From f20de2df8b579205c90f4970c3ad9cbb641c1a0e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 9 Jan 2023 18:18:58 +0000
Subject: gentoo auto-resync : 09:01:2023 - 18:18:58

---
 Manifest                                           |  30 +-
 Manifest.files.gz                                  | Bin 29796 -> 29804 bytes
 app-backup/Manifest.gz                             | Bin 8040 -> 8034 bytes
 app-backup/mkstage4/Manifest                       |   4 +-
 app-backup/mkstage4/mkstage4-0.4.ebuild            |  30 ++
 app-backup/mkstage4/mkstage4-9999.ebuild           |   5 +-
 app-containers/Manifest.gz                         | Bin 7546 -> 7547 bytes
 app-containers/lxd/Manifest                        |   2 -
 app-containers/lxd/files/lxd-5.0.2.initd           |  54 ----
 app-containers/lxd/lxd-5.0.1-r3.ebuild             | 203 --------------
 app-portage/Manifest.gz                            | Bin 9423 -> 9426 bytes
 app-portage/mirrorselect/Manifest                  |   6 +-
 .../mirrorselect/mirrorselect-2.2.6-r2.ebuild      |   2 +-
 .../mirrorselect/mirrorselect-2.3.0-r1.ebuild      |   2 +-
 app-portage/mirrorselect/mirrorselect-9999.ebuild  |   2 +-
 dev-lang/Manifest.gz                               | Bin 19513 -> 19511 bytes
 dev-lang/mujs/Manifest                             |   4 -
 dev-lang/mujs/mujs-1.2.0.ebuild                    |  61 -----
 dev-lang/mujs/mujs-1.3.0.ebuild                    |  61 -----
 dev-libs/Manifest.gz                               | Bin 96414 -> 96416 bytes
 dev-libs/dqlite/Manifest                           |   2 -
 dev-libs/dqlite/dqlite-1.11.1.ebuild               |  43 ---
 dev-libs/raft/Manifest                             |   2 -
 dev-libs/raft/raft-0.15.0.ebuild                   |  55 ----
 dev-python/Manifest.gz                             | Bin 260610 -> 260616 bytes
 dev-python/pydecomp/Manifest                       |   4 +-
 dev-python/pydecomp/pydecomp-0.3-r3.ebuild         |   2 +-
 dev-python/pydecomp/pydecomp-9999.ebuild           |   2 +-
 dev-python/pynvim/Manifest                         |   2 +-
 dev-python/pynvim/pynvim-0.4.3-r1.ebuild           |   2 +-
 dev-python/ssl-fetch/Manifest                      |   4 +-
 dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild       |   2 +-
 dev-python/ssl-fetch/ssl-fetch-9999.ebuild         |   2 +-
 mail-mta/Manifest.gz                               | Bin 2380 -> 2381 bytes
 mail-mta/postfix/Manifest                          |   4 +-
 mail-mta/postfix/postfix-3.8_pre20221227.ebuild    | 292 --------------------
 mail-mta/postfix/postfix-3.8_pre20230108.ebuild    | 292 ++++++++++++++++++++
 media-gfx/Manifest.gz                              | Bin 37866 -> 37863 bytes
 media-gfx/entangle/Manifest                        |   2 +-
 media-gfx/entangle/entangle-3.0-r1.ebuild          |  76 ------
 media-gfx/entangle/entangle-3.0-r2.ebuild          |  76 ++++++
 media-sound/Manifest.gz                            | Bin 56407 -> 56413 bytes
 media-sound/musescore/Manifest                     |   2 +-
 media-sound/musescore/musescore-9999.ebuild        |  20 +-
 media-video/Manifest.gz                            | Bin 25687 -> 25686 bytes
 media-video/vdr/Manifest                           |  11 +-
 media-video/vdr/files/vdr-2.4.7_gcc11.patch        |  26 --
 media-video/vdr/vdr-2.2.0-r6.ebuild                | 301 ---------------------
 media-video/vdr/vdr-2.4.7-r1.ebuild                | 209 --------------
 media-video/vdr/vdr-2.6.3.ebuild                   | 199 ++++++++++++++
 metadata/Manifest.gz                               | Bin 4034 -> 4038 bytes
 metadata/dtd/timestamp.chk                         |   2 +-
 metadata/glsa/Manifest                             |  28 +-
 metadata/glsa/timestamp.chk                        |   2 +-
 metadata/md5-cache/Manifest.gz                     | Bin 28354 -> 28368 bytes
 metadata/md5-cache/app-backup/Manifest.gz          | Bin 12894 -> 13053 bytes
 metadata/md5-cache/app-backup/mkstage4-0.4         |  13 +
 metadata/md5-cache/app-backup/mkstage4-9999        |   4 +-
 metadata/md5-cache/app-containers/Manifest.gz      | Bin 12858 -> 12690 bytes
 metadata/md5-cache/app-containers/lxd-5.0.1-r3     |  16 --
 metadata/md5-cache/app-portage/Manifest.gz         | Bin 18124 -> 18107 bytes
 .../md5-cache/app-portage/mirrorselect-2.2.6-r2    |  10 +-
 .../md5-cache/app-portage/mirrorselect-2.3.0-r1    |  10 +-
 metadata/md5-cache/app-portage/mirrorselect-9999   |  10 +-
 metadata/md5-cache/dev-lang/Manifest.gz            | Bin 38297 -> 37988 bytes
 metadata/md5-cache/dev-lang/mujs-1.2.0             |  13 -
 metadata/md5-cache/dev-lang/mujs-1.3.0             |  13 -
 metadata/md5-cache/dev-libs/Manifest.gz            | Bin 149942 -> 149627 bytes
 metadata/md5-cache/dev-libs/dqlite-1.11.1          |  16 --
 metadata/md5-cache/dev-libs/raft-0.15.0            |  16 --
 metadata/md5-cache/dev-python/Manifest.gz          | Bin 346207 -> 346215 bytes
 metadata/md5-cache/dev-python/pydecomp-0.3-r3      |  10 +-
 metadata/md5-cache/dev-python/pydecomp-9999        |  10 +-
 metadata/md5-cache/dev-python/pynvim-0.4.3-r1      |  12 +-
 metadata/md5-cache/dev-python/ssl-fetch-0.4-r1     |  10 +-
 metadata/md5-cache/dev-python/ssl-fetch-9999       |  10 +-
 metadata/md5-cache/mail-mta/Manifest.gz            | Bin 3727 -> 3725 bytes
 .../md5-cache/mail-mta/postfix-3.8_pre20221227     |  16 --
 .../md5-cache/mail-mta/postfix-3.8_pre20230108     |  16 ++
 metadata/md5-cache/media-gfx/Manifest.gz           | Bin 55259 -> 55259 bytes
 metadata/md5-cache/media-gfx/entangle-3.0-r1       |  16 --
 metadata/md5-cache/media-gfx/entangle-3.0-r2       |  16 ++
 metadata/md5-cache/media-sound/Manifest.gz         | Bin 72176 -> 72173 bytes
 metadata/md5-cache/media-sound/musescore-9999      |  14 +-
 metadata/md5-cache/media-video/Manifest.gz         | Bin 36726 -> 36572 bytes
 metadata/md5-cache/media-video/vdr-2.2.0-r6        |  15 -
 metadata/md5-cache/media-video/vdr-2.4.7-r1        |  16 --
 metadata/md5-cache/media-video/vdr-2.6.3           |  16 ++
 metadata/md5-cache/net-libs/Manifest.gz            | Bin 53511 -> 53655 bytes
 metadata/md5-cache/net-libs/libnma-1.10.6          |  17 ++
 metadata/md5-cache/net-misc/Manifest.gz            | Bin 89911 -> 90066 bytes
 .../md5-cache/net-misc/gnome-remote-desktop-43.3   |  18 ++
 metadata/md5-cache/sci-mathematics/Manifest.gz     | Bin 28884 -> 28884 bytes
 metadata/md5-cache/sci-mathematics/octave-7.3.0-r2 |   4 +-
 metadata/md5-cache/sys-apps/Manifest.gz            | Bin 75432 -> 75444 bytes
 metadata/md5-cache/sys-apps/util-linux-2.38.1      |  10 +-
 metadata/md5-cache/sys-apps/util-linux-9999        |  10 +-
 metadata/md5-cache/sys-cluster/Manifest.gz         | Bin 22669 -> 22668 bytes
 metadata/md5-cache/sys-cluster/torque-6.0.4-r2     |   4 +-
 metadata/md5-cache/sys-cluster/torque-6.0.4-r3     |   4 +-
 metadata/md5-cache/www-apache/Manifest.gz          | Bin 7946 -> 8103 bytes
 metadata/md5-cache/www-apache/mod_qos-11.73        |  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-libs/Manifest.gz                               | Bin 32762 -> 32763 bytes
 net-libs/libnma/Manifest                           |   2 +
 net-libs/libnma/libnma-1.10.6.ebuild               |  75 +++++
 net-misc/Manifest.gz                               | Bin 54398 -> 54396 bytes
 net-misc/gnome-remote-desktop/Manifest             |   2 +
 .../gnome-remote-desktop-43.3.ebuild               |  73 +++++
 sci-mathematics/Manifest.gz                        | Bin 17714 -> 17721 bytes
 sci-mathematics/octave/Manifest                    |   2 +-
 sci-mathematics/octave/octave-7.3.0-r2.ebuild      |   2 +-
 sys-apps/Manifest.gz                               | Bin 48777 -> 48779 bytes
 sys-apps/util-linux/Manifest                       |   4 +-
 sys-apps/util-linux/util-linux-2.38.1.ebuild       |   2 +-
 sys-apps/util-linux/util-linux-9999.ebuild         |   2 +-
 sys-cluster/Manifest.gz                            | Bin 11533 -> 11531 bytes
 sys-cluster/torque/Manifest                        |   4 +-
 sys-cluster/torque/torque-6.0.4-r2.ebuild          |   4 +-
 sys-cluster/torque/torque-6.0.4-r3.ebuild          |   4 +-
 sys-devel/Manifest.gz                              | Bin 10631 -> 10631 bytes
 sys-devel/m4/Manifest                              |   2 +-
 sys-devel/m4/files/m4-1.4.19-fortify-source.patch  |   1 +
 www-apache/Manifest.gz                             | Bin 6076 -> 6076 bytes
 www-apache/mod_qos/Manifest                        |   2 +
 www-apache/mod_qos/mod_qos-11.73.ebuild            |  62 +++++
 132 files changed, 1097 insertions(+), 1695 deletions(-)
 create mode 100644 app-backup/mkstage4/mkstage4-0.4.ebuild
 delete mode 100644 app-containers/lxd/files/lxd-5.0.2.initd
 delete mode 100644 app-containers/lxd/lxd-5.0.1-r3.ebuild
 delete mode 100644 dev-lang/mujs/mujs-1.2.0.ebuild
 delete mode 100644 dev-lang/mujs/mujs-1.3.0.ebuild
 delete mode 100644 dev-libs/dqlite/dqlite-1.11.1.ebuild
 delete mode 100644 dev-libs/raft/raft-0.15.0.ebuild
 delete mode 100644 mail-mta/postfix/postfix-3.8_pre20221227.ebuild
 create mode 100644 mail-mta/postfix/postfix-3.8_pre20230108.ebuild
 delete mode 100644 media-gfx/entangle/entangle-3.0-r1.ebuild
 create mode 100644 media-gfx/entangle/entangle-3.0-r2.ebuild
 delete mode 100644 media-video/vdr/files/vdr-2.4.7_gcc11.patch
 delete mode 100644 media-video/vdr/vdr-2.2.0-r6.ebuild
 delete mode 100644 media-video/vdr/vdr-2.4.7-r1.ebuild
 create mode 100644 media-video/vdr/vdr-2.6.3.ebuild
 create mode 100644 metadata/md5-cache/app-backup/mkstage4-0.4
 delete mode 100644 metadata/md5-cache/app-containers/lxd-5.0.1-r3
 delete mode 100644 metadata/md5-cache/dev-lang/mujs-1.2.0
 delete mode 100644 metadata/md5-cache/dev-lang/mujs-1.3.0
 delete mode 100644 metadata/md5-cache/dev-libs/dqlite-1.11.1
 delete mode 100644 metadata/md5-cache/dev-libs/raft-0.15.0
 delete mode 100644 metadata/md5-cache/mail-mta/postfix-3.8_pre20221227
 create mode 100644 metadata/md5-cache/mail-mta/postfix-3.8_pre20230108
 delete mode 100644 metadata/md5-cache/media-gfx/entangle-3.0-r1
 create mode 100644 metadata/md5-cache/media-gfx/entangle-3.0-r2
 delete mode 100644 metadata/md5-cache/media-video/vdr-2.2.0-r6
 delete mode 100644 metadata/md5-cache/media-video/vdr-2.4.7-r1
 create mode 100644 metadata/md5-cache/media-video/vdr-2.6.3
 create mode 100644 metadata/md5-cache/net-libs/libnma-1.10.6
 create mode 100644 metadata/md5-cache/net-misc/gnome-remote-desktop-43.3
 create mode 100644 metadata/md5-cache/www-apache/mod_qos-11.73
 create mode 100644 net-libs/libnma/libnma-1.10.6.ebuild
 create mode 100644 net-misc/gnome-remote-desktop/gnome-remote-desktop-43.3.ebuild
 create mode 100644 www-apache/mod_qos/mod_qos-11.73.ebuild

diff --git a/Manifest b/Manifest
index fcb65f18654f..c271b1b91908 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29796 BLAKE2B 153afc01e0636e6d6646a744b9766e14669ffc5943968066f0cac4272a7919316e4ce390d22f827730997c5b6bd1bbc0690acfe4918bca1e877b7321a71b7ceb SHA512 ecc0af06b4e2e2c0d72f574ee9ea018ed6fea9d3080fe13ff36870bbdb2f1b2ffa64710913e7bb8716fd0d429b01df736194f581e09108043b37408c0eaccf5a
-TIMESTAMP 2023-01-09T11:39:39Z
+MANIFEST Manifest.files.gz 29804 BLAKE2B a739d5b99cd711e5333b5696e3bd80d8ae784f96a79a60b71bd598a46ab03d16761b4d022a693add8bd646826e3eed7d33fe89e881eaaf3c0b372c30ab1c6d0e SHA512 341a4c1ab98a8695e1ca52f1603bea0739e4827eef653b09ba838c9251cd3bf9177c50144baaff370cfe12939fc496bb5dbd47854fa74715e13e96ceac6556eb
+TIMESTAMP 2023-01-09T17:39:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO7/PtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO8UWFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAbNA//YI8itZQbvnsqcTv2P0tXZWVCoIaZp1ipfsItAHwRqsbrT5Qt3epURkPO
-jL2KUBcKnl7zw9PcJQPXBCCradIGU6GwrZ6Eievob3RSjiwBo4a2kdb1WyZeS4yp
-x3eFpUFVTL2WixRlVE7kpQ3bxZ7uw8IZxVo9iaCjg7RPera/EKjohe7lVGNnI/me
-PGlRSP45QLR8oNC1QoQqms7K1GaEDaZxu8S2SbEzQaRkTz+66tDTiCvOpvV4I/2q
-aJooZlnvd0d7ZfujMcXXduLvOS1zFbSjBQbMfxNKKjv0NjJ+mxVj5B+DaVswBTfB
-mBHMOZp3t9yaUWMmo7rVPwXHWENBaUqhpUizgWG6eBp4hfYCiSraKTj5lcQBiBsT
-AJK1OzmmAoAM59uhtdtp7tmE4TOhpPjFEvGfQLeOfJ0vGtgma02ZnhEc4MgaVKTX
-dNHh3XX67dTn2UeqNAxrEJBGzAveLO2By5eAS2tS0fkZjG2q2qOiigmcZ3Kta/FO
-DLbbvhqgRRhffcqB7Oo0qBPo92dAtE8GFEaKhkDnQbMF4xEjJ8Ji7DJDJ6z6sis6
-UfU1yJnElPp/x6U0YL6jtw0kASwsR3DYaYhTsBvnRiZUwnD8NsYMvrdF3IEHPBlt
-KPlobSEe/OMB6o7YVia7Qu+U401PhtrO3HpfaL70LA6YANHsOjc=
-=ngai
+klA+ng//VuKNUP8ojXIOUqU2FuK/ULFdEqfe+5EvXBA77EWWnxyKs6py9mtktpKb
+Z7hGGpgllJZDei5HLVXAoysJk5VMyBOpdXkcI3GlCW6aWKOgY91F5yfrh/e+6UJk
+M9OghzdkE5pOyhEWQrSozNKsIT8gon9AINmklpo7nXrY0Di08bWPhYPbofDi1wDA
+mpfR7AI5ENebxMmYGjvfhypVjLGuPR4VZvPPwSxPq4Tg2o2kXe4x00c/Br84Q3vI
+q5L16JwZv6C7stt3xHEEYTqvd24RVgpyyOV2F/0fCXHvnXbr223uDo8PdoB0ZEw5
+g0YKhlsUIVwYLywTIlsftFWhgL22ZXTyH+X1GO5BmabAgwnXFYfLlwFDjDegXcsY
+FrHSWtGzmNiP/vw69b/3aJNTmd4qRAVz/eqOI7eXMD/tARRDYNVsGnOvBv5hI416
+hJlINGMHzP7uKPQuqfxe7J5D29Kzs7x4RHfrcYlJLDu+Owv8WRZMGnv5hxCpvX5g
+BODeacxLWiCgVtGWC6JVJoM5vAnXMgyM0phn8q9UKplo7YwCLAzqGuKGtAI+1d+h
+gd8IkTUvUU608oCwWWdfybpyVaKI1LxiVbI925U+nlAP1AAK8mG5ap/n6odmF94Q
+ZaQuTgoGQgNh5mgSf/7r/s1HTjXq7/S4VlDakKb1qUdINHXv/ds=
+=KMWm
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 1608ef05931c..11dfc31ba649 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 095459ae07f4..803b4e6d495b 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/mkstage4/Manifest b/app-backup/mkstage4/Manifest
index 4afa35b2157d..2d63e7bc8f17 100644
--- a/app-backup/mkstage4/Manifest
+++ b/app-backup/mkstage4/Manifest
@@ -1,6 +1,8 @@
 DIST mkstage4-0.3.1.tar.gz 19416 BLAKE2B d9d2ec0d9c3aba6331e2500f927cdeace8b728a535f9cc4b4cb8ea93fb7dea2bc5f95be5dbea76c9948836f35bea832a9fdb2acea34518f9a4b5a456507973e0 SHA512 f58c89d0d9cc3a65cfa62cc18b0c5f172a69d4b4582e839e98ecd52cafd584395a91e5531ceb171dacd5e4975d6858ae91c5f97a26b62dab0f4ab809f7bcd4c0
 DIST mkstage4-0.3.tar.gz 18648 BLAKE2B 3a881bc1ec14f5c9795d49306966b586c30a8b415542fb500b5a2af7735008832ebc64f0a166ea4e2fdb48a555bd789b352784f1b05118116ae3f634937beed6 SHA512 6971bf4b43a2fdef0b54802b010c99e95caf896c8e109c54f5a6beb4db1714ea5639e0859ba3f958eed92b9fc6a3bb613bb82de440729e71e53543d60549d2db
+DIST mkstage4-0.4.tar.gz 19769 BLAKE2B 833b343f8d8deba2914c24aad07b802f551102f598fa6b149ad2aa8df3b96d189b8a29be8904e510cc4200609b4a2a19d83c510c58745b734898a119ae259313 SHA512 13f867c45fe9891754e62f2204e35260ce9c6a756eddea807800cce5cb5d9e7a1b21c27dd0d5142a13bc8b88c441cf618ba5ce6827a0644f6468759062a9e34c
 EBUILD mkstage4-0.3.1.ebuild 564 BLAKE2B 361ec0f9ce67246612993ebab79ad5be98aed1cefe645f8df7b52cbff36056c1dc95edbdecc29bbf18d671ace4990e7e9453fca46d4a2911319cc71a01f3f3e3 SHA512 2070dfbb893aff9934eb179a34ac217fab849a0c1fe5a562c21e85a1979266f6e547f94a0b2bb3de01c919ae880807ca2c1ca670135a4b3b496feaba54172823
 EBUILD mkstage4-0.3.ebuild 564 BLAKE2B 04c3f8d12d73b68f5dcbc19403f3cf7c26d29e1ac4dc7f183bf0e150ceb7265c0d24b5da31a121d53b00e80389245037263f524c706d8d665cc9a9e0b5657c02 SHA512 1a53dff6acf100669b0fa9b6be0e9ba4b07a2028238891de1baf7bd80d52bf28ca58b26f61139adab004018c0275d855c12aac536fc43334069393677cc8bf4d
-EBUILD mkstage4-9999.ebuild 451 BLAKE2B 01273d1052e60c4b045b26cb5c58601a3827adeb8fffe1cb5d5244d83b8b6b677c75aa51e3ad2f6e8dafc4dee06f48acc17dda9e21ec03c9c7a5edea34c2d00f SHA512 996089d35c4b30da90eb0cea6fc86129c0b4026aba4f71a6703feedce65a02e91502efcda4d160b35ede0630a6c03f40f1784a08673a8c7c64188b5a1522b882
+EBUILD mkstage4-0.4.ebuild 593 BLAKE2B 4effa155325d873c254a5b3060bc224e554083638b53e1146477743cdcf59d4eb89b2d9e1677be289d5cb60d088a0bb45ae7a8e4699a7eeb4609faaef5766229 SHA512 55e5368b7301aa975e4ff8fc6f418cee17b9831e7008634c9dcea941bba333016451ac70a5c1f485a177409fc64f686a95f3f186a2aa143129a927ff7ee7f385
+EBUILD mkstage4-9999.ebuild 480 BLAKE2B a3b2354257d980c979a2bcfbb4185771c7a95017b5e036a0df45c8304d9e783d972c4ca3349255a676da7f3541d46288e789888d750b868fc3ea8fa210adf451 SHA512 c3b797b4f49964d188c88196c51d6f41c70e1cad7c361c119071548c7859d65808749826f14882abd5419fbe4f0d712c547c1fe04dc8d64163dfc16c8ff16a1e
 MISC metadata.xml 529 BLAKE2B 74c2cbdcca72e6000fb8ea9e06afbe8ef62ffed46d5e826b062e426940835a97e7d551cb0730cb8427b6f53ec34cf105728ff0f34e00239e6207f00879cac25b SHA512 f78895fe8380196f172f80f9f27ddea970b2e05c7933f4b53e8125881acb6e51b549573e19ef5358ea4367b31913b467e90dff2994311af5b92958c5122f28f3
diff --git a/app-backup/mkstage4/mkstage4-0.4.ebuild b/app-backup/mkstage4/mkstage4-0.4.ebuild
new file mode 100644
index 000000000000..5a7ce8f650e8
--- /dev/null
+++ b/app-backup/mkstage4/mkstage4-0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
+HOMEPAGE="https://github.com/TheChymera/mkstage4"
+SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-util/bats )"
+RDEPEND="
+	app-shells/bash
+	app-arch/tar
+"
+
+src_install() {
+	newbin mkstage4.sh mkstage4
+	newbin exstage4.sh exstage4
+	einstalldocs
+}
+
+src_test() {
+	bats tests/* || die
+}
diff --git a/app-backup/mkstage4/mkstage4-9999.ebuild b/app-backup/mkstage4/mkstage4-9999.ebuild
index cd989859f11f..62421b82d7eb 100644
--- a/app-backup/mkstage4/mkstage4-9999.ebuild
+++ b/app-backup/mkstage4/mkstage4-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit git-r3
 
@@ -20,5 +20,6 @@ RDEPEND="app-shells/bash
 
 src_install() {
 	newbin mkstage4.sh mkstage4
+	newbin exstage4.sh exstage4
 	einstalldocs
 }
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index c9e77563bef3..d0ecd712b2d4 100644
Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 287f6d87f41c..2785b4fce9b4 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -3,13 +3,11 @@ AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d
 AUX lxd-4.0.9-r1.service 612 BLAKE2B e44029b6f615afc0daf8abfccd7d2e472291d9b1f8530b64f5c9b7d96aeda605a0dd0ec9b74f0a79f68992a45607e4362a7c30c711b34ac106b9377610f97ad6 SHA512 68800d9952e865eeffe1c05ecf111c49e6b137c6f7af7c7b02daf180c3a794a670ddbe7140e97d187f1b9a803ca84e132303808ed8b6ae49760246c01d7c60d4
 AUX lxd-4.0.9.initd 1333 BLAKE2B 72a27d38527b4f0dcca3b111ae0d112bd128cf83ff6261561c5a3bf1c619a2e36672b5eb06ff643660d3cee05a545991ed565be257a56452cbd498a202e1b197 SHA512 933a09e72dbf3bbab8e2148549b6bc08ac0caf2088bd44c3e378ac6041fa861845bfae351c83fcd0920655ceb29ea6ca8023163c52a2fb7499c9bf2958d4dc86
 AUX lxd-5.0.2-r1.initd 1710 BLAKE2B a9597d32e88502f521f3ae784e4f653ab6d3ab144537b27f5e9b84eb36e5688b13d74968c865153d6e442f77a67b5794fb429705bea8b40cdef00768102de55b SHA512 73ea4aaee39061565524a378b9317bee4b850f0c28ae3f8a47e905b9dffc4452e71736880391bb74b88ea70bda12874699a1eff56400ac9d7949738f3aa3ebce
-AUX lxd-5.0.2.initd 1553 BLAKE2B 6f230eecda849486e8734e6cff7ae5779f1d25d198d29eee1dd6fc60f75b5b7d81e7c002a2a1cc7f6b61d34243953deca15b7ea2027f4af1a5d418c7bd316b06 SHA512 2369731b7227aa16b012fe6ea6f5deadd9451949ea293a8226ebcbb34581783f54dbd603a26949374459f0a2ff251965bf5398ae7878b10885bdc02b74c0febc
 AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718
 DIST lxd-5.0.1.tar.gz 14640923 BLAKE2B 81bdf3301c0eecc719864cd8e18fd886113f83d1980e13ee4d4ccb6641ee4a7e33f0b859a21abd8a0a9956d1c2f3dfa6e7eb1ae454fbb580c23b5558ef51168e SHA512 b04b7329bdeb17ca384cc2d931a1510d5f03521fd247eab93904bbcb6139cc0daf28f9aeb6416268ccf15affdd15b26598f3e280fb5eefe5c59be6918f092bed
 DIST lxd-5.0.1.tar.gz.asc 833 BLAKE2B d233c8ebfb5b71f66ff08b4d74861a42bf45ef3e9622d4f113603a7a6c1a29b5aa3422c075ad5250a7d5ab7526a49dd676672d0a73194024af477fa762e02b12 SHA512 bf22f26b6688420e843e9e24eb731a2068eae3d90c77787e0f4a279d4cb7a8a2df38b7e9c8ea79f604c1d54743238cb36474baf018ea6bf72e6f37838b252294
 DIST lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch 882 BLAKE2B 4c4cb8b19709939c0c14ed87e5d9c917ac967471400de07c14ea049c0a8aae9a2ed0e3755d554cb1077ee7c607fcdc71431d57a55becd0a46c1f177bc9b33aed SHA512 266788186ca9aabda4ad0fe5fa47ef3acfa31bee64c742c011c58a39f4da833f768e8bb71ec81b57af8d4f124d733f2c22ab33f9ee1bc4ecbd21f5bbbae1f6e7
 DIST lxd-5.8-add-tcp-keepalives-to-exec-channels.patch 15702 BLAKE2B ee834b86284e36f87ad3e54df04eb2968dc0fefdf81b116bd640e611ac4ca2eb93763ed2c2f3cfd1e9473da1a3e66bd90858eb4bab08a47f86306a0903a19e6e SHA512 5e7c56f5ffbc8cecb27c6916abbbf4bb3d268c0936b9fdb2b80b4b306c911bdcf782059290243988feb49c9209e55de9ea168ea7041636bf9ae1b7d88ff541c9
 EBUILD lxd-5.0.1-r2.ebuild 5268 BLAKE2B b0d0d8601fe9dfda083f98078aa404e04cc4c82098583bc3b8bcee76b4f46f1eadd097a05ffb62111ab929a42f3af2377de9302f3acaeeca5056d85ef460715f SHA512 540ef775bc0558a59dad52220d1f8d9de6f0dd4aa57eff7e18beefefc2263651d9edf5fb0e993d724b4e03145f0250efa074cfb11d0e5e9997dcd5b968a2997c
-EBUILD lxd-5.0.1-r3.ebuild 5807 BLAKE2B 502565c333bf5603953b0b683e1ecb5383ee3cd40926e8db3d042a74df7b59b2e5f7640b0c2c6ebec202f7079de2fa6f190a4225d05db41d5dc21c97fe4ab0b3 SHA512 7922dca61538e02a0a3f219c9f27ded3b4762855f5073eb4cfdbbfd7e3c1d4f7fe3e72af65722e627f6b8a6811b08ac1590af91258f8f30cb853be98873e34e4
 EBUILD lxd-5.0.1-r4.ebuild 6167 BLAKE2B 4c333bb05d113db43b7c9b9917ff96737599fe9a36492e777339a47eeee86efa07baf9736dbbd4f9f19179939da6b3fb196cf29b607bc72a6535fe673d6f2a0f SHA512 04c20b5b7c0095f60f0cc1b49e98336426de6fad703432167882020829660ab696c6c9a004c5b881036927f3ce6cb116e517afcf026df647ef388b47e33d743f
 MISC metadata.xml 1403 BLAKE2B 4bff140bc9282b41631293b9cc28a5f85bec2b0f923c762c6572e75b752aba113632747142bd3b3a87322ce8d2ba10fd15afe3f1a7c1384e49c408ca176f267d SHA512 38fb2faa661a8473d0221117299baea01c06f46e5fbf5bd7e32f26b7d0a433ab35c5e0e5dde42c7478b7118489d619fdacca29b3a9b0e89cf432c5bccd3ffba3
diff --git a/app-containers/lxd/files/lxd-5.0.2.initd b/app-containers/lxd/files/lxd-5.0.2.initd
deleted file mode 100644
index 575129a8f7e8..000000000000
--- a/app-containers/lxd/files/lxd-5.0.2.initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/lxd
-PIDFILE=/run/lxd.pid
-
-depend() {
-	need net
-	need lxcfs
-}
-
-start() {
-	ebegin "Starting lxd service"
-
-	modprobe -f loop > /dev/null 2>&1
-
-	# Fix permissions on /var/lib/lxd and make sure it exists.
-	# Create a log directory for lxd with correct permissions.
-	install -d /var/lib/lxd --group lxd --owner root --mode 0775
-	install -d /var/log/lxd --group lxd --owner root
-
-	start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec ${DAEMON} \
-		--background \
-		--make-pidfile \
-		-- \
-		${LXD_OPTIONS}
-	eend ${?}
-
-	# Create necessary systemd paths in order for systemd containers to work on openrc host.
-	install -d /sys/fs/cgroup/systemd --group lxd --owner root
-	mount -t cgroup -o none,name=systemd systemd /sys/fs/cgroup/systemd
-}
-
-stop() {
-	if [ "${RC_CMD}" = restart ]; then
-		ebegin "Stopping lxd service (but not containers)"
-		# start-stop-daemon sends SIGTERM with a timeout of 5s by default.
-		# SIGTERM indicates to LXD that it will be stopped temporarily.
-		# Instances will keep running.
-		start-stop-daemon --stop --quiet -p "${PIDFILE}"
-		eend ${?}
-	else
-		ebegin "Stopping lxd service and containers, waiting 40s"
-		# SIGPWR indicates to LXD that the host is going down.
-		# LXD will do a clean shutdown of all instances.
-		# After 30s all remaining instances will be killed.
-		# We wait up to 40s for LXD.
-		start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
-		eend ${?}
-	fi
-}
diff --git a/app-containers/lxd/lxd-5.0.1-r3.ebuild b/app-containers/lxd/lxd-5.0.1-r3.ebuild
deleted file mode 100644
index 703f56669164..000000000000
--- a/app-containers/lxd/lxd-5.0.1-r3.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
-	https://github.com/lxc/lxd/commit/d55a590ea50a75c3cb2ea67894be8253074d6093.patch -> lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch
-	https://patch-diff.githubusercontent.com/raw/lxc/lxd/pull/11011.patch -> lxd-5.8-add-tcp-keepalives-to-exec-channels.patch
-	verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="apparmor ipv6 nls"
-
-DEPEND="acct-group/lxd
-	app-arch/xz-utils
-	>=app-containers/lxc-3.0.0[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	dev-libs/dqlite:=
-	dev-libs/lzo
-	dev-libs/raft[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp,ipv6(+)?]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	net-firewall/ebtables
-	net-firewall/iptables[ipv6(+)?]
-	sys-apps/iproute2[ipv6(+)?]
-	sys-fs/fuse:*
-	>=sys-fs/lxcfs-5.0.0
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND="dev-lang/go
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-
-	~KVM
-	~MACVTAP
-	~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/fuidshift
-	/usr/bin/lxc
-	/usr/bin/lxc-to-lxd
-	/usr/bin/lxd-agent
-	/usr/bin/lxd-benchmark
-	/usr/bin/lxd-migrate
-	/usr/sbin/lxd"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-PATCHES=( "${DISTDIR}"/lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch
-	"${DISTDIR}"/lxd-5.8-add-tcp-keepalives-to-exec-channels.patch )
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	export GOPATH="${S}/_dist"
-
-	default
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	# Fix hardcoded ovmf file path, see bug 763180
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-		doc/environment.md \
-		lxd/apparmor/instance.go \
-		lxd/apparmor/instance_qemu.go \
-		lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		lxd/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/lxd.service || die
-	fi
-
-	# Disable -Werror's from go modules.
-	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do
-		go install -v -x "${S}/${k}" || die "failed compiling ${k}"
-	done
-
-	go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build the daemon"
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/lxd-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	export GOPATH="${S}/_dist"
-	local bindir="_dist/bin"
-
-	dosbin ${bindir}/lxd
-
-	for l in fuidshift lxd-agent lxd-benchmark lxd-migrate lxc lxc-to-lxd; do
-		dobin ${bindir}/${l}
-	done
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
-	newinitd "${FILESDIR}"/lxd-5.0.2.initd lxd
-
-	systemd_dounit "${T}"/lxd.service
-	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
-	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
-	dodoc AUTHORS
-	dodoc -r doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-	elog "For virtual machine support, see:"
-	elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines"
-	elog
-	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
-	elog
-	optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the lxd group."
-
-	if [[ -n ${REPLACING_VERSIONS} ]] && has_version app-emulation/qemu[spice,usbredir,virtfs]; then
-		ewarn ""
-		ewarn "You're updating from <5.0.1. Due to incompatible API updates in the lxd-agent"
-		ewarn "product, you'll have to restart any running virtual machines before they work"
-		ewarn "properly."
-		ewarn ""
-		ewarn "Run: 'lxc restart your-vm' after the update for your vm's managed by lxd."
-		ewarn ""
-	fi
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index a496af80a18d..edd59d2eee14 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 4f3553ed8d0e..90920337dbfe 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -2,7 +2,7 @@ AUX mirrorselect-2.3.0-setup.py.patch 2000 BLAKE2B b5881e7b03c12f410721628670265
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8 SHA512 ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
 DIST mirrorselect-2.3.0.tar.gz 18039 BLAKE2B eebc4a02257b734c3dfd05cee541369689b92548b5421e977dd451442e8c83e426a03845a46e92eaa01507e0cba2b3679c97db2c00f012619cf9f551cfa1e1af SHA512 fc040bf6a9cc79f781157c7b65c6366c86dd54d583b4286845e3d037a2709c376e9132889e9dbe2cd40846cd7bd138aae7111d1a442a421101db756cc259b535
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
-EBUILD mirrorselect-2.2.6-r2.ebuild 1510 BLAKE2B 54f7c3c09da976730fd954ce51443b8ede20a3ed7882d8ed5a4882ea910b1ee0b6586deca1d07d67d19c663ea594e106b93c930b9a9877026d98c3dc2f4c3e8f SHA512 67d42ded934dfcd13ea42808d07e914fc56f347832f115e7439ffa1cef3eba15577b85586e021002c5b8c379bd5a8ae223a3ecbfc12a0366b1be45f8d6948252
-EBUILD mirrorselect-2.3.0-r1.ebuild 1173 BLAKE2B eba60180ed7f9439b87e6be30c5bd14142e929c50e7d268245789d9ff4d11ca68ef0981051be01df1f5b19c2302da32629da4faf6fa4ec9ee37141b373d684f2 SHA512 5f1f2d19cafff43749241bad45ce86bb918b321a2ba4f5c0e4d42c596e6b6079e13a84b0daa9869a80fbd07c12264721924839342cbfda5d75fbe8dbd16fac7a
-EBUILD mirrorselect-9999.ebuild 1152 BLAKE2B e47e81d4f7a92462cbcb566198242512cb1500902081ba03ab7d6b0bfd9b81f5eabd3597f46c8deef444aa62a71a8de3de7a459f37a7533ac94e86fd24bae414 SHA512 b5cc3c9f59e246be9a517ba820317f305fc7ea63598eb8ca09e4f4501bc849495a3bd8a16d8d9764f3c417ad72125e00f378a3776fd4bf32ccc7d3e0d79ffa14
+EBUILD mirrorselect-2.2.6-r2.ebuild 1510 BLAKE2B a46879d8b498eabcfb2ce3568715436ae3d5b82f118f2b4e893fd999aafd8ac88362ece12046972e9f56cb67ac8d74bdc4eddab38a8e1a1e2e878ad85f55c27c SHA512 799c95f6d5b214f4a4eab3ddfade372e5ee19e796b8571010f8b3e0ecc019de10f77cc20336e299c581757d7eb925615ec433d7e5f46f96a76b00cefc0b1cd6a
+EBUILD mirrorselect-2.3.0-r1.ebuild 1173 BLAKE2B cb9cb158522a285e9470c5169dfc8b5aad5af76e9d9d2a13232c80b4b18ffc4a7efffbf1425281074217bdea69f1349a44373021ca84fd42c6a5a5f4c6117035 SHA512 3c9f88f94a493a3144aa86d2686d3fbaad11a6f5ead7ed900005ffa0ef7f4c7b5805547c6bc66006a0fa7b6345048b321fdd0c40e475c67551a508b7a9e46701
+EBUILD mirrorselect-9999.ebuild 1152 BLAKE2B 28555f70f03fb1f3a0e0678ba276bcef395423edc7276993efbb0b58ddc648898e9c93ad3ff5604d6ff9f411f46f3d22aa93ed11d1f6ddc18a351312f062af61 SHA512 d48ea623f4c0b4b0bd6bbb4f3903ed95108378b4743b361982f54ce4790f23cde3a6f6f93cc7775491e5eae8d00de8aa30ab2df5046679d2851d49f1c2913e95
 MISC metadata.xml 495 BLAKE2B ebc7faf279e0a14f107411622bb0855c36c2229ed8357d7abea7cc7ea6e49a7ae7d136d476c33c02da46bb93614adadf87d6b6e19d1698d14c78942f9eace139 SHA512 5e8f9c4e185318f2de112e02c2c15662553ccae75f35a14023eac9e55ade710a45f0f6b78d98c899fa7604043e28f0ec2109889459aca46b3708c97c444d858d
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
index 178d0c9af101..060bd600b856 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
index 9811c4382c98..1f034351afc4 100644
--- a/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 prefix
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index 16a255b5950c..6584dd8aa165 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 git-r3 prefix
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 1435203c362d..5a29ab4001f9 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 24f56c49ba2f..f97554808195 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,8 +1,4 @@
 AUX mujs-1.1.1-flags.patch 313 BLAKE2B c0dfb2aa7721fe865b4c04141924da299db48d900a6fab883dc76bf274cd60ca8749febd80e6b106e60cc36c4fcefa76d5414e29ef1ef7c774a7e912088895c0 SHA512 8d189613398203693e35c4313d3b7688c73ec38b426eea93a9cf96a21df11bb651afe0191168ca3c23a69f9d77390ed2829c2bc2204f04cb7621fb9f286a7266
-DIST mujs-1.2.0.tar.xz 99108 BLAKE2B 3661fb56a3c316f529251e93b50e18ae1835077af10d5fb636e92e77a766fb63410af0f61ffca6e6c12d6c5c984548d4e36ccee03ead44835493c0c28ef610a9 SHA512 04cc246091bf878aadfa2382ef46c8c42cd04924d9459558016f27474ae3ebca7fc7a0fda7b4efee1bd668b8b051030a2e1f9f40722cb547700c7f84857f4071
-DIST mujs-1.3.0.tar.gz 127929 BLAKE2B 589dbe16b05b3b0b59a551d162edcc4d3ba7d3623de5646cd87640c6f3ee1b7e2765909c4a0fdc0457022a8575daeeefe8efb4c3c7d2a5d900101e60406362a9 SHA512 1e9590892b1a0b139f8959a64e4255f5695c8e2dca355858155275628345ac3bb4168779dc6115bd6ac62b8615932762d3f348a1c6d0ee8d56cb43a863c4e0c3
 DIST mujs-1.3.2.tar.gz 127899 BLAKE2B 4de5e1e60c5d6af9a20d8bb1fe2612d6c90a6b5557a66524bf81747e893a89a88b4da7e5393325923c6eb0788679da4013f25032cad23e547f15a1d49cf0a738 SHA512 ccffb04171f7ecec2cfa6f0e59859acc911836370a648e4c6703db174631ce316413a64ebf4b32eea3d3b09221ff01861cda91f4b1b9bebf495168f26f90daf5
-EBUILD mujs-1.2.0.ebuild 1647 BLAKE2B 6175a6ac7b322841eeaf61081e66cdf67c9303f24cf559c6d263025dacbb62a093c38a522fc405ab93040ab9f0a932f9a71be218ceba9737f204e5ead18b4a22 SHA512 f12c266225b783e512aa5c2a04977b054651c240dbea4f685321b829fd151d5d0fcfeae68d3f4bac9da7cba9cdff3662dcd154131777688fe506ba1c243bde68
-EBUILD mujs-1.3.0.ebuild 1654 BLAKE2B 1e504a6fccd349f6a57f6fca1408cee3135c24ff37d04d870f17b737ab30e5aef9d3c5037e5a0c8fc24b53eb331630141917bde2427f537e4914e65803686c10 SHA512 93d0d863c16d084abd707b59eff56e68d853abe2d514250d9541d221d1043bc464dc454b85bc7f0acf800e26ea39735c1d41fbee9f4f4b6239d19b0cb384d413
 EBUILD mujs-1.3.2.ebuild 1647 BLAKE2B 37b42353fb70112dfb24bddff3ceb373fd7982c61088d7df9a75cf4b2d7fbcbca00a23d427a602f0f19b9238f1a5bc27382c5e8fa50a17d8bab590ba511904cd SHA512 ea444a30f7cb767a33991d69f5e68831a89b4000781731a415936ab1eb69916f92690a71d8b22747331255327ca29ee1466533cb32bdaf2732393e086e51ef26
 MISC metadata.xml 713 BLAKE2B 854afbc1219508e2b29aad5f4b83d0a869f1a70c9380fd624ce844be2d4ac3001ad0fe406b8a96c244d2d4837d8921ffd68bb424cf997d804fb426da0d2888b9 SHA512 36d958686ead6fa0cb13dfd8048f036ed833146fe786da0f2ce4f829343925472846d4164c3bbdd1ad4a9e04e8be5fd9b68e44cfef5139194f1aa7359250ed21
diff --git a/dev-lang/mujs/mujs-1.2.0.ebuild b/dev-lang/mujs/mujs-1.2.0.ebuild
deleted file mode 100644
index 7e3cf9e25569..000000000000
--- a/dev-lang/mujs/mujs-1.2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="An embeddable JavaScript interpreter written in C"
-HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
-SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
-
-LICENSE="ISC"
-# The subslot matches the SONAME
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="sys-libs/readline:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.1-flags.patch
-)
-
-src_prepare() {
-	default
-
-	tc-export AR CC
-
-	append-cflags -fPIC
-
-	# The library's ABI (and API) might change in new releases
-	# Diff 'usr/include/mujs.h' across releases to validate
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		append-cflags -Wl,-install_name,"${EPREFIX}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib
-	else
-		append-cflags -Wl,-soname=lib${PN}.so.${PV}
-	fi
-}
-
-src_compile() {
-	# We need to use ${PV} for the pkgconfig file, see: #784461
-	emake \
-		VERSION=${PV} \
-		XCFLAGS="${CFLAGS}" \
-		XCPPFLAGS="${CPPFLAGS}" \
-		prefix=/usr \
-		shell shared
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		VERSION=${PV} \
-		libdir="/usr/$(get_libdir)" \
-		prefix=/usr \
-		install-shared
-
-	mv -v "${ED}"/usr/$(get_libdir)/lib${PN}$(get_libname) "${ED}"/usr/$(get_libdir)/lib${PN}$(get_libname ${PV}) || die "Failed adding version suffix to mujs shared library"
-	dosym lib${PN}$(get_libname ${PV}) /usr/$(get_libdir)/lib${PN}$(get_libname)
-	dosym lib${PN}$(get_libname ${PV}) /usr/$(get_libdir)/lib${PN}$(get_libname ${PV:0:1})
-}
diff --git a/dev-lang/mujs/mujs-1.3.0.ebuild b/dev-lang/mujs/mujs-1.3.0.ebuild
deleted file mode 100644
index 267cf273a319..000000000000
--- a/dev-lang/mujs/mujs-1.3.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="An embeddable JavaScript interpreter written in C"
-HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
-SRC_URI="https://mujs.com/downloads/${P}.tar.gz"
-
-LICENSE="ISC"
-# The subslot matches the SONAME
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="sys-libs/readline:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.1-flags.patch
-)
-
-src_prepare() {
-	default
-
-	tc-export AR CC
-
-	append-cflags -fPIC
-
-	# The library's ABI (and API) might change in new releases
-	# Diff 'usr/include/mujs.h' across releases to validate
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		append-cflags -Wl,-install_name,"${EPREFIX}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib
-	else
-		append-cflags -Wl,-soname=lib${PN}.so.${PV}
-	fi
-}
-
-src_compile() {
-	# We need to use ${PV} for the pkgconfig file, see: #784461
-	emake \
-		VERSION=${PV} \
-		XCFLAGS="${CFLAGS}" \
-		XCPPFLAGS="${CPPFLAGS}" \
-		prefix=/usr \
-		shell shared
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		VERSION=${PV} \
-		libdir="/usr/$(get_libdir)" \
-		prefix=/usr \
-		install-shared
-
-	mv -v "${ED}"/usr/$(get_libdir)/lib${PN}$(get_libname) "${ED}"/usr/$(get_libdir)/lib${PN}$(get_libname ${PV}) || die "Failed adding version suffix to mujs shared library"
-	dosym lib${PN}$(get_libname ${PV}) /usr/$(get_libdir)/lib${PN}$(get_libname)
-	dosym lib${PN}$(get_libname ${PV}) /usr/$(get_libdir)/lib${PN}$(get_libname ${PV:0:1})
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 211789b7ff8f..a7d03dd80d9d 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index 962fe53b1d27..8ba5f32097db 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -1,8 +1,6 @@
 AUX dqlite-1.12.0-disable-werror.patch 515 BLAKE2B 3a2ed21d6d4b33f3f39789459754f3663ff03946c65a9660bb98a07bbc6b9b3bde7f800580f40b2e49f92744cbca719463226c60a8e98b8f41f689797b63a916 SHA512 af0a219f9ef5315fdb169f7f812059b6cadc251df5262de8d5574827afb23da64e9d0015ef38db0e5581dd9e6a992a72e3a54c2cbb5181ceddcc07082a98bfdb
-DIST dqlite-1.11.1.tar.gz 172024 BLAKE2B 48fb3c4eebc1f1a2d341254f9f0ad01f871b65fac727b132b80ac59eceb7d1ab95ac6118549ab39c8b032053a8791d6abef5e0d4856da7e45f00939b083463e5 SHA512 64d9a6548a4d75e3045adf5e31d54c508a02b255573225d32119225260c3d5219c4ac29c857ba054cd3fa3df54ee81cf88bbc2f9769839902f63f0f8c02cc6c7
 DIST dqlite-1.12.0.tar.gz 181709 BLAKE2B efb35aa9d0c348cd55eb190e27ad155b7d748ccbcb80822f33ce4589d56bc0090f5c0703d769e7090bb8da1b8908cbd73d1076568108661d5b85e55103795a9f SHA512 2a3dc17fcaa0ec2fc5481d3ff57a7bee42c8930f0e6ac7030d51e1a61ae3ce4d7b24f47921b29602a65353c1a51931a82d9af302ee580b19bdce561e6547e940
 DIST dqlite-1.13.0.tar.gz 190627 BLAKE2B 02880a112a7b070ee19653b60f19dbb49030b1d0d1bd3671577137ce281fd1af9c135f138d692fcc1c14592972cc9321198b3a2003fa0e81829c8ae462604964 SHA512 da56c622c75dcdc1df814d2b7acfeb08cb046fa7b74691d63575ddb3d30f91b441b8f58cc72466872b4c5e0028706b6505846d8f3d06583be844baefdd85f8a9
-EBUILD dqlite-1.11.1.ebuild 869 BLAKE2B 0cd8e9e2a544716abee49e2a999a656a1bebd72b8647a9985f1717d6853e815a910da4b25aa722af6e9da3f9866ec911a24700abbd5cd509fcef0c42dbe81c48 SHA512 c0594bef260583d4dc90523f174aea2a781211e49eaaba3c89487c408e386d0e592ed6dc120fb110402199b8cbac24d30e0ef4b86653f4fab21c7e43821c863b
 EBUILD dqlite-1.12.0.ebuild 938 BLAKE2B 60472923a3f7b2ec5c980f68e5e37af966fcf037e356aac92517dbb56d8f57833f83d572b55cdafb31f19efbc0f54bdcdb0925de3644a4e5ac4b3ee735aa010d SHA512 7c545c2a3b0e09fbe0858a5230a8fe4e1028617eb78d8d73ea27de6f7a4258c7d1f9aab80167361c7795307a6619a93a0dea1c06288cbd1aecff13d8a6fbd924
 EBUILD dqlite-1.13.0.ebuild 961 BLAKE2B 8cf06a328bee43c78a7891e9f5848c1a67f272dde34ab1ed3cf2525cff9fd69ceffc102da8c768186086d50794c563f8d6fde3f1f7541a7a419d2fa45e5e30a6 SHA512 750247d895ed2d0d036ea2e56a0c92685ac540db787f69184a013ba11e3725d8dd7501d98a476fc38e8f3d2c295583e279d0ae2a4d17e239aa4cb413265a0ace
 MISC metadata.xml 950 BLAKE2B 26822e40a2c719e8e3a03db6e513d869eef038fcca973ef049da1b6eeec29aefd0867d6bced049ad1dd0465a4d942982565ff0436a7744ffb127879987ea626a SHA512 bb07a8a87ae66e5b5a2aca695e9d5cd1e5a1d725d1d9200099f9d5b46adad83c2ca9ebfedc172ad01fe31aecc1fbbe5a4de7255a2e04d4462c03a106127c7221
diff --git a/dev-libs/dqlite/dqlite-1.11.1.ebuild b/dev-libs/dqlite/dqlite-1.11.1.ebuild
deleted file mode 100644
index dc59dea20346..000000000000
--- a/dev-libs/dqlite/dqlite-1.11.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Embeddable, replicated and fault tolerant SQL engine"
-HOMEPAGE="https://dqlite.io/ https://github.com/canonical/dqlite"
-SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/libuv:=
-	>=dev-libs/raft-0.14.0"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/raft-0.13.0[lz4,test] )"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-debug
-		--disable-sanitize
-		--disable-static
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 6e95639ab5fc..725fddee590a 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1,7 +1,5 @@
 AUX raft-0.10.0-toggle-zfs.patch 955 BLAKE2B bb9f351a6b7d0b7d95b7cdb6cf89db8963d46c44bd2613c69c7f3bd2c910cc185c8409cd80d218cab1569fe4729f649ac922ad1eb2b5652e5eeba441642e9588 SHA512 907f50fd1dc907d2a9aa1a89601064205c26d48956ddf56389a843e8c81b00acbc461125cbea5caef315be4a4a1d3a8f9bfd0a45ff0dedbeef1e0851e899b277
 AUX raft-0.11.3-disable-automagic-check-for-lz4.patch 2819 BLAKE2B 132e07bd4dc447bb67b2521c89e06c697dce9554d1f2b737aa460a22be9f7a2999f39ebd1b25f81863ebd764ef127856dceeadcb2a12aecdb01cf01f1cc22bc0 SHA512 9de7af38c778366e63e03991fa147844695dd0b4cd2e62559c5f82a0a2e914abf1bab5b905ad3cf26512d6d48670bfdb40a0683ef7dd1383eb0229f6718a70a4
-DIST raft-0.15.0.tar.gz 339309 BLAKE2B 2baf68b37d37af130e4530dbd97e15b17a4f609e00136284f07f0d16529c092abae875bae03a2bc0e68881662b41ecab945d200f33c0d4e66fe7e106f9d67a70 SHA512 273ad9385f6fe9a58824594d2ca84b879c1fa74ccef6a18e7077d097957956c10f3a12de7fe3b4500deba7910d8479345b6e086adfd1b7d577775be04af5306f
 DIST raft-0.16.0.tar.gz 347565 BLAKE2B 8452feed5bffefcc8087e62cdd48bda05be6a4068fbffcb0621779ab349902015be9095f252a253d6584faf4bfc6c8daefd97a130e7a9f8ef682ca03efd70dc0 SHA512 cee4a2f6fd9a0a16b591d46aa9df2104a50f2b62068eb27017e3347fc28a6b3cd3aef6bfabe3acc7e72844406b4b71aff1d1e088d08e83d6d2f5744876a681c8
-EBUILD raft-0.15.0.ebuild 1036 BLAKE2B 7efcc055596a4c780584a745324afd333b4fae36e474befd70b906f0ea82835fad930f38bf38951b56f0f9c349e8cc2226d8b6642b70ba2bde5fe5850a3149fd SHA512 5a00ba7613d4bace49eff5b6d9a64c66986b72f568b1f42d455afe69e1b21200c6f37f5fe594058589950af11feb3fd4441ada0e3f0fd55b167bb9dc6eee945d
 EBUILD raft-0.16.0.ebuild 1036 BLAKE2B 841f95e61a6152ad3708bdec09e3a4f2f0a1f231c6a40c961015dd731e3fd6cb33ca843a9db23289d976c7692f6d175b9f6a61b2ada076d759ff6bfcc02036a9 SHA512 819040ba8cd1b93d1c3736ffbab16161ea9fc82ed15e05eaeb1144704b19876fc821187a8237a5a66f81557cb2721425279827c7e47ad3a85fe46eb8466d97f5
 MISC metadata.xml 897 BLAKE2B 13bfe9b6f1bb195f93437b02134626657f8879afb8a70cc81e328a4a1851cd3fdf5b361d95d8eb913fcd446d3723d1261c3844987b24d300a7b38d4bec538b87 SHA512 cd4f8adf74cf8e6e29f661348549e4c20f44cdb8d10f7181703796f4f4fb8d2e9eccf8b9097d1e4c553efab638e2db7c0619a07b7432edc9d5f28878381aba33
diff --git a/dev-libs/raft/raft-0.15.0.ebuild b/dev-libs/raft/raft-0.15.0.ebuild
deleted file mode 100644
index e0f234b3f1c2..000000000000
--- a/dev-libs/raft/raft-0.15.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="C implementation of the Raft consensus protocol"
-HOMEPAGE="https://github.com/canonical/raft"
-SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="lz4 test zfs"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/libuv:=
-	lz4? ( app-arch/lz4:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/raft-0.10.0-toggle-zfs.patch
-	"${FILESDIR}"/raft-0.11.3-disable-automagic-check-for-lz4.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-uv
-
-		--disable-benchmark
-		--disable-debug
-		--disable-example
-		--disable-sanitize
-		--disable-static
-
-		$(use_enable lz4)
-		$(use_enable test fixture)
-
-		$(use_with zfs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3ccf33d3562d..7dec46328537 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index 84989758a3c1..8cc627c6fa0b 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -1,5 +1,5 @@
 AUX 0.3-no-pixz-index.patch 2089 BLAKE2B fec4eb3bbef769d43c7ef42bc2314252df6379c1d973e319ddc6377c870793b83eba63325f9531cbb46a35e7e13011353dc689438479bb3c42d67f52b4b7799b SHA512 1d051e0d2e829d91a5de704273dde1ed91c7c3bbedd5744fd24d54ec21418ed67db73d866ca1943e36299824214e677058fbfce9e61233aa7c1ecd90152e8fde
 DIST pydecomp-0.3.tar.gz 10009 BLAKE2B 2741dc776ac265a84daf4c68542e652c7e2663dff1561297057f3ac219805136ece32af3f33e0b03df0a9883663692fc3855490478c538a0edec838c90c1c4b6 SHA512 7935111f9d0629eb74f529a6427b9db3cac4c9c205f80b28380ab9c323ca9ad7b78b40f69a7760a5a69ed065e9d6ddd42d08fb8f2cb787f15d2ec6e88e20221a
-EBUILD pydecomp-0.3-r3.ebuild 758 BLAKE2B a75d8142279be6f4130fe7fd5a94203abcca432444a1c985c14f06e5b69c6da0ccd8ce7fa2e4f6b8b6bee24c7e4b9bdb4b65adb22076a4fee98030701a03e6eb SHA512 50508cec672c77e1f1610b7dc07fb6017b9e8dac19f43522f0a0a62d7096527ff04cadacca75c96c9bd6cdd8417320e9b3e2ced7b8adedf36c45c647f5211c6e
-EBUILD pydecomp-9999.ebuild 713 BLAKE2B 882308d4470481ad91a6a11dbc93266d58d6719b3e622128dbb02a55d28f5b515de90b86a254ff844226781fbdb68dfb10005219d18f3a1d587ed64997c20d32 SHA512 bcc7d4ff667c90195cf168a3b3bc54b30acfc2b0c701022d1a3dfd8cc99e3ec878de7a63ef04e613523636752505810d444b19d92a7f83f4b4fa38ca677ae836
+EBUILD pydecomp-0.3-r3.ebuild 758 BLAKE2B 2af4c5d88ae4f9915e59246c35682a009a01264280c0bf0b056f2d782a2a432e8e98eeaf819ce35bc263a759199e890d9a14a8ff57950bb8d8e0a77583e83c47 SHA512 fddc5a92043de25a1fc99f20dbdbf3ac38ef41b200614d294d257275a0c88a0b33a33afe52d598a8667e7197bdb7353ce375cc3886d33efab93645840cbad77b
+EBUILD pydecomp-9999.ebuild 713 BLAKE2B c3d295926ef8539aba35a8d7ac78a915bad8b30bd8023791a4529d885eac8345fdb71baa38dd13a961e117cd415f494b7f2bec1293b5511e9ddcfb4ae3eb9e62 SHA512 593fb22f4c90b8c69a0cee98ba3da9aa38cd483d4622b81ce136484513ba971bf40a9f5c29d07dce2d0fd58ceefc348f62837baa6d9154fbd0afd9a5fe47c2b9
 MISC metadata.xml 779 BLAKE2B f33c8009603ba2d4ce7246088d5f8c67919e79bbddde5f4423f2fd7526bfcbb87badca1e38a9ad8b524f6db2d2c5c5dd7ee05fb8a33bebac7177fa598aff0e20 SHA512 8129e96ba267ea1ab32a67149b8e645295ffc9a89e9740d1ae392e45d296fa19189eda30194018799e852652ac556654e852d651168b3ace794678b133beb8c8
diff --git a/dev-python/pydecomp/pydecomp-0.3-r3.ebuild b/dev-python/pydecomp/pydecomp-0.3-r3.ebuild
index 9bf3c7059d42..49158c385fca 100644
--- a/dev-python/pydecomp/pydecomp-0.3-r3.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index 5179c059b59c..23daddd44275 100644
--- a/dev-python/pydecomp/pydecomp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest
index 5027f45c21fe..1cbdd49955c9 100644
--- a/dev-python/pynvim/Manifest
+++ b/dev-python/pynvim/Manifest
@@ -1,3 +1,3 @@
 DIST pynvim-0.4.3.tar.gz 52807 BLAKE2B 2ac8894af71a28f8008dca1f9e34a0cda6a68aa108ddfe122e4e9cac4c7669262483729aafb238d0e8eb0022ddea9bb222ec7b718e9a9c59fbb349821b6b8dbe SHA512 5d8fc7623a5bc2e069991b901dbd4dcc6005ddab31e2f0a70ee50c2d6febf3b5c29a61fc4dce454aa494779d7a869a1e92a2a97cb66212ed858c3d3fd77c0f55
-EBUILD pynvim-0.4.3-r1.ebuild 686 BLAKE2B 11957e494a64e8a434850a4698087626d60192cd9515c922fd232d20e5f1382fdc036fde316a7f426afda4e3fc3a7a9f35f61b4f8ebdf38aeeb0c514e34ab948 SHA512 07442dc3ac5d7e8feb8cf91d4598967f6d08638aebcf49ba437d0ce63a2c78a969c08cbd4500a144913fc6e714cd92da15d82aba9754048f58f36d5a433fc09c
+EBUILD pynvim-0.4.3-r1.ebuild 686 BLAKE2B 9f1c65fa4fb2a3ab875b7f239eecdb53f33c28c9565b8702d2ec6247709caeb424944d1256a1c44621bd78752735007ffe10b247a9331b2a29e39700973a8a72 SHA512 9f7e2b6dbb2540bcbc65fc3732897a1e2e46fe633bc65b227a0a2661cc7506ad47946d2f21035ca64ad8686f3c0a2d1105686e6c727105ad372e1e7b2364126c
 MISC metadata.xml 497 BLAKE2B 0fb6f83694d47c77d6b370e19a2c681caff4d9a105ce831f54823c65c995cb88949bf1f276a186245c8a03f551374cb6583cc9e0b4143fa048fae289278d4042 SHA512 bbf30f5aa13e28b3a7f810d6660815767e0c21e21de7e01ebfd6b1ca6a22187e3f3aa8278ee26ffb632a6c201e5544ad2b069710dc8cccf6d4bbda962b48437c
diff --git a/dev-python/pynvim/pynvim-0.4.3-r1.ebuild b/dev-python/pynvim/pynvim-0.4.3-r1.ebuild
index 1cdd79504db6..7e9680fddc52 100644
--- a/dev-python/pynvim/pynvim-0.4.3-r1.ebuild
+++ b/dev-python/pynvim/pynvim-0.4.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index a464f79bf294..443d53d558f8 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -1,4 +1,4 @@
 DIST ssl-fetch-0.4.tar.gz 11663 BLAKE2B c75173f40367d1e84a0ed3e13dbc7e6b8270302bf64168487061195cd1d24a593630ca650bfac4ed867d4146e8bad438cac8bfecca86180d2ca23d9ccafa9e5d SHA512 6b31a5dc5d3a566eded6ca284a3edac8c308596dd5a1971d13223e55abdd2ddc4d3e1eca5f369c1c05540bafcb6c273e5ef1eae627a7a9170bc262a0cda06696
-EBUILD ssl-fetch-0.4-r1.ebuild 973 BLAKE2B 02e41a7c170690a99f758d3d2f34c512bb7f1d553f41254ea161f45af7e807306ab08866fd2df73034a33796a0b95234c26ffbdbafe421f03ecdd52ea18ba892 SHA512 a4a01f53f22548305603ec03bc85f5b79639d412c004a4b5752d3790fe8b69902367bd55c024b75340a3f1712b9a870a04431f0e8179e02602dd2dd71baf18a5
-EBUILD ssl-fetch-9999.ebuild 817 BLAKE2B 5ef253f92cd5917f54aaa3559fcf36719b40c8e0896284c22cf96c3ed12e279946820c7aa61e0cd7344aef909aea470a82e7cd3b374e1221d119aafe34436b12 SHA512 a90d9681875f57907ad6ba47be7e788523cb2a40a0840e4198cddc71ee1eaa5c1cb721bdc7a48c40af779e3b8959f249a39d0ff7b701a124c9eed6a4e8e5a17c
+EBUILD ssl-fetch-0.4-r1.ebuild 973 BLAKE2B bbc41aac4c816d1dd8cb15a7041cf2dcc46942c348239e3082b84a791a04131b5ca7b089e5e05eba637882a0cf5a25fd1fcd46bea32d6db43f2d74e862a5bc6f SHA512 56a346b544690541cffe9f8e882a1ed94d4cadfdd6de6ea16d6dab3c6f96a54e89ac91838e901d7a936397cc4b91a87de4865d0949834bca1320b8e038040857
+EBUILD ssl-fetch-9999.ebuild 817 BLAKE2B 797e001dd36bdf6991523eca80163de85181a328a381eb6df6e19cf8453d3a480ecf0591c226a77f6ddbd4089ed4004065da069b224b179a05312fbac536d599 SHA512 ed77acb0a27c677dfaa50eaa0ec1d8a917daab893de71fc7e79132b0d3ff75e8b54f89271f537b065033837b58afd5ecdfaf2848a0c4ce2bdff07d90152ca57a
 MISC metadata.xml 384 BLAKE2B a6d808e54df2c5b89dc5c0f4a92f38f188a7f7ea8d512f014e6c372203688d8d011582c4c275df70225ed11e3205126a660eb89fd67c9a07da6958bda3360b73 SHA512 c4d2c22a3b9d98e262db31005022c763432d5c11ff020481e69d931086d3871d9c278d502a7625b6d15e148c90a40eb4dbfc1d537b7a94794241acdeb5f12946
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild
index 49c0ec042f98..842da8bb31f0 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
index ed96683472a6..b9554fd68394 100644
--- a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1 git-r3
 
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 7ac5499c9650..9b46547dcc14 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 915d89132643..af3eabeb9659 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -4,7 +4,7 @@ AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d3
 AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
 DIST postfix-3.7.3.tar.gz 4825380 BLAKE2B 005abf49b27e59bd3e3251e345df4da0c830314c4d4478aee11057163166afa1a0159017c46bead6572d29d9738a18e1a42a0b72fe260facd3ad77f8ed309271 SHA512 4ceedd1b7b364f47a3becc041cf29a48aea54e38306fd1227c5a7c25894831fb5c37150d99d781d237175e58da21ac53887c97d99bb6b715c4988777596ee890
-DIST postfix-3.8-20221227.tar.gz 4832197 BLAKE2B 717d0a595f71eb2095bccab5fdd77de14e7627018503730d299574b6c04fce2192365059da1440b4cf82bf3696cabb2e90303775e863eb93dbe35709d9a7d644 SHA512 f8c74b66b6f9acdf7ff3ff83ba31d1769021347be0b5a61a39dbc75d3501750271613ddad5f18c8d9aa449d8c7b87f27832f6b97e527f9e85ed3b3ec3a3de372
+DIST postfix-3.8-20230108.tar.gz 4819822 BLAKE2B 40b6ea56d7ca4fb8c8db3873b43765a82614b33bb5e24fe5dc164062035c081ae30b5d505fd2568872b6301b5f2d5e0827dc43c58af608c13b2dd29f1e896a7c SHA512 c9950af9439f74369de55651cda0ecf45992fe3a696a63aeb46d2dc3a7d5eb3ece98116b85d478597d8482a62766a0d140ba16ea512473d085b7e8b34c9836e0
 EBUILD postfix-3.7.3.ebuild 8058 BLAKE2B d98af774658023242cbdfe4f869132e1f38ecb4a8e3e8d86cb21294132778f8220db52e23b3ec4ba6d3b8872857b816e137d7fab8654eb2de1f79869037b370d SHA512 98c03c38b2c4c42e6628a1bb9d7a58d6f8ed3541f0599a26d92e0ae50096606a09e71c4390f0005b426790041b90c1fa29f24faafdc86f03212ebde32296f283
-EBUILD postfix-3.8_pre20221227.ebuild 8060 BLAKE2B f47bbada9c7b165e8b3abee8eb88b5f36148cb7af19a216d4a3d80b7843e8fa39c59e99254fd30c9e9e002269b114ebb83df28ea6baebfe3b3217a4d2dcdf4c3 SHA512 0bd3c50a093847f7b687a0988f332167d33a9219aa9e315af48ffa20df6ad4a9c85c1c449cb781c2ed5f2342040b335ff23926be050bc769ff11b9a130e9f9de
+EBUILD postfix-3.8_pre20230108.ebuild 8060 BLAKE2B 877b2a38a5793f84752a36e202a730d5eda0c1edc7a2b6437d15d83aa40c5c14002763e2d8a6ce5deb4db66b1e207668fcbff7184c26a8381d5afe89c16a8c4f SHA512 a08deea534d610a7de0d9d3357a0dda3fd5312c5b872f890ca986be08e2137132e4bae770f0aaebcf2acc97725779d1cee5d3d848fd5b7227a3b63601b57687b
 MISC metadata.xml 867 BLAKE2B 1839d35c91007bb07e1a722b6b4751e9f7754e00109859efe5850df16486bafbaeb019326d006438471678553aca9474462fa32eaba445362113ced6927bf4ab SHA512 ff898bdce2b60bc52a0d326f8f8221bd474cc4fa31def2ccc5526ba59ad396b0b26f22cc98ca4e1181e3c38e5476615e53bde2db1e643ae5b9209ac581ecc1fd
diff --git a/mail-mta/postfix/postfix-3.8_pre20221227.ebuild b/mail-mta/postfix/postfix-3.8_pre20221227.ebuild
deleted file mode 100644
index c97c5be2d78a..000000000000
--- a/mail-mta/postfix/postfix-3.8_pre20221227.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit pam systemd toolchain-funcs
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND="
-	acct-group/postfix
-	acct-group/postdrop
-	acct-user/postfix
-	dev-libs/libpcre2:0
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap:= )
-	ldap-bind? ( net-nds/openldap:=[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11:= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl:= )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-	"
-
-RDEPEND="${DEPEND}
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!mail-mta/ssmtp[mta]
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-src_prepare() {
-	default
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="" mylibs="${LDFLAGS} -ldl"
-
-	# libpcre is EOL. prefer libpcre2
-	mycc=" -DHAS_PCRE=2"
-	AUXLIBS_PCRE="$(pcre2-config --libs8)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		# change default database type
-		if use cdb; then
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		elif use lmdb; then
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"lmdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			AUXLIBS_CDB="-lcdb"
-		else
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles shared=yes dynamicmaps=no pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install() {
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape, posttls-finger, collate and tlstype
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-	dobin auxiliary/collate/collate.pl
-	newdoc auxiliary/collate/README README.collate
-	dobin auxiliary/collate/tlstype.pl
-	dodoc auxiliary/collate/README.tlstype
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue,log}
-	fperms 02755 /usr/sbin/post{drop,queue,log}
-
-	keepdir /etc/postfix
-	keepdir /etc/postfix/postfix-files.d
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	dodoc -r README_FILES/ examples/
-	# postfix set-permissions expects uncompressed man files
-	docompress -x /usr/share/man
-
-	if use pam; then
-		pamd_mimic_system smtp auth account
-	fi
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	if has_version mail-mta/postfix; then
-		# let the sysadmin decide when to change the compatibility_level
-		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	# do not assume berkdb
-	if [[ ! -e /etc/mail/aliases.db \
-	   && ! -e /etc/mail/aliases.cdb \
-	   && ! -e /etc/mail/aliases.lmdb ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions
-
-	# hint for configuring tls
-	if use ssl ; then
-		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
-			elog "To configure client side TLS settings, please run:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
-			elog "To configure server side TLS settings, please run:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-server
-		fi
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.8_pre20230108.ebuild b/mail-mta/postfix/postfix-3.8_pre20230108.ebuild
new file mode 100644
index 000000000000..18fb69e10d6f
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.8_pre20230108.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit pam systemd toolchain-funcs
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	dev-libs/libpcre2:0
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap:= )
+	ldap-bind? ( net-nds/openldap:=[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11:= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	"
+
+RDEPEND="${DEPEND}
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp[mta]
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="" mylibs="${LDFLAGS} -ldl"
+
+	# libpcre is EOL. prefer libpcre2
+	mycc=" -DHAS_PCRE=2"
+	AUXLIBS_PCRE="$(pcre2-config --libs8)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		# change default database type
+		if use cdb; then
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		elif use lmdb; then
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"lmdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			AUXLIBS_CDB="-lcdb"
+		else
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger, collate and tlstype
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+	dobin auxiliary/collate/tlstype.pl
+	dodoc auxiliary/collate/README.tlstype
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue,log}
+	fperms 02755 /usr/sbin/post{drop,queue,log}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	dodoc -r README_FILES/ examples/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	if use pam; then
+		pamd_mimic_system smtp auth account
+	fi
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	# do not assume berkdb
+	if [[ ! -e /etc/mail/aliases.db \
+	   && ! -e /etc/mail/aliases.cdb \
+	   && ! -e /etc/mail/aliases.lmdb ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# hint for configuring tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings, please run:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings, please run:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index abad01d931ba..7bdbad434d09 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/entangle/Manifest b/media-gfx/entangle/Manifest
index 22e832763e29..8b8bc3d58329 100644
--- a/media-gfx/entangle/Manifest
+++ b/media-gfx/entangle/Manifest
@@ -1,4 +1,4 @@
 AUX entangle-3.0-fix-meson-0.61-build.patch 810 BLAKE2B 4b4eac6fbddba41e6f6cdd2afa4f0db1b603bc96b1c281fde415cd71826ae15cb839b267a138229dd59e280459f7cc3cd1538e32357b0bab74b1a5a9507a9caa SHA512 fb2196fc1ec125c6b8ba237c74e9495d8e0e22bd584948a385d3ee906fd32ad9887d02093b3c690e5de90fa19e7d7e538aed9e1f8ede433e15bdd6ad80639ff1
 DIST entangle-3.0.tar.xz 518808 BLAKE2B fe2bf4b114bc04fdc56792f984ae7387b70d693fa82f8deaa2023de71a8bba72bc95d4bfc430cdfaf5244e9114b4f7e8bb2e17f3b86de6529037519fa3877899 SHA512 8c6d7e067f88a770c63b76fde2a6ae71894aae95477fcf66b4670697889fdf7939d3f95532626d6f4ca7ae75841d8f247f6bcf78a1ce195b540989f1bfe5ebdd
-EBUILD entangle-3.0-r1.ebuild 1695 BLAKE2B dddd23c54eda58dab8b1913e1c7b1580a599ee472f29df693cf8dce7d878c3d8a746b1d2aba7f3755e9193f30296ff8083b75a488a6ee5d56e78bf66d88cbb54 SHA512 d229846998e163ed9d078c84347504aa2fb924d0f8c0b61cb41487f26696e427350e058e9648e381cd61f690cf0ebcd68359ef0c3c6c54039627406a2c6125c8
+EBUILD entangle-3.0-r2.ebuild 1697 BLAKE2B 474eb8d573d97b14f0f4ca075b7af9b8dc5eb5d7f7fac98b58d849edb769519ee89683d132b0e8584306d625ab9e4aabeb1c80cd7eb72389436a2e99e184e39e SHA512 149bba37b5e1afd2ca87c5872da346c3e9e7154deb845b24a775dedf6fc32365ec47515abde314d669e6859d9d2a74a2dd959a968e2ae569da2c9715b98119d8
 MISC metadata.xml 447 BLAKE2B dd2c9401bd2d866158d724e74423fe837963707e1aeaef52ee3a611b66f60e5388a43d5491f41036997e8115dc7569ca92fdd3f3ea58b89bbac82f9ff836b286 SHA512 eb9dfef9d08aaadb9767cd2793722c304350a3cdcd71d80fa7b6fbf3eb52c8eb7669575e4a25d3debc95b184f138656190fe1a340e6370cef7623a6ec70bd443
diff --git a/media-gfx/entangle/entangle-3.0-r1.ebuild b/media-gfx/entangle/entangle-3.0-r1.ebuild
deleted file mode 100644
index 1496fba1154a..000000000000
--- a/media-gfx/entangle/entangle-3.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome2-utils meson python-single-r1 xdg-utils
-
-DESCRIPTION="Tethered Camera Control & Capture"
-HOMEPAGE="https://entangle-photo.org/"
-SRC_URI="https://entangle-photo.org/download/sources/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/gobject-introspection-1.54.0
-	dev-libs/libgudev:=
-	>=dev-libs/libpeas-1.2.0[gtk,${PYTHON_SINGLE_USEDEP}]
-	>=media-libs/gexiv2-0.10[introspection]
-	>=media-libs/libgphoto2-2.5.0:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-libs/lcms:2
-	>=media-libs/libraw-0.9.0:=
-	>=x11-libs/gdk-pixbuf-2.12.0:2
-	>=x11-libs/gtk+-3.22:3[introspection]
-	>=x11-libs/libXext-1.3.0
-	>=x11-libs/pango-1.40.11
-	x11-themes/adwaita-icon-theme
-"
-RDEPEND="
-	${DEPEND}
-"
-
-# perl for pod2man
-BDEPEND="
-	app-text/yelp-tools
-	dev-lang/perl
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-meson-0.61-build.patch
-)
-
-src_compile() {
-	# prevent gst from loading system plugins which causes
-	# sandbox violations on device access
-	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
-	# pre-generate enums to resolve race conditions
-	# https://bugs.gentoo.org/709740
-	meson_src_compile \
-		src/backend/entangle-{camera,colour-profile}-enums.h \
-		src/frontend/entangle-image-display-enums.h
-	meson_src_compile
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/media-gfx/entangle/entangle-3.0-r2.ebuild b/media-gfx/entangle/entangle-3.0-r2.ebuild
new file mode 100644
index 000000000000..63cee64f9516
--- /dev/null
+++ b/media-gfx/entangle/entangle-3.0-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome2-utils meson python-single-r1 xdg-utils
+
+DESCRIPTION="Tethered Camera Control & Capture"
+HOMEPAGE="https://entangle-photo.org/"
+SRC_URI="https://entangle-photo.org/download/sources/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/gobject-introspection-1.54.0
+	dev-libs/libgudev:=
+	>=dev-libs/libpeas-1.2.0[gtk,${PYTHON_SINGLE_USEDEP}]
+	>=media-libs/gexiv2-0.10[introspection]
+	>=media-libs/libgphoto2-2.5.0:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-libs/lcms:2
+	>=media-libs/libraw-0.9.0:=
+	>=x11-libs/gdk-pixbuf-2.12.0:2
+	>=x11-libs/gtk+-3.22:3[X,introspection]
+	>=x11-libs/libXext-1.3.0
+	>=x11-libs/pango-1.40.11
+	x11-themes/adwaita-icon-theme
+"
+RDEPEND="
+	${DEPEND}
+"
+
+# perl for pod2man
+BDEPEND="
+	app-text/yelp-tools
+	dev-lang/perl
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-meson-0.61-build.patch
+)
+
+src_compile() {
+	# prevent gst from loading system plugins which causes
+	# sandbox violations on device access
+	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+	# pre-generate enums to resolve race conditions
+	# https://bugs.gentoo.org/709740
+	meson_src_compile \
+		src/backend/entangle-{camera,colour-profile}-enums.h \
+		src/frontend/entangle-image-display-enums.h
+	meson_src_compile
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index c234dfc1af41..b99ce128f259 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index faec6cdcfac9..6180d3cdaa52 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -3,5 +3,5 @@ AUX musescore-3.6.1-rename-audioitem.patch 491 BLAKE2B 9ecdccb1e3aec15c7233baaeb
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
 EBUILD musescore-3.6.2-r1.ebuild 3058 BLAKE2B 5352d979ff5f5f7a704f589f747d8a04900976e8da82b62cd9d65de6feede64bd78d604f38264c1a3302b3084c9a00a14f542a0c3ecbfa08d5d07bf3e8b143fe SHA512 2f07e56fe6d81bc00590839d2d5a1f30bea863a5d36aa9c5ae159b8719f39abafe08edde4a43683c24c6bf67962a2dc67696921a0a7e5d458cbfdf10f6fdf525
-EBUILD musescore-9999.ebuild 3001 BLAKE2B c5de983af93a21e83218b7dcf1a11c046fe6c2b6b8118ee098104531c325944bb0e94b836d380b789da75e7e546d5df5d4aa05f967a4aa213020bd0d5a2ce12f SHA512 f2162b78542524277a33f064a098d56b04859acd8d9e8acd1e39309dc3ff2693913bd1af11c63f5a5ddd7e6149afc5a25c97cead4f3be4ae93fbbfcf8a77a1fc
+EBUILD musescore-9999.ebuild 3197 BLAKE2B c56126777d356fc661b95de37a48d53ba46732d293cd230bc733d885388e7e83fe2d3141fa8d8ca31c184046536cbe392066e26bc1d7f701c25305a6fa868ea7 SHA512 13a3035263637873728f1e2550442a54856fbc05233a20f570014de1f401181638402e2a5444e59d120acf1a8f5477225ba88c7ebfb3c8d33bb8155b3883bb06
 MISC metadata.xml 882 BLAKE2B a8ead5437d77a6c39262770afc3409f3a68072fbc796af0b029641126521299e45e921a666b97b168de79b92d3359ecd4032e26fca798188fa9bd503f394db5a SHA512 4146e03299dd9a646e713dc9baacdba9578c5fb204eeeb81397e25fe5d7b19ae07aa1bb0c550ffff5cb53194f9ee53d0b35fbc26b04658d0e50f08e1a0e441f7
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index d2e8794771d9..2cfc1a6e6ba3 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_MAKEFILE_GENERATOR="emake"
+#CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
 inherit cmake qmake-utils xdg check-reqs
 
@@ -24,7 +24,8 @@ SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz test webengine"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="portmidi? ( portaudio )"
 
 BDEPEND="
@@ -85,15 +86,15 @@ src_configure() {
 	local mycmakeargs=(
 		-DAEOLUS=OFF # does not compile
 		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_CRASH_REPORTER=OFF
+		-DBUILD_CRASHPAD_CLIENT=OFF
 		-DBUILD_JACK="$(usex jack)"
 		-DBUILD_LAME="$(usex mp3)"
 		-DBUILD_PCH=OFF
 		-DBUILD_PORTAUDIO="$(usex portaudio)"
 		-DBUILD_PORTMIDI="$(usex portmidi)"
 		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_TELEMETRY_MODULE=ON
+		-DBUILD_UNIT_TESTS=$(usex test)
 		-DBUILD_WEBENGINE="$(usex webengine)"
 		-DCMAKE_SKIP_RPATH=ON
 		-DDOWNLOAD_SOUNDFONT=OFF
@@ -116,3 +117,10 @@ src_compile() {
 	cmake_build -j1 lrelease manpages
 	cmake_src_compile
 }
+
+src_install() {
+	cmake_src_install
+
+	# Hack to not install bundled libraries like libogg
+	rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 7ab3d00e555b..a573940f87be 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 2d37b8418753..1aec4f8497c2 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -10,24 +10,17 @@ AUX vdr-2.4.1_mainmenuhook-1.0.1.patch 4645 BLAKE2B 3b4bc624f33366da133bb471bb5c
 AUX vdr-2.4.6_clang.patch 527 BLAKE2B 6f74ee8a96657df7280ea51b55199768ed3bd968cd377df12674b29616b3a43703e4cc76c4c4fa43412a564bc51bdcb32ec565832177397200f5bd7aef9b05c6 SHA512 5ad498c5784551fdcde9911e2890b236c75e47f20dabe85b561bdb0e8771d7d6ce6ab160fa8831361799ed9d5da0cfa4f3788b509dd0eadf1cdb1eeeb6aad8a7
 AUX vdr-2.4.6_gentoo.patch 2236 BLAKE2B c7372e3bfe04ea14f1bb12459d4385d6001c6acafbf96b4d1d8a69e194e076af656b76bb349ce07a30b131dd9e779d39441a34cc41ff0ae651fd14c8f2791fef SHA512 6ff8d20e4c596e3705ac6814e0ea1562e4b1f2809d585440bd5940b7094127fce21e7f6a738281305d6782c9806336f2d030c864e189d2c85e3b302635f07685
 AUX vdr-2.4.6_makefile-variables.patch 1094 BLAKE2B eabc93d2bb383b1146c15c8b0bdff5979e172a5190a9c755071f1be66a662f89ce6f92c230a0df14ec5ca1958ac53326624e16c54457d83296a0b117047ac22a SHA512 5ee06df94028fc7bbd70fae718aab544f562a1a4d2cf380c282a24db33cdef1bea7224608c01e5ecb4a92cf1a709706342314918f36c0b6f65f5861c872fe499
-AUX vdr-2.4.7_gcc11.patch 1159 BLAKE2B 789345c32b5658d65736552ca25dd98d0f3047284c0b528ce8443fa8a20cfa01d44425c601800833b9f3cba5f798b5393708165618322475e284d32221932c5a SHA512 4a74e7126619678497d952b1adf1d3aa9989207b69cbdbea0dc6c899a3cd90f88f438200b3fc058d6e9f6fc550c59f48cddeedfbe7cd61936b19b619486f944b
 AUX vdr-2.4_remove_plugins.patch 876 BLAKE2B 27f36cd30e11ec85f8c91d0b4da77d2a6a94d23d4801dc8dea70dbd617e12a6e0968ad96624688b7ad1463dcc3676ccbccd85e29c7b556b5e989191fb020df2d SHA512 eb5da3977d5a55dfac8871bf638ad320bf03e84c6c667f098f6f39f71beecd861fd5ae8b898ad835b8441ce8bb9dcb82005ba0b0e1b785ac156e478b222515a9
 AUX vdr-2.6.1-patch-for-permashift.patch 18981 BLAKE2B 01da7d33401a7d73b37f30e5359a4db695345e24a4eda9dda0c5d1c1bb70cf43c2954f136cd96d37d619707f2a74dfb8960b3346d644ab89ac9720b1eb0da4c3 SHA512 71eb63ff475723fb75a7b35fbfff43728baee4d2a665dd6516c2c4be0bedb5b1744d0653c79d679a38b376cb80627aa05605e469bfab0e0b4a65644136425ec7
 AUX vdr-2.6.1_naludump.patch 19594 BLAKE2B 012b92b265c0721ae7baf0f193c9b50fe3bee1e0fd8396e79e05deebef05a34acc5c7eb9ecad225f084449799c8e04a8285b41aa6cac5b24d582e4797dc60888 SHA512 3482d7d921c4b73f12426538cab6d7923d5ca3013efa9d16998bb48bd75557ace04af683401fc93b7c77bf4d619f4ded74f7f4568acdceb0406de0472bef074a
 AUX vdr-2.6.1_pinplugin.patch 19274 BLAKE2B 19cc70e16f956087ace9a52d646c7003abba0be5894b05314e96880114f07584309756a4102bf8569c6612c21037ae1a4ec45fbcc91b6e2df42d89e4febfc0c7 SHA512 d5e875f8f51c4f946b9f305a36d15b760720b0495c6abaf6c2fbab4d200799741088026e9edb83458cc75cabc390a72173f33620010aedc4eaf22ed1a3d57973
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
-DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175 SHA512 d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
-DIST vdr-2.4-patch-for-permashift.diff.bz2 5298 BLAKE2B ebd00ba1c66783f97f5a6cc757cc9be6d937bd460f46b1880eec8b86ead1a5673a25ab64b733b8030e1c9a94123af28a5d6383905da265c67b2a945ba2c06c33 SHA512 3ba1968d2710061627e2a3b320e24ffeb08be6d8a7e71ed0c6732ebe6ed02d25f3a8afff524a6185ad0025d187ed9c7b259a9fb63dcf0c91e3fd2a079b5ef9d3
-DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f SHA512 9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759
-DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f SHA512 d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12
-DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882 SHA512 14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
-DIST vdr-2.4.7.tbz2 919632 BLAKE2B be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab SHA512 41b8453bc6cdbb0db728b5d7d6624ab3ff9034b58ba443a8196f5fcc9fa78d18698cc91905890244e69d482ffc493374e6da2c97baed95fe742b888bdc63e42b
 DIST vdr-2.6.1.tbz2 937103 BLAKE2B d8bbf8cb74f79c328ba7a367cd120d9472be667def851fbdff2f2fda3addbf33ae1f0ab0f20dc0ea6b3a03667e36164a5acf5a17cff8f7934c15f4e61b3a8db2 SHA512 235ffd1654d8f13ba658533bfa5db9c9669e93106a63a770297997f9b8342807f270f26e7a6f5a3c127cd9f760bb94ae77f884dcad42a500615c28e1cf3fd92f
 DIST vdr-2.6.1_ttxtsubs_v2.patch 40549 BLAKE2B 525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f SHA512 590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
+DIST vdr-2.6.3.tbz2 943867 BLAKE2B 48dd2f19125dc60b68d835d3da457b4e2377b7b8ca31b9e1849b9f5ebe29391ed51c9460ec8efc9bdd349adba6d39a2b17f4a3e8f23bea3964b15bcbd9618ec9 SHA512 d84ca2cd797c80134a28cebc28172f45081d4f9580122f823dde396d106a15fa88d5f040252b8ee7caa7d44fa6f1cfba37a13c6a36ecd3fd2734b0140f7c438c
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
-EBUILD vdr-2.2.0-r6.ebuild 8172 BLAKE2B e6823542e56a5ae3bd4cb5d61840522b25ba9c0d1cb600b8a035a5e79f19c530e478751634130199aff157a8d32adc9b154b3d67d863eb54bfc0a8a4dcde8ed6 SHA512 f67d2c299f7e45cb398294735bdaf6fe2c23b06900aad8b9520bd7bab426cffff99d5be2861dfd0a9ac85215324c52b8a4130fd2b4ae6597c3d459f2c179fe3f
 EBUILD vdr-2.2.0-r7.ebuild 8240 BLAKE2B 4ce894b7b579a3d2d9e6c0d3f30b8aac6600479152f2d0d7377d7ae829b35d98ecf7b269a1889084d1cd2c09ece2dbf6c372607d944978e37e11dc2717c3efd4 SHA512 7bed97818724be9f25ebafe1e1256ec0b683ad908306eaceea32a47efaea6b1d5ac5ca43163587d0de7158691b63d61fc88a23ca3a79bb53356f6255f35c4f4f
-EBUILD vdr-2.4.7-r1.ebuild 6171 BLAKE2B 92c996b62c17c3496befa2698023749d89d8599ea2e9cc2eeb03f2c989cd531075bb7c89b19dd16ebf4f7f33bf3e9c5914f6cf40bddf6aebf23db8b101e934db SHA512 46e7e9ea9aee587428ee639ddc280f00685375bad4de92368637583ef855566a7215eedc6b8b95ce67bc3543943cbd36699ec2cf6f422b546a40681053f84323
 EBUILD vdr-2.6.1.ebuild 5514 BLAKE2B 7d9006b725d1ebde1aa139cc36adeeba1e4836d602dabe528ba089c3238c22b6acb1b800460ed4055626fa712bb5b66032b318fe066dae32fdd389f7aeb104c6 SHA512 72b36b33c9a6120c9df2fce4c7572ee6ffe58266cfcd77b607449d8655c154c47825915568b744151778dbf8aa3b0f49f05ac8b736b3054c007edd81e91b4df0
+EBUILD vdr-2.6.3.ebuild 5544 BLAKE2B d5b98347b1234db840c677b55d719c55da1c4ad108fc5d3426bfc2d360ffa1d32893d04b156a8446e6447dc57b7666d88dcd751e690bbb98e32eed7b7bd04fc0 SHA512 8a49e6dd7eabeefa50e0b44bf1da562e8d3a557def432acf73cf78cbff0dd6b225a97a476524119405ea284d005fdbebb588a871359276b1a73224d44c097ab9
 MISC metadata.xml 1780 BLAKE2B 179a1948c96a7b237b500a08861799c25ae084d5b9cd6702921acd04cfbf0111bbb11170e4d14bf31ad7355ef0899f285857350131badc411548a3611593ecb6 SHA512 6c8c2073c55f327d4dfe52cb22ae1622d936c43503caf2964594656e1281b07110187c139216a73ed10abd625b43509ecdfe41edb7439950653e038991abfb31
diff --git a/media-video/vdr/files/vdr-2.4.7_gcc11.patch b/media-video/vdr/files/vdr-2.4.7_gcc11.patch
deleted file mode 100644
index 1e37b2f0010c..000000000000
--- a/media-video/vdr/files/vdr-2.4.7_gcc11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix compile with gcc-11, officially from kls
-
-Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
-
---- a/tools.h     2021/01/19 20:38:28     5.3
-+++ b/tools.h     2021/05/05 15:16:45
-@@ -53,17 +53,15 @@
-
- // In case some plugin needs to use the STL and gets an error message regarding one
- // of these functions, you can #define DISABLE_TEMPLATES_COLLIDING_WITH_STL before
--// including tools.h.
--#if !defined(__STL_CONFIG_H) // for old versions of the STL
--#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL) && !defined(_STL_ALGOBASE_H)
-+// including any VDR header files.
-+#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL)
- template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
- template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
- #endif
- template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
--#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL) && !defined(_MOVE_H)
-+#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL)
- template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
- #endif
--#endif
-
- template<class T> inline T constrain(T v, T l, T h) { return v < l ? l : v > h ? h : v; }
diff --git a/media-video/vdr/vdr-2.2.0-r6.ebuild b/media-video/vdr/vdr-2.2.0-r6.ebuild
deleted file mode 100644
index 372355cbe09d..000000000000
--- a/media-video/vdr/vdr-2.2.0-r6.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic strip-linguas toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
-				mainmenuhooks menuorg menuselection resumereset ttxtsubs"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-	mirror://gentoo/${EXT_P}.patch.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-COMMON_DEPEND="
-	virtual/jpeg:*
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-2.7
-	media-fonts/corefonts
-	bidi? ( dev-libs/fribidi )
-	systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX AR
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg | tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config || die "cannot write to Make.config"
-
-		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot write to defines.tmp"
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE || die "cannot write to defines.tmp"
-		export DEFINES_IUSE=$( cat "${T}"/defines.IUSE )
-	done
-}
-
-extensions_add_make_conf() {
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/d' \
-		Make.config.template >> Make.config || die "cannot write to Make.config"
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]' || die "error in function extensions_all_defines"
-}
-
-lang_po() {
-	LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_configure() {
-	# support languages, written from right to left
-	export "BIDI=$(usex bidi 1 0)"
-	# systemd notification support
-	export "SDNOTIFY=$(usex systemd 1 0)"
-	# with/without keyboard
-	export "USE_KBD=$(usex keyboard 1 0)"
-}
-
-src_prepare() {
-	# apply maintenance-patches
-	ebegin "Changing paths for gentoo"
-
-	local DVBDIR="/usr/include"
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR="${i}"
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or too old for ${P}"
-		eerror "You cannot compile VDR against old dvb-header"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT || die "cannot write to Make.config"
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-
-	EOT
-	eend 0
-
-	# wrt bug 586070
-	if has_version ">=sys-apps/systemd-230"; then
-		sed -e "s:libsystemd-daemon:libsystemd:g" -i Makefile || die "sed libsystemd failed"
-	fi
-
-	if ! use vanilla; then
-
-		# Now apply extensions patch
-		eapply "${WORKDIR}/${EXT_P}.patch"
-		sed -e 's/PERMASHIFT_V1/PERMASHIFT/g' -i "${S}"/*.[ch] "${S}"/Make.config* || die "sed failed"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# we do not support these patches
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing"
-
-			extensions_all_defines > "${T}"/new.IUSE || die "cannot write to new.IUSE"
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE || die "cannot write to old.IUSE"
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS are up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		eend 0
-
-		extensions_add_make_conf
-
-		# add defined use-flags compile options to vdr.pc
-		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile || die "sed fails on Makefile"
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		eapply "${FILESDIR}/${P}_gcc7extpng.patch"
-	fi
-
-	eapply "${FILESDIR}/${P}_gentoo.patch"
-	eapply "${FILESDIR}/${P}_unsignedtosigned.patch"
-	eapply "${FILESDIR}/${P}_glibc-2.24.patch"
-	eapply "${FILESDIR}/${P}-jpeg-9c.patch"
-	eapply "${FILESDIR}/${P}_glibc-2.31.patch"
-
-	# fix some makefile issues
-	sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \
-		-e "s:ifdef BIDI:ifeq (\$(BIDI),1):" \
-		-e "s:ifdef SDNOTIFY:ifeq (\$(SDNOTIFY),1):" \
-		-i "${S}"/Makefile || die "sed fails on Makefile"
-
-	eapply_user
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t You will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install \
-	VIDEODIR="/" \
-	DESTDIR="${ED}" install
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	# backup for plugins they don't be able to create this dir
-	keepdir "${CONF_DIR}"/plugins
-
-	if use html; then
-		local HTML_DOCS=( *.html )
-	fi
-
-	local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS )
-
-	einstalldocs
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	chown -R vdr:vdr "${ED}/${CONF_DIR}" || die "chown failed"
-}
-
-pkg_postinst() {
-
-	elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n"
-	elog "\tA lot of thanks to Klaus Schmidinger"
-	elog "\tfor this nice piece of Software...\n"
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild b/media-video/vdr/vdr-2.4.7-r1.ebuild
deleted file mode 100644
index a7db9e18f489..000000000000
--- a/media-video/vdr/vdr-2.4.7-r1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic strip-linguas toolchain-funcs
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> ${P}.tbz2
-	mainmenuhooks? ( http://vdr.websitec.de/download/${PN}/${PN}-2.4.1/${PN}-2.4.1_mainmenuhook-1.0.1.patch.bz2 )
-	menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff )
-	naludump? ( https://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
-	pinplugin? ( http://vdr.websitec.de/download/${PN}/vdr-2.4.6/${PN}-2.4.6_pinplugin.patch.bz2 )
-	ttxtsubs? ( http://vdr.websitec.de/download/${PN}/vdr-2.4.6/${PN}-2.4.6_ttxtsubs_v2.patch.bz2 )
-	permashift? ( http://vdr.websitec.de/download/${PN}/vdr-2.4.6/vdr-2.4-patch-for-permashift.diff.bz2 )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose"
-
-COMMON_DEPEND="
-	virtual/jpeg:*
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	media-tv/gentoo-vdr-scripts
-	media-fonts/corefonts
-	bidi? ( dev-libs/fribidi )
-	systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
-
-REQUIRED_USE="pinplugin? ( !mainmenuhooks )
-	permashift? ( !naludump !pinplugin )"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	# use the corrected DIR /var/lib/vdr/* for acct/{user,group) handling
-	if has_version ">=media-tv/gentoo-vdr-scripts-3.0_rc1"; then
-		VIDEO_DIR="/var/lib/vdr/video"
-	else
-		VIDEO_DIR="/var/vdr/video"
-	fi
-
-	tc-export CC CXX AR
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-lang_po() {
-	LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_configure() {
-	# support languages, written from right to left
-	export "BIDI=$(usex bidi 1 0)"
-	# systemd notification support
-	export "SDNOTIFY=$(usex systemd 1 0)"
-	# with/without keyboard
-	export "USE_KBD=$(usex keyboard 1 0)"
-	# detailed compile output for debug
-	export "VERBOSE=$(usex verbose 1 0)"
-}
-
-src_prepare() {
-	# apply maintenance-patches
-	ebegin "Changing paths for gentoo"
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or too old for ${P}"
-		eerror "You cannot compile VDR against old dvb-header"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT || die "cannot write to Make.config"
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		ARGSDIR			= \$(CONFDIR)/conf.d
-		VIDEODIR		= ${VIDEO_DIR}
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-
-	EOT
-	eend 0
-
-	eapply "${FILESDIR}/${PN}-2.4.6_gentoo.patch"
-	use demoplugins || eapply "${FILESDIR}/vdr-2.4_remove_plugins.patch"
-	eapply "${FILESDIR}/${PN}-2.4.6_makefile-variables.patch"
-
-	# fix clang/LLVM compile
-	eapply "${FILESDIR}/${PN}-2.4.6_clang.patch"
-
-	# fix gcc-11 compile
-	eapply "${FILESDIR}/${P}_gcc11.patch"
-
-	use naludump && eapply "${DISTDIR}/${PN}-2.1.5-naludump-0.1.diff"
-	use permashift && eapply "${WORKDIR}/${PN}-2.4-patch-for-permashift.diff"
-	use pinplugin && eapply "${WORKDIR}/${PN}-2.4.6_pinplugin.patch"
-	use ttxtsubs && eapply "${WORKDIR}/${PN}-2.4.6_ttxtsubs_v2.patch"
-	use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff"
-	use mainmenuhooks && eapply "${WORKDIR}/${PN}-2.4.1_mainmenuhook-1.0.1.patch"
-
-	add_cap CAP_UTF8 \
-		CAP_IRCTRL_RUNTIME_PARAM \
-		CAP_VFAT_RUNTIME_PARAM \
-		CAP_CHUID \
-		CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}" || die "cannot write to CAP_FILE"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t You will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-
-	default
-}
-
-src_install() {
-	# trick the makefile to not create a VIDEODIR by supplying it with an
-	# existing directory
-	emake VIDEODIR="/" DESTDIR="${ED}" install
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	# backup for plugins they don't be able to create this dir
-	keepdir "${CONF_DIR}/plugins"
-
-	if use html; then
-		local HTML_DOCS=( *.html )
-	fi
-	local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS UPDATE-2* )
-	einstalldocs
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	fowners vdr:vdr "${CONF_DIR}" -R
-}
-
-pkg_postinst() {
-	elog "Please read the /usr/share/doc/${PF}/UPDATE-2.4"
-	elog "for major changes in this version\n"
-
-	elog "It is a good idea to run vdrplugin-rebuild now.\n"
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup\n"
-
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.6.3.ebuild b/media-video/vdr/vdr-2.6.3.ebuild
new file mode 100644
index 000000000000..dc7302616595
--- /dev/null
+++ b/media-video/vdr/vdr-2.6.3.ebuild
@@ -0,0 +1,199 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic strip-linguas toolchain-funcs user-info
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> ${P}.tbz2
+	menuorg? ( https://github.com/vdr-projects/vdr-plugin-menuorg/raw/master/vdr-patch/vdr-menuorg-2.3.x.diff )
+	ttxtsubs? ( https://md11.it.cx/download/${PN}/${PN}-2.6.1_ttxtsubs_v2.patch )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose"
+
+COMMON_DEPEND="
+	acct-group/vdr
+	acct-user/vdr
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libjpeg-turbo:=
+	sys-libs/libcap"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/linuxtv-dvb-headers-5.3"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	media-tv/gentoo-vdr-scripts
+	media-fonts/corefonts
+	bidi? ( dev-libs/fribidi )
+	systemd? ( sys-apps/systemd )"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="permashift? ( !naludump !pinplugin )"
+
+CONF_DIR="/etc/vdr"
+CAP_FILE="${S}/capabilities.sh"
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+	use debug && append-flags -g
+
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+	VIDEO_DIR="$(egethome vdr)/video"
+
+	tc-export CC CXX AR
+}
+
+add_cap() {
+	local arg
+	for arg; do
+		CAPS="${CAPS}\n${arg}=1"
+	done
+}
+
+lang_po() {
+	LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_prepare() {
+	# apply maintenance-patches
+	ebegin "Changing paths for gentoo"
+
+	local DVBDIR=/usr/include
+	local i
+	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+		[[ -d ${i} ]] || continue
+		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+			einfo "Found DVB header files in ${i}"
+			DVBDIR=${i}
+			break
+		fi
+	done
+
+	# checking for s2api headers
+	local api_version
+	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+	if [[ ${api_version:-0} -lt 5*3 ]]; then
+		eerror "DVB header files do not contain s2api support or too old for ${P}"
+		eerror "You cannot compile VDR against old dvb-header"
+		die "DVB headers too old"
+	fi
+
+	cat > Make.config <<-EOT || die "cannot write to Make.config"
+		#
+		# Generated by ebuild ${PF}
+		#
+		PREFIX			= /usr
+		DVBDIR			= ${DVBDIR}
+		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
+		CONFDIR			= ${CONF_DIR}
+		ARGSDIR			= \$(CONFDIR)/conf.d
+		VIDEODIR		= ${VIDEO_DIR}
+		LOCDIR			= \$(PREFIX)/share/locale
+		INCDIR			= \$(PREFIX)/include
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+		INCLUDES		+= -I\$(DVBDIR)
+
+		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
+		LIBDIR			= ${PLUGIN_LIBDIR}
+		PCDIR			= /usr/$(get_libdir)/pkgconfig
+
+	EOT
+	eend 0
+
+	eapply "${FILESDIR}/${PN}-2.4.6_gentoo.patch"
+	use demoplugins || eapply "${FILESDIR}/vdr-2.4_remove_plugins.patch"
+	eapply "${FILESDIR}/${PN}-2.4.6_makefile-variables.patch"
+
+	# fix clang/LLVM compile
+	eapply "${FILESDIR}/${PN}-2.4.6_clang.patch"
+
+	use naludump && eapply "${FILESDIR}/${PN}-2.6.1_naludump.patch"
+	use permashift && eapply "${FILESDIR}/${PN}-2.6.1-patch-for-permashift.patch"
+	use pinplugin && eapply "${FILESDIR}/${PN}-2.6.1_pinplugin.patch"
+	use ttxtsubs && eapply "${DISTDIR}/vdr-2.6.1_ttxtsubs_v2.patch"
+	use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff"
+	use mainmenuhooks && eapply "${FILESDIR}/${PN}-2.4.1_mainmenuhook-1.0.1.patch"
+
+	add_cap CAP_UTF8 \
+		CAP_IRCTRL_RUNTIME_PARAM \
+		CAP_VFAT_RUNTIME_PARAM \
+		CAP_CHUID \
+		CAP_SHUTDOWN_AUTO_RETRY
+
+	echo -e ${CAPS} > "${CAP_FILE}" || die "cannot write to CAP_FILE"
+
+	# LINGUAS support
+	einfo "\n \t VDR supports the LINGUAS values"
+
+	lang_po
+
+	einfo "\t Please set one of this values in your sytem make.conf"
+	einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+	if [[ -z ${LINGUAS} ]]; then
+		einfo "\n \t No values in LINGUAS="
+		einfo "\t You will get only english text on OSD \n"
+	fi
+
+	strip-linguas ${LING_PO} en
+
+	default
+}
+
+src_configure() {
+	# support languages, written from right to left
+	export "BIDI=$(usex bidi 1 0)"
+	# systemd notification support
+	export "SDNOTIFY=$(usex systemd 1 0)"
+	# with/without keyboard
+	export "USE_KBD=$(usex keyboard 1 0)"
+	# detailed compile output for debug
+	export "VERBOSE=$(usex verbose 1 0)"
+}
+
+src_install() {
+	# trick the makefile to not create a VIDEODIR by supplying it with an
+	# existing directory
+	emake VIDEODIR="/" DESTDIR="${ED}" install
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	# backup for plugins they don't be able to create this dir
+	keepdir "${CONF_DIR}/plugins"
+
+	if use html; then
+		local HTML_DOCS=( *.html )
+	fi
+	local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS UPDATE-2* )
+	einstalldocs
+
+	insinto /usr/share/vdr
+	doins "${CAP_FILE}"
+
+	fowners vdr:vdr "${CONF_DIR}" -R
+}
+
+pkg_postinst() {
+	elog "Please read the /usr/share/doc/${PF}/UPDATE-2.4"
+	elog "for major changes in this version\n"
+
+	elog "It is a good idea to run vdrplugin-rebuild now.\n"
+
+	elog "To get nice symbols in OSD we recommend to install"
+	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+	elog "\t2. select font VDRSymbolsSans in Setup\n"
+
+	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+	elog "\thttps://wiki.gentoo.org/wiki/VDR"
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 005ba19d28d2..5e7fc9ab98f6 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 992a2f81d359..4c738ae21489 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 09 Jan 2023 11:39:36 +0000
+Mon, 09 Jan 2023 17:39:41 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 3d9e0ac023db..ed6958227f33 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 538785 BLAKE2B a42e589b6c2be5ab4486b79822a326a12b3725dbc28e32cbb116cd453b6899511ab2026524f136171407f678f9acafd852f1a2a245b8caed5bad581d2eb86337 SHA512 8ff81ddfe9cd2569ab4fe6eabe9daf23f1f66918aba5cae55ff8241b2bb330fac90cb5595df81455bfa98b51ed1c6e965c73508fe1b662e752525e3e27b52956
-TIMESTAMP 2023-01-09T11:39:39Z
+TIMESTAMP 2023-01-09T17:39:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO7/PtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO8UWBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCn1Q//QyXMJnuYMaDiQQ7qDtSQPK3qkaXf1B9EP9b784pP8VLNwHNMHVVtpEd+
-WU0NCWuve2/E3FFhlH2aptnM5CJaqWOcRJotFEk60QVkEPZVFPDWpX1aAy0UQhiZ
-THxBFC6UGHPAKuSxed4EdFIT9Ju8ttLzz7Hjj+sJoNpqj+Jwzpei6G1g5MvOzuhu
-0hnJaQnilBErqbt3TzirotnFwVJKsYsbwVfAearj3GCGRNOG/4RrvHDA1rn4fSEm
-hfDBXevsKvnCE/pn+de7NCPsapa5BWp7Hw8A0R18BXEIZj7GOhs/SlS91jmJkp/y
-9Ox01Ud6w+EeJp0Waos969v0rSl6gV1r/o+N7az1VUjN9OWZVKETUqJreYVlpOe2
-7zpDZjHD383+g7xiL1lyoXKgNZgJNtpOBhOkXvXQTmJpMoj5jhJ+bLl4JfcVuk0O
-lMJ9Fx50xpZALm+1iSFiEsrwqAQMQqsTy5Ehtatct+ThHnRF2x0vhtXtMrC1ojvE
-d7IqkEQ/xj+163C3RbV1UbH5VAzDVq6Crt7RheAOKlD086zIjavGOHEQ2+PMuf6E
-wpOcGRDg/wlhoLerCOsR/05KfUC1C+CVfS5bMGiv0eWTOTt71qRXtjzpDCsNhxzc
-1IKpR1chxK9lgf/oi10ZBVk1RQ4Ky90VpViZuj8KD1KV+3X3KYY=
-=wmby
+klCuUhAAohw1WfzYzFSAlRVUdTudlN97NSZPcARgDV5PglbjD4LCU+rI4oSsJUXg
+7magp9xTqEpW4b0DVQ3E1dso5V8x1IWFig3uYx09Jt3mw4dZrpX+UWqFygfddK5D
+lGfTz3YtHDjdszPspNUtBrMagnqjXTEbG0GHSE/sAN3Nt0/A7f7eVYPnGdOuDqsh
+yyt/ItUwldb0Ijc4xLknQfbR44Y2m4f5e6fH1Nz/bXodA0rtDMDth67NYXSb/oZn
+WuiJ6oxLfEecM/MREQ4bKZcbDgSRNHi8wiXRZGyigrVq8m6sletq0T5XWf8qyFvi
+N3nsOqYxET8jd+CogT9ZPQoeel4ipHQzC2bsQsv9glT1u5kOXlPwSlYC1iYhq2mx
+3jahgkywaS+Ep4GEFhGuKrXyIFaspHbnOw1XQP1t9fLEuQp+S1D9Isoq/gRWZSJF
+NdCns0BRnQvk6nGfFcGHhRhKJl+GtCrVP/2Phvi/ymelEGMUTnZgUMSeiW9Kjb3Q
+RWLMq7HveEq1NkyvAAI8qrnd23wG/hCaZnhsDz7H+IkasYeTdNgZdtZ838hoYLGs
+LHDQQRpTgILccnRUO7uyX+zwngbvuIW2dw+RAd0BQ4odAgDkeg1UsYeAjq+I2DHS
+bz6r+2+5InivBl09eSvyYHZwy0A17UvU+8fgagQk7PlN+xEtAus=
+=1vAH
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 992a2f81d359..4c738ae21489 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 09 Jan 2023 11:39:36 +0000
+Mon, 09 Jan 2023 17:39:41 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index ae671897ecaa..ddebdc8ab33f 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 3f8bfc11cd81..08da49ff4105 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/mkstage4-0.4 b/metadata/md5-cache/app-backup/mkstage4-0.4
new file mode 100644
index 000000000000..ba80063067aa
--- /dev/null
+++ b/metadata/md5-cache/app-backup/mkstage4-0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install test
+DEPEND=test? ( dev-util/bats )
+DESCRIPTION=Bash Utility for Creating Stage 4 Tarballs
+EAPI=8
+HOMEPAGE=https://github.com/TheChymera/mkstage4
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=app-shells/bash app-arch/tar
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/TheChymera/mkstage4/archive/0.4.tar.gz -> mkstage4-0.4.tar.gz
+_md5_=71de97dcbb6d83c782ba4160a5e07bb3
diff --git a/metadata/md5-cache/app-backup/mkstage4-9999 b/metadata/md5-cache/app-backup/mkstage4-9999
index 04a71954c1af..9f4312b72e36 100644
--- a/metadata/md5-cache/app-backup/mkstage4-9999
+++ b/metadata/md5-cache/app-backup/mkstage4-9999
@@ -1,7 +1,7 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install unpack
 DESCRIPTION=Bash Utility for Creating Stage 4 Tarballs
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/TheChymera/mkstage4
 INHERIT=git-r3
 LICENSE=GPL-3
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=app-shells/bash app-arch/tar
 SLOT=0
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f
-_md5_=37005543788ab15050f5ebd9e3bbc5ea
+_md5_=ff85a7f26042779d902a5c2f9194004b
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 502b4bc6c053..2b92cbf4e04d 100644
Binary files a/metadata/md5-cache/app-containers/Manifest.gz and b/metadata/md5-cache/app-containers/Manifest.gz differ
diff --git a/metadata/md5-cache/app-containers/lxd-5.0.1-r3 b/metadata/md5-cache/app-containers/lxd-5.0.1-r3
deleted file mode 100644
index bde280c194ab..000000000000
--- a/metadata/md5-cache/app-containers/lxd-5.0.1-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/go nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-linuxcontainers ) >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=acct-group/lxd app-arch/xz-utils >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)] dev-db/sqlite:3 dev-libs/dqlite:= dev-libs/lzo dev-libs/raft[lz4] >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6(+)?] sys-libs/libcap virtual/udev
-DESCRIPTION=Modern, secure and powerful system container and virtual machine manager
-EAPI=8
-HOMEPAGE=https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd
-INHERIT=bash-completion-r1 go-module linux-info optfeature systemd verify-sig
-IUSE=apparmor ipv6 nls verify-sig
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=acct-group/lxd app-arch/xz-utils >=app-containers/lxc-3.0.0[apparmor?,seccomp(+)] dev-db/sqlite:3 dev-libs/dqlite:= dev-libs/lzo dev-libs/raft[lz4] >=dev-util/xdelta-3.0[lzma(+)] net-dns/dnsmasq[dhcp,ipv6(+)?] sys-libs/libcap virtual/udev net-firewall/ebtables net-firewall/iptables[ipv6(+)?] sys-apps/iproute2[ipv6(+)?] sys-fs/fuse:* >=sys-fs/lxcfs-5.0.0 sys-fs/squashfs-tools[lzma] virtual/acl
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-5.0.1.tar.gz https://github.com/lxc/lxd/commit/d55a590ea50a75c3cb2ea67894be8253074d6093.patch -> lxd-5.0.2-move-shellcheck-version-call-into-static-analysis.patch https://patch-diff.githubusercontent.com/raw/lxc/lxd/pull/11011.patch -> lxd-5.8-add-tcp-keepalives-to-exec-channels.patch verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-5.0.1.tar.gz.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	4c4b34f361efda91762ffeda8f632c02	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=14f39cfcf5901e147bdaa0f66da9acdf
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 73bf097f451e..38ead3a1e5f4 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2 b/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2
index 12f1efaf57cf..7828c47948c8 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] )
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
 INHERIT=distutils-r1 prefix
-IUSE=ipv6 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=ipv6 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)?] >=dev-python/ssl-fetch-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)?] >=dev-python/ssl-fetch-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.6.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=95e82ada46fbea6c6c8bf99ba70644f4
+_md5_=49c90be29c180b1111b3315ab59a27ac
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.3.0-r1 b/metadata/md5-cache/app-portage/mirrorselect-2.3.0-r1
index 1dd011e87042..b54ed14f6304 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.3.0-r1
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.3.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] )
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
 INHERIT=distutils-r1 prefix
-IUSE=ipv6 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=ipv6 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)?] >=dev-python/ssl-fetch-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)?] >=dev-python/ssl-fetch-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.3.0.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=186f78efc83ac24bfd3e4d5d282dff16
+_md5_=9f9000ca703b065002a4dbbe41e26413
diff --git a/metadata/md5-cache/app-portage/mirrorselect-9999 b/metadata/md5-cache/app-portage/mirrorselect-9999
index 4d3f42f43f8a..b693826826c1 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-9999
+++ b/metadata/md5-cache/app-portage/mirrorselect-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
 INHERIT=distutils-r1 git-r3 prefix
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)] ~dev-python/ssl-fetch-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)] ~dev-python/ssl-fetch-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=2a672ff5e81111b336c4b0c82d8c5b5e
+_md5_=5911d9a7e36645079fad1a93dd6b2d81
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 2272e727472b..ade50e7ace53 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/mujs-1.2.0 b/metadata/md5-cache/dev-lang/mujs-1.2.0
deleted file mode 100644
index 9416d1be9a4c..000000000000
--- a/metadata/md5-cache/dev-lang/mujs-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/readline:=
-DESCRIPTION=An embeddable JavaScript interpreter written in C
-EAPI=8
-HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs
-INHERIT=flag-o-matic multilib toolchain-funcs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
-LICENSE=ISC
-RDEPEND=sys-libs/readline:=
-SLOT=0/1.2.0
-SRC_URI=https://mujs.com/downloads/mujs-1.2.0.tar.xz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=381c0048fd4589604239a05ec45d79d3
diff --git a/metadata/md5-cache/dev-lang/mujs-1.3.0 b/metadata/md5-cache/dev-lang/mujs-1.3.0
deleted file mode 100644
index df67143dcdb4..000000000000
--- a/metadata/md5-cache/dev-lang/mujs-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/readline:=
-DESCRIPTION=An embeddable JavaScript interpreter written in C
-EAPI=8
-HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs
-INHERIT=flag-o-matic multilib toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
-LICENSE=ISC
-RDEPEND=sys-libs/readline:=
-SLOT=0/1.3.0
-SRC_URI=https://mujs.com/downloads/mujs-1.3.0.tar.gz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6ccb6057ad6658978bf40fc793c4ac38
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a9bbaa7de4ae..88b98760cbda 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/dqlite-1.11.1 b/metadata/md5-cache/dev-libs/dqlite-1.11.1
deleted file mode 100644
index a93f4000939f..000000000000
--- a/metadata/md5-cache/dev-libs/dqlite-1.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-db/sqlite:3 dev-libs/libuv:= >=dev-libs/raft-0.14.0 test? ( >=dev-libs/raft-0.13.0[lz4,test] )
-DESCRIPTION=Embeddable, replicated and fault tolerant SQL engine
-EAPI=8
-HOMEPAGE=https://dqlite.io/ https://github.com/canonical/dqlite
-INHERIT=autotools
-IUSE=test
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=LGPL-3-with-linking-exception
-RDEPEND=dev-db/sqlite:3 dev-libs/libuv:= >=dev-libs/raft-0.14.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/canonical/dqlite/archive/v1.11.1.tar.gz -> dqlite-1.11.1.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b31d9391e4e97f87ff9d2030f0a1731f
diff --git a/metadata/md5-cache/dev-libs/raft-0.15.0 b/metadata/md5-cache/dev-libs/raft-0.15.0
deleted file mode 100644
index 15b054e59e1e..000000000000
--- a/metadata/md5-cache/dev-libs/raft-0.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libuv:= lz4? ( app-arch/lz4:= )
-DESCRIPTION=C implementation of the Raft consensus protocol
-EAPI=8
-HOMEPAGE=https://github.com/canonical/raft
-INHERIT=autotools
-IUSE=lz4 test zfs
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=LGPL-3-with-linking-exception
-RDEPEND=dev-libs/libuv:= lz4? ( app-arch/lz4:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/canonical/raft/archive/v0.15.0.tar.gz -> raft-0.15.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=61c61e7790ee042e4c8c9caa96f77fc1
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 0c725ce95b5a..eced713bfcde 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/pydecomp-0.3-r3 b/metadata/md5-cache/dev-python/pydecomp-0.3-r3
index 3a1958759d0a..b11c5077b0c2 100644
--- a/metadata/md5-cache/dev-python/pydecomp-0.3-r3
+++ b/metadata/md5-cache/dev-python/pydecomp-0.3-r3
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A python library of common (de)compression and contents handling
 EAPI=8
 HOMEPAGE=https://github.com/dol-sen/pyDeComp
 INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/pydecomp/pyDeComp-0.3.tar.gz -> pydecomp-0.3.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=d3cd3ea8d1f07d5840cbc2ef59c1652b
+_md5_=6fe0031c8bfc85e3e3bd908f7af13faf
diff --git a/metadata/md5-cache/dev-python/pydecomp-9999 b/metadata/md5-cache/dev-python/pydecomp-9999
index 48cc8dafd97d..a947d1e7f6e3 100644
--- a/metadata/md5-cache/dev-python/pydecomp-9999
+++ b/metadata/md5-cache/dev-python/pydecomp-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A python library of common (de)compression and contents handling
 EAPI=8
 HOMEPAGE=https://github.com/dol-sen/pyDeComp
 INHERIT=distutils-r1 git-r3
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ebd747b9dd6d4a08f41db6483483a40b
+_md5_=1a8bc912432132e39ed0b0213eb0ccab
diff --git a/metadata/md5-cache/dev-python/pynvim-0.4.3-r1 b/metadata/md5-cache/dev-python/pynvim-0.4.3-r1
index b256e3b48001..a44f063376b1 100644
--- a/metadata/md5-cache/dev-python/pynvim-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/pynvim-0.4.3-r1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( app-editors/neovim )
+DEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-editors/neovim )
 DESCRIPTION=Python client for Neovim
 EAPI=7
 HOMEPAGE=https://github.com/neovim/pynvim
 INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neovim/pynvim/archive/0.4.3.tar.gz -> pynvim-0.4.3.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=945d5fa4efd5fcc96ddad8dff08a5759
+_md5_=3cce0bf02d5b6a064880b0382e0b5e9a
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-0.4-r1 b/metadata/md5-cache/dev-python/ssl-fetch-0.4-r1
index e910017431f4..89a8b0f240e7 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-0.4-r1
+++ b/metadata/md5-cache/dev-python/ssl-fetch-0.4-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Small convenience library for fetching files securely
 EAPI=8
 HOMEPAGE=https://github.com/dol-sen/ssl-fetch
 INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2
-RDEPEND=>=dev-python/requests-1.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/requests-1.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/ssl-fetch/ssl-fetch-0.4.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f81f4c7c488709a42a7ad36456e9f1da
+_md5_=23c99d19efdcf47a29b4904fdacb09bc
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-9999 b/metadata/md5-cache/dev-python/ssl-fetch-9999
index 575fcfa15e79..d5053bbe2c3e 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-9999
+++ b/metadata/md5-cache/dev-python/ssl-fetch-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DESCRIPTION=Small convenience library for fetching files securely
 EAPI=8
 HOMEPAGE=https://github.com/dol-sen/ssl-fetch
 INHERIT=distutils-r1 git-r3
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=dev-python/requests-1.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/requests-1.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=316f4afb103a33c13bd07e9d511d0613
+_md5_=ad6a2ce201df2c7885628ca7bafa9959
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 79cb2469c794..db1d2c49fb6b 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/postfix-3.8_pre20221227 b/metadata/md5-cache/mail-mta/postfix-3.8_pre20221227
deleted file mode 100644
index 4180d30839e0..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.8_pre20221227
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=8
-HOMEPAGE=http://www.postfix.org/
-INHERIT=pam systemd toolchain-funcs
-IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.8-20221227.tar.gz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0fa3938a3b3aa19f5359393d0225f32e
diff --git a/metadata/md5-cache/mail-mta/postfix-3.8_pre20230108 b/metadata/md5-cache/mail-mta/postfix-3.8_pre20230108
new file mode 100644
index 000000000000..c8338abdd9a9
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.8_pre20230108
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=8
+HOMEPAGE=http://www.postfix.org/
+INHERIT=pam systemd toolchain-funcs
+IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=|| ( IBM EPL-2.0 )
+RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.8-20230108.tar.gz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=547b0b1b3a9448c54cde2c20857487a4
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 72b72bc09bec..cbf55706b8f0 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/entangle-3.0-r1 b/metadata/md5-cache/media-gfx/entangle-3.0-r1
deleted file mode 100644
index 43f815645211..000000000000
--- a/metadata/md5-cache/media-gfx/entangle-3.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/yelp-tools dev-lang/perl dev-util/glib-utils dev-util/gtk-doc dev-util/itstool sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-libs/glib-2.36:2 >=dev-libs/gobject-introspection-1.54.0 dev-libs/libgudev:= >=dev-libs/libpeas-1.2.0[gtk,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] >=media-libs/gexiv2-0.10[introspection] >=media-libs/libgphoto2-2.5.0:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/lcms:2 >=media-libs/libraw-0.9.0:= >=x11-libs/gdk-pixbuf-2.12.0:2 >=x11-libs/gtk+-3.22:3[introspection] >=x11-libs/libXext-1.3.0 >=x11-libs/pango-1.40.11 x11-themes/adwaita-icon-theme
-DESCRIPTION=Tethered Camera Control & Capture
-EAPI=7
-HOMEPAGE=https://entangle-photo.org/
-INHERIT=gnome2-utils meson python-single-r1 xdg-utils
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-libs/glib-2.36:2 >=dev-libs/gobject-introspection-1.54.0 dev-libs/libgudev:= >=dev-libs/libpeas-1.2.0[gtk,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] >=media-libs/gexiv2-0.10[introspection] >=media-libs/libgphoto2-2.5.0:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/lcms:2 >=media-libs/libraw-0.9.0:= >=x11-libs/gdk-pixbuf-2.12.0:2 >=x11-libs/gtk+-3.22:3[introspection] >=x11-libs/libXext-1.3.0 >=x11-libs/pango-1.40.11 x11-themes/adwaita-icon-theme
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://entangle-photo.org/download/sources/entangle-3.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c6c18ef12ff46e120f26a29dd080f48e
diff --git a/metadata/md5-cache/media-gfx/entangle-3.0-r2 b/metadata/md5-cache/media-gfx/entangle-3.0-r2
new file mode 100644
index 000000000000..7d2d36dac363
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/entangle-3.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=app-text/yelp-tools dev-lang/perl dev-util/glib-utils dev-util/gtk-doc dev-util/itstool sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-libs/glib-2.36:2 >=dev-libs/gobject-introspection-1.54.0 dev-libs/libgudev:= >=dev-libs/libpeas-1.2.0[gtk,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] >=media-libs/gexiv2-0.10[introspection] >=media-libs/libgphoto2-2.5.0:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/lcms:2 >=media-libs/libraw-0.9.0:= >=x11-libs/gdk-pixbuf-2.12.0:2 >=x11-libs/gtk+-3.22:3[X,introspection] >=x11-libs/libXext-1.3.0 >=x11-libs/pango-1.40.11 x11-themes/adwaita-icon-theme
+DESCRIPTION=Tethered Camera Control & Capture
+EAPI=7
+HOMEPAGE=https://entangle-photo.org/
+INHERIT=gnome2-utils meson python-single-r1 xdg-utils
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-libs/glib-2.36:2 >=dev-libs/gobject-introspection-1.54.0 dev-libs/libgudev:= >=dev-libs/libpeas-1.2.0[gtk,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] >=media-libs/gexiv2-0.10[introspection] >=media-libs/libgphoto2-2.5.0:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/lcms:2 >=media-libs/libraw-0.9.0:= >=x11-libs/gdk-pixbuf-2.12.0:2 >=x11-libs/gtk+-3.22:3[X,introspection] >=x11-libs/libXext-1.3.0 >=x11-libs/pango-1.40.11 x11-themes/adwaita-icon-theme
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://entangle-photo.org/download/sources/entangle-3.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=ab8e4a3a7b08238191a567f2859b0e82
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 5e8c2ebd4e76..7269aeaf553b 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/musescore-9999 b/metadata/md5-cache/media-sound/musescore-9999
index 000cc7ad404e..cf3adc9be41b 100644
--- a/metadata/md5-cache/media-sound/musescore-9999
+++ b/metadata/md5-cache/media-sound/musescore-9999
@@ -1,16 +1,18 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) omr? ( app-text/poppler ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) omr? ( app-text/poppler ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] )
 DESCRIPTION=WYSIWYG Music Score Typesetter
-EAPI=7
+EAPI=8
 HOMEPAGE=https://musescore.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake qmake-utils xdg check-reqs git-r3
-IUSE=alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine
+IUSE=alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz test webengine
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtnetworkauth:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024[X] dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) omr? ( app-text/poppler ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] )
 REQUIRED_USE=portmidi? ( portaudio )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5a004bc98c717e99df7f94063d7c036d
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=bd4320fc5220f472900bc54ff7297e90
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index d05c703745f5..bf52f2efb9b1 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/vdr-2.2.0-r6 b/metadata/md5-cache/media-video/vdr-2.2.0-r6
deleted file mode 100644
index 124c1ff942ca..000000000000
--- a/metadata/md5-cache/media-video/vdr-2.2.0-r6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 >=virtual/linuxtv-dvb-headers-5.3
-DESCRIPTION=Video Disk Recorder - turns a pc into a powerful set top box for DVB
-EAPI=7
-HOMEPAGE=http://www.tvdr.de/
-INHERIT=flag-o-matic strip-linguas toolchain-funcs
-IUSE=bidi debug keyboard html systemd vanilla alternatechannel graphtft naludump permashift pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 dev-lang/perl >=media-tv/gentoo-vdr-scripts-2.7 media-fonts/corefonts bidi? ( dev-libs/fribidi ) systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=ftp://ftp.tvdr.de/vdr/vdr-2.2.0.tar.bz2 mirror://gentoo/extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=22aa102c90a0a4b71cde40668a43e488
diff --git a/metadata/md5-cache/media-video/vdr-2.4.7-r1 b/metadata/md5-cache/media-video/vdr-2.4.7-r1
deleted file mode 100644
index 53dee3249c3c..000000000000
--- a/metadata/md5-cache/media-video/vdr-2.4.7-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 >=virtual/linuxtv-dvb-headers-5.3
-DESCRIPTION=Video Disk Recorder - turns a pc into a powerful set top box for DVB
-EAPI=7
-HOMEPAGE=http://www.tvdr.de/
-INHERIT=flag-o-matic strip-linguas toolchain-funcs
-IUSE=bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 dev-lang/perl media-tv/gentoo-vdr-scripts media-fonts/corefonts bidi? ( dev-libs/fribidi ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=pinplugin? ( !mainmenuhooks ) permashift? ( !naludump !pinplugin )
-SLOT=0
-SRC_URI=http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.4.7;sf=tbz2 -> vdr-2.4.7.tbz2 mainmenuhooks? ( http://vdr.websitec.de/download/vdr/vdr-2.4.1/vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 ) menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff ) naludump? ( https://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff ) pinplugin? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4.6_pinplugin.patch.bz2 ) ttxtsubs? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4.6_ttxtsubs_v2.patch.bz2 ) permashift? ( http://vdr.websitec.de/download/vdr/vdr-2.4.6/vdr-2.4-patch-for-permashift.diff.bz2 )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bfea6e0b301e72f8da8de7e31114057a
diff --git a/metadata/md5-cache/media-video/vdr-2.6.3 b/metadata/md5-cache/media-video/vdr-2.6.3
new file mode 100644
index 000000000000..47a539ffec1f
--- /dev/null
+++ b/metadata/md5-cache/media-video/vdr-2.6.3
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=acct-group/vdr acct-user/vdr media-libs/fontconfig media-libs/freetype media-libs/libjpeg-turbo:= sys-libs/libcap >=virtual/linuxtv-dvb-headers-5.3
+DESCRIPTION=Video Disk Recorder - turns a pc into a powerful set top box for DVB
+EAPI=8
+HOMEPAGE=http://www.tvdr.de/
+INHERIT=flag-o-matic strip-linguas toolchain-funcs user-info
+IUSE=bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=acct-group/vdr acct-user/vdr media-libs/fontconfig media-libs/freetype media-libs/libjpeg-turbo:= sys-libs/libcap dev-lang/perl media-tv/gentoo-vdr-scripts media-fonts/corefonts bidi? ( dev-libs/fribidi ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=permashift? ( !naludump !pinplugin )
+SLOT=0
+SRC_URI=http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.6.3;sf=tbz2 -> vdr-2.6.3.tbz2 menuorg? ( https://github.com/vdr-projects/vdr-plugin-menuorg/raw/master/vdr-patch/vdr-menuorg-2.3.x.diff ) ttxtsubs? ( https://md11.it.cx/download/vdr/vdr-2.6.1_ttxtsubs_v2.patch )
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	user-info	83547b4df3e1ba5a6bf91a0837eaa664
+_md5_=1107c15f505da1cd3c14892e435c9723
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 7ba25c377bb5..dab68a234f6d 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/libnma-1.10.6 b/metadata/md5-cache/net-libs/libnma-1.10.6
new file mode 100644
index 000000000000..7a2664a27d5e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnma-1.10.6
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxml2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.56 ) net-misc/networkmanager[vala] ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=gui-libs/gtk-4.0:4 app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.12:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-4.0.0:4 ) introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+DESCRIPTION=NetworkManager GUI library
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg vala
+IUSE=gtk-doc +introspection +pkcs11 vala
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=gui-libs/gtk-4.0:4 app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.12:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-4.0.0:4 ) introspection? ( >=dev-libs/gobject-introspection-1.56:= ) !<gnome-extra/nm-applet-1.16.0
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=mirror://gnome/sources/libnma/1.10/libnma-1.10.6.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7509018e779ef4b88b928c25b175cc7b
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 8304944aea47..37bd7fa09f3c 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/gnome-remote-desktop-43.3 b/metadata/md5-cache/net-misc/gnome-remote-desktop-43.3
new file mode 100644
index 000000000000..e33f65ae804f
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gnome-remote-desktop-43.3
@@ -0,0 +1,18 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig doc? ( app-text/asciidoc ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=x11-libs/cairo x11-libs/libdrm >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= app-crypt/tpm2-tss:= rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.8.0:=[server] >=sys-fs/fuse-3.9.1:3 >=x11-libs/libxkbcommon-1.0.0 aac? ( media-libs/fdk-aac:= ) ) vnc? ( net-libs/libvncserver )
+DESCRIPTION=Remote desktop daemon for GNOME using pipewire
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-remote-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson systemd xdg
+IUSE=aac doc +rdp systemd +vnc
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=x11-libs/cairo x11-libs/libdrm >=media-libs/libepoxy-1.4 >=dev-libs/glib-2.68:2 x11-libs/libnotify app-crypt/libsecret >=media-video/pipewire-0.3.49:= app-crypt/tpm2-tss:= rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.8.0:=[server] >=sys-fs/fuse-3.9.1:3 >=x11-libs/libxkbcommon-1.0.0 aac? ( media-libs/fdk-aac:= ) ) vnc? ( net-libs/libvncserver ) x11-wm/mutter[screencast]
+REQUIRED_USE=|| ( rdp vnc ) aac? ( rdp )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-remote-desktop/43/gnome-remote-desktop-43.3.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=73997404d416f6f2110ac873d1a9a18a
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 4fb2235b6ca2..fe52dc3880d6 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/octave-7.3.0-r2 b/metadata/md5-cache/sci-mathematics/octave-7.3.0-r2
index 834ca7cddb31..b69c611022d0 100644
--- a/metadata/md5-cache/sci-mathematics/octave-7.3.0-r2
+++ b/metadata/md5-cache/sci-mathematics/octave-7.3.0-r2
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.gnu.org/software/octave/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils toolchain-funcs xdg
 IUSE=curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X zlib java
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 app-arch/unzip app-arch/zip app-text/ghostscript-gpl sys-apps/texinfo dev-libs/libpcre:= sys-libs/ncurses:= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:= ) fftw? ( sci-libs/fftw:3.0= ) fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] ) glpk? ( sci-mathematics/glpk:= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= ) hdf5? ( sci-libs/hdf5:= ) imagemagick? ( media-gfx/graphicsmagick:=[cxx] ) java? ( >=virtual/jre-1.8:* ) json? ( dev-libs/rapidjson ) opengl? ( media-libs/freetype:= media-libs/fontconfig:= virtual/glu x11-libs/gl2ps:= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:= ) qrupdate? ( sci-libs/qrupdate:= ) readline? ( sys-libs/readline:= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:= sci-libs/camd:= sci-libs/ccolamd:= sci-libs/cholmod:= sci-libs/colamd:= sci-libs/cxsparse:= sci-libs/umfpack:= ) ssl? ( dev-libs/openssl:= ) sundials? ( >=sci-libs/sundials-4:= ) X? ( x11-libs/libX11:= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=fltk? ( opengl X ) gui? ( X ) opengl? ( || ( fltk gui ) )
 SLOT=0/7.3.0
 SRC_URI=mirror://gnu/octave/octave-7.3.0.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6f1d842152b0eff4d94b87bf3e768607
+_md5_=75c34497a9ffc6367a13e620fbfea6a2
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index c6e2c819e98e..f4a8ca539820 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/util-linux-2.38.1 b/metadata/md5-cache/sys-apps/util-linux-2.38.1
index 65a456509bec..dfc9aab02a6f 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.38.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.38.1
@@ -1,17 +1,17 @@
 BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) verify-sig? ( sec-keys/openpgp-keys-karelzak ) >=app-portage/elt-patches-20170815 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
+DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
 DESCRIPTION=Various useful Linux utilities
 EAPI=8
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux
 INHERIT=toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript pam python-r1 multilib-minimal multiprocessing systemd verify-sig
-IUSE=audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode split-usr python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+IUSE=audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode split-usr python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) su? ( pam )
+RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) su? ( pam )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.1.tar.xz verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.1.tar.sign )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	usr-ldscript	80677644cd5fa559d15743fb93dcbf5a	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=d1360f5dc165fe7d9a862dff53b8d067
+_md5_=3ed13d68c4d05e61fbf6a2e0fc48f422
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index 50362a39077b..ffdeff97a4b9 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) dev-ruby/asciidoctor >=app-portage/elt-patches-20170815 virtual/pkgconfig sys-devel/gnuconfig || ( >=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 prepare pretend test unpack
-DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
+DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
 DESCRIPTION=Various useful Linux utilities
 EAPI=8
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux
 INHERIT=toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript pam python-r1 multilib-minimal multiprocessing systemd autotools git-r3
-IUSE=audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode split-usr python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 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=audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode split-usr python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
 PROPERTIES=live
-RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) su? ( pam )
+RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) su? ( pam )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	usr-ldscript	80677644cd5fa559d15743fb93dcbf5a
-_md5_=5522b945b2254e1da07d27426977e4cf
+_md5_=a33a292c6915f1bf3ac93d4e5a54f2f0
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 54207dba0013..ea039821d106 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/torque-6.0.4-r2 b/metadata/md5-cache/sys-cluster/torque-6.0.4-r2
index 06e2a8265d55..2c90cf78ca38 100644
--- a/metadata/md5-cache/sys-cluster/torque-6.0.4-r2
+++ b/metadata/md5-cache/sys-cluster/torque-6.0.4-r2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup
 DEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 dev-libs/boost cpusets? ( sys-apps/hwloc:= ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat sys-libs/ncurses:* !!sys-cluster/slurm
 DESCRIPTION=Resource manager and queuing system based on OpenPBS
 EAPI=8
-HOMEPAGE=http://www.adaptivecomputing.com/products/open-source/torque
+HOMEPAGE=https://adaptivecomputing.com/cherry-services/torque-resource-manager/ https://github.com/adaptivecomputing/torque/
 INHERIT=autotools flag-o-matic linux-info toolchain-funcs
 IUSE=autorun cgroups cpusets +crypt doc munge nvidia quickcommit server +syslog tk
 KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 dev-libs/boost cpuse
 SLOT=0
 SRC_URI=https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> torque-6.0.4-gh-20170829.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch https://dev.gentoo.org/~sam/distfiles/sys-cluster/torque/torque-6.0.4-glibc-2.34-pthread.patch.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=af28043def939f24989fbe3ec7027cdf
+_md5_=3e4a0840a6c5ccb130bff31dc4b7427d
diff --git a/metadata/md5-cache/sys-cluster/torque-6.0.4-r3 b/metadata/md5-cache/sys-cluster/torque-6.0.4-r3
index 241a638020e6..d6fee792fab6 100644
--- a/metadata/md5-cache/sys-cluster/torque-6.0.4-r3
+++ b/metadata/md5-cache/sys-cluster/torque-6.0.4-r3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup
 DEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 dev-libs/boost cpusets? ( sys-apps/hwloc:= ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat sys-libs/ncurses:* !!sys-cluster/slurm
 DESCRIPTION=Resource manager and queuing system based on OpenPBS
 EAPI=8
-HOMEPAGE=http://www.adaptivecomputing.com/products/open-source/torque
+HOMEPAGE=https://adaptivecomputing.com/cherry-services/torque-resource-manager/ https://github.com/adaptivecomputing/torque/
 INHERIT=autotools flag-o-matic linux-info toolchain-funcs
 IUSE=autorun cgroups cpusets +crypt doc munge nvidia quickcommit server +syslog tk
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 dev-libs/boost cpuse
 SLOT=0
 SRC_URI=https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> torque-6.0.4-gh-20170829.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch https://dev.gentoo.org/~sam/distfiles/sys-cluster/torque/torque-6.0.4-glibc-2.34-pthread.patch.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=bbe5b8cf93bfe5872628a2dfd8b3fc79
+_md5_=355273133957e8d94ef5676a0a1fbdb2
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 19e9646a0b3d..381250cda1bc 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/mod_qos-11.73 b/metadata/md5-cache/www-apache/mod_qos-11.73
new file mode 100644
index 000000000000..a98074928c5a
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_qos-11.73
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/libpcre2 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
+DESCRIPTION=A QOS module for the apache webserver
+EAPI=7
+HOMEPAGE=http://mod-qos.sourceforge.net/
+INHERIT=autotools apache-module
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libpcre2 dev-libs/openssl:0= media-libs/libpng:0= sys-libs/zlib:0= =www-servers/apache-2*
+SLOT=0
+SRC_URI=mirror://sourceforge/mod-qos/mod_qos-11.73.tar.gz
+_eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	depend.apache	416d1c5005c5f4594e79812fb7323f0d	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=9c40b0a719a40026c7d1c4e08b42a0fe
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d6386506032d..de8012325854 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14965 BLAKE2B 0511d9d714cebde2326e23abfa24bba7318694b5216c96f343d6d94416db2ba397ccc9f0f63ea9c7707aa0414d66e329fb1669bedb5e961cf73b188b04dac363 SHA512 bc41483b3882eeb50bbf35dc4b007fdb5080fc09c4d64d83706e8c2e509eccc05aa28c839c8c30c89e9b3fbc6832e099264b3f3b6e0b76887f0b37a1f8a14e1d
-TIMESTAMP 2023-01-09T11:39:39Z
+TIMESTAMP 2023-01-09T17:39:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO7/PtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO8UWBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAGnBAAhF9vBRxY5Rl7MsjGnVudXZxQT4pu5PS+xyhsOqkvTUD9BRjW68u4wXkr
-2xOaySipKp7Pj11YNdmOYyqPsLdOkuHzItf93WQg2AqmUv5tCAZZTyKL/JVtdVQL
-bw1rh2VQk/8nUTBrUAkEb8Xgv5GqzSoVPk2WBLRIjdJ98bKIDff80Wgd2qYzUrph
-IP9Z0tKrrnnuEMECM6ZxNkDeXHMEo/Bx1owqiXnmHdR+sNQCWII/PuxK8MYdXyxp
-lnTkng6O3+2ChfqAgi64ivyi7jYMwRYjt+93zCj5hrqmLq5cnm9Q9iXiE6+iG9Wc
-OgfVF1GRw0Va6zS5VArwOAxb6zO6b+/rkYt77bXMRGvxa9NHpxwC1kSBFAkPLQ+I
-f6MYKzgS+adly1cDh7j7WQFy4MUXwGi/EE924AVZsGayY920MwYMVQqOn5BoPQCv
-x807BCC6MUE2UWCfcPw7GW9CZIyCdlhFYDB40G4OaYvec7KE409mNAY0nEDxG9+e
-R4kAtINqE9ho6dORNJngz6qLnOY6/JjOGu7I+vdNgpistRzMWcqELwiG69cJ7/DM
-cHcWYrXev0aXTYHYv7sxdCqUHg/jA+r7YEqjrhpc2H6F7lUWmFNVVWa1SKTs7reo
-qXdiUvJNOl24AH6wmnZujE3w/FPtLdCZmxzsrApDII9p9so1Pno=
-=UQB1
+klCj+RAAsTogB3aEdS4RqVn8YyR2Gk4PYjAc/CKWC4lXJE+AkeQ/Jj/lXjswQiy6
+TgRtp+8NUvZojrdF+F3oY4D+ZXUdCpcPzQ79ImX/SusjMBQZXKE9eMJ+TsSURnAw
+WWTMa8yHKXoerfoBP/dieK+T05IZKMGGrZoQJxIIyyFSFwFrWdI+PO4e3Sdefr2/
++IKalXXQ1hhMmhLDKl41pcbSij7/W6LwGmc3XUYM/aboOcnWGODk9qaFk0PQrQMJ
+KU6WkktjpGugh4M3tLoz4aJ2rni17QPk4hDDe2KBP9roPQQfLKs6lYw/8QD9tmkb
+7sL/iaq5ubZsJHG5bP+DZptb351jsSE9oSRdXmLAW82C2GismCrqOLdM1VsK3bWm
+v6Gkm6cok4dZZGLv8fA2tGnhwZgKJHVQp3aZtLJi4fCW/t4CDT3EoI3nAzmgg26q
+Jlc7OBuDni+qofKYR1VH36hNKEdMAw1mgKoupXsskg8Hqow2aGlfbU1HidqCnVzn
+/UME9+2LKqZhAvQqhzxWoxFUuei+eF3tXr58U1mC4Ad7hBsv4Up+ZI1vIyF8xTU+
+4F7wOJoA7tiyZUduP/tdcvYzyyLpyezChOE2phIUuOrm1ojPkmlVLUgOuZ0ElCFI
+yNNbRf6twGSE/IhYBDSbWOFbgkuM1AEWMl9jyfwsj4YRtbzZ2Gg=
+=d0m+
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 992a2f81d359..4c738ae21489 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 09 Jan 2023 11:39:36 +0000
+Mon, 09 Jan 2023 17:39:41 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4235c78c1b0f..ea3b8082c49e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jan  9 11:39:36 AM UTC 2023
+Mon Jan  9 05:39:41 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 205d66b18ebc..a537f4d82801 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 09 Jan 2023 11:45:01 +0000
+Mon, 09 Jan 2023 17:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index de17eed31da5..735f0411c305 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ec9d21f273fed73f763aade64f97676b3d6ef7d2 1673262768 2023-01-09T11:12:48+00:00
+e1cd22a0319e1437f864946462c25e4f8f173c4c 1673283855 2023-01-09T17:04:15+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 18de2187e402..5ba4321daef9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1673264401 Mon 09 Jan 2023 11:40:01 AM UTC
+1673286001 Mon 09 Jan 2023 05:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 992a2f81d359..4c738ae21489 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 09 Jan 2023 11:39:36 +0000
+Mon, 09 Jan 2023 17:39:41 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 2e1161705e3c..9f7f4e9867f0 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index ac13df17e98c..24cfebd3b175 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -1,4 +1,6 @@
 AUX libnma-1.10.4-path-eap-schema.patch 1229 BLAKE2B 50c80e5f5e5bdfbe14e176daa5082162902af4184fd94093353aba3e4b68c181ba3fa0a10e756a81de1b43efa2142c2843fd08d317df806578bf78329ff4a804 SHA512 6d5dc9f13de966471cac8391d2422279abca235daf7e839b0b92fa00abc98f4949935822997920b2d0b597892c0402ef42b09a3af922f06abb1b1772cb70c015
 DIST libnma-1.10.4.tar.xz 1351932 BLAKE2B 0178407d04fed680b260ea7e4615f0d939483504209b4bc721e2a4fe49ecbf49d9ffde0476b4352973cda9de4f088ac50d557c12f67d970f21031c1741f692e3 SHA512 4fe0d6b0e5b3c1bd7654e03dce747ee390de76d6641eb317fecb901ed6768bf48785e4a99e6fc8f12864066d06a64e308a8dbb2081a2d57e3f1509ca712deccc
+DIST libnma-1.10.6.tar.xz 702820 BLAKE2B 8f5b62f9522c8e7f16d6847d0e297d32fa8f62c9be2db68af596765dcfaa93c4eb9c3d3e03098ebd024d7f6ad788dd82eedc7b4841738d4278f64e3a1053d2d6 SHA512 4801db35a8d510c651fc91da4f394a665a4ba5c35fbefe0496363c404b49d5f4e103f49084220ee58b995684d2ac93643320b7d1777ebeea555e7657768a1f6a
 EBUILD libnma-1.10.4-r2.ebuild 1889 BLAKE2B 7ebfb7b19c81909881ba542948da4d92217e9f7f215c5009886dd691f7acb512e8a5c6ea2081f943cd2d03a11c1c5e2397a41e112f70e22f217a157f6b63675e SHA512 98e5eab9a2859038fb07e1d9a26726e7a57b331983943c63f340fc923320f4880c3f87769156f13eabf69475e48bcb9ddd885c86f30d3fa31c2ea51491bb4483
+EBUILD libnma-1.10.6.ebuild 1779 BLAKE2B ff38a80667b7168a906d6d893cd2b352768d9332a7cd29b10836af4fc02446d3a9fcc94ef391b13f462bf95e7c379f83b1254758d9bc495cc3c8b0daa614cdc2 SHA512 a2303f764257b15c9590d12bca99a19428f5e1d4adb318b24f7988792411c3e65c15f9fd0418da0e37ef841e0eb01959acfd35d39077249a99d14d9851a352e5
 MISC metadata.xml 470 BLAKE2B 634b69ece62b9f3f8aa9e82b1df56009823dffd8dd45a46b6ac58c3580179c7c6c87965c8da5d653188e81bfbe5c26c956d15181d23f23ec17b468ba3b585cbd SHA512 a15b193fd01eda0a1408af3ad93660ed7cf859e3837e8e83c5c76031cf50aa3634e8a4d2a47f8db8c311cb36b1eb2fb8a89f8c7adfb9fd6d596eb6e9e5e8bea6
diff --git a/net-libs/libnma/libnma-1.10.6.ebuild b/net-libs/libnma/libnma-1.10.6.ebuild
new file mode 100644
index 000000000000..e5e8df6c93a9
--- /dev/null
+++ b/net-libs/libnma/libnma-1.10.6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg vala
+
+DESCRIPTION="NetworkManager GUI library"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
+IUSE="gtk-doc +introspection +pkcs11 vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=gui-libs/gtk-4.0:4
+	app-text/iso-codes
+	net-misc/mobile-broadband-provider-info
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.12:3[introspection?]
+	>=net-misc/networkmanager-1.7[introspection?]
+	pkcs11? ( >=app-crypt/gcr-4.0.0:4 )
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+"
+RDEPEND="${DEPEND}
+	!<gnome-extra/nm-applet-1.16.0" # gschema moved to here before nm-applet-1.16.0
+BDEPEND="
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	vala? ( $(vala_depend)
+		net-misc/networkmanager[vala]
+	)
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlibnma_gtk4=true
+		$(meson_use pkcs11 gcr)
+		-Dmore_asserts=0
+		-Diso_codes=true
+		-Dmobile_broadband_provider_info=true
+		-Dld_gc=false
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	rm "${D}/usr/share/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml" || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index de09b7fd2ea4..79886dcc334a 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index 16edbfb73064..6502cc15474f 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-remote-desktop-43.2.tar.xz 195984 BLAKE2B 7f6bcf142f98a1b6f357cbc6bb651c63bcae5360a52a83ac44b8eea8f0f3bcdb29c23ec4d973ee40b29ebc0ff59958468a236238b50e68a886e31334a45f5c5c SHA512 e7e9c36e04a7273cb1700859d59ab8130bca7103c3def7f51a6df31b98f6021b9ceb15d2f9e71fef2464141dcd01d467e126731028d7dd6b6ec843dd52b1e8d4
+DIST gnome-remote-desktop-43.3.tar.xz 196540 BLAKE2B a33dcb830cd5ed0e9c44da8717a7c621231a97a0d503daa007d6d4c47feb83e16905f61a9ebe60ce5231b7fbad035ab24603284f9c9212ccb48dab90cb845a5c SHA512 67dc7c4ab7d2db9ef843e30b688e024ed91341c09fbf4c7d33f4c1d8b7d9d3564fb64bc948b12f2aee3ca8a545fb21842ce79970ec1ddaf99fd64c41a44b8f59
 EBUILD gnome-remote-desktop-43.2.ebuild 1368 BLAKE2B b579aab040bebf357e960ba6f65813026023a63dc5023f4079dc5b7b3fe38d71fe7c1dd549ea541d90bb5f23c017e89900c56987eefbaf96e5868e152efefd33 SHA512 68ec11a3b414a8847900f9900af4beeacd9a6e45b0958afda0e4fa5351a539ba2caede34e0a6bb9649d56d4a113bd1e20e7fc55cabf8da2e0240d65d70846651
+EBUILD gnome-remote-desktop-43.3.ebuild 1368 BLAKE2B a35a6b6f2d7de6fce39bb9afc777a77800dbfd3daa568912256ed82f68cc834feb0d4e94395e179ae1e4ac2963353d96f569dacc27011953c44c6dcc3f38033a SHA512 eeb72aa501adc54fc4ac7d2616e592fd1c8c0d47583c9f23e43d55861bd1b7a5b84cadf17f2d657c0518943d595bbc65e8b630af483c137343bb4b64da978c82
 MISC metadata.xml 488 BLAKE2B 14e2e29779ea62269e8c473a877b3da316a60b6b970ac784e6cd853610ac81a981ed9dd4104a99d5e7c48f4146f74efdbab9f71d81c405baf24f3cb3e9a1702c SHA512 7d9b8b371cc0f609e77baa3a3eff701a5a68922e5405995d5c3f70bc92af0308ca409bc05e28480ab8f008b879e417cd679bb0ec5494f17d3abb8a7b52248a06
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.3.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.3.ebuild
new file mode 100644
index 000000000000..9b0c3dfafbb2
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-43.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="aac doc +rdp systemd +vnc"
+REQUIRED_USE="|| ( rdp vnc ) aac? ( rdp )"
+RESTRICT="test" # Tests run xvfb-run directly
+
+DEPEND="
+	x11-libs/cairo
+	x11-libs/libdrm
+	>=media-libs/libepoxy-1.4
+	>=dev-libs/glib-2.68:2
+	x11-libs/libnotify
+	app-crypt/libsecret
+	>=media-video/pipewire-0.3.49:=
+	app-crypt/tpm2-tss:=
+	rdp? (
+		>=media-libs/nv-codec-headers-11.1.5.0
+		>=net-misc/freerdp-2.8.0:=[server]
+		>=sys-fs/fuse-3.9.1:3
+		>=x11-libs/libxkbcommon-1.0.0
+
+		aac? (
+			media-libs/fdk-aac:=
+		)
+	)
+	vnc? (
+		net-libs/libvncserver
+	)
+"
+RDEPEND="${DEPEND}
+	x11-wm/mutter[screencast]
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+	doc? (
+		app-text/asciidoc
+	)
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc man)
+		$(meson_use aac fdk_aac)
+		$(meson_use rdp)
+		$(meson_use vnc)
+		$(meson_use systemd)
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 7ae9038bae2a..7a587be2e2e2 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index a0a0b0805954..db99a9d14439 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -6,5 +6,5 @@ AUX octave-7.3.0-docs-texinfo-7.0.patch 1623 BLAKE2B 36a6ceda753083171ece9e4045a
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02 SHA512 91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
 DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5 SHA512 1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e
 EBUILD octave-6.4.0-r5.ebuild 6099 BLAKE2B 2f2d206f60d84675928d97cc67b14abc3cf6f4749d1b9519b3a03e2811eebc29d33ed87d02a1c23808f9f8bb10db7f299b2a0f8dfca85d0cc1e8e32368f8106d SHA512 615987c1b4f4e7f264ca6c5cf62d27800558accf8fc4c0a54b9a0d250acdeff7200243280dcd35644c0cd324f1f0b8b42ca5cee735faba1aa9b8e09be9b3dbf1
-EBUILD octave-7.3.0-r2.ebuild 6721 BLAKE2B bcd93f4df6d08e24cc934b9157091725ea2aafca293a1d50a6137d9b8c05f8ad11bbcb7fc69c7d76c0fd542c06ccad316a90294334d99718d880d783630ab81c SHA512 17c3e0c3a6603ef5e16277a02daf65fcf1fc83ef0b73aa6190ca1437389f29dd1e14d0ef5956332ab9bc44743d2e011972267c1105c28aa13829ad134becb92d
+EBUILD octave-7.3.0-r2.ebuild 6727 BLAKE2B 2de036fb8ff4ac1786aba15d3a115b61317a6f3262e39758840f07f96063a81b6b0f035439422f7b329ace56f4d63ab4891d7add71e1491d7a749c934054da2e SHA512 f1d39df10bdca389a8a9ca7dd477bd9897ed6ec9a0f36569ec0ce27521721ce67f9dc8abea214d52a9bf58eb1387e97b95d5110112fd5aedc2a88c3ccf8cfa95
 MISC metadata.xml 1703 BLAKE2B 0471bc1eeaa2ce86b8eeca5c3e831eb0d9207b5fd1d3c03aba017a257b7b98b313c42a1054471c79dab1b5d2d84df8a8d3b0ee68e772cbe6970ac92f07dc3269 SHA512 3c051ff80c958af4315faa1670cc5e1d6a53397b4182304b760cf4f2e14f716e187dd76879d094e35713ac115c47ea623530c2f4b114f7bf2eae1cdf28bc46b8
diff --git a/sci-mathematics/octave/octave-7.3.0-r2.ebuild b/sci-mathematics/octave/octave-7.3.0-r2.ebuild
index 2d09264e6440..eea6ea2ec301 100644
--- a/sci-mathematics/octave/octave-7.3.0-r2.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X zlib"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index dcd4d6c9406f..ea9852bb6e93 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index fa70f69a2193..cff82bd62769 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -7,6 +7,6 @@ DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 7f6cd12ec9bc68a6db787be78c1ee19fdf
 DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085111937f5d0daada37a679e9bbfe61fc98bb57cca9bf7bea20be483f38e2a758039f9baf5b1a901852e2b5dd014d8 SHA512 d8b3e936065ae1dc105b8ce773c874bb037ebf84ee571676509543f79c39950180e7f252c6b0d4500119568ed4ac3aa7117793de839f983e9287f26649e91dad
 DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957
 EBUILD util-linux-2.37.4.ebuild 9434 BLAKE2B e5bcbf418867e65ffcecd1348115e68cc611736994e1d2fd648c67d7a6d0ca9572d752871ec41bda9e07c94f99882e730e1c024d358c7bd263a58d2caaefef50 SHA512 ae8e6ed5c350afe109a578716676f4189e1bc02e4ebe1b9ba1beb24daf6e7774edef703fe2187c9d2c0332ff32175922aa170dc959c5ec393f0cb5b7cd7a354a
-EBUILD util-linux-2.38.1.ebuild 10818 BLAKE2B 5d1dae6703ff23afb07193cd91e7787214e976a0fb200e55d8af810e3d7f6295517b9d9479ca01e33634e7469fb0208f4e4a5168d3cfaf3697bd83b0f4435313 SHA512 23dcf875a55de8093b784bc23141c45ca9d69297706eca408980d276b6a549a07f01e74466d7f4731ee7d97dde592b5594043e525f4932ae8f1d7c4ff0585999
-EBUILD util-linux-9999.ebuild 10821 BLAKE2B 796146093c56e08c20a174e627ba190c6506c6ebece82c515d6c79023b091cb0dc98454694e8682fcb0ac77c0fa35defd1d722e044e3cf3c39b8cb51ae4c54ba SHA512 cc69ab74eed977731e6352555dfcf8042e2288a196d8130f86c7b0e0973dcb7948750d24b41f5a45f0c5d4c68d22014d3b91387b33af0282af68ccd08cce912c
+EBUILD util-linux-2.38.1.ebuild 10818 BLAKE2B 98c6026e657b7c844e20239a8980092ce614ce5755ee1f759f2833165f8bb6c118b312fa7e95667cf717196550b435c2e13070f33b1916bb25c7726884ea5b97 SHA512 f9c7710ab49ab9b7695d98ffa5d41fc52fcd015079afdc225c0233bb586041103288c75d2b5782e3fa97c57b92519560ff9699c794194584d5dff8e9c018b77c
+EBUILD util-linux-9999.ebuild 10821 BLAKE2B c3ea84a8f7f30cbc6919787a25c0f975bacc2f565c3cbca0fe01e73d9c2ce266b31fd0c20636f990e2d8e32591ca251fae365a2471617c0db41ed012878f2466 SHA512 e3bb977acfb277658b09e6a10a0f26ad8af3c65d4c95fb8c34a88cd80380c88fe0d69b75ae7d891ad235b09af8810586c5ca4adbfc6e73adab3a78d713cfd95a
 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/util-linux-2.38.1.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild
index 0bb5603d9c24..c56daa8d4939 100644
--- a/sys-apps/util-linux/util-linux-2.38.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 59eecef07674..ad5755f84912 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index d0f573879b81..3b45c34797e8 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/torque/Manifest b/sys-cluster/torque/Manifest
index 944f03ed7640..4702d389093f 100644
--- a/sys-cluster/torque/Manifest
+++ b/sys-cluster/torque/Manifest
@@ -14,6 +14,6 @@ AUX trqauthd-init.d 477 BLAKE2B fe62bfae07d1d9fe08352ba4d99ab5d46185a74b10497f32
 DIST torque-6.0.4-gcc7.patch 50412 BLAKE2B 43748e9bfd3811abdfeb56f93dd517fcb07a6902194120e2c9e16bbe5bbe0f04afd3f898616d46e0310902a6376671be0c8f3865e8f7dd5381fca46e7ad62fc8 SHA512 430ae6a80ebbfb2066831326f8ce25a34cb6fc17c1fbe4a202c495baceb2b7011c9f6782da31b78c34287f26765c76c587611d689791523b8bd53d634e3681b6
 DIST torque-6.0.4-gh-20170829.tar.gz 6182495 BLAKE2B f9156ae4ffe388a7f3fa0df142e5f2d48c16fd7b8c148a3a80cd1c977eb0c1ef4a455da275f993100867be043422526ed05c53734e707851083d6d23ee1a2cc4 SHA512 8f1101adb89e06617de501f7956e126633b78b495baeb7980d3c534d34537cc604a3cf0a7c23c48eb2554b26cc13672b0e00c75d0f722d63ac4d42d57388ed94
 DIST torque-6.0.4-glibc-2.34-pthread.patch.bz2 6266 BLAKE2B b5175b8bfe2deabe86b067f1ec5269770bcf096c6e875b8fd3cb404a976c9cb550ddcbe6e4ebb1e59c96044f95c285519e70fb4acd5c9db86c3050093ff65b3b SHA512 dbe0bd6000c140e1fe9b36e55c1a844701406a563bd178b9c972793b83282f3434e2160da5280666dcc0934c2b88e36c0a2b9518ffe7695b23d73fce0a07388d
-EBUILD torque-6.0.4-r2.ebuild 5952 BLAKE2B 8ab710b71a0f7911949a0560aa263675e6e7820bdf23b046646bcbe692a3f26c03f67671ae5e742db0a093f2564ce5beaabe094849534f785e0a11ece9a4114d SHA512 609c0ef88c19549f3b60f7cdb3c3963ac78d48aa814dfe00155bfd75d71f0f735fe32ea8a898338343a120a32c2e804e12d3e097a11c528b51764afcdec7dd5b
-EBUILD torque-6.0.4-r3.ebuild 5999 BLAKE2B 1054daf54b14a3407cf3196294458a8e6d005de58b2c9e47eed2b9aa61a856fb1c49d376e4473d70674e0b65ed646b5d53a264bd0489aaaa7a747672bce8cd6f SHA512 d438900d1e73c2544fb919d32d8665a7bb511d70e02bfb64d9eb95380856e2de724c4b4a4adedba444f820aacdbf2a16cd70f743be15eddc488368e178039bed
+EBUILD torque-6.0.4-r2.ebuild 6007 BLAKE2B 4f4831fdd044af2936b44e5fed7426541e3f0a84c76ffd70d23bf2ea92371e0af3ec58f1bea24f138981579b781e002dd79f79786bc9fe85e8f4377d1353797a SHA512 d495a66dffad869968fe8f0e183cda3c8dbd34fb9e15bfb041e46ec332a2c987a184f7b3f046143e5b9d69bd68428385aaf9766341dd28922ea7bd5d6670797f
+EBUILD torque-6.0.4-r3.ebuild 6054 BLAKE2B eb1090c62a049ac82d600a35930584d81de3e9f735e682c1e3e962bf076510abf813d0d3267e6b5f3ed71fe8e3dc014cca58d363e216730d755ab261407977be SHA512 11e5c606321f8d13c6e49f8de8e2fb41b23ab854f53d308bc739d79c796e8c4d693073575f7795368fca0cfdb38e6309ef316e061ac467652e32c366ee69de7b
 MISC metadata.xml 854 BLAKE2B 77be0da422efef3efbe4a151f45b82f3cc5efdb2da91345bd245d23b1b3f93e8e9bbfff40c7aa4ab149a66574f8113360bf6cce8f630fa3ff17bbcf7a580c896 SHA512 a296b3a82abc530aff7672cf70fe06b26c61dff95476ca33a6692fb7cb5fabaa3873e6e1666721b8066ff524273ea6ebf20681a8418e849f94995b4493d4496f
diff --git a/sys-cluster/torque/torque-6.0.4-r2.ebuild b/sys-cluster/torque/torque-6.0.4-r2.ebuild
index b3886f93053d..b4fd6981da11 100644
--- a/sys-cluster/torque/torque-6.0.4-r2.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ MY_COMMIT="6a0b37f85c7d644e9217cbab1542792d646f59a6"
 inherit autotools flag-o-matic linux-info toolchain-funcs
 
 DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
+HOMEPAGE="https://adaptivecomputing.com/cherry-services/torque-resource-manager/ https://github.com/adaptivecomputing/torque/"
 SRC_URI="https://github.com/adaptivecomputing/torque/archive/${MY_COMMIT}.tar.gz -> ${P}-gh-20170829.tar.gz
 	https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch
 	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.0.4-glibc-2.34-pthread.patch.bz2"
diff --git a/sys-cluster/torque/torque-6.0.4-r3.ebuild b/sys-cluster/torque/torque-6.0.4-r3.ebuild
index 6799806e325e..268b518c340b 100644
--- a/sys-cluster/torque/torque-6.0.4-r3.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ MY_COMMIT="6a0b37f85c7d644e9217cbab1542792d646f59a6"
 inherit autotools flag-o-matic linux-info toolchain-funcs
 
 DESCRIPTION="Resource manager and queuing system based on OpenPBS"
-HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
+HOMEPAGE="https://adaptivecomputing.com/cherry-services/torque-resource-manager/ https://github.com/adaptivecomputing/torque/"
 SRC_URI="
 	https://github.com/adaptivecomputing/torque/archive/${MY_COMMIT}.tar.gz -> ${P}-gh-20170829.tar.gz
 	https://dev.gentoo.org/~juippis/distfiles/tmp/torque-6.0.4-gcc7.patch
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 43411ddd0d34..43add0e10d2c 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index d5c7c19d682f..965fd6a5af9c 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,5 +1,5 @@
 AUX loong-fix-build.patch 882 BLAKE2B f861f0e709e13bdf32641202b412a07b91684f91c8df60faa9a59d78b1cd838f06f856757e4e0258814e511e1b2e04ce0219b94b675d3ebde7c3abe49c1c666a SHA512 d1bcb80e4e58e669bbda2e7897ed13db6eedfaf0b9c574a8a7fb8b8a1825bd5bff75690a11b5e698abe32817d9d4a9c78b5075e28563cda718e6902c9cddacf2
-AUX m4-1.4.19-fortify-source.patch 1814 BLAKE2B 98328ba9592dd7b3170bfdbb80ed8e01d1ed3f9b77f221b7e5c5548f151a6738819c1e4c598940f946f316798c7cde62583f4a647fa82855e9fd7801b54e0e66 SHA512 4b7fecb072c96ad06f8d366bad3fa77b5faf57a1469988d11ea86f04812e9ec7a81ea3f44e867816b3bca36509a9c9791bfc6f963d1dfde90bfe22602335813b
+AUX m4-1.4.19-fortify-source.patch 1882 BLAKE2B 3fe8b2dd324f2c54da77c54f8937aad47ef31cad86d6af2832361614929ce1369e4209b52c2969fd1e8a2b22edd05b68f118ba3237cdeffac03a15e1775d478e SHA512 e9d48960b9b2af33791530985b5f3e113d3d7818ee892c47d3adb7fc8dbfd44a1222cb558cce26554626023bd83378dcdfe97959e26c6572439e34b2eedecfb3
 AUX m4-1.4.19-make-4.4-tests.patch 1447 BLAKE2B a080aa6d5b85e965ac197ebe58a9e075fdcf34c0e1b2e6e94fba27f3eb3191d9d69ee9c45d8f9d8ac8fa00c50a5e46c28d0a26a4743b0f2ed5d6c9b1ecaca588 SHA512 25bfd81d384f645ae18777cba21924d10b35b281fbd7f0ab75a6307f9febc0533151eba6460adf239d6d7f7b1bd73444439b044b0459e8369edb58e45d523a48
 AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d46686ff8103cb3f5c1c4a1cdd5e9c4adccf4511f667db473086b0ea7fa5242f36e3109f929d70728e7 SHA512 079e50b0f7d99bd7c45a33acd56a2fb000e50f7b4bc73fa18d246315b732550ceb75251ba12daf5fd2948be9252cd40804df3c2c797b47bf8b0cf173a1db4c7e
 DIST m4-1.4.19-test-198-sysval-r1.patch.gz 6292 BLAKE2B 62f52c8bb75e7b8f11e487906f1ce47069ea6d3095fd6532aa6b47bcd8109b7cd733fde26915d449a1cfc326f27f5ed83ba29a5a80687b8b9bdb73c8d87e96b8 SHA512 c3e7d4c1631e401c6b5477c22fd5de837188acf9d72551b116c665a927d1799b1fb249e90c9fb4f6f2f328ee84b2e4dd0bf54f684139997c19ee5b69a3e9284d
diff --git a/sys-devel/m4/files/m4-1.4.19-fortify-source.patch b/sys-devel/m4/files/m4-1.4.19-fortify-source.patch
index 69e5405b6f2b..d07fe620c3df 100644
--- a/sys-devel/m4/files/m4-1.4.19-fortify-source.patch
+++ b/sys-devel/m4/files/m4-1.4.19-fortify-source.patch
@@ -1,3 +1,4 @@
+https://lists.gnu.org/archive/html/m4-patches/2023-01/msg00001.html
 https://bugs.gentoo.org/890273
 
 From 960b9b4d0774f78d286932251d6f53f638aefb19 Mon Sep 17 00:00:00 2001
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 6e502b9eccae..1086403cc3ff 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index 0016aaf76d11..4463a482480d 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -3,8 +3,10 @@ DIST mod_qos-11.66.tar.gz 1247819 BLAKE2B a835722363a816637411b434eba60bc91f04fe
 DIST mod_qos-11.70.tar.gz 1283241 BLAKE2B 516dc8ec0228956c374845e10ed2533291544c496a1eda693da28d551b81f83ab898384a627b87c940782925c5bc84f1140e4e241c964b451acb63fd947a274d SHA512 004898d7993cda82f261d28e4c91b1ff1665465d3ad1da005fae94471824a31f0d30ca4edf700ddb45bfde133218c55d49a396ba03b3ed0ac00b1743c4aaa5be
 DIST mod_qos-11.71.tar.gz 1282858 BLAKE2B 92061497a6f31c009c5dbd7d0bf9042272b679e7b2f1bf5fdf9a52dc3b9cf9ea13fae6a6bd422d652466a5d1ac4355b7cc33f2d183900a64eddce3de97e96e82 SHA512 2550d868a03b7add5a48a4cd43a5287317142c879777e6d38c15270a8bbef1e2a639f938d996645bb2cace40dc6806094fc4a80e2a9b5b4e5ccc60bd35244cc8
 DIST mod_qos-11.72.tar.gz 1283276 BLAKE2B 1769a7198f5569b2c205a0939928f6949e950d41f54765ee1a055606df139c7e7dad4ad7d6161dbf07003a93d54b966b15d20fc721a6ba05cba221e1cae126d8 SHA512 0e5af2c702bade096101f20fcf12b90a2a538665cfbec4183608acdfdc99552304ad4a42f63ad3111b570bfd42b17ce7acb16f6bc86a0380c79fae84a5124715
+DIST mod_qos-11.73.tar.gz 1288540 BLAKE2B 74953216f8dd1e5cacda09dfbeb8901a09f2c1d7929db2846f8576a4ae00123a7120385e6d77438c2d4fb33c5602e84a4737033281b7c647ba249629da0b26ce SHA512 67099a7efe2cb99191e4af1eb2f23ce9ba609425520c95360ae064dd9b88cd7ce6b3a3af21ee5805d3e26721637433a0436c1b1633d109e98613593544767ebd
 EBUILD mod_qos-11.66.ebuild 1141 BLAKE2B 4c08f022489736efcf3833b70c6ae90663ccb34bbed965e14b55e4c028c039e1e438618ebd153eca1e22c2b0f1a541a68c2383d4b80d8cbb7bd549a766bb6f06 SHA512 54ab558430ec323df724e4f4d2a2c0019c94f97d656b1d75107b0e1ac0a905fe4cce2422f28d79342aae2b41f7466461fd6480518a0d6d89c3396f26dedfab4e
 EBUILD mod_qos-11.70.ebuild 1142 BLAKE2B 8b9f5e9626719ec8390b401df2b9f17a00231cad9135c5a107f9e965a24f6823c60d99faec0a6dcaecd18a957ac1930078f9937d3694fa66edede3fd960e34ca SHA512 aea1e1ffaddbb25679e7815e1ad48f76cc8ab59606c20beaf8dcfe54640c9a939f2dd864550911d0257554ad39f529fa9a09bead62e2ab04d029fefc8fbe9887
 EBUILD mod_qos-11.71.ebuild 1142 BLAKE2B 169c4a162118afb590a56a8ad230a273820c2129a9e207843a4565701ba37bf4e46d2f1e7b25db049fcef70a9c106a31cd21437f52954f3d829d185056028d9b SHA512 007b46552dc1f398600ece4d6b6105a4f7ccbd7db88aef19afcf05c64cfa28da4fa7467225d45d325adbec90f6cd3d4a30b7232578b819de97bbb9ca1fc26d1d
 EBUILD mod_qos-11.72.ebuild 1141 BLAKE2B db2e5f9e9eb28d23d1d14a9d248dbef49860cce6431fba53f4592104fd8830d369c9e42752fd4435e7955ed8d9771316f75e79cf79c2d1aeeedd6459a4662b09 SHA512 6dd74da124ae7de36b05f88499d05f8918812cf77c5e4bef3987f7e1937a81e2d523064d7a7a59afa4362b9ff2d77d448fede6bca70cd65d7c288784802eb06c
+EBUILD mod_qos-11.73.ebuild 1141 BLAKE2B b6345da2b34210f69ed60efaec3c12f94fdd76caa3394f3fa131d7c6db8ea80ddd0a49701b96d7af190189fcf2bc3ebfd224b7adea8965fe1f37f621141b434c SHA512 bf159285ccf8840bf94d3c695f39697b23f68db4680dfa779b9fb455bcf6ed5bd2197599d3502939b064d45b30763b1cf564437bd5e5d0f2c18fb9c7b33258eb
 MISC metadata.xml 326 BLAKE2B 469e74aa98baf0a4789743501b566d233d6072595c29c91ef4cffb4a9e4a986dde186cef2326e5b1e02d57a69f49b9dcf9fd045c857a5627f68f50787cd6d072 SHA512 bd08a8ffbee3d67a6b5a81e615ad0bf161204027e91ae69bd5a541a2d76f0ec52ca7405647d03d2ed3b51c756fb16d0386c97b1bab8be52a1b3803f0b2c301dc
diff --git a/www-apache/mod_qos/mod_qos-11.73.ebuild b/www-apache/mod_qos/mod_qos-11.73.ebuild
new file mode 100644
index 000000000000..1c3182af2600
--- /dev/null
+++ b/www-apache/mod_qos/mod_qos-11.73.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools apache-module
+
+DESCRIPTION="A QOS module for the apache webserver"
+HOMEPAGE="http://mod-qos.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libpcre2
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="QOS"
+DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
+
+need_apache2
+
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+src_prepare() {
+	default
+
+	pushd "${S}"/tools &>/dev/null || die
+	eautoreconf
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	pushd "${S}"/tools &>/dev/null || die
+	econf
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	apache-module_src_compile
+	emake -C "${S}"/tools
+}
+
+src_install() {
+	einfo "Installing Apache module ..."
+	pushd "${S}"/tools &>/dev/null || die
+	apache-module_src_install
+	popd &>/dev/null || die
+
+	einfo "Installing module utilities ..."
+	emake -C "${S}"/tools install DESTDIR="${D}"
+}
-- 
cgit v1.2.3