From 4242446a1af7d38662da76b31d2e6254d64706ec Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 7 Jul 2023 22:17:58 +0100
Subject: gentoo auto-resync : 07:07:2023 - 22:17:58

---
 Manifest                                           |  30 +-
 Manifest.files.gz                                  | Bin 29266 -> 29290 bytes
 app-editors/Manifest.gz                            | Bin 13901 -> 13903 bytes
 app-editors/vscode/Manifest                        |  12 +-
 app-editors/vscode/vscode-1.79.0.ebuild            | 122 ----
 app-editors/vscode/vscode-1.79.1.ebuild            | 122 ----
 app-editors/vscode/vscode-1.80.0.ebuild            | 122 ++++
 app-emacs/Manifest.gz                              | Bin 71795 -> 71787 bytes
 app-emacs/ebuild-mode/Manifest                     |   2 -
 app-emacs/ebuild-mode/ebuild-mode-1.64.ebuild      |  28 -
 app-text/Manifest.gz                               | Bin 48377 -> 48383 bytes
 app-text/pandoc-bin/Manifest                       |   3 +
 app-text/pandoc-bin/pandoc-bin-3.1.5.ebuild        |  56 ++
 app-text/sigil/Manifest                            |   4 +-
 app-text/sigil/metadata.xml                        |   1 -
 app-text/sigil/sigil-1.9.30.ebuild                 |   5 +-
 dev-cpp/Manifest.gz                                | Bin 14267 -> 14269 bytes
 dev-cpp/cpp-httplib/Manifest                       |   2 +
 dev-cpp/cpp-httplib/cpp-httplib-0.13.0.ebuild      |  50 ++
 dev-lang/Manifest.gz                               | Bin 19491 -> 19493 bytes
 dev-lang/php/Manifest                              |   6 +-
 dev-lang/php/php-8.1.21.ebuild                     | 759 ++++++++++++++++++++
 dev-lang/php/php-8.2.7-r1.ebuild                   | 760 ---------------------
 dev-lang/php/php-8.2.8.ebuild                      | 760 +++++++++++++++++++++
 dev-libs/Manifest.gz                               | Bin 97917 -> 97920 bytes
 dev-libs/libunistring/Manifest                     |   2 +-
 dev-libs/libunistring/libunistring-1.1-r1.ebuild   |   2 +-
 dev-php/Manifest.gz                                | Bin 38204 -> 38204 bytes
 dev-php/igbinary/Manifest                          |   2 +-
 dev-php/igbinary/igbinary-3.2.9.ebuild             |   2 +-
 dev-python/Manifest.gz                             | Bin 263413 -> 263577 bytes
 dev-python/fastbencode/Manifest                    |   3 +
 dev-python/fastbencode/fastbencode-0.2.ebuild      |  26 +
 dev-python/fastbencode/metadata.xml                |  12 +
 dev-python/sqlalchemy/Manifest                     |   4 +
 dev-python/sqlalchemy/sqlalchemy-1.4.49.ebuild     |  98 +++
 dev-python/sqlalchemy/sqlalchemy-2.0.18.ebuild     | 120 ++++
 dev-ruby/Manifest.gz                               | Bin 106423 -> 106424 bytes
 dev-ruby/rdoc/Manifest                             |   2 +-
 dev-ruby/rdoc/rdoc-6.5.0.ebuild                    |   2 +-
 dev-vcs/Manifest.gz                                | Bin 11351 -> 11357 bytes
 dev-vcs/breezy/Manifest                            |  38 ++
 dev-vcs/breezy/breezy-3.3.0.ebuild                 | 102 +++
 gui-libs/Manifest.gz                               | Bin 4293 -> 4289 bytes
 gui-libs/wlroots/Manifest                          |   6 +-
 gui-libs/wlroots/wlroots-0.14.1-r1.ebuild          |   2 +-
 gui-libs/wlroots/wlroots-0.15.1-r1.ebuild          |   2 +-
 gui-libs/wlroots/wlroots-0.16.2-r1.ebuild          |   2 +-
 media-gfx/Manifest.gz                              | Bin 37999 -> 38000 bytes
 media-gfx/geeqie/Manifest                          |   3 +-
 media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch    |  19 +
 media-gfx/geeqie/geeqie-2.1.ebuild                 |   7 +-
 media-video/Manifest.gz                            | Bin 25345 -> 25348 bytes
 media-video/simplescreenrecorder/Manifest          |   4 +-
 .../simplescreenrecorder-0.4.4-r2.ebuild           | 101 ---
 .../simplescreenrecorder-0.4.4-r3.ebuild           | 101 +++
 .../simplescreenrecorder-9999.ebuild               |   2 +-
 metadata/Manifest.gz                               | Bin 3503 -> 3506 bytes
 metadata/dtd/timestamp.chk                         |   2 +-
 metadata/glsa/Manifest                             |  28 +-
 metadata/glsa/timestamp.chk                        |   2 +-
 metadata/md5-cache/Manifest.gz                     | Bin 27917 -> 27890 bytes
 metadata/md5-cache/app-editors/Manifest.gz         | Bin 24234 -> 24083 bytes
 metadata/md5-cache/app-editors/vscode-1.79.0       |  14 -
 metadata/md5-cache/app-editors/vscode-1.79.1       |  14 -
 metadata/md5-cache/app-editors/vscode-1.80.0       |  14 +
 metadata/md5-cache/app-emacs/Manifest.gz           | Bin 115666 -> 115503 bytes
 metadata/md5-cache/app-emacs/ebuild-mode-1.64      |  13 -
 metadata/md5-cache/app-text/Manifest.gz            | Bin 71169 -> 71338 bytes
 metadata/md5-cache/app-text/pandoc-bin-3.1.5       |  11 +
 metadata/md5-cache/app-text/sigil-1.9.30           |   8 +-
 metadata/md5-cache/dev-cpp/Manifest.gz             | Bin 24522 -> 24681 bytes
 metadata/md5-cache/dev-cpp/cpp-httplib-0.13.0      |  17 +
 metadata/md5-cache/dev-lang/Manifest.gz            | Bin 41049 -> 41205 bytes
 metadata/md5-cache/dev-lang/php-8.1.21             |  18 +
 metadata/md5-cache/dev-lang/php-8.2.7-r1           |  18 -
 metadata/md5-cache/dev-lang/php-8.2.8              |  18 +
 metadata/md5-cache/dev-libs/Manifest.gz            | Bin 156828 -> 156830 bytes
 metadata/md5-cache/dev-libs/libunistring-1.1-r1    |   4 +-
 metadata/md5-cache/dev-php/Manifest.gz             | Bin 62056 -> 62059 bytes
 metadata/md5-cache/dev-php/igbinary-3.2.9          |   4 +-
 metadata/md5-cache/dev-python/Manifest.gz          | Bin 370611 -> 371089 bytes
 metadata/md5-cache/dev-python/fastbencode-0.2      |  17 +
 metadata/md5-cache/dev-python/sqlalchemy-1.4.49    |  17 +
 metadata/md5-cache/dev-python/sqlalchemy-2.0.18    |  17 +
 metadata/md5-cache/dev-ruby/Manifest.gz            | Bin 176843 -> 176837 bytes
 metadata/md5-cache/dev-ruby/rdoc-6.5.0             |   4 +-
 metadata/md5-cache/dev-vcs/Manifest.gz             | Bin 18322 -> 18480 bytes
 metadata/md5-cache/dev-vcs/breezy-3.3.0            |  17 +
 metadata/md5-cache/gui-libs/Manifest.gz            | Bin 8093 -> 8091 bytes
 metadata/md5-cache/gui-libs/wlroots-0.14.1-r1      |   4 +-
 metadata/md5-cache/gui-libs/wlroots-0.15.1-r1      |   4 +-
 metadata/md5-cache/gui-libs/wlroots-0.16.2-r1      |   4 +-
 metadata/md5-cache/media-gfx/Manifest.gz           | Bin 56325 -> 56319 bytes
 metadata/md5-cache/media-gfx/geeqie-2.1            |   2 +-
 metadata/md5-cache/media-video/Manifest.gz         | Bin 38086 -> 38076 bytes
 .../media-video/simplescreenrecorder-0.4.4-r2      |  17 -
 .../media-video/simplescreenrecorder-0.4.4-r3      |  17 +
 .../media-video/simplescreenrecorder-9999          |   6 +-
 metadata/md5-cache/net-dns/Manifest.gz             | Bin 12105 -> 12101 bytes
 metadata/md5-cache/net-dns/inadyn-2.11.0           |   4 +-
 metadata/md5-cache/sys-apps/Manifest.gz            | Bin 87710 -> 87699 bytes
 metadata/md5-cache/sys-apps/fd-8.7.0               |   4 +-
 metadata/md5-cache/sys-cluster/Manifest.gz         | Bin 26515 -> 26513 bytes
 metadata/md5-cache/sys-cluster/rdma-core-45.0      |   4 +-
 metadata/md5-cache/sys-kernel/Manifest.gz          | Bin 35438 -> 35438 bytes
 metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.38 |   4 +-
 .../md5-cache/sys-kernel/gentoo-kernel-bin-6.1.38  |   4 +-
 metadata/md5-cache/sys-process/Manifest.gz         | Bin 15752 -> 15596 bytes
 metadata/md5-cache/sys-process/iotop-c-1.22        |  16 -
 metadata/md5-cache/sys-process/iotop-c-1.23        |  16 -
 metadata/md5-cache/sys-process/iotop-c-1.23-r1     |  16 +
 metadata/md5-cache/sys-process/iotop-c-9999        |   4 +-
 metadata/md5-cache/virtual/Manifest.gz             | Bin 51917 -> 51916 bytes
 metadata/md5-cache/virtual/dist-kernel-6.1.38      |   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 8205 -> 8204 bytes
 net-dns/inadyn/Manifest                            |   2 +-
 net-dns/inadyn/inadyn-2.11.0.ebuild                |   2 +-
 profiles/Manifest.gz                               | Bin 179335 -> 179339 bytes
 profiles/use.local.desc                            |   1 -
 sys-apps/Manifest.gz                               | Bin 49882 -> 49888 bytes
 sys-apps/fd/Manifest                               |   2 +-
 sys-apps/fd/fd-8.7.0.ebuild                        |   2 +-
 sys-cluster/Manifest.gz                            | Bin 11533 -> 11530 bytes
 sys-cluster/rdma-core/Manifest                     |   2 +-
 sys-cluster/rdma-core/rdma-core-45.0.ebuild        |   2 +-
 sys-kernel/Manifest.gz                             | Bin 4408 -> 4411 bytes
 sys-kernel/gentoo-kernel-bin/Manifest              |   2 +-
 .../gentoo-kernel-bin-6.1.38.ebuild                |   2 +-
 sys-kernel/gentoo-kernel/Manifest                  |   2 +-
 .../gentoo-kernel/gentoo-kernel-6.1.38.ebuild      |   2 +-
 sys-process/Manifest.gz                            | Bin 10147 -> 10145 bytes
 sys-process/iotop-c/Manifest                       |   6 +-
 sys-process/iotop-c/iotop-c-1.22.ebuild            |  36 -
 sys-process/iotop-c/iotop-c-1.23-r1.ebuild         |  41 ++
 sys-process/iotop-c/iotop-c-1.23.ebuild            |  36 -
 sys-process/iotop-c/iotop-c-9999.ebuild            |   7 +-
 virtual/Manifest.gz                                | Bin 28288 -> 28281 bytes
 virtual/dist-kernel/Manifest                       |   2 +-
 virtual/dist-kernel/dist-kernel-6.1.38.ebuild      |   2 +-
 147 files changed, 2633 insertions(+), 1453 deletions(-)
 delete mode 100644 app-editors/vscode/vscode-1.79.0.ebuild
 delete mode 100644 app-editors/vscode/vscode-1.79.1.ebuild
 create mode 100644 app-editors/vscode/vscode-1.80.0.ebuild
 delete mode 100644 app-emacs/ebuild-mode/ebuild-mode-1.64.ebuild
 create mode 100644 app-text/pandoc-bin/pandoc-bin-3.1.5.ebuild
 create mode 100644 dev-cpp/cpp-httplib/cpp-httplib-0.13.0.ebuild
 create mode 100644 dev-lang/php/php-8.1.21.ebuild
 delete mode 100644 dev-lang/php/php-8.2.7-r1.ebuild
 create mode 100644 dev-lang/php/php-8.2.8.ebuild
 create mode 100644 dev-python/fastbencode/Manifest
 create mode 100644 dev-python/fastbencode/fastbencode-0.2.ebuild
 create mode 100644 dev-python/fastbencode/metadata.xml
 create mode 100644 dev-python/sqlalchemy/sqlalchemy-1.4.49.ebuild
 create mode 100644 dev-python/sqlalchemy/sqlalchemy-2.0.18.ebuild
 create mode 100644 dev-vcs/breezy/breezy-3.3.0.ebuild
 create mode 100644 media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch
 delete mode 100644 media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r2.ebuild
 create mode 100644 media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r3.ebuild
 delete mode 100644 metadata/md5-cache/app-editors/vscode-1.79.0
 delete mode 100644 metadata/md5-cache/app-editors/vscode-1.79.1
 create mode 100644 metadata/md5-cache/app-editors/vscode-1.80.0
 delete mode 100644 metadata/md5-cache/app-emacs/ebuild-mode-1.64
 create mode 100644 metadata/md5-cache/app-text/pandoc-bin-3.1.5
 create mode 100644 metadata/md5-cache/dev-cpp/cpp-httplib-0.13.0
 create mode 100644 metadata/md5-cache/dev-lang/php-8.1.21
 delete mode 100644 metadata/md5-cache/dev-lang/php-8.2.7-r1
 create mode 100644 metadata/md5-cache/dev-lang/php-8.2.8
 create mode 100644 metadata/md5-cache/dev-python/fastbencode-0.2
 create mode 100644 metadata/md5-cache/dev-python/sqlalchemy-1.4.49
 create mode 100644 metadata/md5-cache/dev-python/sqlalchemy-2.0.18
 create mode 100644 metadata/md5-cache/dev-vcs/breezy-3.3.0
 delete mode 100644 metadata/md5-cache/media-video/simplescreenrecorder-0.4.4-r2
 create mode 100644 metadata/md5-cache/media-video/simplescreenrecorder-0.4.4-r3
 delete mode 100644 metadata/md5-cache/sys-process/iotop-c-1.22
 delete mode 100644 metadata/md5-cache/sys-process/iotop-c-1.23
 create mode 100644 metadata/md5-cache/sys-process/iotop-c-1.23-r1
 delete mode 100644 sys-process/iotop-c/iotop-c-1.22.ebuild
 create mode 100644 sys-process/iotop-c/iotop-c-1.23-r1.ebuild
 delete mode 100644 sys-process/iotop-c/iotop-c-1.23.ebuild

diff --git a/Manifest b/Manifest
index abcf9c677bcb..ad75f9f86f2f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29266 BLAKE2B 4b8352e49ead13af310205b213b6b6fda49e2c5b0f7779c9688e384e0b4ad9c055b801180dc51a810514d6b9413dc16ab1a0f11521bc814918e560a13378441f SHA512 d23a9253345b90117eb6c89f8f792b7582b626b792655e44a524c52f3175f3f02e04461f216efd846f1488276d285de05b96b93bec3ccfc290e21f45f45fcfc4
-TIMESTAMP 2023-07-07T14:40:18Z
+MANIFEST Manifest.files.gz 29290 BLAKE2B eb08e0ec9258a9d36736dffd4c67ee20594387082bf4889376fab7203c066c8f536ef38c5b3efd70dc74dcc529180854f2bb7f219bb7c67848b2a702230a759b SHA512 7fd25b1b3a1dd5a85e5baf0e5113000bfd136b5c8451c6b8e16346e6e72fe85a3c1afa6eeb11f4a777699aeb7e5a8389d65b9e49a3e6f337282832c650752cf0
+TIMESTAMP 2023-07-07T20:40:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSoI9JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSoeCxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAghQ/+LO/81Cg08h/keFIHh6yEEXn2o+z4GWttarrktnZ6LPKxVINKkQMPAXL2
-2nGtyd8zgX9w3zM8+CN97qO5wxdSbPVNwN6FMshY3ORr+WPM2sZ7wswFNDsFu33B
-A7U2hIfIdlwfImFFl6MS/kaWfE7m5+BtSJBgXSFSIBpOGowaOy0kvPW50zLsDS47
-nfeVczVxrtIuAvLtOnqx7mFJCiWUn2XIGPk6paDC4yiOvO4ii9dMTKXyMWhisu+b
-UDvuW7aH40u9140Yzn3pElSvwKjX+c7p5JYU03Z2IhqqSLcVuAnbAkqxYOoGJav/
-j04epmIoI3QhDshjo37SeChiFgcmLKDGWH1Y/EsHzXVjuB2wAw246oVHtRzTImGY
-jqsOhcA8/Nq8kG5RpLhP6E7xIQEMAmZtsesHoDkV+VsbbJR1OSrgmSGdgGh4L6Ii
-T7+VyH4eYU9JXS9T63w+EeTmX31ezjh92DdAEog02y03J6c+J8ZANSdk2hh4feqT
-BtHDMKeAqekoCXj2l5aeRQpuGvFGe/VyWjky4OiE5smB4z40jHP073LdcUZb83BB
-qoGDNeiDa7FaFHd0QIjiLU1Mf4NzTde636GYbVW30392KxKhUHQoWqP4g5jm4g0i
-hSOJLUm+8culiznDtmOxOYxnAbcCvf0aj+mu7b4NP0ySK83sh90=
-=MdC1
+klCN2hAAjd/vwfpa4EVAzG/Z6omlY3wDSfDPlqFfH5yauRSCMMzsVLphhQo1Dgu9
+eWny5/3nO1S3cu+hp3D6N7xoDnjROMJ9rGhoF+R4ZsCRAvvbrmVObMud6wkpBdlR
+IrE+qTwdROv36FfTukQX6ToP/djVbc+ctZ9YFAab0rWndlKTYR+gONPBB6OjECNW
+G13np9GAwBMr9D2Pu7lKeQ+YIQm+G5D0Ur3OD/i3xOISNKDrMIYPPyDfE/J9WY3X
+lFnOPM40xSI5iG70r/52dxYdOOKLLIRfhAyymltGCt6+sWH75PNopsG0ml5SsIaP
+uMSBzjhP3ZwsRv+n/KZ0c+GimpfmWHCf3NasGcdCa+rJYYhX+sGghfR/gLBcNLfX
+9PMm4rFyTXmDUvpO2jOx4PfVYMdv6Mzq6f0rNLQsSC1xW3u74vmEDRnvuniXv8N/
+2+SKrVga5jxy/tMuzS5TH1kv48tmboyi0lH8QQWI+tVgZrdqIzF6H79isvJjrZfp
+K43LKBrt9pJcu9TktyablfRTkJmkpR7mGwnJ0S81Er9zrVNDwPpuF3hJa71ZOcFr
+BU4lkCpZSf3wBrke21g73hrqBC8UWn/KlVnA4ZLWUKU0qnYdyf7e6caVrmWfDpZV
+6GTHJjLnW5I4mqClXHngZwO+kW6E/i8CfnGvq7kQ2lM+y5zTij4=
+=E0JJ
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 565212972013..77785cd88194 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 907d969a4cd1..6b2336996e66 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index ec7ede64ba29..b2606ab4b434 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -2,16 +2,12 @@ AUX vscode-url-handler-wayland.desktop 351 BLAKE2B 8b1d295572865fb25beeb14d9762c
 AUX vscode-url-handler.desktop 291 BLAKE2B 364ce7de060a947d48486a639aed515f5b17e1720ac1eaee1aa4e13559047622e2897c0426aed792e3d8aed440771c6f5bb3e36873140401c951ec3b749cd661 SHA512 4607346645781f67daeb6cff2425924133537d620bf7dac9c2619cd5a1a29252e7ecf1a27f27e7bb917c413d462f129f9ae26f50ec8b531e5ac872bc8b96dd93
 AUX vscode-wayland.desktop 580 BLAKE2B fb70f6b28e975368550735f2dab8be6ccab9510481c794e6b44545a690224bc93b51cbc6beb809886eee1cde3648eb284374c87c0b74a1fcc3bdf0af0e700a9f SHA512 615cacda3121b4a839816722382c23bfa2cb162e2a772ba91bded9e161a92763bb536778ea8f716e4c6c46f4f6c289a9c922347523d278ba3714569eb64c0234
 AUX vscode.desktop 451 BLAKE2B 3c0cbe4a9bf71d47c3534bf6f7a265a04a0949b0bb86e060a0ecccb3b9f242ba9b46f1fc0dea37ff0d982ec88417da980b31b9658906a8f23c707e9b100183c6 SHA512 334b8c025c4a99e0f1390c56dd89e529c23b0ea3f6ec5a83105eb6acc4ff62b4d25419353d7bf4bb69dec611bd98778e7b8c728d2392827aa97690b5b91c7fb8
-DIST vscode-1.79.0-amd64.tar.gz 134771216 BLAKE2B eff3918fdc4c48cb9b0dd0ba09f5cf10c707c3fe491905a4150cfd634722d66e49a13c3d08828c3eafcc8b507356308d829b32e5c57313194157c27b9d895e6a SHA512 586898b17af29bf218af765cf7a8c3aefd7b73d181c9bafa3a98fc8f2f74d14c6c132179542b1b5ffa364b153bb8c5d71150d0ef40266913685640c2640c7209
-DIST vscode-1.79.0-arm.tar.gz 119314354 BLAKE2B 23ffd7c9202e5491e41c5b99a707807ca3cd06ba5323f5c67859344c95dc19848ec9daa83bc97f2afa585cd93a4cf62da0608a3cc4788d9e4b71a468a1fad6c3 SHA512 9eecbeaf34b4248915e4c0f922c7033c140cb4944e73775c116bd1e03c8cd3feb2f702e6d089df057b307637e2b4065a06e377b156d22ea92dee1741c846934f
-DIST vscode-1.79.0-arm64.tar.gz 130967654 BLAKE2B fe5a484b12ad1ef6c9cccbe95cab149a0caf9fe6d5f2b5f6354dbf154346f5cfb6d6c4da839149dfff2194b43ac72639a2e5df457aedcd2bcf96cd8fff9515e9 SHA512 b2541ea525ae82b8468b6b41990f73cb881461f352691959402d7927423a1ec215a43db7aac7f9b3ae83e6507cdf5c7645431fc08872dde8df7d6b4ce47c20f3
-DIST vscode-1.79.1-amd64.tar.gz 134787612 BLAKE2B 65b8cd1695c92dc3d1cd3cf1ddd5b2e048ed8df3bd0d8284bff6a1980947adbc9fb85fe48a79ce20405151d33422c6f0677a4a2cf7cbb572eff6b866d9f951d1 SHA512 15f48715bffe22aceada44cc5da3b7e47983e3acb5ecc04aca5babe465f2da0c2dd143540f231ce6d8e3f6879d66b494d9be57afa23161ab65448430f294ea2c
-DIST vscode-1.79.1-arm.tar.gz 119311072 BLAKE2B 5f6a48fb3b915894aa90488c0c80fd47d886c614d46821a61a3d97899e4d8c02a22730944f50e1ecc4c7f729db19ef054e3e46be570d6a19e63a8b730084b41e SHA512 f61c3bb2570621c3e20b3b056e4d06178a674e63d9fbc132f885734ba5ec030456177657e81c7d2a98054dce4dde2ca6387d8c84841dc26c0dd6bcea1dc386aa
-DIST vscode-1.79.1-arm64.tar.gz 130964437 BLAKE2B ae7d5a14a0d31de1ac984f74805191d3323cad8861949c4cbf342e7f6e5b0a4d5ee046ad314be4eb39b33e17120a700964c9d7696922ac1fd487d7e1b5374915 SHA512 e99fed7bdf7b8557cdcaa4bfe5ee7509dd34a34e6643f522439736d84d172070586cf7216b9d06f3110bdb2487bbd389777ee2a14929c04c963db982196e2a87
 DIST vscode-1.79.2-amd64.tar.gz 134757908 BLAKE2B 8f92476935a7833cbb872d41b65d480540860a529f587009e1188d3aaa1dc61b19ca11ee472ebf7942d5f763bee940fb28b4066a67346094aa5efd519456fd5c SHA512 14aded59f7b083a1c57c50ff24064c242520c6520811541f5cd4daa9ab3878eae4a88c8e0ba54bfe3ec1023395e5b2f4f74cecd373d8bc43acbdb15fdd1fc47f
 DIST vscode-1.79.2-arm.tar.gz 119307976 BLAKE2B 89b48809c3306ff89057f7533c825bfce9f35792be4b308b254bc4e347ead14c3e89a00c70ce678287e2e8376a76997c4a43dbb4dd3209cfaebe4a432d5a0bfc SHA512 9f83a0ae95fb6fead3fe2da3ce96e6be336713a29bd28fa0db168ce3236d4eaf80067e9ca1ff0cd3ebb7d31d9789f262a0119524afe042f75b58bcb953937ca5
 DIST vscode-1.79.2-arm64.tar.gz 130972979 BLAKE2B da5c86ac8bfe4d7900aec6dbd61de03555e94a8c36ca504024b5fa0c217f2473fc13a1e0ef0fa32779ae0793f6574fceae693381370b068d574bc0d1fa8649e0 SHA512 76050ff4fd73a3cc285781f03c087388d8717d5fbb31807f271da9bca77d10ac909844dc9ec1b30e85dd5a76a76ac5b027d200acf0d4445c5d5fb88bdea1104a
-EBUILD vscode-1.79.0.ebuild 2862 BLAKE2B f935e3c07dd88704fa82bfa86cfa460bc58a8f769125bbd9a93b9963ead92bb83700263b8740ee0829938f32caf0f68f5867b9e884ad8774d544cb7c860cf911 SHA512 8327ee741916aa3a518b1996416dbe61af77c1d05a4c07e57528baf0cb50ddbb470e763d3b89211cc61f44472cf73941b709b14a82d71d54ddff3e86a8ea304f
-EBUILD vscode-1.79.1.ebuild 2862 BLAKE2B f935e3c07dd88704fa82bfa86cfa460bc58a8f769125bbd9a93b9963ead92bb83700263b8740ee0829938f32caf0f68f5867b9e884ad8774d544cb7c860cf911 SHA512 8327ee741916aa3a518b1996416dbe61af77c1d05a4c07e57528baf0cb50ddbb470e763d3b89211cc61f44472cf73941b709b14a82d71d54ddff3e86a8ea304f
+DIST vscode-1.80.0-amd64.tar.gz 135325602 BLAKE2B f959c454f0a0fbf3f499eebfbc48115347e88619e44d0ceb68844e23e15991627651b2d63c0b7f756decefee9e535f39d3ca4a0292523af541c4c1b035f339fa SHA512 b121229bb9c7ed467370a00abb5efc53b8999cade79351c9740037df4af5485714c4695905e228e1e483f69c30e84ec7182ad249431d68f5d3aaacaf6ac2c44d
+DIST vscode-1.80.0-arm.tar.gz 119949287 BLAKE2B 56b20d79aacf3effd36f811c25fcb56e80df03a18026ddb13de62ef06aad13d92bdb93739f330bd212007023ef75f4be99616f945569755d733ab97af8757231 SHA512 ea98b06a0adbe097436a9c154c9083442426128105c40ebeb73408471822102f9b977985ed50cedb056d0a4ab9578415509f2a558fbdd901d9a230a1cd267f4d
+DIST vscode-1.80.0-arm64.tar.gz 131637682 BLAKE2B e8e50dba908b288ee359d97d378ce8ff36f4c82d3fa4f101a2c9d335641b6d121cddd5dff8f6f233defa8234fff880d2a3c8a006e069612e511d5fed90b4df0c SHA512 233a380270f043dbe5b045188f7c28731325be6705a0365f1d297240f8a0e77876189685cf7e93f60e52617524c65cf5b6c9390ecb8e01e266c6bced31680941
 EBUILD vscode-1.79.2.ebuild 2862 BLAKE2B f935e3c07dd88704fa82bfa86cfa460bc58a8f769125bbd9a93b9963ead92bb83700263b8740ee0829938f32caf0f68f5867b9e884ad8774d544cb7c860cf911 SHA512 8327ee741916aa3a518b1996416dbe61af77c1d05a4c07e57528baf0cb50ddbb470e763d3b89211cc61f44472cf73941b709b14a82d71d54ddff3e86a8ea304f
+EBUILD vscode-1.80.0.ebuild 2862 BLAKE2B f935e3c07dd88704fa82bfa86cfa460bc58a8f769125bbd9a93b9963ead92bb83700263b8740ee0829938f32caf0f68f5867b9e884ad8774d544cb7c860cf911 SHA512 8327ee741916aa3a518b1996416dbe61af77c1d05a4c07e57528baf0cb50ddbb470e763d3b89211cc61f44472cf73941b709b14a82d71d54ddff3e86a8ea304f
 MISC metadata.xml 1058 BLAKE2B cf7606233d99e4429debe5ef824f235f1ff3083ab5553030453e982bfb5860dd5ccecca3792319665835d604b6ff2cb53ebd885bb959236784c62885087750b2 SHA512 961552953336ad9606c9fc004fc3e0fb8d7481a017b6ba5da683db5ba989f58d474ccb4ea3a001851b2cfe705e7fe3f70ba01a14dd1f048523e73af522d50410
diff --git a/app-editors/vscode/vscode-1.79.0.ebuild b/app-editors/vscode/vscode-1.79.0.ebuild
deleted file mode 100644
index 0362e867fb48..000000000000
--- a/app-editors/vscode/vscode-1.79.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-SRC_URI="
-	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
-	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
-"
-S="${WORKDIR}"
-
-RESTRICT="mirror strip bindist"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	Microsoft-vscode
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	sys-apps/util-linux
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	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/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libxshmfence
-	x11-libs/pango
-"
-
-QA_PREBUILT="
-	/opt/vscode/bin/code-tunnel
-	/opt/vscode/chrome_crashpad_handler
-	/opt/vscode/chrome-sandbox
-	/opt/vscode/code
-	/opt/vscode/libEGL.so
-	/opt/vscode/libffmpeg.so
-	/opt/vscode/libGLESv2.so
-	/opt/vscode/libvk_swiftshader.so
-	/opt/vscode/libvulkan.so*
-	/opt/vscode/resources/app/extensions/*
-	/opt/vscode/resources/app/node_modules.asar.unpacked/*
-	/opt/vscode/swiftshader/libEGL.so
-	/opt/vscode/swiftshader/libGLESv2.so
-"
-
-src_install() {
-	if use amd64; then
-		cd "${WORKDIR}/VSCode-linux-x64" || die
-	elif use arm; then
-		cd "${WORKDIR}/VSCode-linux-armhf" || die
-	elif use arm64; then
-		cd "${WORKDIR}/VSCode-linux-arm64" || die
-	else
-		die "Visual Studio Code only supports amd64, arm and arm64"
-	fi
-
-	# Cleanup
-	rm -r ./resources/app/ThirdPartyNotices.txt || die
-
-	# Disable update server
-	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
-
-	# Install
-	pax-mark m code
-	mkdir -p "${ED}/opt/${PN}" || die
-	cp -r . "${ED}/opt/${PN}" || die
-	fperms 4711 /opt/${PN}/chrome-sandbox
-
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
-	dosym -r "/opt/${PN}/bin/code-tunnel" "usr/bin/code-tunnel"
-	domenu "${FILESDIR}/vscode.desktop"
-	domenu "${FILESDIR}/vscode-url-handler.desktop"
-	domenu "${FILESDIR}/vscode-wayland.desktop"
-	domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscode.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
-}
diff --git a/app-editors/vscode/vscode-1.79.1.ebuild b/app-editors/vscode/vscode-1.79.1.ebuild
deleted file mode 100644
index 0362e867fb48..000000000000
--- a/app-editors/vscode/vscode-1.79.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-SRC_URI="
-	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
-	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
-"
-S="${WORKDIR}"
-
-RESTRICT="mirror strip bindist"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	Microsoft-vscode
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	sys-apps/util-linux
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	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/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libxshmfence
-	x11-libs/pango
-"
-
-QA_PREBUILT="
-	/opt/vscode/bin/code-tunnel
-	/opt/vscode/chrome_crashpad_handler
-	/opt/vscode/chrome-sandbox
-	/opt/vscode/code
-	/opt/vscode/libEGL.so
-	/opt/vscode/libffmpeg.so
-	/opt/vscode/libGLESv2.so
-	/opt/vscode/libvk_swiftshader.so
-	/opt/vscode/libvulkan.so*
-	/opt/vscode/resources/app/extensions/*
-	/opt/vscode/resources/app/node_modules.asar.unpacked/*
-	/opt/vscode/swiftshader/libEGL.so
-	/opt/vscode/swiftshader/libGLESv2.so
-"
-
-src_install() {
-	if use amd64; then
-		cd "${WORKDIR}/VSCode-linux-x64" || die
-	elif use arm; then
-		cd "${WORKDIR}/VSCode-linux-armhf" || die
-	elif use arm64; then
-		cd "${WORKDIR}/VSCode-linux-arm64" || die
-	else
-		die "Visual Studio Code only supports amd64, arm and arm64"
-	fi
-
-	# Cleanup
-	rm -r ./resources/app/ThirdPartyNotices.txt || die
-
-	# Disable update server
-	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
-
-	# Install
-	pax-mark m code
-	mkdir -p "${ED}/opt/${PN}" || die
-	cp -r . "${ED}/opt/${PN}" || die
-	fperms 4711 /opt/${PN}/chrome-sandbox
-
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
-	dosym -r "/opt/${PN}/bin/code-tunnel" "usr/bin/code-tunnel"
-	domenu "${FILESDIR}/vscode.desktop"
-	domenu "${FILESDIR}/vscode-url-handler.desktop"
-	domenu "${FILESDIR}/vscode-wayland.desktop"
-	domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscode.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
-}
diff --git a/app-editors/vscode/vscode-1.80.0.ebuild b/app-editors/vscode/vscode-1.80.0.ebuild
new file mode 100644
index 000000000000..0362e867fb48
--- /dev/null
+++ b/app-editors/vscode/vscode-1.80.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils xdg optfeature
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-1
+	BSD-2
+	BSD-4
+	CC-BY-4.0
+	ISC
+	LGPL-2.1+
+	Microsoft-vscode
+	MIT
+	MPL-2.0
+	openssl
+	PYTHON
+	TextMate-bundle
+	Unlicense
+	UoI-NCSA
+	W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	app-crypt/libsecret[crypt]
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/util-linux
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	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/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libxshmfence
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	/opt/vscode/bin/code-tunnel
+	/opt/vscode/chrome_crashpad_handler
+	/opt/vscode/chrome-sandbox
+	/opt/vscode/code
+	/opt/vscode/libEGL.so
+	/opt/vscode/libffmpeg.so
+	/opt/vscode/libGLESv2.so
+	/opt/vscode/libvk_swiftshader.so
+	/opt/vscode/libvulkan.so*
+	/opt/vscode/resources/app/extensions/*
+	/opt/vscode/resources/app/node_modules.asar.unpacked/*
+	/opt/vscode/swiftshader/libEGL.so
+	/opt/vscode/swiftshader/libGLESv2.so
+"
+
+src_install() {
+	if use amd64; then
+		cd "${WORKDIR}/VSCode-linux-x64" || die
+	elif use arm; then
+		cd "${WORKDIR}/VSCode-linux-armhf" || die
+	elif use arm64; then
+		cd "${WORKDIR}/VSCode-linux-arm64" || die
+	else
+		die "Visual Studio Code only supports amd64, arm and arm64"
+	fi
+
+	# Cleanup
+	rm -r ./resources/app/ThirdPartyNotices.txt || die
+
+	# Disable update server
+	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
+
+	# Install
+	pax-mark m code
+	mkdir -p "${ED}/opt/${PN}" || die
+	cp -r . "${ED}/opt/${PN}" || die
+	fperms 4711 /opt/${PN}/chrome-sandbox
+
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
+	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
+	dosym -r "/opt/${PN}/bin/code-tunnel" "usr/bin/code-tunnel"
+	domenu "${FILESDIR}/vscode.desktop"
+	domenu "${FILESDIR}/vscode-url-handler.desktop"
+	domenu "${FILESDIR}/vscode-wayland.desktop"
+	domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
+	newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 7a60dc410ca7..f803d35abf7d 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 792d42ab669d..5a96961339c8 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,8 +1,6 @@
 AUX 50ebuild-mode-gentoo-1.54.el 1509 BLAKE2B 98cf2a1672723ffaa3f4d2f57b4b67b897df56cc2d7352366b79df0578b927faae53c3cc703fa70cf23bd0b1006d8c49dd8e59fcaffa3a231fd7ec5e26c7dce5 SHA512 91c59e85ea79733c195985e4a33dfb1aec8ac13457c0dc3fe7353fb2616787ebde4393b671a2943b752725593929070b658c24955d5e2132b6e9b76daa749850
 DIST ebuild-mode-1.63.tar.xz 39600 BLAKE2B 1746e0ab558fd7b48dc778f2287b3a9f2b5f82f5e4e53e353b0b9c3de3436a8ec17f827d93cf1ff990dd780a33435ea946e19ac655fd0f39fee03beb07ce5509 SHA512 264678921d8a2e535fedcc06c9c0932a4898f3d33cc54d79107658d9a77048e00c5ec276d4c74dc55c2ba2c643024453542f16619fde473d417b446bbd78175c
-DIST ebuild-mode-1.64.tar.xz 39872 BLAKE2B e6309f91276093d40c322e0b639c10067ac95f305a7333d4335182fc6f0bec34141bb3cac1fd577657a5d795338b1da0d1f2212b2c5fd6502d958129a1e8167b SHA512 0c760946070882e93fb10dbad6f1ceb4977b2b9f0b7786c1a99ecde7b16874f840ac9877dc531503b216b0d030e779bb3d0f9cec9eeb40bb211ec6f20ebe0f88
 DIST ebuild-mode-1.65.tar.xz 39952 BLAKE2B fba1a751e417d39e1d4ce6f9fbc9b5e3465bdddef5fd9a675f6649a3fddb56a8009ebf4c9b22bde349c2faf0009dc6f29ae1acb78632144fbf1b4b5b9e5fa4ca SHA512 fa8b16d68f3afd1ba3557e13d83a809d723bf0f0adf4741ee6897381835c96970a43c28191e9a90a0f096a164c183604caaee2e5ddb0769ed77fca34633cc0e3
 EBUILD ebuild-mode-1.63.ebuild 874 BLAKE2B 1c65faf2ee32a4c4a094ab9eef56342d61ec272000c15e3cef4c0a604a91af8e1157971e173919f95278375511c81393987de8677f713857cfc4400ebbe85b72 SHA512 e704314cd41d61debba4be29f21746501bc7893f55782f3933e276dfd5a3c198f56b7ce18fa7c04468d6ed3a43c573dad69591d5eff590f74f0af40a75ec39b7
-EBUILD ebuild-mode-1.64.ebuild 881 BLAKE2B e5790c63140728370663fd390818141969890060d2a01b9f83846c9dfa495608b7c844a07d1df81d429dd329a3f2f46e8c8e6075ce609e57cd8940765369da9f SHA512 391230d12863a5bdd0e7a3643d089d7bf09d82fff736a3abc9ce1de3130962890951274d91d4b595bce7d538673232aa8fe780a59afce342b964cf4226b18365
 EBUILD ebuild-mode-1.65.ebuild 881 BLAKE2B e5790c63140728370663fd390818141969890060d2a01b9f83846c9dfa495608b7c844a07d1df81d429dd329a3f2f46e8c8e6075ce609e57cd8940765369da9f SHA512 391230d12863a5bdd0e7a3643d089d7bf09d82fff736a3abc9ce1de3130962890951274d91d4b595bce7d538673232aa8fe780a59afce342b964cf4226b18365
 MISC metadata.xml 483 BLAKE2B 203c30fd4195b63532c0462427658547b0805fb23b57c9a04c554eba8ef0a9b9bc7e3100a51c3cb7feb11d1dcb9472357e5e53640e9a94658e35594cd3369f56 SHA512 78804ced19849c5d88cf942117714db3302cb2187e93ab3924b5526d0c6aa973dbda2cdb5a67c9e0639d5ac3278ea8da9df1e20c2b3cb96231f3fee5fc6845fb
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.64.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.64.ebuild
deleted file mode 100644
index 7c4ed2c5c19a..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.64.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp optfeature
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.54.el"
-
-pkg_postinst() {
-	elisp_pkg_postinst
-	optfeature "ebuild commands support" sys-apps/portage
-	optfeature "additional development tools" dev-util/pkgdev
-	optfeature "ebuild QA utilities" dev-util/pkgcheck
-	optfeature "generating HTML from GLEPs" dev-python/docutils-glep
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 88f37d37f315..468b5ed5aed1 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest
index 5cd8c8e6ba2c..a3d8e9d8c11c 100644
--- a/app-text/pandoc-bin/Manifest
+++ b/app-text/pandoc-bin/Manifest
@@ -4,7 +4,10 @@ DIST pandoc-3.1.3-linux-amd64.tar.gz 28685814 BLAKE2B ecbc685d45ced12f69223ceff4
 DIST pandoc-3.1.3-linux-arm64.tar.gz 30811766 BLAKE2B 5d5807ea6de49fe87b31f51754d70f781fbd27111980bb14eaafd985a53f7e4fa1c7c0dd66d041184194d5b6a74a429e78b8a0913532645d29b47dbc82e154fb SHA512 6bb8b658e2ea3c96e5781754618104086268dbad45bd95ed7474842993c57cbd18ef1bb909556a1aef118589624d431b17454cd76e8b44dbe441e463e6332a1b
 DIST pandoc-3.1.4-linux-amd64.tar.gz 28628391 BLAKE2B b929d7c1f37f0630a816e07cf0b67a35dd474bfe55626c1ea3c4acefa61a4a7fe335cc1913c01ca3fd45fa1469f957ad671b08fc7e0bd1d4ca6404fe3817f1dc SHA512 f59b66bae4b365ef1291ca979e47ee3955d017112b645da0b7b70dfc84cfc32d29ceb948e6ddd2f16a847867df661b69d1e0f0058259d53613a0ee5b61f312d9
 DIST pandoc-3.1.4-linux-arm64.tar.gz 30740344 BLAKE2B d0504eb6e530d91d223fcd5b578651ba4be74141c7cc4f2616a2a56dbdd73deafd8997a2eb0d0d4b7b75591219cbd194d3412e7c7f60bd6dfd1b97614e6d40bf SHA512 0e63ed951ae1032c2ee29b36f2df5b2edba10d9993bccc2baacc378f82201f5afc38cfc5ffce234b5a8dcaac51ece1967c76a7ae30af0286c8083f0aa8b1573a
+DIST pandoc-3.1.5-linux-amd64.tar.gz 31034735 BLAKE2B c2704142f90a95c8bfe045ba1a6d7ce29c7e0f3c755a2fa85a694ce01d05f97814e0ccec70cc7da17c57fcb4124bc10afc4d06d40437eec08d984350d74cdae0 SHA512 97454c530e7fa95bc4cda90ff803422850d620c7f6452be855b9198fc71832ef2531f2350044b110b36804f745ca90c44ffb4f2013bee78fdc935f810b55ed41
+DIST pandoc-3.1.5-linux-arm64.tar.gz 33687622 BLAKE2B 8021c04ba2a3b71db6b758a21e7dcc2708a2db871fd6604fdf9e2f89619f6141913b4a0bf267e775646a4a0d23308f64487bffe632f75bee53f02110b91e10a8 SHA512 ca64066d438076571979af998e19c89295e7d297a3c5365aaefbd4665e20a6ea1f19a1d8a320b2bc98fb0511a43570fbe3850bcbb13c3b3b054e3c13bd9d0142
 EBUILD pandoc-bin-3.1.2.ebuild 1399 BLAKE2B a6716e82b27390fb9a81b0116aa39330c11812ba180679e38bd1ff34003b2332f79a888f9828c610a2e29e95e67ca6f3592fab9cc743ae8f7e43294d4adc135d SHA512 ec789ef8addcbbb01777b2e49b4ada887ca614dc437e173e165fe1dbc7542c215597b784aa10687dd6c088441c990c264e9be189e3b479aecb642bd5e190a631
 EBUILD pandoc-bin-3.1.3.ebuild 1401 BLAKE2B df6b6d864fd5ac799f59a73380db8452421212fc5dd7848dc2c1b5f2f98b3cfbf5b161f51e31c9e98e76fa8ca3bd61465e0bc5154ffdd103a4a3caf0e708076d SHA512 5366c4d00711f395dda02ee7dfebd6e259b8e62e339441304f081cc2f711d15e93380f2df690c6be4bf78d0f126458b4b8a633f690aafc594146c4efa801ebdf
 EBUILD pandoc-bin-3.1.4.ebuild 1401 BLAKE2B df6b6d864fd5ac799f59a73380db8452421212fc5dd7848dc2c1b5f2f98b3cfbf5b161f51e31c9e98e76fa8ca3bd61465e0bc5154ffdd103a4a3caf0e708076d SHA512 5366c4d00711f395dda02ee7dfebd6e259b8e62e339441304f081cc2f711d15e93380f2df690c6be4bf78d0f126458b4b8a633f690aafc594146c4efa801ebdf
+EBUILD pandoc-bin-3.1.5.ebuild 1401 BLAKE2B df6b6d864fd5ac799f59a73380db8452421212fc5dd7848dc2c1b5f2f98b3cfbf5b161f51e31c9e98e76fa8ca3bd61465e0bc5154ffdd103a4a3caf0e708076d SHA512 5366c4d00711f395dda02ee7dfebd6e259b8e62e339441304f081cc2f711d15e93380f2df690c6be4bf78d0f126458b4b8a633f690aafc594146c4efa801ebdf
 MISC metadata.xml 986 BLAKE2B 10ab442c2f7892545054ba2747c0cde115d9d875673c077d2cefcd035e2ecd6d04f2aef05ef9ca58a2150a983079ad8fbdc6910ca93fc14977409041e5f20201 SHA512 c8e241d4d7bba0a6f36320517d18fbb99922e32970d7771d5bbc80a8ecf5086f8f7d1eadd0188d457412a66db898d044074b4d4f0301aab1e19cd1213e562375
diff --git a/app-text/pandoc-bin/pandoc-bin-3.1.5.ebuild b/app-text/pandoc-bin/pandoc-bin-3.1.5.ebuild
new file mode 100644
index 000000000000..f5289c741e6a
--- /dev/null
+++ b/app-text/pandoc-bin/pandoc-bin-3.1.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN//-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Conversion between markup formats (binary package)"
+HOMEPAGE="https://pandoc.org/
+	https://github.com/jgm/pandoc/"
+
+BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
+SRC_URI="
+	amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
+	arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="+pandoc-symlink"
+
+RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+	default
+
+	# Manpages are gzipped.
+	unpack "${S}"/share/man/man1/*.1.gz
+}
+
+src_install() {
+	exeinto /usr/bin
+	newexe bin/${MY_PN} ${PN}
+	dosym ${PN} /usr/bin/pandoc-lua-bin
+	dosym ${PN} /usr/bin/pandoc-server-bin
+
+	newman "${WORKDIR}"/${MY_PN}-lua.1 pandoc-lua-bin.1
+	newman "${WORKDIR}"/${MY_PN}-server.1 pandoc-server-bin.1
+	newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
+
+	if use pandoc-symlink ; then
+		dosym ${PN} /usr/bin/${MY_PN}
+		dosym pandoc-lua-bin /usr/bin/${MY_PN}-lua
+		dosym pandoc-server-bin /usr/bin/${MY_PN}-server
+
+		dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
+		dosym pandoc-lua-bin.1 /usr/share/man/man1/${MY_PN}-lua.1
+		dosym pandoc-server-bin.1 /usr/share/man/man1/${MY_PN}-server.1
+	fi
+}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 0a2616b1c8aa..d40e13ce6aa4 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,3 +1,3 @@
 DIST sigil-1.9.30.tar.gz 26602897 BLAKE2B 554af2aa4c26994c065023839ea29b190eea501cac1183d58dcf2439ebca89e0a56848aaec1d668cfb84555c6830eaf6d32efdc82b08e0c94d7b6ba95dd7ff8b SHA512 80dcaa9dcee51c36a42bcd57fc87acda94002af74602d934c7e9bfd275339d9ac200cd1f141fb9e2709ac054569bc22f1869623498ce16c636a3fab8dae4e70f
-EBUILD sigil-1.9.30.ebuild 1897 BLAKE2B 90e33470199cd108a48224cbfee10b74d425b2eb0d8a1a677b4c6b7002a635e7789cd6b933b10c8552782584d91374a39a5dea845a21d89edfd104d2be45cbc6 SHA512 f7e6314d0dc1d7970ae7898d6c97e6bb1c5393c8bd6b9300a8b34080132cebf652297afa8fce24985b35a90ceb55dae05fce685205d1958ec0b6976669c6ad9c
-MISC metadata.xml 810 BLAKE2B 9790a33fa436de084e57410b5fea4fc477bef40dafbc9b0467b0b01a27dfcb9b6874df529f5e0ecc1aca5e48fb07adde0b3a8c99fdd1ff1bd14f6877ecfedc98 SHA512 8b0c12e38cf8516e139bc1277062f0499148b6eba417e9c65389dd5aa8fdae9b967cffbe066f5e3bee5ed11d2eac2d909c782dc3b3f1432b3f4515adb04acaf2
+EBUILD sigil-1.9.30.ebuild 1847 BLAKE2B 12165185ecf9888f9d3087ce8782aa707dddcc709f06211bebe3cabbaa61fa076acd05479ee7d026f7f8504a73faa2e0b8f808307dade7a2cced5c97a49cb9c0 SHA512 fdcb6426bd7aea052c3e36aa0fb92f900f39e8bca28caa4022b8b6f4979b999c8e54f175a0967d3b797c69b0f5097719b8dae80cddb37cbfbbf57980d01d084f
+MISC metadata.xml 706 BLAKE2B 394811d292869d61297ed01ce36223cd0eb33b6ea21db9cfe6e87911d7f30801977f8b66663085a289bf9f6870fd64d72c1d706c7b9516d2e09585783772a4dc SHA512 a98d16ad1760d359f9ab915d472747fe3f1dc229f41b10980f1ccd3436091f8dec0ee800fed7e531413eb77826a7873ce3e2e3bf8c2d478b4d1ec1ccc16e5b68
diff --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
index 16a802d7daa4..4daa9a331609 100644
--- a/app-text/sigil/metadata.xml
+++ b/app-text/sigil/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="plugins">Installed needed Python packages for using Sigil plugins</flag>
-		<flag name="system-mathjax">Use the system-wide <pkg>dev-libs/mathjax</pkg> instead of bundled</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">Sigil-Ebook/Sigil</remote-id>
diff --git a/app-text/sigil/sigil-1.9.30.ebuild b/app-text/sigil/sigil-1.9.30.ebuild
index 621537704a6e..681e2613d8dd 100644
--- a/app-text/sigil/sigil-1.9.30.ebuild
+++ b/app-text/sigil/sigil-1.9.30.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P^}"
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE="+plugins system-mathjax"
+IUSE="+plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -41,7 +41,6 @@ RDEPEND="
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/regex[${PYTHON_USEDEP}]') )
-	system-mathjax? ( dev-libs/mathjax )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -63,7 +62,7 @@ src_configure() {
 		-DUSE_SYSTEM_LIBS=1
 		-DUSE_QT6=0
 	)
-	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
+	# use system-mathjax && mycmakeargs+=( -DMATHJAX3_DIR="${EPREFIX}"/usr/share/mathjax )
 
 	cmake_src_configure
 }
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 5c61ea3df677..3bd3ec03e936 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index 193e727b7a78..eb4165035191 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,5 +1,7 @@
 DIST cpp-httplib-0.12.3.tar.gz 639107 BLAKE2B 15db0056069cbda5359c6279ebc84520039e809f32cd8314c180dd761324a76fccaae0e80f39d0b69563903bd667799425c7e85708962b2763416a3c8bbd09bb SHA512 3465e5c843ad4087bababadf8fe9f3e6961213301540053bb47f242f958280f43c85b03b8cf6f955a6b91bf9511a81669feeb9989344caf2a1e42ff587b3a460
 DIST cpp-httplib-0.12.6.tar.gz 641145 BLAKE2B 56a1a9c2d048a608664cce1ea3737d8633d6dbc124b4a5b2b5a33f81d678efdd2b8b0c79fb88c23dd861f1c6264eddba32349740142e3765d61f811dd50d9909 SHA512 63f0172bb7f4b02f3640634f25801bc1e34d85f53c9915e6402d825891793de26faa7551dff88a44c23af39e3592b7863454d9c070b5bd0e546cb987bca14885
+DIST cpp-httplib-0.13.0.tar.gz 644021 BLAKE2B 9ed1d49819662dbb6af04c4ab8b1d1cfa68db07d5b147f64c8c20a6a61f61490f518d9c8e405f867a130f0b455e530582ec9685deaadfd4b9f34790becf6495f SHA512 8d91fe1f2780d2330112ebb3f3d3c6ac6526e8cb04902e15edefe6121d588495519551007c3c134e0d16f71460cba1680860e229b2318f8725ce651027a68a9a
 EBUILD cpp-httplib-0.12.3.ebuild 1314 BLAKE2B 6b9874966e1b346189732803dbce30f3e306a60182269d64581a22646c97e8c884622a2dd94879db412d763639656c68a2bf5d2d1c993b2a0b57a98f5a445944 SHA512 9a02f97726c99f4489f9ba9d4e06bf755c5585bd70514a0e516665a73f34c8b63115f813c523f92e0dabdbeb25f10302e4bf5b36c900cd8846dcad93ba8d8d20
 EBUILD cpp-httplib-0.12.6.ebuild 1342 BLAKE2B 2246303a14ae4830a106eccc1b3edb0d4acdd401e118207c1f45124574bd55e2bf49c534ae4d4562d7a8401f046337abe9793e0be6dc201973093c09ea07d198 SHA512 d6e988dc4cf3d6a8b9b9034d98349689c3e86fd179b3d598775d00a1eed7161749e1f1829b2a2a4e5e91cd6e179ff496253e22394cb34cdd0115ca5d32dd90a6
+EBUILD cpp-httplib-0.13.0.ebuild 1342 BLAKE2B 2246303a14ae4830a106eccc1b3edb0d4acdd401e118207c1f45124574bd55e2bf49c534ae4d4562d7a8401f046337abe9793e0be6dc201973093c09ea07d198 SHA512 d6e988dc4cf3d6a8b9b9034d98349689c3e86fd179b3d598775d00a1eed7161749e1f1829b2a2a4e5e91cd6e179ff496253e22394cb34cdd0115ca5d32dd90a6
 MISC metadata.xml 744 BLAKE2B c3cbea51dafa4c3faa9ad130a2cb493ec87489a574dea464d884b15188c54bd60cb9e6dc30fa8f453bff041d374a3e9ff3f20a78580bdc8fad2bf26b0e3b3c90 SHA512 361401b649e07b2a4d577788d8552fc744271fa8e14e8a53083fa5aeea8a39f183eb6c736c941e10878ef24700a1e2a80201bc36ed646406586835cacdeee1a2
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.13.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.13.0.ebuild
new file mode 100644
index 000000000000..d084d2656c17
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.13.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake-multilib python-any-r1 toolchain-funcs
+
+DESCRIPTION="C++ HTTP/HTTPS server and client library"
+HOMEPAGE="https://github.com/yhirose/cpp-httplib/"
+SRC_URI="https://github.com/yhirose/cpp-httplib/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"  # soversion
+KEYWORDS="~amd64 ~loong ~x86"
+
+IUSE="brotli ssl test zlib"
+REQUIRED_USE="test? ( brotli ssl zlib )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DHTTPLIB_COMPILE=yes
+		-DBUILD_SHARED_LIBS=yes
+		-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no
+		-DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no
+		-DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no
+		-DHTTPLIB_REQUIRE_BROTLI=$(usex brotli)
+		-DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl)
+		-DHTTPLIB_REQUIRE_ZLIB=$(usex zlib)
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake-multilib_src_configure
+}
+
+multilib_src_test() {
+	cp -p -R --reflink=auto "${S}/test" ./test || die
+
+	GTEST_FILTER='-*.*_Online' emake -C test "CXX=$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index e14bb46d1c14..25577a55dc14 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 953d93cc530c..c9709a4757ec 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -16,7 +16,8 @@ DIST php-8.0.29.tar.xz 10803592 BLAKE2B 6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd48
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1 SHA512 437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.1.16.tar.xz 11760948 BLAKE2B ac0d352dae05115197852092b9b3c0b5091528326806c70eb34e0aba6007f718e927e67045d65976cb2104e4737a475b2224d4f05ff89ddf8c3066e0240c38e1 SHA512 4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096 SHA512 d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
-DIST php-8.2.7.tar.xz 12016940 BLAKE2B c80dcdf7b862b25ff1219688ee648938125d52aa8efa6c74b8d08a038222a411851642744872a5684dbaf2c2762f950c0e4190337ef63fb905671361f1418e6a SHA512 8533c0d7b6b0cbca8d01238342edebe1f123b093ab8f3cf5efab40b133989c3288214176b9e2a213b260b07b6bf140711f9b9580c2515a093f586bedc81d8a44
+DIST php-8.1.21.tar.xz 11862320 BLAKE2B 51195859c23a3216247a66f39e76bf4679f0365d390f31c7dee7437f22f45cee4e4f4de8cf42706e030355d9ec66b471d61fafc1b30da2eb65b339d99ace93c7 SHA512 aeb62947e12646a530b6f61efe9350e4a3632d421ee0bec6a1d26dc2fd680c782e12cbad06496f2d4ffcddf5182aa3438c19a59b0d593fc43789271241ec0383
+DIST php-8.2.8.tar.xz 12034856 BLAKE2B c07bec5e9eeb74e611f7480da21b9bd2b2e101bf00fe909a62a52b62c2a44dde5760b151317b3c0d6fb13cc69e3d81397c1b09b46f410e9b935e2fc6bb5b131e SHA512 d1539010761aaa525e286cf012953a097556c61608505a2b1a83f78b40b7a1c3338f494c4cf34abda764c762c4b0bacb09ce9286236d2a356ee61121236b6bcf
 EBUILD php-7.4.33-r4.ebuild 21345 BLAKE2B 07cbf045eb598131ca13920582d0fbfaac23d78c387bb831409ccbfb4e839b79ca4d48b66e287fab01e9ded7d548467629838c6bc52cbc7afd2ab9859ec3e2c3 SHA512 329cec6bf3a0f3fd4e07df911efa6f7b1ac062605dff603a42abc456b6c3720ecb15224e27628a49a736cf05199f91f49100cbb4ddf6ea028cf989dd1cec211e
 EBUILD php-7.4.33-r5.ebuild 21533 BLAKE2B 2246f60ecb54284555e74ac458551729e9a98000c21c5200df2db511e35429c907f0e1a22fa1fccaab2a99215ab8ee40e17c29843d2a703e0e50745b2ed828a2 SHA512 03bb839e682daa74e1a1cca3ae0843ea61e7b57836302e2726710b5ab2dcf11862e52c5b8012dd6178607d7f62343116e75e5e0d243b29631b76e0570faa7456
 EBUILD php-7.4.33-r6.ebuild 21502 BLAKE2B e8e5f58105088783b8ed435f4705ecb3891ad8ea17ecf63c9bac6b911a256f4615964325df7af2d63a925e842a57ee8cf2c7de1fb4bc1d11a2afbf9b5fa086cd SHA512 98f75d9ac14141407a8b8fdbc94bcf06b7b0325a0feb90acde5fbbdbdf669b1e5208f293eb43bc3ba58332f8b5fee29972884e4fbdcd941625cca78b96778bfb
@@ -26,5 +27,6 @@ EBUILD php-8.0.29.ebuild 21852 BLAKE2B e806e3effda0371ddb74cc27fe5c4fce21f095b86
 EBUILD php-8.1.12.ebuild 21815 BLAKE2B c1610ff5a4e439954b228744cd0223a4205dd1b53e6cff7a48535db414b6d20d307ba1b31c96ea6ab60b2ed1f811eb612c80e245b49acdf9659a6f8b2bb94b08 SHA512 73b766c5dec9b7231f1149b279b47e8621e527bbce2e1606bafdf1e6cd3f647ca30b2fcd16e1d9c3160c4a50c464fdeefbd05e1102f9debe7b79abd68fbceb4d
 EBUILD php-8.1.16.ebuild 21818 BLAKE2B 1782dc5c71cef2ac3ca067f4d53fcf64e61850044384dfe9bc0e64a025ab1dcf328a455b2aadbd17dd8c92cc65029337598763e3644f488122cde39a913d3343 SHA512 2215fb5851cfd28ffff620ffe86b0d924f61e9a24ff724fa019be7c788fb7de3c53f23489d21553fd81670887cd463b959f9f9857a53cc872e72f70478e330d9
 EBUILD php-8.1.20-r1.ebuild 21914 BLAKE2B 5c44d372707fb544587f2f854fec25b07d54ffb6faebed85520803da507d56b0177020a938f7589a869098e8327bc24ff328a79384e9c3b793a30c02249bedfe SHA512 1764f5a1b4bc74c2a03df4a7712226412a47d1f23549547f97447714f381110ceae7aa01183e844931a25cc8cf06627f8ed645e27b45878470170c1596042264
-EBUILD php-8.2.7-r1.ebuild 21957 BLAKE2B 3b0d77db4e42d852c92888ea93cf8a7b35344ca9d9e0e80c184edec509e68bb3e6e7ea82234f629b26367e2fd4c173f1c31a44da9e1d603ddf149ab7175fc1aa SHA512 ccb6a15c480874521d510331f5b7a5d375380a5f8275e605cd292aea5e42dfce819c07e775bfaf3aea7d4dc9f2859426815e271653648f34614afbcedd08e353
+EBUILD php-8.1.21.ebuild 21917 BLAKE2B 87783761a2113250800e1999e517319622b6ab82ca7fca86259e61683a567771e7c7b0a269326a341cc26ba0559ccf6c80c71265f5ac1d791f016b30d1f8f314 SHA512 dc1bfef40b29e5a161b500e8f8162c45446c49295b97254cac48e8373410c4df861768f7e06207136dcdeb8cca891ed761f4993624b09390c798d1e01b5c88ed
+EBUILD php-8.2.8.ebuild 21957 BLAKE2B 3b0d77db4e42d852c92888ea93cf8a7b35344ca9d9e0e80c184edec509e68bb3e6e7ea82234f629b26367e2fd4c173f1c31a44da9e1d603ddf149ab7175fc1aa SHA512 ccb6a15c480874521d510331f5b7a5d375380a5f8275e605cd292aea5e42dfce819c07e775bfaf3aea7d4dc9f2859426815e271653648f34614afbcedd08e353
 MISC metadata.xml 4018 BLAKE2B a2413be53cf35069736693b31b2ef8d4277c25c1cb4ea75d949e3a50809e77b9fae2dceeb8a71bcd0ea4c74131cfcaeaefa09ca67f312bd7eb934c2e07156502 SHA512 ba8385d8596d5e71d6b5cc7e225d2afbbed0cde36ea1b49a43efd16c03141d63baa26b440ddfeb39dea04313467077353c5ac6b8b75307bb64ea0c09fe456933
diff --git a/dev-lang/php/php-8.1.21.ebuild b/dev-lang/php/php-8.1.21.ebuild
new file mode 100644
index 000000000000..6fb08e8646fb
--- /dev/null
+++ b/dev-lang/php/php-8.1.21.ebuild
@@ -0,0 +1,759 @@
+# Copyright 1999-2023 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.2.7-r1.ebuild b/dev-lang/php/php-8.2.7-r1.ebuild
deleted file mode 100644
index 11169ef1de48..000000000000
--- a/dev-lang/php/php-8.2.7-r1.ebuild
+++ /dev/null
@@ -1,760 +0,0 @@
-# Copyright 1999-2023 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 +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 ) 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 ) )
-	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
-		--enable-ipv6
-		$(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_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)
-	)
-
-	# 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
-
-	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.8.ebuild b/dev-lang/php/php-8.2.8.ebuild
new file mode 100644
index 000000000000..11169ef1de48
--- /dev/null
+++ b/dev-lang/php/php-8.2.8.ebuild
@@ -0,0 +1,760 @@
+# Copyright 1999-2023 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 +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 ) 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 ) )
+	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
+		--enable-ipv6
+		$(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_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)
+	)
+
+	# 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
+
+	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-libs/Manifest.gz b/dev-libs/Manifest.gz
index 42a3d8d0bc6a..54be88ef00dc 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index a9017813fe18..b6ee04073b84 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -5,5 +5,5 @@ DIST libunistring-1.0.tar.xz 2367800 BLAKE2B 8208fe33d4ac2f015b0efb56b0c7dd87afc
 DIST libunistring-1.1.tar.xz 2397676 BLAKE2B 721adc90884006480055b95d0fa06cd862417aa02b467f1e14688292ad9c11f1e33520b14ed5dc2d2724c6df8713d3af1e8032014259d8355156cb72edfcb983 SHA512 01a4267bbd301ea5c389b17ee918ae5b7d645da8b2c6c6f0f004ff2dead9f8e50cda2c6047358890a5fceadc8820ffc5154879193b9bb8970f3fb1fea1f411d6
 EBUILD libunistring-0.9.10-r1.ebuild 990 BLAKE2B 49c3109d5009ef62c198fe1a8e34ddfbb727145d2806387e82bf8118ccec95ab1e1d001ca0bfa5380b8c01f951d056e3866f6a976b76f85e94a84e7d339048c3 SHA512 ca72e0272a1d82f0ce2d8f85ad2fce45effe814424918a94c686d78179d3f3b9dc213cf85dc9adaf1501006865b6303ff7cc0a10a04986fd479e20e0c0e5b1eb
 EBUILD libunistring-1.0.ebuild 971 BLAKE2B e75f516ec2539588e88c8e5f689f321a9a09711aa286dba7e3a613d7566f756e9be2f0ef9a78c6530cff92b4c096b434c4af1b94cd98307fe2820a399c592430 SHA512 07768d6af0260064e999819da00c6a9eb5a4e2ac31d760b7eccd063e12c254f59172e11169b585dcfb352d0581582b2ba9fc21fc8c716dadfaa27f571a764024
-EBUILD libunistring-1.1-r1.ebuild 1011 BLAKE2B 4cb58909b4873e297cc7dad9102b21b79ab9495dfdf1c3a9434db28bc04cd73283318279545b88155fefb9a319fbe43c5f4f7114f1956f27093682434e3f2527 SHA512 3c126e7fd197ebf2471dae812a9a6e86ace6972edc13329f3abf7168e7d6a153831e1935e54e3f42fcbbd7c15a095c94bce945631a93c52093b11ad9dd58c1dd
+EBUILD libunistring-1.1-r1.ebuild 1009 BLAKE2B ee881c90787c8cdd1bf24567d1e8f5764ce8dd1d8f89a6c1338ce7802a5f7125de876e10df5fd87d9e58a7464ac281b27ca3aee917740f33f5642d7790a054ff SHA512 25c4e91761df0bc8014e5e6bf272e22289d7c21ffdb839045d54e5aac273544aa0965f33e12735da69772bdd9fe242de1a022c3dd03c9a13526966a0922bed6e
 MISC metadata.xml 1118 BLAKE2B f981284f99d5526eb59d8985d7d67096583d8a3bf49bf008ac9902aa32bc9cc77cfadd5d2ab9efa9157384e38c59629d7f4b322f3f85bbe6bf3acec90d67520a SHA512 9a389d92d315a50653438232128a600c5b1671200534efac85fc891cd902e5652897ca9d316c4feedf618d6c7fc825437a2251843ca1ccab7ab6875f9114e0a3
diff --git a/dev-libs/libunistring/libunistring-1.1-r1.ebuild b/dev-libs/libunistring/libunistring-1.1-r1.ebuild
index a0f26cfccf52..1be718fb5bf3 100644
--- a/dev-libs/libunistring/libunistring-1.1-r1.ebuild
+++ b/dev-libs/libunistring/libunistring-1.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )"
 # Check regularly even on "minor" bumps
 SLOT="0/5"
-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="doc static-libs"
 
 PATCHES=(
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index cfe920aaea10..7dd97c699ae8 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index 4884de6fc7e3..f904a252aaf8 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,5 +1,5 @@
 DIST igbinary-3.2.7.tar.gz 248481 BLAKE2B 40936fb78b9f01d717daac78f8b707f902d78714e5202fbb1344042c2d30a3b723f9c5b6fd982f7a5002aab65e414ba7f9bda354fec4db82ba3f03fc09663a43 SHA512 1bdb60fa4ac76ef405b55b4a7e7f07c73ccc945a3fad8635934cf83a05ae554ac1a0b64c4b55229f0bd2a3269189d3266a492b064a0338fdb2bf4dfe5c3733e4
 DIST igbinary-3.2.9.tar.gz 251747 BLAKE2B d44711ffc195572a83a000f225776191e7b421e4be3065a668287f356d46fd11536af0a0969a0fc219c38d027f13aec16cfe41f15ea778ef087f7082daa9b8dc SHA512 2789f8517aaefa4e4e736592944361e8bad1ce50687aed161bb4e17bcdfbfec2320df8069c7b39704fa96c614727bd66fb65185b15f72f8c96bb5fda88f2e66f
 EBUILD igbinary-3.2.7.ebuild 555 BLAKE2B 55ce93a92c908b1a3838cf8742be5135d35ecb8b3678fb20f21066930e0109c6a5ac584d5855b28d3cd66905de855915abd58b4929c3c7b15c7cff81f1b6c3a5 SHA512 39ae60c959d011cd92940fe786a5aee3fa58f47a9fe1b84fb228f5c02fb7b98b86f075db7cec657265fc9a55a0282e9cf0d2d0b652a1964a0046cecc524a34f6
-EBUILD igbinary-3.2.9.ebuild 530 BLAKE2B 3ab47a8f9ffb1dd11db2d33dcd75947d2a9fa6b7175e40a43f780d7021057995eaf095dc5a86be308eb870cbb65122384e6ce3d801bd600aeeabb66f746cacf8 SHA512 fb06dc87dba3c0235ebc733443b434562a013f6338639c359f3076a2fdc5393c59596f83e99e8d7865f4ac06d4e1d25a9506458e92ca77b4c4475fef233e9124
+EBUILD igbinary-3.2.9.ebuild 529 BLAKE2B b56f39fe4ffae592db2c8830145b997ab1e4597e304d09e1ef4b5e2fc165d47f80561996c4615d4a6bac22ccacf988d5a8d5e1d92f3103cc045828c1819894fd SHA512 a80053ee666ab068f72604fb7e951f3f18dbd53c657c288b275e4549eb577a1bf3bf8b68db652b828cb3022da54acfdbf89781842441814537a2032be440d14f
 MISC metadata.xml 332 BLAKE2B dd842052dec2b48669fb7d85ee2637132f64d64d56ac9ece1394222211f3cc1a698e0d5e4dda6d4d5289a4debfe7a44c0c776ec2399d3384874be03278995af2 SHA512 0e2d8ac966bb0f3e40fcf96e0ff93ebd9353a0629129e14f9be2186fe7fc3db8cb5fafc3af795b59005332d66085f1636df62b5454998cb9bd09bfacc1ced0a6
diff --git a/dev-php/igbinary/igbinary-3.2.9.ebuild b/dev-php/igbinary/igbinary-3.2.9.ebuild
index 429b0698f67c..1206f5409a19 100644
--- a/dev-php/igbinary/igbinary-3.2.9.ebuild
+++ b/dev-php/igbinary/igbinary-3.2.9.ebuild
@@ -17,4 +17,4 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c988b5346296..007d8f11cc57 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/fastbencode/Manifest b/dev-python/fastbencode/Manifest
new file mode 100644
index 000000000000..22e00b920a54
--- /dev/null
+++ b/dev-python/fastbencode/Manifest
@@ -0,0 +1,3 @@
+DIST fastbencode-0.2.tar.gz 22580 BLAKE2B 87e14260cf7174ee1b40372879efed7b8fef3302ec0783cf9ebd103e9730c0f415ccd96c2ada944849b7cf63bf2998d2ddc644307619449b29177c680730233b SHA512 4cc62d8ed54fcf1d989e026ad2b4d0c1f4a2fa762d9c2f7da182501af7454f802202c47763b714072009357858a3f93ea6ad9b3e9f80742b749f5014f84e1598
+EBUILD fastbencode-0.2.ebuild 515 BLAKE2B 779c291c5144d093965eaad4f49fb15cd4e0a8e9bc585f4586443443af2c6d85c1cf741a348bec4e362dde7c477c92fd33b9b9b2b593934ff0692256005e4e0f SHA512 5a8a076fed3ce62e08a0f6380ca1512611204fb1214da235849a7c5853aa5a8c3a7c16825e0f318b764f51ded01fc567e0e0dce08e8ef269a8f33b2faa63504d
+MISC metadata.xml 378 BLAKE2B 7e1f98ba9526fccbb5a725843f28115a903ea41f4fa53928cff3799e7389dc79cbe423634f642c5c38c989a52857563389792912e2ae697e92dca8d2ee52fd0f SHA512 225d52d476e400a16f0892a8bfd82c238f3850b0f3353993a5815956d66c86923e123cfefaa04d2b3fe0d96d746f12c910ae9f4d4eeec09d6d443d52f9740ac8
diff --git a/dev-python/fastbencode/fastbencode-0.2.ebuild b/dev-python/fastbencode/fastbencode-0.2.ebuild
new file mode 100644
index 000000000000..33b5303ae6ab
--- /dev/null
+++ b/dev-python/fastbencode/fastbencode-0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Implementation of bencode with optional fast C extensions"
+HOMEPAGE="
+	https://github.com/breezy-team/fastbencode
+	https://pypi.org/project/fastbencode/
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/fastbencode/metadata.xml b/dev-python/fastbencode/metadata.xml
new file mode 100644
index 000000000000..a626371679bf
--- /dev/null
+++ b/dev-python/fastbencode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">fastbencode</remote-id>
+		<remote-id type="github">breezy-team/fastbencode</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 20b276120bde..89658f2288cf 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,13 +1,17 @@
 DIST SQLAlchemy-1.4.48.tar.gz 8448993 BLAKE2B 02c5457e099a0f0bb0e5427a95d3ea35d504d0b5f1d10003b59c8dc76f92ea7b4720512d934fae64b12d95c5de5230139f3af9f5bd6e372fc07228b432995bd9 SHA512 f948e79c92889f2462b117ca49ccb8e82d5f8da0027c65488a3f6c64a802dc0bca96cc84c4e77bb3b8d434dfd66b621ef4d69c5d417ad781d1dc7136bcf6dea1
+DIST SQLAlchemy-1.4.49.tar.gz 8536601 BLAKE2B 2133723380b157a76f4af6103a2c68099f78d7a49ad90793d682bd6015d61a06a72ba6f02922111b60716e311ddc2f6067153f7b4b1f80329775e0d6f27a0d92 SHA512 268751b09aebd9da10fd57b4b987fa57f3c61d18d5104bb308e405aa034c74e7d5441abd94368857fbe11b8d15bb5315634f64f3b1252e7318d24107ba1fe3ff
 DIST SQLAlchemy-2.0.12.tar.gz 9264506 BLAKE2B 83a3aa719e2809b5b48ef5332cf6cbc0e973089dad142dbbe952d14b2e4f3e5a1cf67c7a7240017fbddfafe1c57d6acb974d9c61e72970d8a8c49b7a57f52a91 SHA512 0e4bbc7d4729b2667ca1e8a0c88293e44698346415e3742ad3c686495c9855b5714dab161590605d5ee60523a2544f590f67ac7d01f7f2756ddc7156688db902
 DIST SQLAlchemy-2.0.13.tar.gz 9286442 BLAKE2B 3d2c06d7c89db1d5c5c13366cfc818720f8db0c1e26684c8de5856fd2cedf8c307f8653817eb080526b1da17bcfbd1163f1066226881ef47a553f5662e1989c2 SHA512 b560dedfaa1c2d854feddcb7ac343b184603db8143db8ec9551180fb5345ec793bc74211c838dd15cb45feba970d64f53daaeffe7d5bfa8c6c534742f6aa8453
 DIST SQLAlchemy-2.0.15.tar.gz 9296612 BLAKE2B 45abdb9010b854e52762d9c84a471e92ece2b212620a74d161b19ef7c6bce3d9ad39b3075c4f32749774884e3ffe255f82028dd6a6375e269d2827cbf18c35e7 SHA512 a1b9301f4a81428ac36b9280840a27433fcfb97dec2a04888e6e53cc33104c82972147e2b840a929e05af0edb47ee496a7ed5171201332aad374ce64baef414d
 DIST SQLAlchemy-2.0.16.tar.gz 9381438 BLAKE2B 8999ab045d799c43de1b386d594022a8015fba4d69b3c910622e34b83ea7514b9cb97ab4f65997813eca058eff2a285ecc6cdd09396edf27a216fe412387ba7b SHA512 f0d5287ba6cee97316d6de7cf1c893dd749459d912872d903833abf905b6c282fa477910fa5eb11b5ba803314e16c3f1a9ac6b7639573c4c44ff921ea56132da
 DIST SQLAlchemy-2.0.17.tar.gz 9394733 BLAKE2B d6237b4bc5f7c3e0ba615161ee112f520b87102d7f498ab0db9bf30287fc131111c04910f1d00b059b277be5626af62f64f01101486c2eb31258c75ed4411db6 SHA512 be45d1283fc446c7ed886d87d9225711b8f0125e8de6961b365930515246e94c3943fd85d078056c942508a9785731bf280519e04b0c00d936e93d3b9b6c137f
+DIST SQLAlchemy-2.0.18.tar.gz 9417280 BLAKE2B 0f67e993c91cbf5fb2b5c9481e531830c24f69cb583ab0045b844048e92e57c2a9d826f098b792c0dfc807236fcb422fb800d201473e75fafc1190282d7c27f1 SHA512 4665994e4dc07b5ba0e0549cf80c0cc542c87609c74dce1e5523d4d6bfd5e1be5c7b62562e151c864a2e2a836cceb8374e804871937c738e54a1aa17297732ce
 EBUILD sqlalchemy-1.4.48.ebuild 3011 BLAKE2B 927f8ccd0d4d29014dc78e5edf9a12c55f68f368facb6da3bbb44bf16ff7f8b17f379638fa45f42fb69cf9662a67ff88b76830e009ec3574f278d4bd64b1207e SHA512 8323e28bcb86267ec2e6914324238ec0f5640f2434cdd1bb7bde8986d837e53ae42d5dcff1c58cfae30e9064c8b436db53847b8103f121fff2f02271738a5eb4
+EBUILD sqlalchemy-1.4.49.ebuild 3020 BLAKE2B 8783c87e60a34a79774eeabff726e6f418df45318ce5e861916b438b91a74d44a911387da6d1d260bd6c41d2ed15b894465f005e17833b88206843d6dffea350 SHA512 1d0c566bece92cb03b2880d50f883bf3973a401f035fbc396b2281eb9aa141c021dbd093c4dd704fb2538c2598aa17c81fff8aa4f8d55ee43b53439c09ae69e5
 EBUILD sqlalchemy-2.0.12.ebuild 4279 BLAKE2B 918997ed54427c9eb4c4e93c134ab1c3d0a9aacfa812fe78f3d05d7697ffedf344610a69c1fe2b1775ec4d661ac320962937a02ee4795670324d6eed34ba5405 SHA512 cb5e3da91d49320229f34208157a3762d5a9a6ed96402b44191e5e9f2eaebec69b71be51e25489fd30ed2931aa9d1e326813c0420b71728403fb8a56f4a9c003
 EBUILD sqlalchemy-2.0.13.ebuild 4287 BLAKE2B 72aa9fc5fcb5eb120d1c472f4907d0f0c0f7ffe2cf6d5f0e598bafc90c9e83bb55abd47a86f6b50009ca77eedab3a82b7c450e3dbd2e193f733556ff5f4df561 SHA512 c401a9d73fe819cadc5827793bd9bb36cee3052c89ef8fb8b2fc20eaf1ca1179c621e6a24a43d8db01654e2e583cdcc58cac767ea8b182093b2641d59aec7fae
 EBUILD sqlalchemy-2.0.15.ebuild 4475 BLAKE2B 2018e5987224c426cd7a8ec81a90ed40836f05c12d1e54d79e2c2c1ab75832002aec2cf71a58935e0f7816e692005b596d86280700759bf497328c149cff9cd7 SHA512 be643fe239f2ebe8b6395f3989059a5f60a2393d4df7b1bf3804adfb5b3d87fcd959d6d4fb74e0fc462f1b7e24ff727aa6a724586af132cd82deec32a429cc00
 EBUILD sqlalchemy-2.0.16.ebuild 4482 BLAKE2B 0e443c9855ceaaffcca0047b564e3132e81de4f6208bb04908800c3afd869664e7d477e9072d0fbf5250247384b4eb058b9e32344430bfa0fbe05047ce035997 SHA512 42c2e19ab2a32cfce62eafcf7092a7ca7945faa682571e55519dd7b4009ca9edbc9562ee8995be19b820535fbe87372345146fff98fa11b3505a9a561d16bded
 EBUILD sqlalchemy-2.0.17.ebuild 4482 BLAKE2B 0e443c9855ceaaffcca0047b564e3132e81de4f6208bb04908800c3afd869664e7d477e9072d0fbf5250247384b4eb058b9e32344430bfa0fbe05047ce035997 SHA512 42c2e19ab2a32cfce62eafcf7092a7ca7945faa682571e55519dd7b4009ca9edbc9562ee8995be19b820535fbe87372345146fff98fa11b3505a9a561d16bded
+EBUILD sqlalchemy-2.0.18.ebuild 4509 BLAKE2B 8537f110cbc6958ea1756d0b0e44288b9a31db296487c998bf815e2711677e7864920c0fd05ada8883613307afbb81e7df3ea02e6e3b62bdd4d142a81a07c94d SHA512 55b12e61d8863597c1c94d7173bb36ab8c01fe3d2aa75352166c256ffb13105ccd264e09cadb6c0504a4ada9348dc1d1a3966bca3dc62b044ae381e1a37af885
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.49.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.49.ebuild
new file mode 100644
index 000000000000..fa757af7a61b
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.49.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..11} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature pypi
+
+MY_PN="SQLAlchemy"
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
+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"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+	)
+	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+		# https://github.com/sqlalchemy/sqlalchemy/issues/8762
+		test/orm/test_query.py::YieldTest_sqlite+pysqlite_${sqlite_version//./_}::test_yield_per_close_on_interrupted_iteration_legacy
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	# note that we can't use xdist because it causes nodes to randomly
+	# crash on init
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.18.ebuild
new file mode 100644
index 000000000000..8a0e1b74df5a
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.18.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature pypi
+
+MY_PN="SQLAlchemy"
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
+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"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		test/ext/mypy/test_mypy_plugin_py3k.py
+		test/typing/test_mypy.py
+		# hardcode call counts specific to Python versions
+		test/aaa_profiling
+	)
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+		# TODO
+		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
+		test/sql/test_resultset.py::CursorResultTest_sqlite+pysqlite_3_41_0::test_pickle_rows_other_process
+	)
+	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
+		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
+		test/engine/test_pool.py::QueuePoolTest::test_recycle_pool_no_race
+		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
+		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
+		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
+		"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
+		"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
+		test/base/test_utils.py::ImmutableDictTest::test_pep584
+	)
+	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
+		# see https://github.com/sqlalchemy/sqlalchemy/issues/9819
+		test/base/test_result.py::ResultTupleTest::test_slices_arent_in_mappings
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	# note that we can't use xdist because it causes nodes to randomly
+	# crash on init
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 43a254d4b105..984118321b5a 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 325b732c4b07..bcba7875369b 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,5 +1,5 @@
 DIST rdoc-6.4.0.tar.gz 755741 BLAKE2B d2519dc0dac3fac32ef7cac8c87dba1a679f0b09dc5858e91899d6d28195cf584fe3eba802bafad400ae26c5ddcb65eaec32e101f9e047f80cecd1616a386ed3 SHA512 6c6a89245ac77abdeedee70327f97f8a9b8bb596c14848a95487ff19039864dd7a5c0f5b501fe2e7b187c671cfb205c1500359c7c203beb89211addaf3ac34f7
 DIST rdoc-6.5.0.tar.gz 762645 BLAKE2B cecade491f0d18b2c50ec710cb27a28b6cb946f321503e0508e8d4802e93033a78867346eb1d68ca56884ea0d68d51d6fdb92eb61fa63034a01332e8b572dbcf SHA512 10382e66ca778f85f236614fe071b2b0d598065d3aab8f5a89cb0839da7713b5e16a66e3f7a2bff2e2125d26a42f088a86c6d339dc36479a943bb7023c1cad0c
 EBUILD rdoc-6.4.0.ebuild 2697 BLAKE2B f9b35a125df8033e62de26b10a71eff097eddac0699ed30536ba449db26016741a86185e40dd797f7a63e73dbf721d9fda1a3de2f69520df86409e1529eb7dfa SHA512 e6a6980a961a72811424146f4f995241745ab5c0ff4bd3cea59b41909ebaa0362da1532fb5370398ab0ddedd9e7b51b27c5920ac39ce7b7f165eee926a0dadb5
-EBUILD rdoc-6.5.0.ebuild 2734 BLAKE2B 8e50aaa65c504c99c9e5b16b4892b655118f408a3571fb3a0e73060242be7eba32cacbaae921421504895448bcab22654e4343f0ac65cba96107117862468a3c SHA512 c57a38a1357e5b30362c1ae6879ef4ca9e958b15cfaf06d33dd373b91d6b447e852e002f3baa1679972df26cd052b91f22f844fc402c820db7d62c6494826a56
+EBUILD rdoc-6.5.0.ebuild 2733 BLAKE2B 514fc870c322cb0d5b04969a01d23235a9328676d13300074c725c85a83622cb1f181ab0ef8643faea9c72703ca0c1c252d0b599c18369ea74d9bafcc64ee522 SHA512 8a8d36bf1dea2cd7560484e24aac3b7dbcae080629e2213bde689de7c24b4ce713ebb3ee4fccda5621987169988668eb8f178a1895d9d7ec95b62aa8512121db
 MISC metadata.xml 336 BLAKE2B 142894745c624081f44dfccc6509273287120a43ceb8d7471634d92ab970bbc7747ce12b3a770b085c8c55a30f2c52ee34e0f27ba4be804ee2056150fb3b035f SHA512 438973812b1541e96ffd4add9422bd19e2c09f3f5b8ddc3ef86a670827c6bce9ed9c1bf9df0601927c959584b63a9d0986d0377807856ab8301fc8a8176922e1
diff --git a/dev-ruby/rdoc/rdoc-6.5.0.ebuild b/dev-ruby/rdoc/rdoc-6.5.0.ebuild
index decf00a04b20..c28db569dda5 100644
--- a/dev-ruby/rdoc/rdoc-6.5.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.5.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
 SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~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 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index c022870066b9..8b3f5679ced1 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/breezy/Manifest b/dev-vcs/breezy/Manifest
index 707b32217e5c..5358ebd9b1ef 100644
--- a/dev-vcs/breezy/Manifest
+++ b/dev-vcs/breezy/Manifest
@@ -1,3 +1,41 @@
+DIST aho-corasick-1.0.2.crate 167694 BLAKE2B fa5323cbe6cb73594dfa4c327c64676bc1e006dadc0b9def325974c83b9a769beba02d59a4657ec7a2d0cc511a7b7cc6f72cf57b8f9e639206d1c2bf13107a52 SHA512 5c75451f96fbbd670e6af0e1f54df2bdb57259dfe6898495ac46a5b2fc04f316a4698fd5cfd4ec31a94c298661937a8de08ce97cab3890fb3c015e4a2a67bb7b
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST breezy-3.2.1.tar.gz 9445046 BLAKE2B 67de39c93351d2f78b1b64764a6ad11f26bd31c9bb2d73ef65f8722764d7db8c574f0e116f77dca1b93a53a360f984fb2861f94e0e7f41ce97ad0f703332e25e SHA512 bfbbff1301f7cc13a2d59b1add80c196f3b45b69994194dcae96c0be151f807c965854047c86e43f54dd8c7aa24d56b25afdd00f0063e83b362a8c46d5858226
+DIST breezy-3.3.0.tar.gz 11386758 BLAKE2B 2244f4f5bbe8c0d782e686c946e1891a4048099535e405370162dc6e5517dc59fbee3e6250b05a3333747fa2947328c9627ac612adbaa22469e43f3786d0b45b SHA512 be45eb602b7c474166f6f427e1aca5ead1856e9ca5949aa619af66df59f881bf024bd71e11af41b4a79defe9af4ed91ab2497f5f2057a000ca3f946039325af9
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST indoc-0.3.6.crate 9663 BLAKE2B ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2 SHA512 e900aa3b001df0fdbf1f543d8b679af317e85a1f95e26fc556213f2826a4f6c82d8c4f3f82de435e3591f8bc14e78eb22668d901dcbe2287f46740e0291afacd
+DIST indoc-impl-0.3.6.crate 7933 BLAKE2B 93e232e360e8f02943ef9a9cabf16bc863d792d8096b8d9a13a07f0b7b396db590abf83b5444f082317059dad7578ffae974dbc8a7e56fbdbab817b7d2534725 SHA512 18406587ee56a09dd2062cee456af697efa903343de42c0ff618a64ddf2bf7efed5da02e7220fed2636c555a6ae18059018f5c3c9b44ba8d3e5a34ea5b53c806
+DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
+DIST lock_api-0.4.10.crate 26713 BLAKE2B 113adf8554c65e9782e8fd0360d0398567dfbfddb1fea4928cc152fbab98dbe086e42b81170f6f5c333d61dd3261e8a1ebfbaed786e6bf6378e6afde6d7f9e5c SHA512 ffe8cad8099bc382832181c1ff95e0935993491f247114604201be7d4ddf8402fd4db8fd6499c611f95fbce7d57dc3d3738eddfab31c52f50ab8709e549697db
+DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
+DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
+DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
+DIST parking_lot_core-0.8.6.crate 32567 BLAKE2B 9943244f813879ab85eae0b9a6bd8f8f0070fe190bc43148a832b217ad546bc97e58707a3987072965a79ae8bc2fa839aebac272f2de00993b8ac1ca0c5fc5ef SHA512 906241f8e2d71784d572fb78978c9550b19af9c4e32fe3b2da751287806d0faeba61f5bd36f7aab026970b2bffaaa1f62ddc10c64dc348eae61bf7b51297ef80
+DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad SHA512 a4d9c75f6f358d6c86eb0a66cdf22eedec180db37358ca2870a992e215d5b389b7991837d8f2769742ac1b093674cb4352ef9d6754a249253472fbcb3a81c001
+DIST paste-impl-0.1.18.crate 9451 BLAKE2B e465c4c7eef44d02eb1b61b5290090513607b452f4adc11487947b7047ddc44905d7a02df827feb2142f0e74583afdd9648c1c66086f10e1bd861b663200bf8c SHA512 c635efee46cb251b76ee9427432f81a0d944cdf1d0a95693d824c6085e7dea7e1e3f48c692ae27946f69e4e78d8080220058acf98e5c8a78482007349f8a7a4b
+DIST pkg-version-1.0.0.crate 3847 BLAKE2B e1abdeb37a34d2021b78a3cc054671d47b7ffaf3e48cd7200ac7c95255b268540cee82715a2e060c8889f0b3b6eafc626f242ea33555bf23dcd703e26faa24fa SHA512 104170dc128e4b35fc5913d3e1bf2241285009975c4e8cb5cdeb0c43aa7538b475a4f6f82a0b622b79875baec0a3ac59368d14d08d4188013a10446169f13ca0
+DIST pkg-version-impl-0.1.1.crate 1403 BLAKE2B 2353001e9307e3edfa5345d5c6c6608f64302592b49c647e25993cdd1f2cab121ee13df8324e93535ed1a3878ccc883dd1c2f8477ef6b83ab8617ed95e6958c5 SHA512 da1177a213534f9aae559e1a02e0c7c86eba79a6348a72ae93653ad858eda2d056934104c12ce1247f7a17af8e6c36ef1cdd953f6d2d501961a9fda1df63c702
+DIST proc-macro-hack-0.5.20+deprecated.crate 15045 BLAKE2B fb7b9fa57ad64f2920e801482bfccc762bb7b2c8c1db7da32f393c7b47414fab37234c8a408a4ca9d7072a541df22b07775fc509f76f352fb6be9fe822f84dfd SHA512 278e786f8e0c93e346de900666b3d55d366324167a2e5e553565870c4444bfe661cf8c151a29cbd3176a4905ec49d69cffb81ae1e4a129f30404f930972c4b43
+DIST proc-macro2-1.0.63.crate 44867 BLAKE2B 54fc0f4f4e328c78609f5c0e26a8e6b1e5f1ad989d68e63d21e094bc20e1be6950d5df98ffb601c89bd3d137f6c05a3d1de74070e493002e793bf159b96f29de SHA512 3855011d0d42e8fe591e7552d224b692d79b194c4452fe9d8f92ed85e5437c0a3524a38e66301412be482cfcfbd468b071a03cf584a1618284dfcdcac9713102
+DIST pyo3-0.15.2.crate 371382 BLAKE2B 79b813eca0818bf79e0e1c118c952219f16f1fe22a0ab1aaaac0499a5048ebbc27326bdd2d96054e410ef116866250464aa4e4d8e91bb733f915f77536bf0f05 SHA512 81595bf2b5d2b3a4e79750f0779c142fe7c3e7185f9ffa68a83fce30062ae6812d7af71bee425206552c95839ad7473408f658ff936d4a1f58fd1ac922822582
+DIST pyo3-build-config-0.15.2.crate 22235 BLAKE2B 35355ee30242b7e95426920e7f108fd7f32aa86f2949bb388139ed84ac0a8da2adbc05a5ecaf3beb89525d0c7a4e25ca8e33e9f35e324cbd970f6b4dbe5fbfdf SHA512 e05e68bc54bc7287d3fb037251767dcbcb512e3cae29948507deb7e0ca18ec4d7fd5d598f1dca1a595b6edcd5395fb443189fe56724e67ef68422bf050b10324
+DIST pyo3-macros-0.15.2.crate 7596 BLAKE2B f8ab6ba53354705617ad88a2db693e38596d563f14e5481141b913595f367cf43fdb438c077c89b22a60fb0cccba7d67e79f9528af25c626ec7d8ba2c2ae3825 SHA512 4a40fae4362aa811996d9ff94ff7bfb645396eccffe13fbfc1fff70ada80db56f1a03630cadffca4ff6e156f04c052e82e059d72541d720abbf0ab18f2a7057e
+DIST pyo3-macros-backend-0.15.2.crate 46112 BLAKE2B f3efd72d375f709efca7366f702837222b3bde498a89750a9184437ac495cab031f12f83a062329ea3907e264ec0782523656e15cbe3eb03bc0535fe438a3e4d SHA512 5c3be99d863764376c3f66de304de8b36548cd99fae8ac40c548b3d467b6bdfcd683c53b4cd1aba26b1730c6b9214c36b1723a5d1299265734e67ea791918c82
+DIST quote-1.0.28.crate 28382 BLAKE2B 9fb16c3bb2a7fec3d8138ffec1f58277061f4a643c9051e1f6525f9e347ed9de41a3797eb3140a6dd828526eb4114c1f7ca562151dc933f338d64b175ed35d9f SHA512 846d718153f78cbae6dc714caa9413a5d5964bcc5e032f5c6c5356c62c33bf22635955ebdff0dede69ba1c9657387e65d61de7c537f6f56f8060721dfa52d735
+DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
+DIST regex-1.8.4.crate 249562 BLAKE2B ad6d1221412beb65eb760ae905d4becc5583ae4d030c67b061626afdd3d4389c24123000688039fc6c8c1d091ff307b4a46f4b0eb84f1c258d0612c51aa2627d SHA512 6fa873671bc188906334202027fdd4d15923fcea88aa85d56a63e3a36bcf6aa77ae61c596f9154dee6c69e03bf3f3441e4ce26304d5a8e0ac47d710bf7af4a5a
+DIST regex-syntax-0.7.2.crate 339778 BLAKE2B 0b9533e4e4bfae1304a7ab5e2c8bc0bc3038367dbcab7bc19e680bc4945146f1eca3baa1c5bbff6ac60447b54059228a5790cad20ae33f16b9dab794a5f76140 SHA512 3065cec128ae6ce427d13b68066fc02357c21f7d1517c1669295f857395eea3297344fb2171c96d15dfe48050785249b7b8b8138fbe5b4a65c8427968347c128
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
+DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
+DIST unicode-ident-1.0.9.crate 41978 BLAKE2B 4e78cefb4e7d7f173f1826a5ab6c8ffde386fea67cf3227bd22e6a6e65d3348dc53c9438e6bde9af06fb5e04b0beac866209d2426e7f04cd10b2435db85df7e3 SHA512 4d8cffe699c6f15ee82ab5f5a73421a6bb8b1a476237aefefa6e932c45c30683a4fb015f138bce99d7cb27a27fb7972909c828e77daef091da84ec162315625a
+DIST unindent-0.1.11.crate 7700 BLAKE2B d4d1dde410c4194acb51f74f374cf11fa872e49fad8f5f24b596d72476403e5e312fedf7b0bcb1027384d53c8de565368d63c30eaf70a6e6cd958b82e5288ca3 SHA512 f800d6c37fe72477908c91457a738a73d2b8085bb5ae303d6d954405d6ccd98833b5da16a12c3ad1ab75d32a68dedc706dfaacc0fcbb95571dd829cdc03a356a
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD breezy-3.2.1-r1.ebuild 2966 BLAKE2B 78d2f6417f87a11bf83b2d2f7998163099180355bd1fa14716367478c7ed516d81e6e34440cd530b7630cf33d7e8212e621d101dee16262de44ec1c796bfdc68 SHA512 de45c3026453c4672e85c75e3f72ad77da05e5def0681e4b8637ae1ad9c2237384eba5e784d07295a068541c2606f18ff3c3c8506e376649bf51b2aeebd4f325
+EBUILD breezy-3.3.0.ebuild 2269 BLAKE2B 59b2a30ae4096af4844f802b58804189c3d185450b820ea439ea6c4e4e281d51b1a262a0a6aa3b49771f6d63f5eb943cdc7fa0837eefe70cea6e63f6373379eb SHA512 08b611ed60a3a2294818d12f0a46f3330f5094d5016ee5a90565a7cd5244ebaa01ab964f5ed6b4887bcd63dc127df035e4b300a90e6972c256e1cb591076f55c
 MISC metadata.xml 424 BLAKE2B 485d8ba011693c021b649e37c76ea715b5a64b3356b7acd30abf841782ced63261cb34a254bf82e282c5e4ac8fd9550fd8d68504b35b4d540482c33ee4d50c83 SHA512 6ae1b97af9d955eae016ea7c9c87f7fe3fa80a6a3c8cfed4a962b6974eaaa14f0a02c4846ba387b4dc7d643c134e9d17526ff5b275c3f7e46a098204505bfc3b
diff --git a/dev-vcs/breezy/breezy-3.3.0.ebuild b/dev-vcs/breezy/breezy-3.3.0.ebuild
new file mode 100644
index 000000000000..305f328287e7
--- /dev/null
+++ b/dev-vcs/breezy/breezy-3.3.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+CRATES="
+	aho-corasick@1.0.2
+	autocfg@1.1.0
+	bitflags@1.3.2
+	cfg-if@1.0.0
+	indoc@0.3.6
+	indoc-impl@0.3.6
+	instant@0.1.12
+	lazy_static@1.4.0
+	libc@0.2.147
+	lock_api@0.4.10
+	memchr@2.5.0
+	once_cell@1.18.0
+	parking_lot@0.11.2
+	parking_lot_core@0.8.6
+	paste@0.1.18
+	paste-impl@0.1.18
+	pkg-version@1.0.0
+	pkg-version-impl@0.1.1
+	proc-macro-hack@0.5.20+deprecated
+	proc-macro2@1.0.63
+	pyo3@0.15.2
+	pyo3-build-config@0.15.2
+	pyo3-macros@0.15.2
+	pyo3-macros-backend@0.15.2
+	quote@1.0.28
+	redox_syscall@0.2.16
+	regex@1.8.4
+	regex-syntax@0.7.2
+	scopeguard@1.1.0
+	smallvec@1.10.0
+	syn@1.0.109
+	unicode-ident@1.0.9
+	unindent@0.1.11
+	winapi@0.3.9
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-x86_64-pc-windows-gnu@0.4.0
+"
+
+inherit cargo distutils-r1 optfeature
+
+DESCRIPTION="Distributed Version Control System with a Friendly UI"
+HOMEPAGE="https://www.breezy-vcs.org/ https://github.com/breezy-team/breezy"
+SRC_URI="https://launchpad.net/brz/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz
+		${CARGO_CRATE_URIS}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# I've got tired of all the test failures. It definitely mostly works.
+# We have ~29000 tests successfully passing from ~30000 tests.
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/configobj[${PYTHON_USEDEP}]
+		dev-python/dulwich[${PYTHON_USEDEP}]
+		dev-python/fastimport[${PYTHON_USEDEP}]
+		dev-python/patiencediff[${PYTHON_USEDEP}]
+		dev-python/fastbencode[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	')
+	!dev-vcs/bzr
+"
+BDEPEND="
+	sys-devel/gettext
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	')
+"
+
+QA_FLAGS_IGNORED=".*"
+
+src_prepare() {
+	sed -e 's@man/man1@share/&@' -i setup.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# Symlink original bzr's bin names to new names
+	dosym brz /usr/bin/bzr
+}
+
+pkg_postinst() {
+	optfeature "access branches over sftp" "dev-python/pycryptodome dev-python/paramiko"
+	optfeature "PGP sign and verify commits" "app-crypt/gpgme[python]"
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index efa3d60c3aab..035a5c17affb 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index f59ab3d8e908..905b914329f0 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -4,10 +4,10 @@ DIST wlroots-0.14.1.tar.gz 505840 BLAKE2B fca4d259cdde62da0c196344ce1d0f5dd679d0
 DIST wlroots-0.15.1.tar.gz 565816 BLAKE2B 09b704a55d8b4a5ab19bb0fcdd041635fbbbb8eed94ff6d189ef47f9f86e90178efa8441c7db78839b1145ed79ed016d520d6599e256cdcf49130cda38bc307d SHA512 6228160f2f350a406c612f1048d7075cf2f78206cc84bc16f889d5d0acd614f9e98845fffed03d7067cfdbd7558b77fcc5d8cedc3868d866e476523126a63677
 DIST wlroots-0.16.2.tar.gz 589804 BLAKE2B 49911556f1442b43b46e3ec7750706cabeeab915bc36b178b92dec7b66743f4c2f0e335c6e26e318a25ceda41170b20913987a94a3c516df580d379305df7cc2 SHA512 3c1d4fecb3b751987e7051e69849fd62bd4eed95f2d2e548f06e42e4829d0fc24f20c1bfe056a53ede2d1fd05e0c566269a7b9f2bab0de0057a32b55e826a7c0
 EBUILD wlroots-0.14.0-r2.ebuild 1481 BLAKE2B f350d6bbaf05a349cb9ee5ac67cea0c29b1e737b7fdb819ab4fee051311e48c5a448e3d2f2690f9c6effcedde2fc940779fa409ba7ba03acf099b5e4961f7e19 SHA512 4f50dfcfa7fd7cc1e5c5653f9b79da8fdda49994f2a385c145a272bf1d9227d6c5b5a13bd7f4c381036343c9b7f65c6b322b2a3bc188ea39ab427c7d1a424c81
-EBUILD wlroots-0.14.1-r1.ebuild 1482 BLAKE2B ca24b52f27d39c3c382959caac6dcf6dda5eab089db4026700a4a6c4b17b9e1396b1f4f00c08bb79a5dfc94783952a0e0728ec925d0ab35898cb71f682bfd82e SHA512 0c09cc16a457b1080614e39e4377c7a5b35413a0c34b06fb6d4c95732cdcf963c2ba5bdcf55a4c9ad25f8b04389f4ae05d1afa9f01fea21bb6dbacc40f470032
-EBUILD wlroots-0.15.1-r1.ebuild 1901 BLAKE2B fb65e31e0ebfa3d9db534ecfa9eea14c2e9c75cb8b4deb15a1e4df0d2f0753aee1ff6da1dca9f7709df3973fb5ae1faa6a4dd9476d212055af4aaaa8f6d07a68 SHA512 617e629d8e1706f01a5fbb46b3ab7fedf9071b257e9f18d45db9b9e5f9ddfee151d9ddb19dbc8b774e79fc06a836589d1c05ef2d595156ef902e96b4524241ae
+EBUILD wlroots-0.14.1-r1.ebuild 1481 BLAKE2B e79076408407f98ddd69d2a3c34c4029ef6a11b90b5e0a51f25507898821d09b4333b23cbcb58bc96c763520202c8f70aabe754c8502298b22bac856de6e7fa8 SHA512 a684c1b7df82e16150ee28ee8f45e0301ac033fb4fa70c4d038cdafb04d068a0a2d5ad012e45270ae53075d1e604e04ec9130eafd428b0bf164227074a67a184
+EBUILD wlroots-0.15.1-r1.ebuild 1900 BLAKE2B ba17f3046d031a012b565a9888437c2889b0875ab26437d024385f4dfbf462a5309ee0b82918fbfc8d61cf22fa727b27c2c5543beaf3a5debd909b44ebce0418 SHA512 be4ccec158c87c9b7d4dfb6f36813b05d590c72dad3f746effb3e0c4c808d66465130b1541cfa267068523818965682949c88a5b4b272cf16ea39e2cb876a227
 EBUILD wlroots-0.15.1.ebuild 1694 BLAKE2B 6612ccfa47cb13280a788b766b8c986c37f8ed256808e54068709e84e629e7618ecda9624faea2ac63878f232996c47a8f36a4ae760d7747cd7c918ed0667d90 SHA512 fbb4123948bc0d9f69bfd8d9c3990aa21e648b5e1a7018aa6c4bcc6bf6aa0982bf8ff5aea6df9ea460f29ba48646687747457ec3d146808a3f0ac2b8b667f374
-EBUILD wlroots-0.16.2-r1.ebuild 2081 BLAKE2B 9fdbc59b410148ceb684249dca0543a1c426f8526b3f21f7b9aec03ae5f82de0c2de9a7419b52fdfdcad45d523b494cebf1c9dff9be1a96de4d44c44009d8ea7 SHA512 74d32c32905d082a276a042b9f4bc1661967782890eb247e839f424720677d25082ec76d7bbee9200aa887fb04ffafbb5f333eb7ef393f700a6209c1dc97de29
+EBUILD wlroots-0.16.2-r1.ebuild 2080 BLAKE2B 2bd6340eee226b987ec98bfd6cdc5ef86af2312eef3ffec1ed340fff7792555e535921a4c845d9363112cfa738c493ebc0a4d0949c6334154f0a9ebbba607fd0 SHA512 ac1a674059e1a0a20d3594eaadf533f795a29c9d65dd8ac0ebac8f9fd8337d778d7d0b9b33bca004b310cb0de1a3dc16944f9fa2bcc8e6a2025db07011e9d0ab
 EBUILD wlroots-0.16.2.ebuild 1867 BLAKE2B 92acbbdf1ea682a26c2db9cec4b912da340b38bb46934c421aa70d85252532f803d3d43825f893e6b3c1d62512d42566562d3438c6a40ff59904c2d362410380 SHA512 d21c7af4bba4dbfed53c29e8b59338eb4aa4c8a8348ba46c758ab2f179ad79fa3cc481f5f18c547c35be1f311938db3dae0c590e4afdebd8ad9e517cba1562b7
 EBUILD wlroots-9999.ebuild 2323 BLAKE2B 9522808721afea836626f0b848446d34e1b2e4a10cee2eac63a8425ee23f9ce5354b91b606fc48be95f102705e0fe82efb1a20cab3a3c0b86db21bdffa8be65d SHA512 52d6ac37ede3270d10b7c9594146763d1070e8f432fb2bc43d39c666d9552d41a86b0a0b559b7f44532e9e64af0e700d8aa0e3705f8a3e12c543a07ac43b87cf
 MISC metadata.xml 2002 BLAKE2B 4c23df888cb9dd4027bc8b208a9b2237932e88de27eaf2b3a70f5f94ae127d878ad7c6f3e9c0ee3d06d869ad1cd8ec58604ce711240a0b49665456926d7de49f SHA512 ce92c7cfb9ecf65a61fccc54c3907bd6a59b8c53f7f9eb550d77b43e14db5fe513833ddc346ceacaef563f919aba8ebe386dbeb24128ae3364ed753734a3db1a
diff --git a/gui-libs/wlroots/wlroots-0.14.1-r1.ebuild b/gui-libs/wlroots/wlroots-0.14.1-r1.ebuild
index fcdaa479d4fd..fd974c5504f4 100644
--- a/gui-libs/wlroots/wlroots-0.14.1-r1.ebuild
+++ b/gui-libs/wlroots/wlroots-0.14.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 	SLOT="0/14"
 fi
 
diff --git a/gui-libs/wlroots/wlroots-0.15.1-r1.ebuild b/gui-libs/wlroots/wlroots-0.15.1-r1.ebuild
index 375e2e5446a5..b95b11bd48f8 100644
--- a/gui-libs/wlroots/wlroots-0.15.1-r1.ebuild
+++ b/gui-libs/wlroots/wlroots-0.15.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 	SLOT="0/$(ver_cut 2)"
 fi
 
diff --git a/gui-libs/wlroots/wlroots-0.16.2-r1.ebuild b/gui-libs/wlroots/wlroots-0.16.2-r1.ebuild
index 11c4fb2cf02a..f761a7dd0540 100644
--- a/gui-libs/wlroots/wlroots-0.16.2-r1.ebuild
+++ b/gui-libs/wlroots/wlroots-0.16.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 	SLOT="0/$(ver_cut 2)"
 fi
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2450f896ba74..936574465b00 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 511f9ad4ca1b..2536f1440443 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,5 +1,6 @@
 AUX geeqie-2.0.1-allow_xxdi.patch 776 BLAKE2B 59f566ef44b581e06b7d066fc6874a552bc08ad4b180ed1a240839661d50a92b860738efd8994c3a5344746bb109cd6da7cac0b68c3b37f730ba842a9382883e SHA512 376ca5efc6ec2f5385c4c4f77e5257d105ecf2ef39d26576a2f50307b8babdb2ae55d8aa38a23709eb1aa7d5dfa62e0213b3a71aebe70c54c7d6a1afc5b7da8a
 AUX geeqie-2.0.1-doc_option.patch 4141 BLAKE2B 59ea49f13d8bd666a01c0905ae95845eb1ecc6acbe71b7ef8553902c0ffca172984ca7dabe39e840d0ca779e13418a8a8043cacc0e3992d691a363f547fa0d58 SHA512 4edb088606d5a4b6f1d83390b40c47c8d2e06a2da2a2ea21dd9049961c63253a9aaa32d0270ef3969b0a273f5f9d2114a740328d9d4d7bbf73b766ecd2aaa8a8
+AUX geeqie-2.1-lua_hpp.patch 344 BLAKE2B 8206ef3ec5faf9b94efe57413905dedef5046b0d90056864e33b2adb876ca4bb3867417a24e4f6956d14923b3ee119ee5e8379f314cffe8ade2c1102bcb3c1de SHA512 599f9b63fad24bd292a393ead338894c6330b82fc3e02e71e16f7a85b49fa0ed564677444b5d78d68b4ac91ad04e8a6c237e3119031e1307ab089ae37e6eb838
 DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9 SHA512 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9
 DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9 SHA512 a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288
 DIST geeqie-2.0.1.tar.xz 1666600 BLAKE2B e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958 SHA512 cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5
@@ -7,6 +8,6 @@ DIST geeqie-2.1-docs.tar.xz 333756 BLAKE2B 2e569f4000befdaecebd6df9c94c59b8d9e05
 DIST geeqie-2.1.tar.xz 1800612 BLAKE2B 60190532eb8830e12acf06e39046dd04ccf28ac5d3679f2063e6f6e102add0d398dfc70a57a758d0c16483d5314ec88cb56b54829103ad938b29ac1500f86fdc SHA512 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f
 EBUILD geeqie-1.7.3-r1.ebuild 2360 BLAKE2B 7df2eb50e6ccc116893305927b308a28825f4a3fc931e1067f6c4d2d79e0a2b89206df35cdf808cf5ec55e052fa7d574b242fea3a926d0b3654bb4665e01ea26 SHA512 4a9c6f461480e8a758cc9d6614548ad0ff5410165b4b1b9c4c6fd1f0d42eb7f300468bc4a50a1b8a8285a6e23743677dc825c868bed9367052b6c1a7c2d75af7
 EBUILD geeqie-2.0.1-r4.ebuild 3223 BLAKE2B a7c6cec69992bece30e632b729262f667dd87be5c9d95492e7664fee04e2adb1395d021355da1acb9b73a95d8a0ac6892d3d3577a4444da6db9846ea48b28097 SHA512 5725d02c3ff3056dc89b4abdba32b3ee1dba45eaeac4c2c3b7bfb4635cb27d76303a4b49be8aa0b6e4996ae0aae0c90b09f296cf507cd0bf30fb59831f61e17e
-EBUILD geeqie-2.1.ebuild 3108 BLAKE2B 11d77386cc58a97c5903605c934661724048b7401dd9fdf74963b38b1612279585588f6438565e23aec4a94e48ebd88afecd8ffe131fe778f8eec0a40ecab24c SHA512 fe876aa92d4d66bd73c1acb6a4c23f262a9165f1b3b545d8246746100c4d74f237888df55d0f60e5f77027012bf61df2f4ad2e95cc87aff62e9f7ec2b22384ee
+EBUILD geeqie-2.1.ebuild 3068 BLAKE2B bc41e8d13926deb8354500c9ee64a3e4c9008a34fb9ce9938478ff816adc939041026cf930e13613f0f9131ccfc0a191f3cd92ad5b674da022fdd7ded4142ad9 SHA512 e2f6d050d913f1bee25ddea7042e31503ebc7a2c0da813e31c9f58e10af8abc7eeee9d4cdc4557d252ffbfdec974f1e3e92f175834d6991f9c5da66c6a62b1c8
 EBUILD geeqie-9999.ebuild 3149 BLAKE2B 0c2f3e3b42223096a96297ef0fc17c3eef27db82d85c5f4624025c5bf3b3e3df6647b56ee514ee18fe765370c3444332f0ae174d129466743d59ce55b234b442 SHA512 fb84879ef022ee8df2cbd3491751f6a210725534fca83f6f120b3972fe9a0932b9f6a2d4e920b3f5bb7782bbab39b8865960f00b295910815b2878eed68bf1e0
 MISC metadata.xml 964 BLAKE2B 68899bc0e99e06b4121753cbe15beea5a5edecff0673b1265dd09e43f06fcf76f9769949d2d08470711eafa4fc65a07a926a66465cab47aa0aa0393cab7969d4 SHA512 83ede5f6bb9ad78cddf27cb98f2985d18e46112118a823f728f29f76a1804f62bdc4252faea39adfd3a64d8959e0a9be75c7349eee5e0be4e306a8ef21597e0b
diff --git a/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch
new file mode 100644
index 000000000000..a0c816b5fb3c
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.1-lua_hpp.patch
@@ -0,0 +1,19 @@
+---
+ src/lua.cc | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/lua.cc b/src/lua.cc
+index 84aa549a..458b658a 100644
+--- a/src/lua.cc
++++ b/src/lua.cc
+@@ -24,9 +24,7 @@
+ 
+ #define _XOPEN_SOURCE
+ 
+-#include <lua.h>
+-#include <lauxlib.h>
+-#include <lualib.h>
++#include <lua.hpp>
+ 
+ #include <stdio.h>
+ #include <glib.h>
diff --git a/media-gfx/geeqie/geeqie-2.1.ebuild b/media-gfx/geeqie/geeqie-2.1.ebuild
index 9553979fc1d4..62d485ca97b3 100644
--- a/media-gfx/geeqie/geeqie-2.1.ebuild
+++ b/media-gfx/geeqie/geeqie-2.1.ebuild
@@ -45,6 +45,10 @@ BDEPEND="
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-lua_hpp.patch
+)
+
 pkg_setup() {
 	# Do not require setting LUA_SINGLE_TARGET if lua is not used
 	use lua && lua-single_pkg_setup
@@ -55,9 +59,6 @@ src_prepare() {
 
 	# Disable doc build - not useful most of the time per upstream
 	sed -e "/subdir('doc')/d" -i meson.build || die
-
-	# Lua version
-	sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die
 }
 
 src_configure() {
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 13137c7d385f..cbf040113c93 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index 817dbd454ef9..aa23a8ac3518 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,5 +1,5 @@
 AUX simplescreenrecorder-0.4.4-ffmpeg5.patch 2540 BLAKE2B 5551255312733fca5641ffbed46e332181d02147dafaa9f6831df967b38cb0d6f05fa2d0d910f78fce1cecb40e1db24e1913b8ec71a7e05a3a7ef0ee761e0427 SHA512 823bfdb35b49bd63a7a2f294695f3adb986d1d018d892db68ada0f08cb9d917ddac86cc258ed7520c44ca53b1194164f58e7e4d4ffdd58a5cfeda4590dff5ec0
 DIST simplescreenrecorder-0.4.4.tar.gz 1961269 BLAKE2B 05c7635840f8461ab324f740f0cc554eb544ed91b00cdf39c80f861e6a8631f59afbdcc9fe958830b0f1e31eedb90f11d29c114ce4bbb612f1756264502f069f SHA512 a90549a2709490482d70559073e505e669417a93abf16124b98c021e6d2bf08b91b53eb68e006df4f80fcee9fe4da2624bf8de979618953adb3f37eb1d471525
-EBUILD simplescreenrecorder-0.4.4-r2.ebuild 2840 BLAKE2B e81240fe90c1bc15529930a408ccf25469761a958f528623808e631dc4c3b6b6f51ccc7bbc7b784a302209f2a60a2380443a770cb260fc4ce471953ad1e23d51 SHA512 11c98edc2d1360e9986cdfb2690c7720186de5b585e6664e88552e11ddf111ce828092757e1718f8ab47ec39b0019481cacf899fc0e65ed1d5961e03ee90928c
-EBUILD simplescreenrecorder-9999.ebuild 2796 BLAKE2B bb9567e1e36c54284684ed6ca7824d6cba2990c7fccdd735e89c81bb9acc9b4439d7d5877af1a246280a628e3562e06e9473485125cf88d311f23e78181ba889 SHA512 8f46e16d5ad357113f7e73869a838c370eb3796be9bcb34efe350626977b612b33358415324c7be899b199d3a50a739b3454687296e71eaac5a8f6637de66e6e
+EBUILD simplescreenrecorder-0.4.4-r3.ebuild 2842 BLAKE2B 2c176abddd8f22b7d7e62c418617cfa02db498275809f10fc13d1a7618b9aa87ad3c86f72977fa3a803fa0925012c36700b00466125c86a1803c337e4874bd02 SHA512 c2b63fef2f92aefbd16cad5796c62c84e2cf0e0fb5e1d805816ef7d4f98f8789b2216312f369b5476c2201276b9745f5e92c3b3f23010fd912bae92aa8b3589d
+EBUILD simplescreenrecorder-9999.ebuild 2798 BLAKE2B 3f4ad8dcf5ae878014f06b773293070f3a1119814d7634f76e4ed6e74e08d09723522930e10f2a2ed9109a519b7799770aa89a6c3fd939b6e1c4881ac724cbc1 SHA512 6c7321a3381104e9023fa9d1dfabb7066cc8c2affcca7cacf7afcbf9e480667aac8dca9c031236f6471def9cb3001c8de067ecc34971e8776142698f18711f5b
 MISC metadata.xml 420 BLAKE2B 2a645626005a1656fb4365970626c8b936ad6c8bfe501bd16fb2fc0a3450b56691ea69cf67ddeb3a5bc4aef2f544ddd300a5a8ae7801c2e71724f1e4d361d70b SHA512 68b6a0da9153a989618fbb7249d04e9d92cda87be16f8ecbdf3dbfc1af65d48ff7b15472087904e2dce47087eb6dc73cc1ebee6b49fcc63d492a5583c273830f
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r2.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r2.ebuild
deleted file mode 100644
index c07b20b0ffff..000000000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PKGNAME="ssr"
-inherit cmake-multilib flag-o-matic xdg
-
-DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/"
-if [[ ${PV} = 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
-	EGIT_BOOTSTRAP=""
-else
-	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${PKGNAME}-${PV}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264"
-
-REQUIRED_USE="abi_x86_32? ( opengl )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib:0=
-	media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	x11-libs/libXi
-	x11-libs/libXinerama
-	virtual/glu[${MULTILIB_USEDEP}]
-	jack? ( virtual/jack )
-	opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] )
-	pulseaudio? ( media-libs/libpulse )
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=( "${FILESDIR}"/${P}-ffmpeg5.patch )
-
-pkg_pretend() {
-	if [[ "${ABI}" == amd64 ]] ; then
-		einfo "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		einfo "When added 32bit GLInject libraries are also included. This is"
-		einfo "required if you want to use OpenGL recording on 32bit applications."
-		einfo
-	fi
-
-	if has_version media-video/ffmpeg[x264] && has_version media-libs/x264[10bit] ; then
-		ewarn
-		ewarn "media-libs/x264 is currently built with 10bit useflag."
-		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
-		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
-		ewarn "record videos with x264."
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	# Qt requires -fPIC. Compile fails otherwise.
-	# Recently removed from the default compile options upstream
-	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
-	append-flags -fPIC
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_JACK_METADATA="$(multilib_native_usex jack)"
-		-DENABLE_X86_ASM="$(usex asm)"
-		-DWITH_OPENGL_RECORDING="$(usex opengl)"
-		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
-		-DWITH_JACK="$(multilib_native_usex jack)"
-		-DWITH_GLINJECT="$(usex opengl)"
-		-DWITH_V4L2="$(multilib_native_usex v4l)"
-	)
-
-	if multilib_is_native_abi ; then
-		mycmakeargs+=(
-			-DENABLE_32BIT_GLINJECT="false"
-			-DWITH_QT5="true"
-		)
-	else
-		mycmakeargs+=(
-			# https://bugs.gentoo.org/660438
-			-DCMAKE_INSTALL_LIB32DIR="$(get_libdir)"
-			-DENABLE_32BIT_GLINJECT="true"
-			-DWITH_SIMPLESCREENRECORDER="false"
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r3.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r3.ebuild
new file mode 100644
index 000000000000..735efe53c501
--- /dev/null
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4-r3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PKGNAME="ssr"
+inherit cmake-multilib flag-o-matic xdg
+
+DESCRIPTION="A Simple Screen Recorder"
+HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/"
+if [[ ${PV} = 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
+	EGIT_BOOTSTRAP=""
+else
+	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+	S="${WORKDIR}/${PKGNAME}-${PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264"
+
+REQUIRED_USE="abi_x86_32? ( opengl )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib:0=
+	media-video/ffmpeg:=[vorbis?,vpx?,x264?,mp3?,theora?]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi
+	x11-libs/libXinerama
+	virtual/glu[${MULTILIB_USEDEP}]
+	jack? ( virtual/jack )
+	opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] )
+	pulseaudio? ( media-libs/libpulse )
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=( "${FILESDIR}"/${P}-ffmpeg5.patch )
+
+pkg_pretend() {
+	if [[ "${ABI}" == amd64 ]] ; then
+		einfo "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
+		einfo "When added 32bit GLInject libraries are also included. This is"
+		einfo "required if you want to use OpenGL recording on 32bit applications."
+		einfo
+	fi
+
+	if has_version media-video/ffmpeg[x264] && has_version media-libs/x264[10bit] ; then
+		ewarn
+		ewarn "media-libs/x264 is currently built with 10bit useflag."
+		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
+		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
+		ewarn "record videos with x264."
+		ewarn
+	fi
+}
+
+pkg_setup() {
+	# Qt requires -fPIC. Compile fails otherwise.
+	# Recently removed from the default compile options upstream
+	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
+	append-flags -fPIC
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_JACK_METADATA="$(multilib_native_usex jack)"
+		-DENABLE_X86_ASM="$(usex asm)"
+		-DWITH_OPENGL_RECORDING="$(usex opengl)"
+		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
+		-DWITH_JACK="$(multilib_native_usex jack)"
+		-DWITH_GLINJECT="$(usex opengl)"
+		-DWITH_V4L2="$(multilib_native_usex v4l)"
+	)
+
+	if multilib_is_native_abi ; then
+		mycmakeargs+=(
+			-DENABLE_32BIT_GLINJECT="false"
+			-DWITH_QT5="true"
+		)
+	else
+		mycmakeargs+=(
+			# https://bugs.gentoo.org/660438
+			-DCMAKE_INSTALL_LIB32DIR="$(get_libdir)"
+			-DENABLE_32BIT_GLINJECT="true"
+			-DWITH_SIMPLESCREENRECORDER="false"
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index 5d68f605635a..5816cb829b9c 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib:0=
-	media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
+	media-video/ffmpeg:=[vorbis?,vpx?,x264?,mp3?,theora?]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext
 	x11-libs/libXfixes[${MULTILIB_USEDEP}]
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 81f06a3820d9..ef7b6d783315 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 000229d12e68..79407a0c4587 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Jul 2023 14:40:14 +0000
+Fri, 07 Jul 2023 20:40:09 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index bcd6ab0ed123..ae06590d8643 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546124 BLAKE2B b8c960a7f19f0cac8ea254b9330e3a1add1f4be28ff0a9b4020f5e68f250a6b511280b7dd1dec4e472c73320abae493b0ab8441075c681803abfb19ea280332e SHA512 0dccc4f920463740ab2803f55b50f1cf0df2af9d58750c12c98fe5963dc8738d5a3e8d6a895c2e0d3ba8230bb61557b6e88b4fa56b2f05f5697577b68a9413df
-TIMESTAMP 2023-07-07T14:40:17Z
+TIMESTAMP 2023-07-07T20:40:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSoI9FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSoeCxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAL3A//UAWNqvBywDjdYHBoHkRDxyfw3e3vXazEYjuM1d7JIfKjZg0Bn56I7nFT
-OnHBc/xMSwj6NOF+DB0Ml0u1+Mh8OMfi3PTz7wQLN7MrYa+aT0Lt7+SuKlsXD1Hl
-g9zLUMQ9vnYzUtBru6itO0nZ/0Wutct/5AR5wp4DsVXiAx2PmHnm04moJqkfNXje
-vo1EaNy2dftC3Eb4rtvyQRY4yOHWlv7s5qS4xYZMhjDJN0bao/bnLujhymov3CkC
-axvMdzNZRasf473MaxvqSd/fTA1O2NNzO3tuMjBwLDmH7AmKrXjJ91RY7REHfUrR
-cZEzAZA8+6u2/1LDj+qkpziAPMLfJ6D4GtJ/h9NNZ2O2U0wZy9DmftHMEJxtO4+C
-NCaMYDznvsIrqOwNfNh89FPp7LTlvgYtu7F0rzfCV59x0uRgCf0OfSY378DW2qpv
-Tdo5AkpGMgQycioN9EnoDMUTsSP1qPfviQZkGuJcOQRFH7Rzl37f4dVvVzVGRufY
-ww4GuNX+euz01f6GEaG7y3LwgdAAMxtKdVSqqLF2KNj3tDdx1gE8ccJaVVO2id/g
-41HiyDmU93J68ats+Y5sY4XK28k47t5dq+kdhUEds/ynrEcv6UV0+OkW89qfen2z
-2Mq7ygd4wtLhx1JzS7ZtIJvGmHaAcy19jY+jnHOea5LZJ3CEBPw=
-=fanJ
+klCQ2w//VVx6quxvTFdxh4YulRms1MSOdC78MdDOxHjsJj1pihmnI4/ao44bUwGE
+3p64ebvoJbyKj7r77sZp9xRGKqOjDitnhvAWOSA+qBZop+nGDqeDszLqCP5gxONY
+jkVmE8btU4kyk61bz5C/MRt0uezBjRSqhaE6gsVkGh4t9Nrsto+zluyTsnlgtI6z
+pVBcyCyzwOqAItYewGnbPc5WIo22oOYhueAKCXbFPKtaZ9si1pI8qQsKRHOKOoUf
+EF0y+W09yaGzfI9iyOtA1QugRRz/phkDnQ1VluOg7Eeb50kLkvquGJVnQoMDMaOo
+1KBlhixGzJWzccFtjMvRu79MRk4zN6rMFJwTewvLuaytfplJnF+4JRriRPHS/kB8
+z8J2z2UzeJJfinP79V7taDNrO4hX5KLr1/gMilL/5WAcG6c1xocqTvlfvxHw2xgL
+jB26iUDYjxEoHnam9cJ/6D8ZyQag5egm6MuOSPDykCmELV4x9foB/fZtEWSa0U9q
+Siwme4gztgHr1SWpMOz84klkvVR5cgQn27P8ghAs68gGHWGg/1Fur0Wxb4GWrlOe
+vshwgE+HTdXxKW7RqlMyabJb2EgE6l+uErdAPlm+5dDY5J9BGFqxZ4BBdSBLtQQo
+WOnZ8ggEj+MWRqlcub3VRSoZUtocYhxXD3moBWIIXEPfji+kvKo=
+=zfaL
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 04438f6e0fb0..79407a0c4587 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Jul 2023 14:40:15 +0000
+Fri, 07 Jul 2023 20:40:09 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index eba068f70fc8..a716dfc8cf4a 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 143201f5d410..2a6a9683cc6b 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/vscode-1.79.0 b/metadata/md5-cache/app-editors/vscode-1.79.0
deleted file mode 100644
index 38dc7d26d39f..000000000000
--- a/metadata/md5-cache/app-editors/vscode-1.79.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DESCRIPTION=Multiplatform Visual Studio Code from Microsoft
-EAPI=8
-HOMEPAGE=https://code.visualstudio.com
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop pax-utils xdg optfeature
-KEYWORDS=-* ~amd64 ~arm ~arm64
-LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ Microsoft-vscode MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret[crypt] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/util-linux sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 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/libxkbfile x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
-RESTRICT=mirror strip bindist
-SLOT=0
-SRC_URI=amd64? ( https://update.code.visualstudio.com/1.79.0/linux-x64/stable -> vscode-1.79.0-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.79.0/linux-armhf/stable -> vscode-1.79.0-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.79.0/linux-arm64/stable -> vscode-1.79.0-arm64.tar.gz )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d5fc16d5d863419740ba8c941099f3a1
diff --git a/metadata/md5-cache/app-editors/vscode-1.79.1 b/metadata/md5-cache/app-editors/vscode-1.79.1
deleted file mode 100644
index 31139e0a9856..000000000000
--- a/metadata/md5-cache/app-editors/vscode-1.79.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DESCRIPTION=Multiplatform Visual Studio Code from Microsoft
-EAPI=8
-HOMEPAGE=https://code.visualstudio.com
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop pax-utils xdg optfeature
-KEYWORDS=-* ~amd64 ~arm ~arm64
-LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ Microsoft-vscode MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret[crypt] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/util-linux sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 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/libxkbfile x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
-RESTRICT=mirror strip bindist
-SLOT=0
-SRC_URI=amd64? ( https://update.code.visualstudio.com/1.79.1/linux-x64/stable -> vscode-1.79.1-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.79.1/linux-armhf/stable -> vscode-1.79.1-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.79.1/linux-arm64/stable -> vscode-1.79.1-arm64.tar.gz )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d5fc16d5d863419740ba8c941099f3a1
diff --git a/metadata/md5-cache/app-editors/vscode-1.80.0 b/metadata/md5-cache/app-editors/vscode-1.80.0
new file mode 100644
index 000000000000..73ad77b66954
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vscode-1.80.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Multiplatform Visual Studio Code from Microsoft
+EAPI=8
+HOMEPAGE=https://code.visualstudio.com
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop pax-utils xdg optfeature
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ Microsoft-vscode MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret[crypt] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/util-linux sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 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/libxkbfile x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
+RESTRICT=mirror strip bindist
+SLOT=0
+SRC_URI=amd64? ( https://update.code.visualstudio.com/1.80.0/linux-x64/stable -> vscode-1.80.0-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.80.0/linux-armhf/stable -> vscode-1.80.0-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.80.0/linux-arm64/stable -> vscode-1.80.0-arm64.tar.gz )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d5fc16d5d863419740ba8c941099f3a1
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 658145dc8257..3093fe8b5cc2 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.64 b/metadata/md5-cache/app-emacs/ebuild-mode-1.64
deleted file mode 100644
index ab3f3c92430a..000000000000
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.64
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-apps/texinfo >=app-editors/emacs-25.3:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-INHERIT=elisp optfeature
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=>=app-editors/emacs-25.3:*
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.64.tar.xz
-_eclasses_=elisp	d5d9361b9698f474179a2ac3f8bf46e8	elisp-common	dde4f515dde15603a26a3755438e9c78	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54
-_md5_=7ca750a6cba17c8cad610afa6b6179e4
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index b8bf3f923f31..44a3fdebe7b8 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/pandoc-bin-3.1.5 b/metadata/md5-cache/app-text/pandoc-bin-3.1.5
new file mode 100644
index 000000000000..ee0ca256e36f
--- /dev/null
+++ b/metadata/md5-cache/app-text/pandoc-bin-3.1.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Conversion between markup formats (binary package)
+EAPI=8
+HOMEPAGE=https://pandoc.org/ https://github.com/jgm/pandoc/
+IUSE=+pandoc-symlink
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=GPL-2+
+RDEPEND=pandoc-symlink? ( !app-text/pandoc )
+SLOT=0
+SRC_URI=amd64? ( https://github.com/jgm/pandoc/releases/download/3.1.5/pandoc-3.1.5-linux-amd64.tar.gz ) arm64? ( https://github.com/jgm/pandoc/releases/download/3.1.5/pandoc-3.1.5-linux-arm64.tar.gz )
+_md5_=9de2481ca42246e96194be468def2f3c
diff --git a/metadata/md5-cache/app-text/sigil-1.9.30 b/metadata/md5-cache/app-text/sigil-1.9.30
index b00b8097d389..69809ccf8f07 100644
--- a/metadata/md5-cache/app-text/sigil-1.9.30
+++ b/metadata/md5-cache/app-text/sigil-1.9.30
@@ -1,17 +1,17 @@
 BDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[tk] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[tk] ) dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[tk] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[tk] ) app-text/hunspell:= dev-libs/libpcre2:=[pcre16] python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/css-parser[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cssselect[python_targets_python3_11(-)] dev-python/dulwich[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) ) system-mathjax? ( dev-libs/mathjax )
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[tk] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[tk] ) app-text/hunspell:= dev-libs/libpcre2:=[pcre16] python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/css-parser[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cssselect[python_targets_python3_11(-)] dev-python/dulwich[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) )
 DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
 EAPI=8
 HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg cmake python-single-r1
-IUSE=+plugins system-mathjax python_single_target_python3_10 python_single_target_python3_11
+IUSE=+plugins python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64
 LICENSE=GPL-3+ Apache-2.0
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[tk] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[tk] ) app-text/hunspell:= dev-libs/libpcre2:=[pcre16] python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/css-parser[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cssselect[python_targets_python3_11(-)] dev-python/dulwich[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) ) system-mathjax? ( dev-libs/mathjax )
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10[tk] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11[tk] ) app-text/hunspell:= dev-libs/libpcre2:=[pcre16] python_single_target_python3_10? ( dev-python/css-parser[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/css-parser[python_targets_python3_11(-)] dev-python/lxml[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cssselect[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/html5lib[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cssselect[python_targets_python3_11(-)] dev-python/dulwich[python_targets_python3_11(-)] dev-python/html5lib[python_targets_python3_11(-)] dev-python/pillow[python_targets_python3_11(-)] dev-python/regex[python_targets_python3_11(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/1.9.30.tar.gz -> sigil-1.9.30.tar.gz
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b5923df1d08d2e04e07c1ca381cfc0f5
+_md5_=d96902c4c80143fc41ae9acfc545819b
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 32909457f252..2d0b287dfe96 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.13.0 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.13.0
new file mode 100644
index 000000000000..855c2a3f21ec
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/cpp-httplib-0.13.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.12.0_beta3:3.12 >=dev-lang/python-3.11.4:3.11 >=dev-lang/python-3.10.12:3.10 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=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(-)?] ) ssl? ( 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(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=C++ HTTP/HTTPS server and client library
+EAPI=8
+HOMEPAGE=https://github.com/yhirose/cpp-httplib/
+INHERIT=cmake-multilib python-any-r1 toolchain-funcs
+IUSE=brotli ssl test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~loong ~x86
+LICENSE=MIT
+RDEPEND=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(-)?] ) ssl? ( 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(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test? ( brotli ssl zlib )
+RESTRICT=!test? ( test )
+SLOT=0/0.13
+SRC_URI=https://github.com/yhirose/cpp-httplib/archive/v0.13.0.tar.gz -> cpp-httplib-0.13.0.tar.gz
+_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=560ec2aa9b89c45a5b4e1b63556279b7
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 712ddc1d313a..f1422e40eca9 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/php-8.1.21 b/metadata/md5-cache/dev-lang/php-8.1.21
new file mode 100644
index 000000000000..95cb70c5164f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.1.21
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/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.21.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=87b334d1b09a0ecf3c3f369951b84725
diff --git a/metadata/md5-cache/dev-lang/php-8.2.7-r1 b/metadata/md5-cache/dev-lang/php-8.2.7-r1
deleted file mode 100644
index 706df3fb9249..000000000000
--- a/metadata/md5-cache/dev-lang/php-8.2.7-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/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 ) ) 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 +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 ) 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 ) ) 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.2
-SRC_URI=https://www.php.net/distributions/php-8.2.7.tar.xz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=f61ebeea63e2f58e44307ca588ed34d7
diff --git a/metadata/md5-cache/dev-lang/php-8.2.8 b/metadata/md5-cache/dev-lang/php-8.2.8
new file mode 100644
index 000000000000..a300ce1bd0e0
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.2.8
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71-r5 >=sys-devel/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 ) ) 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 +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 ) 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 ) ) 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.2
+SRC_URI=https://www.php.net/distributions/php-8.2.8.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=f61ebeea63e2f58e44307ca588ed34d7
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 04c663dfffde..bb20fc10bbda 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/libunistring-1.1-r1 b/metadata/md5-cache/dev-libs/libunistring-1.1-r1
index 7de403e34cbd..f88c723f5d6d 100644
--- a/metadata/md5-cache/dev-libs/libunistring-1.1-r1
+++ b/metadata/md5-cache/dev-libs/libunistring-1.1-r1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/libunistring/
 INHERIT=multilib-minimal libtool
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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=|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )
 SLOT=0/5
 SRC_URI=mirror://gnu/libunistring/libunistring-1.1.tar.xz
 _eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=42999ed8333afa060b6724ee3544cd9b
+_md5_=625e109126eb071778e71c6e8ffa60ee
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 2034888f9764..0926abca0fe6 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/igbinary-3.2.9 b/metadata/md5-cache/dev-php/igbinary-3.2.9
index 25f6c458a5fb..50799ebb8d61 100644
--- a/metadata/md5-cache/dev-php/igbinary-3.2.9
+++ b/metadata/md5-cache/dev-php/igbinary-3.2.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/igbinary/igbinary
 INHERIT=php-ext-source-r3
 IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
-KEYWORDS=amd64 arm ~arm64 x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=BSD
 RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=0
 SRC_URI=https://github.com/igbinary/igbinary/archive/3.2.9.tar.gz -> igbinary-3.2.9.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=5cab9d961611c3328fd841c92dc905e9
+_md5_=2b28f78e65d1e0f4582ece40632858bb
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 75076502040d..38c3f2d1f510 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/fastbencode-0.2 b/metadata/md5-cache/dev-python/fastbencode-0.2
new file mode 100644
index 000000000000..06f54fbcd4cf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fastbencode-0.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+DESCRIPTION=Implementation of bencode with optional fast C extensions
+EAPI=8
+HOMEPAGE=https://github.com/breezy-team/fastbencode https://pypi.org/project/fastbencode/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/f/fastbencode/fastbencode-0.2.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=5ad7d005c3de2bb1fbea224f58c2ca69
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.49 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.49
new file mode 100644
index 000000000000..a76530b544c2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.49
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] ) ) test? ( >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite?] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite?] )
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+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
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite?] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-1.4.49.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=201753c7211983ae4c8e7a586197b625
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-2.0.18 b/metadata/md5-cache/dev-python/sqlalchemy-2.0.18
new file mode 100644
index 000000000000..577a110a9d97
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-2.0.18
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[sqlite] ) ) test? ( >=dev-python/typing-extensions-4.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite?] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[sqlite?] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.7.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/wheel-0.40.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite?] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[sqlite?] )
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+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 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 ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/typing-extensions-4.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11_p1:0=[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.12:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.4:3.11[sqlite?] ) python_targets_python3_12? ( >=dev-lang/python-3.12.0_beta3:3.12[sqlite?] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-2.0.18.tar.gz
+_eclasses_=distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	6b97d2db40ff6be180030687e6003199	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=3aa0d70744758f543e544613a5b36235
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index f98d22321910..f54d4ebd65cb 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.5.0 b/metadata/md5-cache/dev-ruby/rdoc-6.5.0
index dc4eef8078b4..2e5a1c604641 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.5.0
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.5.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/rdoc/
 INHERIT=ruby-fakegem
 IUSE=doc test ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~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 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( GPL-2 Ruby-BSD )
 RDEPEND=>=app-eselect/eselect-ruby-20181225 ruby_targets_ruby30? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/psych-4.0.0[ruby_targets_ruby32(-)] ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.5.0.tar.gz -> rdoc-6.5.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	ruby-fakegem	5e527fb26c6deaeeda655b48a2017909	ruby-ng	e7004f981e452d70374b865ccff407aa	ruby-utils	e06533c14f2bbca05b01fb6b0506e83a	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=304b691f6327a4f55ca6d60f580a0adf
+_md5_=bf28f49744e8c4e8fe5a2fa21927793d
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 85b909006725..245493e752b6 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/breezy-3.3.0 b/metadata/md5-cache/dev-vcs/breezy-3.3.0
new file mode 100644
index 000000000000..8892ae01c19c
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/breezy-3.3.0
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gettext python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/setuptools-rust[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] dev-python/setuptools-rust[python_targets_python3_11(-)] ) >=virtual/rust-1.53 python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] >=dev-python/setuptools-67.7.2[python_targets_python3_10(-)] >=dev-python/wheel-0.40.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] >=dev-python/setuptools-67.7.2[python_targets_python3_11(-)] >=dev-python/wheel-0.40.0[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+DESCRIPTION=Distributed Version Control System with a Friendly UI
+EAPI=8
+HOMEPAGE=https://www.breezy-vcs.org/ https://github.com/breezy-team/breezy
+INHERIT=cargo distutils-r1 optfeature
+IUSE=debug python_single_target_python3_10 python_single_target_python3_11 debug
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_10? ( dev-python/configobj[python_targets_python3_10(-)] dev-python/dulwich[python_targets_python3_10(-)] dev-python/fastimport[python_targets_python3_10(-)] dev-python/patiencediff[python_targets_python3_10(-)] dev-python/fastbencode[python_targets_python3_10(-)] dev-python/urllib3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/configobj[python_targets_python3_11(-)] dev-python/dulwich[python_targets_python3_11(-)] dev-python/fastimport[python_targets_python3_11(-)] dev-python/patiencediff[python_targets_python3_11(-)] dev-python/fastbencode[python_targets_python3_11(-)] dev-python/urllib3[python_targets_python3_11(-)] ) !dev-vcs/bzr python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/brz/3.3/3.3.0/+download/breezy-3.3.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/1.0.2/download -> aho-corasick-1.0.2.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.147/download -> libc-0.2.147.crate https://crates.io/api/v1/crates/lock_api/0.4.10/download -> lock_api-0.4.10.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/once_cell/1.18.0/download -> once_cell-1.18.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.6/download -> parking_lot_core-0.8.6.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pkg-version/1.0.0/download -> pkg-version-1.0.0.crate https://crates.io/api/v1/crates/pkg-version-impl/0.1.1/download -> pkg-version-impl-0.1.1.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.20+deprecated/download -> proc-macro-hack-0.5.20+deprecated.crate https://crates.io/api/v1/crates/proc-macro2/1.0.63/download -> proc-macro2-1.0.63.crate https://crates.io/api/v1/crates/pyo3/0.15.2/download -> pyo3-0.15.2.crate https://crates.io/api/v1/crates/pyo3-build-config/0.15.2/download -> pyo3-build-config-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.15.2/download -> pyo3-macros-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.15.2/download -> pyo3-macros-backend-0.15.2.crate https://crates.io/api/v1/crates/quote/1.0.28/download -> quote-1.0.28.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/regex/1.8.4/download -> regex-1.8.4.crate https://crates.io/api/v1/crates/regex-syntax/0.7.2/download -> regex-syntax-0.7.2.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/unicode-ident/1.0.9/download -> unicode-ident-1.0.9.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	cddd4ee89517b7a52ddce3da8abf3109	distutils-r1	1c9a447ab8b90199e719e0e3a9a5cb00	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=2bdc3b855b12e84594b050cc9200729b
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 033510e66cf6..def9b2afd778 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.14.1-r1 b/metadata/md5-cache/gui-libs/wlroots-0.14.1-r1
index 64a776dca9c4..933e6f9c96d4 100644
--- a/metadata/md5-cache/gui-libs/wlroots-0.14.1-r1
+++ b/metadata/md5-cache/gui-libs/wlroots-0.14.1-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/swaywm/wlroots
 INHERIT=meson
 IUSE=x11-backend X
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl(+),gles2,gbm(+)] sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
 SLOT=0/14
 SRC_URI=https://github.com/swaywm/wlroots/archive/0.14.1.tar.gz -> wlroots-0.14.1.tar.gz
 _eclasses_=meson	18d046bdb14e1bdb22cce6e5d953e364	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=daf0e789a92b4cea920e2cfd81b61bdf
+_md5_=1e0824ce3c4bc581073da643c0b5ee3c
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.15.1-r1 b/metadata/md5-cache/gui-libs/wlroots-0.15.1-r1
index 4e80b6290961..a66fbd17fbcf 100644
--- a/metadata/md5-cache/gui-libs/wlroots-0.15.1-r1
+++ b/metadata/md5-cache/gui-libs/wlroots-0.15.1-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/wlroots/wlroots
 INHERIT=meson
 IUSE=tinywl vulkan x11-backend X
-KEYWORDS=amd64 ~arm64 ~loong ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.24 media-libs/mesa[egl(+),gles2,gbm(+)] sys-auth/seatd:= virtual/libudev vulkan? ( dev-util/glslang:0= dev-util/vulkan-headers:0= media-libs/vulkan-loader:0= ) >=x11-libs/libdrm-2.4.109:0= x11-libs/libxkbcommon x11-libs/pixman x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-wm )
 SLOT=0/15
 SRC_URI=https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/0.15.1/wlroots-0.15.1.tar.gz
 _eclasses_=meson	18d046bdb14e1bdb22cce6e5d953e364	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=f1fa0e4f2fa925b1ce124c523331335f
+_md5_=9ca8c70d7220ebe93fddd763acba6354
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.16.2-r1 b/metadata/md5-cache/gui-libs/wlroots-0.16.2-r1
index 8426199f1985..a33da1434704 100644
--- a/metadata/md5-cache/gui-libs/wlroots-0.16.2-r1
+++ b/metadata/md5-cache/gui-libs/wlroots-0.16.2-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/wlroots/wlroots
 INHERIT=meson
 IUSE=+drm +libinput tinywl vulkan x11-backend X
-KEYWORDS=amd64 ~arm64 ~loong ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.28 drm? ( sys-apps/hwdata:= ) libinput? ( >=dev-libs/libinput-1.14.0:0= ) media-libs/mesa[egl(+),gles2] sys-auth/seatd:= virtual/libudev vulkan? ( dev-util/glslang:0= dev-util/vulkan-headers:0= media-libs/vulkan-loader:0= ) >=x11-libs/libdrm-2.4.114:0= x11-libs/libxkbcommon >=x11-libs/pixman-0.42.0:0= x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xwayland x11-libs/libxcb:0= x11-libs/xcb-util-image x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
 SLOT=0/16
 SRC_URI=https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/0.16.2/wlroots-0.16.2.tar.gz
 _eclasses_=meson	18d046bdb14e1bdb22cce6e5d953e364	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=1469c561245a23a6fc336e530455cc93
+_md5_=15233cc8d9d879b533a3509a9c637bb0
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 9b9dc2945f0e..9a28faec7acf 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/geeqie-2.1 b/metadata/md5-cache/media-gfx/geeqie-2.1
index aa4fac64b55c..fb091d1b7a4b 100644
--- a/metadata/md5-cache/media-gfx/geeqie-2.1
+++ b/metadata/md5-cache/media-gfx/geeqie-2.1
@@ -14,4 +14,4 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) )
 SLOT=0
 SRC_URI=https://github.com/BestImageViewer/geeqie/releases/download/v2.1/geeqie-2.1.tar.xz https://dev.gentoo.org/~voyageur/distfiles/geeqie-2.1-docs.tar.xz
 _eclasses_=lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	18d046bdb14e1bdb22cce6e5d953e364	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d2351807f43ad924084d00e2421d85c8
+_md5_=5b55c67c2cc84bf8e986442cdded78f4
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index ef0215fa9e30..245d6d3a7cde 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4-r2 b/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4-r2
deleted file mode 100644
index 46bfc4f9f969..000000000000
--- a/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[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 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/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[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] ) pulseaudio? ( media-libs/libpulse ) v4l? ( media-libs/libv4l )
-DESCRIPTION=A Simple Screen Recorder
-EAPI=8
-HOMEPAGE=https://www.maartenbaert.be/simplescreenrecorder/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake-multilib flag-o-matic xdg
-IUSE=+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264 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 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[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 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/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[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] ) pulseaudio? ( media-libs/libpulse ) v4l? ( media-libs/libv4l )
-REQUIRED_USE=abi_x86_32? ( opengl )
-SLOT=0
-SRC_URI=https://github.com/MaartenBaert/ssr/archive/0.4.4.tar.gz -> simplescreenrecorder-0.4.4.tar.gz
-_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=24ddef977e0e6d44132693774ef78941
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4-r3 b/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4-r3
new file mode 100644
index 000000000000..13cfc082a3ec
--- /dev/null
+++ b/metadata/md5-cache/media-video/simplescreenrecorder-0.4.4-r3
@@ -0,0 +1,17 @@
+BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg:=[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[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 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/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[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] ) pulseaudio? ( media-libs/libpulse ) v4l? ( media-libs/libv4l )
+DESCRIPTION=A Simple Screen Recorder
+EAPI=8
+HOMEPAGE=https://www.maartenbaert.be/simplescreenrecorder/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake-multilib flag-o-matic xdg
+IUSE=+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264 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 x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg:=[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[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 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/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[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] ) pulseaudio? ( media-libs/libpulse ) v4l? ( media-libs/libv4l )
+REQUIRED_USE=abi_x86_32? ( opengl )
+SLOT=0
+SRC_URI=https://github.com/MaartenBaert/ssr/archive/0.4.4.tar.gz -> simplescreenrecorder-0.4.4.tar.gz
+_eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=00771343e5a052c97e3e3c6b32278fb3
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-9999 b/metadata/md5-cache/media-video/simplescreenrecorder-9999
index 668f90b5ac2e..34a868e6b9cf 100644
--- a/metadata/md5-cache/media-video/simplescreenrecorder-9999
+++ b/metadata/md5-cache/media-video/simplescreenrecorder-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[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 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/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[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] ) pulseaudio? ( media-libs/libpulse ) v4l? ( media-libs/libv4l )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg:=[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[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 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/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[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] ) pulseaudio? ( media-libs/libpulse ) v4l? ( media-libs/libv4l )
 DESCRIPTION=A Simple Screen Recorder
 EAPI=8
 HOMEPAGE=https://www.maartenbaert.be/simplescreenrecorder/
@@ -9,8 +9,8 @@ INHERIT=cmake-multilib flag-o-matic xdg git-r3
 IUSE=+asm jack mp3 opengl pulseaudio theora v4l vorbis vpx x264 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[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 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/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[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] ) pulseaudio? ( media-libs/libpulse ) v4l? ( media-libs/libv4l )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-video/ffmpeg:=[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[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 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/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) opengl? ( media-libs/libglvnd[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] ) pulseaudio? ( media-libs/libpulse ) v4l? ( media-libs/libv4l )
 REQUIRED_USE=abi_x86_32? ( opengl )
 SLOT=0
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fd27a12cf9cc4dde886499dcf9344dfa
+_md5_=6d54b5c43d5a37e69ee80900c912fd30
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index b48a08c378de..24078d34971b 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/inadyn-2.11.0 b/metadata/md5-cache/net-dns/inadyn-2.11.0
index 4d9e2a200ddb..41695c9563f0 100644
--- a/metadata/md5-cache/net-dns/inadyn-2.11.0
+++ b/metadata/md5-cache/net-dns/inadyn-2.11.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/troglobit/inadyn
 INHERIT=systemd tmpfiles
 IUSE=gnutls mbedtls openssl
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=acct-group/inadyn acct-user/inadyn dev-libs/confuse:= gnutls? ( dev-libs/nettle:= net-libs/gnutls:0= ) mbedtls? ( net-libs/mbedtls:0= ) openssl? ( dev-libs/openssl:0= ) virtual/tmpfiles
 REQUIRED_USE=?? ( gnutls mbedtls openssl )
 SLOT=0
 SRC_URI=https://github.com/troglobit/inadyn/releases/download/v2.11.0/inadyn-2.11.0.tar.gz
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=74d3d8718311f41fb12e1fa54d3b099e
+_md5_=a53bcb93b07ee685ffbae73cee2dcf9e
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index e61807737d70..ade38efdf721 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/fd-8.7.0 b/metadata/md5-cache/sys-apps/fd-8.7.0
index 549a37ac184a..b8ab7bdecbad 100644
--- a/metadata/md5-cache/sys-apps/fd-8.7.0
+++ b/metadata/md5-cache/sys-apps/fd-8.7.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/sharkdp/fd
 INHERIT=bash-completion-r1 cargo
 IUSE=debug
-KEYWORDS=amd64 ~arm64 ppc64 x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=Apache-2.0 BSD MIT Unicode-DFS-2016
 RDEPEND=!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )
 SLOT=0
 SRC_URI=https://github.com/sharkdp/fd/archive/v8.7.0.tar.gz -> fd-8.7.0.tar.gz https://github.com/sharkdp/fd/releases/download/v8.7.0/fd-v8.7.0-i686-unknown-linux-gnu.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.19/download -> aho-corasick-0.7.19.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/anyhow/1.0.68/download -> anyhow-1.0.68.crate https://crates.io/api/v1/crates/argmax/0.3.1/download -> argmax-0.3.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.11.1/download -> bumpalo-3.11.1.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/clap/4.1.1/download -> clap-4.1.1.crate https://crates.io/api/v1/crates/clap_complete/4.0.6/download -> clap_complete-4.0.6.crate https://crates.io/api/v1/crates/clap_derive/4.1.0/download -> clap_derive-4.1.0.crate https://crates.io/api/v1/crates/clap_lex/0.3.0/download -> clap_lex-0.3.0.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.12/download -> crossbeam-utils-0.8.12.crate https://crates.io/api/v1/crates/ctrlc/3.2.3/download -> ctrlc-3.2.3.crate https://crates.io/api/v1/crates/cxx/1.0.82/download -> cxx-1.0.82.crate https://crates.io/api/v1/crates/cxx-build/1.0.82/download -> cxx-build-1.0.82.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.82/download -> cxxbridge-flags-1.0.82.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.82/download -> cxxbridge-macro-1.0.82.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/faccess/0.2.4/download -> faccess-0.2.4.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/filetime/0.2.18/download -> filetime-0.2.18.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fs_extra/1.2.0/download -> fs_extra-1.2.0.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/globset/0.4.9/download -> globset-0.4.9.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.53/download -> iana-time-zone-0.1.53.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/0.7.4/download -> io-lifetimes-0.7.4.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.4/download -> io-lifetimes-1.0.4.crate https://crates.io/api/v1/crates/is-terminal/0.4.2/download -> is-terminal-0.4.2.crate https://crates.io/api/v1/crates/jemalloc-sys/0.5.2+5.3.0-patched/download -> jemalloc-sys-0.5.2+5.3.0-patched.crate https://crates.io/api/v1/crates/jemallocator/0.5.0/download -> jemallocator-0.5.0.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.7/download -> link-cplusplus-1.0.7.crate https://crates.io/api/v1/crates/linux-raw-sys/0.0.46/download -> linux-raw-sys-0.0.46.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lscolors/0.13.0/download -> lscolors-0.13.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/nix/0.24.3/download -> nix-0.24.3.crate https://crates.io/api/v1/crates/nix/0.25.1/download -> nix-0.25.1.crate https://crates.io/api/v1/crates/nix/0.26.2/download -> nix-0.26.2.crate https://crates.io/api/v1/crates/normpath/0.3.2/download -> normpath-0.3.2.crate https://crates.io/api/v1/crates/nu-ansi-term/0.46.0/download -> nu-ansi-term-0.46.0.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/once_cell/1.17.0/download -> once_cell-1.17.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.3.0/download -> os_str_bytes-6.3.0.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rustix/0.35.12/download -> rustix-0.35.12.crate https://crates.io/api/v1/crates/rustix/0.36.6/download -> rustix-0.36.6.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scratch/1.0.2/download -> scratch-1.0.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.103/download -> syn-1.0.103.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.2.1/download -> terminal_size-0.2.1.crate https://crates.io/api/v1/crates/test-case/2.2.2/download -> test-case-2.2.2.crate https://crates.io/api/v1/crates/test-case-macros/2.2.2/download -> test-case-macros-2.2.2.crate https://crates.io/api/v1/crates/thiserror/1.0.37/download -> thiserror-1.0.37.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.37/download -> thiserror-impl-1.0.37.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	cddd4ee89517b7a52ddce3da8abf3109	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=80435707a1e9c28b6423151d3d4a03ff
+_md5_=7109feb13e4c1dd129b94f596715da5e
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index c0a3ddf1ed8c..1d6a99303d17 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-45.0 b/metadata/md5-cache/sys-cluster/rdma-core-45.0
index b3e9ee2398a0..bfdc57e55ab1 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-45.0
+++ b/metadata/md5-cache/sys-cluster/rdma-core-45.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/linux-rdma/rdma-core
 INHERIT=cmake perl-functions python-single-r1 udev systemd
 IUSE=neigh python static-libs systemd valgrind python_single_target_python3_10 python_single_target_python3_11
-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=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
 RDEPEND=dev-lang/perl virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_10? ( >=dev-lang/python-3.10.12:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.4:3.11 ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/releases/download/v45.0/rdma-core-45.0.tar.gz
 _eclasses_=cmake	6c921d868d090cc18e142a396f66f74a	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	perl-functions	c3fca037246e877693badea0df3b0ef8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f1ea3048cf5e0861a7c9a17470c1454b
+_md5_=e205479891f661359c8c24dad8847148
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 4e4d21e6dfb4..b82b885e7429 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/gentoo-kernel-6.1.38 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.38
index 42269af88254..40aa9bfc2568 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.38
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.38
@@ -6,7 +6,7 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.ke
 IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 INHERIT=kernel-build toolchain-funcs
 IUSE=debug hardened savedconfig +initramfs test +strip
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-6.1.38
 RDEPEND=!sys-kernel/gentoo-kernel-bin:6.1.38 virtual/libelf
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=6.1.38
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-44.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-44.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
 _eclasses_=dist-kernel-utils	fd52aae774814577c0581f5d381339c7	kernel-build	edc3f11db98cceabd4a58844c33ee32f	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	a74d533f258f1f435be71312558c12f9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a013e16d5d896b3d8be68dd2a0e846ea	savedconfig	8b5f9d995a970e49cd427c55d5840285	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=c30271fe0a376084b7a3d7f1e3a2e5b5
+_md5_=47e263febadf4ee8bf86788abf218cb2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.38 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.38
index 7075e664b29c..b5256def3a41 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.38
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.38
@@ -6,7 +6,7 @@ HOMEPAGE=https://www.kernel.org/
 IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 INHERIT=kernel-install toolchain-funcs unpacker
 IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
 PDEPEND=>=virtual/dist-kernel-6.1.38
 RDEPEND=!sys-kernel/gentoo-kernel:6.1.38 virtual/libelf
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=6.1.38
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-44.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-44.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.38-1.gpkg.tar -> gentoo-kernel-6.1.38-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.38-1.gpkg.tar -> gentoo-kernel-6.1.38-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.38-1.gpkg.tar -> gentoo-kernel-6.1.38-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.38-1.gpkg.tar -> gentoo-kernel-6.1.38-1.x86.gpkg.tar )
 _eclasses_=dist-kernel-utils	fd52aae774814577c0581f5d381339c7	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	3945d351ee3192381911f938f4ee527a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c	unpacker	aa6a4e924009232d8b78b31e932c30b5
-_md5_=3a8ae6be2f70d60acd9626d82f8147e7
+_md5_=00a10e1ed5b004c852974a808178a191
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 38b535283ecf..e0df423b55bd 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/iotop-c-1.22 b/metadata/md5-cache/sys-process/iotop-c-1.22
deleted file mode 100644
index 14e4cee49826..000000000000
--- a/metadata/md5-cache/sys-process/iotop-c-1.22
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=sys-libs/ncurses:= !sys-process/iotop
-DESCRIPTION=top utility for IO (C port)
-EAPI=8
-HOMEPAGE=https://github.com/Tomas-M/iotop
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=fcaps linux-info toolchain-funcs
-IUSE=+filecaps
-KEYWORDS=amd64 arm arm64 ~loong x86
-LICENSE=GPL-2+
-RDEPEND=sys-libs/ncurses:= !sys-process/iotop
-SLOT=0
-SRC_URI=https://github.com/Tomas-M/iotop/archive/v1.22.tar.gz -> iotop-c-1.22.tar.gz
-_eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=863d623e3e527ee688d6614888447b24
diff --git a/metadata/md5-cache/sys-process/iotop-c-1.23 b/metadata/md5-cache/sys-process/iotop-c-1.23
deleted file mode 100644
index f094213f09b0..000000000000
--- a/metadata/md5-cache/sys-process/iotop-c-1.23
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=sys-libs/ncurses:= !sys-process/iotop
-DESCRIPTION=top utility for IO (C port)
-EAPI=8
-HOMEPAGE=https://github.com/Tomas-M/iotop
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=fcaps linux-info toolchain-funcs
-IUSE=+filecaps
-KEYWORDS=amd64 arm arm64 ~loong x86
-LICENSE=GPL-2+
-RDEPEND=sys-libs/ncurses:= !sys-process/iotop
-SLOT=0
-SRC_URI=https://github.com/Tomas-M/iotop/archive/v1.23.tar.gz -> iotop-c-1.23.tar.gz
-_eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=9cba5a4abd520a3950a8c1f8ea8712d7
diff --git a/metadata/md5-cache/sys-process/iotop-c-1.23-r1 b/metadata/md5-cache/sys-process/iotop-c-1.23-r1
new file mode 100644
index 000000000000..e3c98b3df262
--- /dev/null
+++ b/metadata/md5-cache/sys-process/iotop-c-1.23-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=sys-libs/ncurses:= !sys-process/iotop
+DESCRIPTION=top utility for IO (C port)
+EAPI=8
+HOMEPAGE=https://github.com/Tomas-M/iotop
+IDEPEND=filecaps? ( sys-libs/libcap )
+INHERIT=fcaps linux-info toolchain-funcs
+IUSE=+filecaps
+KEYWORDS=amd64 arm arm64 ~loong x86
+LICENSE=GPL-2+
+RDEPEND=sys-libs/ncurses:= !sys-process/iotop
+SLOT=0
+SRC_URI=https://github.com/Tomas-M/iotop/archive/v1.23.tar.gz -> iotop-c-1.23.tar.gz
+_eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
+_md5_=0ab3771a83a55c531e3da12d6fbc2554
diff --git a/metadata/md5-cache/sys-process/iotop-c-9999 b/metadata/md5-cache/sys-process/iotop-c-9999
index 88fc5d816dba..4453eb4edd45 100644
--- a/metadata/md5-cache/sys-process/iotop-c-9999
+++ b/metadata/md5-cache/sys-process/iotop-c-9999
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install postinst setup unpack
+DEFINED_PHASES=compile install postinst prepare setup unpack
 DEPEND=sys-libs/ncurses:= !sys-process/iotop
 DESCRIPTION=top utility for IO (C port)
 EAPI=8
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=sys-libs/ncurses:= !sys-process/iotop
 SLOT=0
 _eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	513c31b3346458ed1f3878b57da6d61c
-_md5_=836c3d1d624b4ce10629c3be6020d2fe
+_md5_=052d0f494d5abce063e8b901b268e6fe
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index c2735fbfea5d..b50ff7382cc3 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.1.38 b/metadata/md5-cache/virtual/dist-kernel-6.1.38
index 810f07efa454..447f073fb30c 100644
--- a/metadata/md5-cache/virtual/dist-kernel-6.1.38
+++ b/metadata/md5-cache/virtual/dist-kernel-6.1.38
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv x86
 RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.1.38 ~sys-kernel/gentoo-kernel-bin-6.1.38 ~sys-kernel/vanilla-kernel-6.1.38 )
 SLOT=0/6.1.38
-_md5_=1b77229b710f7250654decf4c40132e9
+_md5_=dcd4320c7b163f35294d3c0d2958aeac
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 6544029b353f..0470b21391cd 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-07-07T14:40:17Z
+TIMESTAMP 2023-07-07T20:40:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSoI9FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmSoeCxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBSBg//WB2COqA5dNWpNzDxhk8zNRkjjWvpdVMdFXascIMH4a01wcvUgFmVHmzA
-BQiU44Y6KhrTTgPKUOTakAGdYoPCg051RGmgjExqbbBS+9QRA11jwxgQIcM0sfx4
-miFitwWgh7IHIKYbeKpGBfYea2YUpfNyvmIC8Ww4dp2J3Ltr7fG5unzdu8Iq45S0
-vjgfqgD/7Y7XozM+Y3aprxzgfoH5FILzjmgpDOow/yKIOEYNN9ndU6eIv0d9bT+a
-3uK6Wt89/fXAEOH2fIupmhaqhW5N7+wmkg1OVfrVowb/ODfk+R/TQbuapk4pGRA4
-zAGjk80Gta8WMV0/kzrRwmQWp/fyZlRLo8aj9e8m2RK5J2me7HF80SF+EksULE0Y
-QZbQPzhe13bwwyvsCoZxyGXZYgXn0FRMOe7hXFnp8UGbpFsjlbLwtmuihOMFe0bN
-8v0QRs1IMSuAD3dA2z3bX84sWs1j/x04X5736zSXCnwwAnEt95bJYtD8+hSrT58/
-DfI6HpudCEKnQJkCsQd7aiUJpbOuIQYklb2mIn0Z/awJ3OsDyap2YPro3oJe/5eX
-RQwvKLfupMGtapgpTwk2ZzB/6pg8aSHydYokyO+BG9v9lcjEOdKIyX3ir8jpy4zC
-XQ0E3R6qvTP+4oyTlhpVKgo8z2240IgI2g4a8Rt+fHR+ycg46mM=
-=V7YH
+klCVaw//Vke1A50uqQCSSYIp5UqEniDaIFeDzTkQKx3xhfXbSiRK8XRaFXgbdZnS
+AiagDZbSWSSQ1LlA3TsP6ie2uW9rXgCUKVFkmzrpxvMTKf+k9HW3iC90ePDWq5lI
+KiKJdcqy037f4qcYepS4W9g7u9tEYNGLiDu1uQG4+TC8ZiygXfoKv/2CP0dzSI+R
+KZNwS5TRftHe2aE06unO/QT/Q3TEOKIl8UhbYMLnJtIO2eN1sSv1jRJvLdko60Yw
+5rYLsteBsFnjKrmGajCKYr+XKnO0/U7clmNaOy+MXor+m8SCOuFQw/OeJHzQCdvI
+iV7XiQq79Jm2xA+yobgqEz2MPwOBiQMdOBqY+LdRRGyqkLVSabWllbzz6sV/ci1n
+vYbGWfBolpGyr3YdHUJlIUjR1lDO9db6CyLVhKyJ/Mu25nlJ4XB2U5O+5KiVyEO5
+GhCgZZZ1DaPmtxMuXv0JSzk87+aZWEe1PXAqhAlIZbx3NIecKnRkbK7t+pSc/K6T
+vRMv6NVaM8EwBfC/LCYdiolFKGDbelOIvkfslleQp7kQ2lCBbv0rx6FAYjQVHjc7
+lqi6lihMMoj04NGZZcBgjsiGLwdSrZQFu1dVFGkIQa3cUFFq8G2SzFivKNtcRq3u
+4TLHVwjglCRA7ZgXhFeb48aWNod0wOtXvlunHhiluYNV76J+Ygs=
+=OPUV
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 04438f6e0fb0..79407a0c4587 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Jul 2023 14:40:15 +0000
+Fri, 07 Jul 2023 20:40:09 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index abd4b920a21e..1391a87b9466 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jul  7 02:40:14 PM UTC 2023
+Fri Jul  7 08:40:09 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 46e1c8e125fc..06ab4403225c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Jul 2023 14:45:01 +0000
+Fri, 07 Jul 2023 20:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 3625505bdfc6..d0948480be54 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-dcfcaba95dbdf62a41a451e846e5ba579f5dfd8b 1688736435 2023-07-07T13:27:15+00:00
+03d9f25399b6b5ea0f0ad461c93d4637d06fcbd6 1688760697 2023-07-07T20:11:37+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4b97cb400e75..0a7227b7445f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1688740801 Fri 07 Jul 2023 02:40:01 PM UTC
+1688762401 Fri 07 Jul 2023 08:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 04438f6e0fb0..79407a0c4587 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 07 Jul 2023 14:40:15 +0000
+Fri, 07 Jul 2023 20:40:09 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 777056b89b4c..568ad48acbf8 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/inadyn/Manifest b/net-dns/inadyn/Manifest
index 842ad34194c1..1b0d4e8581de 100644
--- a/net-dns/inadyn/Manifest
+++ b/net-dns/inadyn/Manifest
@@ -2,5 +2,5 @@ AUX inadyn.confd 158 BLAKE2B 246e1620c4e86ae2181cdee7ae4a14d9139a96476c159a2bd1b
 AUX inadyn.initd 618 BLAKE2B 14dbddb55e21194ddad9fbbd8470a84964f06a30a560375ee2b4916ca3522cf366a5e793eef7edbee272ab117e55ebf20a5ab574c24c8d8561937168cb70bdcb SHA512 fe5d77d54f4f56900e7e54d920530b2023401207ffc43955ebdbf8edf9d8b0a323ec10df7620bc3751c6ee7bf1c25047ef6d7226b3b29d276f70d511665ce45e
 AUX inadyn.tmpfilesd 75 BLAKE2B f09b58e347524f2bb42dbab273a6ca86e2a46bd15082fd54bbf2523a75e97f204a1539c6acde658e2fc4e377cf3801fd5c1a393e7f91ccca847f86aca139c1f1 SHA512 53f3a24f2bd3ed9a236294223199cb9717a009550222d32f704c0b98b6b91c94943440a47ed3dfcd528591cf7e00b29ded02b6245eeb5887282fbffe169e1414
 DIST inadyn-2.11.0.tar.gz 509655 BLAKE2B 7acb356f691717e282355ed9f0a152463f2364633b0e999838572b18b3330b4aa6cc1f02c58ed1f0fac4e6bac6220992f0c7b20449aea420eb28f55343caa954 SHA512 d0d73cbecbc4dca028dd39f4e125ed9f5e370cb8367086cc819eafbae825ce7bb6f2ad4a5134bfefefd7d6609352d6355b73b28149426a8f755b0e463aa8f008
-EBUILD inadyn-2.11.0.ebuild 1385 BLAKE2B 3eae851a6f6b9d108c507c8e9ed8a7deaa2dda5b094e7ce46054e1225871140b13518820677943eb7413486c03cd7e136705ef5f011afb775d9af3b59c6c6f82 SHA512 e52df17505a0fa7be862910a49dbb726fbc9a1d81a4621c59e978a5e4523e33662a81bce2c13370ace26d53e0850fba58a889aa2eef84e8f9903d559d938edef
+EBUILD inadyn-2.11.0.ebuild 1391 BLAKE2B e89c92a92276efc50c85a80a8a292cbe86093774bb05102ee2bb9f22565865a72bde9e63882c10bafe7b9b891db74d58d970e93f85049b35c56862faa7240f1b SHA512 83689f74521285a7b2702a7309f6aa716ad9ecb683c361d0fe920697229fa7614060f0c3ec6a9f1418b00fbff359f107b020499b9eaf59cadcce7a17e31f18e9
 MISC metadata.xml 993 BLAKE2B 362846a13e02a33b0219fa4c21f7e4d39886089b16a0eb2d5891abbf3f6c1945f42750126d54b8271caa381770dedf458f18117ece52f7058c494838d5625540 SHA512 7bb3ba6f732c1bde413bd52a50f22c93ca1e5f59cbdee12e106cc33b4175982c55cb587f48a691d603d46ae268ab9bf37fbb816cab514e895c7386c6d5cc4267
diff --git a/net-dns/inadyn/inadyn-2.11.0.ebuild b/net-dns/inadyn/inadyn-2.11.0.ebuild
index 6654dd5ddc9a..1a14c931946b 100644
--- a/net-dns/inadyn/inadyn-2.11.0.ebuild
+++ b/net-dns/inadyn/inadyn-2.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troglobit/inadyn/releases/download/v${PV}/${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~x86"
 IUSE="gnutls mbedtls openssl"
 REQUIRED_USE="?? ( gnutls mbedtls openssl )"
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index b0256b19923a..e25e82250c12 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 1fbb7d3ea6d4..ff2a3628bc0d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1182,7 +1182,6 @@ app-text/qpdfview:synctex - Add support for searching TeX sources
 app-text/robodoc:examples - Installs usage examples in /usr/share for Perl
 app-text/sdcv:darkterm - Improve readability of color output on terminals with dark background.
 app-text/sigil:plugins - Installed needed Python packages for using Sigil plugins
-app-text/sigil:system-mathjax - Use the system-wide dev-libs/mathjax instead of bundled
 app-text/sword:clucene - Use dev-cpp/clucene for lucene search support
 app-text/tessdata_best:osd - Enable support orientation and script detection.
 app-text/tessdata_fast:osd - Enable support orientation and script detection.
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 1495fb9ef54b..19b6fe7cd8f8 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
index 6ab13ba84bb5..989a81ab2af6 100644
--- a/sys-apps/fd/Manifest
+++ b/sys-apps/fd/Manifest
@@ -171,5 +171,5 @@ DIST windows_x86_64_gnullvm-0.42.0.crate 357906 BLAKE2B 02e08e696f18105f0c131fcf
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a704661864378021cbb92b147fdfcee978b7011bb770441c481b439985c298816c524c6a11f21a7bd81115e65882fa000a28566bcd SHA512 94d6554ae293785d2fc9dc9d53480c98bc08ab2b78bd8684a0606e7e0ec156a454c1a653d214c21de382bc7ab5d898e45000ed73e6110f679da513ffabbf3cb9
 EBUILD fd-8.4.0.ebuild 2743 BLAKE2B 2dd3efccdf53fd29a723f2e302ba964b0b061b62038a59283f7f420f2db2473446648fd943833451165f90051d982284f81a5c7054a04e2ee5a8d01edd28e98a SHA512 4d2f943d0efc28dc98af7f4f8ee4ff630bddc5281a231598fac2123d96831987192a07ffaf98b1a06230b5b774e7de8befd8e377e414ebe48a2e94bf76ced815
-EBUILD fd-8.7.0.ebuild 3931 BLAKE2B d02c90527f4a7f548846b885665f49ce14a435766fe2fb72eec6dd879a14f5be4c7d9a315e99a6bbcd8dab2a3bf3878d88774f845e3719451a829455d1c216ac SHA512 b2ab3c704d90bc84eb596af9c03f166d56c6e7a9bb63448dd86f58f3dee6a2964cfe28cc6fa28a73e55d9b4d5cc076e79ab784f5b9aad21d98248b0338c47fb7
+EBUILD fd-8.7.0.ebuild 3930 BLAKE2B 9578f6ba762d6a15de186fa82c601077651b0965844c3de455e4b57dbb1b99e332a067c927c8756f23955f0f96060f7b2f4c09811aa5f11b96590181881d3982 SHA512 e068dedc9b74e6885419811ef5231d811e175a4e19a07080d555656515400fc750da7820cfba11f104e0993eef83007116a9ee8126b1e0f1313d7da50aa3e23c
 MISC metadata.xml 575 BLAKE2B 7cea4b70a5cc9f91d9d7a3bc5821b8e3ea9762928dbeb538a3cab911e0cb1ebd865edc5dd1d0ab5c597da2a2aafad60b9c247108dc46c22ff20c15e2d47e43cc SHA512 8a13cdeac4b76847fa80e75575e7b8dd52faba7d047b81c145e3f51ff05e6b38f471d2c28a78ff3b26c7666dc645d68f2374f8f24329907d01582e0c3e9be8e9
diff --git a/sys-apps/fd/fd-8.7.0.ebuild b/sys-apps/fd/fd-8.7.0.ebuild
index 2984f73e8fea..80c498aaa055 100644
--- a/sys-apps/fd/fd-8.7.0.ebuild
+++ b/sys-apps/fd/fd-8.7.0.ebuild
@@ -140,7 +140,7 @@ SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0 BSD MIT Unicode-DFS-2016"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE=""
 
 DEPEND="!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 1972c15f0531..736f5287406e 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index aaeca68b39c7..3d8fd4407fc9 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -5,6 +5,6 @@ AUX srpd.init 535 BLAKE2B 71b1c00f804ad2d5d5919044eda7dfd5ca273a8bbb2debe31cf775
 DIST rdma-core-43.0.tar.gz 1905196 BLAKE2B 96003e32de43e3f72a28c5d2d9bc670a709b25caba6ff25a36dedc003daa315b0fbfba1a25084160e659a1f0f7aa8fe32b63b0eb29103624a9499c05ebba0a87 SHA512 d5c48cfe10af40bc1caaed48fd6f82acfee5a22e1bfcc6955098ff328c1833e5455140e8f39cd5ceaa03f0aaa2bc627d56b2c1d3af8f2f505dda8a58ea70b597
 DIST rdma-core-45.0.tar.gz 1939646 BLAKE2B e2bcc7c993e220326884df1964c73156b123b10c16bd159798fc0440cc58cd1fd32348da667778bec9627c3f3f742061917bbebb37c33a784d946c5c59f394d4 SHA512 3a6728990065867d6fd2abe2a13e3275df513a491da6e3c07a75ec79e8f9ad7fe30f6cbbf04951d0976f1318bf45e0d562c260e9d633c96e4c167d0f9fa71d1b
 EBUILD rdma-core-43.0.ebuild 2624 BLAKE2B b7bf4df59b08125d0a4b20515d1fd10a85d521b94ceb18efa4add72cb7049063131c9dba8e23c2a4cce18561a962491092577a18cf9a74c895d6d847bf6bf4c9 SHA512 77be25177e9c85fd484d909e32360fdb4b3f930456af6473aeca56fcc60824960ed441a979c094664ef1abd9debdf53307750772c793476b28004add6c4d3c49
-EBUILD rdma-core-45.0.ebuild 2625 BLAKE2B 023fb2215f210b1bf0423422ba0fc12324ec2131979e92bf5c764a95581634f760f793f7b6e60235d3b63e2210de3232a56c4c493092d46305bc676a890345d3 SHA512 91038066e965a0e162cdcd66410b6847d648f53c599b978b9b23d99bc91d5b4424334b1febc12f179bd98b4fe189ac9a7eeda9644c988a5dc0dbb40f608e963e
+EBUILD rdma-core-45.0.ebuild 2624 BLAKE2B b7bf4df59b08125d0a4b20515d1fd10a85d521b94ceb18efa4add72cb7049063131c9dba8e23c2a4cce18561a962491092577a18cf9a74c895d6d847bf6bf4c9 SHA512 77be25177e9c85fd484d909e32360fdb4b3f930456af6473aeca56fcc60824960ed441a979c094664ef1abd9debdf53307750772c793476b28004add6c4d3c49
 EBUILD rdma-core-9999.ebuild 2630 BLAKE2B f61a7da6c15775ca147847b28ad113edb5fd5f759e9b2928041e70d4e5c816487a6abea417cc095fd6b59ce26c2f4c2b55cb7ddb34e3fab8106c12e3d7964a5f SHA512 9a10481190be4017a609c488302ffe8f8af2463a6c60526996aa5b7e0285bc58114b917ad7e7252952f61947deee4f323fcd9f604b33a9abdb2207dd193958a1
 MISC metadata.xml 459 BLAKE2B 9c055f4418202d48c3149d11568e858b36ec212a162aa996a7aceed75a7cce78be25ba54dc136a186ea7178db4f04337d16ad95821f47681c03145939bbde783 SHA512 9cb977a3330cf22b7321bcb2877e187cb78173edf2604aa1fec9244af98081a42245f5657743249c9faf39d9518ffb41a6301bbf015b8f889584fa31ff78ed36
diff --git a/sys-cluster/rdma-core/rdma-core-45.0.ebuild b/sys-cluster/rdma-core/rdma-core-45.0.ebuild
index 42b7403cbde4..8ed9652f3ab6 100644
--- a/sys-cluster/rdma-core/rdma-core-45.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-45.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
 else
 	SRC_URI="https://github.com/linux-rdma/rdma-core/releases/download/v${PV}/${P}.tar.gz"
-	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"
 fi
 
 LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 4a483d5d88eb..449b86cac98f 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 56e7f210480f..201059d65c4c 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -239,7 +239,7 @@ EBUILD gentoo-kernel-bin-6.1.34.ebuild 3029 BLAKE2B 0fc4d2ca3341d8f5afd03ac7ae09
 EBUILD gentoo-kernel-bin-6.1.35.ebuild 3027 BLAKE2B 7991a3d474395829a86d186720d409e9114fd392bf0aa49b5f55962dc5774ed497628a3610631a560564f50ae6e9467828c0e2d7a1db416789367e82b28651c4 SHA512 5c962b885b31de97d5232c6fd428925de67b5107e0c6b8ab002370e8971b4a007ea411829258eaac834b873b1092c8a20a9f4aeeceda2ca7a455c524faebed6e
 EBUILD gentoo-kernel-bin-6.1.36.ebuild 3029 BLAKE2B 0fc4d2ca3341d8f5afd03ac7ae09ca1cc6cd9b011660474eb8a2ef077505a610d80e6d77035dec5b92cd934babcee30e591e466b85b36c3aa06e60d7ac74e0df SHA512 75be80e0f233c3f8770165ec7639147a819e670c9c31531fb4a23dedecb0651e40ed7ba6e19b5d606b02d1aa9cfdea2c18af489a84eae83969107233cabf75bb
 EBUILD gentoo-kernel-bin-6.1.37.ebuild 3029 BLAKE2B 0fc4d2ca3341d8f5afd03ac7ae09ca1cc6cd9b011660474eb8a2ef077505a610d80e6d77035dec5b92cd934babcee30e591e466b85b36c3aa06e60d7ac74e0df SHA512 75be80e0f233c3f8770165ec7639147a819e670c9c31531fb4a23dedecb0651e40ed7ba6e19b5d606b02d1aa9cfdea2c18af489a84eae83969107233cabf75bb
-EBUILD gentoo-kernel-bin-6.1.38.ebuild 3029 BLAKE2B 7e344f2c9619826058ab1e7437837bb2307480c9b5be1e52638b4d30cd458ed59f7053e896ab8fb7c02965a1df0f10f2d67fda031e2ee8764460134592585a2b SHA512 eb0c10f46c137cf2a98f606b0bd49fbd43920136bde57d445bc2feefd1d1ec57212b651510b9ad6a7ea37cef2d02e004217e136ed10ca23b39c3791162e5d8f6
+EBUILD gentoo-kernel-bin-6.1.38.ebuild 3025 BLAKE2B 95e4eb0f4309e4141a863875ec46ea241e6e9e96260bdd3804400e11d32dd2b12bce79c1c66e0abbe6533cc9c9abf0f19eceabe46885b6feeac986287fec0070 SHA512 1f22d7d6843659d872c9ea6bd6eda48f99841e95c12aa723020633cdf30564f43e4aa63e3433f0598930230a03d2c27a1714d2b865a548edfc5725cf9f99176f
 EBUILD gentoo-kernel-bin-6.3.10.ebuild 3029 BLAKE2B 892ec1549f7259065d4a5c35cb8cd0b61625cfa6c1e12bc931e17b0dd50498c5980044c6d0e2c1a2952e2841fb7bb0a69f256ec758bce59f1ff2d732b5ee4433 SHA512 d03ad5a6ceccf7ac86895866c120b90b9655ecdd6bb2a69c00a0a0944ae4af5bd4d7bb0fdd20a8583761a8e45dfea8ba12acd778cab3badeabab6445eafe7e76
 EBUILD gentoo-kernel-bin-6.3.11.ebuild 3029 BLAKE2B 892ec1549f7259065d4a5c35cb8cd0b61625cfa6c1e12bc931e17b0dd50498c5980044c6d0e2c1a2952e2841fb7bb0a69f256ec758bce59f1ff2d732b5ee4433 SHA512 d03ad5a6ceccf7ac86895866c120b90b9655ecdd6bb2a69c00a0a0944ae4af5bd4d7bb0fdd20a8583761a8e45dfea8ba12acd778cab3badeabab6445eafe7e76
 EBUILD gentoo-kernel-bin-6.3.12.ebuild 3029 BLAKE2B affd41a3466ffc303abb12fd2f1aea0cbad5e54e70386e975d8be73100f4f3a5f5a1cd16cc54d5b42de5fa02a6099a77a50d476a7ed2295942cfeb8452ca49c9 SHA512 7429d6359e24aaeec895729a7952021d70e60d2f14e9a0a8da0598b5764ad0cd47bca3f211af24857a85a44a4bdfd5f914f4afa56629099ef122f3f3752a18c4
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.38.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.38.ebuild
index 83c6a5e4fa8f..bbd48fd37dc6 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.38.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.38.ebuild
@@ -35,7 +35,7 @@ SRC_URI+="
 S=${WORKDIR}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 RDEPEND="
 	!sys-kernel/gentoo-kernel:${SLOT}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 32e90ad70f9a..4210a0abc471 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -124,7 +124,7 @@ EBUILD gentoo-kernel-6.1.34.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f8649
 EBUILD gentoo-kernel-6.1.35.ebuild 3917 BLAKE2B 7d874950232c5ec963518170c249d974f7dfa7bf398517f09e6bf8f56663dd3407fa829d62a588c3ab6ad6bdf83ebe26641a00be837a44b88155c729bb95dca8 SHA512 c70e32185b12202830cc31889f7eb189b5bc1bec458dc57d5aa84712174b6c6e6f6526e1dfebe6bfd8f7c81ba85a4d53309cf22f6aa7aadfad7594f37eebeea3
 EBUILD gentoo-kernel-6.1.36.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f864931c42a093a934c9a54d5bab61f84adf8d072a401c36e4f464125756d15373c159d835c8b64da9e68f364dd85360e13b1 SHA512 3e9d6bf7af0ee81645f3fa3410c6fdc5cd06876c952a77e3ae043634b15b3fd6370e83eef8f312a883df87d98dd9b228f7b4d30145b514cfa5037db0fbe6243e
 EBUILD gentoo-kernel-6.1.37.ebuild 3919 BLAKE2B 94d646109f6ba20b49d1b536b60f864931c42a093a934c9a54d5bab61f84adf8d072a401c36e4f464125756d15373c159d835c8b64da9e68f364dd85360e13b1 SHA512 3e9d6bf7af0ee81645f3fa3410c6fdc5cd06876c952a77e3ae043634b15b3fd6370e83eef8f312a883df87d98dd9b228f7b4d30145b514cfa5037db0fbe6243e
-EBUILD gentoo-kernel-6.1.38.ebuild 3919 BLAKE2B fc5b35ac53cc76099e26e269fa5a47ba9b7efab478fcb8ccc7542654f7e8747c260aed4e3773c8d086cdd7b9cab73578236114bfea1918306000edfb0915831e SHA512 bcdbb512c07c8d1e18ae7e395fe985aa429f719be707e6cc2010153635708a1070af492032eec2fba692f251a6f7db89427cba1eafa39e1181c36df4a5ba5b5e
+EBUILD gentoo-kernel-6.1.38.ebuild 3915 BLAKE2B 32fbcf1d2df4cd62c7f70e463e81d223e2f7281dac414cc912367bef913bc0bdad45abc487c3aa5da0b8a5c22ac6963d4ab862a69e7e15b418ba1582a763ccd7 SHA512 1da377d13d150ab5bd23b12bc05176e59bf2e2440c1b5d906a3e838e9927b2ce5b3591199ae55c06626316531a92b2cc170fdb85bd335062a1de20c4f47f349a
 EBUILD gentoo-kernel-6.3.10.ebuild 3946 BLAKE2B 1fa6fcaa24bc13570986fb4fb0a62b456a9213cbf5b181b996dc99685e936a8cb57ad160e5a94b3635c5bb1b654766c9ef96df6089ab5d04784ac42f5264b3db SHA512 599cddf43b76a05d3d6e704475c89ead560b3ef6f1c930995acd90fedc5aa84afcd48f6d98927c63e4eb8a97d072f7c5164c53c5963eb8caaca385a1142c5278
 EBUILD gentoo-kernel-6.3.11.ebuild 3946 BLAKE2B 1fa6fcaa24bc13570986fb4fb0a62b456a9213cbf5b181b996dc99685e936a8cb57ad160e5a94b3635c5bb1b654766c9ef96df6089ab5d04784ac42f5264b3db SHA512 599cddf43b76a05d3d6e704475c89ead560b3ef6f1c930995acd90fedc5aa84afcd48f6d98927c63e4eb8a97d072f7c5164c53c5963eb8caaca385a1142c5278
 EBUILD gentoo-kernel-6.3.12.ebuild 3946 BLAKE2B d9cd40cfdab4a29e9b2f7aad767b21aa6ebe9ecccc4ceb71fc47e452cfaa071e484e707c33182fc229150a328b8a24645e20cfd045e6a1687c4721d597ae09df SHA512 4fe04b5f1681d1a667f3962bd8eeba2aa41a472bb695eb679e60776b06ada2e0551b85332a0fdcb640c47068a117c2e1d85d76ab535b0feff3fbf5ea02fffb9d
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.38.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.38.ebuild
index c338d2cfc68f..2e6c2fb568e4 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.38.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.38.ebuild
@@ -43,7 +43,7 @@ SRC_URI+="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv x86"
 IUSE="debug hardened"
 REQUIRED_USE="arm? ( savedconfig )
 	hppa? ( savedconfig )
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 98f2b2882f0c..fd21516b6a4c 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/iotop-c/Manifest b/sys-process/iotop-c/Manifest
index f455dabf3bab..57dec9e0dcbd 100644
--- a/sys-process/iotop-c/Manifest
+++ b/sys-process/iotop-c/Manifest
@@ -1,6 +1,4 @@
-DIST iotop-c-1.22.tar.gz 135078 BLAKE2B 90a441402b19ab5af9d5155f5d335e992e8acd702cbc2ebfb4b99dbc0be672fe07d462aab2c00a14702f584c0762b3b0ae4336022007bc956309ab781cbd2aa8 SHA512 863f4e602e13c91302ef3e2de7bf917418cb389a427fd0a6579c31a991d628112d0b479a2287944c4b3f3b5c4b13815ec57d30687fc48de7b782586e56ee62d8
 DIST iotop-c-1.23.tar.gz 138772 BLAKE2B 123995c5af48f2d257a4c4b2f342c3cb656d91105e13200baac63c3bd5bdd68a09cf4991363db4d49b211f0ad75285b3f34e66951aa80b2df55f6728c54629dc SHA512 afdc59373e96f23efaf93a661ca31d101732b36e61631844864692599b0e5a1d2355fdda0ec994a8e9ed03bc7f6a37c4dd16336fb750084294d58bfcfc6e7f17
-EBUILD iotop-c-1.22.ebuild 790 BLAKE2B 4a32382133c0ba071a80c93af050c881c8fb4d5407786c51098916618e759c820d8958cb18cd5f37e85a8a930ca32b216069f01e256ec9a1458ac20080a98ad3 SHA512 36b64042aeb2c611888cc212129d7ca09c9c9efbf0f0174a8fa49c129c8e7805ac34046f48ffbb7ee946838779fa7c08e9b573747f43d38ce6cefd670a055cda
-EBUILD iotop-c-1.23.ebuild 795 BLAKE2B bee4dc35cc4199a8f1088c4c3f70197605f94b99dc9ca84b923bc7c27940faf2250c9ba2c7f4b123f01bd0110f81df4bbaab88d87e2708c7c2a2c1bba9b409a2 SHA512 e48f01b86b80d7704908a0ecef0f87d1111ff0ab46a652830349b2ee3a7fa4763ca6e99fdaa59d58d1650e5f297205872356a9b67bd07f95eaae40b0560fdf1f
-EBUILD iotop-c-9999.ebuild 701 BLAKE2B d87011d19c473ce2c4cba8d2f954d1c4e5e7d3cb43f04cef30f62bc238ad995db40c090107c1633acf37e983520474148f4975305c54cd40d01f428068bf85f4 SHA512 99bdda36efce6b2174a17746c21fe7398bcdf515943139776ac8123189d681bd630c063e9efcbb3cb91827fac75f518f3501fb11b09086cbc49442848308c055
+EBUILD iotop-c-1.23-r1.ebuild 876 BLAKE2B 7f8adf6b12ca8975c934237208fadae6661d8fdf28d417cb6c584fcad3007b1de7e478ef8d200923448eaf13d40e5f9bbc9df61f8fd15faf2fdf5548c11f746d SHA512 5de147bfc8f63de3bc0acfe3a8bb5dfd7d40dbb573cfb88ce4196a2243ec6b9477f80f3c631da1e3dc7405ef20b7159b71de2dab9c78c588618604ddf520fa57
+EBUILD iotop-c-9999.ebuild 787 BLAKE2B b92b4f9ab8aa4130b98bde413b0e2cd925b25ffa89357469eec3885f4540ec33ee6abac785b634e22ac318bd81dba0b5f76bb092e84dd823ed2ac7bcdc925d94 SHA512 3b96fa81c4c735c025ed17141e6497c391933b7117f48a666cb620be710768563fd7cd11cdfa18ddcd06297375208e566cd102e3ecdda4e22f4f71701040fc0b
 MISC metadata.xml 1377 BLAKE2B 1b0e762f6677fd063044d1ad811fda5c95f64b36a51310dd3d9d0e652d9d671fe255a9cfa312d299369b19d4206723aa5010994ff6e20bf1b67be92432cb4350 SHA512 c5eee7ec3b5711666029d57eb84319e3f89373d7f73d067d1b990ecfcc6d98625966fb781ea3a47894ea078cfca40fc5f03a8d70dd83f7c93b8a77a6e14d2de0
diff --git a/sys-process/iotop-c/iotop-c-1.22.ebuild b/sys-process/iotop-c/iotop-c-1.22.ebuild
deleted file mode 100644
index cc98b1156d52..000000000000
--- a/sys-process/iotop-c/iotop-c-1.22.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps linux-info toolchain-funcs
-
-DESCRIPTION="top utility for IO (C port)"
-HOMEPAGE="https://github.com/Tomas-M/iotop"
-SRC_URI="https://github.com/Tomas-M/iotop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/iotop-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong x86"
-
-RDEPEND="sys-libs/ncurses:=
-	!sys-process/iotop"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS"
-
-FILECAPS=(
-	cap_net_admin=eip usr/bin/iotop
-)
-
-src_compile() {
-	emake V=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" NO_FLTO=1
-}
-
-src_install() {
-	dobin iotop
-	dodoc README.md
-	doman iotop.8
-}
diff --git a/sys-process/iotop-c/iotop-c-1.23-r1.ebuild b/sys-process/iotop-c/iotop-c-1.23-r1.ebuild
new file mode 100644
index 000000000000..c401c231d083
--- /dev/null
+++ b/sys-process/iotop-c/iotop-c-1.23-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps linux-info toolchain-funcs
+
+DESCRIPTION="top utility for IO (C port)"
+HOMEPAGE="https://github.com/Tomas-M/iotop"
+SRC_URI="https://github.com/Tomas-M/iotop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/iotop-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~loong x86"
+
+RDEPEND="sys-libs/ncurses:=
+	!sys-process/iotop"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS"
+
+FILECAPS=(
+	cap_net_admin=eip usr/bin/iotop
+)
+
+src_prepare() {
+	sed -e 's/-D_FORTIFY_SOURCE=2//' -i Makefile || die
+	default
+}
+
+src_compile() {
+	emake V=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" NO_FLTO=1
+}
+
+src_install() {
+	dobin iotop
+	dodoc README.md
+	doman iotop.8
+}
diff --git a/sys-process/iotop-c/iotop-c-1.23.ebuild b/sys-process/iotop-c/iotop-c-1.23.ebuild
deleted file mode 100644
index 01595c683cbc..000000000000
--- a/sys-process/iotop-c/iotop-c-1.23.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps linux-info toolchain-funcs
-
-DESCRIPTION="top utility for IO (C port)"
-HOMEPAGE="https://github.com/Tomas-M/iotop"
-SRC_URI="https://github.com/Tomas-M/iotop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/iotop-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong x86"
-
-RDEPEND="sys-libs/ncurses:=
-	!sys-process/iotop"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS"
-
-FILECAPS=(
-	cap_net_admin=eip usr/bin/iotop
-)
-
-src_compile() {
-	emake V=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" NO_FLTO=1
-}
-
-src_install() {
-	dobin iotop
-	dodoc README.md
-	doman iotop.8
-}
diff --git a/sys-process/iotop-c/iotop-c-9999.ebuild b/sys-process/iotop-c/iotop-c-9999.ebuild
index b05952298d1d..47a5c48a0a0e 100644
--- a/sys-process/iotop-c/iotop-c-9999.ebuild
+++ b/sys-process/iotop-c/iotop-c-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,6 +23,11 @@ FILECAPS=(
 	cap_net_admin=eip usr/bin/iotop
 )
 
+src_prepare() {
+	sed -e 's/-D_FORTIFY_SOURCE=2//' -i Makefile || die
+	default
+}
+
 src_compile() {
 	emake V=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" NO_FLTO=1
 }
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 4fda284a8608..967d25871dd2 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 02f4eadce349..8379611797a2 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -24,7 +24,7 @@ EBUILD dist-kernel-6.1.34.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49
 EBUILD dist-kernel-6.1.35.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.1.36.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.1.37.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
-EBUILD dist-kernel-6.1.38.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
+EBUILD dist-kernel-6.1.38.ebuild 406 BLAKE2B d2a57d03473571929e7e2e0b24ab0de1a166019a411c63c7aac8f52d43a363e9e17d4af8845d6338b22a6b0cc3dd2bd139f884bbcb1ffd794d091c75bfbc0898 SHA512 51b4d7b63502533d411188e04f36f665d112e294e855ccab411fa6aa9b855e30a250e0f8330f2fceac1d3e08d0b1e831c86d72a2a16142e52007d78491764e85
 EBUILD dist-kernel-6.3.10.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.3.11.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.3.12.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
diff --git a/virtual/dist-kernel/dist-kernel-6.1.38.ebuild b/virtual/dist-kernel/dist-kernel-6.1.38.ebuild
index d3f0fa8764cf..43c9e88b8a76 100644
--- a/virtual/dist-kernel/dist-kernel-6.1.38.ebuild
+++ b/virtual/dist-kernel/dist-kernel-6.1.38.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	|| (
-- 
cgit v1.2.3