From dd851ab76c56a249df7a0ec052acd90940bc014f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 4 Oct 2023 17:52:00 +0100
Subject: gentoo auto-resync : 04:10:2023 - 17:51:59

---
 Manifest                                           |  30 +-
 Manifest.files.gz                                  | Bin 29284 -> 29300 bytes
 dev-games/Manifest.gz                              | Bin 6231 -> 6233 bytes
 dev-games/godot/Manifest                           |   5 +-
 dev-games/godot/files/godot-3.5.2-gcc13.patch      |  15 -
 dev-games/godot/godot-3.5.2.ebuild                 | 217 ----------
 dev-games/godot/godot-4.1.2.ebuild                 | 239 +++++++++++
 dev-java/Manifest.gz                               | Bin 58124 -> 58126 bytes
 dev-java/jdbc-mysql/Manifest                       |   2 +-
 dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild        |   2 +-
 dev-lang/Manifest.gz                               | Bin 20690 -> 20690 bytes
 dev-lang/erlang/Manifest                           |   2 +-
 dev-lang/erlang/erlang-26.0.ebuild                 |   2 +-
 dev-libs/Manifest.gz                               | Bin 97864 -> 97861 bytes
 dev-libs/libmpack/Manifest                         |   1 -
 dev-libs/libmpack/libmpack-1.0.5-r3.ebuild         |  68 ---
 dev-perl/Manifest.gz                               | Bin 285813 -> 285820 bytes
 dev-perl/Text-BibTeX/Manifest                      |   2 +
 dev-perl/Text-BibTeX/Text-BibTeX-0.890.0-r1.ebuild |  48 +++
 ...ibTeX-0.890.0-dont-clobber-fortify-source.patch |  13 +
 dev-util/Manifest.gz                               | Bin 69275 -> 69264 bytes
 dev-util/ccls/Manifest                             |   2 +-
 dev-util/ccls/ccls-0.20230717.ebuild               |   2 +-
 dev-util/intel-graphics-compiler/Manifest          |   2 +-
 .../intel-graphics-compiler-1.0.15136.4-r1.ebuild  | 101 +++++
 .../intel-graphics-compiler-1.0.15136.4.ebuild     |  95 -----
 dev-util/rebar/Manifest                            |   2 +-
 dev-util/rebar/rebar-3.21.0.ebuild                 |   2 +-
 media-libs/Manifest.gz                             | Bin 69208 -> 69208 bytes
 media-libs/libvpx/Manifest                         |   2 +
 .../files/libvpx-1.13.1-allow-fortify-source.patch |  17 +
 media-libs/libvpx/libvpx-1.13.1-r1.ebuild          | 142 +++++++
 media-libs/mesa/Manifest                           |   2 +
 media-libs/mesa/mesa-23.1.9.ebuild                 | 463 +++++++++++++++++++++
 media-libs/mutagen/Manifest                        |   2 +-
 media-libs/mutagen/mutagen-1.47.0.ebuild           |   2 +-
 media-libs/svt-hevc/Manifest                       |   4 +-
 ...vt-hevc-1.5.1-dont-clobber-fortify_source.patch |  35 ++
 media-libs/svt-hevc/svt-hevc-1.5.1-r1.ebuild       |  32 ++
 media-libs/svt-hevc/svt-hevc-9999.ebuild           |   4 +
 metadata/Manifest.gz                               | Bin 6988 -> 6991 bytes
 metadata/dtd/timestamp.chk                         |   2 +-
 metadata/glsa/Manifest                             |  30 +-
 metadata/glsa/Manifest.files.gz                    | Bin 549460 -> 549618 bytes
 metadata/glsa/glsa-202310-04.xml                   |  44 ++
 metadata/glsa/timestamp.chk                        |   2 +-
 metadata/glsa/timestamp.commit                     |   2 +-
 metadata/md5-cache/Manifest.gz                     | Bin 27910 -> 27900 bytes
 metadata/md5-cache/dev-games/Manifest.gz           | Bin 8172 -> 8177 bytes
 metadata/md5-cache/dev-games/godot-3.5.2           |  15 -
 metadata/md5-cache/dev-games/godot-4.1.2           |  17 +
 metadata/md5-cache/dev-java/Manifest.gz            | Bin 77436 -> 77441 bytes
 metadata/md5-cache/dev-java/jdbc-mysql-8.1.0       |   4 +-
 metadata/md5-cache/dev-lang/Manifest.gz            | Bin 42684 -> 42685 bytes
 metadata/md5-cache/dev-lang/erlang-26.0            |   4 +-
 metadata/md5-cache/dev-libs/Manifest.gz            | Bin 164573 -> 164420 bytes
 metadata/md5-cache/dev-libs/libmpack-1.0.5-r3      |  12 -
 metadata/md5-cache/dev-perl/Manifest.gz            | Bin 375186 -> 375346 bytes
 metadata/md5-cache/dev-perl/Text-BibTeX-0.890.0-r1 |  16 +
 metadata/md5-cache/dev-util/Manifest.gz            | Bin 131241 -> 131242 bytes
 metadata/md5-cache/dev-util/ccls-0.20230717        |   4 +-
 .../dev-util/intel-graphics-compiler-1.0.15136.4   |  15 -
 .../intel-graphics-compiler-1.0.15136.4-r1         |  15 +
 metadata/md5-cache/dev-util/rebar-3.21.0           |   4 +-
 metadata/md5-cache/media-libs/Manifest.gz          | Bin 118018 -> 118500 bytes
 metadata/md5-cache/media-libs/libvpx-1.13.1-r1     |  15 +
 metadata/md5-cache/media-libs/mesa-23.1.9          |  17 +
 metadata/md5-cache/media-libs/mutagen-1.47.0       |   4 +-
 metadata/md5-cache/media-libs/svt-hevc-1.5.1-r1    |  12 +
 metadata/md5-cache/media-libs/svt-hevc-9999        |   2 +-
 metadata/md5-cache/net-analyzer/Manifest.gz        | Bin 61410 -> 61412 bytes
 metadata/md5-cache/net-analyzer/arp-scan-1.10.0    |  14 +
 metadata/md5-cache/net-analyzer/arp-scan-99999     |  13 -
 metadata/md5-cache/net-im/Manifest.gz              | Bin 16166 -> 16333 bytes
 metadata/md5-cache/net-im/swift-4.0.3              |  17 +
 metadata/md5-cache/net-libs/Manifest.gz            | Bin 57142 -> 57297 bytes
 metadata/md5-cache/net-libs/libotr-4.1.1-r2        |  14 +
 metadata/md5-cache/net-misc/Manifest.gz            | Bin 93897 -> 94060 bytes
 metadata/md5-cache/net-misc/stunnel-5.71           |  16 +
 metadata/md5-cache/net-print/Manifest.gz           | Bin 6809 -> 6814 bytes
 metadata/md5-cache/net-print/cups-2.4.7            |  18 -
 metadata/md5-cache/net-print/cups-2.4.7-r1         |  18 +
 metadata/md5-cache/net-print/cups-9999             |   8 +-
 metadata/md5-cache/sys-apps/Manifest.gz            | Bin 90571 -> 90908 bytes
 metadata/md5-cache/sys-apps/kbd-2.6.3-r1           |  16 +
 metadata/md5-cache/sys-apps/usbredir-0.13.0-r1     |  16 +
 metadata/md5-cache/x11-misc/Manifest.gz            | Bin 63076 -> 63233 bytes
 metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r3   |  14 +
 metadata/news/Manifest                             |  28 +-
 metadata/news/timestamp.chk                        |   2 +-
 metadata/timestamp                                 |   2 +-
 metadata/timestamp.chk                             |   2 +-
 metadata/timestamp.commit                          |   2 +-
 metadata/timestamp.x                               |   2 +-
 metadata/xml-schema/timestamp.chk                  |   2 +-
 net-analyzer/Manifest.gz                           | Bin 43255 -> 43263 bytes
 net-analyzer/arp-scan/Manifest                     |   4 +-
 net-analyzer/arp-scan/arp-scan-1.10.0.ebuild       |  34 ++
 net-analyzer/arp-scan/arp-scan-99999.ebuild        |  26 --
 ...p-scan-1.10.0-dont-clobber-fortify-source.patch |  25 ++
 net-im/Manifest.gz                                 | Bin 9231 -> 9230 bytes
 net-im/swift/Manifest                              |   5 +
 .../files/swift-4.0.3-gcc11-compatibility.patch    |  13 +
 .../files/swift-4.0.3-reproducible-build.patch     |  21 +
 net-im/swift/swift-4.0.3.ebuild                    | 207 +++++++++
 net-libs/Manifest.gz                               | Bin 32140 -> 32144 bytes
 net-libs/libotr/Manifest                           |   2 +
 .../libotr-4.1.1-dont-clobber-fortify-source.patch |  23 +
 net-libs/libotr/libotr-4.1.1-r2.ebuild             |  40 ++
 net-misc/Manifest.gz                               | Bin 54493 -> 54489 bytes
 net-misc/stunnel/Manifest                          |   4 +
 .../stunnel-5.71-dont-clobber-fortify-source.patch |  15 +
 .../stunnel-5.71-respect-EPYTHON-for-tests.patch   |  12 +
 net-misc/stunnel/stunnel-5.71.ebuild               | 123 ++++++
 net-print/Manifest.gz                              | Bin 5752 -> 5755 bytes
 net-print/cups/Manifest                            |   4 +-
 net-print/cups/cups-2.4.7-r1.ebuild                | 314 ++++++++++++++
 net-print/cups/cups-2.4.7.ebuild                   | 318 --------------
 net-print/cups/cups-9999.ebuild                    |  12 +-
 sys-apps/Manifest.gz                               | Bin 49678 -> 49686 bytes
 sys-apps/kbd/Manifest                              |   2 +
 .../kbd-2.6.3-no-redefine-fortify-source.patch     | 171 ++++++++
 sys-apps/kbd/kbd-2.6.3-r1.ebuild                   |  94 +++++
 sys-apps/usbredir/Manifest                         |   1 +
 sys-apps/usbredir/usbredir-0.13.0-r1.ebuild        |  41 ++
 x11-misc/Manifest.gz                               | Bin 47015 -> 47019 bytes
 x11-misc/cairo-clock/Manifest                      |   2 +
 x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild   |  49 +++
 .../files/cairo-clock-0.3.4-fortify-source.patch   |  16 +
 129 files changed, 2668 insertions(+), 907 deletions(-)
 delete mode 100644 dev-games/godot/files/godot-3.5.2-gcc13.patch
 delete mode 100644 dev-games/godot/godot-3.5.2.ebuild
 create mode 100644 dev-games/godot/godot-4.1.2.ebuild
 delete mode 100644 dev-libs/libmpack/libmpack-1.0.5-r3.ebuild
 create mode 100644 dev-perl/Text-BibTeX/Text-BibTeX-0.890.0-r1.ebuild
 create mode 100644 dev-perl/Text-BibTeX/files/Text-BibTeX-0.890.0-dont-clobber-fortify-source.patch
 create mode 100644 dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15136.4-r1.ebuild
 delete mode 100644 dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15136.4.ebuild
 create mode 100644 media-libs/libvpx/files/libvpx-1.13.1-allow-fortify-source.patch
 create mode 100644 media-libs/libvpx/libvpx-1.13.1-r1.ebuild
 create mode 100644 media-libs/mesa/mesa-23.1.9.ebuild
 create mode 100644 media-libs/svt-hevc/files/svt-hevc-1.5.1-dont-clobber-fortify_source.patch
 create mode 100644 media-libs/svt-hevc/svt-hevc-1.5.1-r1.ebuild
 create mode 100644 metadata/glsa/glsa-202310-04.xml
 delete mode 100644 metadata/md5-cache/dev-games/godot-3.5.2
 create mode 100644 metadata/md5-cache/dev-games/godot-4.1.2
 delete mode 100644 metadata/md5-cache/dev-libs/libmpack-1.0.5-r3
 create mode 100644 metadata/md5-cache/dev-perl/Text-BibTeX-0.890.0-r1
 delete mode 100644 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15136.4
 create mode 100644 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15136.4-r1
 create mode 100644 metadata/md5-cache/media-libs/libvpx-1.13.1-r1
 create mode 100644 metadata/md5-cache/media-libs/mesa-23.1.9
 create mode 100644 metadata/md5-cache/media-libs/svt-hevc-1.5.1-r1
 create mode 100644 metadata/md5-cache/net-analyzer/arp-scan-1.10.0
 delete mode 100644 metadata/md5-cache/net-analyzer/arp-scan-99999
 create mode 100644 metadata/md5-cache/net-im/swift-4.0.3
 create mode 100644 metadata/md5-cache/net-libs/libotr-4.1.1-r2
 create mode 100644 metadata/md5-cache/net-misc/stunnel-5.71
 delete mode 100644 metadata/md5-cache/net-print/cups-2.4.7
 create mode 100644 metadata/md5-cache/net-print/cups-2.4.7-r1
 create mode 100644 metadata/md5-cache/sys-apps/kbd-2.6.3-r1
 create mode 100644 metadata/md5-cache/sys-apps/usbredir-0.13.0-r1
 create mode 100644 metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r3
 create mode 100644 net-analyzer/arp-scan/arp-scan-1.10.0.ebuild
 delete mode 100644 net-analyzer/arp-scan/arp-scan-99999.ebuild
 create mode 100644 net-analyzer/arp-scan/files/arp-scan-1.10.0-dont-clobber-fortify-source.patch
 create mode 100644 net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch
 create mode 100644 net-im/swift/files/swift-4.0.3-reproducible-build.patch
 create mode 100644 net-im/swift/swift-4.0.3.ebuild
 create mode 100644 net-libs/libotr/files/libotr-4.1.1-dont-clobber-fortify-source.patch
 create mode 100644 net-libs/libotr/libotr-4.1.1-r2.ebuild
 create mode 100644 net-misc/stunnel/files/stunnel-5.71-dont-clobber-fortify-source.patch
 create mode 100644 net-misc/stunnel/files/stunnel-5.71-respect-EPYTHON-for-tests.patch
 create mode 100644 net-misc/stunnel/stunnel-5.71.ebuild
 create mode 100644 net-print/cups/cups-2.4.7-r1.ebuild
 delete mode 100644 net-print/cups/cups-2.4.7.ebuild
 create mode 100644 sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch
 create mode 100644 sys-apps/kbd/kbd-2.6.3-r1.ebuild
 create mode 100644 sys-apps/usbredir/usbredir-0.13.0-r1.ebuild
 create mode 100644 x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild
 create mode 100644 x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch

diff --git a/Manifest b/Manifest
index 358c7f9aba3e..16195ff5c45c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29284 BLAKE2B 0c6f1f53b01dab6df82351cace90051fd9b71a5c0f0cca9b68dc23df5d299242eeff19d73245f6b60ce9c056bcabf44a5ee98385f080f461c4fe64e5f00a9fc2 SHA512 4aa592e8ba07f9ae0662c3563314c978f84803358acbb6c7706b655f761c7d1b6f6d68e12ceffef854979ecf821f1efeea030918d0e580a2708e8c41786379e8
-TIMESTAMP 2023-10-04T10:10:13Z
+MANIFEST Manifest.files.gz 29300 BLAKE2B f27b68b00e17129b4b6c51bac4f74a898c9df5ee595b730be95e3dc12ee7e47411725bcaa4467a20004add2ad532f1316fe63e2cbe9a1763b25ffd3c05fe00ba SHA512 29d90e6f826fcadf2a153f9b28297565bc039a11e1afec66052cd36ea5c8c6c9069cb58a0cf18f86f9b6aba97c87430a1c62ea916e34b07a3a51dc1042bfb6f7
+TIMESTAMP 2023-10-04T16:10:23Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUdOgVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUdjm9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAGYQ/9F3o+xrwVjWqfFcqOo6tlnPRsDLrmpR54/Fe3x1zoV8UybAKT0SIEmafX
-8vvEFha0Ubzbgi8v6951V4MsjFNTgUsEwwI6E9AlgZd9J21LunqlcuLGQBVudtA9
-B0zT1osBUuf0YejJ76D0ASFjLVhmB5DLtHwTlYCByWRa9RzMyIf+GCyK6OK5H4tN
-pEF/6WqD6fWUSzKF89pDUhkgTXy/NoQ1FdTdVuSUiGO3UTpVGnEFiddpEh6YhjSw
-R2SCE7N4lsJsLjn1FydvyYUo47J1XO0pzKVfwWJgVzQZtTzE1a5i4XMC13S/9GZW
-RFedk5i3ODezrWGVrK3dCFTMgGO/hHqcNJyzYZ0hDKZ0/lf66wMvMA/QtuOz++q8
-sxjs1Kv4grYIhvCXheutgrMU7yZa+62EG14+cRiZcsgqfPGtFcr+li/LXA3dFjGk
-gk3SydNScwrRtDznoeZiacZuAqTfEMeKOd8mgoWopGG8YpVpljGL8dssTx7cURw7
-dANXshgbm+U2twpjrcBckLt0Sa6nl2CQjw8fnjxHsMl1WgviI/867QFtFPW2F5u2
-643uVQzsC+QTYoe/yf+ptMFe8fAxxHyhOtzJpZFMV7ej3u5wBrfCV6VswZ/TEl8w
-oNDN5nr8ZvFqbOyjzAWkvkS6CgwWyGYLrhQs5mu6V4pJ58pM9IA=
-=sgm3
+klCANw/8CLVTkKhVwid+suJyrEWKd7my7jwIKkgimp+o9sJ6xRwm3LU4zUbirjps
+nGIFuMVrBLPf6ZXQwWmjzZqOpXPPErrdHFxwwuYhunhxVh/IFyyLeSOaFq+fKUXv
+uA8E3R3NjcfzdSlI0ODIVZBG+NOu2Ytee7jmqUQftYHJeLsRmKaFS3I4dc6ACQ8R
+hJFfHCP/jTG/S8c+P1YWTTSt6hXeHYMUmEsTtxfwef8e/Wz99qvhLRte6QN8TkOa
+LCFCQhx72IWz7RfIzAMxRzKNsiVjDI3SVlWsYi81LWJtbkpBcbMkbrclWPCzckx5
+Pb1Ts1vju8JWG9kP8AZ6EUV62Oc9OgXXWs+o2ehrk/6U9hizG2379pxgNudfzbDC
+xstb4/Sf5gmAT/QuoHBMbi5RLvcOHsUnkUTFkrAZyDC/qujq6+/8baEonouJl59e
+W3FAlfPW5pf3cXMH7VvtXAfYpFV7Q++yrRBopW7qEtdmab9GXmns8tAThVqH5uxT
+1USh5niVrMf4W1EzsDuRcvP2BujlELcbQLI7I+/zs25mHwNGOtRNrY7XtlAphntZ
+R9cncIV9cznkqbOBlpGwNdP/yFyezTkUzKuj9VSnvgHoo1ZBsNCS5WQ1D+RkdeWB
+D/8cDwl1OKX3YtoLZrk0Gj4a05/a6HEXir8RWfqdti23CgqoGP0=
+=2N+E
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index afa8018bf876..56630168090b 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 2bb6ee5a0f0d..0ef12d88d91f 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest
index ff4c70719610..06133b48db3e 100644
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@@ -1,16 +1,15 @@
 AUX godot-3.5-musl.patch 325 BLAKE2B 6069b159c7844d471ecf79d080cb4b3d5b21cf82093379961e163efe52866e1d25ca8075ee1ba653aabcaf912592968dca6fba43cb4907d703711af237bacf50 SHA512 828e5870fdec8cd4c4f132db24de722f73f330dc278b21020cf38aaf26498c69723e1fc75855dd01683452c3628a782a3957ff47d5ecf2e13da1bd8aee3a5805
 AUX godot-3.5-scons.patch 2568 BLAKE2B 0da3a29689293a0d9681eaa2877c667fbe484e7d479eb7525f3621640f397dc77bd000780a142418a74e671b6f5b241e27898f5cac71376eb684d3e995a9ac33 SHA512 d7f230da26ebcc40ad0c8c59046a863aeca69c314661ccbcab86c49f545df9662c68bc51d72a146033385ed09812ce2de92aae58a32462402f89542a47069202
-AUX godot-3.5.2-gcc13.patch 433 BLAKE2B f9a5e7e700084910ff7c5e5d3d778a6b9f4358e084ae198499626378c99ad6a4cc97941455bba3f1fa74cd80ed570fd855e1665af1260ad861b5ea9b735829c7 SHA512 ade16845dc997850a790ac30f7076f9ffb37a9b586ebc0be3adafc49dd9eace846b56730ee09ff4e7e016ceae345d6b2caa1bb1c55c1cbde680e346dc63b7639
 AUX godot-3.5.3-gcc13.patch 238 BLAKE2B 1bf7e8e695f2bd6764a47e10318b7f8b0046a461623fa9ff868d4affb87f6208f5c144f87d6ccc5eaf0716804d907a6fa6f50f7a764f3607d05183f614474acf SHA512 2308a382af8fe31f8e23ce6c0d6de6d4f3f2e6b1f33b960d77a1a0a0880f2eda7d2f12744a3ac13e2bb0637266668de4c6fc994fa0760103a9d4f89d244228a5
 AUX godot-4.0_beta3-headless-header.patch 498 BLAKE2B 401942c17829136aace28e34f7c9a4f843457d5a76c8b7035f40894f3d4d06936ddf3f1bcedf81584a65c0bff96e6e556d20ed8856107dd76deb173c98256964 SHA512 f83ec6b0667108b7c8f744b90944cd686de114db5694e09febf20a359a7d3fe11457b0c3279719a1281309a647e856b729354d3bed5f6d5048548b8dd259f63b
 AUX godot-4.0_rc2-musl.patch 878 BLAKE2B d10e22acc29e14df6b42b180ed480908c61e6a9781d81897b1b24a79de792fb967886fa7be6494440fb4e8ab69a83100d455838b986ce195dc30116638db544e SHA512 97b365952a7c1e7e4088ed71d1c98eccca1449b481d05e10fd750a6d29c7635dc6112e0e033ab1555cfe51eda8c0b805df1fbe78e9c54cea2664aed8570fa077
 AUX godot-4.0_rc3-scons.patch 506 BLAKE2B 2fd1421760f082ea65febce90459f8a2d63e06e5b02b5e86e59bbacd14db78f76448ee50d0fa7c935b1a867f528b46a9b82b5bb03765d0b237e9af73d7fd14da SHA512 9ac654edc66a5a330055d1af0b706a5fa143061712146ddc02657add45d4518d96391d9e980c0a6b33d9fa966b5914a3f90a7b333f20885f0a05a7b8985fc667
-DIST godot-3.5.2-stable.tar.xz 24047432 BLAKE2B a4d600cb174b2f79cc91c583b1052db2e7e2921003ffd5a307a2484af9cc050b600e763b6016ba2df043ba5e492f0bdd13c207fd3a3d794b6602f7c574093cb0 SHA512 e9f3c8b23cd69422639fe22948fb1f5f2071dff6e013fee3c08d6d3c1f39de4dfc252d32eb395c847021c9bbc1b2fa320500140ff3e684bf00530889ba48a181
 DIST godot-3.5.3-stable.tar.xz 24072964 BLAKE2B a4c03328e3aa77d741a1c642cfd645de04084f2852e865757fc8960c4919d3b8b8571e772f44004901fdd80a967e8e21bd8c6be8b36263db7afae787dcbd3ed6 SHA512 4c008af5bb7c298d465edbe03f6ebc642f5bbbb0a4254e99d7a7a88919e1f9424b98c5dff95a55ae68d4e2e5878c7c0bb7d13a66869cb632ecb51a913f865155
 DIST godot-4.0.4-stable.tar.xz 30267060 BLAKE2B 42f5f0c89edb96eb6f36c54229671f233ed0a49a769361195f9aaf807b45fe3968aeeaad204fc07e200114d852e4651f9dc8eb137c4f3aca7b8e8e1203ebcdc9 SHA512 4dadc123995d7262ffa6c5002d08611038957c59a8bd742284b9b62577de6b7182aad807db7a231180a355df0f25d10babdc914faf9287ed401152d98762bb5f
 DIST godot-4.1.1-stable.tar.xz 30681136 BLAKE2B 18e6dae0428812493ecdd8d76cc99c2264873707d4abac0146a1d9b9cbffe2f678c346951a714d0d211fd380b433f910cc952e1720a2c4933febeb7d64283369 SHA512 9fc4bdff2ef3f5ad173514709591941f1dff32dd7cc54224a85691b34b6a5f1d01addc9b4f8d996bc6f774cee5c722181122a39b498b23e48e8d70629ff8ff0b
-EBUILD godot-3.5.2.ebuild 6661 BLAKE2B efa30faa7c394c5971a62f6ce072c276585e7b4ce3399767c4143cbd444f7a98746a01332532d15dbe47bbc054c38901e46bbe56033c2fe4e815206c7094901f SHA512 ec2c9e02cf77a139d1ee27eec23e36e5eceb64e5513866131a08a9e6c37c31f722bc0a2b6c363ab36626ebb711d3ea6eb433e08c06cb8f24f31e891bea7d51de
+DIST godot-4.1.2-stable.tar.xz 31020196 BLAKE2B fbdc4470a4db78a810dcbd7700c46dd03a9d9802c08cbad68dd3aedbc00678f7285837f34642ac833c000164f4a98559cb82bcb615ca353cf319e771d55cdc6a SHA512 d9e3c948aeece3586632ed2a8c94ca2107a6b5b4bb1ae8dc264e350fbfcb4cc1f4cd4cf7fdcd61a5b0351511c12e34d83275a79d5e0361e2eee67c8447b5f831
 EBUILD godot-3.5.3.ebuild 6667 BLAKE2B 9a6c6642b12bab97d0c91f9b65b48505532c5d713eb2c13ddbb3c074d6d62ff6913eddb34c6394c57a5db3870661158631cc40b870c3e6a345e490340c8b32b3 SHA512 9085bec5650281edbf46e2ea8ce3242bb40c7e8760f093c709fb21c8454caac54896ebdcea42d0d59e9069e681f8722f3c2029373617f501fff2df8cecbccd27
 EBUILD godot-4.0.4.ebuild 6983 BLAKE2B d089b3cd44737743c572ddd4496064c635f2934e367fbf834bb3527c852061cbaec8283405a7ccad7f59a6bf210fb5a44727c114b228056f98f0f2a819f7e889 SHA512 0aa73012f7b271939e5055f21db46d3d613c5b6eddde7f428418c0ffc0cc7a53aa7038fb417f4ff826dd1ab68e1f6baeea6293148f0a945a41987d01a44ead1e
 EBUILD godot-4.1.1.ebuild 7033 BLAKE2B 5ff93d7024d6404470339708928c7012a4ab843a4e535ddc033e5f05bde3934120f0fa4e174c480e8681a4a6a640fd2a7b37c35455d3a9c65164b718422d2661 SHA512 1b5a0bd0bd24bbbe7b5d77d489217fde719c94a452f113f079a9c575b81cfc62a3220675b6a310bb75e2d5f40e556a1f444fd7b70e2c13ebf03c367091891a8a
+EBUILD godot-4.1.2.ebuild 7075 BLAKE2B cfb19fc3bad4deee505de14044034a7a9e68832f1d773ade24ccfbf63d62fbf969d894b40d06b305b6cae728797a1bbcd3150f0e9149068a466b4833770c8d2d SHA512 f8dbcfde3ee9db5bc0ad971938d8f4a5d3c3627a3cd120b02969ea15aee5aae8611d89f931ae2edd4eb8f1ea970d5171ece5f51d57bf54a75da30b3fec155097
 MISC metadata.xml 1551 BLAKE2B 718ca848e6b90fad730ea413ff8d25a9c23836da1ff890d7c93d458a0b46b503a4d1b949742a4a819eb0323eb0626a3541cd35d41f809b600891fa470f565ff6 SHA512 b935ee9256ae07a8f01bc458ee41c46e25be8a38b6921cf353a20332c59b6083bd6f73e2112858827b3b7bccdb256f9122e1d9691d2a3751aba85bbb8c4ab262
diff --git a/dev-games/godot/files/godot-3.5.2-gcc13.patch b/dev-games/godot/files/godot-3.5.2-gcc13.patch
deleted file mode 100644
index 789c78415bcd..000000000000
--- a/dev-games/godot/files/godot-3.5.2-gcc13.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Issues seem(?) to only trigger when gcc13 is combined with musl.
-
-https://bugs.gentoo.org/906363
---- a/modules/fbx/fbx_parser/FBXCommon.h
-+++ b/modules/fbx/fbx_parser/FBXCommon.h
-@@ -78,2 +78,3 @@
- 
-+#include <cstdint>
- #include <string>
---- a/thirdparty/vhacd/inc/vhacdManifoldMesh.h
-+++ b/thirdparty/vhacd/inc/vhacdManifoldMesh.h
-@@ -17,2 +17,3 @@
- #define VHACD_MANIFOLD_MESH_H
-+#include <cstdint>
- #include "vhacdCircularList.h"
diff --git a/dev-games/godot/godot-3.5.2.ebuild b/dev-games/godot/godot-3.5.2.ebuild
deleted file mode 100644
index 445f05a3f238..000000000000
--- a/dev-games/godot/godot-3.5.2.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
-
-DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
-HOMEPAGE="https://godotengine.org/"
-SRC_URI="
-	https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz
-	https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz"
-S="${WORKDIR}/${P}-stable"
-
-LICENSE="
-	MIT
-	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
-	gui? ( CC-BY-4.0 ) tools? ( BitstreamVera OFL-1.1 )"
-SLOT="3"
-KEYWORDS="~amd64"
-# Enable roughly same as upstream by default so it works as expected,
-# except raycast (tools-only heavy dependency), and deprecated.
-IUSE="
-	+bullet debug deprecated +gui pulseaudio raycast +runner +theora
-	+tools +udev +upnp +webm +webp"
-
-# dlopen: alsa-lib,pulseaudio,udev
-RDEPEND="
-	app-arch/zstd:=
-	dev-games/recastnavigation:=
-	dev-libs/libpcre2:=[pcre32]
-	media-libs/alsa-lib
-	media-libs/freetype[brotli]
-	media-libs/libpng:=
-	<net-libs/mbedtls-3:=
-	net-libs/wslay
-	sys-libs/zlib:=
-	bullet? ( sci-physics/bullet:= )
-	gui? (
-		media-libs/libglvnd
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		tools? ( raycast? ( media-libs/embree:3 ) )
-	)
-	pulseaudio? ( media-libs/libpulse )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)
-	tools? ( app-misc/ca-certificates )
-	udev? ( virtual/udev )
-	upnp? ( net-libs/miniupnpc:= )
-	webm? (
-		media-libs/libvorbis
-		media-libs/libvpx:=
-		media-libs/opus
-	)
-	webp? ( media-libs/libwebp:= )"
-DEPEND="
-	${RDEPEND}
-	gui? ( x11-base/xorg-proto )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-musl.patch
-	"${FILESDIR}"/${PN}-3.5-scons.patch
-	"${FILESDIR}"/${PN}-3.5.2-gcc13.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
-	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
-	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
-		-i misc/dist/linux/org.godotengine.Godot.desktop || die
-
-	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/{x11,server}/detect.py || die
-
-	# use of builtin_ switches can be messy (see below), delete to be sure
-	local unbundle=(
-		bullet embree freetype libogg libpng libtheora libvorbis libvpx
-		libwebp mbedtls miniupnpc opus pcre2 recastnavigation wslay zlib zstd
-		# certs: unused by generated header, but scons panics if not found
-	)
-	rm -r "${unbundle[@]/#/thirdparty/}" || die
-}
-
-src_compile() {
-	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
-
-	local esconsargs=(
-		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-
-		platform=$(usex gui x11 server)
-		progress=no
-		verbose=yes
-
-		deprecated=$(usex deprecated)
-		#execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged
-		minizip=yes # uses a modified bundled copy
-		pulseaudio=$(usex pulseaudio)
-		udev=$(usex udev)
-
-		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-
-		# platform/*/detect.py uses builtin_* switches to check if need
-		# to link with system libraries, but ignores whether the dep is
-		# actually used, so "enable" deleted builtins on disabled deps
-		builtin_bullet=$(usex !bullet)
-		builtin_certs=no
-		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
-		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
-		builtin_freetype=no
-		builtin_libogg=yes # unused
-		builtin_libpng=no
-		builtin_libtheora=$(usex !theora)
-		builtin_libvorbis=$(usex !theora $(usex !webm))
-		builtin_libvpx=$(usex !webm)
-		builtin_libwebp=$(usex !webp)
-		builtin_mbedtls=no
-		builtin_miniupnpc=$(usex !upnp)
-		builtin_opus=$(usex !webm)
-		builtin_pcre2=no
-		builtin_recast=no
-		builtin_rvo2=yes # bundled copy has godot-specific changes
-		builtin_squish=yes # ^ likewise, may not be safe to unbundle
-		builtin_wslay=no
-		builtin_xatlas=yes # not wired for unbundling nor packaged
-		builtin_zlib=no
-		builtin_zstd=no
-		# (more is bundled in third_party/ but they lack builtin_* switches)
-
-		# modules with optional dependencies, "possible" to disable more but
-		# gets messy and breaks all sorts of features (expected enabled)
-		module_bullet_enabled=$(usex bullet)
-		module_mono_enabled=no # unhandled
-		module_ogg_enabled=no # unused
-		module_opus_enabled=no # unused, support is gone and webm uses system's
-		# note raycast is disabled on many arches, see raycast/config.py
-		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
-		module_theora_enabled=$(usex theora)
-		module_upnp_enabled=$(usex upnp)
-		module_vorbis_enabled=no # unused, non-theora/webm uses stb_vorbis
-		module_webm_enabled=$(usex webm)
-		module_webp_enabled=$(usex webp)
-
-		# let *FLAGS handle these, e.g. can pass -flto as-is
-		debug_symbols=no
-		optimize=none
-		use_lto=no
-		use_static_cpp=no
-	)
-
-	if use runner && use tools; then
-		# build alternate faster + ~60% smaller binary for running
-		# games or servers without game development debug paths
-		escons extra_suffix=runner target=release tools=no "${esconsargs[@]}"
-	fi
-
-	esconsargs+=(
-		# debug: debug for godot itself
-		# release_debug: debug for game development
-		# release: no debugging paths, only available with tools=no
-		target=$(usex debug{,} $(usex tools release_debug release))
-		tools=$(usex tools)
-	)
-
-	escons extra_suffix=main "${esconsargs[@]}"
-}
-
-src_install() {
-	local s=godot${SLOT}
-
-	newbin bin/godot*.main ${s}
-	if use runner && use tools; then
-		newbin bin/godot*.runner ${s}-runner
-	else
-		# always available, revdeps shouldn't depend on [runner]
-		dosym ${s} /usr/bin/${s}-runner
-	fi
-
-	newman misc/dist/linux/godot.6 ${s}.6
-	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
-
-	if use gui; then
-		newicon icon.svg ${s}.svg
-		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
-			org.godotengine.${s^}.desktop
-
-		insinto /usr/share/metainfo
-		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
-			org.godotengine.${s^}.appdata.xml
-
-		insinto /usr/share/mime/application
-		newins misc/dist/linux/org.godotengine.Godot.xml \
-			org.godotengine.${s^}.xml
-	fi
-
-	newbashcomp misc/dist/shell/godot.bash-completion ${s}
-	bashcomp_alias ${s}{,-runner}
-
-	insinto /usr/share/fish/vendor_completions.d
-	newins misc/dist/shell/godot.fish ${s}.fish
-	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
-
-	insinto /usr/share/zsh/site-functions
-	newins misc/dist/shell/_godot.zsh-completion _${s}
-	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
-}
diff --git a/dev-games/godot/godot-4.1.2.ebuild b/dev-games/godot/godot-4.1.2.ebuild
new file mode 100644
index 000000000000..91c42a256140
--- /dev/null
+++ b/dev-games/godot/godot-4.1.2.ebuild
@@ -0,0 +1,239 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
+
+DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
+HOMEPAGE="https://godotengine.org/"
+SRC_URI="
+	https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz
+	https://github.com/godotengine/godot/releases/download/${PV}-stable/${P}-stable.tar.xz
+"
+S="${WORKDIR}/${P}-stable"
+
+LICENSE="
+	MIT
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
+	gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
+"
+SLOT="4"
+KEYWORDS="~amd64"
+# Enable roughly same as upstream by default so it works as expected,
+# except raycast (tools-only heavy dependency), and deprecated.
+IUSE="
+	alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast
+	+runner speech test +theora +tools +udev +upnp +vulkan +webp
+"
+# TODO: tests still need more figuring out
+RESTRICT="test"
+
+# dlopen: libglvnd
+RDEPEND="
+	app-arch/brotli:=
+	app-arch/zstd:=
+	dev-games/recastnavigation:=
+	dev-libs/icu:=
+	dev-libs/libpcre2:=[pcre32]
+	media-libs/freetype[brotli,harfbuzz]
+	media-libs/harfbuzz:=[icu]
+	media-libs/libogg
+	media-libs/libpng:=
+	media-libs/libvorbis
+	<net-libs/mbedtls-3:=
+	net-libs/wslay
+	sys-libs/zlib:=
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	fontconfig? ( media-libs/fontconfig )
+	gui? (
+		media-libs/libglvnd
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libxkbcommon
+		tools? ( raycast? ( media-libs/embree:3 ) )
+		vulkan? ( media-libs/vulkan-loader[X] )
+	)
+	pulseaudio? ( media-libs/libpulse )
+	speech? ( app-accessibility/speech-dispatcher )
+	theora? ( media-libs/libtheora )
+	tools? ( app-misc/ca-certificates )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/miniupnpc:= )
+	webp? ( media-libs/libwebp:= )
+"
+DEPEND="
+	${RDEPEND}
+	gui? ( x11-base/xorg-proto )
+	tools? ( test? ( dev-cpp/doctest ) )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch
+	"${FILESDIR}"/${PN}-4.0_rc2-musl.patch
+	"${FILESDIR}"/${PN}-4.0_rc3-scons.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
+	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
+	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
+		-i misc/dist/linux/org.godotengine.Godot.desktop || die
+
+	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/linuxbsd/detect.py || die
+
+	# use of builtin_ switches can be messy (see below), delete to be sure
+	local unbundle=(
+		brotli doctest embree freetype graphite harfbuzz icu4c libogg
+		libpng libtheora libvorbis libwebp linuxbsd_headers mbedtls
+		miniupnpc pcre2 recastnavigation volk wslay zlib zstd
+		# certs: unused by generated header, but scons panics if not found
+	)
+	rm -r "${unbundle[@]/#/thirdparty/}" || die
+
+	ln -s "${ESYSROOT}"/usr/include/doctest thirdparty/ || die
+}
+
+src_compile() {
+	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
+
+	local esconsargs=(
+		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+		progress=no
+		verbose=yes
+
+		use_sowrap=no
+
+		alsa=$(usex alsa)
+		dbus=$(usex dbus)
+		deprecated=$(usex deprecated)
+		fontconfig=$(usex fontconfig)
+		opengl3=$(usex gui)
+		pulseaudio=$(usex pulseaudio)
+		speechd=$(usex speech)
+		udev=$(usex udev)
+		use_volk=no # unnecessary when linking directly to libvulkan
+		vulkan=$(usex gui $(usex vulkan))
+		x11=$(usex gui)
+
+		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+
+		# platform/*/detect.py uses builtin_* switches to check if need
+		# to link with system libraries, but many ignore whether the dep
+		# is actually used, so "enable" deleted builtins on disabled deps
+		builtin_brotli=no
+		builtin_certs=no
+		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
+		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
+		builtin_freetype=no
+		builtin_glslang=yes #879111 (for now, may revisit if more stable)
+		builtin_graphite=no
+		builtin_harfbuzz=no
+		builtin_icu4c=no
+		builtin_libogg=no
+		builtin_libpng=no
+		builtin_libtheora=$(usex !theora)
+		builtin_libvorbis=no
+		builtin_libwebp=$(usex !webp)
+		builtin_mbedtls=no
+		builtin_miniupnpc=$(usex !upnp)
+		builtin_msdfgen=yes # not wired for unbundling nor packaged
+		builtin_openxr=yes # not packaged
+		builtin_pcre2=no
+		builtin_recastnavigation=no
+		builtin_rvo2=yes # bundled copy has godot-specific changes
+		builtin_squish=yes # ^ likewise, may not be safe to unbundle
+		builtin_wslay=no
+		builtin_xatlas=yes # not wired for unbundling nor packaged
+		builtin_zlib=no
+		builtin_zstd=no
+		# (more is bundled in third_party/ but they lack builtin_* switches)
+
+		# modules with optional dependencies, "possible" to disable more but
+		# gets messy and breaks all sorts of features (expected enabled)
+		module_mono_enabled=no # unhandled
+		# note raycast is only enabled on amd64+arm64, see raycast/config.py
+		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
+		module_theora_enabled=$(usex theora)
+		module_upnp_enabled=$(usex upnp)
+		module_webp_enabled=$(usex webp)
+
+		# let *FLAGS handle these, e.g. can pass -flto as-is
+		debug_symbols=no
+		lto=none
+		optimize=custom
+		use_static_cpp=no
+	)
+
+	if use runner && use tools; then
+		# build alternate faster + ~60% smaller binary for running
+		# games or servers without game development debug paths
+		escons extra_suffix=runner target=template_release "${esconsargs[@]}"
+	fi
+
+	esconsargs+=(
+		target=$(usex tools editor template_$(usex debug{,} release))
+		dev_build=$(usex debug)
+
+		# harmless but note this bakes in --test in the final binary
+		tests=$(usex tools $(usex test))
+	)
+
+	escons extra_suffix=main "${esconsargs[@]}"
+}
+
+src_test() {
+	xdg_environment_reset
+	bin/godot*.main --headless --test || die
+}
+
+src_install() {
+	local s=godot${SLOT}
+
+	newbin bin/godot*.main ${s}
+	if use runner && use tools; then
+		newbin bin/godot*.runner ${s}-runner
+	else
+		# always available, revdeps shouldn't depend on [runner]
+		dosym ${s} /usr/bin/${s}-runner
+	fi
+
+	newman misc/dist/linux/godot.6 ${s}.6
+	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
+
+	if use gui; then
+		newicon icon.svg ${s}.svg
+		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
+			org.godotengine.${s^}.desktop
+
+		insinto /usr/share/metainfo
+		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
+			org.godotengine.${s^}.appdata.xml
+
+		insinto /usr/share/mime/application
+		newins misc/dist/linux/org.godotengine.Godot.xml \
+			org.godotengine.${s^}.xml
+	fi
+
+	newbashcomp misc/dist/shell/godot.bash-completion ${s}
+	bashcomp_alias ${s}{,-runner}
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins misc/dist/shell/godot.fish ${s}.fish
+	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/dist/shell/_godot.zsh-completion _${s}
+	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ae1bb22b01ae..f51774e6d431 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 21cd724654d1..07bf9dbf78e1 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -2,5 +2,5 @@ DIST mysql-connector-j-8.0.32.tar.gz 4229102 BLAKE2B bb4f89ac9eb4ebc5ed4a8f3d0b6
 DIST mysql-connector-j-8.1.0.tar.gz 4241696 BLAKE2B 930257a876b1b512b598ebf8397125145bb9d1a438fe33bb55ca208dddfdd29bd436a365cc35b9128cdee6eee436da688dd53cc3ed6cd04efb22d1f5af731863 SHA512 f8a7c621397f49981dd7d19e880d92ee051015ad011c027380ac85760dc22ce2f4117fd27b8d72325c5e2bc40a1a9c22e9534f7200208916ee62bbf1e5ad0c75
 DIST oci-java-sdk-common-2.47.0.jar 439209 BLAKE2B b3b28bb0cf4b8dbca37bb34df7bb48029901be5d9f7754a2ccce888a9af4a06b3348cd545d480127f942687b9b0d63336c37b5f95ecb9f96111c9388a4bc6053 SHA512 73e7376c92d47d81e0630e2ad2d510a483068664874ae31622629dad6dc016d746499c2d29682563e5cdee35ddb6e9e59a2e7557d32e1eeec5fb12206f9d1d6e
 EBUILD jdbc-mysql-8.0.32.ebuild 1497 BLAKE2B 73cef4b5b5b59b5b2a28c705fe727b37856d68e7d64fa8e81f1c29a40c58b2a9fb00a97fad06e6d836d8149dc74ac4ea3b9ea3d14e42caad27370ac691df97f6 SHA512 3fa885dd13270c7ccd01634efdd0562bfecfcd333a39fca0142421d73f7a2442174aa4e7006bf36bf5f6c529e5ad15a30703ae817097bc2088dfaeca4daddead
-EBUILD jdbc-mysql-8.1.0.ebuild 1498 BLAKE2B 4f66287d674ac4966882e9eabd0037c5e208f7fb6c2308619f49473979b97b3f24c371a18f4bb153cac34cec30158bc61ffca0e9064d60ba1c247a9e5cc762ac SHA512 14669900be2178c90dd0deea6f0bebdcacc5f81ed52c64e08b12c355c745389669e0f0867af63fdf86bc2608c3d8686956646a81f9bd2daf7228d1b34f0f4ce9
+EBUILD jdbc-mysql-8.1.0.ebuild 1497 BLAKE2B dc0ee6c150af75b169ccc4205e79923b5a8d7b23cd9f2504625235b800dd0ed90d1a07ae2c16303af01f5639b441e742764ad8586e9bbb7c5372a711da70050f SHA512 81514bb073f6d901d2fd0e1595f6e31b81adb0e3fde1a48b404706c7577ed79a1d3d31ee368228a16c55d8b4fcf98717986c5ef341d09914c1f4cdb410e9c1f6
 MISC metadata.xml 325 BLAKE2B e1c3ff68e092bb0e4cd63ed17da632f053f938e8e119a3b5f9a68a3961aac6c1df48a03e281583c22e881576ac9c50b405f0a6b40323bd85a183541a02792a05 SHA512 f855f395f2cc16667e5c524b63c409f754e399d657e50e7aeaebaa99af850480e271a890460a313b8be3c5a66d3e51d26dd2ceaade8828ce3d700232b892fca8
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild
index b8de3114b97f..5f2f48390a09 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/mysql-connector-j-${PV}"
 
 LICENSE="GPL-2-with-MySQL-FLOSS-exception"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 ~x86"
 
 CP_DEPEND="
 	dev-java/c3p0:0
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index cc857d392f9d..e3086c38d4fe 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 0d396d9f3aff..029e7cca2add 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -14,5 +14,5 @@ DIST erlang_doc_html_26.0.tar.gz 37434137 BLAKE2B 0a1bd0f4966d90cc5aaa8852b28020
 DIST erlang_doc_man_25.3.tar.gz 1719335 BLAKE2B d3d91e5920648ddb5b8375c969586b904d743f1d60acbefddd98577bd11b82246a2f149fdaa8ff1d16e8efc9f3793ce1dbc61efc9bc28c68f50919460d1e8e24 SHA512 9f2e6c4e4a39dd41deb6a2d7b7a04dd374f110bf776c8d08f3139265a8fa00e7c9420e2d2c406231a8d2748bdc65ca7e40ef1d4b9bfe6b06f52a24881ee8747d
 DIST erlang_doc_man_26.0.tar.gz 1742307 BLAKE2B cd52b6e148fd45a1a1b427fa9dccdb7127082f0cfc23a850c519a9dc9e6cc7e0fca3894433d44dcad27e2a8123626b09d86b7f581e503d977f0977ef62a574d8 SHA512 9e3fc06667e633fd1c90f57d86159cbbdbb6105719e3c1ab6733e5190aa48b8c8fbf735172e5763b6893e89a56ec13c0afcdf6c6505de739312b37ff246ed113
 EBUILD erlang-25.3.ebuild 5093 BLAKE2B ac5a0bdbe5247fcf32cdc88db5ee0af5b6496d67e752b70bcf8a28be8d57086eaa42f4e5705f11bf37a8ae3e3ada0262292b987df75c858b86c5ed8f5a257539 SHA512 5fff2f7d103024388e7c3231380bc4ad04d00ea68eab4abfca0df7f037789dc65463c8ede3d181d55aaa6bac4add07a98f9303ccfca5eb778e9ebfeb3ba690b4
-EBUILD erlang-26.0.ebuild 5098 BLAKE2B 4507ac29eadb7faabe8f02e62f4c85494a5d1c587c277c16c4324db9bbed3acbc81da26b7c16a22cd7d484c4e836eb93daf8bcc2f086670d913018b01ce54407 SHA512 e449030c6d67c04a54b21da7b5fd3d5f56217e42fe8693afc30447c3cba9639a283306fc2766adc99273f24574515a43e11be7c20b2282436bc406eb60c2a9a5
+EBUILD erlang-26.0.ebuild 5096 BLAKE2B f76f90738ffd3da9425b0f3bcf90f353088fcea9c0574a12b0e576555d8299bcc9db5f122bf1abc699dc15c24f3b4e349ace023435061fe99e3143c9972c64e9 SHA512 592c6dccd8921b2418066c6c8928ce50fd8e1eb112b3515520f285a89cf0629636c645d9dec2d1739d747a5c084974ef9a476f117542c2fc3e6532a969f7516f
 MISC metadata.xml 749 BLAKE2B 32f06b2fa8579a65cdf259a76df093da6e8d5c27497f8167d8288947076a11960606ad23567bb4984d6b24270965dbd7563b8c9ae08f8f69a8968ac102f32a8e SHA512 4dc1b01adfab93b5ea99876cbd7a4a9a39e66f6417b7e84a9341dab91f3d63fa903b69e4d827a656a709d4308f32ee0bd4a9594b87b3d3d05543249c847ca3c0
diff --git a/dev-lang/erlang/erlang-26.0.ebuild b/dev-lang/erlang/erlang-26.0.ebuild
index c3fa924e7389..78e7e9c279f5 100644
--- a/dev-lang/erlang/erlang-26.0.ebuild
+++ b/dev-lang/erlang/erlang-26.0.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3b1e7f12e8b3..680d362cf8d6 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libmpack/Manifest b/dev-libs/libmpack/Manifest
index db436aa0ad65..540108d74a0d 100644
--- a/dev-libs/libmpack/Manifest
+++ b/dev-libs/libmpack/Manifest
@@ -1,5 +1,4 @@
 AUX libmpack-1.0.5-libtool.patch 2022 BLAKE2B 1b1104b35a79d1bd3595353ec238fd13ece6a369d10999a5c7b627a7c9a98a24fad880970cda5d324cd95e434ae4f31e044ff6702a307f7811bf0833372afbb9 SHA512 dcb0029018df34aa5530ef6f9f0c8ffec7d33288e8854273db98c823f03663d260837c80846acf5571400dd0f78588f26fe62b20a2f9469c09f22189b0a65fff
 DIST libmpack-1.0.5.tar.gz 32966 BLAKE2B 8ad01de11c740c3efc7b42046b89f7691dd32d228e126485bc49224e54789e7f12a611982c0fd9d2bbe8b06d1ce2df1ceea1b302e139e30d0a8c31f251129166 SHA512 6e30edafcacfb580b410bc6749ed7fe8f18b3be0cb98959339853e77bc3ec0cda6df08a0f1f22768cfc773458a2ea6bcef4f0421eea55cf56c58981d13711a04
-EBUILD libmpack-1.0.5-r3.ebuild 1437 BLAKE2B 1a236d45146ae43ae74b39e9e06ef40c105a1c14921c2ff619e9ff5b7bf18979881defb58fc9f38f019c0712db0adeb3324aaae6bc80672b540d0b822edf6b2b SHA512 50fdc0705b1abf50d5cc3b358c7e3a324ea3a0215bac09f2bae802c7e91ccd9b99e367232c8c86eefc94635e2bc40695d3da068f9b14a5053a691afe8102cf46
 EBUILD libmpack-1.0.5-r5.ebuild 1461 BLAKE2B 219285e8bd490686a519db3739906d057f74987d01054c65cfeb1338d59ba6bed0eb5072ae27f95682ffb515817f5e7312563fe2d4b07133165bdd0b776ceb72 SHA512 061cdc8920b232d85e50060ea01f635c23d22b9b5cda73afe486383a2b83b96308332a1296986ba96643c44a50418f709bf3d61c4d492b67037f426c67b236df
 MISC metadata.xml 333 BLAKE2B f3e54e3a241a85adad55693f7dd3cc47cc646d1432b4281c264c849fb2a2bfc050aee53f5ae766063335b72c3ca91ed9054bac758d82c969acb61913f7282940 SHA512 aa83f4113099ecf8b749a070014b9d9c09fc1c0d4836f2cf621b2966088cf3ee73e26ab4f365063713db353671ad5937f98ffe4c87762c6e196cd57c8eb595ea
diff --git a/dev-libs/libmpack/libmpack-1.0.5-r3.ebuild b/dev-libs/libmpack/libmpack-1.0.5-r3.ebuild
deleted file mode 100644
index 961da8a30902..000000000000
--- a/dev-libs/libmpack/libmpack-1.0.5-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Simple implementation of msgpack in C"
-HOMEPAGE="https://github.com/libmpack/libmpack"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libtool.patch # 778899
-)
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-ggdb//g' -i Makefile.in || die
-	sed -e 's/-O3//g' -i .config/release.mk || die
-
-	eautoreconf
-}
-
-src_compile() {
-	local myemakeargs=(
-		"VERBOSE=1"
-		"PREFIX=${EPREFIX}/usr"
-		"CC=$(tc-getCC)"
-		"config=release"
-		"LIBDIR=${EPREFIX}/usr/$(get_libdir)"
-		"INCDIR=${EPREFIX}/usr/include"
-	)
-
-	emake "${myemakeargs[@]}" lib-bin
-}
-
-src_test() {
-	emake VERBOSE=1 XLDFLAGS="-shared" test
-}
-
-src_install() {
-	local myemakeargs=(
-		"VERBOSE=1"
-		"PREFIX=${EPREFIX}/usr"
-		"DESTDIR=${D}"
-		"LIBDIR=${EPREFIX}/usr/$(get_libdir)"
-		"INCDIR=${EPREFIX}/usr/include"
-		"XLDFLAGS=-shared"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local file="libmpack.0.0.0.dylib"
-		install_name_tool \
-			-id "${EPREFIX}/usr/$(get_libdir)/${file}" \
-			"${ED}/usr/$(get_libdir)/${file}" \
-			|| die "Failed to adjust install_name"
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index e158b811469d..6141ecd1742f 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Text-BibTeX/Manifest b/dev-perl/Text-BibTeX/Manifest
index ef59e1a1bdac..1c15ae4c056c 100644
--- a/dev-perl/Text-BibTeX/Manifest
+++ b/dev-perl/Text-BibTeX/Manifest
@@ -1,5 +1,7 @@
+AUX Text-BibTeX-0.890.0-dont-clobber-fortify-source.patch 508 BLAKE2B 15f981a690d9370250fbeee3a8469023c7f2ffbe4deb268f910c02b2d5df22903f207e3cacf812ff0cb53875754b66c1ddab1626efee1310c6407a14f73013ec SHA512 d48b0512a03d3946fe5a798b155b6789cc9f1f7a07b83e132898eb94a4980a2213e70b62322116ec855ae5d133f14066e4404cf209362b3cdb87d05dd8f9f2da
 DIST Text-BibTeX-0.88.tar.gz 301812 BLAKE2B 8a8249a95ef6a8af29346ba647543ebfb7cc24f18271fb79f2bb5b427b6e1fdc38c4e485ee7fba33b22f061c075533871fe6f6e226f6825313618d70632726c8 SHA512 63425590feb479b43b70605144edad400650471ddefbc3dc40f5bd1b6c78e5e50eabaf60501e469de520e36221bebd1806eae8d45124b59feef9446fc3257d18
 DIST Text-BibTeX-0.89.tar.gz 301944 BLAKE2B afa3eb33dddde963d905c56df253b027745db3762fb90bff86513838e27904ad3a1800917167375c7dfc074573235bbddb4a8eb82e0224a818af34a0e51cbae2 SHA512 68f730fbacf541e693181d7b1f74bf7531222f3933a95651940d2ee5d48806188f2ab64329edf90eb3393d7fc3ddd58476b9908fde60e758c949c0ede6154d5b
 EBUILD Text-BibTeX-0.880.0-r1.ebuild 959 BLAKE2B 14dc8279e909b7726755432ae7c2364e1125a02cdc7dd102df307f282162941cc07f7049e2a3a1f1e34ab333644225670672c3a8b6de5106a6d32034fe9d99c6 SHA512 3b9a7f5de0a85dc23220082bda9eb22e8e10e26cb329b60fe99d9bf6e322b6fe1461679e22d9727676fa1b1655deef6a6e4f5fbe8b6a630b5fa78e2237b4e761
+EBUILD Text-BibTeX-0.890.0-r1.ebuild 1037 BLAKE2B e0893823174098375ca6f468e90ff3d978c6ea690a8596e969b83aeb5f2f0cc4cd47606ef342abc1179e0cf9c45861e344c0c33b4b005b38710baf4e249989a2 SHA512 bfb66dc6a351c39ea7fa4441609320b52fa03ec8636331716a784bd38b859bba63b990683090e83072ed10b2f406fe610d16e4fe965872c213bbb7057e2ecaa3
 EBUILD Text-BibTeX-0.890.0.ebuild 959 BLAKE2B e1f82356fbb57f95f794b6d4eff504ed1fe611c849f9c52fcd66f684d48bd4814a63dd8d07cfb6f8b326b942b958f1f4ee296517c8ef415d56ec0e95f8c3feb0 SHA512 4f87fd8e2bf10aadb04df84eb724b1c62312248511fa64cc0bd22fe93f901be9e5755282c07a455f9e3bd89697a03dd83736c1ea68d865c90d6aaaa7658da78d
 MISC metadata.xml 1226 BLAKE2B 1a5d9fb827f28fb5a01dcae4aeb71d8c4d249e76ae7ad9b361948f321d6a0e849a0a6cfd3777b7593eb8cce43f9b1a105886882048ebc7f833637d3d3627882f SHA512 ada20ffa3e4d4eb7876e0ebe12156643b774b4aff2167b65718fa6462b1361ebcd244c066af878084067b8dfc975ca49c8da540f8fefc5855e205be63bf75e21
diff --git a/dev-perl/Text-BibTeX/Text-BibTeX-0.890.0-r1.ebuild b/dev-perl/Text-BibTeX/Text-BibTeX-0.890.0-r1.ebuild
new file mode 100644
index 000000000000..278620286778
--- /dev/null
+++ b/dev-perl/Text-BibTeX/Text-BibTeX-0.890.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=AMBS
+DIST_VERSION=0.89
+DIST_EXAMPLES=( "examples/*" "scripts/*" )
+
+inherit perl-module
+
+DESCRIPTION="A Perl library for reading, parsing, and processing BibTeX files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+
+RDEPEND="
+	!dev-libs/btparse
+	virtual/perl-Encode
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Unicode-Normalize
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-perl/Config-AutoConf-0.320
+	>=dev-perl/ExtUtils-LibBuilder-0.20.0
+	>=virtual/perl-ExtUtils-CBuilder-0.270.0
+	>=dev-perl/Module-Build-0.360.300
+	test? (
+		>=dev-perl/Capture-Tiny-0.60.0
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.890.0-dont-clobber-fortify-source.patch
+)
+
+src_prepare() {
+	sed -i -e "/#include <stdio.h>/a #include <string.h>"\
+		btparse/tests/{tex,purify,postprocess,name,macro}_test.c || die
+	perl-module_src_prepare
+}
+
+src_install() {
+	perl-module_src_install
+	doheader btparse/src/btparse.h
+	doheader btparse/src/bt_config.h
+}
diff --git a/dev-perl/Text-BibTeX/files/Text-BibTeX-0.890.0-dont-clobber-fortify-source.patch b/dev-perl/Text-BibTeX/files/Text-BibTeX-0.890.0-dont-clobber-fortify-source.patch
new file mode 100644
index 000000000000..2acdbca78e55
--- /dev/null
+++ b/dev-perl/Text-BibTeX/files/Text-BibTeX-0.890.0-dont-clobber-fortify-source.patch
@@ -0,0 +1,13 @@
+Don't override our compiler defaults.
+
+https://bugs.gentoo.org/893592
+--- a/inc/MyBuilder.pm
++++ b/inc/MyBuilder.pm
+@@ -208,7 +208,6 @@ sub ACTION_create_objects {
+         $object =~ s/\.c/.o/;
+         next if $self->up_to_date($file, $object);
+         $cbuilder->compile(object_file  => $object,
+-                           extra_compiler_flags=>["-D_FORTIFY_SOURCE=1",@EXTRA_FLAGS],
+                            source       => $file,
+                            include_dirs => ["btparse/src"]);
+     }
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 222968b3de30..96e0f2941717 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
index 84b9ed27041a..25293dbecf26 100644
--- a/dev-util/ccls/Manifest
+++ b/dev-util/ccls/Manifest
@@ -1,6 +1,6 @@
 DIST ccls-0.20220729.tar.gz 160861 BLAKE2B db096f0f1e1d56967086e2711af63f4882e77128236b3d1af3cc107a3b320aa29bcacd4b21769904727261b5608bb2c8409dbb0f3b0d9b0907a94f3bb7c966c8 SHA512 63cb4eace1700118f9c8c4d2f4be40aac948f9c658485c8e3f49dcc863ce7bdd8b6de810b95ec8f46c943b65c8aa5fa643b110a6b981a2e43f57569d897d36c1
 DIST ccls-0.20230717.tar.gz 161869 BLAKE2B fea3d484027d6b1493627e1bd3ea8f031b3486db7d41c34b94715a0abee342f0d87f85226ac567736013a71135325b3c9d13f6fe29b73db1b8dbc87586c16e1b SHA512 f0fe31877151b76cabc17aa2ef8d3d87038805fbe43ca807e2e0824e90d952b1f5767f151788480aedf58e2ff569b72978fceeaca6b741b00c643d73f6afb445
 EBUILD ccls-0.20220729-r1.ebuild 927 BLAKE2B bca9cf80e84ddfd37b0d51136b4e684a8118bfd1bb2824c00dbc56aeeff7ab93d7dce85ff537c722ebabe9bb53fac5fa2cee034ee946e7b2f8a80dd5dfaef4d9 SHA512 120629d1859d5d29c04fff073280c34c115aa7e38b4df3a923b046ba4608fd5b0707a109bc865dbd05db6a4b6b01cd2b5cd8de5e50d61167e5efff5040912b8f
-EBUILD ccls-0.20230717.ebuild 928 BLAKE2B f232d61e41fb1038400fed8e68b2a5884979e6fc74ee53fc48b02bff99fc1b67f63a63eedc90dccd967f6faeb5fcee68ece31513a7298ee42a19dff1fc6199cd SHA512 604c97ee8ef11bf7b0461d78b90f43d961f820d50887d4f27861e6fb9b15fedcb63c49d24e8e28bbc98df5322941143527d4c99d49f21cbaf5006c9f5ee6d6e9
+EBUILD ccls-0.20230717.ebuild 927 BLAKE2B 847678de1baea40d13e68a3846445886b5f8c762a700c71e0d9b30fa7d7caf46e6b68296173a19f600e240a2c54d7e7d0f5eaafd5ecc0b6d86d356c57fceef40 SHA512 1dfe95df488f2fa039d31a208f457d8fb4bd6c60b4a18d227e9e3d61a0421dc529eda5e38e704f3d69c3204449f01db15c24acf6091d43b19422fbd20263302d
 EBUILD ccls-9999.ebuild 928 BLAKE2B f232d61e41fb1038400fed8e68b2a5884979e6fc74ee53fc48b02bff99fc1b67f63a63eedc90dccd967f6faeb5fcee68ece31513a7298ee42a19dff1fc6199cd SHA512 604c97ee8ef11bf7b0461d78b90f43d961f820d50887d4f27861e6fb9b15fedcb63c49d24e8e28bbc98df5322941143527d4c99d49f21cbaf5006c9f5ee6d6e9
 MISC metadata.xml 324 BLAKE2B 83e4ab413a926db1ddf998ec8e5566a9a58fc2b3472b9d137356ebf3c08d4ca888a5252baeb0e10f298e31eca4bb4ea1a9b67c752590807be3ce27f8b3742327 SHA512 00dfaff2972f7ea5df02c207b8211475acafcbba5bef4c5ce3ceb09924db2bb3f009e155aab43866903e7442008d058261f07464f43f9295a4d1be6ed0cfec02
diff --git a/dev-util/ccls/ccls-0.20230717.ebuild b/dev-util/ccls/ccls-0.20230717.ebuild
index c6b39f910fd1..99f199c0f4f3 100644
--- a/dev-util/ccls/ccls-0.20230717.ebuild
+++ b/dev-util/ccls/ccls-0.20230717.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 21e95faf7dc6..0a71296f545e 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -4,5 +4,5 @@ AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb76
 DIST intel-graphics-compiler-1.0.14062.11.tar.gz 8415633 BLAKE2B 1dd65e37a6d2aa7539aa9d5700921ad9c75c3a5cb6a66870adbe9fac888eb16cc772574666f05ce02d165f8954c7b4ebbfbc2ed2008fdd86c5bbb472b95959ae SHA512 0fd2790997268b102ded0af47d4133cf251791c7ecd15758b378a0cdf6d6640d78cc68b2de0b003710a36da4d4750c7fa90eb2ac5aa1702164e46109fafd980d
 DIST intel-graphics-compiler-1.0.15136.4.tar.gz 8942086 BLAKE2B 5008b9d255cd9923de73ef07929215b3e2c14d46c37ee0730d0c25ec1f109bd59fa1178cd7e085cf9b7009cf820cdf29a2a880b9f1c1528f494c300d21535732 SHA512 22c676bec940c91bae0a5cd36f904febbab2e4e60dc8379f2068adb9b1cd2de8d37aa1c66dec2616f1a761e862b58676aa484cdcdf7bdd002222bdc337571bc8
 EBUILD intel-graphics-compiler-1.0.14062.11.ebuild 2655 BLAKE2B 4c078439167bfbd637aa2ae058e3fbe0b7a274217a2f8af9778e0e75bbb727a4f15427aaf849446a50ef30bba4e82e587072e97e2c9369588f6ec91b4dfc3d3e SHA512 0d0f40c58e1751e0e15c2337c3b7f71f6c40afca1e31b93a1fbb13efd8c14666d80ae46a2fc9007cb02b7cdaed085a37e6ebbbab9daa71ef12d643927a8845f9
-EBUILD intel-graphics-compiler-1.0.15136.4.ebuild 2656 BLAKE2B d04b7d39582b235de0243ae5e32aff30e4ba23940c3af8b11a7990264b9a6a2801fb9f5e9e20246e4fb3f7fa8a4c8eda5b471c2d027566578775bff172cb18d9 SHA512 d454459105cf00e91300df5c4b6be0430df4ada2399c0ac3249210258b15892ebd14ab9a7c163f108c2e10903cf0812aefe8ad1f90c8bf9186434c7e87d4fe86
+EBUILD intel-graphics-compiler-1.0.15136.4-r1.ebuild 2830 BLAKE2B 21429b8daca0e017c6eac88fca960af808cbdc310a4354a05c1f58dcc85cd5e29ab4ba03738c952b3dfb11f26ed2b92713626487b39673f46a4f5531da8d0b04 SHA512 89cd6d90be025a5b8d31d43d462eed4f63e2728dafbc93c8f2645882a79cf4bae07ae6abbc87111a262c8ec6401ca4cf95f2a7d042c14f86c23580fa97f7129b
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15136.4-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15136.4-r1.ebuild
new file mode 100644
index 000000000000..4af5fe6fad51
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15136.4-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="15"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+	dev-util/spirv-tools
+	sys-devel/lld:${LLVM_MAX_SLOT}=
+	sys-devel/llvm:${LLVM_MAX_SLOT}=
+	vc? (
+		>=dev-libs/intel-vc-intrinsics-0.12.1-r1
+		dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+)
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't hardcode FORTIFY_SOURCE
+	sed -e '/-D_FORTIFY_SOURCE=2/d' -i IGC/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+	local llvm_version="${llvm_version%%-r*}"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
+	append-flags -U_GLIBCXX_ASSERTIONS
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__OPENCL_HEADER_PATH="/usr/lib/clang/${llvm_version##*-}/include/opencl-c.h"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DINSTALL_GENX_IR="ON"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15136.4.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15136.4.ebuild
deleted file mode 100644
index 1d957af7dd89..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15136.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="15"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug vc"
-
-DEPEND="
-	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
-	dev-util/spirv-tools
-	sys-devel/lld:${LLVM_MAX_SLOT}=
-	sys-devel/llvm:${LLVM_MAX_SLOT}=
-	vc? (
-		>=dev-libs/intel-vc-intrinsics-0.12.1-r1
-		dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	=sys-devel/lld-${LLVM_MAX_SLOT}*
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
-	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
-	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
-)
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't hardcode FORTIFY_SOURCE
-	sed -e '/-D_FORTIFY_SOURCE=2/d' -i IGC/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Get LLVM version
-	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
-	local llvm_version="${llvm_version%%-r*}"
-
-	# See https://github.com/intel/intel-graphics-compiler/issues/212
-	append-ldflags -Wl,-z,undefs
-
-	# See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
-	append-flags -U_GLIBCXX_ASSERTIONS
-
-	# See https://bugs.gentoo.org/718824
-	! use debug && append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
-		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
-		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
-		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
-		-DIGC_OPTION__CLANG_MODE="Prebuilds"
-		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
-		-DIGC_OPTION__LLD_MODE="Prebuilds"
-		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
-		-DIGC_OPTION__LLVM_MODE="Prebuilds"
-		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
-		-DIGC_OPTION__OPENCL_HEADER_PATH="/usr/lib/clang/${llvm_version##*-}/include/opencl-c.h"
-		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
-		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
-		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
-		-DINSTALL_GENX_IR="ON"
-		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index cdb721fe4788..c08c6782ebab 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -20,6 +20,6 @@ EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed8741
 EBUILD rebar-3.19.0.ebuild 2462 BLAKE2B 52b97493bde303b742e274dd294bde9df57a89b4bd4bce81034599e2297a73198373e9588da48fe54dc58e57b3100025a75fb78117c91fa76190a3b8795f8ffe SHA512 93c6921f3d94ebcf7d37f9e4f0d68717cb4e7e7924fac52297f95162940ba4ca8e2160b42cf37139721ad9c51ce63ab9cde1b71ba29491db2c1b409cc5e69c79
 EBUILD rebar-3.20.0-r1.ebuild 1467 BLAKE2B 4431e40b79721f27e5ad2115ceb2613c6c96149dc3a0db1d1b1fbe51a95ce9147e76440359a5b6357bd360eeb1255a4788f5fdb21cc9e4a0f7a5ca4613137eea SHA512 f50c2cdae112c820f099c4ccd0abd6cf86376c4c88ffff6447a4a867521966e8d09d566c4cc35dd33902a205820c927fff7c824f6ac009d042ebf5e4e3a72086
 EBUILD rebar-3.20.0.ebuild 1360 BLAKE2B 1b74606b259767109415f9f8657d77a04d91810ce0bd96176b92dfc6351bd3833e35caae6d4d74dcec1fd7d08a6e54b1f2f6915a1f8efd11ee4b2a32b7aa6527 SHA512 9d4da37362e8c66dc544f0667d14f094e7007c2948362a3d62cb8051cda790ca63441172911a93b5106320e8ceb9b1c8966675c6af55b29155f2e97ca47690a4
-EBUILD rebar-3.21.0.ebuild 1467 BLAKE2B 4431e40b79721f27e5ad2115ceb2613c6c96149dc3a0db1d1b1fbe51a95ce9147e76440359a5b6357bd360eeb1255a4788f5fdb21cc9e4a0f7a5ca4613137eea SHA512 f50c2cdae112c820f099c4ccd0abd6cf86376c4c88ffff6447a4a867521966e8d09d566c4cc35dd33902a205820c927fff7c824f6ac009d042ebf5e4e3a72086
+EBUILD rebar-3.21.0.ebuild 1462 BLAKE2B 1a95bdbeb3842cc303603f09d85ce1d86351121febb07ea01e31cb01403770c1c120112e5c7a6aa59dc44646b94a22da071ae3e4c9b7c3222d7c0faaa3b03090 SHA512 547dfb2625d62c36b58251aca9afc2592f3c3412203387f5122c78c19706f17febfa89f9599ca6906d259485ede55fe9ffcb2a47110043e5e25b207d2d3e9cba
 EBUILD rebar-3.22.1.ebuild 1467 BLAKE2B 4431e40b79721f27e5ad2115ceb2613c6c96149dc3a0db1d1b1fbe51a95ce9147e76440359a5b6357bd360eeb1255a4788f5fdb21cc9e4a0f7a5ca4613137eea SHA512 f50c2cdae112c820f099c4ccd0abd6cf86376c4c88ffff6447a4a867521966e8d09d566c4cc35dd33902a205820c927fff7c824f6ac009d042ebf5e4e3a72086
 MISC metadata.xml 361 BLAKE2B d58dbad87667d782d0b5d81f0d9166b4e93dc0dea86b7b665acd6463c945949425746085f1a36cc952ad0ca3bcd7acb949a855c2aa57eae8a18bfd16120da1ae SHA512 aa1aae5e0688d6e921d4018714a37f079a333282baff352d7faeef3b1810471be421c99a705b1b97de0cb5c846efb69b3ec4f018033cb56efc307164fb8871c3
diff --git a/dev-util/rebar/rebar-3.21.0.ebuild b/dev-util/rebar/rebar-3.21.0.ebuild
index 71d819de495b..92132ff1378f 100644
--- a/dev-util/rebar/rebar-3.21.0.ebuild
+++ b/dev-util/rebar/rebar-3.21.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_PN}-${PV}
 
 LICENSE="Apache-2.0 MIT BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f3aa1603c931..6e094db60e5d 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 4f537bf2291e..e488153c62fe 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -1,6 +1,7 @@
 AUX libvpx-1.12.0-configure-clang16.patch 1466 BLAKE2B e13ec892716dcd9c3940fe955a9e0feddca7ab2af5fbdfd1be6443f2d87b341e626de036244793a403e6ff18080413d2c728e5af88cdb44fb2deab95a422c70b SHA512 86180645d90be302253ac3285bb32764c783a42794f45294ece8647d77f677385afce7b633bad3b5d92c095fe607b8b566fbba960391cf3ed8157884bd5ef1c7
 AUX libvpx-1.13.0-VP8-disallow-thread-count-changes.patch 1888 BLAKE2B fde61e53d8e10a3868504177d2d501ed677ceb5a3d5dd8d8c3a0a3a1b3f3f2edb1b4c31feffa6ae10b28d87f30ff0970bec75d6526743913a930651ed158ac71 SHA512 82d5119cff69896bdf8179c35cef767f83b12f9912f7032ae8f1762ef35c92a318e37e70ad9f78a4e1566b473245fe6c93ac9fe0695ef451a3910fd28e9c81fb
 AUX libvpx-1.13.0-encode_api_test-add-ConfigResizeChangeThreadCount.patch 3352 BLAKE2B e20a9075c41da85f8dcdf94d3970198266ae8467c5f2742ed71d3c7b37660420cb7f37b9b4c28dc45fd5348de4ef7d1fd9ce826b6971c048f993cd8dd126a39e SHA512 bad341f03950142049645d7b0e27520edd11cf5dc944397df87049c2b55d0c708bbe42fd56c5f1a086a7fb4398663fc632730c77a1e0544d577453089c603758
+AUX libvpx-1.13.1-allow-fortify-source.patch 787 BLAKE2B d2e9d0eb8058632ddbc3261593ae5f035566115b7f2f049b7850447673e0ac56631e7a3c091975383c0b4d68efa8a85b862550e0508246a45409f683e742eaa8 SHA512 cb95a16c6de15081f3236fd45acd7ea17d68721b20a02d01ea6f905300ef7429d23b723bc0c5669fef00b13adaf7d09ccf4b68e45ff31e66df64e0c2db9289d3
 AUX libvpx-1.3.0-sparc-configure.patch 406 BLAKE2B 02b1f0484a9659fdc90eb567db517a8b63f679521ae9ab510bfaa88b9fd5e1430d0eceeb8e4a138b00cb43ac4a1db6451dd29a808367973dc885fe5b9eacd665 SHA512 159ba5577fc0eee3e958740d8607a7570f374a8f64a36f1e7832a126482ec0bb96ba2be451eefdf50d84a412a2be73ae75da3d69da78ec13dfe0e24a14685035
 DIST libvpx-1.12.0.tar.gz 5465627 BLAKE2B 92e61ef91ef3bb7e09f359acdef6469843921345b1008a7a24042587fbcfc72c4671fc9eb4e1bf8c1e9de0fa5506ed751dcd6934a9164a6e0fe528cfe8c23154 SHA512 dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0
 DIST libvpx-1.13.0.tar.gz 5515327 BLAKE2B 410be36bf10011171bf15f1219066cf559c8b11e66493f9f722af7217896a467b63934a7e6819144ff697ae90e3ebbac3e5fe93e961d6a68310881c646582f11 SHA512 686cb526b46d5a054d35263b24f54e977149a244e97c95bcdd9aba2d75e045b2d51be2b7f9754302826b4c5450ee2f177f440b41c04c83b8b1661f1c14301c60
@@ -11,5 +12,6 @@ DIST libvpx-testdata-1.13.1.tar.xz 495765552 BLAKE2B 4aba008653b645c1adbfc0f4e20
 EBUILD libvpx-1.12.0-r1.ebuild 4298 BLAKE2B cf4d4610f3ded71551126030e2b46a0e79aa2d0409621f4f7501f1b6f69facec0173c7d9b5b0f5391ac80cb4e797765225cd5326bb00ef52dc1dfb26e1e2ae2d SHA512 7773a3927a9355b855aa9ab43cb162f32b1661d670b36077e685d5bbbf2e0a8b7a2ced7ead593ceb4133261f2fa50ad345f74b939e7625384f57bedbeb7a568b
 EBUILD libvpx-1.13.0-r1.ebuild 4371 BLAKE2B 263c9114dd8b067490ce0c36b949030cd5fc1da55dc025cfc1a52e4a3568681bec471f38aa5a023990bf952cc8fb61caa44c1578761844ca0e22f0d954f469bd SHA512 64509610ab3112638b9b4f8c1eae06a6b69f75706c9480e3d189ae2b685dd575d39afba1c805494de0258c1bdc51012a721dc1937a3a54558782b5ddaf1dfe7a
 EBUILD libvpx-1.13.0.ebuild 4220 BLAKE2B 090cfb41d4efa2475a636aee90d12c8636d84ff02aaf4589ab19248dcc4ac4ac920d2640e89dc35e342dd6754878a67721ca637f650d9149a7640c72ff51da16 SHA512 8d781d69c1c82e582b4f57f2441d503b4b9c148584344ee791a76b0eba8ccf0cf159a00826adca2402f1aac76a75d4764348710f13421c8f8eed6b0807036d36
+EBUILD libvpx-1.13.1-r1.ebuild 4280 BLAKE2B 647ce943505528d4093cb0915f65f50b745b243756452f1a4a878a3fde5eada015e237ff8ae128c0c2627c7a6211b8f5f1a19cb588ec5f2fdb09baa4ab33cb0a SHA512 6e2a9f88341ca6537d0105a2d0379e9ea5f522c811f03db2bd4faf1224926979009de53f06cf95f208465346ed1b2fc954daa40f95f4c84f33b3e2ef30ed7702
 EBUILD libvpx-1.13.1.ebuild 4220 BLAKE2B 00e6912d99e551a16141d9edc09ba2631189e40371c2523e5791b6262ba037857be05ab82d98fd7d300285b31d97e904f340d740e7040ee86a6bc20b76497cd3 SHA512 7b66edfec367033ef1ac4b254c7989b3ded86d1b5b0cb4d9841e3d029b331aa414c0c8554815c22185b0bb9c871b480b0020b797e6c6e420c2db8c3cef8151e6
 MISC metadata.xml 655 BLAKE2B 00bcc63009898b794c7e142cd83096f779758e0d5ce274d10f97cc08f4b98f929719c01898d64137aa125c7628bb991fb128d07a490e7e7b029be6f1041e28ac SHA512 0d2dd46ed564109ca5cd841b41ccc30ddb45e5c0e416624b7e8c0895d67217cfcc71cba0d13ab96af2a898add5f1cf8feb44b6a015ff8487668055c0f288e9fc
diff --git a/media-libs/libvpx/files/libvpx-1.13.1-allow-fortify-source.patch b/media-libs/libvpx/files/libvpx-1.13.1-allow-fortify-source.patch
new file mode 100644
index 000000000000..5928c4e46723
--- /dev/null
+++ b/media-libs/libvpx/files/libvpx-1.13.1-allow-fortify-source.patch
@@ -0,0 +1,17 @@
+This was originally added for ABI reasons in a case which barely works / doesn't
+work at all for glibc anyway, see https://github.com/webmproject/libvpx/commit/b73a3693e581583e9ec676f4396d0c3d173e2462.
+
+We want fortification and we definitely don't want it explicitly turned off.
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -1495,10 +1495,6 @@ EOF
+   # shared objects
+   enabled gcc && enabled pic && check_add_cflags -fPIC
+ 
+-  # Work around longjmp interception on glibc >= 2.11, to improve binary
+-  # compatibility. See http://code.google.com/p/webm/issues/detail?id=166
+-  enabled linux && check_add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
+-
+   # Check for strip utility variant
+   ${STRIP} -V 2>/dev/null | grep GNU >/dev/null && enable_feature gnu_strip
+ 
diff --git a/media-libs/libvpx/libvpx-1.13.1-r1.ebuild b/media-libs/libvpx/libvpx-1.13.1-r1.ebuild
new file mode 100644
index 000000000000..3ac3d45d048a
--- /dev/null
+++ b/media-libs/libvpx/libvpx-1.13.1-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs multilib-minimal
+
+# To create a new testdata tarball:
+# 1. Unpack source tarball or checkout git tag
+# 2. mkdir libvpx-testdata
+# 3. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
+# 4. ./configure --enable-unit-tests --enable-vp9-highbitdepth
+# 5. make testdata
+# 6. tar -caf libvpx-testdata-${MY_PV}.tar.xz libvpx-testdata
+
+LIBVPX_TESTDATA_VER=1.13.1
+
+DESCRIPTION="WebM VP8 and VP9 Codec SDK"
+HOMEPAGE="https://www.webmproject.org"
+SRC_URI="
+	https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )
+"
+
+LICENSE="BSD"
+SLOT="0/8"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_ppc_vsx3 doc +highbitdepth postproc static-libs test +threads"
+REQUIRED_USE="test? ( threads )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-lang/perl
+	abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	doc? (
+		app-doc/doxygen
+		dev-lang/php
+	)
+"
+
+PATCHES=(
+	# bug #501010
+	"${FILESDIR}/${PN}-1.3.0-sparc-configure.patch"
+	"${FILESDIR}/${PN}-1.13.1-allow-fortify-source.patch"
+)
+
+src_configure() {
+	# bug #384585, bug #465988
+	# copied from php-pear-r1.eclass
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/
+	addpredict /var/lib/net-snmp/mib_indexes
+	addpredict /session_mm_cli0.sem
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# bug #357487
+	unset CODECS
+	# bug #905986
+	unset DIST_DIR
+
+	# bug #498364: sse doesn't work without sse2 enabled,
+	local myconfargs=(
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-pic
+		--enable-vp8
+		--enable-vp9
+		--enable-shared
+		--disable-optimizations
+		$(use_enable postproc)
+		$(use_enable static-libs static)
+		$(use_enable test unit-tests)
+		$(use_enable threads multithread)
+		$(use_enable highbitdepth vp9-highbitdepth)
+	)
+
+	# let the build system decide which AS to use (it honours $AS but
+	# then feeds it with yasm flags without checking...), bug #345161
+	tc-export AS
+	case "${CHOST}" in
+		i?86*) export AS=yasm;;
+		x86_64*) export AS=yasm;;
+	esac
+
+	# libvpx is fragile: both for tests at runtime.
+	# We force using the generic target unless we know things work to
+	# avoid runtime breakage on exotic arches.
+	if [[ ${ABI} == amd64 ]] ; then
+		myconfargs+=( --force-target=x86_64-linux-gcc )
+	elif [[ ${ABI} == x86 ]] ; then
+		myconfargs+=( --force-target=x86-linux-gcc )
+	elif [[ ${ABI} == arm64 ]] ; then
+		myconfargs+=( --force-target=arm64-linux-gcc )
+	elif [[ ${ABI} == arm ]] && [[ ${CHOST} == *armv7* ]] ; then
+		myconfargs+=( --force-target=armv7-linux-gcc )
+	elif [[ ${ABI} == ppc64 ]] && [[ $(tc-endian) != big ]] && use cpu_flags_ppc_vsx3; then
+		# only enable this target for at least power9 CPU running little-endian
+		myconfargs+=( --force-target=ppc64le-linux-gcc )
+	else
+		myconfargs+=( --force-target=generic-gnu )
+	fi
+
+	# powerpc toolchain is not recognized anymore, bug #694368
+	#[[ ${CHOST} == powerpc-* ]] && myconfargs+=( --force-target=generic-gnu )
+
+	# Build with correct toolchain.
+	tc-export CC CXX AR NM
+	# Link with gcc by default, the build system should override this if needed.
+	export LD="${CC}"
+
+	if multilib_is_native_abi; then
+		myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
+	else
+		# Not needed for multilib and will be overwritten anyway.
+		myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
+	fi
+
+	edo "${S}"/configure "${myconfargs[@]}"
+}
+
+multilib_src_compile() {
+	# Build verbose by default and do not build examples that will not be installed
+	# Disable stripping of debug info, bug #752057
+	# (only works as long as upstream does not use non-gnu strip)
+	emake verbose=yes GEN_EXAMPLES= HAVE_GNU_STRIP=no
+}
+
+multilib_src_test() {
+	local -x LD_LIBRARY_PATH="${BUILD_DIR}"
+	local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
+	emake verbose=yes GEN_EXAMPLES= test
+}
+
+multilib_src_install() {
+	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
+
+	multilib_is_native_abi && use doc && dodoc -r docs/html
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d3881ee9fbbe..e11f8896f63e 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,10 @@
 AUX clang_config_tool.patch 368 BLAKE2B 968d3b441134d196b436ceabcdff8865ef584e97da52b2b9f78f2e79d671f4e017025fbf098ba6fa9b5837fda3549b5e992089163a0bdc76a3347d5a1633cc4d SHA512 c9f7a126b56dff3ae514f91479ce071078259871b1e864295b7631266899ae17f2f355ab56c8d3933b74ffe1e762fc6ffbf93b48b0f2ad0c05858e7c69902b02
 AUX clang_resource_dir.patch 1129 BLAKE2B 40cf2bc3381d5318c95d3fdadef1bdb6bb57f3b04270e07c0a66613b6432ad617be73d34122be3280d861dde0663fc5c96bb37a9312c2e333e39e69287a9e33a SHA512 493585cf0a93fda04d4577095ae04e1c3dc37aa446ea0873e81857cd2f2c6519bbdf34f0d6e6dd47dd1e927cc776f46901ebab14c7040a92688c3868204b3856
 DIST mesa-23.1.8.tar.xz 18566724 BLAKE2B 43825c936f0dca4bc7e954cf7f8afc9566fb26d23969a9f60279a279504464b4eee966f5db34602489fb659942d11629675a1ef44493020925047bbd8cd7f0d7 SHA512 02dc6f8b10dd3827a2b62fba3035726b1b60ec0c3188817deea2ad14f80f332a37272e9f15c5f653f20cecb14f8ff91697d73c89afc83674c19b686a674b677d
+DIST mesa-23.1.9.tar.xz 18589464 BLAKE2B a4386398841476f6e69031043091cbbf0afff1ef9523e7d6216b1acc49fa8afbe5270802c78d951fee42dd6c8268bc515ed1236de4ce47a5d90e6bdd1ff16b92 SHA512 83f57c530ccc14e9debbc292f71214343f506bdf35bad235cdd3c380d769eb30658bdf93a70b79d7ce08e75615b892023e4245aed1237cd285d2f045cdbf9241
 DIST mesa-23.2.1.tar.xz 18855304 BLAKE2B 51e44c2e9b7dfe17cf4cb7252e169109d03a006caa8ec34036fb594c0c44e9278d0088170894c1a9debdea911f746470e1d256576e0635cae5c3e670ab49161b SHA512 927af0885a4815d330de384232deadf3dce7e2e2024738f138a344cbc4adce22888a9e335317f1d75965a5e691c9638949105f18c9b6ef43839fb594c6b474b5
 EBUILD mesa-23.1.8.ebuild 12747 BLAKE2B 0b638e0f433aa97a74559cab95e2e0f89eed6d7ad8ea21a31b97b3cadae27027e613b84a8d8001a9599a4847ab3c72524e7f931adc38b425f296a6d47a9ba560 SHA512 fa676410871db39c716052b45dc28df0f17ca515ae17b179b2a72442ee6822c8be1a2d62391871da4e788b6b3b07500a429f9508301a3fe5b97d600868863da3
+EBUILD mesa-23.1.9.ebuild 12754 BLAKE2B f941026963e9ae1027e51ef9db1a87467a6066ed14f60ac91eae099515f48ac66f24055e823ca3616d6c4ea2d6f235f9163f6a3f20db73d8743dd5d81a541362 SHA512 6a6668616b0c34c19b4e629fe01d3250cf8195478c2080b2ccb9c20844060314c5f6b419b565be8ba51bf27ff7ddd73ee0894a031d2dee13cf5bf823af382094
 EBUILD mesa-23.2.1.ebuild 12670 BLAKE2B fec88d2d596a54facbfa4a402405bf3fea8cca5bfb2fb5109e836555071989b13effd5fb006b135fb46e276136be6ec5b49b2514ab5624410393e4f025975d59 SHA512 5598738a1b50e7eb9c3f188f4d14c8a78ab0ff30c214ac4a2137db44cddc4c8b1d10773fd3bf80eaf3d9045473bfc6131de2bf03c290ef86258734664692abd7
 EBUILD mesa-9999.ebuild 12546 BLAKE2B 216bfc1bd7c91bc827835262d5cad0afb579b018a15befe71f8d98bea24e1032960568e9bc383b20024c0cc72616a040a8abb2e0441d61e3ff4d80df8eea0b50 SHA512 699fd602530ecdc2335c200b1f5674662d2f1698530e2dca436ca60e7230892dcbdbcfa8d4b804cb358c01c924e7bcf58506cb9f59ebabc94494763e5f946916
 MISC metadata.xml 1488 BLAKE2B 7b776f0a6d92b34baec90c58d019d61af537044766ce34a6e139ef679a0724e57fe65d600307c7f9dc0c48618445527618322e2af737191082dece3e547d5533 SHA512 1d573d534f1099eb1f1912567cf559aeae28111eabefa806b292a66d1f1e539e86394a76ca40a1481a6bfb4b6f7a0b117344e39d7b4d2eac615ef49b8f62acb9
diff --git a/media-libs/mesa/mesa-23.1.9.ebuild b/media-libs/mesa/mesa-23.1.9.ebuild
new file mode 100644
index 000000000000..57d113992835
--- /dev/null
+++ b/media-libs/mesa/mesa-23.1.9.ebuild
@@ -0,0 +1,463 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+fi
+
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+RADEON_CARDS="r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
+	lm-sensors opencl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
+	vulkan-overlay wayland +X xa zink +zstd"
+
+REQUIRED_USE="
+	d3d9? (
+		|| (
+			video_cards_intel
+			video_cards_r300
+			video_cards_r600
+			video_cards_radeonsi
+			video_cards_nouveau
+			video_cards_vmware
+		)
+	)
+	vulkan? ( video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	video_cards_lavapipe? ( llvm vulkan )
+	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_radeonsi?   ( llvm )
+	vdpau? ( X )
+	xa? ( X )
+	zink? ( vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
+RDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	llvm? (
+		video_cards_radeonsi? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_r600? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+		video_cards_radeon? (
+			virtual/libelf:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+	opencl? (
+		>=virtual/opencl-3
+		dev-libs/libclc[spirv(-)]
+		>=dev-util/spirv-tools-1.3.231.0
+		virtual/libelf:0=
+	)
+	vaapi? (
+		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+	)
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	vulkan? (
+		video_cards_intel? (
+			amd64? (
+				dev-libs/libclc[spirv(-)]
+				>=dev-util/spirv-tools-1.3.231.0
+			)
+		)
+	)
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	)
+	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 16.
+# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15.
+LLVM_MAX_SLOT="16"
+LLVM_MIN_SLOT="15"
+LLVM_USE_DEPS="llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}"
+PER_SLOT_DEPSTR="
+	(
+		!opencl? ( sys-devel/llvm:@SLOT@[${LLVM_USE_DEPS}] )
+		opencl? ( sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}] )
+		opencl? ( dev-util/spirv-llvm-translator:@SLOT@ )
+		vulkan? ( video_cards_intel? ( amd64? ( dev-util/spirv-llvm-translator:@SLOT@ ) ) )
+	)
+"
+LLVM_DEPSTR="
+	|| (
+		$(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do
+			echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}"
+		done)
+	)
+	!opencl? ( <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] )
+	opencl? ( <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] )
+"
+RDEPEND="${RDEPEND}
+	llvm? ( ${LLVM_DEPSTR} )
+"
+unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR
+
+DEPEND="${RDEPEND}
+	video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
+	valgrind? ( dev-util/valgrind )
+	wayland? ( >=dev-libs/wayland-protocols-1.24 )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	>=dev-util/meson-1.0.0
+	${PYTHON_DEPS}
+	opencl? (
+		>=virtual/rust-1.62.0
+		>=dev-util/bindgen-0.58.0
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+	llvm? (
+		vulkan? (
+			dev-util/glslang
+			video_cards_intel? (
+				amd64? (
+					$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
+				)
+			)
+		)
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib/libglapi.so.0.0.0
+	usr/lib/libOSMesa.so.8.0.0
+	usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${LLVM_USE_DEPS}]" || return 1
+	fi
+	if use opencl || { use vulkan && use video_cards_intel && use amd64; }; then
+		has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]"
+}
+
+PATCHES=(
+	# Temporary rusticl workaround: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7717#note_1832122
+	"${FILESDIR}/clang_resource_dir.patch"
+
+	# Workaround the CMake dependency lookup returning a different LLVM to llvm-config, bug #907965
+	"${FILESDIR}/clang_config_tool.patch"
+)
+
+pkg_pretend() {
+	if use vulkan; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_freedreno &&
+		   ! use video_cards_intel &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_v3d; then
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+
+	if use osmesa && ! use llvm; then
+		ewarn "OSMesa will be slow without enabling USE=llvm"
+	fi
+}
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1
+	if use llvm && use vulkan && use video_cards_intel && use amd64; then
+		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use video_cards_intel ||
+	   use video_cards_radeonsi; then
+		if kernel_is -ge 5 11 3; then
+			CONFIG_CHECK="~KCMP"
+		elif kernel_is -ge 5 11; then
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		elif kernel_is -ge 5 10 20; then
+			CONFIG_CHECK="~KCMP"
+		else
+			CONFIG_CHECK="~CHECKPOINT_RESTORE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \
+		bin/symbols-check.py || die # bug #830728
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	local platforms
+	use X && platforms+="x11"
+	use wayland && platforms+=",wayland"
+	emesonargs+=(-Dplatforms=${platforms#,})
+
+	if use video_cards_intel ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_use d3d9 gallium-nine))
+	else
+		emesonargs+=(-Dgallium-nine=false)
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vaapi gallium-va))
+		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+	else
+		emesonargs+=(-Dgallium-va=disabled)
+	fi
+
+	if use video_cards_d3d12; then
+		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r300 ||
+	   use video_cards_r600 ||
+	   use video_cards_radeonsi ||
+	   use video_cards_nouveau; then
+		emesonargs+=($(meson_feature vdpau gallium-vdpau))
+	else
+		emesonargs+=(-Dgallium-vdpau=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_nouveau ||
+	   use video_cards_vmware; then
+		emesonargs+=($(meson_feature xa gallium-xa))
+	else
+		emesonargs+=(-Dgallium-xa=disabled)
+	fi
+
+	if use video_cards_freedreno ||
+	   use video_cards_lima ||
+	   use video_cards_panfrost ||
+	   use video_cards_v3d ||
+	   use video_cards_vc4 ||
+	   use video_cards_vivante; then
+		gallium_enable -- kmsro
+	fi
+
+	gallium_enable -- swrast
+	gallium_enable video_cards_freedreno freedreno
+	gallium_enable video_cards_intel crocus i915 iris
+	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_d3d12 d3d12
+	gallium_enable video_cards_nouveau nouveau
+	gallium_enable video_cards_panfrost panfrost
+	gallium_enable video_cards_v3d v3d
+	gallium_enable video_cards_vc4 vc4
+	gallium_enable video_cards_virgl virgl
+	gallium_enable video_cards_vivante etnaviv
+	gallium_enable video_cards_vmware svga
+	gallium_enable zink zink
+
+	gallium_enable video_cards_r300 r300
+	gallium_enable video_cards_r600 r600
+	gallium_enable video_cards_radeonsi radeonsi
+	if ! use video_cards_r300 && \
+		! use video_cards_r600; then
+		gallium_enable video_cards_radeon r300 r600
+	fi
+
+	if use llvm && use opencl; then
+		PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig"
+		# See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst
+		emesonargs+=(
+			$(meson_native_true gallium-rusticl)
+			-Drust_std=2021
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_lavapipe swrast
+		vulkan_enable video_cards_freedreno freedreno
+		vulkan_enable video_cards_intel intel intel_hasvk
+		vulkan_enable video_cards_d3d12 microsoft-experimental
+		vulkan_enable video_cards_radeonsi amd
+		vulkan_enable video_cards_v3d broadcom
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	local vulkan_layers
+	use vulkan && vulkan_layers+="device-select"
+	use vulkan-overlay && vulkan_layers+=",overlay"
+	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+	if use llvm && use vulkan && use video_cards_intel; then
+		PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig"
+		emesonargs+=(-Dintel-clc=enabled)
+	else
+		emesonargs+=(-Dintel-clc=disabled)
+	fi
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=enabled
+		-Ddri3=enabled
+		-Degl=enabled
+		-Dexpat=enabled
+		-Dgbm=enabled
+		-Dglvnd=true
+		$(meson_feature gles1)
+		$(meson_feature gles2)
+		$(meson_feature llvm)
+		$(meson_feature lm-sensors lmsensors)
+		$(meson_use osmesa)
+		$(meson_use selinux)
+		$(meson_feature unwind libunwind)
+		$(meson_feature zstd)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index a577473b5ebb..e178739931ea 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -2,5 +2,5 @@ AUX mutagen-1.46.0-sphinx-6.patch 1697 BLAKE2B 3cb99be12abec75a237965262f65a7791
 DIST mutagen-1.46.0.tar.gz 1268561 BLAKE2B 44e0dbbc1c102521569a91386a9d807f3ad82ffb96a5e3f76958551d173d00c7095fa6a2668a0a418bfdda31be5c3bb175856b2278719007bf7af866c732dc40 SHA512 52ab7408af46e54e79f1d157a3f6114e2606c6a55eb46fdd314dff82d6d586c2c22294b181a432581230dee566c79554456a9435a8e1188a91f4ae000644ae71
 DIST mutagen-1.47.0.tar.gz 1274186 BLAKE2B 220d8e136e8f41d2f3953ce61b4784a24b1e450b6cfe0d0e0c610aeccb9ff3248493b8a0ea78f801e62b2f6ac87cd219a05cff535e04586a5ce9b03aa3540278 SHA512 40f9a8a898c9fdae00fd0bdd38eb91a6fb813cf8319f888590bdfd4b5efcb614aa5322c0b9e017f49c3f5155ccf82d5cae80aad79df285c50b5ef270c09f4c9d
 EBUILD mutagen-1.46.0.ebuild 880 BLAKE2B be5e71812359543c45c69054159c8d5908e732123b54aa0a8c36fda2f8d37a979c711799b180eca07cadab909a5cf2871dc07e111b3ec31c5ba29d688fa02581 SHA512 5fcb42a815840cb1119d4bd37d17008bebf2f786434a82be0d69e9931318a9fb21371987058067955cd8d5056ee6ea99ad85bdc96996f8866da60888c49999a8
-EBUILD mutagen-1.47.0.ebuild 826 BLAKE2B a3ecdc2433e6b300c93ef6fcf3d5868f00377abaaff2756b74902ee3d6dd8c38f00b8641cbc20d32cd0e3cad1ab5a5dfe0f919473683bcd22ad9806fdf2170b3 SHA512 c9f408ec84bb05c9f7f6dfae54cead686fb1a5502cf6e4aa5d1e309d4603d6131738370a347aba75cd4ec8bffb69b7d12c4a744fc21091320859f833b2aa725f
+EBUILD mutagen-1.47.0.ebuild 825 BLAKE2B 20fd251bd30b45d664d5d048cc6c1e5a9637677d6e85a187bab4ac3489816d3beaa75d4388082e30042284b555fd4da61763580781adccbfdfd6d7bc30c3f5ce SHA512 d891542e8ea52787ae141b5d375659a695dd2b25445687807abb6935ceaaa1c076d0bbaf6b6d0bc5ca003c3552f57cc376de4634aeb6352f323d509f7510e230
 MISC metadata.xml 482 BLAKE2B 3ae30f618d887acb7bcabfb63ceafd422ee356b1a2f0b812dd51196e1a3e4f5afd6fc2c5fb36ff137060d710a8a7e1800ff25e2246a6dd4bb5dc3301cd559171 SHA512 13450efc95ce24cacf3c882c78acb2605c10bd803e1b63a700bd6a7bff103946f905ef39e15bc2b86e7302940c7b0a6fe9a5767c8de51f77ee1f11cfc31bfa6f
diff --git a/media-libs/mutagen/mutagen-1.47.0.ebuild b/media-libs/mutagen/mutagen-1.47.0.ebuild
index c5adee34b003..975344434974 100644
--- a/media-libs/mutagen/mutagen-1.47.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.47.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/media-libs/svt-hevc/Manifest b/media-libs/svt-hevc/Manifest
index aad82598e1d7..5a6d08b7fc20 100644
--- a/media-libs/svt-hevc/Manifest
+++ b/media-libs/svt-hevc/Manifest
@@ -1,4 +1,6 @@
+AUX svt-hevc-1.5.1-dont-clobber-fortify_source.patch 796 BLAKE2B 442890c94ab0bf6448f153c23cf19a6a330a89126b70e7e2d9634a01fae687ac5e45bdd1e23beff42983e0749c2103df68c203738558188e7a65fbea78be40cc SHA512 78fa039d7e8195d179e68016a6489f441429001841dc2bde7fc9ab4e78f769ba331a87dbd848cd9cadedf11b0f67077280ffffd83e6a94b98552ed3fd5019214
 DIST svt-hevc-1.5.1.tar.gz 1220295 BLAKE2B e70dc07f74746cb69561818b642d8ce5efd9e731b3376889556ddea0f647f8deaa4edf7a4993d86a5b1100db37d02f928d53eeaa594b7d5c582b92c30761e470 SHA512 f5b9d9a090cb04ada0a3f310522f00b619ae628b8474fe7e1c7f562a017b5a9d0c8c58ab9a35b43cb19f2568fbc59e0395dcd517b7983924b175393ad2ba4299
+EBUILD svt-hevc-1.5.1-r1.ebuild 722 BLAKE2B 89543bc747dd60295e48eb3bd5d2e8831c03a53bf6cdb637b9cb9b011c0714358f9698e79d8406a4fbbe892e39894e8870c3ea18376b46f96a9b04be7cca08cc SHA512 9c0f0aebb13ae80eea0eff5c0e202ecd7c8f102400d9d59b1ad75717f5f82e2a2f964661808a11bbc0df4c2f381717b6153215e12894d0fb5ce8b742a5f9c61a
 EBUILD svt-hevc-1.5.1.ebuild 648 BLAKE2B 02673e1c6187f6c88dfe5469d82657c3b0fcd1c63151464ebbe9ea14a7cf3e642203faeac14f7228fe890f58fc0388d38b4243d55ca33115928d33a90988ca37 SHA512 7f38654a9e6847d819df103d93eb344528455da41258905158c78e8a5d04791ab2ec24eed523b9a294720b8a43d3e58a61b5738b4eea3d768832cf8f77056598
-EBUILD svt-hevc-9999.ebuild 648 BLAKE2B 02673e1c6187f6c88dfe5469d82657c3b0fcd1c63151464ebbe9ea14a7cf3e642203faeac14f7228fe890f58fc0388d38b4243d55ca33115928d33a90988ca37 SHA512 7f38654a9e6847d819df103d93eb344528455da41258905158c78e8a5d04791ab2ec24eed523b9a294720b8a43d3e58a61b5738b4eea3d768832cf8f77056598
+EBUILD svt-hevc-9999.ebuild 722 BLAKE2B 89543bc747dd60295e48eb3bd5d2e8831c03a53bf6cdb637b9cb9b011c0714358f9698e79d8406a4fbbe892e39894e8870c3ea18376b46f96a9b04be7cca08cc SHA512 9c0f0aebb13ae80eea0eff5c0e202ecd7c8f102400d9d59b1ad75717f5f82e2a2f964661808a11bbc0df4c2f381717b6153215e12894d0fb5ce8b742a5f9c61a
 MISC metadata.xml 624 BLAKE2B 11842f1f6fe5a26ca9b8448c380082eb8a77a5a7ebc105b7d8d6a69644aa43075c64301a92563df1cd78a44711e3d7a54eaec08013efbad9641efa30edf5a754 SHA512 155b8a1daecb9cbc6e9399907ccd2016d89d8ee3aee8d4ceedeb5350531733b0997672190c1a87782312d3ea2b10a8760dfac1996a6345b4d55ee077247df693
diff --git a/media-libs/svt-hevc/files/svt-hevc-1.5.1-dont-clobber-fortify_source.patch b/media-libs/svt-hevc/files/svt-hevc-1.5.1-dont-clobber-fortify_source.patch
new file mode 100644
index 000000000000..1cc2974b393c
--- /dev/null
+++ b/media-libs/svt-hevc/files/svt-hevc-1.5.1-dont-clobber-fortify_source.patch
@@ -0,0 +1,35 @@
+Don't clobber our toolchain defaults.
+
+https://bugs.gentoo.org/895260
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -100,7 +100,6 @@ set(flags_to_test
+     -Wformat-security
+     -fPIE
+     -fPIC
+-    -D_FORTIFY_SOURCE=2
+     /GS
+     /sdl)
+ if(MSVC)
+--- a/gstreamer-plugin/CMakeLists.txt
++++ b/gstreamer-plugin/CMakeLists.txt
+@@ -25,8 +25,7 @@ set(flags_to_test
+     -fstack-protector-strong
+     -fPIE
+     -fPIC
+-    -flto
+-    -D_FORTIFY_SOURCE=2)
++    -flto)
+ if(NOT MSVC)
+     list(INSERT flags_to_test 0 -Wall)
+ else()
+--- a/gstreamer-plugin/meson.build
++++ b/gstreamer-plugin/meson.build
+@@ -22,7 +22,6 @@ svthevcenc_dep = dependency('SvtHevcEnc')
+ cc = meson.get_compiler('c')
+ cc_flags = [
+     '-O2',
+-    '-D_FORTIFY_SOURCE=2',
+     '-Wformat',
+     '-Wformat-security',
+     '-fPIE',
diff --git a/media-libs/svt-hevc/svt-hevc-1.5.1-r1.ebuild b/media-libs/svt-hevc/svt-hevc-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..07281bb8299b
--- /dev/null
+++ b/media-libs/svt-hevc/svt-hevc-1.5.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic cmake
+
+DESCRIPTION="Scalable Video Technology for HEVC (SVT-HEVC Encoder)"
+HOMEPAGE="https://github.com/OpenVisualCloud/SVT-HEVC"
+
+if [ ${PV} = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenVisualCloud/SVT-HEVC.git"
+else
+	SRC_URI="https://github.com/OpenVisualCloud/SVT-HEVC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/SVT-HEVC-${PV}"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+BDEPEND="dev-lang/nasm"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-dont-clobber-fortify_source.patch
+)
+
+src_prepare() {
+	append-ldflags -Wl,-z,noexecstack
+	cmake_src_prepare
+}
diff --git a/media-libs/svt-hevc/svt-hevc-9999.ebuild b/media-libs/svt-hevc/svt-hevc-9999.ebuild
index 5729a3499a49..07281bb8299b 100644
--- a/media-libs/svt-hevc/svt-hevc-9999.ebuild
+++ b/media-libs/svt-hevc/svt-hevc-9999.ebuild
@@ -22,6 +22,10 @@ SLOT="0"
 
 BDEPEND="dev-lang/nasm"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-dont-clobber-fortify_source.patch
+)
+
 src_prepare() {
 	append-ldflags -Wl,-z,noexecstack
 	cmake_src_prepare
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b34fd18ecdab..ee2103d2a44d 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 b92e786ad91c..365bbb13eee1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 04 Oct 2023 10:10:09 +0000
+Wed, 04 Oct 2023 16:10:16 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index db6e875dfbda..f3638011a8b6 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 549460 BLAKE2B a1f9ee4b119079d55103a4ccc3197b5638e1f0913b6b08dbff50e6a9ae785bd677e97041b367e5c90d4e715da5a2e9d245d4614a65f57c6fffbe3055d41af720 SHA512 af57c6ff084a9b4d66c2d7d6cdcf381f6edfb5a8b5e7b97a153bb0d0556002c8d13b0c6530999163f8396d382c2b2f781f28b63456546ee7c16c7c3f82742c24
-TIMESTAMP 2023-10-04T10:10:13Z
+MANIFEST Manifest.files.gz 549618 BLAKE2B df3cca5309face77ad600cd7dd41da5c8d5969140f0f882439af0839721ca14a3e2ddda207c25ab4f6c4bb766db6e715560df951e539d7cc21ac6c04098c804d SHA512 fecd1787120b073b451d8a3eda16e7b1d80f65213749758b8dc28dd7adb7911c5d678553c3d79c9868d343fd46ecb5e858110be9deff13b5fe735cee99c77036
+TIMESTAMP 2023-10-04T16:10:22Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUdOgVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUdjm5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDmlg/9HBr9rlvuXXu6wZkguZCHd+LrEdxj2g0beJ9QakQ9OnSpm5kiYlWKQEsp
-vRjHJO/iAg1E3zC4JfLUAje1AaYwDUggAYuc+lLCozQfJzq0kyChYQm9mWd5LyA/
-ym3+SzzulpOhE4aQgCZEUN0sOylkHmiMlcwx4mh7Dpc0knIFb/7GDTmZYoJy6WwI
-+hedW0Jj+9LVV7OgZ6yNWCjRfhVV3NnrA2wRAmVWFNgs3PTezenZ/myP1vo6+8Yz
-kq2yP0ybQX7mQD6b9xf3o9NSk6wYmz/6DXCAgCTMVLhblEhJ7o3+7H0H2W59nF5E
-HaybFdmrObOzM7nivDIHpKE3zjwypkkmCcMcBRv9wuddph+38VSNmIaAhG1T2NQ4
-Lhb2se13umiwSOIfEulS3lMJVvTtSTZl8h7sUUJrY23hxMDfCqd9WjcvuosWCYNV
-E3rsNlwE/UIH1zToXJ6uKfT27u9rsYue6h5awjkl7f+0+taWGjQerCYj7TFkoy5Z
-XrwpwWPycLlwV75qcHLS9l6xkpLMaeZQ1qeDadAm+D7RqNqfMsTzbDJSyunkPuRD
-/94492Y1OE3cZRN4aCAyEBiF/fT2zDuczMhOuWDpAAu6Cs++/6J6idfpomEEWB1z
-nHKJg77r5ySgWhDFY9xjpyWTwtob7bY189ndGQChAxlZNI54P3s=
-=TDQs
+klAW1w/9GEkAnWv4jk/CSI4tbaI2N6UsQWxgpljhqstH/hO+1TqxU7AqCVBu7jb2
+g/F5zcxyfn1qaL1M8D1GcoWpvkLLcFahw+B5zgSmPOh8hEplz/M4gjIWJ0BXOj3Z
+BoaE7utURddat2uuFlrtFNfgX91eCgEioSjdeqkaGy2jU6XcbENnFu3nha14Wl6L
+FaO8pxXiYjOqfG0aYh8jrF6B9q5l0FjrdfUi+scZOSU1u7xcJNdYVEUWIIYBktqJ
+ytLCIoByEUWFBz8EcGT46weTWSEDm5ZTtSzha+4kQ4SVtFuk/dVSYvPH/9jENJtC
+sD0cQj7UL+BEns9CkeoEiGrV+7962XNRU/QJgXngkmGLv2H+5Jeakz6mrEeSGFO4
+HeDD39WXf+l7BjRkD39NrOlFjwICcC8KI24Qa1X1E7cpgdq2x8dIhxx0I6jERvGZ
+HCv5Xo3hPyM55epx9xeiFdK5ETO5POgm5eEVf4DbA8s50rNlOu/gapYB63CyO/53
+WLQUlvFa98atJ/Esj3pvBpGjyUbv302mm3Al3P2fpCrsp4CM6gMu9p+QuFYcHyIz
+/bpR/lD7ZlU1zEIbt6oKEGH4Mn3C3c4cvqkc4YkuLOqCtcXZMtxqNgUDTjymzEsF
+wiHgXPT/DKAMUdsc2rXbjqD6IwSQae6ZmuCJz6yZF2Xpf+0MWTA=
+=TE3s
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index b03f0fde4bfb..a7e06bb28b43 100644
Binary files a/metadata/glsa/Manifest.files.gz and b/metadata/glsa/Manifest.files.gz differ
diff --git a/metadata/glsa/glsa-202310-04.xml b/metadata/glsa/glsa-202310-04.xml
new file mode 100644
index 000000000000..e7025c0e616f
--- /dev/null
+++ b/metadata/glsa/glsa-202310-04.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202310-04">
+    <title>libvpx: Multiple Vulnerabilities</title>
+    <synopsis>Multiple vulnerabilities have been discovered in libvpx, the worst of which could result in arbitrary code execution.</synopsis>
+    <product type="ebuild">libvpx</product>
+    <announced>2023-10-04</announced>
+    <revised count="1">2023-10-04</revised>
+    <bug>914875</bug>
+    <bug>914987</bug>
+    <access>remote</access>
+    <affected>
+        <package name="media-libs/libvpx" auto="yes" arch="*">
+            <unaffected range="ge">1.13.1</unaffected>
+            <vulnerable range="lt">1.13.1</vulnerable>
+        </package>
+    </affected>
+    <background>
+        <p>libvpx is the VP8 codec SDK used to encode and decode video streams, typically within a WebM format media file.</p>
+    </background>
+    <description>
+        <p>Multiple vulnerabilities have been discovered in libvpx. Please review the CVE identifiers referenced below for details.</p>
+    </description>
+    <impact type="high">
+        <p>Please review the referenced CVE identifiers for details.</p>
+    </impact>
+    <workaround>
+        <p>There is no known workaround at this time.</p>
+    </workaround>
+    <resolution>
+        <p>All libvpx users should upgrade to the latest version:</p>
+        
+        <code>
+          # emerge --sync
+          # emerge --ask --oneshot --verbose ">=media-libs/libvpx-1.13.1"
+        </code>
+    </resolution>
+    <references>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-5217">CVE-2023-5217</uri>
+        <uri link="https://nvd.nist.gov/vuln/detail/CVE-2023-44488">CVE-2023-44488</uri>
+    </references>
+    <metadata tag="requester" timestamp="2023-10-04T10:49:17.755721Z">sam</metadata>
+    <metadata tag="submitter" timestamp="2023-10-04T10:49:17.758091Z">sam</metadata>
+</glsa>
\ No newline at end of file
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b92e786ad91c..365bbb13eee1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 04 Oct 2023 10:10:09 +0000
+Wed, 04 Oct 2023 16:10:16 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 276c5a56bfe3..d43c424dd71e 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-029e12731f29676d3f6ebed09f7747ee6e15c5e8 1696406561 2023-10-04T08:02:41+00:00
+78441d962cbe20f36c819692b8c5ea5befbaf0be 1696416594 2023-10-04T10:49:54+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 7680f27183a4..6353c7f0513c 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index dc00453e99fb..ef0b9efa171d 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/godot-3.5.2 b/metadata/md5-cache/dev-games/godot-3.5.2
deleted file mode 100644
index 6fa1d12fec31..000000000000
--- a/metadata/md5-cache/dev-games/godot-3.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.11 >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/libpcre2:=[pcre32] media-libs/alsa-lib media-libs/freetype[brotli] media-libs/libpng:= <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= bullet? ( sci-physics/bullet:= ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender tools? ( raycast? ( media-libs/embree:3 ) ) ) pulseaudio? ( media-libs/libpulse ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webm? ( media-libs/libvorbis media-libs/libvpx:= media-libs/opus ) webp? ( media-libs/libwebp:= ) gui? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
-EAPI=7
-HOMEPAGE=https://godotengine.org/
-INHERIT=bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
-IUSE=+bullet debug deprecated +gui pulseaudio raycast +runner +theora +tools +udev +upnp +webm +webp
-KEYWORDS=~amd64
-LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( BitstreamVera OFL-1.1 )
-RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/libpcre2:=[pcre32] media-libs/alsa-lib media-libs/freetype[brotli] media-libs/libpng:= <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= bullet? ( sci-physics/bullet:= ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender tools? ( raycast? ( media-libs/embree:3 ) ) ) pulseaudio? ( media-libs/libpulse ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webm? ( media-libs/libvorbis media-libs/libvpx:= media-libs/opus ) webp? ( media-libs/libwebp:= )
-SLOT=3
-SRC_URI=https://downloads.tuxfamily.org/godotengine/3.5.2/godot-3.5.2-stable.tar.xz https://github.com/godotengine/godot/releases/download/3.5.2-stable/godot-3.5.2-stable.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9be6ea80c47208e2e8c44280a8a4b288
diff --git a/metadata/md5-cache/dev-games/godot-4.1.2 b/metadata/md5-cache/dev-games/godot-4.1.2
new file mode 100644
index 000000000000..eeb03235b616
--- /dev/null
+++ b/metadata/md5-cache/dev-games/godot-4.1.2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.11 >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=app-arch/brotli:= app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) gui? ( x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) )
+DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
+EAPI=8
+HOMEPAGE=https://godotengine.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
+IUSE=alsa +dbus debug deprecated +fontconfig +gui pulseaudio raycast +runner speech test +theora +tools +udev +upnp +vulkan +webp
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )
+RDEPEND=app-arch/brotli:= app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/libglvnd x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxkbcommon tools? ( raycast? ( media-libs/embree:3 ) ) vulkan? ( media-libs/vulkan-loader[X] ) ) pulseaudio? ( media-libs/libpulse ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) udev? ( virtual/udev ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= )
+RESTRICT=test
+SLOT=4
+SRC_URI=https://downloads.tuxfamily.org/godotengine/4.1.2/godot-4.1.2-stable.tar.xz https://github.com/godotengine/godot/releases/download/4.1.2-stable/godot-4.1.2-stable.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c2ee3632575244eaa19be09de6d1ecd5
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 0cd19aecb842..e833df1c5086 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0 b/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0
index 1342887a5bbb..4aa754f5b5fd 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-8.1.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://dev.mysql.com/doc/connector-j/en/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ppc64 ~x86
+KEYWORDS=amd64 ppc64 ~x86
 LICENSE=GPL-2-with-MySQL-FLOSS-exception
 RDEPEND=dev-java/c3p0:0 dev-java/protobuf-java:0 dev-java/slf4j-api:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-8.1.0.tar.gz https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/2.47.0/oci-java-sdk-common-2.47.0.jar
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	52d47d4db4f2c870e1d8f23700ee5e0a	java-utils-2	d051ecd608488854eb9252d64d396140
-_md5_=5252d8bb109ed1216849858c883c434d
+_md5_=a12eec61ea1028dad03726395b6fc60c
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index c287a74faf19..68d98665e747 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/erlang-26.0 b/metadata/md5-cache/dev-lang/erlang-26.0
index 4ab0c09034d7..fc43a4c48f8e 100644
--- a/metadata/md5-cache/dev-lang/erlang-26.0
+++ b/metadata/md5-cache/dev-lang/erlang-26.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.erlang.org/
 INHERIT=elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
 IUSE=doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets java
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/26.0
 SRC_URI=https://github.com/erlang/otp/archive/OTP-26.0.tar.gz -> erlang-26.0.tar.gz https://github.com/erlang/otp/releases/download/OTP-26.0/otp_doc_man_26.0.tar.gz -> erlang_doc_man_26.0.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-26.0/otp_doc_html_26.0.tar.gz -> erlang_doc_html_26.0.tar.gz )
 _eclasses_=elisp-common	dc179f98b2b4d9a4473fd3bdc154bbb6	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-pkg-opt-2	3816f3fc28ed2b067845e2802eb954b2	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
-_md5_=3cdd307f8195688b30cc8df01da3d5e8
+_md5_=d733498c7c934b4ac53557ce3236f418
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 31ec4850561d..10975ae06ac2 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/libmpack-1.0.5-r3 b/metadata/md5-cache/dev-libs/libmpack-1.0.5-r3
deleted file mode 100644
index f0149b8190c5..000000000000
--- a/metadata/md5-cache/dev-libs/libmpack-1.0.5-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile install prepare test
-DESCRIPTION=Simple implementation of msgpack in C
-EAPI=8
-HOMEPAGE=https://github.com/libmpack/libmpack
-INHERIT=autotools toolchain-funcs
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/libmpack/libmpack/archive/1.0.5.tar.gz -> libmpack-1.0.5.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=cdb9a8024f52f0fed2884924e5866cd8
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index dab08619d0ac..64c6501dc614 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Text-BibTeX-0.890.0-r1 b/metadata/md5-cache/dev-perl/Text-BibTeX-0.890.0-r1
new file mode 100644
index 000000000000..6e636928f703
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Text-BibTeX-0.890.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=!dev-libs/btparse virtual/perl-Encode virtual/perl-Scalar-List-Utils virtual/perl-Unicode-Normalize >=dev-perl/Config-AutoConf-0.320 >=dev-perl/ExtUtils-LibBuilder-0.20.0 >=virtual/perl-ExtUtils-CBuilder-0.270.0 >=dev-perl/Module-Build-0.360.300 test? ( >=dev-perl/Capture-Tiny-0.60.0 ) dev-lang/perl test? ( >=virtual/perl-Test-Simple-1 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=A Perl library for reading, parsing, and processing BibTeX files
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Text-BibTeX
+INHERIT=perl-module
+IUSE=test examples
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!dev-libs/btparse virtual/perl-Encode virtual/perl-Scalar-List-Utils virtual/perl-Unicode-Normalize dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.89.tar.gz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	aa997145fb9941f14e9be1c3ed7238b8	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=7dc5db79d2848c7c0456e785cefd000e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 811838ddfb65..b399f1a1d247 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/ccls-0.20230717 b/metadata/md5-cache/dev-util/ccls-0.20230717
index 2f9a0cd1b356..953983c2b4b2 100644
--- a/metadata/md5-cache/dev-util/ccls-0.20230717
+++ b/metadata/md5-cache/dev-util/ccls-0.20230717
@@ -5,10 +5,10 @@ DESCRIPTION=C/C++/ObjC language server
 EAPI=8
 HOMEPAGE=https://github.com/MaskRay/ccls
 INHERIT=cmake llvm
-KEYWORDS=~amd64 ~arm64 ~riscv
+KEYWORDS=amd64 ~arm64 ~riscv
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/rapidjson <sys-devel/clang-17:=
 SLOT=0
 SRC_URI=https://github.com/MaskRay/ccls/archive/0.20230717.tar.gz -> ccls-0.20230717.tar.gz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	2e1701c714b75feb512bffdecd3fe7d0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f59b742f282fbd3763ac74d0b40c401c
+_md5_=a450b93dba79cd62d2bbd00bb1f8aab1
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15136.4 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15136.4
deleted file mode 100644
index b6e0ca10f6a0..000000000000
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15136.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND==sys-devel/lld-15* || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/opencl-clang:15= dev-util/spirv-tools sys-devel/lld:15= sys-devel/llvm:15= vc? ( >=dev-libs/intel-vc-intrinsics-0.12.1-r1 dev-util/spirv-llvm-translator:15= ) !!sys-devel/llvm:0
-DESCRIPTION=LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware
-EAPI=8
-HOMEPAGE=https://github.com/intel/intel-graphics-compiler
-INHERIT=cmake flag-o-matic llvm python-any-r1
-IUSE=debug vc
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-libs/opencl-clang:15= dev-util/spirv-tools sys-devel/lld:15= sys-devel/llvm:15= vc? ( >=dev-libs/intel-vc-intrinsics-0.12.1-r1 dev-util/spirv-llvm-translator:15= )
-SLOT=0
-SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.15136.4.tar.gz -> intel-graphics-compiler-1.0.15136.4.tar.gz
-_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	2e1701c714b75feb512bffdecd3fe7d0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=62d49fa5f2f471148a15a0226394f262
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15136.4-r1 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15136.4-r1
new file mode 100644
index 000000000000..96967d83a1f1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.15136.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( ( dev-lang/python:3.12 dev-python/mako[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/mako[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/mako[python_targets_python3_10(-)] ) ) =sys-devel/lld-15* || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/opencl-clang:15= dev-util/spirv-tools sys-devel/lld:15= sys-devel/llvm:15= vc? ( >=dev-libs/intel-vc-intrinsics-0.12.1-r1 dev-util/spirv-llvm-translator:15= ) !!sys-devel/llvm:0
+DESCRIPTION=LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware
+EAPI=8
+HOMEPAGE=https://github.com/intel/intel-graphics-compiler
+INHERIT=cmake flag-o-matic llvm python-any-r1
+IUSE=debug vc
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/opencl-clang:15= dev-util/spirv-tools sys-devel/lld:15= sys-devel/llvm:15= vc? ( >=dev-libs/intel-vc-intrinsics-0.12.1-r1 dev-util/spirv-llvm-translator:15= )
+SLOT=0
+SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.15136.4.tar.gz -> intel-graphics-compiler-1.0.15136.4.tar.gz
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	llvm	2e1701c714b75feb512bffdecd3fe7d0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ced9c556fcca7327bdc9ef92b78f5aa3
diff --git a/metadata/md5-cache/dev-util/rebar-3.21.0 b/metadata/md5-cache/dev-util/rebar-3.21.0
index a8f539a56d21..9ee97d31125f 100644
--- a/metadata/md5-cache/dev-util/rebar-3.21.0
+++ b/metadata/md5-cache/dev-util/rebar-3.21.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.rebar3.org https://github.com/erlang/rebar3
 INHERIT=bash-completion-r1
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 sparc x86
 LICENSE=Apache-2.0 MIT BSD
 RDEPEND=dev-lang/erlang[ssl] !dev-util/rebar-bin
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/erlang/rebar3/archive/refs/tags/3.21.0.tar.gz -> rebar-3.21.0.tar.gz test? ( https://repo.hex.pm/tarballs/meck-0.8.13.tar )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=2c35b49c82f927c7d1ece8a029b7eb0b
+_md5_=eaba949bb369521d76bcad9da5f29747
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 6d180aa54c3e..1ae3a74ef7aa 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/libvpx-1.13.1-r1 b/metadata/md5-cache/media-libs/libvpx-1.13.1-r1
new file mode 100644
index 000000000000..783d501707ce
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libvpx-1.13.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm ) abi_x86_x32? ( dev-lang/yasm ) doc? ( app-doc/doxygen dev-lang/php )
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=WebM VP8 and VP9 Codec SDK
+EAPI=8
+HOMEPAGE=https://www.webmproject.org
+INHERIT=edo toolchain-funcs multilib-minimal
+IUSE=cpu_flags_ppc_vsx3 doc +highbitdepth postproc static-libs test +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+REQUIRED_USE=test? ( threads )
+RESTRICT=!test? ( test )
+SLOT=0/8
+SRC_URI=https://github.com/webmproject/libvpx/archive/v1.13.1.tar.gz -> libvpx-1.13.1.tar.gz test? ( https://dev.gentoo.org/~sam/distfiles/media-libs/libvpx/libvpx-testdata-1.13.1.tar.xz )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=52827de41f27f235580c5a9602a6a5fa
diff --git a/metadata/md5-cache/media-libs/mesa-23.1.9 b/metadata/md5-cache/media-libs/mesa-23.1.9
new file mode 100644
index 000000000000..7a9e172fc6be
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-23.1.9
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/meson-1.0.0 || ( dev-lang/python:3.11 dev-lang/python:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) llvm? ( vulkan? ( dev-util/glslang video_cards_intel? ( amd64? ( || ( ( dev-lang/python:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ) ) ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( video_cards_intel? ( amd64? ( dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 ) ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( || ( ( !opencl? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:16 ) vulkan? ( video_cards_intel? ( amd64? ( dev-util/spirv-llvm-translator:16 ) ) ) ) ( !opencl? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:15 ) vulkan? ( video_cards_intel? ( amd64? ( dev-util/spirv-llvm-translator:15 ) ) ) ) ) !opencl? ( <sys-devel/llvm-17:=[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( <sys-devel/clang-17:=[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=8
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+INHERIT=llvm meson-multilib python-any-r1 linux-info
+IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lavapipe video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=MIT SGI-B-2.0
+RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( video_cards_intel? ( amd64? ( dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 ) ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( || ( ( !opencl? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:16 ) vulkan? ( video_cards_intel? ( amd64? ( dev-util/spirv-llvm-translator:16 ) ) ) ) ( !opencl? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:15 ) vulkan? ( video_cards_intel? ( amd64? ( dev-util/spirv-llvm-translator:15 ) ) ) ) ) !opencl? ( <sys-devel/llvm-17:=[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( <sys-devel/clang-17:=[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) vdpau? ( X ) xa? ( X ) zink? ( vulkan )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mesa3d.org/mesa-23.1.9.tar.xz
+_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	2e1701c714b75feb512bffdecd3fe7d0	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=f704bd4240b3b9b9ca2bee0b456a9990
diff --git a/metadata/md5-cache/media-libs/mutagen-1.47.0 b/metadata/md5-cache/media-libs/mutagen-1.47.0
index 28930049c065..cdeb072f61d0 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.47.0
+++ b/metadata/md5-cache/media-libs/mutagen-1.47.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/quodlibet/mutagen/ https://pypi.org/project/mutagen/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.47.0/mutagen-1.47.0.tar.gz
 _eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=d452d8b38899dbce5b15fdcfc8ed90ff
+_md5_=497cdce394f1f103a61824ab2308e5d4
diff --git a/metadata/md5-cache/media-libs/svt-hevc-1.5.1-r1 b/metadata/md5-cache/media-libs/svt-hevc-1.5.1-r1
new file mode 100644
index 000000000000..5ad897d160bf
--- /dev/null
+++ b/metadata/md5-cache/media-libs/svt-hevc-1.5.1-r1
@@ -0,0 +1,12 @@
+BDEPEND=dev-lang/nasm >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Scalable Video Technology for HEVC (SVT-HEVC Encoder)
+EAPI=8
+HOMEPAGE=https://github.com/OpenVisualCloud/SVT-HEVC
+INHERIT=flag-o-matic cmake
+KEYWORDS=~amd64
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://github.com/OpenVisualCloud/SVT-HEVC/archive/v1.5.1.tar.gz -> svt-hevc-1.5.1.tar.gz
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f4a3605e5956091f4832c3990d74c399
diff --git a/metadata/md5-cache/media-libs/svt-hevc-9999 b/metadata/md5-cache/media-libs/svt-hevc-9999
index 5bba9cfd615e..8af14ff03284 100644
--- a/metadata/md5-cache/media-libs/svt-hevc-9999
+++ b/metadata/md5-cache/media-libs/svt-hevc-9999
@@ -8,4 +8,4 @@ LICENSE=BSD-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2dc966c769483861ca36f446f0d2b6b2
+_md5_=f4a3605e5956091f4832c3990d74c399
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index f0cbc1b89ae3..a1988a0aa97b 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/arp-scan-1.10.0 b/metadata/md5-cache/net-analyzer/arp-scan-1.10.0
new file mode 100644
index 000000000000..053791d35dcc
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/arp-scan-1.10.0
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/autoconf-archive sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=prepare
+DEPEND=net-libs/libpcap sys-libs/libcap
+DESCRIPTION=ARP scanning and fingerprinting tool
+EAPI=8
+HOMEPAGE=https://github.com/royhills/arp-scan
+INHERIT=autotools
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=net-libs/libpcap sys-libs/libcap dev-lang/perl
+SLOT=0
+SRC_URI=https://github.com/royhills/arp-scan/archive/1.10.0.tar.gz -> arp-scan-1.10.0.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=0c3b0a18ed23d3aa3dfe2f983ea9f45d
diff --git a/metadata/md5-cache/net-analyzer/arp-scan-99999 b/metadata/md5-cache/net-analyzer/arp-scan-99999
deleted file mode 100644
index c206d406e7c9..000000000000
--- a/metadata/md5-cache/net-analyzer/arp-scan-99999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=prepare unpack
-DEPEND=net-libs/libpcap
-DESCRIPTION=ARP scanning and fingerprinting tool
-EAPI=7
-HOMEPAGE=https://github.com/royhills/arp-scan
-INHERIT=autotools git-r3
-LICENSE=GPL-3
-PROPERTIES=live
-RDEPEND=net-libs/libpcap dev-lang/perl
-SLOT=0
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=551a7f0d508c1e6d1c0be71b0aa0775a
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 69fe80b4081c..e9ff7c9b13b3 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/swift-4.0.3 b/metadata/md5-cache/net-im/swift-4.0.3
new file mode 100644
index 000000000000..10eb2b3ff6e8
--- /dev/null
+++ b/metadata/md5-cache/net-im/swift-4.0.3
@@ -0,0 +1,17 @@
+BDEPEND=|| ( ( dev-lang/python:3.11 >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/openssl:0= net-libs/libnatpmp net-libs/miniupnpc:= sys-libs/zlib expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-util/scons-3.0.1-r3 test? ( net-dns/avahi )
+DESCRIPTION=An elegant, secure, adaptable and intuitive XMPP Client
+EAPI=7
+HOMEPAGE=https://www.swift.im/
+INHERIT=lua-single python-any-r1 scons-utils toolchain-funcs
+IUSE=expat +icu +idn lua test zeroconf lua_single_target_luajit lua_single_target_lua5-1
+KEYWORDS=~amd64
+LICENSE=BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1
+RDEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/openssl:0= net-libs/libnatpmp net-libs/miniupnpc:= sys-libs/zlib expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) )
+REQUIRED_USE=|| ( icu idn ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
+RESTRICT=test
+SLOT=4/0
+SRC_URI=https://swift.im/git/swift/snapshot/swift-swift-4.0.3.tar.bz2 -> swift-4.0.3.tar.bz2 https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.3-python3-compatibility.patch.gz
+_eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=526fb57af6af08981a4db2d0c7a47af6
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 63947fa68327..c30d2ab3d0d0 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libotr-4.1.1-r2 b/metadata/md5-cache/net-libs/libotr-4.1.1-r2
new file mode 100644
index 000000000000..1bbda0f64697
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libotr-4.1.1-r2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/autoconf-archive sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/libgcrypt:= dev-libs/libgpg-error:=
+DESCRIPTION=(OTR) Messaging allows you to have private conversations over instant messaging
+EAPI=8
+HOMEPAGE=https://otr.cypherpunks.ca
+INHERIT=autotools
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=dev-libs/libgcrypt:= dev-libs/libgpg-error:=
+SLOT=0
+SRC_URI=https://otr.cypherpunks.ca/libotr-4.1.1.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=5f6b86bf7fcb484a0b9e94ed4b6b4c8d
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 219e6c68d55b..9315a498d2ee 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/stunnel-5.71 b/metadata/md5-cache/net-misc/stunnel-5.71
new file mode 100644
index 000000000000..a0a1ceb7939c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/stunnel-5.71
@@ -0,0 +1,16 @@
+BDEPEND=test? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=dev-libs/openssl:= tcpd? ( sys-apps/tcp-wrappers ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=TLS/SSL - Port Wrapper
+EAPI=8
+HOMEPAGE=https://www.stunnel.org/index.html
+INHERIT=autotools python-any-r1 ssl-cert systemd tmpfiles
+IUSE=selinux stunnel3 systemd tcpd test ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl:= tcpd? ( sys-apps/tcp-wrappers ) systemd? ( sys-apps/systemd:= ) acct-user/stunnel acct-group/stunnel selinux? ( sec-policy/selinux-stunnel ) stunnel3? ( dev-lang/perl ) virtual/tmpfiles
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.stunnel.org/downloads/stunnel-5.71.tar.gz ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.71.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.71.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.71.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.71.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.71.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.71.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.71.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	ssl-cert	33f6c352c602e87ceda767a86f3b7131	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=ae51cd617f4a19424966b2863c9215fe
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 8ef5469d6649..76071c57b2fe 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/cups-2.4.7 b/metadata/md5-cache/net-print/cups-2.4.7
deleted file mode 100644
index b7a5b24bcd72..000000000000
--- a/metadata/md5-cache/net-print/cups-2.4.7
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=acct-group/lp acct-group/lpadmin virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-text/libpaper:= sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=The Common Unix Printing System
-EAPI=8
-HOMEPAGE=https://www.cups.org/ https://github.com/OpenPrinting/cups
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs
-IUSE=acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-PDEPEND=>=net-print/cups-filters-1.0.43
-RDEPEND=app-text/libpaper:= sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups )
-RESTRICT=!test? ( test ) test
-SLOT=0
-SRC_URI=https://github.com/OpenPrinting/cups/releases/download/v2.4.7/cups-2.4.7-source.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=00e0d3c6af40f938fff4fd0962341f04
diff --git a/metadata/md5-cache/net-print/cups-2.4.7-r1 b/metadata/md5-cache/net-print/cups-2.4.7-r1
new file mode 100644
index 000000000000..14c9caa6be98
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-2.4.7-r1
@@ -0,0 +1,18 @@
+BDEPEND=acct-group/lp acct-group/lpadmin virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-text/libpaper:= sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=The Common Unix Printing System
+EAPI=8
+HOMEPAGE=https://www.cups.org/ https://github.com/OpenPrinting/cups
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs
+IUSE=acl dbus debug kerberos openssl pam selinux static-libs systemd test usb X xinetd zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=Apache-2.0
+PDEPEND=>=net-print/cups-filters-1.0.43
+RDEPEND=app-text/libpaper:= sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://github.com/OpenPrinting/cups/releases/download/v2.4.7/cups-2.4.7-source.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5600e45ee19126d45bbfb4991e351e75
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index 6165ab69c885..b156500e7b91 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -1,17 +1,17 @@
 BDEPEND=acct-group/lp acct-group/lpadmin virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/libpaper:= sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=app-text/libpaper:= sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=The Common Unix Printing System
 EAPI=8
 HOMEPAGE=https://www.cups.org/ https://github.com/OpenPrinting/cups
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs git-r3
-IUSE=acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=acl dbus debug kerberos openssl pam selinux static-libs systemd test usb X xinetd zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=Apache-2.0
 PDEPEND=>=net-print/cups-filters-1.0.43
 PROPERTIES=live
-RDEPEND=app-text/libpaper:= sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups )
+RDEPEND=app-text/libpaper:= sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups )
 RESTRICT=!test? ( test ) test
 SLOT=0
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d92eb12d92ef2b6664cb6c7ef2dc9a19
+_md5_=d0f4829c08ed297ce9bd16b5af0e012e
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index d62d0eccd1f9..78954985baa9 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/kbd-2.6.3-r1 b/metadata/md5-cache/sys-apps/kbd-2.6.3-r1
new file mode 100644
index 000000000000..c5ae614b1bed
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/kbd-2.6.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( dev-libs/check ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare
+DEPEND=app-alternatives/gzip pam? ( !app-misc/vlock sys-libs/pam )
+DESCRIPTION=Keyboard and console utilities
+EAPI=8
+HOMEPAGE=https://kbd-project.org/
+INHERIT=autotools
+IUSE=nls selinux pam test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-alternatives/gzip pam? ( !app-misc/vlock sys-libs/pam ) selinux? ( sec-policy/selinux-loadkeys )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.6.3.tar.xz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=c1a9d3568e11b8d0d395f73a011605d3
diff --git a/metadata/md5-cache/sys-apps/usbredir-0.13.0-r1 b/metadata/md5-cache/sys-apps/usbredir-0.13.0-r1
new file mode 100644
index 000000000000..8ca026fded7f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/usbredir-0.13.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/glib:2 virtual/libusb:1
+DESCRIPTION=TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)
+EAPI=8
+HOMEPAGE=https://www.spice-space.org/usbredir.html https://gitlab.freedesktop.org/spice/usbredir
+INHERIT=meson
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=dev-libs/glib:2 virtual/libusb:1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/spice/usbredir/-/archive/usbredir-0.13.0/usbredir-usbredir-0.13.0.tar.bz2
+_eclasses_=meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=b28cef7fed9338ac9e1c6e4ad4811073
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 6c3a3821289c..4c81f50f024d 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r3 b/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r3
new file mode 100644
index 000000000000..c21cfe0adad9
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/cairo-clock-0.3.4-r3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=install prepare
+DEPEND=>=dev-libs/glib-2.8 >=gnome-base/libglade-2.6 >=gnome-base/librsvg-2.14 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.10:2 >=x11-libs/pango-1.10
+DESCRIPTION=An analog clock displaying the system-time
+EAPI=8
+HOMEPAGE=https://launchpad.net/cairo-clock
+INHERIT=autotools
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.8 >=gnome-base/libglade-2.6 >=gnome-base/librsvg-2.14 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.10:2 >=x11-libs/pango-1.10
+SLOT=0
+SRC_URI=http://macslow.thepimp.net/projects/cairo-clock/cairo-clock-0.3.4.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
+_md5_=f3ea8b4d68e4edebdee436cd767319af
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index a6cc7f18c94d..ea1a352c84b4 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-10-04T10:10:13Z
+TIMESTAMP 2023-10-04T16:10:22Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUdOgVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUdjm5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC9ng//Vav8uEw6qieYNUE5ERBERXyFxWGUnX0hS7cxKXSDOOnslQzaDeWO5XGF
-oQHifRfXYufPESYeimJtl1lCGXFpXp3HcHtCkI+Fej+4ESAx/vuxtd6UrCht3esX
-uKuAs/wA4XtaggcNPP1gQ6YTMlUvQQVjhoiO0DDuZmXS40yJceWN+e5JxqJ+tQgh
-MGZEjJPb2UQ5tt392dPi4Z4HP71FSyOuBI3y5aOgsv74mpjORX9Rxi/tiZEp7U8J
-k2T6x7hIwZxDx5/m+SYcpN2csu5uJF9Ta6Ylc24syTQ3/1hOWAAU5JYMYLTbhWeY
-nezvx8XujWVbCdPon1Y8pP6fmSKls91oNX3hG9O1foQrvlDwHXucbIWT5EzzVtbe
-8GHByLNZcdfVEPHJqhRNrm/Rnm7q7XnWnI7D769Z87Didz18CMhSE5+5APtmc6UP
-JvamTD88P/tBMuJsZA6oWrUL13hhxNZ9wjkHqbgG66PzK06e93zcZyjorneytJM+
-csFbOFXTxAUrTEkePrQbMtqRoRjva8W1pErb2R+sEGX4jdu3Q0J4fioLPkoNE9fb
-TBOWCk8A1qolrh78DHM0Sn4FsUeLK2GxQfZ9vtqXxejTvhzcbYLF9Hb3nDuOi6Wr
-Lt8vW7sSM0Xw4OBHzAKzO12x6fLpo1+z3Rgb6yPyghE4X9XxXDw=
-=UlTf
+klB0ag/+O3kPdavAIa0mcRayRxPCPdqQwWt/tbanzlGNLY8eIgJ7gidAX0lyWVZv
+9MGGkCOPhiTyPEW1jdotnjJ8RQKmuUTPHjn8X4vmQlWZbX2QmTfpgV097pfzMUPF
+pASQHSA2Xgq8YntjJt0N/pr7K0DFweGbK29cpQc1UPRYsxFVQj1TcPX4EA+hc/W0
+kYO+ofSt1UDH2m39IBDuVSom1FRbpcXg2Smuba8jcZrJHDVaR/lge+1q2iLmb5op
+tuP/bSNM7ir1lhv4fh0qKKq6Cp59loqElBA89D5B8fjB5vdSx0rxnFjlBKS+y42Z
++L6v3eYWnrzDEenBjKJTzW8SiKmvlyP8CtTTbx8/5EP+SZ5YB3lUUFDecsZOt23g
+UNgJlFmYvxNxCXzCEWchE5J6u2+aZMKkV0iHjy3dTCZOcg7Nq7fsFry8LmnrrX+N
+VfqXGVdRNk8cKSHRi+iryKo03CMn7IKLsAw30dRTM11XuyN9L7CigtA7oTxH7eT/
+FcxXBJKDxg9eGjllLhiMTCL2IGlPDaCCnUxtDDylFKrlmlkiD04lrTt/yBLfKSDF
+KArSk+yRov9s5utMw01Cwyd8qD88fxN1nCyu6tw9S7fskALIR7lIQBYOcqD63PRF
+61cwGlMGA7MBwfykOJEqLWZFLFFCuIcEvE1o5wc4mopvTJBj4LI=
+=/bU/
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b92e786ad91c..365bbb13eee1 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 04 Oct 2023 10:10:09 +0000
+Wed, 04 Oct 2023 16:10:16 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e5adb1217a8e..5240b2ddb3e9 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Oct  4 10:10:09 AM UTC 2023
+Wed Oct  4 04:10:16 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8836cd07d072..4af34f1a36a0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 04 Oct 2023 10:15:01 +0000
+Wed, 04 Oct 2023 16:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c22ec4bac060..12c5ceba8fb3 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-80968abe70a13d87253f93672bdb5990b7c98b02 1696413643 2023-10-04T10:00:43+00:00
+8e88a75c402954c9c81d2a471be272cfd1523583 1696434856 2023-10-04T15:54:16+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3f08625e138b..2963434262da 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1696414201 Wed 04 Oct 2023 10:10:01 AM UTC
+1696435801 Wed 04 Oct 2023 04:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b92e786ad91c..365bbb13eee1 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 04 Oct 2023 10:10:09 +0000
+Wed, 04 Oct 2023 16:10:16 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 22c4c956cc4d..82e941ddd21b 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/arp-scan/Manifest b/net-analyzer/arp-scan/Manifest
index 10063750b966..013939ffe012 100644
--- a/net-analyzer/arp-scan/Manifest
+++ b/net-analyzer/arp-scan/Manifest
@@ -1,4 +1,6 @@
+AUX arp-scan-1.10.0-dont-clobber-fortify-source.patch 871 BLAKE2B 404b917ae7b6443bdb39c87592bcf3291346d3b51d5ac0380280bf0a5a6913fbce955b1eccac31d27412d337ca703557a0add58ddd7b2117fa69e487cda03f72 SHA512 359379ee7ec53ac5b322bfc35e651cb883af73a44ff6f2612f84fbc05abc9186424f1bb8060f7d2614994714242642c570a45c9172083b440e2e50d384b07fe5
+DIST arp-scan-1.10.0.tar.gz 653900 BLAKE2B 618a8201a2c7f425dce5b4260857542956caa4beed61fde9d85cf763076c12ef24eb5a059a5d332b739f1e5b2b3d18db922e6299ff46f7e02ddfb54562b3fc3e SHA512 716c7727597bdecf9fd3f064fe1715148c246c223c2adeb01a26417865e4d82b9ca47e7fe4a555e510e0ae65f23f8310f0dbdffdb7c3fd969e3b81d0c6e4ae2a
 DIST arp-scan-1.9.7.tar.gz 459544 BLAKE2B bd70b2dd9e005096ce80fca07b8f2d8482b1073d25a2a9f82e8f5c1206148dbeab095046292cb46b5823aa18b56c208a5e86d0b7252d8566ddee5cd714b78cc6 SHA512 2aa808521a64cd3e2a6a270c6725f2cffa4cfce5c251e5483053c8ea9f56fb1368dd9aae2afcf8fffe1030fe2fc37723f0701c9eafa7cd1d52df459c07a80870
+EBUILD arp-scan-1.10.0.ebuild 651 BLAKE2B 31a7bfca9004014a2fe5bddb8226b80563c8fd73baf1cd0756bca2a7335d8d477d026539ebf6d00592f46fa21607fb517ab0d82a928f3fc100bc9242dadc7c6f SHA512 cea92de94a40305f8f0027438daab0639e374d7f4e02e99fd0d5071d2f90b8adfc38f9318ae3630b9509c109b31889fc4b68a0dfcc423f334e29a99cd6cda9f5
 EBUILD arp-scan-1.9.7.ebuild 496 BLAKE2B 2a33868209b807025802dfffaf17fd3e3c219a914e2aee2ea974ee4328f62b63671c19857de5d5f76ac9ee88e1486f257b2f00e8b87a74679264af496ec1ff1a SHA512 30bd6aca39bf48ea57e5ce208ed7b6293b4f40ae4f81b149a4636343a161ac7ad5f4086a7820f32b30bdd166ea9168691a58ab8f31b8270bd50e6d9a30049f82
-EBUILD arp-scan-99999.ebuild 437 BLAKE2B 7a306bfc3b31f3da8e1d5974fc50f90e32f3f01d766cbcc7f9b9408347a37a771da8f83df3a8fd0dcffe5ab80528927e5876f584e08361644a282e445c4f7bfe SHA512 eb8d8ac754ec26d4c122586596a649afee8f9de1a701ee36d24838a37dd3f6256a5820c818c8fdcda171eeacc29dbda8e03778b92a300c6b1ee31c7820e467b0
 MISC metadata.xml 363 BLAKE2B 779a9cd3cba88ae4076ed6b094efbfeb4433e81c757bde0555e87afc9562c64f1575503a7b1395e9e41b9e659a5037bbb124ea38abde3193d9ac001a7ddea2f4 SHA512 864d8e4092af38e8fb45652cf17259466d94dd810707c2c39f7d5115dcaa1adc0164eb8397e7e303d1b57559946cc79941fd137e0a0a54cb71227196de2e95fc
diff --git a/net-analyzer/arp-scan/arp-scan-1.10.0.ebuild b/net-analyzer/arp-scan/arp-scan-1.10.0.ebuild
new file mode 100644
index 000000000000..7ab46fd66b97
--- /dev/null
+++ b/net-analyzer/arp-scan/arp-scan-1.10.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="ARP scanning and fingerprinting tool"
+HOMEPAGE="https://github.com/royhills/arp-scan"
+SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/libcap
+"
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+"
+# Needed for _F_S patch
+BDEPEND="sys-devel/autoconf-archive"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.0-dont-clobber-fortify-source.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-analyzer/arp-scan/arp-scan-99999.ebuild b/net-analyzer/arp-scan/arp-scan-99999.ebuild
deleted file mode 100644
index c0d127582510..000000000000
--- a/net-analyzer/arp-scan/arp-scan-99999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools git-r3
-
-DESCRIPTION="ARP scanning and fingerprinting tool"
-HOMEPAGE="https://github.com/royhills/arp-scan"
-EGIT_REPO_URI="https://github.com/royhills/arp-scan"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-
-DEPEND="
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-analyzer/arp-scan/files/arp-scan-1.10.0-dont-clobber-fortify-source.patch b/net-analyzer/arp-scan/files/arp-scan-1.10.0-dont-clobber-fortify-source.patch
new file mode 100644
index 000000000000..f933e965893b
--- /dev/null
+++ b/net-analyzer/arp-scan/files/arp-scan-1.10.0-dont-clobber-fortify-source.patch
@@ -0,0 +1,25 @@
+Don't clobber toolchain defaults.
+
+(TODO: Fix upstream's GCC_FORTIFY_SOURCE macro or just replace it with the
+autoconf-archive one (AX_ADD_FORTIFY_SOURCE)).
+
+https://bugs.gentoo.org/895522
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,7 +37,6 @@ if test -n "$GCC"; then
+    CFLAGS="$CFLAGS -Wall -Wshadow -Wwrite-strings"
+    GCC_WEXTRA
+    GCC_STACK_PROTECT_CC
+-   GCC_FORTIFY_SOURCE
+    GCC_FORMAT_SECURITY
+ dnl Uncomment the line below to compile with additional warnings enabled.
+ dnl CFLAGS="$CFLAGS -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs"
+@@ -49,6 +48,8 @@ else
+ fi
+ AC_PROG_INSTALL
+ 
++AX_ADD_FORTIFY_SOURCE
++
+ dnl Checks for libraries.
+ dnl Solaris 10 needs -lnsl for gethostbyname() and -lsocket for socket().
+ dnl Linux, {Free,Open,Net,Dragonfly}BSD and MacOS X do not.
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 71a1367d03ee..3aff30277eed 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 4259a0a41ab3..245fd549ca21 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -1,7 +1,12 @@
 AUX swift-4.0.2-boost-1.69-compatibility.patch 2986 BLAKE2B e81cdaadaa7fe4972df1f65f234f4630cade22e64325734500b24ddbba07a663d75fe6ef570b0dbc1463f6d03bc3db3d272d38c2d17945af923383ce65843eb6 SHA512 5218e5ce0d07826c4ebbcf3ea3d7e2685a3d3a9875301d0656929c19b83c4042a538e308b427d4666c5e6ba39adb9049795a886cf50daa9632cf96648421884a
 AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8e71911ee87dc754f8d7dfe15f7fa3ff9d788f3d698a63cd90f6ff9b2cc4b013a14c92bd704ef0248ea71204645ea4ff90d828881 SHA512 a91d516f682b47573de8949ff5e364505b39d67e6a93441f66000519f8c6d910f7efb67ee510f709d03592446a4fbee0b1f17b0e1b7548ecaa2e3781e8406880
 AUX swift-4.0.2-qt-5.15-compatibility.patch 245 BLAKE2B 77facc560f6cea3dedd7c3095b6e5d7a91ff956b80022dc8a27c93edac72884bfd7f484fc84052a47bccb184f4225eb90fcc3d30f925ee15e18d5c97037a0b16 SHA512 9e8adaec0e7b1e727a2f91a675eaea4f62b7f8a53fdbaaf2adf9e13d57a1df15e921f1aa1b876561c7eecd1a4602763a52b3e875cecebe139d6e338df1001b12
+AUX swift-4.0.3-gcc11-compatibility.patch 388 BLAKE2B a8b9d79d05accc9f07ec9db302bdf5a7757c5872a6dd66abc5765a109f6e69358dafc7e7c67208b6e7a15a88befb07b09d4a8629aceda83acc306c4b33899554 SHA512 27b4372eea344c98aaffe02d55550da62130d66d1abb967f3e6d236d58db33cea525448b3ed195c4397446af43d166ec3555b9f1f23637e3edfd73f9acb339e8
+AUX swift-4.0.3-reproducible-build.patch 732 BLAKE2B e40c7e9c5e18aec72c6cd6290e89badbb0d57d15bc30fb06baef1050c4be52f795593f43dc9715a0634d19b9c5a0bb2afbb4025de2b6aa8bd0deb074c748ee2c SHA512 4f90dba4ebbd4ae33b40eeeaa100e647a1ae5cd6e32ed21b6bcbdc52104b57d59bdcc7dbb907a1a751a30f91e1e234d695278d999574f1393d3aaf499484270f
 DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 17b75950bba9252bb76e30eb9fadb9eaaaad6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a SHA512 fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba
 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
+DIST swift-4.0.3-python3-compatibility.patch.gz 14964 BLAKE2B ec98bee12734eb00037433b2791817d24a0a53effa653268a886b59358fb82f8e6c05739165f2518c9c5ad5b7ddfcef90734964eb6de647a24197e69b333ebc9 SHA512 95e1a0c49158cbf1392442103c960e2d458a99b34c3f32cdb47fec2d195b709d6c4b0c2961b4c49d05c19e590f2e2ca836c6f559b960015030bf8375b0604c3f
+DIST swift-4.0.3.tar.bz2 15124142 BLAKE2B 23896b72ffecc5148ade806ec6610c5edfa67ae9000e28383c7cf5a3c8bf275a6fc8208d1d6e7c7715e75bf133869ed404fd35bfb13998849209def3aab46c07 SHA512 59ebf69391f2cbdce538f0ee925f55eec0e8463c2f9b90899cb314f2a036f40ebdc357c4b6a6d3b71ae800ccf6ee6df5ff6011949ea0bb189cdf3e9f231e9733
 EBUILD swift-4.0.2-r102.ebuild 4378 BLAKE2B ab3383c06b7a61c6839b8a6fe8977f7b49e7e4f8b341cc97afdd1e88c9bf777956eb288b6da543583a91bf254341d70abc9afb311f8a43427cd5db6119f2a4dd SHA512 defb6b052b8296408690ee8852bf5dd48673ff2286d1dc30bcafae2523b54994544434093f4af6b12336f5620a982f9dc7cbd7e1e56126be59d7de460a8fda1c
+EBUILD swift-4.0.3.ebuild 4502 BLAKE2B 16b72289e5ee13354ae6f833e36b0a1b72a54a814c22a0cb547843e13dd02c05b5c31db102fd7c1947678fd6eb880d884a80303c873510d3fa22247451a50c1e SHA512 c76c86483f6c5188fc00a82a322e1812eb4025e80719f537591f34a6daf7a36e74cafae27aa03383007dd20c4273796203897a4d75ea7dd1e9453badc1fe1a4d
 MISC metadata.xml 572 BLAKE2B 844c5b114051f7e2292b7857c991d4c6ea9c52a7e697f5d7f93296f4047179da836519701425c3ac6e9fd9fae99d77565258e08f2493682b8f2629cac493344b SHA512 4ed15787f531624392d9e8489634094c99f32b2c077c1330d79713a662bb22c79bd808aa8c1616b21fb5824ec03908aa54ea1d1cf13aa3f011235ef3756a32c5
diff --git a/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch b/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch
new file mode 100644
index 000000000000..4d94c2d10503
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.3-gcc11-compatibility.patch
@@ -0,0 +1,13 @@
+diff --git a/Swift/Controllers/ShowProfileController.h b/Swift/Controllers/ShowProfileController.h
+index 0d01ba1a0..5dc7197ff 100644
+--- a/Swift/Controllers/ShowProfileController.h
++++ b/Swift/Controllers/ShowProfileController.h
+@@ -18,6 +18,8 @@
+ 
+ #include <Swift/Controllers/UIEvents/UIEvent.h>
+ 
++#include <map>
++
+ namespace Swift {
+     class VCardManager;
+     class ProfileWindow;
diff --git a/net-im/swift/files/swift-4.0.3-reproducible-build.patch b/net-im/swift/files/swift-4.0.3-reproducible-build.patch
new file mode 100644
index 000000000000..951678f2303f
--- /dev/null
+++ b/net-im/swift/files/swift-4.0.3-reproducible-build.patch
@@ -0,0 +1,21 @@
+commit 39a684108ae5938105498e7744e70962308cde7b
+Author: kpcyrd <git@rxv.cc>
+Date:   Wed Aug 25 23:30:17 2021 +0200
+
+    Reproducible Builds: Sort directory contents at build
+
+diff --git a/Swiften/SConscript b/Swiften/SConscript
+index f52637bdb..334f4489e 100644
+--- a/Swiften/SConscript
++++ b/Swiften/SConscript
+@@ -567,7 +567,9 @@ if env["SCONS_STAGE"] == "build" :
+     swiften_includes = []
+     swiften_public_includes = []
+     top_path = env.Dir("..").abspath
+-    for root, dirs, files in os.walk(env.Dir(".").abspath) :
++    for root, dirs, files in sorted(os.walk(env.Dir(".").abspath)) :
++        dirs.sort()
++        files.sort()
+         if root.endswith("UnitTest") :
+             continue
+         for file in files :
diff --git a/net-im/swift/swift-4.0.3.ebuild b/net-im/swift/swift-4.0.3.ebuild
new file mode 100644
index 000000000000..36ac7c1ee8ed
--- /dev/null
+++ b/net-im/swift/swift-4.0.3.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit lua-single python-any-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
+HOMEPAGE="https://www.swift.im/"
+SRC_URI="
+	https://swift.im/git/${PN}/snapshot/${PN}-${P}.tar.bz2 -> ${P}.tar.bz2
+	https://dev.gentoo.org/~conikost/distfiles/patches/${P}-python3-compatibility.patch.gz
+"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
+SLOT="4/0"
+KEYWORDS="~amd64"
+IUSE="expat +icu +idn lua test zeroconf"
+REQUIRED_USE="
+	|| ( icu idn )
+	lua? ( ${LUA_REQUIRED_USE} )
+"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/boost:=
+	dev-libs/openssl:0=
+	net-libs/libnatpmp
+	net-libs/miniupnpc:=
+	sys-libs/zlib
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2:2 )
+	icu? ( dev-libs/icu:= )
+	idn? ( net-dns/libidn:= )
+	lua? ( ${LUA_DEPS} )
+"
+
+DEPEND="
+	${RDEPEND}
+	>=dev-util/scons-3.0.1-r3
+	test? ( net-dns/avahi )
+"
+
+# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6".
+RESTRICT="test"
+
+DOCS=(
+	"DEVELOPMENT.md"
+	"README.md"
+	"Swiften/ChangeLog.md"
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.2-boost-1.69-compatibility.patch
+	"${FILESDIR}"/${PN}-4.0.2-qt-5.15-compatibility.patch
+	"${FILESDIR}"/${PN}-4.0.3-gcc11-compatibility.patch
+	"${WORKDIR}"/${PN}-4.0.3-python3-compatibility.patch
+	"${FILESDIR}"/${PN}-4.0.3-reproducible-build.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Don't include '/usr/lib*' in the link command line for `swiften-config`
+	sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die
+
+	# Use correct LIBDIR for Lua
+	sed -e "s/lib/$(get_libdir)/g" -i Sluift/SConscript.variant || die
+
+	# Hack for finding Qt system libs
+	mkdir "${T}"/qt || die
+	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
+	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
+	ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die
+
+	# Remove parts of Swift, which a user don't want to compile
+	rm -fr Swift Slimber || die
+	if ! use lua; then rm -fr Sluift || die; fi
+	if ! use zeroconf; then rm -fr Limber || die; fi
+
+	# Remove '3rdParty', as the system libs should be used
+	# `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
+	local my3rdparty=(
+		Boost
+		Breakpad
+		DocBook
+		Expat
+		LCov
+		Ldns
+		LibIDN
+		LibMiniUPnPc
+		LibNATPMP
+		Lua
+		OpenSSL
+		SCons
+		SQLite
+		Unbound
+		ZLib
+	)
+
+	if use test; then
+		cd 3rdParty && rm -fr "${my3rdparty[@]}" || die
+	else
+		rm -fr 3rdParty || die
+	fi
+}
+
+src_configure() {
+	MYSCONS=(
+		ar="$(tc-getAR)"
+		allow_warnings="yes"
+		assertions="no"
+		build_examples="yes"
+		boost_bundled_enable="false"
+		boost_force_bundled="false"
+		cc="$(tc-getCC)"
+		ccache="no"
+		ccflags="${CFLAGS}"
+		coverage="no"
+		cxx="$(tc-getCXX)"
+		cxxflags="${CXXFLAGS}"
+		debug="no"
+		distcc="no"
+		experimental="no"
+		experimental_ft="yes"
+		hunspell_enable="no"
+		icu="$(usex icu)"
+		install_git_hooks="no"
+		# Use 'DISABLE' as an invalid lib name, so no editline lib is used,
+		# as current version is not compatible and compilation will fail.
+		editline_libname="DISABLE"
+		libidn_bundled_enable="false"
+		libminiupnpc_force_bundled="false"
+		libnatpmp_force_bundled="false"
+		link="$(tc-getCXX)"
+		linkflags="${LDFLAGS}"
+		max_jobs="no"
+		optimize="no"
+		qt="${T}/qt"
+		qt5="no"
+		swiften_dll="true"
+		swift_mobile="no"
+		target="native"
+		test="none"
+		try_avahi="no"
+		try_expat="$(usex expat)"
+		try_gconf="no"
+		try_libidn="$(usex idn)"
+		try_libxml="$(usex !expat)"
+		tls_backend="openssl"
+		unbound="no"
+		V="1"
+		valgrind="no"
+		zlib_bundled_enable="false"
+	)
+
+	if use lua; then
+		MYSCONS+=(
+			lua_includedir="$(lua_get_include_dir)"
+			lua_libdir="${EPREFIX}/usr/$(get_libdir)"
+			lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"
+		)
+	fi
+}
+
+src_compile() {
+	local myesconsinstall=(
+		Swiften
+		$(usex lua Sluift '')
+		$(usex zeroconf Limber '')
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+}
+
+src_test() {
+	MYSCONS=(
+		V="1"
+	)
+
+	escons "${MYSCONS[@]}" test=unit QA
+}
+
+src_install() {
+	local myesconsinstall=(
+		SWIFTEN_INSTALLDIR="${ED}/usr"
+		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
+		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
+		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
+		"${ED}"
+	)
+
+	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
+
+	use zeroconf && dobin Limber/limber
+
+	einstalldocs
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 2aad04eb4039..351b1e7ec4a2 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libotr/Manifest b/net-libs/libotr/Manifest
index 96d63cfbb57d..174c4602ed6d 100644
--- a/net-libs/libotr/Manifest
+++ b/net-libs/libotr/Manifest
@@ -1,4 +1,6 @@
+AUX libotr-4.1.1-dont-clobber-fortify-source.patch 762 BLAKE2B 0d9fe67330b78887751622c5dc9f7ca997ac3a0138aafc3a0ecf9fe9eaff39ef39f3a21ed8b8fa5c5cfd0d4cd39d0387a8b4e3319eed4f55bbdf750ffb319813 SHA512 ed9daa6ee9da54fa318678bb01e7d9c6f0b5de80036d591110dfe60b6f352cd66fc3566295671bcaaded759a812561a2bc3d4599c3e53576b67af3b71ce49cca
 AUX libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch 285 BLAKE2B c83895dc849645ae83bf2f5e5a7c63fd5d94071af6859744551be298d2de7708d6818aadecfc1d83e6fb93c14cad23d2d3e5f1650067fbf29e4cb43aab8101ad SHA512 d1d59c884ec96ab258aeb9d41ce39949aec97de85859c4fc376b5afdc225495a0f7266b4214140f5f6cc4e0acd1a63a376f070a4393460d36e72934a8398e06f
 DIST libotr-4.1.1.tar.gz 655791 BLAKE2B 51be68277b56dab96a68fb744e467dc13d966038849ccc0b98b1d0082bcf3b4a0b7fcaeb3f050b0798851723bcdf11bc7ef6681a94999105656dec2fe919659b SHA512 c957206235b9f627542f23a645c822ea1b318d83fa655f41ed8d9a3c0dddf30b88f0ca82060026af155e48ecb13969dc9270831f20304669794151f666ae5cb0
 EBUILD libotr-4.1.1-r1.ebuild 777 BLAKE2B 8276f8bc612232da153b99a00da3d0df585ae2ce4c6339dcd4f8bd836ee67407f6724821b92745d7b202e4e95a64ca2e2d0c9c1be00899664cf1e924791e5d75 SHA512 4e15bf596cb902eff60c565ad16e29bdfce7c68209a4550f702714975a043741e03f36ff13b584e935153357362af9faf7d4c07d156d1dc16b01eb7553fadee4
+EBUILD libotr-4.1.1-r2.ebuild 914 BLAKE2B 6ebefeccfb4cfa20a2263d7f234ffa207bc0d9906fdac71e7ae2b7aff8524af30bb4beddb9e384d382436ad3d720015dd9f49991003807b25c33115d83dae5d1 SHA512 af3965195f2f9581c223aaa98e4ff4c9d13d612f8f6f2d36dcd5fe371b26a5553370aa595bf3b8b1b4dff584481732cccac3fbdfa8f17a804b8eff26274a0be1
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-libs/libotr/files/libotr-4.1.1-dont-clobber-fortify-source.patch b/net-libs/libotr/files/libotr-4.1.1-dont-clobber-fortify-source.patch
new file mode 100644
index 000000000000..af9330b97d3a
--- /dev/null
+++ b/net-libs/libotr/files/libotr-4.1.1-dont-clobber-fortify-source.patch
@@ -0,0 +1,23 @@
+Don't clobber our toolchain defaults.
+
+https://bugs.gentoo.org/895680
+--- a/configure.ac
++++ b/configure.ac
+@@ -151,7 +151,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
+ ])], have_clang=yes, have_clang=no)
+ 
+ if test x$enable_gcc_hardening != xno; then
+-    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
++    CFLAGS="$CFLAGS"
+     if test x$have_clang = xyes; then
+        OTR_CHECK_CFLAGS(-Qunused-arguments)
+     fi
+@@ -181,6 +181,8 @@ if test x$enable_linker_hardening != xno; then
+     OTR_CHECK_LDFLAGS(-z relro -z now, "$all_ldflags_for_check", "$all_libs_for_check")
+ fi
+ 
++AX_ADD_FORTIFY_SOURCE
++
+ AC_OUTPUT([Makefile src/Makefile toolkit/Makefile tests/Makefile tests/utils/Makefile libotr.pc
+            tests/utils/tap/Makefile
+            tests/unit/Makefile
diff --git a/net-libs/libotr/libotr-4.1.1-r2.ebuild b/net-libs/libotr/libotr-4.1.1-r2.ebuild
new file mode 100644
index 000000000000..d1082fa841cc
--- /dev/null
+++ b/net-libs/libotr/libotr-4.1.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
+HOMEPAGE="https://otr.cypherpunks.ca"
+SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	dev-libs/libgpg-error:=
+"
+DEPEND="${RDEPEND}"
+# autoconf-archive for F_S patch
+BDEPEND="sys-devel/autoconf-archive"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.1-fix-build-with-libgcrypt-1.10.patch"
+	"${FILESDIR}/${PN}-4.1.1-dont-clobber-fortify-source.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc UPGRADING
+
+	# no static archives, #465686
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 87ea6d851088..b1973ad1745e 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index c2abce1f7e0d..3803320c29a4 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,10 +1,14 @@
+AUX stunnel-5.71-dont-clobber-fortify-source.patch 414 BLAKE2B 8d9d199a916aeacbf860e9582becc833ee54790084b4ef1d5b598c3377fada8c21547496fb1443e756dd03bcdd12532fcd66b7b85202fd055f3c393bdae27032 SHA512 0773de628660c94988257ea209451c07b99b9de56d2cf454b4de4a9c3ae9ccb353b2da5bc15dbf4dfd8edef012e7fb4ba04f2fa79b30ab61fa1e38b000a3b3cf
+AUX stunnel-5.71-respect-EPYTHON-for-tests.patch 651 BLAKE2B 620fcef5f89172bce144a53d2112bdab81c341da558228471311694a825cfa1122212b954403db4b74b139bafa015bd1e4626fb6a88c94171dc68f17de93af0a SHA512 c2c14f21c6caccd08b751c731b7445d1cd34889c8a6bb75b84ccdd99c894625c59f7524f6a5b1a368abd39235b246af33fe9ed7bd1c3c6ab14d9b528a303f962
 AUX stunnel-r2 1652 BLAKE2B 7a1ee4d81b51583fcc2138b09999bd8ee66f03305f477ea6929eab43384a153f088c5703818aa99fe6f0cca40f177328ea916d64d410ec37bf68638e443aac90 SHA512 cd4bc2bd38df267cac979587e36cee878d60ce4a7b1c11ba72323b6955d30ce927bacd125b2a9ef329ca1c69d882af68abaae1412cd5c12f727178a8f466e6fc
 AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc552699a219a98b58374aa8864ef0d79d31e39185c8f3c35b3584f2c09218fff965966554e5335370 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826
 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb
 DIST stunnel-5.64.tar.gz 869088 BLAKE2B c6be054b825e57c1ac44adf28d4546ab78250cf9d7b17bc9e039d2715ca2316fef674a3ed2c4419a5a7ad6fa85b56809f736d0dca0bc672521347d5f51d2ed23 SHA512 85ed22664420db3c97b871f1afeb6483e547f421f0419fed1ccb4f3563ea154b6aeb6ae7221f001557c786a3406ada4c7b0d44b208dcf98f16209229aee4e0aa
 DIST stunnel-5.65.tar.gz 872293 BLAKE2B 45cc4dd0ec91cb9a99c10d26910b05325af29ec2609c0b86d5aceb07fbd495ff6fe39b0fe2c5895358596ee34ed822870c6eb1a538e30557f4485d042f5ae781 SHA512 96ca0535a07d5ea050a5d985c0ab6299bb92e551715120f536869a7b408b795fdc251782aaa7a4a282749d3146726d71c8b3c25430969aa55745a863abe5728a
 DIST stunnel-5.68.tar.gz 884989 BLAKE2B e2551b2052db0719203b24dcf16a2ef74c078dccd1200d25502defcef1301456e755a71a1a2b6ab7b43fc9ddc04cd031fca83ffb760528133a0e22ae22e64d40 SHA512 cdc3b8ab4cd35ba722b5248c005ae58a39d79a80600447417b1d0d01fd3aa9e8b22f8568c3177423be99d7395bb15a8754e975fb953556cd80a9cc11e185e9fb
+DIST stunnel-5.71.tar.gz 895646 BLAKE2B d323363c7bfdd6c0b7931b84a6069cf9a8337e967c31e14d15976d7932f0c0d6f40f7a1cbf5abbdff0e9edc52176cdcead4f848653088193b2debf4e77443b42 SHA512 c7004f48b93b3415305eec1193d51b7bf51a3bdd2cdc9f6ae588f563b32408b1ecde83b9f3f5b658f945ab5bcc5124390c38235394aad4471bf5b666081af2a2
 EBUILD stunnel-5.64-r2.ebuild 2914 BLAKE2B 3983e2163da5f52ac0515eaf28ebe7d993a8c665ffbdd20f9823b57427a1409d5f1065903d503ee13f17b54cf3a12600f8bbe5b1a6e9d34e873dcf090da41ceb SHA512 6a3a22bbd63ee234a280df39dd97245b40dd8a4420e3956d32f8f1a2617fb6edcc2cbc7149734a515c750b98b747960212acd5ace9fd4a6c6e6ed02a836bdc12
 EBUILD stunnel-5.65-r2.ebuild 2888 BLAKE2B ef210090dce4fae228bdb4400155e384c4b9a5e6dc7ff2fe7f3a805880b33593071438367ea943557acc3c3604457c1fdb1951273a6e0f656fe28f473f74e8b2 SHA512 48d7263cb1c6e68f8a56736c39f01e62a1f7b93ae8827b1e17da8a7f78d6bef6b71cac5d60783cf691fc862715d6f142cbb34359da7192957c857de0c65d8d58
 EBUILD stunnel-5.68.ebuild 2888 BLAKE2B ef210090dce4fae228bdb4400155e384c4b9a5e6dc7ff2fe7f3a805880b33593071438367ea943557acc3c3604457c1fdb1951273a6e0f656fe28f473f74e8b2 SHA512 48d7263cb1c6e68f8a56736c39f01e62a1f7b93ae8827b1e17da8a7f78d6bef6b71cac5d60783cf691fc862715d6f142cbb34359da7192957c857de0c65d8d58
+EBUILD stunnel-5.71.ebuild 3489 BLAKE2B c957b22b154735cebf9dd167dfce329f9556caf8161a9a9f07dd3d5d70139a3314048cc8588317d7ac67f78445e2ae266feed12abbe4fe540ac40bfacede068d SHA512 955f8b5c9286270b29f2e7c29547debd1d4326ed6cd6288b445e1874f8399152edc3194044fb5dad0e0e7df5691bc5075c305f982ff3da06f6602e89fecd6a08
 MISC metadata.xml 712 BLAKE2B abb0d57cf71591afbd71b86118435b149bb2a12ade506bac04e93fc0a334c7c458e58be0d428343582aa5738f2062307206bbfe4b79a809ab09e0e69e673459c SHA512 c6538a699b0135a536a8df4ab8355d7a8ca0ed25ff32e822a2e27dfdd896a2ba4b2a5398b75f692bcf5e77a88f9c64af358c14fdbaab213cafad882cb3f0deb3
diff --git a/net-misc/stunnel/files/stunnel-5.71-dont-clobber-fortify-source.patch b/net-misc/stunnel/files/stunnel-5.71-dont-clobber-fortify-source.patch
new file mode 100644
index 000000000000..723b9c5e43f2
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.71-dont-clobber-fortify-source.patch
@@ -0,0 +1,15 @@
+Don't clobber toolchain defaults.
+
+https://bugs.gentoo.org/892992
+--- a/configure.ac
++++ b/configure.ac
+@@ -109,7 +109,8 @@ if test "${GCC}" = yes; then
+     AX_APPEND_LINK_FLAGS([-Wl,-z,now])
+     AX_APPEND_LINK_FLAGS([-Wl,-z,noexecstack])
+ fi
+-AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
++
++AX_ADD_FORTIFY_SOURCE
+ 
+ AC_MSG_NOTICE([**************************************** libtool])
+ LT_INIT([disable-static])
diff --git a/net-misc/stunnel/files/stunnel-5.71-respect-EPYTHON-for-tests.patch b/net-misc/stunnel/files/stunnel-5.71-respect-EPYTHON-for-tests.patch
new file mode 100644
index 000000000000..3c421da91484
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.71-respect-EPYTHON-for-tests.patch
@@ -0,0 +1,12 @@
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -7,8 +7,7 @@ EXTRA_DIST = maketest.py plugin_collection.py reader.py error.py plugins
+ 
+ # try to find a supported python version (>= 3.7) that works
+ check-local:
+-	for v in $$(seq 20 -1 7); do command -v python3.$$v && break; done || ( echo "Python 3.7 or later not found" && false )
+-	for v in $$(seq 20 -1 7); do command -v python3.$$v && python3.$$v $(srcdir)/maketest.py --debug=10 --libs=$(SSLDIR)/lib64:$(SSLDIR)/lib && break; done
++	${EPYTHON} $(srcdir)/maketest.py --debug=10 --libs=$(SSLDIR)/lib64:$(SSLDIR)/lib
+ 
+ dist-hook:
+ 	rm -rf $(distdir)/__pycache__ $(distdir)/plugins/__pycache__
diff --git a/net-misc/stunnel/stunnel-5.71.ebuild b/net-misc/stunnel/stunnel-5.71.ebuild
new file mode 100644
index 000000000000..0a61d4a431b5
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.71.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools python-any-r1 ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html"
+SRC_URI="
+	https://www.stunnel.org/downloads/${P}.tar.gz
+	ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="selinux stunnel3 systemd tcpd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/openssl:=
+	tcpd? ( sys-apps/tcp-wrappers )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/stunnel
+	acct-group/stunnel
+	selinux? ( sec-policy/selinux-stunnel )
+	stunnel3? ( dev-lang/perl )
+"
+BDEPEND="
+	test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.71-dont-clobber-fortify-source.patch
+	"${FILESDIR}"/${PN}-5.71-respect-EPYTHON-for-tests.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.am || die "sed failed"
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel || die
+
+	# We pass --disable-fips to configure, so avoid spurious test failures
+	rm tests/plugins/p10_fips.py tests/plugins/p11_fips_cipher.py || die
+
+	# Needed for FORTIFY_SOURCE patch
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-ssl="${EPREFIX}"/usr
+		--disable-fips
+		$(use_enable tcpd libwrap)
+		$(use_enable systemd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 || die
+
+	if ! use stunnel3 ; then
+		rm -f "${ED}"/usr/bin/stunnel3 || die
+	fi
+
+	dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	tmpfiles_process stunnel.conf
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename.  For openrc make a symlink from the"
+	einfo "stunnel init script to \'stunnel.name\' and use that to start|stop"
+	einfo "your custom instance"
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 7e242e4f3842..f43b87bb5cb3 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index dbd2f3262554..5f1366174b25 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -4,6 +4,6 @@ AUX cupsd.init.d-r4 577 BLAKE2B 48508b10a13ee73e905b3d061275f5cb12ebdc2175ce46af
 DIST cups-2.4.6-source.tar.gz 8135135 BLAKE2B 4e61112ddaa46f20b1cfcb8f523dd07ba7d82604b9857754b288a2a9c5bc50ce242cfa119867347e4696818dc2eb505cf7fff1f9a0634e314edb2500395b83e4 SHA512 eb748680a748f599e4826c17054a24259d190e6c8e8339f6a7a37ee2a3f4c3fd1829e856b25a854cfdbee1b51279c70a0e847f6142225b8b68f1cd10c4ce4ce4
 DIST cups-2.4.7-source.tar.gz 8134809 BLAKE2B d81de62cff37c576ef8fb125b97568c2d86602cec6151d7030552fad421d7bc77a5df1e860d5ac5a241e739cc0d1fe5fcac44b8451ad2fc4dc675cf74fd41382 SHA512 914b574ff6d85de9f3471528b52d4a436c484c441f47651846e1bdfa00aec26774efd416ff466216d2bccf468f8a797b1e0d666b5c82abc87e77550ce8b00d39
 EBUILD cups-2.4.6.ebuild 9552 BLAKE2B 04227d32d232dabbf378d9dd4c254b04bf582e41c569295c50db2990b23f14824287c5158f792da2b9a64d146883b5c8b096f7fc55f88ffdc3b1288293def759 SHA512 4d8e8028a98f338d6775ee3ca07490efdfcd5f9ac9ca4a6fa59405045e25e2280598bab302b6d2cbc6c69878253cba035dbcee8a6f09c6c989ffc62d78408406
-EBUILD cups-2.4.7.ebuild 9553 BLAKE2B 976523e386d4b4f1231bdc0857bd9fdd6bf44008309f0b43b21266e05343fb0f9826f5ea94e427e4301c077739638b52e2b8a63f63cfde6c1a9c9f598fa8a5bd SHA512 5974d640daafcf55c7159f103af4c6bb0f89bb209743a0298725fe0a1e11538926b5e23dfffa1320340ab1fd440f797a44334677650fee7e1875f0ea2d046792
-EBUILD cups-9999.ebuild 9560 BLAKE2B 9f4c4868df8dd8dd31a8ec1c3adac3612e3fe01e5a0fd459d27c4a04121a6a2270563c7714187a3d81c3dadae531cf655b3d48f8a684dcbf0a4c52bbcea46833 SHA512 4082f0a7a857a96fd811460ccc660e9a6df370be4e72cde7fee82ea3964172753a5303e9daa32846c031a6baba409bf8e774868ab34b0897c1a85236ba2fa53b
+EBUILD cups-2.4.7-r1.ebuild 9468 BLAKE2B 13eeaba864bdb593e092db9db486587566b326211e4c7da61f4756d7bef5340c3ab681245cb450e2bf9a7f772b0a4370d8f39e428c771c98e4925c6c634fa702 SHA512 8a39e69a0db0993aecfc0df1d1523379b70b1efc71c69d4bbe39651bfc1bc16a1a5e805da62f44de084064fee739c2197942ad2b379010dd7a1527870ef2fd99
+EBUILD cups-9999.ebuild 9475 BLAKE2B 6a86ce8658096636175e5f324e4d19b6ab2023f002495e6bff79f18122ea1bb7332bfdc9c642d26022a50ec72e9dd3d1d0f7329b92fc49e3da7abf038835fc92 SHA512 e0ece558491f66bcbd78fa4c10a84ef58b58a17fac7ce1f6a5fd6c6a6e7c2163b671b178da22fe92883c90a79a391f2f0735cd1f920fcac0e6e12f4c9b6b6077
 MISC metadata.xml 527 BLAKE2B 04a32175e666165226eaa97785a6b9e4b779644e352c503a4653870631f28089dddbaaa3db3143f09a1d97c7f57952e4d760d64005eafacb379c23035fe9ad19 SHA512 136c81a99b501ffcedfd71f4425ba556292b79abc0ac819d336d2c845401775955b8cd72e6194f02f4c48d0cd26bc93ee7c94c7438228b49410daca80a159523
diff --git a/net-print/cups/cups-2.4.7-r1.ebuild b/net-print/cups/cups-2.4.7-r1.ebuild
new file mode 100644
index 000000000000..ca1eb9e72744
--- /dev/null
+++ b/net-print/cups/cups-2.4.7-r1.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs
+
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_PV="${MY_PV/_p/op}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git"
+	[[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999}
+else
+	SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
+	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+	fi
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="acl dbus debug kerberos openssl pam selinux static-libs systemd test usb X xinetd zeroconf"
+
+# As of 2.4.2, they don't actually seem to be interactive (they pass some flags
+# by default to input for us), but they fail on some greyscale issue w/ poppler?
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	acct-group/lp
+	acct-group/lpadmin
+	virtual/pkgconfig
+"
+DEPEND="
+	app-text/libpaper:=
+	sys-libs/zlib
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	!pam? ( virtual/libcrypt:= )
+	!openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:1 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/lp
+	acct-group/lpadmin
+	selinux? ( sec-policy/selinux-cups )
+"
+PDEPEND=">=net-print/cups-filters-1.0.43"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.1-nostrip.patch"
+	"${FILESDIR}/${PN}-2.4.1-user-AR.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# Recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug #501122)
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					elog "Your USB printers will be managed via libusb. In case you run into problems, "
+					elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
+					elog "usblp kernel module."
+					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove ".SILENT" rule for verbose output (bug #524338).
+	sed 's#^.SILENT:##g' -i Makedefs.in || die
+
+	# Remove redefinition of _FORTIFY_SOURCE (bug #907683)
+	sed 's#-D_FORTIFY_SOURCE=3##g' -i config-scripts/cups-compiler.m4 || die
+
+	AT_M4DIR="config-scripts" eautoreconf
+
+	# Custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	# Explicitly specify compiler wrt bug #524340
+	#
+	# Need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	local myeconfargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--localstatedir="${EPREFIX}"/var
+		# Follow Fedora permission setting
+		--with-cupsd-file-perm=0755
+		--with-exe-file-perm=755
+		--with-log-file-perm=0640
+		# Used by Debian, also prevents printers from getting
+		# disabled and users not knowing how to re-enable them
+		--with-error-policy=retry-job
+		# Used in Debian and Fedora
+		--enable-sync-on-close
+		#
+		--with-rundir="${EPREFIX}"/run/cups
+		--with-pkgconfpath="${EPREFIX}"/usr/$(get_libdir)/pkgconfig
+		--with-cups-user=lp
+		--with-cups-group=lp
+		--with-docdir="${EPREFIX}"/usr/share/cups/html
+		# See bug #863221 for adding root
+		--with-system-groups="root lpadmin"
+		--with-xinetd="${EPREFIX}"/etc/xinetd.d
+		$(multilib_native_use_enable acl)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable debug debug-guards)
+		$(use_enable debug debug-printfs)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable pam)
+		$(use_enable static-libs static)
+		$(use_enable test unit-tests)
+		--with-tls=$(usex openssl openssl gnutls)
+		$(use_with systemd ondemand systemd)
+		$(multilib_native_use_enable usb libusb)
+		$(use_with zeroconf dnssd avahi)
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
+	)
+
+	# Handle empty LINGUAS properly, bug #771162
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		myeconfargs+=(
+			--with-languages="${LINGUAS}"
+		)
+	fi
+
+	if tc-is-static-only; then
+		myeconfargs+=(
+			--disable-shared
+		)
+	fi
+
+	# Install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e 's:CUPS_SERVERBIN="$exec_prefix/lib/cups":CUPS_SERVERBIN="$exec_prefix/libexec/cups":g' configure ||die
+
+	econf "${myeconfargs[@]}"
+
+	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
+
+	# Additional path corrections needed for prefix, see bug #597728
+	sed \
+		-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
+		-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
+		-e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
+		-e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
+		-i Makedefs || die
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	# Avoid using /tmp
+	export CUPS_TESTBASE="${T}"/cups-tests
+
+	mkdir "${T}"/cups-tests || die
+
+	# We only build some of CUPS for multilib, so can't run the tests.
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake BUILDROOT="${D}" install
+	else
+		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,CREDITS,README}.md
+
+	# Move the default config file to docs
+	dodoc "${ED}"/etc/cups/cupsd.conf.default
+	rm "${ED}"/etc/cups/cupsd.conf.default || die
+
+	# Clean out cups init scripts
+	rm -r "${ED}"/etc/{init.d/cups,rc*} || die
+
+	# Install our init script
+	local neededservices=(
+		$(usex zeroconf avahi-daemon '')
+		$(usex dbus dbus '')
+	)
+	[[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}"
+	cp "${FILESDIR}"/cupsd.init.d-r4 "${T}"/cupsd || die
+	sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	if use pam ; then
+		rm "${ED}"/etc/pam.d/${PN} || die
+		pamd_mimic_system cups auth account
+	fi
+
+	if use xinetd ; then
+		# Correct path
+		sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${ED}"/etc/xinetd.d/cups-lpd || die
+		# It is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
+		# Write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd
+	else
+		# Always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		rm -r "${ED}"/etc/xinetd.d || die
+	fi
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	if ! use X ; then
+		rm -r "${ED}"/usr/share/applications || die
+	fi
+
+	# Create /etc/cups/client.conf, bug #196967 and bug #266678
+	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# The following file is now provided by cups-filter:
+	rm -r "${ED}"/usr/share/cups/banners || die
+
+	# The following are created by the init script
+	rm -r "${ED}"/var/cache || die
+	rm -r "${ED}"/run || die
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} /var/log/cups /var/spool/cups/tmp
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	local v
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ! ver_test ${v} -ge 2.2.2-r2 ; then
+			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
+			ewarn "cupsd will fail the next time. To fix this, please run once as root"
+			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
+			break
+		fi
+	done
+
+	for v in ${REPLACING_VERSIONS}; do
+		elog
+		elog "For information about installing a printer and general cups setup"
+		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+		break
+	done
+
+	optfeature_header "CUPS may need installing the following for certain features to work:"
+	use zeroconf && optfeature "local hostname resolution using a hostname.local naming scheme" sys-auth/nss-mdns
+}
diff --git a/net-print/cups/cups-2.4.7.ebuild b/net-print/cups/cups-2.4.7.ebuild
deleted file mode 100644
index fb26dd7c4f2a..000000000000
--- a/net-print/cups/cups-2.4.7.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs
-
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_PV="${MY_PV/_p/op}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git"
-	[[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999}
-else
-	SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
-	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
-	fi
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf"
-
-# As of 2.4.2, they don't actually seem to be interactive (they pass some flags
-# by default to input for us), but they fail on some greyscale issue w/ poppler?
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
-	acct-group/lp
-	acct-group/lpadmin
-	virtual/pkgconfig
-"
-DEPEND="
-	app-text/libpaper:=
-	sys-libs/zlib
-	acl? (
-		kernel_linux? (
-			sys-apps/acl
-			sys-apps/attr
-		)
-	)
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	!pam? ( virtual/libcrypt:= )
-	ssl? (
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
-		openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	)
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:1 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/lp
-	acct-group/lpadmin
-	selinux? ( sec-policy/selinux-cups )
-"
-PDEPEND=">=net-print/cups-filters-1.0.43"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.1-nostrip.patch"
-	"${FILESDIR}/${PN}-2.4.1-user-AR.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/cups-config
-)
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Can't check the linux kernel configuration."
-			ewarn "You might have some incompatible options enabled."
-		else
-			# Recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug #501122)
-			if use usb; then
-				if linux_chkconfig_present USB_PRINTER; then
-					elog "Your USB printers will be managed via libusb. In case you run into problems, "
-					elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
-					elog "usblp kernel module."
-					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
-				fi
-			else
-				if ! linux_chkconfig_present USB_PRINTER; then
-					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
-					ewarn "support in your kernel."
-					ewarn "Please enable it:"
-					ewarn "    CONFIG_USB_PRINTER=y"
-					ewarn "in /usr/src/linux/.config or"
-					ewarn "    Device Drivers --->"
-					ewarn "        USB support  --->"
-					ewarn "            [*] USB Printer support"
-					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Remove ".SILENT" rule for verbose output (bug #524338).
-	sed 's#^.SILENT:##g' -i Makedefs.in || die
-
-	# Remove redefinition of _FORTIFY_SOURCE (bug #907683)
-	sed 's#-D_FORTIFY_SOURCE=3##g' -i config-scripts/cups-compiler.m4 || die
-
-	AT_M4DIR="config-scripts" eautoreconf
-
-	# Custom Makefiles
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	# Explicitly specify compiler wrt bug #524340
-	#
-	# Need to override KRB5CONFIG for proper flags
-	# https://github.com/apple/cups/issues/4423
-	local myeconfargs=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--localstatedir="${EPREFIX}"/var
-		# Follow Fedora permission setting
-		--with-cupsd-file-perm=0755
-		--with-exe-file-perm=755
-		--with-log-file-perm=0640
-		# Used by Debian, also prevents printers from getting
-		# disabled and users not knowing how to re-enable them
-		--with-error-policy=retry-job
-		# Used in Debian and Fedora
-		--enable-sync-on-close
-		#
-		--with-rundir="${EPREFIX}"/run/cups
-		--with-pkgconfpath="${EPREFIX}"/usr/$(get_libdir)/pkgconfig
-		--with-cups-user=lp
-		--with-cups-group=lp
-		--with-docdir="${EPREFIX}"/usr/share/cups/html
-		# See bug #863221 for adding root
-		--with-system-groups="root lpadmin"
-		--with-xinetd="${EPREFIX}"/etc/xinetd.d
-		$(multilib_native_use_enable acl)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable debug debug-guards)
-		$(use_enable debug debug-printfs)
-		$(use_enable kerberos gssapi)
-		$(multilib_native_use_enable pam)
-		$(use_enable static-libs static)
-		$(use_enable test unit-tests)
-		# USE="ssl" => gnutls
-		# USE="ssl openssl" => openssl
-		$(use_with ssl tls $(usex openssl openssl gnutls))
-		$(use_with systemd ondemand systemd)
-		$(multilib_native_use_enable usb libusb)
-		$(use_with zeroconf dnssd avahi)
-		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
-	)
-
-	# Handle empty LINGUAS properly, bug #771162
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		myeconfargs+=(
-			--with-languages="${LINGUAS}"
-		)
-	fi
-
-	if tc-is-static-only; then
-		myeconfargs+=(
-			--disable-shared
-		)
-	fi
-
-	# Install in /usr/libexec always, instead of using /usr/lib/cups, as that
-	# makes more sense when facing multilib support.
-	sed -i -e 's:CUPS_SERVERBIN="$exec_prefix/lib/cups":CUPS_SERVERBIN="$exec_prefix/libexec/cups":g' configure ||die
-
-	econf "${myeconfargs[@]}"
-
-	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
-	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
-	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
-
-	# Additional path corrections needed for prefix, see bug #597728
-	sed \
-		-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
-		-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
-		-e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
-		-e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
-		-i Makedefs || die
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake libs
-	fi
-}
-
-multilib_src_test() {
-	# Avoid using /tmp
-	export CUPS_TESTBASE="${T}"/cups-tests
-
-	mkdir "${T}"/cups-tests || die
-
-	# We only build some of CUPS for multilib, so can't run the tests.
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake BUILDROOT="${D}" install
-	else
-		emake BUILDROOT="${D}" install-libs install-headers
-		dobin cups-config
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,CREDITS,README}.md
-
-	# Move the default config file to docs
-	dodoc "${ED}"/etc/cups/cupsd.conf.default
-	rm "${ED}"/etc/cups/cupsd.conf.default || die
-
-	# Clean out cups init scripts
-	rm -r "${ED}"/etc/{init.d/cups,rc*} || die
-
-	# Install our init script
-	local neededservices=(
-		$(usex zeroconf avahi-daemon '')
-		$(usex dbus dbus '')
-	)
-	[[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}"
-	cp "${FILESDIR}"/cupsd.init.d-r4 "${T}"/cupsd || die
-	sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die
-	doinitd "${T}"/cupsd
-
-	if use pam ; then
-		rm "${ED}"/etc/pam.d/${PN} || die
-		pamd_mimic_system cups auth account
-	fi
-
-	if use xinetd ; then
-		# Correct path
-		sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
-			"${ED}"/etc/xinetd.d/cups-lpd || die
-		# It is safer to disable this by default, bug #137130
-		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
-			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
-		# Write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd
-	else
-		# Always configure with --with-xinetd= and clean up later,
-		# bug #525604
-		rm -r "${ED}"/etc/xinetd.d || die
-	fi
-
-	keepdir /etc/cups/{interfaces,ppd,ssl}
-
-	if ! use X ; then
-		rm -r "${ED}"/usr/share/applications || die
-	fi
-
-	# Create /etc/cups/client.conf, bug #196967 and bug #266678
-	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
-
-	# The following file is now provided by cups-filter:
-	rm -r "${ED}"/usr/share/cups/banners || die
-
-	# The following are created by the init script
-	rm -r "${ED}"/var/cache || die
-	rm -r "${ED}"/run || die
-
-	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} /var/log/cups /var/spool/cups/tmp
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	local v
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ! ver_test ${v} -ge 2.2.2-r2 ; then
-			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
-			ewarn "cupsd will fail the next time. To fix this, please run once as root"
-			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
-			break
-		fi
-	done
-
-	for v in ${REPLACING_VERSIONS}; do
-		elog
-		elog "For information about installing a printer and general cups setup"
-		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
-		break
-	done
-
-	optfeature_header "CUPS may need installing the following for certain features to work:"
-	use zeroconf && optfeature "local hostname resolution using a hostname.local naming scheme" sys-auth/nss-mdns
-}
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index d1f511ef75b9..3d6b8b8cac30 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf"
+IUSE="acl dbus debug kerberos openssl pam selinux static-libs systemd test usb X xinetd zeroconf"
 
 # As of 2.4.2, they don't actually seem to be interactive (they pass some flags
 # by default to input for us), but they fail on some greyscale issue w/ poppler?
@@ -52,10 +52,8 @@ DEPEND="
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
 	!pam? ( virtual/libcrypt:= )
-	ssl? (
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
-		openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	)
+	!openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:1 )
 	X? ( x11-misc/xdg-utils )
@@ -166,9 +164,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable pam)
 		$(use_enable static-libs static)
 		$(use_enable test unit-tests)
-		# USE="ssl" => gnutls
-		# USE="ssl openssl" => openssl
-		$(use_with ssl tls $(usex openssl openssl gnutls))
+		--with-tls=$(usex openssl openssl gnutls)
 		$(use_with systemd ondemand systemd)
 		$(multilib_native_use_enable usb libusb)
 		$(use_with zeroconf dnssd avahi)
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 1398d77250be..58ccc37859e8 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 822b831397b1..ab35989c1101 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,3 +1,4 @@
+AUX kbd-2.6.3-no-redefine-fortify-source.patch 5516 BLAKE2B ed6532cf047b3bc4bfe24ba8abeacc03088b21c8e356eb4891ad700ec23e8c785a832d131c2181b491f68bdf5cc8a8ebb713e07b6855f579e4e58713f6f51416 SHA512 d22db84d282d3231b2891745bd6f249ce65e17fcfed46e10fccdc8289ad182fe0b0b847c4a10739f95f250bd50e506fc12dfaf97db3b3d83e33cfce3bf62edf2
 DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0
 DIST kbd-2.6.1.tar.xz 1591240 BLAKE2B 15c738379cfa9420e218ddbf6562e2c75b6bf5eb31ce159d798d49546991ca0c02bf9a11486d99bd2ba7d99f3bf6abb53ad799c6314df6d9ca9b1e8cf808b738 SHA512 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91
 DIST kbd-2.6.2.tar.xz 1503532 BLAKE2B aa146177b2ffd9d6d396c253ce54d0ee42e1a1a2ba471ae0f8950a72b49f2f83aa4660337a581150cfd9fae0b9a4415725f4d152e83c0bdf26b833a31f6e2696 SHA512 afcac33e2e8eecd6f9cfa20bb39254deffc4d8924c4f722d003bdfaf286dac7d87f55ed0a5a35d341ae88fc48162966d5aa1ab8125b11e845bf3c2589a17c8d2
@@ -5,6 +6,7 @@ DIST kbd-2.6.3.tar.xz 1503048 BLAKE2B 9c3f9e2ec9abd3a18bd4159b3a223deee6aee74610
 EBUILD kbd-2.5.1.ebuild 2027 BLAKE2B 66c55f1296812b9a197460a8a90bf237def618d6fc9d00ad6e26ff543b1918c7274aae2627c836925099ed37645bf6fa5c05ebfc392077b265b46f0d31d0b1c9 SHA512 9734368dac398812fee31c31a29f6ec8b4819181a8a0a711ceadb64c825aaf515aa35d767185bf9379e5287facda5f53c923ef64aeb3f45ea054b5a5c97f2dd2
 EBUILD kbd-2.6.1.ebuild 2080 BLAKE2B 0606f8e5722854c0aeb9e389079d016eaeab9d3d5b35d973c78f5e1d96242e443b6ddd50684288d3fbbc2d1e901e5648fb2396401b443b561154a9cd1f97b754 SHA512 6f07c4c1c64c445fc2014a857005c8b4a8d070f387d57b24377c15669f75b19e56a1c17278935a2418db5fe317ed734c3c2e36fb3d96a1a6ff6d84287b721124
 EBUILD kbd-2.6.2.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
+EBUILD kbd-2.6.3-r1.ebuild 2208 BLAKE2B 77a373d748301d2a4ccd36de5907c24a31a2116168ba6fd64e3a282f4bd54f1fff2a1d14bc720c826684dc128d1603cc2cf998ff8f5a0e2541c53645a03c33fa SHA512 5845863c0adf411da2f3259ca18b244c0bff48804e70373f3ba91375c5eb99d3971b6638c984623130987ed498a8fbdaf8cedf88453ee0420fe47094ec35402c
 EBUILD kbd-2.6.3.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
 EBUILD kbd-9999.ebuild 2087 BLAKE2B d28a22fedf7b8cbbeca0245c825a27f23f9bf2889362737103a0b368a78c4eeb96d6381e262d83b1c2b131206f36074f1f06ca0220a855ffe81b032a3d3ffbf6 SHA512 25f67af979a43e1866e8bbc98bfa86c27f493b06933e37365321dc6bbdc8520478fa8253430a8ad125b64c67c8e5df7560ff3e047a84ff2e661403afb456077a
 MISC metadata.xml 335 BLAKE2B 3b00a31428edc76e9a758c347107ad15e2f91a440a49e5167878555eda6dad176f8936ca22acbbecb5ff4827d8605b28db53ca990284b4e18c536a04d46616ed SHA512 86a6b134e0403abf5c22e868e2013a2051f504401d5ff8aa1ad682638d866ab8d837470ed87434286b77933483d7675646f382b15aed19772b2fff17258fc0f7
diff --git a/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch b/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch
new file mode 100644
index 000000000000..b18fb9f751cf
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch
@@ -0,0 +1,171 @@
+https://github.com/legionus/kbd/pull/103
+
+From 3392e2038dee97361d7438512653736d72a02109 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 4 Oct 2023 14:47:33 +0100
+Subject: [PATCH] Use `AX_ADD_FORTIFY_SOURCE` to avoid redefining
+ `_FORTIFY_SOURCE`
+
+Some distributions are now setting -D_FORTIFY_SOURCE=3 by default in their
+toolchains rather than _F_S=2. By forcing _F_S=2, this causes both a warning
+and a downgrade in the effective protection.
+
+Use the autoconf-archive macro for this purpose (AX_ADD_FORTIFY_SOURCE)
+to add the fortification at the highest supported level if the compiler doesn't
+already default to it.
+
+Bug: https://bugs.gentoo.org/892834
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac                |   5 +-
+ m4/ax_add_fortify_source.m4 | 119 ++++++++++++++++++++++++++++++++++++
+ 2 files changed, 122 insertions(+), 2 deletions(-)
+ create mode 100644 m4/ax_add_fortify_source.m4
+
+diff --git a/configure.ac b/configure.ac
+index 66023ff8..7fdbe7d6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,13 +63,14 @@ strspn strstr strtol strtoul setpgrp malloc realloc])
+ 
+ AC_SEARCH_LIBS([timer_create], [rt])
+ 
++AX_ADD_FORTIFY_SOURCE
++
+ # Optimization level
+ CC_O_LEVEL="-O2"
+-FORTIFY_SOURCE="-D_FORTIFY_SOURCE=2"
+ 
+ if test "$enable_code_coverage" = yes; then
+ 	CC_O_LEVEL="-O0"
+-	FORTIFY_SOURCE=
++	FORTIFY_SOURCE="-U_FORTIFY_SOURCE"
+ fi
+ 
+ case "$GCC,$ac_cv_prog_cc_g" in
+diff --git a/m4/ax_add_fortify_source.m4 b/m4/ax_add_fortify_source.m4
+new file mode 100644
+index 00000000..860c1598
+--- /dev/null
++++ b/m4/ax_add_fortify_source.m4
+@@ -0,0 +1,119 @@
++# ===========================================================================
++#  https://www.gnu.org/software/autoconf-archive/ax_add_fortify_source.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_ADD_FORTIFY_SOURCE
++#
++# DESCRIPTION
++#
++#   Check whether -D_FORTIFY_SOURCE=2 can be added to CPPFLAGS without macro
++#   redefinition warnings, other cpp warnings or linker. Some distributions
++#   (such as Ubuntu or Gentoo Linux) enable _FORTIFY_SOURCE globally in
++#   their compilers, leading to unnecessary warnings in the form of
++#
++#     <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
++#     <built-in>: note: this is the location of the previous definition
++#
++#   which is a problem if -Werror is enabled. This macro checks whether
++#   _FORTIFY_SOURCE is already defined, and if not, adds -D_FORTIFY_SOURCE=2
++#   to CPPFLAGS.
++#
++#   Newer mingw-w64 msys2 package comes with a bug in
++#   headers-git-7.0.0.5546.d200317d-1. It broke -D_FORTIFY_SOURCE support,
++#   and would need -lssp or -fstack-protector.  See
++#   https://github.com/msys2/MINGW-packages/issues/5803. Try to actually
++#   link it.
++#
++# LICENSE
++#
++#   Copyright (c) 2017 David Seifert <soap@gentoo.org>
++#   Copyright (c) 2019, 2023 Reini Urban <rurban@cpan.org>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved.  This file is offered as-is, without any
++#   warranty.
++
++#serial 10
++
++AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[
++    ac_save_cflags=$CFLAGS
++    ac_cwerror_flag=yes
++    AX_CHECK_COMPILE_FLAG([-Werror],[CFLAGS="$CFLAGS -Werror"])
++    ax_add_fortify_3_failed=
++    AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=3 to CPPFLAGS])
++    AC_LINK_IFELSE([
++        AC_LANG_PROGRAM([],
++            [[
++                #ifndef _FORTIFY_SOURCE
++                    return 0;
++                #else
++                    _FORTIFY_SOURCE_already_defined;
++                #endif
++            ]]
++        )],
++        AC_LINK_IFELSE([
++            AC_LANG_SOURCE([[
++                #define _FORTIFY_SOURCE 3
++                #include <string.h>
++                int main(void) {
++                    char *s = " ";
++                    strcpy(s, "x");
++                    return strlen(s)-1;
++                }
++              ]]
++            )],
++            [
++              AC_MSG_RESULT([yes])
++              CFLAGS=$ac_save_cflags
++              CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=3"
++            ], [
++              AC_MSG_RESULT([no])
++              ax_add_fortify_3_failed=1
++            ],
++        ),
++        [
++          AC_MSG_RESULT([no])
++          ax_add_fortify_3_failed=1
++        ])
++    if test -n "$ax_add_fortify_3_failed"
++    then
++    AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS])
++    AC_LINK_IFELSE([
++        AC_LANG_PROGRAM([],
++            [[
++                #ifndef _FORTIFY_SOURCE
++                    return 0;
++                #else
++                    _FORTIFY_SOURCE_already_defined;
++                #endif
++            ]]
++        )],
++        AC_LINK_IFELSE([
++            AC_LANG_SOURCE([[
++                #define _FORTIFY_SOURCE 2
++                #include <string.h>
++                int main(void) {
++                    char *s = " ";
++                    strcpy(s, "x");
++                    return strlen(s)-1;
++                }
++              ]]
++            )],
++            [
++              AC_MSG_RESULT([yes])
++              CFLAGS=$ac_save_cflags
++              CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
++            ], [
++              AC_MSG_RESULT([no])
++              CFLAGS=$ac_save_cflags
++            ],
++        ),
++        [
++          AC_MSG_RESULT([no])
++          CFLAGS=$ac_save_cflags
++        ])
++    fi
++])
+
diff --git a/sys-apps/kbd/kbd-2.6.3-r1.ebuild b/sys-apps/kbd/kbd-2.6.3-r1.ebuild
new file mode 100644
index 000000000000..8109218a18e0
--- /dev/null
+++ b/sys-apps/kbd/kbd-2.6.3-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	if [[ $(ver_cut 3) -lt 90 ]] ; then
+		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	else
+		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	fi
+fi
+
+DESCRIPTION="Keyboard and console utilities"
+HOMEPAGE="https://kbd-project.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls selinux pam test"
+RESTRICT="!test? ( test )"
+
+# Testsuite's Makefile.am calls missing(!)
+# ... but this seems to be consistent with the autoconf docs?
+# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
+
+DEPEND="
+	app-alternatives/gzip
+	pam? (
+		!app-misc/vlock
+		sys-libs/pam
+	)
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-loadkeys )
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.3-no-redefine-fortify-source.patch
+)
+
+src_prepare() {
+	default
+
+	# Rename conflicting keymaps to have unique names, bug #293228
+	# See also https://github.com/legionus/kbd/issues/76.
+	pushd "${S}"/data/keymaps/i386 &> /dev/null || die
+	mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
+	mv olpc/es.map olpc/es-olpc.map || die
+	mv olpc/pt.map olpc/pt-olpc.map || die
+	mv qwerty/cz.map qwerty/cz-qwerty.map || die
+	popd &> /dev/null || die
+
+	#if [[ ${PV} == 9999 ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
+	#	eautoreconf
+	#fi
+
+	# Always do it for now for the F_S patch
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-werror
+
+		$(use_enable nls)
+		$(use_enable pam vlock)
+		$(use_enable test tests)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc docs/doc/*.html
+
+	# USE="test" installs .la files
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/usbredir/Manifest b/sys-apps/usbredir/Manifest
index 020f9c99f10c..416e0857a81f 100644
--- a/sys-apps/usbredir/Manifest
+++ b/sys-apps/usbredir/Manifest
@@ -1,3 +1,4 @@
 DIST usbredir-usbredir-0.13.0.tar.bz2 68836 BLAKE2B c0efabd12dec51bffa6e639db0a82547ec5c93ca649de823a6240373154d0929df599924ab3868d24ad74c7795202ad92ff1221589f37799944e34424acadf2d SHA512 b71eb1814ef456bebf62bac2e273f9a41b1451ae50941018c36d79298d74ac29c1137b66a4a928fd46c1fcd2905b83d3774fab703d88f9ea7e3e4e14420958ca
+EBUILD usbredir-0.13.0-r1.ebuild 962 BLAKE2B 928740feba9d886d4cf4c443d1170da81c5da51c5a66e4624f9a13750801f146c1801c0b8b95509e2581a7dee3bc61070c568b31dd9f52be0524737c6e47e8b1 SHA512 82a8eaec4e417c4a4b0afdda6a4b3c347992affad03548b07bda2abf61455c13acdb66a5ba308eecd7a3916ecbdcff65b93d6d53fc1be13f418a6386f70a32b3
 EBUILD usbredir-0.13.0.ebuild 859 BLAKE2B 977095e1b7f80622b066a007aa4040e1a733981eae32712c2e66e1a067b21b43626baaebd07c4235b7372fb2405b6a6bda2b5867a90d0ee86f703e46e090c0f2 SHA512 a25861ec7c667cc3d7b3f3f9b179149c2bc557d390f24c09f9dda3872efb29a726630971d9080a91a3ea045c12ca8d45c4cd917821dccb85a4aff4fce2b45e4c
 MISC metadata.xml 481 BLAKE2B 705eee8b08c628f347b7f31d7f45b2323660442520fd6644a41ca16bf28605f904b80a451e3821fbfe07362d09242bf2b041067ba19563052385f61efd5d67be SHA512 8d68d6428971fed1283fd6d0eb91819cf9b87a9b00efb228e437115d636f4eb7c3c1c6d07fb11697a3a6b825f1975b53431068675df0624be3a55ffed9efaf50
diff --git a/sys-apps/usbredir/usbredir-0.13.0-r1.ebuild b/sys-apps/usbredir/usbredir-0.13.0-r1.ebuild
new file mode 100644
index 000000000000..5c896d3ecb8e
--- /dev/null
+++ b/sys-apps/usbredir/usbredir-0.13.0-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 meson
+
+DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)"
+HOMEPAGE="https://www.spice-space.org/usbredir.html https://gitlab.freedesktop.org/spice/usbredir"
+SRC_URI="https://gitlab.freedesktop.org/spice/usbredir/-/archive/${P}/${PN}-${P}.tar.bz2"
+S="${WORKDIR}"/usbredir-${P}
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/glib:2
+	virtual/libusb:1
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	# This overrides our toolchain default.
+	sed -i -e '/-D_FORTIFY_SOURCE=2/d' meson.build || die
+
+	local emesonargs=(
+		-Dgit_werror=disabled
+		$(meson_feature test tests)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dodoc -r docs/.
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c70ed2f3aede..6ae322e58ba6 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/cairo-clock/Manifest b/x11-misc/cairo-clock/Manifest
index b0076b687cd6..545bfeb1ec29 100644
--- a/x11-misc/cairo-clock/Manifest
+++ b/x11-misc/cairo-clock/Manifest
@@ -1,5 +1,7 @@
 AUX cairo-clock-0.3.4-desktop.patch 599 BLAKE2B 093c409f14c171246dba3f6ac7a39066af78271c3ec5b96f205d573f49cd1a40966509403f0cdfdff0e25a473fd116be18150cf4071996a6cb47f56d567a006e SHA512 f0dcf4dc5baed7969f7515bda571a6f40f8ed8a365c665d0553c73b0224c47c64626f37ccf3a543db88d4b3f494247c86a761bd2b68b8c33f581fe26867c3577
+AUX cairo-clock-0.3.4-fortify-source.patch 488 BLAKE2B ec09ca49d3e039db4517d3d785d3ef2674940fac02d7a2e18c9d12c2fa9d19f94461fd4db38e96584fe9d8902faa20a6642d1d2802b375d7cc98d9d1ec23d481 SHA512 a7f9633c1b165bb03f18678e6a54562f9bf2f2b9fa44de22f95904c5eee464fbcfbca262e4ceaf86da2a08493ab5afbe5c039582357661c793afc6117100968f
 AUX cairo-clock-0.3.4-linker.patch 617 BLAKE2B 1f7c5de0cb985da7f404754bf522f677ac6122761b4cc69fdd47684c1734080e16f0074cc4408c3291b2369b997f38603cb756a06b0bbd311dd1a697e7556dfc SHA512 7a5f4235fbde60a932e26fc8ad60dce20f2f64ee53a1ecc3ebc7437225432d7256d2edd6d7b2a10cff31fefd6a94329b7516ba4e6202aa4c8b6f857ea19e9a64
 DIST cairo-clock-0.3.4.tar.gz 832968 BLAKE2B 93d4acb621af05176cb19041872aeb0da563c3dc37a660c8b761a31f6bab2809d23b04bfbce88e904427430a5b80337b28a04ff1f20ae94759fd3a507a1c9cad SHA512 b26c3005d4e2b22dcaf6967b8892630f5fd44e366b7482f374ea6215ca8863cf1b3f489fe2279eab73dfd4aaed1793d753e84fe4c929d105a6e97cde6da6b628
 EBUILD cairo-clock-0.3.4-r2.ebuild 792 BLAKE2B 59cc29929bcbd3388bd398472ff92997ba026aa5fa2f3b8512600c40acc6454b13006e50b8f1747d04a423946a94c2eab101ec4db6336debf47232969a8f2b83 SHA512 14f8a51a6cf28a72aa92b2cfe277ad8f3bf0f8d9765a4e125e2bfaa03b759c4a9875ea6fd80e84aaa9523d48ce9d470d6f32cbef498c17d13cbd76173ba764da
+EBUILD cairo-clock-0.3.4-r3.ebuild 906 BLAKE2B 288418c5b44ddfcab3650c0f0e0326530f911fc1e1c5d98e0457e8092e6ce8362b42c176b2cf4e9e26b62996ae4a6d64246840d851389ef5ab8937d7bf9a54b1 SHA512 0d3b0404b3b24103e34f318805abf8bc59653868d84b56e2c552081bc52a9e5a9d3470215bed7f5a311b6bd349642f77c276f1de8c5e4e89f0ed868224f7da6c
 MISC metadata.xml 356 BLAKE2B e2e95e94a3155af0e3fb3440fe6781ab70f39328a17e7d328cd7d88c89cdad54e8a928acb7a4c9bd5fe3ede3c9702886e384f642a262a23966e2ed552e6fa30d SHA512 cdca9d3a290935da34f05aa1c24c7f23640f0fd87f7789a72d7203046cf9ef71a5e6060f65ebaf299cef1cf172612219df070d5c77b0190e7ff16e37bc10109a
diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild
new file mode 100644
index 000000000000..fa63e6bff82c
--- /dev/null
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="An analog clock displaying the system-time"
+HOMEPAGE="https://launchpad.net/cairo-clock"
+SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.8
+	>=gnome-base/libglade-2.6
+	>=gnome-base/librsvg-2.14
+	>=x11-libs/cairo-1.2
+	>=x11-libs/gtk+-2.10:2
+	>=x11-libs/pango-1.10
+"
+DEPEND="${RDEPEND}"
+# autoconf-archive for F_S patch
+BDEPEND="
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-linker.patch
+	"${FILESDIR}"/${P}-fortify-source.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	gzip -d "${ED}"/usr/share/man/man1/cairo-clock.1.gz || die
+}
diff --git a/x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch
new file mode 100644
index 000000000000..c10461b47f35
--- /dev/null
+++ b/x11-misc/cairo-clock/files/cairo-clock-0.3.4-fortify-source.patch
@@ -0,0 +1,16 @@
+Don't clobber our toolchain defaults.
+
+https://bugs.gentoo.org/898240
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,7 +96,9 @@ CLOCK_DEFINES='-DDATA_DIR="\"$(datadir)\"" -DPKGDATA_DIR="\"$(pkgdatadir)\""'
+ AC_SUBST([CLOCK_DEFINES])
+ 
+ dnl CFLAGS
+-CFLAGS="$CFLAGS -Wall -pedantic -std=c99 -fno-strict-aliasing -fmessage-length=0 -D_FORTIFY_SOURCE=2"
++CFLAGS="$CFLAGS -Wall -pedantic -std=c99 -fno-strict-aliasing -fmessage-length=0"
++
++AX_ADD_FORTIFY_SOURCE
+ 
+ AC_CONFIG_FILES([
+ 	Makefile
-- 
cgit v1.2.3