From 5560910b8e280aa828f26c34b4e361b44f5227c4 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 21 Oct 2022 14:02:42 +0100
Subject: gentoo auto-resync : 21:10:2022 - 14:02:42

---
 Manifest                                           |  30 +--
 Manifest.files.gz                                  | Bin 29594 -> 29586 bytes
 app-backup/Manifest.gz                             | Bin 8206 -> 8208 bytes
 app-backup/borgmatic/Manifest                      |   4 +-
 app-backup/borgmatic/borgmatic-1.7.3.ebuild        |  68 ------
 app-backup/borgmatic/borgmatic-1.7.4.ebuild        |  59 ++++++
 app-text/Manifest.gz                               | Bin 48547 -> 48547 bytes
 app-text/poppler/Manifest                          |   4 +-
 app-text/poppler/poppler-22.07.0.ebuild            |   2 +-
 app-text/poppler/poppler-22.09.0.ebuild            |   2 +-
 dev-java/Manifest.gz                               | Bin 55524 -> 55526 bytes
 dev-java/jakarta-servlet-api/Manifest              |   2 +-
 .../jakarta-servlet-api-6.0.0.ebuild               |   2 +-
 dev-libs/Manifest.gz                               | Bin 95949 -> 95948 bytes
 dev-libs/jemalloc/Manifest                         |   2 +-
 dev-libs/jemalloc/jemalloc-5.3.0-r1.ebuild         |   2 +-
 dev-python/Manifest.gz                             | Bin 261464 -> 261469 bytes
 dev-python/fsspec/Manifest                         |   2 +
 dev-python/fsspec/fsspec-2022.10.0.ebuild          |  58 +++++
 dev-python/jupyter_core/Manifest                   |   2 +
 dev-python/jupyter_core/jupyter_core-4.11.2.ebuild |  34 +++
 dev-python/jupyterlab_server/Manifest              |  10 +-
 .../jupyterlab_server-2.14.0.ebuild                |  54 -----
 .../jupyterlab_server-2.15.0.ebuild                |  61 ------
 .../jupyterlab_server-2.15.1.ebuild                |  61 ------
 .../jupyterlab_server-2.15.2.ebuild                |  62 ------
 .../jupyterlab_server-2.16.1.ebuild                |  62 ++++++
 dev-python/moto/Manifest                           |   2 +
 dev-python/moto/moto-4.0.8.ebuild                  |  92 ++++++++
 dev-python/nuitka/Manifest                         |   6 +-
 dev-python/nuitka/nuitka-1.1.3.ebuild              |  55 -----
 dev-python/nuitka/nuitka-1.1.4.ebuild              |  55 -----
 dev-python/nuitka/nuitka-1.1.6.ebuild              |  55 +++++
 dev-python/pbr/Manifest                            |   2 +
 dev-python/pbr/pbr-5.11.0.ebuild                   |  73 +++++++
 dev-python/scipy/Manifest                          |   2 +
 dev-python/scipy/scipy-1.9.3.ebuild                | 107 ++++++++++
 dev-python/swagger_spec_validator/Manifest         |   2 +-
 .../swagger_spec_validator-3.0.1.ebuild            |   7 +
 dev-python/uvicorn/Manifest                        |   2 +
 dev-python/uvicorn/uvicorn-0.19.0.ebuild           |  62 ++++++
 dev-python/watchfiles/Manifest                     |   2 +
 dev-python/watchfiles/watchfiles-0.18.0.ebuild     | 109 ++++++++++
 dev-ruby/Manifest.gz                               | Bin 110467 -> 110466 bytes
 dev-ruby/fuubar/Manifest                           |   2 +-
 dev-ruby/fuubar/fuubar-2.5.1.ebuild                |   2 +-
 dev-ruby/parallel/Manifest                         |   2 +-
 dev-ruby/parallel/parallel-1.22.1.ebuild           |   2 +-
 dev-ruby/rspectacular/Manifest                     |   2 +-
 .../rspectacular/rspectacular-0.70.8-r1.ebuild     |   2 +-
 dev-ruby/ruby-progressbar/Manifest                 |   2 +-
 .../ruby-progressbar-1.11.0.ebuild                 |   2 +-
 dev-ruby/shoulda-matchers/Manifest                 |   2 +-
 .../shoulda-matchers-3.1.3-r2.ebuild               |   2 +-
 dev-vcs/Manifest.gz                                | Bin 11308 -> 11314 bytes
 dev-vcs/git-machete/Manifest                       |   4 +-
 dev-vcs/git-machete/git-machete-3.12.1.ebuild      |  41 ----
 dev-vcs/git-machete/git-machete-3.12.5.ebuild      |  41 ++++
 games-emulation/Manifest.gz                        | Bin 9547 -> 9542 bytes
 games-emulation/pcsx2/Manifest                     |   9 +-
 .../files/pcsx2-1.7.3468-cubeb-automagic.patch     |  56 +++++
 games-emulation/pcsx2/metadata.xml                 |   1 +
 games-emulation/pcsx2/pcsx2-1.7.3468.ebuild        | 233 +++++++++++++++++++++
 games-emulation/pcsx2/pcsx2-9999.ebuild            |  82 +++++---
 metadata/Manifest.gz                               | Bin 3860 -> 3862 bytes
 metadata/dtd/timestamp.chk                         |   2 +-
 metadata/glsa/Manifest                             |  28 +--
 metadata/glsa/timestamp.chk                        |   2 +-
 metadata/md5-cache/Manifest.gz                     | Bin 28237 -> 28249 bytes
 metadata/md5-cache/app-backup/Manifest.gz          | Bin 13996 -> 14002 bytes
 metadata/md5-cache/app-backup/borgmatic-1.7.3      |  16 --
 metadata/md5-cache/app-backup/borgmatic-1.7.4      |  16 ++
 metadata/md5-cache/app-text/Manifest.gz            | Bin 72059 -> 72063 bytes
 metadata/md5-cache/app-text/poppler-22.07.0        |   4 +-
 metadata/md5-cache/app-text/poppler-22.09.0        |   4 +-
 metadata/md5-cache/dev-java/Manifest.gz            | Bin 73540 -> 73541 bytes
 .../md5-cache/dev-java/jakarta-servlet-api-6.0.0   |   4 +-
 metadata/md5-cache/dev-libs/Manifest.gz            | Bin 166801 -> 166807 bytes
 metadata/md5-cache/dev-libs/jemalloc-5.3.0-r1      |   4 +-
 metadata/md5-cache/dev-python/Manifest.gz          | Bin 364721 -> 365203 bytes
 metadata/md5-cache/dev-python/fsspec-2022.10.0     |  16 ++
 metadata/md5-cache/dev-python/jupyter_core-4.11.2  |  16 ++
 .../md5-cache/dev-python/jupyterlab_server-2.14.0  |  16 --
 .../md5-cache/dev-python/jupyterlab_server-2.15.0  |  16 --
 .../md5-cache/dev-python/jupyterlab_server-2.15.1  |  16 --
 .../md5-cache/dev-python/jupyterlab_server-2.15.2  |  16 --
 .../md5-cache/dev-python/jupyterlab_server-2.16.1  |  16 ++
 metadata/md5-cache/dev-python/moto-4.0.8           |  16 ++
 metadata/md5-cache/dev-python/nuitka-1.1.3         |  16 --
 metadata/md5-cache/dev-python/nuitka-1.1.4         |  16 --
 metadata/md5-cache/dev-python/nuitka-1.1.6         |  16 ++
 metadata/md5-cache/dev-python/pbr-5.11.0           |  16 ++
 metadata/md5-cache/dev-python/scipy-1.9.3          |  17 ++
 .../dev-python/swagger_spec_validator-3.0.1        |   2 +-
 metadata/md5-cache/dev-python/uvicorn-0.19.0       |  16 ++
 metadata/md5-cache/dev-python/watchfiles-0.18.0    |  16 ++
 metadata/md5-cache/dev-ruby/Manifest.gz            | Bin 197218 -> 197225 bytes
 metadata/md5-cache/dev-ruby/fuubar-2.5.1           |  12 +-
 metadata/md5-cache/dev-ruby/parallel-1.22.1        |  12 +-
 metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1 |  12 +-
 .../md5-cache/dev-ruby/ruby-progressbar-1.11.0     |  12 +-
 .../md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2   |  12 +-
 metadata/md5-cache/dev-vcs/Manifest.gz             | Bin 19944 -> 19953 bytes
 metadata/md5-cache/dev-vcs/git-machete-3.12.1      |  16 --
 metadata/md5-cache/dev-vcs/git-machete-3.12.5      |  16 ++
 metadata/md5-cache/games-emulation/Manifest.gz     | Bin 13661 -> 13821 bytes
 metadata/md5-cache/games-emulation/pcsx2-1.7.3468  |  18 ++
 metadata/md5-cache/games-emulation/pcsx2-9999      |  10 +-
 metadata/md5-cache/net-dns/Manifest.gz             | Bin 15886 -> 16049 bytes
 metadata/md5-cache/net-dns/pdns-4.7.0              |  17 ++
 metadata/md5-cache/sci-electronics/Manifest.gz     | Bin 15626 -> 15623 bytes
 .../md5-cache/sci-electronics/librepcb-0.1.5-r1    |  16 --
 metadata/md5-cache/sci-electronics/librepcb-0.1.7  |  17 ++
 metadata/md5-cache/sys-devel/Manifest.gz           | Bin 35821 -> 35816 bytes
 metadata/md5-cache/sys-devel/lld-13.0.1-r1         |   4 +-
 metadata/md5-cache/sys-devel/lld-14.0.6-r1         |   4 +-
 metadata/md5-cache/sys-fs/Manifest.gz              | Bin 34841 -> 34847 bytes
 metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2      |   4 +-
 metadata/news/Manifest                             |  28 +--
 metadata/news/timestamp.chk                        |   2 +-
 metadata/timestamp                                 |   2 +-
 metadata/timestamp.chk                             |   2 +-
 metadata/timestamp.commit                          |   2 +-
 metadata/timestamp.x                               |   2 +-
 metadata/xml-schema/timestamp.chk                  |   2 +-
 net-dns/Manifest.gz                                | Bin 8862 -> 8859 bytes
 net-dns/pdns/Manifest                              |   2 +
 net-dns/pdns/pdns-4.7.0.ebuild                     | 170 +++++++++++++++
 profiles/Manifest.gz                               | Bin 148370 -> 148372 bytes
 profiles/use.local.desc                            |   1 +
 sci-electronics/Manifest.gz                        | Bin 8890 -> 8891 bytes
 sci-electronics/librepcb/Manifest                  |   6 +-
 sci-electronics/librepcb/librepcb-0.1.5-r1.ebuild  |  55 -----
 sci-electronics/librepcb/librepcb-0.1.7.ebuild     |  60 ++++++
 sci-electronics/librepcb/metadata.xml              |  18 +-
 sys-devel/Manifest.gz                              | Bin 10473 -> 10467 bytes
 sys-devel/lld/Manifest                             |   4 +-
 sys-devel/lld/lld-13.0.1-r1.ebuild                 |   2 +-
 sys-devel/lld/lld-14.0.6-r1.ebuild                 |   2 +-
 sys-fs/Manifest.gz                                 | Bin 22231 -> 22232 bytes
 sys-fs/cryptsetup/Manifest                         |   2 +-
 sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild       |   2 +-
 142 files changed, 1738 insertions(+), 834 deletions(-)
 delete mode 100644 app-backup/borgmatic/borgmatic-1.7.3.ebuild
 create mode 100644 app-backup/borgmatic/borgmatic-1.7.4.ebuild
 create mode 100644 dev-python/fsspec/fsspec-2022.10.0.ebuild
 create mode 100644 dev-python/jupyter_core/jupyter_core-4.11.2.ebuild
 delete mode 100644 dev-python/jupyterlab_server/jupyterlab_server-2.14.0.ebuild
 delete mode 100644 dev-python/jupyterlab_server/jupyterlab_server-2.15.0.ebuild
 delete mode 100644 dev-python/jupyterlab_server/jupyterlab_server-2.15.1.ebuild
 delete mode 100644 dev-python/jupyterlab_server/jupyterlab_server-2.15.2.ebuild
 create mode 100644 dev-python/jupyterlab_server/jupyterlab_server-2.16.1.ebuild
 create mode 100644 dev-python/moto/moto-4.0.8.ebuild
 delete mode 100644 dev-python/nuitka/nuitka-1.1.3.ebuild
 delete mode 100644 dev-python/nuitka/nuitka-1.1.4.ebuild
 create mode 100644 dev-python/nuitka/nuitka-1.1.6.ebuild
 create mode 100644 dev-python/pbr/pbr-5.11.0.ebuild
 create mode 100644 dev-python/scipy/scipy-1.9.3.ebuild
 create mode 100644 dev-python/uvicorn/uvicorn-0.19.0.ebuild
 create mode 100644 dev-python/watchfiles/watchfiles-0.18.0.ebuild
 delete mode 100644 dev-vcs/git-machete/git-machete-3.12.1.ebuild
 create mode 100644 dev-vcs/git-machete/git-machete-3.12.5.ebuild
 create mode 100644 games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch
 create mode 100644 games-emulation/pcsx2/pcsx2-1.7.3468.ebuild
 delete mode 100644 metadata/md5-cache/app-backup/borgmatic-1.7.3
 create mode 100644 metadata/md5-cache/app-backup/borgmatic-1.7.4
 create mode 100644 metadata/md5-cache/dev-python/fsspec-2022.10.0
 create mode 100644 metadata/md5-cache/dev-python/jupyter_core-4.11.2
 delete mode 100644 metadata/md5-cache/dev-python/jupyterlab_server-2.14.0
 delete mode 100644 metadata/md5-cache/dev-python/jupyterlab_server-2.15.0
 delete mode 100644 metadata/md5-cache/dev-python/jupyterlab_server-2.15.1
 delete mode 100644 metadata/md5-cache/dev-python/jupyterlab_server-2.15.2
 create mode 100644 metadata/md5-cache/dev-python/jupyterlab_server-2.16.1
 create mode 100644 metadata/md5-cache/dev-python/moto-4.0.8
 delete mode 100644 metadata/md5-cache/dev-python/nuitka-1.1.3
 delete mode 100644 metadata/md5-cache/dev-python/nuitka-1.1.4
 create mode 100644 metadata/md5-cache/dev-python/nuitka-1.1.6
 create mode 100644 metadata/md5-cache/dev-python/pbr-5.11.0
 create mode 100644 metadata/md5-cache/dev-python/scipy-1.9.3
 create mode 100644 metadata/md5-cache/dev-python/uvicorn-0.19.0
 create mode 100644 metadata/md5-cache/dev-python/watchfiles-0.18.0
 delete mode 100644 metadata/md5-cache/dev-vcs/git-machete-3.12.1
 create mode 100644 metadata/md5-cache/dev-vcs/git-machete-3.12.5
 create mode 100644 metadata/md5-cache/games-emulation/pcsx2-1.7.3468
 create mode 100644 metadata/md5-cache/net-dns/pdns-4.7.0
 delete mode 100644 metadata/md5-cache/sci-electronics/librepcb-0.1.5-r1
 create mode 100644 metadata/md5-cache/sci-electronics/librepcb-0.1.7
 create mode 100644 net-dns/pdns/pdns-4.7.0.ebuild
 delete mode 100644 sci-electronics/librepcb/librepcb-0.1.5-r1.ebuild
 create mode 100644 sci-electronics/librepcb/librepcb-0.1.7.ebuild

diff --git a/Manifest b/Manifest
index d599903fc8e5..541e02beab2d 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29594 BLAKE2B 9741d98f1d7e70e0b2d8a82fd3da727690193a2aa8571496f4228cf73676167031439c0ddd3b8f8e442b809d990ef01929c743b5866aafcc2296b3edc0903f87 SHA512 06a2a7ab234c902f9f7bbe5c72de224fec68ebd0608c99000a1e3e47b53cf63f17e2e0d3ae16c2a62f0ba1aaefdb28ec49b7dff1393cfa29368aa5fb3b9236c4
-TIMESTAMP 2022-10-21T06:09:39Z
+MANIFEST Manifest.files.gz 29586 BLAKE2B 5bae4322ded9c78d6bdb2039eefb2bf32a988c1827d8bdb19ae22d23229d805c737d09f30d15da0e7f85affd4caa6a84ef40602c745f3a8a4a85a787ecb87bcd SHA512 ebe31eadebddb941928fdb41f785caf0471ca9a1ab3c9aa2526da0cec5a879c38221ad3367bfb1ddb0c888246153068ec04243c1c306d63df66a68f28441ab28
+TIMESTAMP 2022-10-21T12:09:38Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNSN6NfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNSjAJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBW/xAAjhYHidWXXJkvX5jeI5WsyHVOtqCFoYc3s9LcTQPnvTp95OE4yTEPHJwC
-o5zPz3qwDRe35J+WAZL0Ru+KsTml+I+JyrDBK4gB76IZnTtfvkZX2H19sZlcP8rG
-LZ7weL2711NJyNdcx0d3YTFU0G1fx76mVWLevrL66Xnrftz/hZpeqtfo2BZeqTY4
-U0bEuA0PVztIuyhPcHTIJE5fclgW0eefD0+++P6DQapd5dY08WzTu16+uGUW5340
-b06OKBOH+pmG/YoIPEoB/yfNmHlvrWMUZyyRk3jRKo/hI3brXGnXZR38fD3nVZul
-86rfv58TgW/ahGCvL7ewamtTDzAYZqGC1OPZV2JrSBMmbrldnuM95JStObhKlXx4
-Th/POpbwRYBB5D32ZXGKq/RGby9FRpJGkCaOWh1/nbyzoG5xbauyHc/p7PyhHhLk
-PKQO2xEfC3CKrDVXKogAG81CQurgGYL/0DGzZd047dCcBQ42xgxQjFirD7GgOyyI
-JKzvEixjMAGhvRRbHGo/iJy6zObNlJBMOY2LiHZ184MnvfyQBje13h1Gu7kWqYqm
-pRqwcbYSFunaSkMuLzj1JTH/KF6aFjnTgria6B8IaBxpQatEmTBJ7Kuzxa+fAAjb
-NroT8UouB2q+mXmSPrKDtJuHTbD/KeDUMH4qLM6/C4kIzhrAwws=
-=xDSW
+klAh/Q/+J7XblVQPVijTUL33+uTd08qQmIKcrGBlqezhK2e9rW5pUw6TWNGhucjt
+xL3O2O5AnnRq6C+ocdbIPRZ6OgPEaypfWWwhj3W/VirFgyWtdBP8yhGzL43EtTlA
+l65H3pc5T10nkU13+EFONNHQ8rfJk4VEXftNMagPb6KU2cPNrxdLijvisx9axf46
+V1AGk76B5IGYe78RYh9vMwY/VkmJvX5wk7QBJEsikgVTPDuNsLlz4YRGA88QWhQ9
+hGF8S43Q4q+3RCcmoyb+X9pttck6x7y/6WwUBJYM42zp++Sirhg5GKHQF59GfvhN
+oFpk/8HzSi9yYYwZ4MAZrHS1VudZSR42zCxB1qhw7qMrb1qoBRR0HEgJH8DfkQ+x
+aCnfsAcoWX3B2zGGWxUE51hOiFhMkQjK//99ffcNJskdlbfjJ/jUv+0cxwu8CxWt
+wkgsTEHM+IssMUW7T34mTWcZ4wf07gSdmmTOw1cd0BhUn47d/hI161g7VxMT7R1Y
+Ha4eIcQ/ka2fXacEHuN1+AILRqm3HVExFj5vOTP8fuc0qaWcmpgY8dpPxiV6Ex8i
+3aObcjIqL9YwTOX5KAm82BiTe1xNRoSUKY3FKwWFcPvIhxMur4mXMm9KKyaS0p7T
+aCfKYcwvsoNLK+a0VWR8RX2FUX2CF7vy/yE5mSxNEnHYrqOsswo=
+=RcYH
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d2ed201fb557..502e7dd41dcf 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 c17084c16301..74c4be127d54 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 2d7719606045..af24cde566a3 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -3,8 +3,8 @@ AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972
 AUX borgmatic-1.7.3-systemd_service_bin_path.patch 604 BLAKE2B 9b1c613ce2667d2b8846e1bdf7e7bd838529fb9029af2ca572dcbafc5a8c9b64c79cab820be3b750c5fcb060da72cdf1c449cbe50efefe63ef1eb6a884e26e14 SHA512 6ca6c351697db1ae26de2b00ad543fc8f1cea1b0f4ef84f82f9578d9e56da58b4437ed48839c5aaf7d5ea66fcb79620d0cc12b8a2b30862b488fae07ad182638
 DIST borgmatic-1.6.6.tar.gz 323601 BLAKE2B b40d8f00e3b7bbd343336cf4c6992e34d8289de451c184717827e8e43519b84d4bb9b8cff6a835a7cc502d2e93045f0196d744e4b6ad800de1276e11c3189cec SHA512 f1a6dfa344ebee89e88f1aa6b43d8493c80815c637d8e0f7f6314462fd511b576e62246d957023ab2f9a68875d2818e2b8ef00cbf3339dc35a93d6ebad0bed19
 DIST borgmatic-1.7.2.tar.gz 333772 BLAKE2B fd628e9c77547686d4edf5d1066d3c171575f4d923ebc5205c5eb64f3a960e94c121282e9f4fb02b1291a81011a18dc393c6d13a07f215585459e7a5b55f8107 SHA512 6ec12ec25ae4d0210bb9114795c1ea292d8236f9e68c9425e24ee7b580796504e4c317a3fcf778806a33bbd3db68669beb4ef7a88ec538c1bd432db9a2845b3e
-DIST borgmatic-1.7.3.tar.gz 337143 BLAKE2B 3cd0112978feb6476c9d6ea9a81bb535406514e82d2134f408935c5949ecc276881c4402251bffdccf814fe58c93d6db4d0cbe4a63138a865bbab3459e1bd83f SHA512 aa40090fbddd5453c792cf289021d52347b022a2dfb5bf53d7695f594c27a2fd8e7d9cfe0912e02fb3c1c1b8cd7a4a1a4f4890f86458bde58554f58d9d30b523
+DIST borgmatic-1.7.4.tar.gz 337521 BLAKE2B cbdf22c7428d2bd098a8bec0608c9d2fe41ab945aca4921cf78f72a5b73e2ea562a1e9e37705ada615f830b2655977179beca0f9a9bfa2937cc1cde0c292caed SHA512 bd320cbbb108fa20f7acc9a50fd4404166556a74df0a3631a2beca61de0e50c29e1e102345e6c3759538420040f359ff2f0cefe89b49c2c19250a4c7a27acd54
 EBUILD borgmatic-1.6.6.ebuild 1904 BLAKE2B b03ba369e333dc898f8b7901ee651470ccd83d05c37becedbc2f6ddea0b5d29515eb5331015645b1b5f17b921dc180907d1a02edf96a6a1546db4d444f01b415 SHA512 dc5208c3fbed40f6617effc59539e1fcf1cc166ce4083f8a0475b22b0f1a8e70e4f0dcaf35c3acecd6ee6c08b1dd32961d59284b2baba565ea4c558f0bfcebab
 EBUILD borgmatic-1.7.2.ebuild 2133 BLAKE2B 6f2dfcb4e7822ee1de43a961888ed326b52fa2ed10b291b3aa04a0a510f28598e86d08694274275f52743aec9ff368efbe7c9db11feff7692534aa87b5963805 SHA512 461dde9ae021a879a997cab17caba0303011804fb656f5e884cb271e3d7913759166261f43d2684da80355a3bf9be6aaf89f0be9b1243bbe43a916397f95325b
-EBUILD borgmatic-1.7.3.ebuild 2132 BLAKE2B 298c29b49d49af5246a44ba3740944ae319b7f48c2cdfd1f694db9396b399d795279f8ba001eb64a577680704ea4cf1d5c76e2215c965524498bdce005049e6e SHA512 71d930f51d351a3244eb036aa926823b1cea3440bbde6fdb6caf6d25e1bb1794f81d0f4d65da6093a01f932096540284d646573c168a147524b7b4712012f727
+EBUILD borgmatic-1.7.4.ebuild 1696 BLAKE2B 60856bcf3b73f9ee31f2b49665637cbd9856f843f6dd62c8ec3cf4a058a3493dd9e7f241450a3644b478b0ed6f8435f374ece20f4863a0a8f929b516b798bf87 SHA512 f957bc2ae30f663388f87623836e0ab19168ccb0ed9c0970a2990f7c2c4861534d9a71fc0376b94ab9b5e01450eca225bac16b298a50b911af11b35dfab11a09
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.7.3.ebuild b/app-backup/borgmatic/borgmatic-1.7.3.ebuild
deleted file mode 100644
index 7693ff51ae61..000000000000
--- a/app-backup/borgmatic/borgmatic-1.7.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
-	"${FILESDIR}"/${PN}-1.7.3-systemd_service_bin_path.patch
-)
-
-# test_borgmatic_version_matches_news_version tries to run the 'borgmatic'
-# executable so making it work would require passing --install
-# to distutils_enable_tests. Given that this is the only test requiring
-# this and that all it does is make sure the NEWS file has been updated
-# for the current version, just skip it.
-EPYTEST_DESELECT=(
-	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    generate-borgmatic-config"
-	else
-		ewarn "Please note that since version 1.7.0 ${PN} no longer supports old-style command-line action flags like '--create', '--list', etc."
-		ewarn "Make sure all your scripts use actions, e.g. 'create', 'list' and so on"
-	fi
-	elog
-	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
diff --git a/app-backup/borgmatic/borgmatic-1.7.4.ebuild b/app-backup/borgmatic/borgmatic-1.7.4.ebuild
new file mode 100644
index 000000000000..a792f9e40a67
--- /dev/null
+++ b/app-backup/borgmatic/borgmatic-1.7.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
+HOMEPAGE="https://torsion.org/borgmatic/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+
+# borg is called as an external tool, hence no pythonic stuff
+RDEPEND="app-backup/borgbackup
+	$(python_gen_cond_dep '
+		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
+		')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
+	"${FILESDIR}"/${PN}-1.7.3-systemd_service_bin_path.patch
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	systemd_dounit sample/systemd/borgmatic.{service,timer}
+	keepdir /etc/borgmatic
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "To generate a sample configuration file, run:"
+		elog "    generate-borgmatic-config"
+	else
+		ewarn "Please note that since version 1.7.0 ${PN} no longer supports old-style command-line action flags like '--create', '--list', etc."
+		ewarn "Make sure all your scripts use actions, e.g. 'create', 'list' and so on"
+	fi
+	elog
+	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ae552a2dd56f..c4f3152f7123 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index b98b38757ff7..46cc7419b8d1 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,8 +7,8 @@ DIST poppler-22.09.0.tar.xz 1842704 BLAKE2B 7104dc18582611901e55dbaa84d9ae871217
 DIST poppler-22.09.0.tar.xz.sig 833 BLAKE2B bda372fa8d8d3d7ebe4263f9f81212d69e09b50e787a853390191c1bfcc38fd65f8e524f3810b6d3d25820ba5b2fe3d337c9e661c0747a73d64cbcdfb06b8205 SHA512 678e374c184e403b85cfbdc954b80fa4132f37d34eb60854f7708d7963b98f4e57997ec9a9aa8e17090ee696ff5821c3479857ef3f93a69e32c3f25744c84e43
 DIST poppler-22.10.0.tar.xz 1844524 BLAKE2B 4784f0aa9bf19beb251e0b7e3a9f42d6e21fea6f9e2ccdffd5ffc59167902466faf4bc13ab20a4e30cb272010416ede61020ab781c601cbe808debcce93013ef SHA512 9f80a08ae7c6c41c2ae9a2f3d2fbd8b65e430f290d2603aaa6df39d1d69f4418f76584c3f20733fb38731e4a57a8b04f55cf0f9753dd8a43be7b6d18f609f116
 DIST poppler-22.10.0.tar.xz.sig 833 BLAKE2B 0714d81b8ded72b239b7e8e8d7a7812336f03a2a37a242270b64c4622e994ad9f2798c49f8f8c2de9a0c3c732bd55a87ce37c66eb35819fa0a26ace072c0dc5a SHA512 6341fbbe65ae8ce132c7384f00ff4cef900854d72bfe2d1aae15767eef0a85e2817527ffea3e089dc08e076af4f72b67f1db559e90d32a9e29949b51abcf5a8d
-EBUILD poppler-22.07.0.ebuild 3491 BLAKE2B 3d0968091aa6473467ee1e090fe40485ede546e93d6c8dde1719dabb5bbc7470cb2415a2f41fe05282e96685e955d087b944e1981099803840dd590ff896c1c8 SHA512 0d56c0ae8cdb7503e3b459668052a1d00269c8d9d234586fdf9eb38965814ce6a3b2adebe5bde071283018d2136bc8698dbe25529508b6848ad0f8bcaca9ef87
-EBUILD poppler-22.09.0.ebuild 3650 BLAKE2B 58a7485af808183ca860092c31917390db3ea5b4e928047dc70d3665562328859606b9a383bd9a1d8c027162dfe4dd2a2552e07e2a3f510db5880264d94053dd SHA512 9ac1db706e45d30237e1a202a216e4cdb0b05de486a9a9278d84c0c567afff51d6af1d6f2b1cdff8beaaa25d2624f90350726978b635c3dc811bb923dcbdaea4
+EBUILD poppler-22.07.0.ebuild 3470 BLAKE2B 36be3f76d028fa1abf516071588b31590f39a902cb66f0810503a496c0dc6d92d0c8b4316d82e2f220fac2cd6602e704b9e13df6c0406ba4e6251d7d2f14406e SHA512 4adb7ccc8e1a29a75866faa4daa29057a2d74f21862fa8c33152e6d940047462fbff7e0682d8815ebd126bdec8771efc8aa39a0cd7a8c1bdea3916bce4d82998
+EBUILD poppler-22.09.0.ebuild 3649 BLAKE2B 8cd499f7121ddfd2abdbb987c1318d7a9510ac3efdbe613b945823fcde8091b3e6b8ce081bf1091bc635c3ae13d9ca6323f5f84cb2e880efb09f68b5bf7ad4b3 SHA512 a49ddf6f7d92fff70ad0422b6f66048f7f4656b6627f3ae2fa8838f016dec4c3c406c08b92513f4c9ce64a5a2a8322c1850678fce3b2decab5bc0caaf90943c7
 EBUILD poppler-22.10.0.ebuild 3656 BLAKE2B 2da2cabf00caa4729e0fc70f265694a1ae97e6f1fbbf71f462fc79d89f15aa92fdf964cc45c563e4a00dc426f22bd499e41c99459288226d1bdf5b7137bc353e SHA512 1f77e93ca0ab9c18c2f9692b4a51cc81ecae1168a52562eced65bea5b9e8719c25767640812eb90f7d47419d8c04fc3294e11528b0b1dc4923cc34d1f492b0aa
 EBUILD poppler-9999.ebuild 3656 BLAKE2B 2da2cabf00caa4729e0fc70f265694a1ae97e6f1fbbf71f462fc79d89f15aa92fdf964cc45c563e4a00dc426f22bd499e41c99459288226d1bdf5b7137bc353e SHA512 1f77e93ca0ab9c18c2f9692b4a51cc81ecae1168a52562eced65bea5b9e8719c25767640812eb90f7d47419d8c04fc3294e11528b0b1dc4923cc34d1f492b0aa
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-22.07.0.ebuild b/app-text/poppler/poppler-22.07.0.ebuild
index 3883ce28bb9a..7537cdc4f757 100644
--- a/app-text/poppler/poppler-22.07.0.ebuild
+++ b/app-text/poppler/poppler-22.07.0.ebuild
@@ -15,7 +15,7 @@ else
 
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="arm64 ppc ppc64 ~ppc-macos"
+	KEYWORDS="ppc64"
 	SLOT="0/122"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-22.09.0.ebuild b/app-text/poppler/poppler-22.09.0.ebuild
index 42ffd8c7420f..c45bf978c640 100644
--- a/app-text/poppler/poppler-22.09.0.ebuild
+++ b/app-text/poppler/poppler-22.09.0.ebuild
@@ -15,7 +15,7 @@ else
 
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/124"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e41753f2c63a..f8dcce8be0dd 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/jakarta-servlet-api/Manifest b/dev-java/jakarta-servlet-api/Manifest
index 7cea03e459ee..059917d4c47f 100644
--- a/dev-java/jakarta-servlet-api/Manifest
+++ b/dev-java/jakarta-servlet-api/Manifest
@@ -1,5 +1,5 @@
 DIST jakarta-servlet-api-4.0.4-RELEASE.tar.gz 188270 BLAKE2B 6c5db208603333abb9aa31726e60d489c5f860e3b6ad61e691d65e8b99909a8139f7677cec52d2a74ed9e8445ea2f0f510875ca32a2e512a09183245a9822889 SHA512 9cd613f8c33f5d415b06f70543eee926c81e87a14d03b837998a6c4db11ce5fb9c2b97f796f2936a63f2a6dc7847d7a97aec7a804b80234cd52e4bfdca9920a9
 DIST jakarta-servlet-api-6.0.0-RELEASE.tar.gz 634690 BLAKE2B e48375f6a0b74950a2c50d73f2d50f7c79db96e22d5c845380bff670948cd1a1d1ea98eaf93e7fa02887e94010c8573382ba3f6fb52a8fca6fa98e5915c307f6 SHA512 65285bce3e8b5143eb33d548549ff5653c6c90f55e7a19e8fdb4a7799842d3430cfe0cebe54f7a7d253d9da4c2b6d4d7a08b35846636c11a2ca814b8311cecc7
 EBUILD jakarta-servlet-api-4.0.4.ebuild 935 BLAKE2B 5007e96b0617853577ea6159caa7e587e9316568f5ea620c8366d27c9dbe74b280b646d8b60c2ad9dd37b1ff37556d9c2a5c49f74d918d0d0ec58ad243e2f3ff SHA512 cab6ebbea0966a0be1f785efd65e2af6ff8b80a602101877f8551be26ea945f20208d820743a8be59fc83aff4c84e12d03516cf2dea79b2de9d8e207b0ddf03c
-EBUILD jakarta-servlet-api-6.0.0.ebuild 1278 BLAKE2B 6fa04052e4998180cbf2b91d2ad3ef2d8fdaa2eb3287d516458a93a4fba8b429f14817218ac276ba81816c9b5a3a3da51ec52860d8bda33bdb6bb9f8bd4ea06e SHA512 fc36764e2ed54b3e2818dc3d85f3f09adc8b0ae3e122b658ffdad48d546906793dff340c6c4308c47eb3a19eda2bf416101062f99db41ccff589b23ea8541467
+EBUILD jakarta-servlet-api-6.0.0.ebuild 1276 BLAKE2B 286064fa66026035e2b9e511aedcfa57cd7070741857ad768d0dc6fcb0edce2fd434596e4701741ec1340c8a656794dc18ca6abb4a6590c4abac2b9b9e98a2d5 SHA512 25b103aa0fdc99e9a23df2bd98e43cef804fed73fe6907fb2f06250a244e880793977a7286c744385ba00559b6d7c5ec8a68c0519f2a3a22c553f9094323a5ef
 MISC metadata.xml 332 BLAKE2B b9a06fe2a5573bde0da5b4f0d11a4cdf8c26738b67ac575014c01ed7fadfbc057a63fe2de907942a83d12afe8335933edbf671460b33939969bbb8d2657ffd81 SHA512 4c044f785c3a41116e24cc56b46b8e74327e4fbe29b11a25e1004e18d815023d073465658bb9467afbf80f8490e29815e1e52ce3d5ccde250ae48f0edbf0d380
diff --git a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
index 74495765cc3e..b3bba8165175 100644
--- a/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
+++ b/dev-java/jakarta-servlet-api/jakarta-servlet-api-6.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jakartaee/servlet/archive/${PV}-RELEASE.tar.gz -> ${
 
 LICENSE="EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm arm64 ppc64"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-11:*"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e205010af519..d65165b9ee22 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index c29297f363be..c84ce6df86c9 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -4,6 +4,6 @@ AUX jemalloc-5.3.0-gentoo-fixups.patch 1233 BLAKE2B 4654d1ecc2846281530b922e942d
 DIST jemalloc-5.2.1.tar.bz2 554279 BLAKE2B 52cb8cd5e5807a750a7e5e9ee005afd61144d821d7f7029a5eca998fd61787a7271338dee3de586ddf93f5fdbddc2c2ca03ba64375a70096f273a6aa173da431 SHA512 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
 DIST jemalloc-5.3.0.tar.bz2 736023 BLAKE2B 9ff51616c3fb086d7cc021c59b83e5f0304d886993f4b5194a6956ffaf742cc509d08a2cf81ead6966c39a44f35621b57550f4a5c726c4508fd2c86c7c056ab0 SHA512 22907bb052096e2caffb6e4e23548aecc5cc9283dce476896a2b1127eee64170e3562fa2e7db9571298814a7a2c7df6e8d1fbe152bd3f3b0c1abec22a2de34b1
 EBUILD jemalloc-5.2.1-r1.ebuild 1418 BLAKE2B efc1ecdbf966fe0f3fc69f065f51c66946b59b68e59197079d9a1fc2f88da1f736015f9910a5923b0f1f2b476578f2b21d5edfea61337c76ce689326338ebe26 SHA512 745d3534239ac337bef2b6cfb38dbf5cf9b648781bfad50e9e8e3fa037313183c7a5b447e72221db152315e0372ec03edb23b102a368f818b30adbb1d50657d6
-EBUILD jemalloc-5.3.0-r1.ebuild 1586 BLAKE2B 2925005e2c44e5946ae93c6b9c0d280dec817f77241b9401a76f2749024fa6cbb856038288f133f5c288f67d97bde6ac3a297f2e90b04d29fd142bd75281c0b7 SHA512 df5bd8f6e9153bed7ebb32fb11d05a985c1f2e722b635a351e1a9df12717e38fb4fc9339a7ccdec6265ea7da5d1bb13d1270e02030c0dc5c7edc9620827ff838
+EBUILD jemalloc-5.3.0-r1.ebuild 1584 BLAKE2B 28056a4258d27969b47f84f5d102588d4249ab25b13f3dfd5101e25e012cd5d9895ae42acee99d655e8c507a51dec09b665c67607461a572053b9e179278ca5c SHA512 d716682d4773a63fc91226893ce3ee9e6d82cbfaec7d6bb2e59e003e3f83e30fc4312dc1aae9fc684a29a538e8c95676c246c69b5024ad0087fdf221405d42b3
 EBUILD jemalloc-5.3.0.ebuild 1509 BLAKE2B efde538a9372f7dd4a8d7da8019892cd03f9e9c2355b6216be9c9e639364e967b4d762b246050b4147514a976bb036fdd1807438cedf8c78dd47ba5b535d181d SHA512 7a94711a79b3aacb903ae5e5fdd570a4e4747d3557d789e745cec257c5f64048ed2baf4b67a501e2567141b43f159765315f16b19ae6c94a9a1ef69b635f0321
 MISC metadata.xml 638 BLAKE2B 5d10d2e2db2f0557f2a0176e8e4ad244aa6b9209519c4b21c68696561b6a2a558f206bbd7de37d1f021231b8c84ec08a6796f0af5e5b32c2ec8c047ee50e8fab SHA512 31f22b88e6fa5252504cba421a730f13a18c213dec487a764c2c05555d45539ee58a0ddfe2212f535bc276934101125a3940c9b4934c7f924e89f85ebe75672c
diff --git a/dev-libs/jemalloc/jemalloc-5.3.0-r1.ebuild b/dev-libs/jemalloc/jemalloc-5.3.0-r1.ebuild
index d9d25ddc82bd..bc50663f65f4 100644
--- a/dev-libs/jemalloc/jemalloc-5.3.0-r1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 LICENSE="BSD"
 SLOT="0/2"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="debug lazy-lock prof stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=(
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6e09c844b8ed..6874bd288392 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 3c40cbdf314c..3839ceaf82dd 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,3 +1,5 @@
+DIST filesystem_spec-2022.10.0.gh.tar.gz 338829 BLAKE2B 93d0f878218d750f605d0f6cb7011504d3b5325ec9d80bad3e4d0f2c51e7494c751478958131bb6522ad5c3144a129a508b948a114f3a6c55d43b9a206b46a2b SHA512 ac8d9118df9b69c082e0707990ff29bdd7576534622be8fc1a10e8cc14d1d3a328fc8e022dc9f316af3da4afb4d38fe3fb533222aa89c47d4d49a296c6b9bf6b
 DIST filesystem_spec-2022.8.2.gh.tar.gz 338446 BLAKE2B 0f3b78794271b367d8e5d26ff889e7d72df7148baa7ca2e7dca3884cbeff74b41f5ce1a532fa768523f29d230f574e630fb3de43b767ace874f831a4d2a47e1f SHA512 696f726000c413ba78380b5e17e312ecca30b51093ebf8d7c3658fb7b82ace57223d3aac471e3a772d350523142bdf983b547277838cca0b182ecb4e0a4b3924
+EBUILD fsspec-2022.10.0.ebuild 1370 BLAKE2B e0b00d994b41327f60e7a8fb8f89a751f7a699eaa01c9169c23b46b82833e05a3bca1933ccdca18527abedefbcecb4514771416e49f9002f9bb9dc36f9248f6d SHA512 0c26a6736d1598fd4305a82408031b1af5251d10b59c6c87f8464d1af88723537f05af1dac4fb71ca76cfe1710828c360d65642a6ebae5e56ac57b433d08e636
 EBUILD fsspec-2022.8.2-r1.ebuild 1368 BLAKE2B 2ebce7153de30d870b270b903ca1b837bf437f97c804b0f69d104d920026de5a986ce9e8a62e4c33acc090d632c5da1d0d394c8555cc303bc87d6476d9690571 SHA512 e2f20c7c1eab0e5286f57f16654636b68599e7011caea8ce38a8152617bdcaac20220e9240cde7a266b6f5ee5968beb60998117c785aa97731e013e84a88e869
 MISC metadata.xml 374 BLAKE2B 6c0b18a0ad3b85713ae6f618ac0646ed63f08549bd7d1ed5bd94b80d89d79efaf2f97ce913a0a7d6e54e77cc602994416520a22deadcc71e484cf7ca22bc6dde SHA512 5bf051387d6bcffb3022d023f60ee8f76ca277bb8d626dda988a0baaf1d1e3a71e872d8316607ee7e269e579b5a17c23ab93c56fade533150171d3ce44e4bb71
diff --git a/dev-python/fsspec/fsspec-2022.10.0.ebuild b/dev-python/fsspec/fsspec-2022.10.0.ebuild
new file mode 100644
index 000000000000..dba46d7fc2e2
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2022.10.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="
+	https://github.com/fsspec/filesystem_spec/
+	https://pypi.org/project/fsspec/
+"
+SRC_URI="
+	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tqdm[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
+
+EPYTEST_DESELECT=(
+	fsspec/tests/test_spec.py::test_find
+)
+
+EPYTEST_IGNORE=(
+	# sftp and smb require server started via docker
+	fsspec/implementations/tests/test_dbfs.py
+	fsspec/implementations/tests/test_sftp.py
+	fsspec/implementations/tests/test_smb.py
+	# unhappy about dev-python/fuse-python (?)
+	fsspec/tests/test_fuse.py
+)
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 4f991bdbc85c..c77c21d53073 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,3 +1,5 @@
 DIST jupyter_core-4.11.1.tar.gz 73661 BLAKE2B 38f93826fd86f5b4dcd5495473426e934365aea3156e6bd881041920b5604a7ae11becc3d1037785f448f085b03e5afa361b7221378425e9e758fca90ed850e4 SHA512 38348e8fc349ab7bdc83599607e6179c2d14dd3a42daf6b52cb0a6fb4feee360aed4e7c682e6349dcf560b2dec598f9a27477e0b2e982fd85e5a385b1bca5858
+DIST jupyter_core-4.11.2.tar.gz 788994 BLAKE2B a337d6974f905b3b666225f828f2026f7dd314e34411f7998b8d2981ad9623029901e5369bfe831ecfcbf3be387bb0adc7f067269537a6b2a73029f439bfe9a1 SHA512 7659b61ad5793d6e4ceba09f7d4422610ceb358cbba30e2bee7ab7910e6c03cb365fad5db8e4444f9e0fd196361d5b15370f41fb7cb13c2e551382e19d7d6b73
 EBUILD jupyter_core-4.11.1.ebuild 662 BLAKE2B f73ead1fe9358d15a04732beceea90c10525a1d6db3c91913ba4e66dac88908a51bf8cb89b48b70858d77def53b0ac4b1fb50882cc8935a61a6d52c51b52eff7 SHA512 cbcbbf755c13d602563b2f93a95791eb41104fcac4fd9c1e3b6d837c42fd00be2636bb6082e1c97f91d36358fcbfd954ff2b5665774857aa8579558aac8f2fb3
+EBUILD jupyter_core-4.11.2.ebuild 756 BLAKE2B fb5b6b9e012d58ee2ee2e235b9d2dfef05c9753d5e670d35cc3f2b4b4bca9cb1536ac009903ef6a523bb9fe88d3893db87a416c14d79201206ccee760a1a6814 SHA512 fc5019c9fbccca1ec1dfa98c1dd1ce036d2c8985f6894a2dbf4b46a3cc54f11838134fafd82be93784f8da8be6ed9d37ba96c5d695bba78c3a8b4e169c5a84ae
 MISC metadata.xml 759 BLAKE2B 4ef6a95640943d1b082bb65ae17515300089c6d78c0aa81410f4c7e57e1447787ad15373f314f8ea5c980459f4e5f74ee54edace2eb9421991e2425793040adc SHA512 d9769460a005d11961ebabc81636065aec545166820e923ab7abd58782e0832592a58611ccb4485164ef7c1c646812e8f608fafb9639525663732dec730542f5
diff --git a/dev-python/jupyter_core/jupyter_core-4.11.2.ebuild b/dev-python/jupyter_core/jupyter_core-4.11.2.ebuild
new file mode 100644
index 000000000000..f7de21236410
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.11.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_core/
+	https://pypi.org/project/jupyter-core/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-github-alt
+distutils_enable_tests pytest
diff --git a/dev-python/jupyterlab_server/Manifest b/dev-python/jupyterlab_server/Manifest
index f0396f2dbcee..30fb5fdc3753 100644
--- a/dev-python/jupyterlab_server/Manifest
+++ b/dev-python/jupyterlab_server/Manifest
@@ -1,11 +1,5 @@
-DIST jupyterlab_server-2.14.0.tar.gz 62704 BLAKE2B 93277a6880a9395622e6c0ec1da9522c5e30e7a8144c8629de89f45845964008f0a435ec84289efe56043c8ebb998ea65df1d09f3da72096f255fcafa29fab53 SHA512 21ecf749879663378d865bd06161fb3e331f3675038917e405df0cb77d4a4cec55340a35d6511676fa4d91ecaedcd1e7f8aec3a13ad3a39298d10911ab215cc6
-DIST jupyterlab_server-2.15.0.tar.gz 61443 BLAKE2B 48ead96f13caf747cc14f7d65dc6104822dcd0fe17315a2cee4111598b40f05119998f169aef90411e84fe24e8f09736c857325752cfa3f22047acb2a9e2e3c1 SHA512 27530b293ad7c171b280a4c165d7f983c85238c4cb0bc89bb2eda8493b2988f047045c842ba456df9d0bfef00b5ee28b061c537ef6293d726c3a4f3d6572727c
-DIST jupyterlab_server-2.15.1.tar.gz 62345 BLAKE2B 14d82bc9cc7566312c4f434b78f396bb822f150653e3be6f1e328d620d1d8b205a8dca8c0b4a1e84a52562e04f76cb63154fd1b58f45da3a4f787a32468595cc SHA512 b4fba8a09562a70a705170406b69cbfaad4fcee290ca74e7949155698af616e4ce650a75c06bfa613e1a307980a4769418587ccf33a964868053ded9a7648095
-DIST jupyterlab_server-2.15.2.tar.gz 62533 BLAKE2B 46df68a0f1500e1b4520817ee63042194e65e72fb9d63058bc18effad1668e19733e6a1d5edbd2ec6e07c4c932c2901d974f787455142404f8162d2a83205f68 SHA512 670b9cb3a982d832225a7e632dda57000044a5a4b86f4d0c308cc20c1ad8db09216ae3918af52209dd3bfb04d34c807fca7060208db239b52ef9f29b92943ead
 DIST jupyterlab_server-2.16.0.tar.gz 62546 BLAKE2B ce8c1d8aa906d61ebdfccbcdd851a26df09c39a4dbdbe84297889b6a28960eb7616de049b6a6cab6188ae4392535f1e45f60f4699b52ce9eea4071c9b89d7745 SHA512 13df24cf3b77d74b64cbacb6d0d9f385e2e09adc77dc223a0ebaa56585c29f7fcf3f91c0091c4d3354dc0059ba1126cf813c74119f3c8f6a6244b9d1f0ab43e2
-EBUILD jupyterlab_server-2.14.0.ebuild 1639 BLAKE2B 0d0e407d1cc7a23dc4695b1c02e26ee44245852312925557c26f982e158950cc874e8b71146b0099a1c174c176f609aa07a4c60701dc67a795b7c48b9f42f7c8 SHA512 3177bebf38b63510accbcad54965e0fb9ebb3cbaaa18c611d49c7b8fbca3ed44fd94d5412faf9d3eefd86a036b965a3e5976e26cc5ac83c5ba4b64e1cd84a422
-EBUILD jupyterlab_server-2.15.0.ebuild 1751 BLAKE2B 78194ccd23664839271fde49bcdba89d775028d078ef33a54796866dbf8050b23403839d7236f909a3e1fe68f930ea0bcbb9b9697b116f482977b8039fdb27d4 SHA512 65006064e30c9b8552f1c6df538bd0b779ff7922021fd83b87bf03d5794ee27cb91be970d3d2d6a8d68db8f5a374844f495e206af94e065a662189a4f07ca632
-EBUILD jupyterlab_server-2.15.1.ebuild 1751 BLAKE2B 78194ccd23664839271fde49bcdba89d775028d078ef33a54796866dbf8050b23403839d7236f909a3e1fe68f930ea0bcbb9b9697b116f482977b8039fdb27d4 SHA512 65006064e30c9b8552f1c6df538bd0b779ff7922021fd83b87bf03d5794ee27cb91be970d3d2d6a8d68db8f5a374844f495e206af94e065a662189a4f07ca632
-EBUILD jupyterlab_server-2.15.2.ebuild 1815 BLAKE2B 810ab814926f74cd52ed7e56201b5353b811c771c03a96c68e63c56f5efa5e885647d69d641a31334e6f4c059bd4dd8d7f108a2204ac3653b798008ee56b3852 SHA512 12e2361918aaffedfb9bbe9794ec06973a014199b974b2b6cde293c2fafd67a8d6c7580562ea87984554dbdf4ed55ad2987e5f490aafc8b57c62bce3ff9acfe0
+DIST jupyterlab_server-2.16.1.tar.gz 64634 BLAKE2B 05d71b229b9e226bcae409028ff97fa6313662b506171ee5fcb3d8a0cb29c6339f5a54ce91a31b251e969d1418d1a6ede61ccefb1be5412f35bbe51d34378fcf SHA512 3841463b56adcca2d65a9943e04c084fef47b208b46012c9e01a3f91d58058d0bc8e0e97dd1c794ebc7963fc7106f4965524ba293268bb4e7a2e41158a7c54cf
 EBUILD jupyterlab_server-2.16.0.ebuild 1778 BLAKE2B 239ccae8f4fb9c102a885611bf2415f92c9b0a20441c26b0e93001e511523e7d36941e0ffb22760f9c4df20f29a721264f3f05b7c61cc3bfcf03b03d1cb7aed6 SHA512 e6cb219db11e258f4912af106740f01679601fb97b68a1abae08d59d5c20250b7926bf92ac4722397510b678556e67f5d1173f67380681c1fcf2a76cfa090435
+EBUILD jupyterlab_server-2.16.1.ebuild 1724 BLAKE2B 3537fbdd6336fab8b4a50b5699dccbf76472c2d27080e110f9842eab25d5ffbf50419f32494e8ba299cbdbd5ace8a5601d3b2d025aa46915883deb836e445df0 SHA512 ff9be41251f67d8ee840066ca902264f85706211ed30919ec14ab611afc1e6bb4d00e46badc0cf84d7d49c74890f435241ffb00f3b8972a6620b3fb8d6d38b71
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.14.0.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.14.0.ebuild
deleted file mode 100644
index ec49d91d6512..000000000000
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.14.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=hatchling
-inherit distutils-r1
-
-DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/json5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
-	<dev-python/jupyter_server-2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
-	dev-python/openapi-core[${PYTHON_USEDEP}]
-	dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
-	dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-	dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-# TODO: package autodoc_traits
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
-
-python_prepare_all() {
-	# This seems to not work for us, can only find english
-	rm tests/test_translation_api.py || die
-
-	# Do not depend on pytest-cov
-	sed -i -e '/addopts/d' pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.15.0.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.15.0.ebuild
deleted file mode 100644
index 88f6833ba9dd..000000000000
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.15.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=hatchling
-
-inherit distutils-r1
-
-DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab_server/
-	https://pypi.org/project/jupyterlab-server/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/json5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
-	<dev-python/jupyter_server-2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jupyter_server[${PYTHON_USEDEP}]
-		dev-python/openapi-core[${PYTHON_USEDEP}]
-		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-# TODO: package autodoc_traits
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
-
-python_prepare_all() {
-	# This seems to not work for us, can only find english
-	rm tests/test_translation_api.py || die
-
-	# Do not depend on pytest-cov
-	sed -i -e '/addopts/d' pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.15.1.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.15.1.ebuild
deleted file mode 100644
index 88f6833ba9dd..000000000000
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.15.1.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=hatchling
-
-inherit distutils-r1
-
-DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab_server/
-	https://pypi.org/project/jupyterlab-server/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/json5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
-	<dev-python/jupyter_server-2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jupyter_server[${PYTHON_USEDEP}]
-		dev-python/openapi-core[${PYTHON_USEDEP}]
-		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-# TODO: package autodoc_traits
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
-
-python_prepare_all() {
-	# This seems to not work for us, can only find english
-	rm tests/test_translation_api.py || die
-
-	# Do not depend on pytest-cov
-	sed -i -e '/addopts/d' pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.15.2.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.15.2.ebuild
deleted file mode 100644
index 1f1ed041c3c7..000000000000
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.15.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=hatchling
-
-inherit distutils-r1
-
-DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyterlab/jupyterlab_server/
-	https://pypi.org/project/jupyterlab-server/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/json5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
-	<dev-python/jupyter_server-2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jupyter_server[${PYTHON_USEDEP}]
-		>=dev-python/openapi-core-0.14.2[${PYTHON_USEDEP}]
-		<dev-python/openapi-core-0.15[${PYTHON_USEDEP}]
-		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-# TODO: package autodoc_traits
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
-
-python_prepare_all() {
-	# This seems to not work for us, can only find english
-	rm tests/test_translation_api.py || die
-
-	# Do not depend on pytest-cov
-	sed -i -e '/addopts/d' pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.16.1.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.16.1.ebuild
new file mode 100644
index 000000000000..246f5dbfdff8
--- /dev/null
+++ b/dev-python/jupyterlab_server/jupyterlab_server-2.16.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=hatchling
+
+inherit distutils-r1
+
+DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyterlab/jupyterlab_server/
+	https://pypi.org/project/jupyterlab-server/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/json5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
+	<dev-python/jupyter_server-3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/jupyter_server[${PYTHON_USEDEP}]
+		>=dev-python/openapi-core-0.14.2[${PYTHON_USEDEP}]
+		<dev-python/openapi-core-0.15[${PYTHON_USEDEP}]
+		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# TODO: package autodoc_traits
+#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		tests/test_translation_api.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_tornasync.plugin
+}
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 276c75bf42d7..be8b410d563f 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,8 +1,10 @@
 DIST moto-4.0.0.tar.gz 2404959 BLAKE2B a9969cb306937deaa15aca1ee76a447d0e416a7be160da9c81ce30e5147fd595cbe7b38f84ee26e795d055e3f62a6c1467e176d9b7ee58197c9d22a34f94918e SHA512 11bc093b6e89bad5340433daee0f9ba482a8534ab73a57a77556510f1dfef8186ee45b6c914bab291e861eb50d4bda7686d3d22d469db87a79e3247dbefd2e6d
 DIST moto-4.0.6.tar.gz 2465655 BLAKE2B e9ab47e910baf2b704c87a0d4583bdf02f2e4a1a23d08402c431012b18750ed229abdd96c98bb5dde5ba69837613853bb108b4d390b5c28afb3475b63d97bf95 SHA512 32def58317c2e76960f2db1d79a95a5468d110284540f9441e495b7d08109ab0933a2f5dc8673fdc71bd601cb5f6395f53aad7d1aef065c7ee3a1a318e5850a7
 DIST moto-4.0.7.tar.gz 2478859 BLAKE2B ba3df603fd1ea9e944037bc8abe3d9343fab483efe4446045cf81e16d9918e5291e4470e2b6d51faa99c64a581c2a7890eb9a558fd9b4e431b70b5c71393d2a2 SHA512 b0119cfa480d735ac255125c058c1026e0b32690fcedf64889845452bfc9e92dd2f64e3c413bdce24dd43a205b88a9df03896afe96149146a8690b7d6bb4437f
+DIST moto-4.0.8.tar.gz 2488253 BLAKE2B ae707de8f0917b62904f38f977eded8f3e995271da8a7d6be47f05a24e3cb8bb8121e5e52625deb6c8f836e5f328352a7e6ea0855a4278c32dc9363da0faa8cc SHA512 9d3d3164bb6a77901bb55b8c536bfc8822e5b5292d79fedfe89a4a7fefaeab24b740d9a898e9487152a45c5a3bfd15d8aaca042a485bea389e1a82bb0a90bdd0
 EBUILD moto-4.0.0.ebuild 4096 BLAKE2B 60d3dbe15f9c40b8cfa64fdccd57d1d24152a152449c24e0f5e5bd967471c0e1a181ef3d921ef04c299b2ea9dc13fddfe76c861b0f56f2522e64975850eac786 SHA512 a19ca0cf5b9b0db8a36705a39d84e8a67cc4e9153be8b4f5157736039457803ba51dbebbeca84c24e200c70584905118abce400c8211709bc08ae7e902bef432
 EBUILD moto-4.0.6.ebuild 4098 BLAKE2B 524e4925bec974fa3e5c31cfaadbdd7acb0f3638bf4198c48dba3e48f0f8d1185ba4652de7b1f24957ab1a57f61ce3e533af51ee3091b2652fec9ece03a8bf44 SHA512 c28daf0e0919d4b0bdf353d10275385ddd2e3bcf98bf241a33973d31010856b2a2a1437fccdf2cb70381ce8cc4412650b415feb37cdb4d28b6f0cbc8e32e8b8d
 EBUILD moto-4.0.7-r1.ebuild 4170 BLAKE2B 40f9e16c72e4d0e9f85f77a638010028bf8037ac5b35d936860a02b12975088991bfbe46a5ced21416001765594669e688c8d43fe5a1c1c146d2b34b82b8e774 SHA512 0e4a3523bd9c58bf304b847a31b637f53de466850e921513ca70eb2772fa26abf1132db4ff5b88c7fc557c9947dda3e54cb2d5d58a9d96678ec5860809641bc8
 EBUILD moto-4.0.7.ebuild 4098 BLAKE2B 524e4925bec974fa3e5c31cfaadbdd7acb0f3638bf4198c48dba3e48f0f8d1185ba4652de7b1f24957ab1a57f61ce3e533af51ee3091b2652fec9ece03a8bf44 SHA512 c28daf0e0919d4b0bdf353d10275385ddd2e3bcf98bf241a33973d31010856b2a2a1437fccdf2cb70381ce8cc4412650b415feb37cdb4d28b6f0cbc8e32e8b8d
+EBUILD moto-4.0.8.ebuild 4170 BLAKE2B 40f9e16c72e4d0e9f85f77a638010028bf8037ac5b35d936860a02b12975088991bfbe46a5ced21416001765594669e688c8d43fe5a1c1c146d2b34b82b8e774 SHA512 0e4a3523bd9c58bf304b847a31b637f53de466850e921513ca70eb2772fa26abf1132db4ff5b88c7fc557c9947dda3e54cb2d5d58a9d96678ec5860809641bc8
 MISC metadata.xml 552 BLAKE2B c0162cc80007c1fda211c105b3e7391e3596ef11deb9257bab489f4b112f79ed115ca3f250bdf1b87aee0af258aa59056c8d062acebca7dec631acf3ec9eb2bb SHA512 3f7b3c5709bca51588e58f9eeb9bb363e2657a7e6483519ec7782eb047a5311d434e2459ccd3b495340f85f72a92da2f7cc6eb3de617e979bade7b8fc7b3c01d
diff --git a/dev-python/moto/moto-4.0.8.ebuild b/dev-python/moto/moto-4.0.8.ebuild
new file mode 100644
index 000000000000..6249184fce6a
--- /dev/null
+++ b/dev-python/moto/moto-4.0.8.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	dev-python/cfn-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	dev-python/boto3[${PYTHON_USEDEP}]
+	dev-python/botocore[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
+		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
+		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
+		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
+		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
+		# broken code (local variable used referenced before definition)
+		tests/test_appsync/test_appsync_schema.py
+		tests/test_appsync/test_server.py::test_appsync_list_tags_for_resource
+		# Needs network (or docker?) but not marked as such, bug #807031
+		# TODO: report upstream
+		tests/test_batch/test_batch_jobs.py::test_terminate_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
+		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
+		tests/test_batch/test_batch_jobs.py::test_dependencies
+		tests/test_batch/test_batch_jobs.py::test_container_overrides
+		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
+		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
+		tests/test_s3/test_server.py::test_s3_server_post_to_bucket_redirect
+		tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+	)
+
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 1b16ffb84650..fddab1c45b19 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,7 +1,5 @@
-DIST Nuitka-1.1.3.tar.gz 3921812 BLAKE2B f3160facc010fb55510246d8c455665c9be1c893629a04ecfd204fcd6898ae6e4955684804cc83abff8e35084727c87b848abd9d5c25f8d0eb5b054b1c2f7d5a SHA512 fcc1374605ae8429a3f22c926783d8f96b335597b152320d2a33152ccabb7e3cb003f7870d51dcf36d1e4bbc391f517e56631c49905a4bd1cc146e5ada9c5aa6
-DIST Nuitka-1.1.4.tar.gz 3923043 BLAKE2B 7c85aab9170f118f43c56a097ef4ea90e78e539d8a796fcf4435f1e2d27e1f8a7f87ab030736f231834ab044db512e6649f6f0f2b7726dcda989edad5cc9cbae SHA512 9bf9de077d71cdca629737f21ddac22fa8526d4e1d3ec3a41465f8764997141a3a5e6e2d545001b72f66dc972fe7a9fa23cdf36636a29552652d1a04a23fd2d6
 DIST Nuitka-1.1.5.tar.gz 3920916 BLAKE2B 7352009df91e39c63073e8230065af990c86d07cf51752ceaf234e4e8b5814d085ee7423440dc5bb8ca63341f7e1eccdbd41631711ebcfac481bcb3645c011f2 SHA512 ef88b98341cb930529d6e31bb487cf3bb8c217dd9b8a8b50c8e5b147f0b4879a17f2d6c7621a056ad3f1ffd15ac88781445bc0dc8dc164a38aea83b43a6bf3c7
-EBUILD nuitka-1.1.3.ebuild 1214 BLAKE2B b5c547ea636f0c56f83984808e9596f6119416150c47d49fbb77c6ba7c9ffaf8f23781fdf6a18aadabb5e7c77986c1709820583abee20d7ec6d2e53de4655653 SHA512 9c1931c4e40b695eb166bd0160c6a4cb5874873cbd1241bf275d38c823f4cb82fc335b8083b8bac4575294cdd1a7767b31533a437ae4f5364e3bc546da989cca
-EBUILD nuitka-1.1.4.ebuild 1214 BLAKE2B b5c547ea636f0c56f83984808e9596f6119416150c47d49fbb77c6ba7c9ffaf8f23781fdf6a18aadabb5e7c77986c1709820583abee20d7ec6d2e53de4655653 SHA512 9c1931c4e40b695eb166bd0160c6a4cb5874873cbd1241bf275d38c823f4cb82fc335b8083b8bac4575294cdd1a7767b31533a437ae4f5364e3bc546da989cca
+DIST Nuitka-1.1.6.tar.gz 3923364 BLAKE2B 680496486121ff17bb8bded93ea3be79c65cc7d1eb8352a29699e3f0c9f6cec75c83f1018b58f837dc181668cb3d5f7574f8c6ded80d9727c396d5caad2896a2 SHA512 8bdf4ed2bf15ff0d5ab88f3df151c219822a718d7c5244075ffef1822467861030875fa508eb861825fab030232f041f0baf7e719eba0f82ae1d9ace224eb749
 EBUILD nuitka-1.1.5.ebuild 1214 BLAKE2B b5c547ea636f0c56f83984808e9596f6119416150c47d49fbb77c6ba7c9ffaf8f23781fdf6a18aadabb5e7c77986c1709820583abee20d7ec6d2e53de4655653 SHA512 9c1931c4e40b695eb166bd0160c6a4cb5874873cbd1241bf275d38c823f4cb82fc335b8083b8bac4575294cdd1a7767b31533a437ae4f5364e3bc546da989cca
+EBUILD nuitka-1.1.6.ebuild 1214 BLAKE2B b5c547ea636f0c56f83984808e9596f6119416150c47d49fbb77c6ba7c9ffaf8f23781fdf6a18aadabb5e7c77986c1709820583abee20d7ec6d2e53de4655653 SHA512 9c1931c4e40b695eb166bd0160c6a4cb5874873cbd1241bf275d38c823f4cb82fc335b8083b8bac4575294cdd1a7767b31533a437ae4f5364e3bc546da989cca
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-1.1.3.ebuild b/dev-python/nuitka/nuitka-1.1.3.ebuild
deleted file mode 100644
index b55f0385d58a..000000000000
--- a/dev-python/nuitka/nuitka-1.1.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://www.nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-util/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-1.1.4.ebuild b/dev-python/nuitka/nuitka-1.1.4.ebuild
deleted file mode 100644
index b55f0385d58a..000000000000
--- a/dev-python/nuitka/nuitka-1.1.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 flag-o-matic optfeature
-
-DESCRIPTION="Python to native compiler"
-HOMEPAGE="
-	https://www.nuitka.net/
-	https://github.com/Nuitka/Nuitka/
-	https://pypi.org/project/Nuitka/
-"
-SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-util/scons[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-util/ccache )
-"
-
-DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
-
-distutils-r1_src_prepare() {
-	# remove vendored version of SCons that is Python2 only
-	# this should be removed when upstream removes support for Python2
-	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	doman doc/nuitka3.1 doc/nuitka3-run.1
-}
-
-python_test() {
-	append-ldflags -Wl,--no-warn-search-mismatch
-	./tests/basics/run_all.py search || die
-}
-
-pkg_postinst() {
-	optfeature "support for stand-alone executables" app-admin/chrpath
-}
diff --git a/dev-python/nuitka/nuitka-1.1.6.ebuild b/dev-python/nuitka/nuitka-1.1.6.ebuild
new file mode 100644
index 000000000000..b55f0385d58a
--- /dev/null
+++ b/dev-python/nuitka/nuitka-1.1.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="
+	https://www.nuitka.net/
+	https://github.com/Nuitka/Nuitka/
+	https://pypi.org/project/Nuitka/
+"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/scons[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 02766bd79718..3facbfe0057a 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,3 +1,5 @@
 DIST pbr-5.10.0.tar.gz 127122 BLAKE2B 45a254629c2d1e73ce500edb5ba05f165dfaa9987bd62500490cdcceed11708878bc82441f218cf2f5a38b50301a2bcd0aabd0a5e5810346586d8d6463162ba9 SHA512 a5f4393407a17f4de5977483f3c7fa651780b9b9069a0a1898a5b511742262dfb06f891cfcb632c5b64ecfd041188095ceb880c6e71c99c81f0eace59e4e1976
+DIST pbr-5.11.0.tar.gz 127505 BLAKE2B 201fcd04ded1f909f4792886ddf79a5a764318645ff6b6245543cde2940d502ab711820cb6e999894a339df933e43e6a8394bd8ec1e978d930710a3085b131fd SHA512 bdb442e8ef7bda90a65c5fb7f0696041808278fcc643eb0c15d5401b7da7d64cd3566018b1046145f55bc5683791ee182bec92461801004b02a35b8bf4c5abf0
 EBUILD pbr-5.10.0.ebuild 2178 BLAKE2B 0e64b677e735c6ca41e130e3b24123eb575d65d8c500a479dfb294ffaf5586f81f905b07145db5a11f1837102efcf890356d1e19a30775a5e11f0e4c49009eee SHA512 dff96e665e547523584351cc1e6bcaee5f15e98850760ae2aa47b7a8450c51680b0c5817854bcb7fea97c82be8fd3eaafc9653e68dab67f6ef77de592e6a4184
+EBUILD pbr-5.11.0.ebuild 2187 BLAKE2B 15aa68efbd3ce5981e2c5b9e0d76cd0bfdb6c91eb94bcc0a69c66ac3a8ef51e978a622522d14d91ae762d5c9e25ebb8e5efec98dc184bb4763b66d3e6bccd769 SHA512 c5f5b48e03f2a73e89904b1bfdf20c806cc270c83da7299a327eba246b56e8cec64635d8a8070dc74c055c13c02e83254b3ec9365730b213eee2fc9279415ad2
 MISC metadata.xml 815 BLAKE2B 439ee90d79572a8653f1ae3b8b5bf0883adb34ceac5257458dba7a2505e25ebba1c5080095139f6521d8fbd57c11ea38cf4049710b584069aea0ebaa7760077a SHA512 3d0618ef6656706acd829be80b2e6a0b0763b5f4128dcd360f28818d42cbc8825ecd04f7f47af5929a3a35fd60a3b9f9816cc37ee30af164c2e5b51764c25afe
diff --git a/dev-python/pbr/pbr-5.11.0.ebuild b/dev-python/pbr/pbr-5.11.0.ebuild
new file mode 100644
index 000000000000..1e521c028037
--- /dev/null
+++ b/dev-python/pbr/pbr-5.11.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{8..11} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="
+	https://opendev.org/openstack/pbr/
+	https://github.com/openstack/pbr/
+	https://pypi.org/project/pbr/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}]
+"
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
+# stestr is run as external tool
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
+			dev-vcs/git
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# TODO: investigate
+	sed -e 's:test_console_script_develop:_&:' \
+		-e 's:test_console_script_install:_&:' \
+		-e 's:test_setup_py_keywords:_&:' \
+		-i pbr/tests/test_core.py || die
+	# network
+	rm pbr/tests/test_wsgi.py || die
+	# installs random packages via pip from the Internet
+	sed -e 's:test_requirement_parsing:_&:' \
+		-e 's:test_pep_517_support:_&:' \
+		-i pbr/tests/test_packaging.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Testing on ${EPYTHON} is not supported at the moment"
+		return
+	fi
+
+	eunittest -b
+}
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index c317c21cff70..36b8d5e846ad 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -2,10 +2,12 @@ AUX scipy-1.9.9999-meson-options-lapack.patch 1013 BLAKE2B 04cb7b3bc281ef06fe436
 DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
 DIST scipy-1.9.1.tar.gz 42019478 BLAKE2B aa7f9e8f354d2c73cfeb0e349562279ec323e6c16641c82c47080108d21f385acb1431c1f072e454a043f56e8fd708778fc34c0eddaceedca979f40b6b11e358 SHA512 1378a24c59b66e2818929acd015fe5408cdd57926d96b7b909d5eb7e2bb6bae942e8fe802f107c8b0901af9873b8e24461624ca0917867e24bb50c7d28e09e71
 DIST scipy-1.9.2.tar.gz 42068300 BLAKE2B 0962115990a12339d8b87eabbee02d52a52e57259fbe2e74884fa2f08d66d8b7505f84561f643b539603bc8bf4ef3bf73c3d908453fbb0c99f732c3a81f8a328 SHA512 5f8667aa66aa0b5fad689d960f742874ce09f830bfd5aa241917526f153fbc09c7f709bc84113f83283fcbb8a47113eb215478d9c3473f76d8f7dbf0989429a2
+DIST scipy-1.9.3.tar.gz 42075414 BLAKE2B f19e829d26a5673cccb69bce43a9142637f42a9ec462a3fd2ea44b62564cff6fb27a4deaccc59e0e738cc0c997b0a7de948bf9f2db6fa7896323405a072e0111 SHA512 119f9a5e1ce3b4268ba38a0eb82dff78837593d9a5c5e464663925a4b3b1de060201fe568236e19ed0996a045754333c580e181c4cdec2cc707e57060f59364e
 DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
 DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
 EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763
 EBUILD scipy-1.9.1.ebuild 2287 BLAKE2B 01f8dbe3bc789af389da8f7eb4853f3f1c84329368f7baa8542ec3da0ea8f13abcb7ea9b7048ade6c8978ed877abe7b305711123046000c6bead9eec9d2774a4 SHA512 9a328fa90b73836e297f975e9a67faf359a581ba5021c91fedc99d1054704fe8f63e1bb199e15749fd54f2f3f5641ca7f13ecf3b0955b2870ee32edbe99f0fb9
 EBUILD scipy-1.9.2.ebuild 2360 BLAKE2B 4461feef60a9df1d573a4dc523f28c5b5a69c623921bf54427d2fbbf9fee9845506464b6902c177b20f00af653099f6a8d497dfaf07575815ba5278c7c978d0b SHA512 0b27f11b9c104ce37d69217f0fecb7ba0e63eb7f76bee4b1eaa1badcbf896b1b323aebe023b5db0e64c426df61f21f542ddd3cb1365a950e6337750080ebc1fa
+EBUILD scipy-1.9.3.ebuild 2360 BLAKE2B 4461feef60a9df1d573a4dc523f28c5b5a69c623921bf54427d2fbbf9fee9845506464b6902c177b20f00af653099f6a8d497dfaf07575815ba5278c7c978d0b SHA512 0b27f11b9c104ce37d69217f0fecb7ba0e63eb7f76bee4b1eaa1badcbf896b1b323aebe023b5db0e64c426df61f21f542ddd3cb1365a950e6337750080ebc1fa
 EBUILD scipy-1.9.9999.ebuild 2339 BLAKE2B 8b34952534298e156de44cffe5552c1895c343095bf4ec0e9d199fc915dcff549ac9b44cae9255634b244f207396b31428f817b8a4920dcf8c8bafc6c89ac7d2 SHA512 fbdfaabc2de08aa51f6d27ca230c69c812590de18adaca11fb956ebac77d56e98c88a710f9916b88f1ae9e783ed4a89b4ed763fa5fd4b109829cddacbaa76da1
 MISC metadata.xml 1148 BLAKE2B bd532eb47b00da1ff18e9bb5be287ef32136412fd7542e92a522c9d3d9d9663d2312b74fd2fc6d4239e4fc581c8e881ac6e682fcfd14b0debb08210237878398 SHA512 a913d7013caece759f2fd36f8814589a512e7650afca19edf444694b1fceeeda02f0bffb4ced81a46a376b2d6d54b292257a236549418aecf20d99e70715babb
diff --git a/dev-python/scipy/scipy-1.9.3.ebuild b/dev-python/scipy/scipy-1.9.3.ebuild
new file mode 100644
index 000000000000..a3764e438be5
--- /dev/null
+++ b/dev-python/scipy/scipy-1.9.3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 multiprocessing
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	# Upstream is often behind with doc updates
+	DOC_PV=1.8.1
+	MY_PV=${PV/_rc/rc}
+	MY_P=${PN}-${MY_PV}
+
+	SRC_URI="
+		mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
+		)"
+	S="${WORKDIR}"/${MY_P}
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ppc ~ppc64 ~riscv ~s390 ~x86"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +pythran"
+
+# umfpack is technically optional but it's preferred to have it available.
+DEPEND="
+	>=dev-python/numpy-1.18.5[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:=
+	sci-libs/umfpack
+	virtual/cblas
+	>=virtual/lapack-3.8
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.62.2
+	dev-util/patchelf
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
+)
+
+EPYTEST_DESELECT=(
+	linalg/tests/test_decomp.py::TestSchur::test_sort
+	linalg/tests/test_solvers.py::test_solve_discrete_are
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+src_configure() {
+	export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
+}
+
+python_test() {
+	cd "${T}" || die
+
+	epytest -n "$(makeopts_jobs)" --pyargs scipy
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/swagger_spec_validator/Manifest b/dev-python/swagger_spec_validator/Manifest
index b26713f9c990..6a622899367a 100644
--- a/dev-python/swagger_spec_validator/Manifest
+++ b/dev-python/swagger_spec_validator/Manifest
@@ -1,3 +1,3 @@
 DIST swagger_spec_validator-3.0.1.gh.tar.gz 48112 BLAKE2B 9489c5b58667e80c8d5971d7bad3e14947f8facf51bd2db4fbbc810cca89039598f49fe9d00caec6d630aaec795c5854e6b71d53d882d23245401a145bba3dde SHA512 fb0fba69209a416ce781f2842f711864fe552c450163131db9e5e8e2eb99f2530ca64157bfcfbcee87ea998fe6dca2b92535a18c1d3fc219b81e99dc62236c07
-EBUILD swagger_spec_validator-3.0.1.ebuild 732 BLAKE2B 42b2edd233ed01a6f1a4488a69f8a8951bc94f205a69be846b38e5c9dc47b9817dbf9e40dc2ae4e00a66370eb5dc6ff2c2d9a385761e177e3afae077f1386ca5 SHA512 e2f7a16baeab236b4f662f3c241d738b7157b6f549ce82ff5381229e0736b96c582e958517065d3e3c6779681ee021e079f47f00ebe7b248d4600664231f66fd
+EBUILD swagger_spec_validator-3.0.1.ebuild 1060 BLAKE2B 7cf0e5dec2c56e6f1a21bd56a2630491a3ab49b9043f3f2a8e683ab6208b3a437dbe0b5df1c3a9561adfb47ec6ce94cc9ae90797953f7675a686bb61fe3ee244 SHA512 1b3cb8641f33a34a4fd55a75e75353036c37e6737f267c79ab545657d2997f113381078a4f53708fdcf25fa291dde2e2000f8db4006f26faef24668f45e7bf10
 MISC metadata.xml 417 BLAKE2B afbf646bc60cbe742cc04d6feea3d45afaac36d0873f869ed70c96af3a354ef473ccdece6a4b6627adfe3a0cd34d0aa3f2082dbd0f0f95d3e95f632519327855 SHA512 dccb6c2e31540afc8832d4e91cb2458fa42a91ab1a5c42f34c690b73aa79584573156c1cf9707cdbbe40603f0c4996e6ee39ea10c95855c55410e2541cf39591
diff --git a/dev-python/swagger_spec_validator/swagger_spec_validator-3.0.1.ebuild b/dev-python/swagger_spec_validator/swagger_spec_validator-3.0.1.ebuild
index 622b8261e1f8..668114731af1 100644
--- a/dev-python/swagger_spec_validator/swagger_spec_validator-3.0.1.ebuild
+++ b/dev-python/swagger_spec_validator/swagger_spec_validator-3.0.1.ebuild
@@ -30,3 +30,10 @@ RDEPEND="
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/source \
 	dev-python/sphinx_rtd_theme
+
+EPYTEST_DESELECT=(
+	# network (resolver)
+	tests/util/validate_spec_url_test.py::test_raise_SwaggerValidationError_on_urlopen_error
+	tests/validator12/validate_spec_url_test.py::test_raise_SwaggerValidationError_on_urlopen_error
+	tests/validator20/validate_spec_url_test.py::test_raise_SwaggerValidationError_on_urlopen_error
+)
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 9b2665e9bf96..42caa6af4121 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,5 +1,7 @@
 DIST uvicorn-0.17.6.tar.gz 708048 BLAKE2B 83b06907c8109b38e13930d8b73584682fa4e34fe7e51fe14b6ca1ddc7ef8122d950a09e31cb364a02f5f12eead5d0522b41cbf428509c6900604d4e2776dfb2 SHA512 d5c5223759d59648f279e22f7e6af728fe8117ed75488d125c1db3e5e9d385a50d574cff72ac46db4eb0a78d0e4f690096cfe78c774674dfba61860e55b7494e
 DIST uvicorn-0.18.3.gh.tar.gz 713216 BLAKE2B ba1fb1f2241fa3c23bc4115d335ef1c176937e8af5e33ae7d1e615271c94bc330ef5cb21d6bedd697ecb2a38798758ea47d5523ea6ee45295cf447e81503ff05 SHA512 a4983e7095f3596ac54557432a074eb8cae4c6dd579fabfe8b6c34606ba8258e6c0684c2e34e8019f2455fbfd1771f8c2c88bf8b01fc505abfae93655f61f032
+DIST uvicorn-0.19.0.gh.tar.gz 713679 BLAKE2B ee83cd7d318b0e54bd2dc240b5bfe3874ef41933ba7e2376e8dd3bdce90387b3d253c02c16ef28bbb54435b2e666309769cd057fe703d4be498f3c0ef19532c0 SHA512 d030a0c5e61b5bec985fa1640a74bf5da1dfa1a48d0b3f758096eaff2e3bf1d1b3bee1c3a024f5960cafbf928e9ee94e285a8c24404e1c4b6b6aa29f0d4cb15a
 EBUILD uvicorn-0.17.6.ebuild 1394 BLAKE2B 1f9eb4a37f3476787f643dd1b06c846ee2d4f0aa08aedfb74589097e9163b24a4b5642bf8fdb672bbb61537a15bdbee3ecd69962bd5edb42f969b94202307320 SHA512 7e478a4e05e4ae6b097eb018ec4bc105812a368389e0b663100f1ae0abad5c11a9ceb8555119d01c1d5397bc56df9af801129ed83e246a69538aa262fa39157f
 EBUILD uvicorn-0.18.3.ebuild 1672 BLAKE2B 9ca1d9a303ba136326695762cd9e6242a04c2ae9660e9fa397c83f9ecacd6e177f054af68585f4135d620ef018830be5f047ef13671b762fc9445c403d36998c SHA512 1a3fe5dfb54a312bbd5d99ed317d63cc8310c96d2734084c89c2a3c6ec961ab3b6fa0d01869012b3ad9851199bffb4d24db804a4e5c6acdf93a3cfbc547994a5
+EBUILD uvicorn-0.19.0.ebuild 1680 BLAKE2B a20a31ce9f222039bde644a208fa34185133e1b0dbe62ce8c4d02bf9b6d65c2480a7b8bb41cbe1727fad093895a0f76e7757ee65b3e44316629acba06a47930d SHA512 94a4d3db98ffa4b74b0ba19051975fe5cc9a21efc345d5cd19f9235a2bb5b13283d9949d7eea03e66b25e0ebd013cdb75a9f1783c282696b2acca744fc879e6b
 MISC metadata.xml 451 BLAKE2B af9be617c95128297e3455b503e198e13c373244094f6aa9c80837945c3f9f023f1874efa28d4ffa8b241feb9a4e8c7f3d3534e96966733bd5593bffb90904a5 SHA512 4d76bab5c20f7cad81fa56a28c9be07bf2c2ebc412fc647f073215d437a2550eca247b8419df71d04200d0fdf545520684db0b6f4953e73848f69a4f4ad6931e
diff --git a/dev-python/uvicorn/uvicorn-0.19.0.ebuild b/dev-python/uvicorn/uvicorn-0.19.0.ebuild
new file mode 100644
index 000000000000..ed997d18da2a
--- /dev/null
+++ b/dev-python/uvicorn/uvicorn-0.19.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Lightning-fast ASGI server implementation"
+HOMEPAGE="https://www.uvicorn.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/httpx[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-dotenv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		>=dev-python/websockets-10.0[${PYTHON_USEDEP}]
+		dev-python/wsproto[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# too long path for unix socket
+		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
+		# need unpackaged httptools
+		"tests/middleware/test_logging.py::test_trace_logging_on_http_protocol[httptools]"
+		tests/protocols/test_http.py::test_fragmentation
+	)
+
+	local EPYTEST_IGNORE=()
+	# love from Rust world
+	if ! has_version "dev-python/watchfiles[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/supervisors/test_reload.py
+		)
+	fi
+
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "auto reload on file changes" dev-python/watchfiles
+}
diff --git a/dev-python/watchfiles/Manifest b/dev-python/watchfiles/Manifest
index 3579df0c0fca..bf7a2ff5475e 100644
--- a/dev-python/watchfiles/Manifest
+++ b/dev-python/watchfiles/Manifest
@@ -39,6 +39,7 @@ DIST unindent-0.1.8.crate 8326 BLAKE2B 3123c6b540b152d89cc7a9a76ff1315549f973c6a
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST watchfiles-0.17.0.gh.tar.gz 42487 BLAKE2B 9e50c1d2bea174754c393090a5ff07a92067af76ca17d1c4a058e27a082fec8347dd42e23178a319f8644f87f800174acf3f0db72dd35becdbb21d3ef425df5c SHA512 db39bf6c56d0af93807665aef8d96ed4331ff8a9d2a24ddd2b489ab5501ca3f5b33bd5cfbde2a33089622247d8b7f5ec91566f911ca564b812537b02be3ed2b2
+DIST watchfiles-0.18.0.gh.tar.gz 43563 BLAKE2B e8af967ee9499571d2f8a597ab2174b1be5d2e4c3cd61a63a5c02eb5614846084e446f2759534e9b35c0dfe2bf18992ef6aaccec009f7c57692c8b3b3014a1a4 SHA512 1cccf458ffa643a675e2e257e5074275e5f9c533743957bd7b58b3576ac47cca849e9ef219e40c9eccb854a6b8331bd3afa43bee8cf27b95ea6a4c2dbbaa97c0
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
@@ -50,4 +51,5 @@ DIST windows_i686_msvc-0.34.0.crate 733497 BLAKE2B fe7588e946d95c1570ea0d90db82d
 DIST windows_x86_64_gnu-0.34.0.crate 744301 BLAKE2B fb0775c40069aa42fcabd01ff09fc7557236e3cd270c771b3648d7f556e9aeb9add7130b117fb107f3562bc199b728d3636779a99c9a1aad96aaf6b99f975f3e SHA512 61f532c2c95edf42f79ced48be9d4a9810dda327f45ff2dbff19a5fb888e3ba206f2b875c5b5571884f27742fb380d5f1e105e6d5fa460a2e529b53625123d86
 DIST windows_x86_64_msvc-0.34.0.crate 669900 BLAKE2B 15a851bb19557ee896ade2db29872754549e4df9cf895a1387d9ddfbf8c599e6e5a2bcb835f450d8218296a99d08fbfb2db469e244b0abdaa13f16bcc38b35a9 SHA512 3bf5308993a259f5d1b3964698550151c5819a0d28a02928c6f7d70443be69131255a896d423f086a298842ba773502de8a8e8bb2ce8adbf7bf848ab40184bec
 EBUILD watchfiles-0.17.0.ebuild 2209 BLAKE2B db0ff03e363949d4b522400b580478bd6f4e41edf6ab2fb52102ed0f1dbec0de07204a91bca6af466e5f277d04042e95b17b35b855a18c14b1dea3b0cd0189fc SHA512 ec1c5168268334b84b84254699a7e98f38c746c6d32576b63671cd3289304dd803dcc823bc65a37484aa2e4aa0ce9e2d11589b9a029583d51e69b3c8f0450bc0
+EBUILD watchfiles-0.18.0.ebuild 2209 BLAKE2B db0ff03e363949d4b522400b580478bd6f4e41edf6ab2fb52102ed0f1dbec0de07204a91bca6af466e5f277d04042e95b17b35b855a18c14b1dea3b0cd0189fc SHA512 ec1c5168268334b84b84254699a7e98f38c746c6d32576b63671cd3289304dd803dcc823bc65a37484aa2e4aa0ce9e2d11589b9a029583d51e69b3c8f0450bc0
 MISC metadata.xml 355 BLAKE2B 95253406e11c30a7a3b5462d3c835010313bed3122f9d16ff73d6959a5c1f4c8922e324c839fcae9f541c7b1d84544cd38718ffcaba039b8c61292eaefa37447 SHA512 e1c11224e0129eb696e4e92a41ec0e35819febee2eb967982e016f7a0d02d95df8465867e0202d8e7ac59cc579f73c79d9ed6b87eebd44b3b64d63a5642ac458
diff --git a/dev-python/watchfiles/watchfiles-0.18.0.ebuild b/dev-python/watchfiles/watchfiles-0.18.0.ebuild
new file mode 100644
index 000000000000..ab7b96182857
--- /dev/null
+++ b/dev-python/watchfiles/watchfiles-0.18.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+CRATES="
+	autocfg-1.1.0
+	bitflags-1.3.2
+	cfg-if-1.0.0
+	crossbeam-channel-0.5.4
+	crossbeam-utils-0.8.8
+	filetime-0.2.16
+	fsevent-sys-4.1.0
+	indoc-1.0.4
+	inotify-0.9.6
+	inotify-sys-0.1.5
+	kqueue-1.0.5
+	kqueue-sys-1.0.3
+	lazy_static-1.4.0
+	libc-0.2.124
+	lock_api-0.4.7
+	log-0.4.16
+	mio-0.8.2
+	miow-0.3.7
+	notify-5.0.0
+	ntapi-0.3.7
+	once_cell-1.10.0
+	parking_lot-0.12.0
+	parking_lot_core-0.9.2
+	proc-macro2-1.0.37
+	pyo3-0.16.4
+	pyo3-build-config-0.16.4
+	pyo3-ffi-0.16.4
+	pyo3-macros-0.16.4
+	pyo3-macros-backend-0.16.4
+	quote-1.0.18
+	redox_syscall-0.2.13
+	same-file-1.0.6
+	scopeguard-1.1.0
+	smallvec-1.8.0
+	syn-1.0.91
+	target-lexicon-0.12.3
+	unicode-xid-0.2.2
+	unindent-0.1.8
+	walkdir-2.3.2
+	wasi-0.11.0+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.34.0
+	windows_aarch64_msvc-0.34.0
+	windows_i686_gnu-0.34.0
+	windows_i686_msvc-0.34.0
+	windows_x86_64_gnu-0.34.0
+	windows_x86_64_msvc-0.34.0
+"
+
+inherit cargo distutils-r1
+
+DESCRIPTION="Simple, modern file watching and code reload in Python"
+HOMEPAGE="
+	https://pypi.org/project/watchfiles/
+	https://github.com/samuelcolvin/watchfiles/
+"
+SRC_URI="
+	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	$(cargo_crate_uris ${CRATES})
+"
+
+LICENSE="MIT"
+# crates
+LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD"
+LICENSE+=" CC0-1.0 ISC MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	=dev-python/anyio-3*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		dev-python/dirty-equals[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+# enjoy Rust
+QA_FLAGS_IGNORED=".*/_rust_notify.*"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# fix version number
+	sed -i -e "/^version/s:0\.0\.0:${PV}:" Cargo.toml || die
+}
+
+python_test() {
+	rm -rf watchfiles || die
+	epytest
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index db405ab5baef..547d1e3f2196 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/fuubar/Manifest b/dev-ruby/fuubar/Manifest
index 9852cbfe3659..978931e05b4c 100644
--- a/dev-ruby/fuubar/Manifest
+++ b/dev-ruby/fuubar/Manifest
@@ -1,5 +1,5 @@
 DIST fuubar-2.5.0.tar.gz 32763 BLAKE2B 841f85cc867a8215e00f720f2ffc25aaa5444ee6536cd17663b789d7a947e957987f3b60659828d310c0fd816abfedd9c7ef90effe37b6f847ac119a41f134a1 SHA512 c0ad302516a7eb7df2b574c038068298aece8bc1606adcb81c53bba1f0315a774dd65f5c742586ef2b7f188bc01ea94e0c5a3eb8b3c5f225ad76027340165453
 DIST fuubar-2.5.1.tar.gz 39138 BLAKE2B e36c5a4ca67b9c2cfd6775f554ebf1c027f9b1f24b36cfb1e3c062a07034eee472ff06f750755e7aba9e0b1f4a3704be213b44c9d9cf5c6b50cc1cf24b84c572 SHA512 d3b200690a483f131faeaa0e6164ab4103584324b02a928be1c8845f14984e3695d8cd1cf3b9edf945acbd9876dca879029c04b9d76b0ace4b7d1883c73ca924
 EBUILD fuubar-2.5.0-r1.ebuild 843 BLAKE2B e9cfc05768ab6510913fd076e754c438ca3cdd517b551875ead8dbefb9788b36266aa4d8590e7c0f2bcf6c63349f043b42ab0e0cc8a6e8e2ca715a1dc5af52e5 SHA512 1cd707ddf643a2f4c1e4833b39e1bc23b37bc2f112754e579ad0441c74a3577e6d739270bc7d48829aa3d68917c7b02bd185a95eb25a2dc9709a7f855d94612c
-EBUILD fuubar-2.5.1.ebuild 843 BLAKE2B f2cfc6aae622b1b316f4de293b94acacfe7bf520c2847e8a96b6d59ae8989e41fc63bf36ac5ec46be3ec584d1aa0e2955f090963ee7cd96fcf103febaa655266 SHA512 f56e203545b1ebb9beb3bf1a8f9d30e6886f833b3962377192ba5998f79309360962ba87228f2f60f1cbc5d0266f40e1039f96357b0c52fbd42077e0d6bca930
+EBUILD fuubar-2.5.1.ebuild 843 BLAKE2B 54d36a87e0d681f27d15197a93ab55a522679337c4050375ee65ee0cd4e33272d8cefdd479a3871e0a233abe2fd9cbeb6fd22a76e7ac5c9f1e19e610fd6362bd SHA512 8c5cf0b8b46a3877bee8c7ab679b3b1c85320a8d1566b8a2b204442b089f4bfd2e41b505f84051c012d4ee17a8a0a6939e50b4b06fe50724df6475fb1b36a88f
 MISC metadata.xml 350 BLAKE2B 7478b2a6df65be521a515a51620b05666cb29ad6a7f6999fe133150a94376e4cd04dceef1aadfb6f563dd44318033cc7f1291cf60ec38d6c941318e51f87cc6c SHA512 291f9f42987d8ed1224d4f7471510e57e9606231823d0eacd729860c53e79c8aee7b25e99b282014786790e5da4906ce423f51bdae8de6ad3cdf613980630201
diff --git a/dev-ruby/fuubar/fuubar-2.5.1.ebuild b/dev-ruby/fuubar/fuubar-2.5.1.ebuild
index 66ea40e471da..3d98ac7a2ea5 100644
--- a/dev-ruby/fuubar/fuubar-2.5.1.ebuild
+++ b/dev-ruby/fuubar/fuubar-2.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/parallel/Manifest b/dev-ruby/parallel/Manifest
index ab902cc966e5..ec7ca4cca442 100644
--- a/dev-ruby/parallel/Manifest
+++ b/dev-ruby/parallel/Manifest
@@ -1,3 +1,3 @@
 DIST parallel-1.22.1.tar.gz 23294 BLAKE2B 11a3f902f8a6813b407035088adaf76fda5f27e0e33e7f210ce28fc66f4edf4f8d92a8b0f9501d24013a527f4205b79c6eda2c31f6fa4a646a18e6da5b20e702 SHA512 f106ac605a5998d0e5a43b7863f8400e49270c06e55b6342a84fed788e1e854a26a5e29ec31da9d96a4d403227d002691e27786c25e8d7542f3877bf097e55ad
-EBUILD parallel-1.22.1.ebuild 1368 BLAKE2B 5384a11ab3ce4fba9286c1f0a033b5fa5744cf5d69f1ad4e9ba4111538e876808c8c26fdfd9d85bf0eabc420669a86048b761dff2687db5ff929d91e85e2fc6e SHA512 709dfb1ad9ba5dad34a77a75e3a1f895d4f1b802eacb13c4fc2c2ac5a6b78c88eab29c2dfa2ca1ca749a660c4bbdf5cb6f552be5e411cab5bd587f4cb55f834a
+EBUILD parallel-1.22.1.ebuild 1368 BLAKE2B 158a653a23f039a0d79aa7b789a07e83e275d1006cdabce29616e64c2c9c326d1196fc49e45030436ae35ac4267eaefd520ee1513e144eb7ab55282014d6924f SHA512 2f39907617c9277536381803be9ad605997bfd8abc569f5e71fd76ba937392093acaf6da78fcb9f4ce597246dd203951ac14cffc648d240a3f6b5488c6c54a24
 MISC metadata.xml 343 BLAKE2B 319ce92e2b405a76468f653192288669596fdf31ecea733f88de907cb5fc184bdbc197bae14c3cec97a5f25c47cd6fe3e201ae60ab19e5dc06a2f8b612e2b719 SHA512 7fbc85907d9d51e90d0bbf2cd1431557afb9dae6b15b6d9b9d283e1957606381fad7fa7a0aa05d01ce0921c3ecc33d304b61c567069ee439e7ad2f25d3c86924
diff --git a/dev-ruby/parallel/parallel-1.22.1.ebuild b/dev-ruby/parallel/parallel-1.22.1.ebuild
index 74f033fe71cd..6ae6f1d51ac6 100644
--- a/dev-ruby/parallel/parallel-1.22.1.ebuild
+++ b/dev-ruby/parallel/parallel-1.22.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rspectacular/Manifest b/dev-ruby/rspectacular/Manifest
index c20321aeb884..8e75ac17af20 100644
--- a/dev-ruby/rspectacular/Manifest
+++ b/dev-ruby/rspectacular/Manifest
@@ -1,3 +1,3 @@
 DIST rspectacular-0.70.8.gem 16896 BLAKE2B daf9b75be33ccf1b7d60a7aaa540b391578b7f841bb1999c52e566caf8000049d7b2180f372084be18bf4cf367f6c59dba422f187505e42ee6bd66e9431ed11c SHA512 6f048a7781bd672049c10687eede3e2218436ea396438e09814c9239cb07396df25f4b88ab78b98f91c66457c4aceaaf1a1b8aadbff748715a881cadff8dd2e1
-EBUILD rspectacular-0.70.8-r1.ebuild 621 BLAKE2B 6198f8980e4876911801a8cefa7e004c6199443560d2ba616b4163c3369fa7adb449b6cbcd8791e20087ea06d7e83c5ab2010bdc2e77c91e06268f11d711942a SHA512 707723de1496e890d31b3d0d4cac7f6f9ce5f3cae6a2035a68067541efb8e5d00989c2ba674204dcd94b5f3e34bcac3a62d5a41da26b8b948cb83f4329f10572
+EBUILD rspectacular-0.70.8-r1.ebuild 621 BLAKE2B bbe2e6bb928a658a52b65c635f6510fc6ecadaf67327c37783b433f2b1458796977a926c6453e6cbdc07929c4e1561629a26add76071a85540f20da268ff4404 SHA512 f84cacc26ae7d00c2964f97099d6ef2f16ef0f0c7d592981ef62b25b279440149a1449b7f5df9c9caa616317f5bf0aac938826f790e2c69d6df701533e07a104
 MISC metadata.xml 351 BLAKE2B 8f407a5d4255ac91e8c10549c80d2c46b2b510dec1ecec68520d549be5d81459901c7bc5cd561f28d766c9bbc14cbde7e27bdc47dd510a6c6983592b3fe60d97 SHA512 cd62a3006a8f33f9ca2e106bc32c9dbaab20977961ad014b78c4955caeae9a75bd6935555c9844c422a3aaed06558f1e8a49b3d3333cf9146b5366817ebb6804
diff --git a/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild b/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
index 2c02f801759e..2f9dbb3b616c 100644
--- a/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
+++ b/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index 5c314b4ba926..e4682b9eb70d 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -1,5 +1,5 @@
 DIST ruby-progressbar-1.10.1.tar.gz 53416 BLAKE2B ee435291cd55558843ab05254c01a6148711aee54a5ce80d7b03902e32fd8735fda2e3686794f3f2c8a62c7ca26d90df4d63b48c8d947a471279c35131c49898 SHA512 6cbd791833a1638949c7283b5c475164b44ec8a5d4c7eb417d741da5c9cda9e777481a785f112be7fd1c3714668ad58cbf9aa39eecb61d1022fb3bb35ddb6203
 DIST ruby-progressbar-1.11.0.tar.gz 61341 BLAKE2B 558de9d15f6c3eafb0a9ef0b39db279727651c8f86234f3ffad1faac7e9ab7f6bdef6662fadb2132bf10d70bcac9412801a695e0bb3afa5879a48dd363920734 SHA512 5a5c8a6af410746ef601821ec171933d781d32bfb7cb5f67f9cf877824a399941c11be69bb74380941f2271f6f5139928599881441f88860a71f8b7f7b55d4b4
 EBUILD ruby-progressbar-1.10.1-r1.ebuild 1024 BLAKE2B 839f170ae5d2bb9c498349437333c77f68b284216cd3fc64b7dc766e7a45c5732ac8226b2e26a812441980d80a66054353bec101cc92e67f831f0875166ddfca SHA512 1ea55a8c70a65e7d8348ae5a9a0d3c83c4c21e46321f475cb3dd90059bac9b30bc31444c511cf7c8bee03b2af5de0f8aef9270817c323ba44e4507677c090249
-EBUILD ruby-progressbar-1.11.0.ebuild 914 BLAKE2B 952a499a86a02d2f8bdd35a0acf6a3c60084b18805fcddef3d1fe9b28194f9314aa84b5a6f674da3daddf7ff5ed9a9db48e82326a98b74fbba2c35fb8be988c2 SHA512 e8ec1da690388059dca6db08a0844e4e7323f34594b2e369343d48dd865e7e5b1f64b13e9d470787b111e39fba74712b3af169315ee9c2d53d2e5418ed312ced
+EBUILD ruby-progressbar-1.11.0.ebuild 914 BLAKE2B 42843dabcea9767d3040be21b265bf35e40d5a8f11b6670df1e6ee68f47f401195ad1caf251e7d908718858147e5ae45151199ee9fe2ae6166262791c5fe5140 SHA512 382c97e257e6d8ec0fdaf38211bdb3bf197b593d4d16db4da4cc51025e2ce3452b00b8a77da50d903b711d0b5a99a6934cd76d14811de3452de6238403df9aa0
 MISC metadata.xml 353 BLAKE2B 7805fc15a01ee29282bd6097c97659acdd06e1437042d9ff67f2eec8fa0800361e143741cb28436a890ab4952777587e8058c5a6c40d6d6100d5aad7e47f160d SHA512 b98e1e7fae3dd752ec27801aec152ec007d11cec4bdbd125b906ef42797052a5f7ab1dc8e718f133243a309a4aba267d4bc0caba41701b25bab13bb4442f4f7e
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.11.0.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.11.0.ebuild
index 4a0dda0d56ff..8d3fea136cfa 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.11.0.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index 664b27991a41..65c42e0dd445 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -3,7 +3,7 @@ DIST shoulda-matchers-4.4.1.tar.gz 240423 BLAKE2B 5fca9389601f35c536fa8a37adc6a1
 DIST shoulda-matchers-4.5.1.tar.gz 243634 BLAKE2B 32d846d0dc3c8725a9bd0d60e858eb9fe4106a20222503ac908d1a9c9c310d8e1477aa6264f06961812151b9bd1a1a33488707d9c96524cd3431ed7b3246e534 SHA512 8c240fe7699094a63db824145ca28c245526e95d489fac82e1a28a2418ae40524ba0a184a7f9b269b7c31ad7ae2cbc24b453547cab0845639fdea442bada483a
 DIST shoulda-matchers-5.0.0.tar.gz 241021 BLAKE2B 68d70f0ac503deaf05a769b39ad905ee87108b2e2a3f5d76d23b2772c0374e83e3c5cb0b0024a771e7c04958da0b890f3b564287230fffa0d207d501bb8d4c0d SHA512 c81c514071c297a2372b05caa987fc39cf03af25ba0d7ba4ef1f23deebbad81013d80ac5b360a00f5fc0a155e75f3ff65b782c56a5682348f683ea11814ba710
 DIST shoulda-matchers-5.1.0.tar.gz 241567 BLAKE2B 5e778175ca80619b5e3da04fc235a6c68ef150e4abbe34520502fda5a86f44530dec3b0d4d448f87c30c54e062085a00bf6cfe3dee83c82825e238050480e10c SHA512 2abb23126aabc83d1787838468c1959442a32ecdafb244a6f20a08e382990a716ccf2219abee6f8121ff0a3f720e86a6775dee5ae351299416e51df12ad21b32
-EBUILD shoulda-matchers-3.1.3-r2.ebuild 548 BLAKE2B ea8806a4790c1e21df5373486f8a1b9e2700e273c83e0640a6e8f23102b56f752168f6eb243af5900f4189a65114b9c33d81a15f8fedd0cd6e1448b167a8e56c SHA512 bd397b5506f026ba1a7d5fbfd56c740f92e45a6f5f08890aa618a45ff97b905fdf0748c64ad8a943c62a8f168a211853e098a4088b622100610c09591c70e93c
+EBUILD shoulda-matchers-3.1.3-r2.ebuild 548 BLAKE2B 86bc0cc23954bbd58a6fc99188d790ce6e3820000387e46d477fa400aa82fd269c09ec556dd275be5eb6f8ca6d9165bd984ec709857965a40f8fa099982286f0 SHA512 798f10bdd317d0b10ca600966ff1a94588ec30a575c659b76be7b195e7b19eefa0f9d21444b92fcf9122d8f73e603b7c276b292a38aa8cc77289d2529226e9ed
 EBUILD shoulda-matchers-4.4.1.ebuild 826 BLAKE2B b21f3c8ee48db9c51d002a1fa99be0777b0343f4ad2ad371b47591cbfd46e3de2b20045c6274baa98b8a08519f07d7cb4faf2bb891130031005cd56a21885930 SHA512 62f4c3f846eb2f45d1019648af158ec821e752af03ea5298808755768b3216af43d2b6a0705f506700d3bef904a654cb85be0b45d8d6202124a37dc467d757d9
 EBUILD shoulda-matchers-4.5.1-r1.ebuild 828 BLAKE2B 9eee25758297fe04d6fe2fba1152efed97db6f5f9e585b845dc5b1b10ee68a3a9c390dd5e9308d1521dafbd2116980250030b1b490e5d36ff929270989b49c8e SHA512 3e6ca8ad5db58c8e25ca2de70bd8782257543410219ed6206d2c29289583d99683cf63bdfaeeff17e97ccfdfc0d38e68bb34903a320040cf99587330d462db17
 EBUILD shoulda-matchers-5.0.0.ebuild 835 BLAKE2B 4cd1f13995f9f8d48477b828de3ac1ab1f4df0a9b389c8f2bd01a8170d7f9606e22d32ab334702875bb5f16f7ee00761beded8326e29e9c22efa7ff70aa67ef5 SHA512 dd02b4d8c42ba5e0444102ed1441a7b62c9e606b7e767adc5c227cb9bb15cf250e5d35754c970fea5da4afa13eddd49dcdd02d4609bd8acd48042a14db104af7
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild
index cd7ae2fe058b..6dc6d71a3e2a 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 352a48a086d7..a9be27ef44ab 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git-machete/Manifest b/dev-vcs/git-machete/Manifest
index 53aca33ad877..a3a99cd3da33 100644
--- a/dev-vcs/git-machete/Manifest
+++ b/dev-vcs/git-machete/Manifest
@@ -1,5 +1,5 @@
-DIST git-machete-3.12.1.gh.tar.gz 1380396 BLAKE2B 37ba33e7f3d2400c9509c5fb7c11467ebbdbcdb35d0f4a138649a872322bdfa9c22e3711b68b2862f9ff036d1746c0aaac968d6f61df5187553d4713a7cfd532 SHA512 6aab18c8930244c37a320cf920ebbd66c7839f792b1b0ea3156ab7c4222d5fe7e7646b053f8d919ee5189c918b1a4329ddd665a4a1a9d568db9f935bb8b51984
 DIST git-machete-3.12.4.gh.tar.gz 1381813 BLAKE2B 2eb0f8d72fe82cd68bf8f778979ed8a14c2cfd9e752f02f3c0c69e53000c5f8877c433fdaa461f988545e60687d5516c28ee7de0eb2bfd1bc377fcc129425c6b SHA512 39217be678d1cc2fa52a314ebeabf127e71ae130dcbdc8a93bdd075e3130ca2ce2464e153367f8eccc61315234cfe39ec675920eca4599dca41167abc195c1d4
-EBUILD git-machete-3.12.1.ebuild 1114 BLAKE2B 99444d096a41bde9f944f073aa2949636688f8c7400cb296091b07b291ef4573db9e55fe4bbce83a12378b33439e5bf3a9359db3e0255db7e8337cb4db24fbd2 SHA512 c6d0ebe0caf5065d959bb2e4c23ea1c7206f50b0cb4b4a5da50ecea199fc97814f2cb3e1900a18307d72deb07e6181f5dc2ef4cab5ebe140e743bcb982855a73
+DIST git-machete-3.12.5.gh.tar.gz 1386934 BLAKE2B f6a1966fc37dfc6b726f453751d97b466720db6e574bf76e3b830f0895a1f98dd73cbe367c2c4bd20662f434f1e19809324d3a695f5cf62471db38c47648e34f SHA512 8ed7dc13fbcd965e9867b882a2d80cf514b5d8de653a0e19f26fef808e51a53f2fcf9ca0971d1c6b40161d397341af8f4e823175452294b603b1f6559144c715
 EBUILD git-machete-3.12.4.ebuild 1114 BLAKE2B 99444d096a41bde9f944f073aa2949636688f8c7400cb296091b07b291ef4573db9e55fe4bbce83a12378b33439e5bf3a9359db3e0255db7e8337cb4db24fbd2 SHA512 c6d0ebe0caf5065d959bb2e4c23ea1c7206f50b0cb4b4a5da50ecea199fc97814f2cb3e1900a18307d72deb07e6181f5dc2ef4cab5ebe140e743bcb982855a73
+EBUILD git-machete-3.12.5.ebuild 1114 BLAKE2B 99444d096a41bde9f944f073aa2949636688f8c7400cb296091b07b291ef4573db9e55fe4bbce83a12378b33439e5bf3a9359db3e0255db7e8337cb4db24fbd2 SHA512 c6d0ebe0caf5065d959bb2e4c23ea1c7206f50b0cb4b4a5da50ecea199fc97814f2cb3e1900a18307d72deb07e6181f5dc2ef4cab5ebe140e743bcb982855a73
 MISC metadata.xml 835 BLAKE2B f59f4070f862a09fb74c57b5ef093e4c8d1394887f71b8f490e49e49f64722b48ab44f15907edb0eff322227f5a97aaf5d2d92512c818b8aa1020e6f735971c8 SHA512 d31266b47abfef805f0f0ae5f13c1f89ec13907fc7e33e126eefee5600087ffadf8f55e48c5c42c295dc7de8d901a3231db0756a79d666651569a150d7016cea
diff --git a/dev-vcs/git-machete/git-machete-3.12.1.ebuild b/dev-vcs/git-machete/git-machete-3.12.1.ebuild
deleted file mode 100644
index 9c6b4673cedb..000000000000
--- a/dev-vcs/git-machete/git-machete-3.12.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Probably the sharpest git repo organizer & rebase/merge workflow automation tool"
-HOMEPAGE="https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/"
-# No tests in PyPI tarballs
-SRC_URI="https://github.com/VirtusLab/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="dev-vcs/git"
-BDEPEND="test? (
-	>=dev-python/pytest-mock-3.8.2[${PYTHON_USEDEP}]
-	>=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
-)"
-
-DOCS=( CONTRIBUTING.md README.md )
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	newbashcomp completion/${PN}.completion.bash ${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completion/${PN}.fish
-
-	insinto /usr/share/zsh/site-functions
-	newins completion/${PN}.completion.zsh _${PN}
-}
diff --git a/dev-vcs/git-machete/git-machete-3.12.5.ebuild b/dev-vcs/git-machete/git-machete-3.12.5.ebuild
new file mode 100644
index 000000000000..9c6b4673cedb
--- /dev/null
+++ b/dev-vcs/git-machete/git-machete-3.12.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Probably the sharpest git repo organizer & rebase/merge workflow automation tool"
+HOMEPAGE="https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/"
+# No tests in PyPI tarballs
+SRC_URI="https://github.com/VirtusLab/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="dev-vcs/git"
+BDEPEND="test? (
+	>=dev-python/pytest-mock-3.8.2[${PYTHON_USEDEP}]
+	>=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
+)"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	newbashcomp completion/${PN}.completion.bash ${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completion/${PN}.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins completion/${PN}.completion.zsh _${PN}
+}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 05f410bb2b91..57dab69ce3d4 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 67985f4323dd..52b250aba42f 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -7,11 +7,16 @@ AUX pcsx2-1.7.3329-qt6.patch 371 BLAKE2B 15a8e221ee4b6f19c5956269908e9d3bad6a8fb
 AUX pcsx2-1.7.3329-unbundle.patch 1493 BLAKE2B 9d37c36773d594bfc045ecf50680a422e597c96ce76e934a4ed7cc91c6ee2a1f3bb162eeb04a4437fbd5be1e064dff295702b4bcb1352a0064ba7fa697114175 SHA512 b142b2fa1aaf68437f47bd33d30e474543fea05794c67321b3b19746d95ceb7f02196ff8518bb2cc85fd52d43a4233955a31842edf38e9560e3f32204d2fd9d4
 AUX pcsx2-1.7.3329-wx-vs-sdl.patch 350 BLAKE2B 17e54fd9150ad7d8d3545e474b5579ae8b8e1df1b38b510931dee73e566903b6f9397d2dec537f6d6425d61a966f71169f84a863c0e0a82203ce21ab3f514fef SHA512 9240e808886b746d74828405a931c6dc4d093f3ab22619b2a5d349f737a241c2b7545771931a4b77385d6cb6583124a01ba24faf74f43914fdc62c6f33dd39b1
 AUX pcsx2-1.7.3351-unbundle.patch 1276 BLAKE2B 26af7e54f63bed99075f8155d237092d536b9ef420032d766ef4e41b7953c329f70d2040ae6a99142e0bc307fa9a534bd5db4e363e4e64a4291dc7a5760149b9 SHA512 7068a214cae03579e83ce14a5b953807a4f536be93946e15b58a33ede2497a128508ac2727fd1f602444906bc1497182a3740a1613d39300c403e387adbaa332
+AUX pcsx2-1.7.3468-cubeb-automagic.patch 1635 BLAKE2B 90581edb3ed95fb011ecbd446e529b48544a0c8090e7e40b4aba6fb153a73e53f8399a61ee1d9fce180ac2ee44185cf7dac1972e62dc43648496774a7a8cfca9 SHA512 d2b92cc6530c706e0219b6eab5c8b52a3e93bcc16269400afbcbb3ca23edf07f511fd4116b02e77f89eb7083b9bb64f8bec85950d9d7e98ffdbbe351d4c70387
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
 DIST pcsx2-1.7.3329.tar.gz 19379924 BLAKE2B ec1313d97ab9f8bb5c735e73a3174071ccbd8499857835145dcd057f96cf51b60f3677a64c155916e5b6d33960d3e0d8c300714b6149ce4326e747e672c97406 SHA512 cfdd129c93e04f3ddc0a685483683cf5d4c239f9e7a059fd838ebe6cc8c2f3f819c26f45a8fe2a256030fdbd6273599d6e95813980eafbd301dac27689c2182a
+DIST pcsx2-1.7.3468.tar.gz 19926257 BLAKE2B d276d7640c46c6fbad28c87b46e367c6dbfc8b3f6732f34dce49736772224dada6b4d5bc5947db2fe757b465e0d9fc0821eaf6f79987daf6df1734c8c9d34c52 SHA512 e96c1d8e733e3df8666e4eb7ebf3be47c7c65d948b4d4fc0818f90af60dfe15e928a5f93bfe0791444b3529f9b0a3789853c2b53845437507f97eda0c2bc2646
+DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
+DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
 DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
 EBUILD pcsx2-1.7.3329.ebuild 5684 BLAKE2B af44f3fe3968440f88f2506f4e23d1361f2ab5a556d0095b55dc9fe883ab1fe75de5736c22b6e5855c1d49a4e0c2eb783666b0c21f825cecc0381aecdc0d51f1 SHA512 af6169cfa2f69125abce4d08a9bcf5c1919611fdda8a00ffcf66f61bcf06f4c3dc531bdfb5042d4b605eccac11214e1904aba8626b1987b3a69ab71807ff9ac1
-EBUILD pcsx2-9999.ebuild 6179 BLAKE2B 2cb50b62a752d2c38a595543433c93fd3dc363089c79fa4bcb7658ccbf58e4a332902371e897222e40b4c5f5770e8f782ceba3ae70e0c76cfb57f3ad4d47e966 SHA512 3b4a06bfa89dcd918057366c429a5907add278998133b42f72103c2090243b715459c09a4a9f2d623e3544ad7680c1234fc064596b002505593a09cd5fec93ee
-MISC metadata.xml 717 BLAKE2B f315a01c45bfe38771a915edf8a49419aefb1308fe1acb7825ec0be8200d41043c30ddbbb497a2e8f4ccae4b40f3bf0a7530381fea217dfa75bcacce4b39b9ed SHA512 ae3eddb74bc286b0506587d090f95a0ed5ddbe6f1e7c1e8ddb2d6e3eb78ea51508eab41cc956df3d1c6b20d414864b1d86d3175e9c8e47d72424015b0873cb8f
+EBUILD pcsx2-1.7.3468.ebuild 7180 BLAKE2B f8ea7f06b934f87f2ee869ae08167078e7eaca8b9601e34d7ed586aec4ab0ce10790db81b3c6d2620be7c9606f25eefed6505c51b9d8a5621639347c73d83d00 SHA512 2cf088951ea0f2f542c0ce158bccf462f2cdd7d2f8150e4135fffa8ecfaf1ee7895eb739cb6e283b058bded6de605b89bc9aabd8112965c0b73b1357e5c2e81a
+EBUILD pcsx2-9999.ebuild 7180 BLAKE2B f8ea7f06b934f87f2ee869ae08167078e7eaca8b9601e34d7ed586aec4ab0ce10790db81b3c6d2620be7c9606f25eefed6505c51b9d8a5621639347c73d83d00 SHA512 2cf088951ea0f2f542c0ce158bccf462f2cdd7d2f8150e4135fffa8ecfaf1ee7895eb739cb6e283b058bded6de605b89bc9aabd8112965c0b73b1357e5c2e81a
+MISC metadata.xml 805 BLAKE2B eb7ce944f7dc5b1889cc2b59f389eafabe9d5e44c4a730fa1352b0a00aec0f97d607204c440a9ce014e02f5b1a73c6ccd294074e7ce41f563c6c3643614ac9f6 SHA512 e8d939f76830204283557319961b4e3aab557e1c3e36fbfc98d4605b0728adb42d0731a05da998eb099f6b0df837eef7616cddb1e62b006979fb9262c172d961
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch
new file mode 100644
index 000000000000..804cf29af397
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3468-cubeb-automagic.patch
@@ -0,0 +1,56 @@
+Same that media-libs/cubeb does and meant for -DLAZY_LOAD_LIBS=no.
+
+Unfortunately need to use bundled cubeb here given it modifies the
+source starting with (but not limited to):
+https://github.com/PCSX2/pcsx2/commit/9170a5abc1
+--- a/3rdparty/cubeb/CMakeLists.txt
++++ b/3rdparty/cubeb/CMakeLists.txt
+@@ -110,38 +110,48 @@
+ 
+   find_package(PkgConfig REQUIRED)
+ 
++  if(CHECK_PULSE)
+   pkg_check_modules(libpulse IMPORTED_TARGET libpulse)
+   if(libpulse_FOUND)
+     set(USE_PULSE ON)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBPULSE_DLOPEN)
+     target_link_libraries(cubeb PRIVATE PkgConfig::libpulse)
+   endif()
++  endif()
+ 
++  if(CHECK_ALSA)
+   pkg_check_modules(alsa IMPORTED_TARGET alsa)
+   if(alsa_FOUND)
+     set(USE_ALSA ON)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBASOUND_DLOPEN)
+     target_link_libraries(cubeb PRIVATE PkgConfig::alsa)
+   endif()
++  endif()
+ 
++  if(CHECK_JACK)
+   pkg_check_modules(jack IMPORTED_TARGET jack)
+   if(jack_FOUND)
+     set(USE_JACK ON)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBJACK_DLOPEN)
+     target_link_libraries(cubeb PRIVATE PkgConfig::jack)
+   endif()
++  endif()
+ 
++  if(CHECK_SNDIO)
+   check_include_files(sndio.h USE_SNDIO)
+   if(USE_SNDIO)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBSNDIO_DLOPEN)
+     target_link_libraries(cubeb PRIVATE sndio)
+   endif()
++  endif()
+ 
++  if(CHECK_AAUDIO)
+   check_include_files(aaudio/AAudio.h USE_AAUDIO)
+   if(USE_AAUDIO)
+     target_compile_definitions(cubeb PRIVATE DISABLE_LIBAAUDIO_DLOPEN)
+     target_link_libraries(cubeb PRIVATE aaudio)
+   endif()
++  endif()
+ endif()
+ 
+ if(USE_PULSE)
diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index e4c0e91aeda5..efa1131e61ab 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -14,6 +14,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
+		<flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
 		<flag name="vulkan">Enable support for Vulkan</flag>
 	</use>
 	<upstream>
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3468.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3468.ebuild
new file mode 100644
index 000000000000..25b97c43ac32
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.3468.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake fcaps flag-o-matic wxwidgets
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+	HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
+	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+	SRC_URI="
+		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+		https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
+		vulkan? (
+			https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+			https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+		)"
+	KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/"
+
+LICENSE="
+	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+SLOT="0"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio qt6 sndio test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/rapidyaml:=
+	dev-libs/libaio
+	dev-libs/libchdr
+	>=dev-libs/libfmt-7.1.3:=
+	dev-libs/libzip:=[zstd]
+	media-libs/harfbuzz
+	media-libs/libglvnd
+	media-libs/libpng:=
+	>=media-libs/libsdl2-2.0.22[haptic,joystick]
+	media-libs/libsoundtouch:=
+	net-libs/libpcap
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		dev-qt/qtsvg:6
+		net-misc/curl
+	)
+	!qt6? (
+		dev-libs/glib:2
+		media-libs/libsamplerate
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[wayland?]
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
+	)
+	sndio? ( media-sound/sndio:= )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	test? ( dev-cpp/gtest )"
+BDEPEND="
+	dev-lang/perl
+	qt6? ( dev-qt/qttools[linguist] )
+	!qt6? ( sys-devel/gettext )"
+
+FILECAPS=(
+	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-crcs.patch
+	"${FILESDIR}"/${PN}-1.7.3329-lto.patch
+	"${FILESDIR}"/${PN}-1.7.3329-musl.patch
+	"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
+	"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
+	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		local EGIT_SUBMODULES=(
+			# has no build system and is not really setup for unbundling
+			3rdparty/rcheevos/rcheevos
+
+			# system rapidyaml is still used, but this uses another part
+			# of the source directly (fast_float) and so allow the submodule
+			# https://github.com/PCSX2/pcsx2/commit/af646e449
+			3rdparty/rapidyaml/rapidyaml
+			3rdparty/rapidyaml/rapidyaml/extern/c4core
+			3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
+
+			# uses glslang's StandAlone/ResourceLimits.h unavailable with
+			# system's (also keep bundled vulkan-headers to be in sync)
+			$(usev vulkan '
+				3rdparty/glslang/glslang
+				3rdparty/vulkan-headers')
+		)
+
+		git-r3_src_unpack
+	else
+		default
+
+		mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die
+		mv fast_float-${HASH_FASTFLOAT} \
+			"${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die
+
+		rmdir "${S}"/3rdparty/rcheevos/rcheevos || die
+		mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die
+
+		if use vulkan; then
+			rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
+			mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
+			mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# qt6 build doesn't support PACKAGE_MODE and need to set resources location
+	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \
+		-i pcsx2/Frontend/CommonHost.cpp || die
+
+	# non-cubeb pulseaudio is only used for usb-mic without qt6, not output
+	use pulseaudio || :> cmake/FindPulseAudio.cmake || die
+
+	if [[ ${PV} != 9999 ]]; then
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+			-i cmake/Pcsx2Utils.cmake || die
+
+		# delete all 3rdparty/* except known-used ones in non-live
+		local keep=(
+			# TODO?: rapidjson and xbyak are packaged and could be unbundlable
+			# w/ patch, and discord-rpc be optional w/ dependency on rapidjson
+			cpuinfo cubeb discord-rpc glad imgui include jpgd lzma
+			rapidjson rapidyaml rcheevos simpleini xbyak
+			$(usev vulkan 'glslang vulkan-headers')
+		)
+		find 3rdparty -mindepth 1 -maxdepth 1 -type d \
+			-not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die
+	fi
+}
+
+src_configure() {
+	use qt6 || setup-wxwidgets
+
+	# for bundled glslang (bug #858374)
+	use vulkan && append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_BUILD_DATE=yes
+		-DDISABLE_PCSX2_WRAPPER=yes
+		-DDISABLE_SETCAP=yes
+		-DENABLE_TESTS=$(usex test)
+		-DPACKAGE_MODE=yes
+		-DQT_BUILD=$(usex qt6)
+		-DUSE_SYSTEM_LIBS=yes
+		-DUSE_VTUNE=no
+		-DUSE_VULKAN=$(usex vulkan)
+		-DWAYLAND_API=$(usex wayland)
+		-DXDG_STD=yes
+
+		# sse4.1 is the bare minimum required, -m is required at build time
+		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)
+		# https://github.com/PCSX2/pcsx2/pull/4329
+		-DARCH_FLAG=-msse4.1
+
+		# bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
+		-DCHECK_ALSA=$(usex alsa)
+		-DCHECK_JACK=$(usex jack)
+		-DCHECK_PULSE=$(usex pulseaudio)
+		-DCHECK_SNDIO=$(usex sndio)
+		-DLAZY_LOAD_LIBS=no
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build unittests
+}
+
+src_install() {
+	cmake_src_install
+
+	use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	local replacing_old
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1
+	then
+		replacing_old=
+		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case"
+		elog "it is recommended to backup your save states and memory cards before use."
+		elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'."
+	fi
+
+	if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then
+		[[ -v replacing_old ]] && elog
+		elog "${PN}-1.7.x is a development branch using a nightly release model"
+		elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting old and lacks"
+		elog "many notable features (e.g. native 64bit builds). Given it may be a long"
+		elog "time before there is a new stable, Gentoo will carry and update 1.7.x"
+		elog "roughly every months."
+		elog
+		elog "Please report an issue if feel a picked nightly release needs to be"
+		elog "updated ahead of time or masked (notably for handling regressions)."
+	fi
+}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index e65ca9879371..25b97c43ac32 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -10,10 +10,14 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
 else
+	HASH_FASTFLOAT=32d21dcecb404514f94fb58660b8029a4673c2c1
+	HASH_RCHEEVOS=31f8788fe0e694e99db7ce138d45a655c556fa96
 	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
 	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
 	SRC_URI="
 		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/fastfloat/fast_float/archive/${HASH_FASTFLOAT}.tar.gz -> ${PN}-fast_float-${HASH_FASTFLOAT::10}.tar.gz
+		https://github.com/RetroAchievements/rcheevos/archive/${HASH_RCHEEVOS}.tar.gz -> ${PN}-rcheevos-${HASH_RCHEEVOS::10}.tar.gz
 		vulkan? (
 			https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
 			https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
@@ -25,11 +29,10 @@ DESCRIPTION="PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
 
 LICENSE="
-	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ ISC LGPL-2.1+
-	LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+
+	ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
 SLOT="0"
-# TODO: proper IUSE to handle cubeb backends with the now-required bundled copy
-IUSE="cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland"
+IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio qt6 sndio test vulkan wayland"
 REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
 
@@ -44,7 +47,6 @@ RDEPEND="
 	media-libs/harfbuzz
 	media-libs/libglvnd
 	media-libs/libpng:=
-	media-libs/libsamplerate
 	>=media-libs/libsdl2-2.0.22[haptic,joystick]
 	media-libs/libsoundtouch:=
 	net-libs/libpcap
@@ -52,6 +54,9 @@ RDEPEND="
 	virtual/libudev:=
 	x11-libs/libX11
 	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-libs/libpulse )
 	qt6? (
 		dev-qt/qtbase:6[gui,network,widgets]
 		dev-qt/qtsvg:6
@@ -59,11 +64,12 @@ RDEPEND="
 	)
 	!qt6? (
 		dev-libs/glib:2
+		media-libs/libsamplerate
 		x11-libs/gdk-pixbuf:2
 		x11-libs/gtk+:3[wayland?]
 		x11-libs/wxGTK:${WX_GTK_VER}[X]
-		pulseaudio? ( media-libs/libpulse )
 	)
+	sndio? ( media-sound/sndio:= )
 	vulkan? ( media-libs/vulkan-loader )
 	wayland? ( dev-libs/wayland )"
 DEPEND="
@@ -85,31 +91,40 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.3329-musl.patch
 	"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
 	"${FILESDIR}"/${PN}-1.7.3351-unbundle.patch
+	"${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch
 )
 
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
-		local EGIT_SUBMODULES=()
-		if use vulkan; then
-			EGIT_SUBMODULES+=(
-				3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
-				3rdparty/vulkan-headers # to keep in sync with glslang
-
-				# system rapidyaml is still used, but this uses another part
-				# of the source and so allow submodule for now
-				# https://github.com/PCSX2/pcsx2/commit/af646e449
-				3rdparty/rapidyaml/rapidyaml
-				3rdparty/rapidyaml/rapidyaml/extern/c4core
-				3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
-
-				# TODO?: check if easy to unbundle when look at next nightly bump
-				# (there is a -DUSE_ACHIVEMENTS to be optional too)
-				3rdparty/rcheevos/rcheevos
-			)
-		fi
+		local EGIT_SUBMODULES=(
+			# has no build system and is not really setup for unbundling
+			3rdparty/rcheevos/rcheevos
+
+			# system rapidyaml is still used, but this uses another part
+			# of the source directly (fast_float) and so allow the submodule
+			# https://github.com/PCSX2/pcsx2/commit/af646e449
+			3rdparty/rapidyaml/rapidyaml
+			3rdparty/rapidyaml/rapidyaml/extern/c4core
+			3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float
+
+			# uses glslang's StandAlone/ResourceLimits.h unavailable with
+			# system's (also keep bundled vulkan-headers to be in sync)
+			$(usev vulkan '
+				3rdparty/glslang/glslang
+				3rdparty/vulkan-headers')
+		)
+
 		git-r3_src_unpack
 	else
 		default
+
+		mkdir -p "${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext || die
+		mv fast_float-${HASH_FASTFLOAT} \
+			"${S}"/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float || die
+
+		rmdir "${S}"/3rdparty/rcheevos/rcheevos || die
+		mv rcheevos-${HASH_RCHEEVOS} "${S}"/3rdparty/rcheevos/rcheevos || die
+
 		if use vulkan; then
 			rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
 			mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
@@ -125,11 +140,8 @@ src_prepare() {
 	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \
 		-i pcsx2/Frontend/CommonHost.cpp || die
 
-	# pulseaudio is only used for usb-mic and without qt6, not for audio output
-	{ use pulseaudio && use !qt6; } || :> cmake/FindPulseAudio.cmake || die
-
-	# GS tests currently fail to build with qt6
-	use !qt6 || sed -i '/add_subdirectory(GS)/d' tests/ctest/CMakeLists.txt || die
+	# non-cubeb pulseaudio is only used for usb-mic without qt6, not output
+	use pulseaudio || :> cmake/FindPulseAudio.cmake || die
 
 	if [[ ${PV} != 9999 ]]; then
 		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
@@ -137,7 +149,10 @@ src_prepare() {
 
 		# delete all 3rdparty/* except known-used ones in non-live
 		local keep=(
-			cpuinfo glad imgui include jpgd lzma simpleini xbyak
+			# TODO?: rapidjson and xbyak are packaged and could be unbundlable
+			# w/ patch, and discord-rpc be optional w/ dependency on rapidjson
+			cpuinfo cubeb discord-rpc glad imgui include jpgd lzma
+			rapidjson rapidyaml rcheevos simpleini xbyak
 			$(usev vulkan 'glslang vulkan-headers')
 		)
 		find 3rdparty -mindepth 1 -maxdepth 1 -type d \
@@ -169,6 +184,13 @@ src_configure() {
 		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)
 		# https://github.com/PCSX2/pcsx2/pull/4329
 		-DARCH_FLAG=-msse4.1
+
+		# bundled cubeb flags, see media-libs/cubeb and cubeb-automagic.patch
+		-DCHECK_ALSA=$(usex alsa)
+		-DCHECK_JACK=$(usex jack)
+		-DCHECK_PULSE=$(usex pulseaudio)
+		-DCHECK_SNDIO=$(usex sndio)
+		-DLAZY_LOAD_LIBS=no
 	)
 
 	cmake_src_configure
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1ba5629d4def..b14688fb5058 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 f0fbe5e19679..6a80c104e2ee 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 21 Oct 2022 06:09:34 +0000
+Fri, 21 Oct 2022 12:09:34 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 8b97b620dbaa..71c156867ebd 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 530688 BLAKE2B 1384754019a41108cd5a577394c6aafe7ddaa1600e86ddd30f667b8ffcd2a271d1d63c110dd32bcc5d2cdf57213dc2ed2ad65288c00d7dd764fc88a2a5ad121f SHA512 08bf73bc99a66d9fbe7dcf764826772bf00488ab216fa1e39298dffc1fef683f7a82d65031193ede26cf629f7bb21ac7a709099a37a9c6772e7b4eacbf503986
-TIMESTAMP 2022-10-21T06:09:38Z
+TIMESTAMP 2022-10-21T12:09:38Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNSN6JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNSjAJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klANwxAAhSWc7ttxaLm2Lce1GYzZ4KZnUpdJGu0q7PgP+ACyhY88zyvgh6Z/gcpR
-N7708FhLtxKvauRB3Xi+PeTo0uKV8f7KYTWRGpB64dTi1C5VxadYtwqrJXTjd+jW
-QPMFVgq5mHjQqom6l/k/ODUYrcNI4N+1gDDFbWsjWZ4SpYfbff8N/HsHwcEKS/AZ
-y413gmzxBGjO4XjsKfG4fiZvK+YxuYyMXxjh0NzNUO/Z5NT2HR+IVsfp2OepluK6
-Z46sfBPCsq/3zzZslgNgWQT9KmR3/E5r4tVhcTUZwCcFBz76ooijt6WLPYYy5Sz4
-GokDP708Kq+xDiapMGUk3y/BlFRH3RoYTmUaiTVXsnbxoNmk4F8iE/dq87/fCMx0
-B03IIkQhgMcpQ4YuliB93FsN6O6QsbeKl5WVAnHldhlEqYVcPKpSCemlaZq7i53p
-5h6GxbHsO2S5GvW7CacHB6bacdh4tHImz7l3UAda2BPXu85lXb9PIAkIfD2TeRKS
-qml5r6wn1DQd0unIPnUBVoyS6iGNYAjIr77x972W81gCxxYG2Zo981qtvSa15l21
-zsGM9JE4L6z6fjQcVE77Yv3RW2PY/Wp6p+nO+HxPz3ANbEYSymc9c6J7tNhjmnwp
-rn2INpkf04PsZp8kXlg3Tqi59G2Ucn6ooF10Yw/XRy/khS4ApMY=
-=11p2
+klCUvw/+PP1BDHlLwIRA0EZjswbbqd9DyOZWFLVFMgaPcHrSC3QVUI6OD+nQKap/
+lnbjRefwVhPA3AyYfHsLkr1brl2KjoO0pwptgQC5nvyrufuI3tZ+6OVl81Qb3IQt
+uJ8p9f/WJqbr+7GhG++kTvgt6MMGV5wBK8PZZ8yazuh91Fg+5AO8VuuJCPtu0Wzo
+utA8TQVj9zPeGHXgk3eDYAPBF0IhsrxCU9A3affFNYEmc7EpeYIZnTT9gpE/9XWc
+OOl+RgsFUeG59kmmtomJtHtZCey0/Qc4hfPCKP05U1EB+r/fgcsYKa4GQgPyOJ9Y
+7ZePtkkGeZYWIyc7idlBn2Oaxp0GRjfPenjywGTVx3PzhYwIlpCPSeNCn0uoZKog
+ax4cZNUrrYWS+WDsqhyz3VezkMC/+9qn+VFxx0sEPSpA8lvi4bYhBgTbbQT7trus
+vo34mFiLvaQ0zmNLQZeorpsnync7E4aLnshQTY1bmrryFQQl8DokE/MY+UP2AXdc
+jrmp9UOwmJNpwohvzdOaHAKYZ18Wh2gYUaLhJyzVO4iR0dfFIdDEDLblbiqgKCmB
+6ftLoeMEu1Y6qCOV/x062JQBlD+DpRk3+EZLEN1GpYQ6CXTS8wYom4j+aoH2HXfm
+HQJupe7lXNsX64sdKsVxWQMOq86bz7Jm4zH0PlLt0rslrJ9JLoE=
+=Zo2H
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 0428302a19ae..12faf42e58f1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 21 Oct 2022 06:09:35 +0000
+Fri, 21 Oct 2022 12:09:35 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 2f4bdb1cc0b5..dc1878e783c1 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 3af6feead237..b02005bfdb09 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/borgmatic-1.7.3 b/metadata/md5-cache/app-backup/borgmatic-1.7.3
deleted file mode 100644
index e35be275d5a7..000000000000
--- a/metadata/md5-cache/app-backup/borgmatic-1.7.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_8? ( >=dev-python/flexmock-0.10.10[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/flexmock-0.10.10[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/flexmock-0.10.10[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/flexmock-0.10.10[python_targets_python3_11(-)] ) ) test? ( app-backup/borgbackup python_single_target_python3_8? ( <dev-python/colorama-0.5[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/colorama-0.5[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/colorama-0.5[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-python/colorama-0.5[python_targets_python3_11(-)] dev-python/jsonschema[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_11(-)] dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.1.3[python_targets_python3_11(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-9[python_targets_python3_11(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_11(-)] dev-python/wheel[python_targets_python3_11(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DESCRIPTION=Automatically create, prune and verify backups with borgbackup
-EAPI=8
-HOMEPAGE=https://torsion.org/borgmatic/
-INHERIT=distutils-r1 systemd
-IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv
-LICENSE=GPL-3
-RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( <dev-python/colorama-0.5[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/colorama-0.5[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/colorama-0.5[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-python/colorama-0.5[python_targets_python3_11(-)] dev-python/jsonschema[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_11(-)] dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.7.3.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2699b2634a45103fd5521855cf5a4508
diff --git a/metadata/md5-cache/app-backup/borgmatic-1.7.4 b/metadata/md5-cache/app-backup/borgmatic-1.7.4
new file mode 100644
index 000000000000..26272cbc9c96
--- /dev/null
+++ b/metadata/md5-cache/app-backup/borgmatic-1.7.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_single_target_python3_8? ( >=dev-python/flexmock-0.10.10[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/flexmock-0.10.10[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/flexmock-0.10.10[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/flexmock-0.10.10[python_targets_python3_11(-)] ) ) test? ( app-backup/borgbackup python_single_target_python3_8? ( <dev-python/colorama-0.5[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/colorama-0.5[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/colorama-0.5[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-python/colorama-0.5[python_targets_python3_11(-)] dev-python/jsonschema[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_11(-)] dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.1.3[python_targets_python3_11(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-9[python_targets_python3_11(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_11(-)] dev-python/wheel[python_targets_python3_11(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=Automatically create, prune and verify backups with borgbackup
+EAPI=8
+HOMEPAGE=https://torsion.org/borgmatic/
+INHERIT=distutils-r1 systemd
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv
+LICENSE=GPL-3
+RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( <dev-python/colorama-0.5[python_targets_python3_8(-)] dev-python/jsonschema[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/colorama-0.5[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/colorama-0.5[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_10(-)] dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-python/colorama-0.5[python_targets_python3_11(-)] dev-python/jsonschema[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] <dev-python/ruamel-yaml-0.18.0[python_targets_python3_11(-)] dev-python/setuptools[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.7.4.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=8c2d51d3ca8d95b5405696e9109eecdc
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 7259ab438dbf..e54d61927007 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/poppler-22.07.0 b/metadata/md5-cache/app-text/poppler-22.07.0
index ce19d0b19da0..a7dbbaf18faf 100644
--- a/metadata/md5-cache/app-text/poppler-22.07.0
+++ b/metadata/md5-cache/app-text/poppler-22.07.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://poppler.freedesktop.org/
 INHERIT=cmake toolchain-funcs xdg-utils verify-sig
 IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils verify-sig
-KEYWORDS=arm64 ppc ppc64 ~ppc-macos
+KEYWORDS=ppc64
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/122
 SRC_URI=https://poppler.freedesktop.org/poppler-22.07.0.tar.xz verify-sig? ( https://poppler.freedesktop.org/poppler-22.07.0.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=97c6d9c77597e8ffa92905d00f55d23f
+_md5_=ca502c140b7d4a1a083a40246d4617c3
diff --git a/metadata/md5-cache/app-text/poppler-22.09.0 b/metadata/md5-cache/app-text/poppler-22.09.0
index 578d85bd7fbd..5a875d36c6ac 100644
--- a/metadata/md5-cache/app-text/poppler-22.09.0
+++ b/metadata/md5-cache/app-text/poppler-22.09.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://poppler.freedesktop.org/
 INHERIT=cmake toolchain-funcs xdg-utils verify-sig
 IUSE=boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig >=media-libs/freetype-2.8 sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/124
 SRC_URI=https://poppler.freedesktop.org/poppler-22.09.0.tar.xz verify-sig? ( https://poppler.freedesktop.org/poppler-22.09.0.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=61bb73e5e53dc02c8be4b1adc4615ffe
+_md5_=bc6c71623e0cd4f883d88231cc11095a
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 6b81fdf7e8e4..352394101af8 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0 b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
index 293846226ca6..03e81a24fdee 100644
--- a/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
+++ b/metadata/md5-cache/dev-java/jakarta-servlet-api-6.0.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j.servlet
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm arm64 ppc64
 LICENSE=EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=https://github.com/jakartaee/servlet/archive/6.0.0-RELEASE.tar.gz -> jakarta-servlet-api-6.0.0-RELEASE.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=2b05433eb8a15d454eef2aa441e9c372
+_md5_=ea75da9779346a62c183d459229ce156
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4e1d3e8b1ba8..8ba0f2ae8309 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/jemalloc-5.3.0-r1 b/metadata/md5-cache/dev-libs/jemalloc-5.3.0-r1
index d0b47d74df65..2ecfc363613b 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-5.3.0-r1
+++ b/metadata/md5-cache/dev-libs/jemalloc-5.3.0-r1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=http://jemalloc.net/ https://github.com/jemalloc/jemalloc
 INHERIT=autotools multilib-minimal
 IUSE=debug lazy-lock prof stats xmalloc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD
 SLOT=0/2
 SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6d1890aeee0d2ba59e32d3ba51fb5f1e
+_md5_=d500810e82804327888e2460f5570ee0
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index b5fabf93dc91..7aa88aa4a96c 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/fsspec-2022.10.0 b/metadata/md5-cache/dev-python/fsspec-2022.10.0
new file mode 100644
index 000000000000..cc9d8228ba92
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fsspec-2022.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) test? ( >=dev-python/pytest-7.1.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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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 specification that python filesystems should adhere to
+EAPI=8
+HOMEPAGE=https://github.com/fsspec/filesystem_spec/ https://pypi.org/project/fsspec/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( 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/fsspec/filesystem_spec/archive/2022.10.0.tar.gz -> filesystem_spec-2022.10.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=6a186866a2ad2d537ebdea50e302994c
diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.11.2 b/metadata/md5-cache/dev-python/jupyter_core-4.11.2
new file mode 100644
index 000000000000..e2aa49872ccf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.11.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/ipython-4.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-)] ) ) ) test? ( dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Core common functionality of Jupyter projects
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/jupyter_core/ https://pypi.org/project/jupyter-core/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.11.2.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=59facaba166ce20d7847b932febbddc7
diff --git a/metadata/md5-cache/dev-python/jupyterlab_server-2.14.0 b/metadata/md5-cache/dev-python/jupyterlab_server-2.14.0
deleted file mode 100644
index 21f859469373..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab_server-2.14.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-spec-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-console-scripts[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornasync[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Server components for JupyterLab and JupyterLab like applications
-EAPI=8
-HOMEPAGE=https://jupyter.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyterlab_server/jupyterlab_server-2.14.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e79e1464b39a308db6e904e03d7f8b84
diff --git a/metadata/md5-cache/dev-python/jupyterlab_server-2.15.0 b/metadata/md5-cache/dev-python/jupyterlab_server-2.15.0
deleted file mode 100644
index 051ce2aff740..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab_server-2.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-spec-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-console-scripts[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornasync[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Server components for JupyterLab and JupyterLab like applications
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab_server/ https://pypi.org/project/jupyterlab-server/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyterlab_server/jupyterlab_server-2.15.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e67edb01b013f4c7ea560f2fd5a1053f
diff --git a/metadata/md5-cache/dev-python/jupyterlab_server-2.15.1 b/metadata/md5-cache/dev-python/jupyterlab_server-2.15.1
deleted file mode 100644
index 213ee6e6a23b..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab_server-2.15.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-spec-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-console-scripts[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornasync[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Server components for JupyterLab and JupyterLab like applications
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab_server/ https://pypi.org/project/jupyterlab-server/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyterlab_server/jupyterlab_server-2.15.1.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e67edb01b013f4c7ea560f2fd5a1053f
diff --git a/metadata/md5-cache/dev-python/jupyterlab_server-2.15.2 b/metadata/md5-cache/dev-python/jupyterlab_server-2.15.2
deleted file mode 100644
index 6567d5fecaf7..000000000000
--- a/metadata/md5-cache/dev-python/jupyterlab_server-2.15.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openapi-core-0.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/openapi-core-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-spec-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-console-scripts[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornasync[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Server components for JupyterLab and JupyterLab like applications
-EAPI=8
-HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab_server/ https://pypi.org/project/jupyterlab-server/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyterlab_server/jupyterlab_server-2.15.2.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5d558d3aaa4d50d64d501ee316b30597
diff --git a/metadata/md5-cache/dev-python/jupyterlab_server-2.16.1 b/metadata/md5-cache/dev-python/jupyterlab_server-2.16.1
new file mode 100644
index 000000000000..6aef05758a6e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyterlab_server-2.16.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openapi-core-0.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/openapi-core-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openapi-spec-validator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornasync[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Server components for JupyterLab and JupyterLab like applications
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyterlab/jupyterlab_server/ https://pypi.org/project/jupyterlab-server/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/Babel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/json5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jupyter_server-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyterlab_server/jupyterlab_server-2.16.1.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=138dcfa3ba2028009d211f72b7218ee0
diff --git a/metadata/md5-cache/dev-python/moto-4.0.8 b/metadata/md5-cache/dev-python/moto-4.0.8
new file mode 100644
index 000000000000..c4000a9c6c2f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-4.0.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Mock library for boto
+EAPI=8
+HOMEPAGE=https://github.com/spulec/moto
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zipp[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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/moto/moto-4.0.8.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=1cfa57ed93b8172202ac5eec3fea905b
diff --git a/metadata/md5-cache/dev-python/nuitka-1.1.3 b/metadata/md5-cache/dev-python/nuitka-1.1.3
deleted file mode 100644
index ca3325e763eb..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-1.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
-INHERIT=distutils-r1 flag-o-matic optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-1.1.3.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=245696c80a85c4cec67db30002ad9105
diff --git a/metadata/md5-cache/dev-python/nuitka-1.1.4 b/metadata/md5-cache/dev-python/nuitka-1.1.4
deleted file mode 100644
index 010841880746..000000000000
--- a/metadata/md5-cache/dev-python/nuitka-1.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python to native compiler
-EAPI=8
-HOMEPAGE=https://www.nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
-INHERIT=distutils-r1 flag-o-matic optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~loong ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://nuitka.net/releases/Nuitka-1.1.4.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=245696c80a85c4cec67db30002ad9105
diff --git a/metadata/md5-cache/dev-python/nuitka-1.1.6 b/metadata/md5-cache/dev-python/nuitka-1.1.6
new file mode 100644
index 000000000000..ce02250bda44
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nuitka-1.1.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
+INHERIT=distutils-r1 flag-o-matic optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~loong ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://nuitka.net/releases/Nuitka-1.1.6.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=245696c80a85c4cec67db30002ad9105
diff --git a/metadata/md5-cache/dev-python/pbr-5.11.0 b/metadata/md5-cache/dev-python/pbr-5.11.0
new file mode 100644
index 000000000000..58a5e1c549cf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pbr-5.11.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_python3_8? ( >=dev-python/wheel-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testresources-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) python_targets_python3_9? ( >=dev-python/wheel-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testresources-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) python_targets_python3_10? ( >=dev-python/wheel-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testresources-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) python_targets_python3_11? ( >=dev-python/wheel-0.32.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testresources-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) ) test? ( >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[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.9_p1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=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.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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
+DESCRIPTION=Inject some useful and sensible default behaviors into setuptools
+EAPI=8
+HOMEPAGE=https://opendev.org/openstack/pbr/ https://github.com/openstack/pbr/ https://pypi.org/project/pbr/
+INHERIT=distutils-r1
+IUSE=test 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/setuptools-60.5.0[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.9_p1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
+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=mirror://pypi/p/pbr/pbr-5.11.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=aef8aad4abb617fe99065c5260fcd212
diff --git a/metadata/md5-cache/dev-python/scipy-1.9.3 b/metadata/md5-cache/dev-python/scipy-1.9.3
new file mode 100644
index 000000000000..d491d13b5790
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scipy-1.9.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/swig >=dev-python/cython-0.29.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/meson-0.62.2 dev-util/patchelf virtual/pkgconfig doc? ( app-arch/unzip ) pythran? ( dev-python/pythran[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/meson-python-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 virtual/fortran
+DESCRIPTION=Scientific algorithms library for Python
+EAPI=8
+HOMEPAGE=https://scipy.org/ https://github.com/scipy/scipy/ https://pypi.org/project/scipy/
+INHERIT=fortran-2 distutils-r1 multiprocessing
+IUSE=doc +pythran test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 -hppa ~ppc ~ppc64 ~riscv ~s390 ~x86
+LICENSE=BSD LGPL-2
+RDEPEND=>=dev-python/numpy-1.18.5[lapack,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/arpack:= sci-libs/umfpack virtual/cblas >=virtual/lapack-3.8 dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/fortran python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/scipy/scipy-1.9.3.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.8.1/scipy-html-1.8.1.zip https://docs.scipy.org/doc/scipy-1.8.1/scipy-ref-1.8.1.pdf )
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=beed2bd4494112b196025d52b03c558a
diff --git a/metadata/md5-cache/dev-python/swagger_spec_validator-3.0.1 b/metadata/md5-cache/dev-python/swagger_spec_validator-3.0.1
index c0726e5b3879..5dca2dd4e754 100644
--- a/metadata/md5-cache/dev-python/swagger_spec_validator-3.0.1
+++ b/metadata/md5-cache/dev-python/swagger_spec_validator-3.0.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Yelp/swagger_spec_validator/archive/v3.0.1.tar.gz -> swagger_spec_validator-3.0.1.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=70c7d6d69bffeff41910c7326620e88c
+_md5_=6ce86fdd62ff1a41a7253c1f022cb1c6
diff --git a/metadata/md5-cache/dev-python/uvicorn-0.19.0 b/metadata/md5-cache/dev-python/uvicorn-0.19.0
new file mode 100644
index 000000000000..6d6bb854a4d1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uvicorn-0.19.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httpx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dotenv[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/websockets-10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wsproto[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/asgiref-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/h11-0.8[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.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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/hatchling-1.8.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 postinst prepare test
+DESCRIPTION=Lightning-fast ASGI server implementation
+EAPI=8
+HOMEPAGE=https://www.uvicorn.org/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/asgiref-3.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/h11-0.8[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.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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/encode/uvicorn/archive/0.19.0.tar.gz -> uvicorn-0.19.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=79217d916fee3378e703b58cd0366e5a
diff --git a/metadata/md5-cache/dev-python/watchfiles-0.18.0 b/metadata/md5-cache/dev-python/watchfiles-0.18.0
new file mode 100644
index 000000000000..bfc0e127d7e9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/watchfiles-0.18.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/dirty-equals[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( =dev-python/anyio-3*[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(-)?] ) >=virtual/rust-1.53 python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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-util/maturin-0.13.2[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 unpack
+DESCRIPTION=Simple, modern file watching and code reload in Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/watchfiles/ https://github.com/samuelcolvin/watchfiles/
+INHERIT=cargo distutils-r1
+IUSE=test debug python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD CC0-1.0 ISC MIT Unlicense
+RDEPEND==dev-python/anyio-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.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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/samuelcolvin/watchfiles/archive/v0.18.0.tar.gz -> watchfiles-0.18.0.gh.tar.gz https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/filetime/0.2.16/download -> filetime-0.2.16.crate https://crates.io/api/v1/crates/fsevent-sys/4.1.0/download -> fsevent-sys-4.1.0.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/inotify/0.9.6/download -> inotify-0.9.6.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/kqueue/1.0.5/download -> kqueue-1.0.5.crate https://crates.io/api/v1/crates/kqueue-sys/1.0.3/download -> kqueue-sys-1.0.3.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.124/download -> libc-0.2.124.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.16/download -> log-0.4.16.crate https://crates.io/api/v1/crates/mio/0.8.2/download -> mio-0.8.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/notify/5.0.0/download -> notify-5.0.0.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.2/download -> parking_lot_core-0.9.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.37/download -> proc-macro2-1.0.37.crate https://crates.io/api/v1/crates/pyo3/0.16.4/download -> pyo3-0.16.4.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.4/download -> pyo3-build-config-0.16.4.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.4/download -> pyo3-ffi-0.16.4.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.4/download -> pyo3-macros-0.16.4.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.4/download -> pyo3-macros-backend-0.16.4.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/syn/1.0.91/download -> syn-1.0.91.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.34.0/download -> windows-sys-0.34.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.34.0/download -> windows_aarch64_msvc-0.34.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.34.0/download -> windows_i686_gnu-0.34.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.34.0/download -> windows_i686_msvc-0.34.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.34.0/download -> windows_x86_64_gnu-0.34.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.34.0/download -> windows_x86_64_msvc-0.34.0.crate
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=f2a8e2a31dbeb35c0c17b97d40691e91
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 47bd0aa1db58..aadb97779385 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.5.1 b/metadata/md5-cache/dev-ruby/fuubar-2.5.1
index ef149f6a7b6c..08fe4498d615 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.5.1
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.5.1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Instafailing RSpec progress bar formatter
 EAPI=7
 HOMEPAGE=https://github.com/thekompanee/fuubar
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] >=dev-ruby/ruby-progressbar-1.4:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/thekompanee/fuubar/archive/releases/v2.5.1.tar.gz -> fuubar-2.5.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d3e90a422b53c98cd93fec49170c20c7
+_md5_=8c16ed2ec3d673c0d963b38c50f3f4b7
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.22.1 b/metadata/md5-cache/dev-ruby/parallel-1.22.1
index e789e41c2eb1..9d0b7af8f0c8 100644
--- a/metadata/md5-cache/dev-ruby/parallel-1.22.1
+++ b/metadata/md5-cache/dev-ruby/parallel-1.22.1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby27(-)] dev-ruby/activerecord[ruby_targets_ruby27(-),sqlite] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby30(-)] dev-ruby/activerecord[ruby_targets_ruby30(-),sqlite] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby27(-)] dev-ruby/activerecord[ruby_targets_ruby27(-),sqlite] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby30(-)] dev-ruby/activerecord[ruby_targets_ruby30(-),sqlite] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby31(-)] dev-ruby/activerecord[ruby_targets_ruby31(-),sqlite] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-process/lsof sys-process/procps ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=test? ( sys-process/lsof sys-process/procps ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Run any code in parallel Processes or Threads
 EAPI=8
 HOMEPAGE=https://github.com/grosser/parallel
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/grosser/parallel/archive/v1.22.1.tar.gz -> parallel-1.22.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=70c02c21abff2c1249c0e7bacca3e277
+_md5_=b11158e865169e8daeda832550fb0b88
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1 b/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
index 408286960ef0..4bd2bb3ffb6c 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.70.8-r1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby27(-)] dev-ruby/fuubar:2[ruby_targets_ruby27(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby30(-)] dev-ruby/fuubar:2[ruby_targets_ruby30(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby27(-)] dev-ruby/fuubar:2[ruby_targets_ruby27(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby30(-)] dev-ruby/fuubar:2[ruby_targets_ruby30(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby31(-)] dev-ruby/fuubar:2[ruby_targets_ruby31(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=RSpec support and matchers
 EAPI=7
 HOMEPAGE=https://github.com/thekompanee/rspectacular
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
 KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby27(-)] dev-ruby/fuubar:2[ruby_targets_ruby27(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby30(-)] dev-ruby/fuubar:2[ruby_targets_ruby30(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby27(-)] dev-ruby/fuubar:2[ruby_targets_ruby27(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby30(-)] dev-ruby/fuubar:2[ruby_targets_ruby30(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby31(-)] dev-ruby/fuubar:2[ruby_targets_ruby31(-)] dev-ruby/shoulda-matchers:3[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rspectacular-0.70.8.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e5776a650ac7a6b69e652ee104ab2a99
+_md5_=8803ead13ae3591084e05b54921dca28
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
index 4aff270b4929..be6c35d19c39 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.11.0
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby27(-)] dev-ruby/timecop[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby30(-)] dev-ruby/timecop[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby27(-)] dev-ruby/timecop[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby30(-)] dev-ruby/timecop[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspectacular[ruby_targets_ruby31(-)] dev-ruby/timecop[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=A Text Progress Bar Library for Ruby
 EAPI=7
 HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jfelchner/ruby-progressbar/archive/releases/v1.11.0.tar.gz -> ruby-progressbar-1.11.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9c3aee56b6f47d2533f195954881605c
+_md5_=183a507e5b0144b3c4848c472131a2f7
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2
index 3071f9ac467b..17e17a9c74aa 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.3-r2
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=8
 HOMEPAGE=https://github.com/thoughtbot/shoulda-matchers
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/shoulda-matchers-3.1.3.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a999d9318db86cc7ef2a30eab5149024
+_md5_=22b6732968c2a253eccc0d93023cd0be
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index fa674ecf9d1e..0dff366abd77 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/git-machete-3.12.1 b/metadata/md5-cache/dev-vcs/git-machete-3.12.1
deleted file mode 100644
index e06eb85682e8..000000000000
--- a/metadata/md5-cache/dev-vcs/git-machete-3.12.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-mock-3.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-vcs/git >=dev-python/pytest-7.1.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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Probably the sharpest git repo organizer & rebase/merge workflow automation tool
-EAPI=8
-HOMEPAGE=https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/
-INHERIT=bash-completion-r1 distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=dev-vcs/git python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( 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/VirtusLab/git-machete/archive/refs/tags/v3.12.1.tar.gz -> git-machete-3.12.1.gh.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4acfdac918d85eff5a161ef7d0502ebe
diff --git a/metadata/md5-cache/dev-vcs/git-machete-3.12.5 b/metadata/md5-cache/dev-vcs/git-machete-3.12.5
new file mode 100644
index 000000000000..48ed536fffb2
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-machete-3.12.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-mock-3.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-vcs/git >=dev-python/pytest-7.1.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.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Probably the sharpest git repo organizer & rebase/merge workflow automation tool
+EAPI=8
+HOMEPAGE=https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/
+INHERIT=bash-completion-r1 distutils-r1
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=dev-vcs/git python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( 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/VirtusLab/git-machete/archive/refs/tags/v3.12.5.tar.gz -> git-machete-3.12.5.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=4acfdac918d85eff5a161ef7d0502ebe
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index e1299a76ee89..42fc1ce0309e 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.7.3468 b/metadata/md5-cache/games-emulation/pcsx2-1.7.3468
new file mode 100644
index 000000000000..cb05887242fc
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.7.3468
@@ -0,0 +1,18 @@
+BDEPEND=dev-lang/perl qt6? ( dev-qt/qttools[linguist] ) !qt6? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) pulseaudio? ( media-libs/libpulse ) qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 media-libs/libsamplerate x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] ) sndio? ( media-sound/sndio:= ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) x11-base/xorg-proto test? ( dev-cpp/gtest )
+DESCRIPTION=PlayStation 2 emulator
+EAPI=8
+HOMEPAGE=https://pcsx2.net/
+IDEPEND=filecaps? ( sys-libs/libcap )
+INHERIT=cmake fcaps flag-o-matic wxwidgets
+IUSE=alsa cpu_flags_x86_sse4_1 jack pulseaudio qt6 sndio test vulkan wayland +filecaps
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+RDEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) pulseaudio? ( media-libs/libpulse ) qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 media-libs/libsamplerate x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] ) sndio? ( media-sound/sndio:= ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland )
+REQUIRED_USE=cpu_flags_x86_sse4_1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PCSX2/pcsx2/archive/refs/tags/v1.7.3468.tar.gz -> pcsx2-1.7.3468.tar.gz https://github.com/fastfloat/fast_float/archive/32d21dcecb404514f94fb58660b8029a4673c2c1.tar.gz -> pcsx2-fast_float-32d21dcecb.tar.gz https://github.com/RetroAchievements/rcheevos/archive/31f8788fe0e694e99db7ce138d45a655c556fa96.tar.gz -> pcsx2-rcheevos-31f8788fe0.tar.gz vulkan? ( https://github.com/KhronosGroup/glslang/archive/c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5.tar.gz -> pcsx2-glslang-c9706bdda0.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/9f4c61a31435a7a90a314fc68aeb386c92a09c0f.tar.gz -> pcsx2-vulkan-headers-9f4c61a314.tar.gz )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=0433815db792d3b84a2987b1f0f328dd
diff --git a/metadata/md5-cache/games-emulation/pcsx2-9999 b/metadata/md5-cache/games-emulation/pcsx2-9999
index 18769d683422..09ac9f25bfe1 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-9999
+++ b/metadata/md5-cache/games-emulation/pcsx2-9999
@@ -1,17 +1,17 @@
 BDEPEND=dev-lang/perl qt6? ( dev-qt/qttools[linguist] ) !qt6? ( sys-devel/gettext ) >=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 prepare test unpack
-DEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-libs/libpulse ) ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) x11-base/xorg-proto test? ( dev-cpp/gtest )
+DEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) pulseaudio? ( media-libs/libpulse ) qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 media-libs/libsamplerate x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] ) sndio? ( media-sound/sndio:= ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) x11-base/xorg-proto test? ( dev-cpp/gtest )
 DESCRIPTION=PlayStation 2 emulator
 EAPI=8
 HOMEPAGE=https://pcsx2.net/
 IDEPEND=filecaps? ( sys-libs/libcap )
 INHERIT=cmake fcaps flag-o-matic wxwidgets git-r3
-IUSE=cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland +filecaps
-LICENSE=GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+IUSE=alsa cpu_flags_x86_sse4_1 jack pulseaudio qt6 sndio test vulkan wayland +filecaps
+LICENSE=GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+ ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
 PROPERTIES=live
-RDEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-libs/libpulse ) ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland )
+RDEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) pulseaudio? ( media-libs/libpulse ) qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 media-libs/libsamplerate x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] ) sndio? ( media-sound/sndio:= ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland )
 REQUIRED_USE=cpu_flags_x86_sse4_1
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d08e0d584f743c048f9c628200dcb6a3
+_md5_=0433815db792d3b84a2987b1f0f328dd
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 35f7fbf6cbbb..987f91a7dcab 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/pdns-4.7.0 b/metadata/md5-cache/net-dns/pdns-4.7.0
new file mode 100644
index 000000000000..dcf3457746dd
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-4.7.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] )
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/openssl:= dev-libs/boost:= lmdb? ( >=dev-db/lmdb-0.9.29 ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4:= app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) elibc_glibc? ( x86? ( >=sys-libs/glibc-2.34 ) )
+DESCRIPTION=The PowerDNS Daemon
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+INHERIT=flag-o-matic lua-single
+IUSE=debug doc geoip ldap lmdb lua-records mydns mysql postgres remote sodium sqlite systemd tools tinydns test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/openssl:= dev-libs/boost:= lmdb? ( >=dev-db/lmdb-0.9.29 ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4:= app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) elibc_glibc? ( x86? ( >=sys-libs/glibc-2.34 ) ) acct-user/pdns acct-group/pdns
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) mydns? ( mysql )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-4.7.0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=b536f35d191772814fd2b754486dd644
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 8798c5c40176..d9385fa6b7fb 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/librepcb-0.1.5-r1 b/metadata/md5-cache/sci-electronics/librepcb-0.1.5-r1
deleted file mode 100644
index 804d60a9cdd9..000000000000
--- a/metadata/md5-cache/sci-electronics/librepcb-0.1.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip dev-qt/linguist-tools:5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/quazip:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Free EDA software to develop printed circuit boards
-EAPI=7
-HOMEPAGE=https://librepcb.org/
-INHERIT=qmake-utils virtualx xdg
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=dev-libs/quazip:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.librepcb.org/releases/0.1.5/librepcb-0.1.5-source.zip
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=55ac2715aba7dfb7c57d103fe8180581
diff --git a/metadata/md5-cache/sci-electronics/librepcb-0.1.7 b/metadata/md5-cache/sci-electronics/librepcb-0.1.7
new file mode 100644
index 000000000000..16ecdf36945d
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/librepcb-0.1.7
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/unzip dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-cpp/muParser:= dev-libs/quazip:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib dev-qt/qttest:5
+DESCRIPTION=Free EDA software to develop printed circuit boards
+EAPI=8
+HOMEPAGE=https://librepcb.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake virtualx xdg
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-cpp/muParser:= dev-libs/quazip:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.librepcb.org/releases/0.1.7/librepcb-0.1.7-source.zip
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=64c54bcec6418cadead245f94bab1c5d
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 7800bf0989ed..dc79c5753ef4 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/lld-13.0.1-r1 b/metadata/md5-cache/sys-devel/lld-13.0.1-r1
index 08dca3964b6d..1bd3654784f1 100644
--- a/metadata/md5-cache/sys-devel/lld-13.0.1-r1
+++ b/metadata/md5-cache/sys-devel/lld-13.0.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1
 IUSE=debug test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 arm arm64 ~ppc ppc64 ~riscv ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=~sys-devel/llvm-13.0.1 !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=13/13
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-13.0.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	276a74ba1e8d247fe5f8247a44550090	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3fa8b1e18223c5e3afb23c226c93c378
+_md5_=28d2fad99744517a5746968352764241
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.6-r1 b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
index 52adeb81c429..16ba1a051ea2 100644
--- a/metadata/md5-cache/sys-devel/lld-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1
 IUSE=debug test test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 arm arm64 ~ppc ppc64 ~riscv ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=~sys-devel/llvm-14.0.6 !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14/14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	276a74ba1e8d247fe5f8247a44550090	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9bc50f2188c65436644ac02e36bbdca7
+_md5_=c9d79d6f0336c2707f0f745eee32872d
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 332d43f0d841..c69b872cc4d5 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2 b/metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2
index a0ec966b17f6..9b56ff24c79e 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.4.3-r2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 INHERIT=linux-info tmpfiles
 IUSE=gcrypt kernel nettle +openssl +argon2 fips nls pwquality reencrypt ssh static static-libs test +udev urandom
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] ) dev-libs/json-c:= dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) ssh? ( net-libs/libssh ) sys-fs/lvm2 udev? ( virtual/libudev:= ) virtual/tmpfiles
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt !ssh !udev !fips ) fips? ( !kernel !nettle )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.3.tar.xz
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d16f57ba33e5e71ccf2a55c18f4e6fef
+_md5_=3ad42025557a6f779495f123bcd25af0
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index a5fe7bc4510a..9dbdcfa11309 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-21T06:09:38Z
+TIMESTAMP 2022-10-21T12:09:38Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNSN6JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNSjAJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD1NA/9EAJ2xcJiMGERxufBH7Sf242DJyvDG5FYudsh3hEfITo6vIuhsBTMZvYV
-DvDqd/pDtzILBYqIPFf9fzJ9qLRh4YwkiotYT536fRBOH4aOBprU0sV0McdtA+xd
-8R3QJ+3PPiAquxnkCnbT7hw+gnh8AH2weR6JMQxqFuS8HxJOHlbv71Uc3bCMm9kl
-N5C+AzMthd7Qtu7ggjMA6AzZtaPIzi8INVppQ6w0/V+oq54ukMN1Ge0L0eTvYLnO
-uqIcGCsPYprjE3Bji1gS5eqvewaRWZ2Eyx1wf1HToTs4+4ofDKzcZdS8ykxlluUU
-L44OKVNW3fhFjRvusYd3rnZA7+G7YMsY0W9CyXyGhO6Qm0KGOmGF5994PLMKC88k
-wMxs9S8zZGeBEKefP+xaJUKAWitdUjqB8h/+mnAeICqb3zR7xGtOgRa+Ci8hQvm0
-p9RePO8xNbvuslRV3E0Mm+P0wc4BaZkmkivge/u1BdKQrgDzo+wvQ73c5WlLyF1P
-NZgVJnH058fHPim+asUWC8R2uTCmA2d2AlFGXdq8Uo8Yn2AN1Ft0plY4MWm9bSoE
-aRzVGUiWfhWvlJQxdTsYOP9yK0ZA384NsZ2YAACFeJZU4AQUrgpcxSWDM2UVeW02
-rBJvVi6WvLd1xROSjP2MKl0UeR3soREi6yknrtYmK5ikgr/KebA=
-=Bboo
+klBBJg/+MMFM5c5ApoSUmlSb9+zs6dM7PebYmgUgsObZ2+wBDyAiA/xXJgRWB4Y6
+unH/pc+eBOnTTgn97W3ZXJaI9QJ5KfcSPXd0stvLeDILHDvasOoVdp+TitTFhHjD
+nSmxZ1wSx0YVd7TyuYhYD1PRtZ14RpVFxzZqszboudsj007nyLPWfsCanjJLjGBe
+gtHF+DhuB/Lbgahke/WGPRusazxEI39QadOYwsEVe4ADPY/En35WUQ2RfGL0uw/f
+QA5xTyRlvAWRCbUGrCCjxsDhTnOhq/Vs8PL7f1Jtv9Qo7t/kubWut7Y/R/DGQvb0
+6MmRYkr2uulXo8ehkcTDgqs3DLp5J4dqpLO5SH0GiYhGXMtJYYH291OIqXu2lyOx
+5c9tN6ZevtMcqMmaElikLvqjpKIOEqpSZpGw6Sp2z1aJiybR0GHCsjBmeomG1Vt6
+pMrhywPwoWBkjmON5XN9P4CqArnzrptPwM0qj2UIjxAcEtumJFH1VzsFK7phCcen
+ekKK4sGB5Eulcbm5/MhSDocnnrbgK2UZqmrxCpNWzIKbIgY/S4FvX+SBYjpvfDGR
+n1MWNPCsVL+iGnDstgZEJ3yhjSvCoO1+qYfSKbubnpW+KxlQu/0QSD2gUzWwM79C
+vizR5vXckTBdSlxMPqRzQr0PBlHDBwKz3xWXkWYBzq7wEZpN9r0=
+=KQtn
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 0428302a19ae..12faf42e58f1 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 21 Oct 2022 06:09:35 +0000
+Fri, 21 Oct 2022 12:09:35 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 200babdf254c..e952c43fa0b5 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Oct 21 06:09:34 AM UTC 2022
+Fri Oct 21 12:09:34 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2dba50e787be..825a5b2103d4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 21 Oct 2022 06:15:01 +0000
+Fri, 21 Oct 2022 12:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2eab9e93020e..18294c19c722 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3627a6ac1a4d798db1e516905d9d0592b6c310e6 1666332274 2022-10-21T06:04:34+00:00
+9a14427d006599e19a40698cbb980e6434f61683 1666353731 2022-10-21T12:02:11+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 33989f6d48bd..882bfa60f273 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666332601 Fri 21 Oct 2022 06:10:01 AM UTC
+1666354201 Fri 21 Oct 2022 12:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f0fbe5e19679..6a80c104e2ee 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 21 Oct 2022 06:09:34 +0000
+Fri, 21 Oct 2022 12:09:34 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 311878f08242..4d9e21c9cc53 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 0879b1bdbbbf..eee045d63d74 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,5 +1,7 @@
 AUX dnsdomain2.schema 6640 BLAKE2B d3efc6bc16390f35979f1184632e7184cf403453422888e2cb44fa4fed7891241919a39c8c6f539a61de032654650a45ea548a6983777ea1bfe029e817f2c315 SHA512 ac16f8d528d6138d3c2cbf997fd8fbb467d388aa63eb6ed4e7780a3dad11ea885b91252ff0809b1d2cf7d5200814b8963aab890af84741ea86d35b2f5955a7ea
 AUX pdns-r1 2815 BLAKE2B cd607cb30a94540eca9cfa2defb7c996f6e151875fcaad8ad3357261937868bc346962f1080ad45a0ef38c2dfc126eb11e41837ee0784f677d1e7c071589a057 SHA512 4c0442d8d92d95268d4971f80782d2772e2a22c43da00566a9328c79a834e4355b2610d133034351d7137ed6cd7fda300f3db8093b09d5852cea44d983de1e39
 DIST pdns-4.6.3.tar.bz2 1302651 BLAKE2B 58a66952293bd5caf7b03d114e11f4d6774f5f2aab969b33c1c510b745790f7276b9913cc03e3e4565e5b1de6f61decf338a3b6430d0429c2b87cc9690d9388d SHA512 ea44a0c929e36bf9002d8db7bf1e06ec372a08b31b60c74bbc3ea5600073fb745151f33798a0a4bd151ce17ad7efb07be30f7ddcf620d5bdaab6de4f37f4296f
+DIST pdns-4.7.0.tar.bz2 1361265 BLAKE2B 157e512da19c48c4a6aa32ef54525d4902b8aff8484c040ceca7ee15f4202acb3f7ed93152a625f858b475193b9c295fe3fc264caabbcf456fc92224786050a6 SHA512 d4ed9acb98b8195f6f8821d4934472f214bbb4cbef67d084c0b9836e61c9cf156eb193b6e4769ae088aaf92f1ca65dc3ab35fdfcacc42eeb9804d80ab92b25e2
 EBUILD pdns-4.6.3.ebuild 4539 BLAKE2B 9289eca73dbaf0a68a5d5a8ea873671f3954def7299dcfaf65b4bfa936f39d9138db3dec9b2c596bbc4c787de4a3574b60f498738772667cba71443babd5af7e SHA512 014166a1b347a9e76510e202afdbcafe29ebad112b0a43a15ebebd19d772dae268161e574cab818b0971f162a0a27abd3c9f5eef6a0db275c8c851a72bda8291
+EBUILD pdns-4.7.0.ebuild 4541 BLAKE2B 1ce28873123969fdc7f9811f0628c4a3496ce16fdd3c866864b7b70b185fe4d4e8f326eadd31bf89a87baa2f95512f7bf9570c597578cc08c5e91efe071a7050 SHA512 cdb4c8b37d4f79b37f21e5e1216e3bf000c985d1061b94fc4eeeded895ff14e4b926c9bb3947f6ab029d6ea5ffa0bc560e130e543cfa166736f95909f19bcc5b
 MISC metadata.xml 1080 BLAKE2B 536be9df9d0d9f8ec3f267740ad37da3bcd854ffe12582d9355bf04a75e5620eaf87483d4bed61bee8c20fd1ac2a8a7fa280585f94400472c5b374c84042dc1a SHA512 437aa6d097f9adce27acd8ae5b1a49ed048d58fd49ca9203d6d73df4728448b2d00299ce0d9e98656dca64b1f70f124c811cd435461e65dbeb1ff23fca00ae19
diff --git a/net-dns/pdns/pdns-4.7.0.ebuild b/net-dns/pdns/pdns-4.7.0.ebuild
new file mode 100644
index 000000000000..4f2153110553
--- /dev/null
+++ b/net-dns/pdns/pdns-4.7.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="debug doc geoip ldap lmdb lua-records mydns mysql postgres remote sodium sqlite systemd tools tinydns test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	mydns? ( mysql )"
+
+DEPEND="${LUA_DEPS}
+	dev-libs/openssl:=
+	dev-libs/boost:=
+	lmdb? ( >=dev-db/lmdb-0.9.29 )
+	lua-records? ( >=net-misc/curl-7.21.3 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( >=net-nds/openldap-2.0.27-r4:= app-crypt/mit-krb5 )
+	sqlite? ( dev-db/sqlite:3 )
+	geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip )
+	sodium? ( dev-libs/libsodium:= )
+	tinydns? ( >=dev-db/tinycdb-0.77 )
+	elibc_glibc? ( x86? ( >=sys-libs/glibc-2.34 ) )"
+RDEPEND="${DEPEND}
+	acct-user/pdns
+	acct-group/pdns"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	lua-single_pkg_setup
+	append-lfs-flags
+	append-cppflags -D_TIME_BITS=64
+}
+
+src_configure() {
+	local cnf_dynmodules="pipe bind" # the default backends, always enabled
+
+	#use db2 && cnf_dynmodules+=" db2"
+	use ldap && cnf_dynmodules+=" ldap"
+	use lmdb && cnf_dynmodules+=" lmdb"
+	use mydns && cnf_dynmodules+=" mydns"
+	use mysql && cnf_dynmodules+=" gmysql"
+	#use oracle && cnf_dynmodules+=" goracle oracle"
+	use postgres && cnf_dynmodules+=" gpgsql"
+	use remote && cnf_dynmodules+=" remote"
+	use sqlite && cnf_dynmodules+=" gsqlite3"
+	use tinydns && cnf_dynmodules+=" tinydns"
+	use geoip && cnf_dynmodules+=" geoip"
+	#use xdb && cnf_dynmodules+=" xdb"
+
+	econf \
+		--disable-static \
+		--sysconfdir=/etc/powerdns \
+		--libdir=/usr/$(get_libdir)/powerdns \
+		--with-service-user=pdns \
+		--with-service-group=pdns \
+		--with-modules= \
+		--with-dynmodules="${cnf_dynmodules}" \
+		--with-mysql-lib=/usr/$(get_libdir) \
+		--with-lua="${ELUA}" \
+		$(use_enable debug verbose-logging) \
+		$(use_enable lua-records) \
+		$(use_enable test unit-tests) \
+		$(use_enable tools) \
+		$(use_enable systemd) \
+		$(use_with sodium libsodium) \
+		${myconf}
+}
+
+src_compile() {
+	default
+	use doc && emake -C codedocs codedocs
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+	fperms 0700 /etc/powerdns
+	fperms 0600 /etc/powerdns/pdns.conf
+
+	# set defaults: setuid=pdns, setgid=pdns
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+		"${D}"/etc/powerdns/pdns.conf
+
+	newinitd "${FILESDIR}"/pdns-r1 pdns
+
+	keepdir /var/empty
+
+	if use doc; then
+		docinto html
+		dodoc -r codedocs/html/.
+	fi
+
+	# Install development headers
+	insinto /usr/include/pdns
+	doins pdns/*.hh
+	insinto /usr/include/pdns/backends/gsql
+	doins pdns/backends/gsql/*.hh
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/dnsdomain2.schema
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "PowerDNS provides multiple instances support. You can create more instances"
+	elog "by symlinking the pdns init script to another name."
+	elog
+	elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+	local old
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 3.2 || continue
+
+		echo
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/powerdns"
+		ewarn "  ${EPREFIX}/etc/powerdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf}
+
+		break
+	done
+
+	if use postgres; then
+		for old in ${REPLACING_VERSIONS}; do
+			ver_test ${old} -lt 4.1.11-r1 || continue
+
+			echo
+			ewarn "PowerDNS 4.1.11 contains a security fix for the PostgreSQL backend."
+			ewarn "This security fix needs to be applied manually to the database schema."
+			ewarn "Please refer to the official security advisory for more information:"
+			ewarn
+			ewarn "  https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-06.html"
+
+			break
+		done
+	fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8b893e2e6073..dde57d2ccc0f 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index faae6c63c519..061fbc38422c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3058,6 +3058,7 @@ games-emulation/mupen64plus-core:new-dynarec - Enable new experimental dynamic r
 games-emulation/mupen64plus-core:opencv - Support video capture via media-libs/opencv
 games-emulation/mupen64plus-core:osd - Overlay emulator messages using on-screen-display
 games-emulation/mupen64plus-video-glide64mk2:hires - Support hi-resolution textures (requires dev-libs/boost)
+games-emulation/pcsx2:sndio - Enable support for the media-sound/sndio backend
 games-emulation/pcsx2:vulkan - Enable support for Vulkan
 games-emulation/pcsxr:archive - Support compressed files (via libarchive)
 games-emulation/pcsxr:ccdda - Support compressed CDDA (requires ffmpeg)
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 78e8de5795b0..aab88c8e69c4 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/librepcb/Manifest b/sci-electronics/librepcb/Manifest
index 519c1bde0845..3680d0de1a72 100644
--- a/sci-electronics/librepcb/Manifest
+++ b/sci-electronics/librepcb/Manifest
@@ -1,7 +1,7 @@
 AUX librepcb-0.1.5-quazip1.x.patch 1799 BLAKE2B f883e5eec392aa2aa4e739d3057e36a558a691298bd89fdb2da7e80ac0b0ecc13dc76073544675cf6bc8998f9a7d92ea7e57f107568c9a5b8ebffefb76357152 SHA512 82b5adecd94e22148205f95a514ccb3ccce720b10925549c806f58cd59be42dc6912aef2c8c275c6b87cf02f48d200c847ec6e27525be050b824b90c7bb994b2
 AUX librepcb-0.1.6-muparser-fix.patch 1058 BLAKE2B 2d3885fc9e3f178cef352a276fa141f873478938c8b7136d11f69a2fabc73e7ec548c24ae9bd1cdcfc229b94f30368dd48f7b2e85ca065caa69fd1e266e34f7e SHA512 1443b14b562608e729bd75f49d8e1fc962afb3bd1562382bb39f060531f40769ab99ad485547ab2d2ab4b892702242c057fdad6158dbc9d33cce02dcc3566596
-DIST librepcb-0.1.5-source.zip 13111207 BLAKE2B 3a8c5f8b310971e1a6bd5b1fa8eb8059cd1c571e9ab369bf80c946ccbd320c258d5e8c65bea3b5a5bc4d85a38cac8205d5bbfbaad6aebf0a031315b73e9b99f4 SHA512 ed8c8fc154a03082bcbfe414bdb934870d09cf137811036a3ce59d70e1ad0b582fea64c31037c84e76a939bf1d087caabb9aa349578b525bce882e853a969653
 DIST librepcb-0.1.6-source.zip 12671974 BLAKE2B bed8d6134159ec663dd88f9933ef0dad6d3bca70776537bf2e16397f0e4fd968a41661d95a118008fcf9d7d6d2432ebac81d78153b3c3ce8d69c64fb59aaf70e SHA512 a51ac2830d65bbd10be8904ecdcc6a7781d80c95e1423ed5bd04fcd009a0b7135ff3a49a87afe9e99006ae1f6ae44f2341021e5733675f2f20b05525860da5d7
-EBUILD librepcb-0.1.5-r1.ebuild 1203 BLAKE2B e49b2bc6181b19a665dda29f6dfff9d4247a6840240f81b6d6251cc900d793a81e5a2ea2c4e5c523976505c71a85c5b852ace0e1b979a5d42ceec2ca2f8bac9d SHA512 7d3eca348ab1fb85be443139dccdd91c5f12225ada8412ff7933f192a1317a32f3fb45d3bab0dd64a9e893c16a99155c7ce1ce302c2c073994e212389bf93bb9
+DIST librepcb-0.1.7-source.zip 13112342 BLAKE2B 53b6dad94febee84b60df1d848936f44093698c9965d4b24815395ff564a5634ab84f38574e7a1b6891f2cdd99b5162eb3747bbfdde2dfc2d680cff76a4e1cc1 SHA512 285ad661b9c528b1aa05c9a0482034af26e9344eb08a119ffabbadf518957a9784ccb9582bcfabcf5bf8982c33b6286b39722c0d59072df983925b3949b3e6c5
 EBUILD librepcb-0.1.6-r1.ebuild 1012 BLAKE2B 9bb9ab11d6e24b1f674733175b8f4b66fb7bcef82a15c660eb9ba7bde245f3c26b806a708dd80a116eef92f1b877b6fe7fd8fef80bbd5879636c4243f4500dd3 SHA512 21a02f8bd46567e2483e0c5b2fafc34ee950fabb109f8355c33247f1d700dbea699cfc123ec6cf1699db88fa02b4c814d135bbbf637a36e56e9fc9b4260eb5f2
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
+EBUILD librepcb-0.1.7.ebuild 1443 BLAKE2B d30668d5b3f96f8db385af33146dcebca6e2d2fa1e510d4ef08316e8ccc59406872536ee735ff81deea1fde4a5c8f4df90261b7eb67be1620176957278cf7905 SHA512 85c0c1b1da5008e55530a15859e8273a7be063681659c2aba1aea183c45107856fc8dddec89a3c998e6bdd296232bfaf5ce7998646cd6370ead0f01a6de447e3
+MISC metadata.xml 1052 BLAKE2B e7eaefddedefe95097ef6394eba9e4edb65c8f99f4ce909f9bc50c4f0165ece941de748d52669e2889cf10ad2ef1d4fdd9bfa89798dfbf70003ea928316b52a7 SHA512 c54b87ef70a7bae289799dc4cbe5726b5d18691264d84211880bd158ecf24f3bb56b33c6a04f5c3dd3114f186aded1808f9d656b88e614b440e63ea60cd0cfcb
diff --git a/sci-electronics/librepcb/librepcb-0.1.5-r1.ebuild b/sci-electronics/librepcb/librepcb-0.1.5-r1.ebuild
deleted file mode 100644
index 409f5eabcce4..000000000000
--- a/sci-electronics/librepcb/librepcb-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils virtualx xdg
-
-DESCRIPTION="Free EDA software to develop printed circuit boards"
-HOMEPAGE="https://librepcb.org/"
-SRC_URI="https://download.librepcb.org/releases/${PV}/${P}-source.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	app-arch/unzip
-	dev-qt/linguist-tools:5"
-
-RDEPEND="
-	dev-libs/quazip:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5"
-
-PATCHES=( "${FILESDIR}"/${P}-quazip1.x.patch )
-
-src_configure() {
-	local pro_lst
-	for pro_lst in $(find libs/librepcb/ -type f -name "*.pro" || die)
-	do
-		sed -e 's:target.path = $${PREFIX}/lib:target.path = $${PREFIX}/'$(get_libdir)':' -i ${pro_lst} || die "Can't fix ${pro_lst} file"
-	done
-	eqmake5 -r PREFIX="/usr" UNBUNDLE+="quazip"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-src_test() {
-	cd "${S}"/output
-	virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername
-}
diff --git a/sci-electronics/librepcb/librepcb-0.1.7.ebuild b/sci-electronics/librepcb/librepcb-0.1.7.ebuild
new file mode 100644
index 000000000000..c2752d3b0f23
--- /dev/null
+++ b/sci-electronics/librepcb/librepcb-0.1.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2009-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx xdg
+
+DESCRIPTION="Free EDA software to develop printed circuit boards"
+HOMEPAGE="https://librepcb.org/"
+SRC_URI="https://download.librepcb.org/releases/${PV}/${P}-source.zip"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	app-arch/unzip
+	dev-qt/linguist-tools:5"
+
+RDEPEND="
+	dev-cpp/muParser:=
+	dev-libs/quazip:=[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5"
+
+src_configure() {
+	local mycmakeargs+=(
+		-DUNBUNDLE_QUAZIP=ON
+		-DUNBUNDLE_MUPARSER=ON )
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/tests/unittests || die
+	# https://github.com/LibrePCB/LibrePCB/issues/516
+	virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername:CategoryTreeModelTest.testSort:BoardPlaneFragmentsBuilderTest.testFragments:BoardGerberExportTest.test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ewarn
+	ewarn "LibrePCB builds might not be exactly reproducible with e.g. -march={native,haswell,...}."
+	ewarn "This can cause minor issues, see for example:"
+	ewarn "https://github.com/LibrePCB/LibrePCB/issues/516"
+	ewarn "For a completely reproducible build use: -march=x86-64."
+	ewarn
+}
diff --git a/sci-electronics/librepcb/metadata.xml b/sci-electronics/librepcb/metadata.xml
index bef24d2c2337..1daccaad1007 100644
--- a/sci-electronics/librepcb/metadata.xml
+++ b/sci-electronics/librepcb/metadata.xml
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+   <maintainer type="project" proxied="proxy">
+     <email>sci-electronics@gentoo.org</email>
+     <description>Gentoo Electronics Project</description>
+   </maintainer>
+   <maintainer type="person" proxied="yes">
+     <email>ktrace@yandex.ru</email>
+     <name>Victor V. Kustov</name>
+   </maintainer>
+   <longdescription lang="en">
+    LibrePCB is a free EDA software to develop printed circuit boards.
+    Cross-platform, multilingual (both application and library elements), intuitive, modern and easy-to-use graphical user interface.
+      - All-In-One: project management + library/schematic/board editors
+      - Very powerful library design with some innovative concepts
+      - Human-readable file formats for both libraries and projects
+      - Multi-PCB feature (different PCB variants of the same schematic)
+      - Automatic netlist synchronisation between schematic and board
+   </longdescription>
 </pkgmetadata>
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 37cac31d00e3..dae7192ab4dc 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index e56e2883e157..89ea96054bc6 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -7,9 +7,9 @@ DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76
 DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916
 DIST llvm-project-ebb258d3b0785f6dcc65e1f277d0690891ddc94d.tar.gz 168823463 BLAKE2B 111afe0f6ba6cef28c3d0162c9c650d15239f981949030768780ebe308418346d0ad367e0e58417832ae43e57b27bccaf56415f81e8221c6c5e78d1113f5617b SHA512 80351d7eeac77a15bf5613b289c71d718ecaccd8a6a4ea6736ed8bfc15c8154099c771564f99ea6c8b491f99bf1ca3a45fac977d638f6a03d7f7b42ba522fa20
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-EBUILD lld-13.0.1-r1.ebuild 2008 BLAKE2B bbf6bdbfa9284481ce75297b88c734c40e8899da3a39c4da0474f1bb053be810a4bdbe4ed6f16e8eb512ed7826c0d172aa410c2a333fb112782b1ad308d3ce73 SHA512 0d8058ffde5633b22f988136b6f15e5700c84d09dfbef8edb1e936f1de6986f42b0de49e6bca249129b03281679e3eea84d42173a6280ed6642873828c3fec7c
+EBUILD lld-13.0.1-r1.ebuild 2005 BLAKE2B 9c81c04ce921d69e2fd5c4d01b44fec7f843b5b5ad0e229c384a5a34dcce269d940e2f6c501e9a991b5d415fd2ab617b9c2a634d1b3152a28a60ce26f4f9d39e SHA512 f8423e1c69046ad020148df1aba7d52302c9110c413c3be6d8800b0bcf9f6d06ebb070dbbcd0b73d615506dd89ce4312c873d05a9198f0fda4161350a086f420
 EBUILD lld-13.0.1.ebuild 1882 BLAKE2B 1a5207649cc769c725f4825ebb6c070eb2b43ffa53ce4c3a04297e5c8e11e9f8cc2df88de51dccefc48a7ad045caadf95b22e747b3760c2d0961f6adba6ff422 SHA512 9f098fda60de3570cd04200babd163d940606a96ff5f7a6f3e8bf31ce054dd50636f47cc25c945cc46e5b4c7646763f58d2799b4940dbee412bad76f73de8dee
-EBUILD lld-14.0.6-r1.ebuild 2014 BLAKE2B cc9fe38292d98e136ec49b7c42e440cc66a6b3a83c9b587066f110ad3d5389b1e771f26bc6f6b7ebd93efbb8fb85d9b24536d6e12b383cb054172aaf802cb270 SHA512 6a53b78cbe58eac99f40f74f9f80772aea8d52522ee124f13c677bfc69f3a513afa3d2beca14b575447a6167db52fae6e8d946b71dcaaa0b79b76a6226b26e80
+EBUILD lld-14.0.6-r1.ebuild 2011 BLAKE2B 1aed42e968db040a57ef3abcb2adf01756fe8970d0876f33a512345e3a5abb9aeaa3bb7019bfb6634b26913c25783422434cbbda4a0de97e8188e8d2e0752452 SHA512 9571adf2643374cd39709eaaf9b04f05cfcd19ecf038ad919a77fa95caad690f08842e2a541a82250f05140465b3a63f1b8fa3c93ebed4f96c7e634564c81d7d
 EBUILD lld-14.0.6.ebuild 1894 BLAKE2B 8f5922031c9b64b0cf246800fd26b1802bdcc1fd84aae911106bd0c5a6d9482ff7c92571b7cc7f988e0b8b0b679eb94fa6c62685d69fdf9cc2b697ae29252e09 SHA512 4959af6727591bbd411861f4717ffd523b9a026c33c4de3b035230b1b5dc1067d9fa5c539455ea16fd7a294c95b9019be1e85638448afb0d900dedbb4284a30a
 EBUILD lld-15.0.2-r1.ebuild 2082 BLAKE2B 29db136bcaa9d462e7e742b2ad95a88c2e1a7989d6dcf98d5d967504842cd87c87fac6c18f3f813116cf8d8788d1a55ea35e0ffd9d7d3d3c167f03fcbe3a9a73 SHA512 a5370a95e195e29acc7fa6b308be61183a8b9fbe0199b4773da8e0b6e8e3f2671ce4dde3c3dd221477fabab482eb3bd160a8b8d83c82083759047c2ceb9f7a18
 EBUILD lld-15.0.2.ebuild 1955 BLAKE2B c8fb954351f0d80d5ee905cbfbcb7d2430bd73e7644ec54afae902ced60bf6a166e5a76c83ba6f18be062fce439a7c3cda5ecd9c1d5f6acb777673a30a1c40e2 SHA512 1b33c0821d40023b026e088b26772e2f851ba53f7c5eef5335a737fbb584120bc527d2711c685556c2b2e106e855aeb69411bf5fce829e33d973ab9ab8562271
diff --git a/sys-devel/lld/lld-13.0.1-r1.ebuild b/sys-devel/lld/lld-13.0.1-r1.ebuild
index b92595d59d45..03c2a11c9cb1 100644
--- a/sys-devel/lld/lld-13.0.1-r1.ebuild
+++ b/sys-devel/lld/lld-13.0.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/lld/lld-14.0.6-r1.ebuild b/sys-devel/lld/lld-14.0.6-r1.ebuild
index 7aca35dc3546..9f806d7daa7c 100644
--- a/sys-devel/lld/lld-14.0.6-r1.ebuild
+++ b/sys-devel/lld/lld-14.0.6-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 2d8c6b0ab660..80273f05e1ad 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 9db820a57785..72dc5b73b834 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,6 +3,6 @@ AUX 2.4.0-dmcrypt.rc 9059 BLAKE2B 622320bd69a9e2d2779bd0eb97034635335125d2def73f
 AUX 2.4.3-dmcrypt.confd 4306 BLAKE2B 107697c85548a8c5f1f4ffc1ae6ec785bcb9c63a55e52a97fd24c1a3c5e7867d031f494030a27be1efb8eab448a94e466c186c964b2638fd4d95250005fbf31d SHA512 d80701d1507c682d619e2ec433bebab2d64cc3e27c5ddc2e7c8408e07dcd353b4d66e9b8505719fa88fa734d7a7930fc90f5b8279e185580c3c038ac7ef7a02a
 AUX 2.4.3-dmcrypt.rc 9697 BLAKE2B 356a54e5de24717731ffdcf6235fe229bc57169c3bd248f5cac77c1cbf0c596c77c0d95a5ef502972db3bab155f4253a53db9be2b7787e10791275d4695821d2 SHA512 61434a6ae3346e5a2f330656055add0c32d1c79a62fec3e8b0f4e38e95f8cf0a3e8ab8d1cc0955316e2ea1b47d9863bffbf46c980fc2f32d6fdd4e817769ca9c
 DIST cryptsetup-2.4.3.tar.xz 11242152 BLAKE2B f5859d794d626cb19426a2c9afc4655fac3a1bae462daa42b37b925882804d5146aadff8733799dea89dcfdc311e628e5b806754495824705709ba105f91682f SHA512 2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e
-EBUILD cryptsetup-2.4.3-r2.ebuild 4264 BLAKE2B a08161c005e1ca5e4b7710b8c444c3f4ebebcc2bbbe99375dc85a07072401954d0d8f2434031298f0f8247d09dabe5f23bbcb0690f832df3d5efee36b88c0c96 SHA512 4d28819815c4e41c0c63a76f753d7858ce7eb48895d9d1e78200ee1edd8b290c509277b30fe72e0d8c9884f655e70286e768205dd297d4f9585518bda7ed284d
+EBUILD cryptsetup-2.4.3-r2.ebuild 4262 BLAKE2B dbfd1d820dc9042d2c392c40e2c6e5cb91ac3bc15e717c1214ccace2647dda9bbe0082cd5ca5046524ed63af38898fae7e35d80cdfbf2f32d217c3cffd164477 SHA512 94adf934b1336ef4d38d978abbb0026eb5a6b903ee48931f7eef1689b20afbbd14a2585f27118756ddcee8ef712fdf888f17e02000764358da01acc424a53606
 EBUILD cryptsetup-2.4.3.ebuild 4172 BLAKE2B 769f38ca8f374b8e08916ab3d7baa4a5bbb250d8fd4dc7f58b8f6a00a062b7def3e033a89781227f1edb15111da7b005dce2e5fe012d747f56d2e995f313baeb SHA512 d671d6d91158d2233b85b026f82fcfb79bf72d8bc0434bfe18cd803d974310c9962bcb4c98bd1bec23590fae7d073fea48bfbf2516322815a08a375679cec5fe
 MISC metadata.xml 1204 BLAKE2B aff35e9aa5025dce5c55206274e23bc575aa8138b1e8d0269ba322c86ef10f4702e69f7838c3d580a963e39c1270d2e907234f540febb5bd4fc403412623a83b SHA512 86f328fadbadb8e582b4ae9a055f943e0c9cb3711a9c80cf84868d5e329770957886d58fe43aaec7aa0f0985acb0e4ac12947f58d1a423814ea4ea8d290b2b39
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
index a09ca6e3971f..3657f1982a1c 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
-- 
cgit v1.2.3