From e374e165c2ee372e9c6d10860ea6ef47f180f6b2 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 2 Oct 2022 07:12:21 +0100
Subject: gentoo auto-resync : 02:10:2022 - 07:12:21

---
 Manifest                                           |  30 +-
 Manifest.files.gz                                  | Bin 29598 -> 29611 bytes
 app-accessibility/Manifest.gz                      | Bin 4711 -> 4711 bytes
 app-accessibility/brltty/Manifest                  |   2 +
 app-accessibility/brltty/brltty-6.5.ebuild         | 223 +++++++++
 app-benchmarks/Manifest.gz                         | Bin 4686 -> 4687 bytes
 app-benchmarks/stress-ng/Manifest                  |   4 +-
 app-benchmarks/stress-ng/stress-ng-0.14.05.ebuild  |  56 ---
 app-benchmarks/stress-ng/stress-ng-0.14.06.ebuild  |  56 +++
 app-crypt/Manifest.gz                              | Bin 23802 -> 23803 bytes
 app-crypt/johntheripper-jumbo/Manifest             |   8 +-
 .../johntheripper-jumbo-1.9.0-r3.ebuild            | 139 ------
 .../johntheripper-jumbo-1.9.0_p20210920.ebuild     | 145 ------
 .../johntheripper-jumbo-1.9.0_p20211129-r1.ebuild  | 159 +++++++
 .../johntheripper-jumbo-1.9.0_p20211129.ebuild     | 157 ------
 .../johntheripper-jumbo-9999.ebuild                |  12 +-
 app-dicts/Manifest.gz                              | Bin 95515 -> 95514 bytes
 app-dicts/aspell-da/Manifest                       |   4 +-
 app-dicts/aspell-da/aspell-da-4.0.ebuild           |  15 -
 app-dicts/aspell-da/aspell-da-4.1.ebuild           |   2 +-
 app-text/Manifest.gz                               | Bin 48560 -> 48572 bytes
 app-text/ghostscript-gpl/Manifest                  |   5 +-
 .../ghostscript-gpl/ghostscript-gpl-10.0.0.ebuild  | 182 +++++++
 .../ghostscript-gpl-9.56.1-r2.ebuild               | 183 -------
 .../ghostscript-gpl-9.56.1-r3.ebuild               | 183 +++++++
 app-text/poppler-data/Manifest                     |   4 +-
 .../poppler-data/poppler-data-0.4.11-r1.ebuild     |  27 --
 .../poppler-data/poppler-data-0.4.11-r2.ebuild     |  27 ++
 app-text/qpdf/Manifest                             |   3 +
 app-text/qpdf/qpdf-11.1.1.ebuild                   |  77 +++
 dev-libs/Manifest.gz                               | Bin 95958 -> 95958 bytes
 dev-libs/intel-vc-intrinsics/Manifest              |   2 +
 .../intel-vc-intrinsics-0.7.1.ebuild               |  37 ++
 dev-libs/libofx/Manifest                           |   2 +
 dev-libs/libofx/libofx-0.10.8.ebuild               |  50 ++
 dev-lua/Manifest.gz                                | Bin 7298 -> 7292 bytes
 dev-lua/luaexpat/Manifest                          |   2 +-
 dev-lua/luaexpat/luaexpat-1.5.0.ebuild             |   2 +-
 dev-lua/readline/Manifest                          |   2 +
 dev-lua/readline/readline-3.2.ebuild               |  94 ++++
 dev-ml/Manifest.gz                                 | Bin 35156 -> 35163 bytes
 dev-ml/ppx_deriving_yojson/Manifest                |   2 +-
 .../ppx_deriving_yojson-3.6.1-r1.ebuild            |  27 ++
 .../ppx_deriving_yojson-3.6.1.ebuild               |  27 --
 dev-ml/re/Manifest                                 |   2 +-
 dev-ml/re/re-1.10.4-r1.ebuild                      |  28 --
 dev-ml/re/re-1.10.4-r2.ebuild                      |  28 ++
 dev-python/Manifest.gz                             | Bin 260932 -> 260916 bytes
 dev-python/contourpy/Manifest                      |   2 +-
 dev-python/contourpy/contourpy-1.0.5.ebuild        |   2 +-
 dev-python/gst-python/Manifest                     |   2 +-
 dev-python/gst-python/gst-python-1.20.3.ebuild     |   2 +-
 dev-python/hatch-fancy-pypi-readme/Manifest        |   2 +-
 .../hatch-fancy-pypi-readme-22.7.0.ebuild          |   2 +-
 dev-python/pyatspi/Manifest                        |   2 +
 dev-python/pyatspi/pyatspi-2.46.0.ebuild           |  61 +++
 dev-python/weasyprint/Manifest                     |   6 +-
 dev-python/weasyprint/weasyprint-55.0.ebuild       |   2 +-
 dev-python/weasyprint/weasyprint-56.0.ebuild       |   2 +-
 dev-python/weasyprint/weasyprint-56.1.ebuild       |   2 +-
 dev-util/Manifest.gz                               | Bin 68793 -> 68796 bytes
 dev-util/diffoscope/Manifest                       |   6 +-
 dev-util/diffoscope/diffoscope-221.ebuild          | 109 -----
 dev-util/diffoscope/diffoscope-222.ebuild          | 109 -----
 dev-util/diffoscope/diffoscope-223.ebuild          | 113 +++++
 dev-util/seer/Manifest                             |   2 +
 dev-util/seer/seer-1.11.ebuild                     |  47 ++
 games-fps/Manifest.gz                              | Bin 12044 -> 12044 bytes
 games-fps/eduke32/Manifest                         |   4 +-
 games-fps/eduke32/eduke32-20220702.10113-r1.ebuild | 218 ---------
 games-fps/eduke32/eduke32-20220929.10163.ebuild    | 218 +++++++++
 mail-client/Manifest.gz                            | Bin 3713 -> 3709 bytes
 mail-client/geary/Manifest                         |   2 +
 mail-client/geary/geary-43.0.ebuild                | 100 ++++
 media-gfx/Manifest.gz                              | Bin 38329 -> 38335 bytes
 media-gfx/gphoto2/Manifest                         |   2 +-
 media-gfx/gphoto2/metadata.xml                     |   1 +
 media-gfx/gphotofs/Manifest                        |   2 +-
 media-gfx/gphotofs/metadata.xml                    |   1 +
 media-libs/Manifest.gz                             | Bin 66304 -> 66292 bytes
 media-libs/libgphoto2/Manifest                     |   2 +-
 media-libs/libgphoto2/metadata.xml                 |   1 +
 media-libs/openimageio/Manifest                    |  13 +-
 .../openimageio/openimageio-2.3.12.0-r3.ebuild     | 175 -------
 media-libs/openimageio/openimageio-2.3.13.0.ebuild | 175 -------
 media-libs/openimageio/openimageio-2.3.15.0.ebuild | 175 -------
 media-libs/openimageio/openimageio-2.3.16.0.ebuild | 175 -------
 media-libs/openimageio/openimageio-2.3.20.0.ebuild | 185 +++++++
 media-libs/openimageio/openimageio-2.4.4.1.ebuild  | 184 +++++++
 media-libs/osl/Manifest                            |   4 +-
 media-libs/osl/osl-1.12.4.1-r2.ebuild              | 102 ----
 media-libs/osl/osl-1.12.6.2.ebuild                 | 109 +++++
 metadata/Manifest.gz                               | Bin 3863 -> 3864 bytes
 metadata/dtd/timestamp.chk                         |   2 +-
 metadata/glsa/Manifest                             |  28 +-
 metadata/glsa/timestamp.chk                        |   2 +-
 metadata/md5-cache/Manifest.gz                     | Bin 28227 -> 28224 bytes
 metadata/md5-cache/app-accessibility/Manifest.gz   | Bin 7070 -> 7229 bytes
 metadata/md5-cache/app-accessibility/brltty-6.5    |  16 +
 metadata/md5-cache/app-benchmarks/Manifest.gz      | Bin 6215 -> 6222 bytes
 .../md5-cache/app-benchmarks/stress-ng-0.14.05     |  14 -
 .../md5-cache/app-benchmarks/stress-ng-0.14.06     |  14 +
 metadata/md5-cache/app-crypt/Manifest.gz           | Bin 35720 -> 35392 bytes
 .../app-crypt/johntheripper-jumbo-1.9.0-r3         |  14 -
 .../app-crypt/johntheripper-jumbo-1.9.0_p20210920  |  15 -
 .../app-crypt/johntheripper-jumbo-1.9.0_p20211129  |  15 -
 .../johntheripper-jumbo-1.9.0_p20211129-r1         |  15 +
 .../md5-cache/app-crypt/johntheripper-jumbo-9999   |   4 +-
 metadata/md5-cache/app-dicts/Manifest.gz           | Bin 98128 -> 97968 bytes
 metadata/md5-cache/app-dicts/aspell-da-4.0         |  14 -
 metadata/md5-cache/app-dicts/aspell-da-4.1         |   4 +-
 metadata/md5-cache/app-text/Manifest.gz            | Bin 72884 -> 73211 bytes
 metadata/md5-cache/app-text/ghostscript-gpl-10.0.0 |  15 +
 .../md5-cache/app-text/ghostscript-gpl-9.56.1-r2   |  15 -
 .../md5-cache/app-text/ghostscript-gpl-9.56.1-r3   |  15 +
 metadata/md5-cache/app-text/poppler-data-0.4.11-r1 |   9 -
 metadata/md5-cache/app-text/poppler-data-0.4.11-r2 |   9 +
 metadata/md5-cache/app-text/qpdf-11.1.1            |  16 +
 metadata/md5-cache/dev-libs/Manifest.gz            | Bin 163458 -> 163776 bytes
 .../md5-cache/dev-libs/intel-vc-intrinsics-0.7.1   |  14 +
 metadata/md5-cache/dev-libs/libofx-0.10.8          |  16 +
 metadata/md5-cache/dev-lua/Manifest.gz             | Bin 7794 -> 7959 bytes
 metadata/md5-cache/dev-lua/luaexpat-1.5.0          |   4 +-
 metadata/md5-cache/dev-lua/readline-3.2            |  17 +
 metadata/md5-cache/dev-ml/Manifest.gz              | Bin 70685 -> 70683 bytes
 .../md5-cache/dev-ml/ppx_deriving_yojson-3.6.1     |  16 -
 .../md5-cache/dev-ml/ppx_deriving_yojson-3.6.1-r1  |  16 +
 metadata/md5-cache/dev-ml/re-1.10.4-r1             |  16 -
 metadata/md5-cache/dev-ml/re-1.10.4-r2             |  16 +
 metadata/md5-cache/dev-python/Manifest.gz          | Bin 360626 -> 360781 bytes
 metadata/md5-cache/dev-python/contourpy-1.0.5      |   4 +-
 metadata/md5-cache/dev-python/gst-python-1.20.3    |  10 +-
 .../dev-python/hatch-fancy-pypi-readme-22.7.0      |   4 +-
 metadata/md5-cache/dev-python/pyatspi-2.46.0       |  18 +
 metadata/md5-cache/dev-python/weasyprint-55.0      |   4 +-
 metadata/md5-cache/dev-python/weasyprint-56.0      |   4 +-
 metadata/md5-cache/dev-python/weasyprint-56.1      |   4 +-
 metadata/md5-cache/dev-util/Manifest.gz            | Bin 134177 -> 134176 bytes
 metadata/md5-cache/dev-util/diffoscope-221         |  16 -
 metadata/md5-cache/dev-util/diffoscope-222         |  16 -
 metadata/md5-cache/dev-util/diffoscope-223         |  16 +
 metadata/md5-cache/dev-util/seer-1.11              |  15 +
 metadata/md5-cache/games-fps/Manifest.gz           | Bin 12587 -> 12585 bytes
 .../md5-cache/games-fps/eduke32-20220702.10113-r1  |  18 -
 .../md5-cache/games-fps/eduke32-20220929.10163     |  18 +
 metadata/md5-cache/mail-client/Manifest.gz         | Bin 8614 -> 8783 bytes
 metadata/md5-cache/mail-client/geary-43.0          |  17 +
 metadata/md5-cache/media-libs/Manifest.gz          | Bin 103139 -> 102812 bytes
 .../md5-cache/media-libs/openimageio-2.3.12.0-r3   |  17 -
 metadata/md5-cache/media-libs/openimageio-2.3.13.0 |  17 -
 metadata/md5-cache/media-libs/openimageio-2.3.15.0 |  17 -
 metadata/md5-cache/media-libs/openimageio-2.3.16.0 |  17 -
 metadata/md5-cache/media-libs/openimageio-2.3.20.0 |  17 +
 metadata/md5-cache/media-libs/openimageio-2.4.4.1  |  17 +
 metadata/md5-cache/media-libs/osl-1.12.4.1-r2      |  17 -
 metadata/md5-cache/media-libs/osl-1.12.6.2         |  17 +
 metadata/md5-cache/net-misc/Manifest.gz            | Bin 91278 -> 91430 bytes
 metadata/md5-cache/net-misc/gallery-dl-1.23.2      |  16 +
 metadata/md5-cache/net-misc/iperf-2.9999           |  12 +
 metadata/md5-cache/net-misc/iperf-2.99999.99999    |  12 -
 metadata/md5-cache/net-misc/iperf-3.12             |  15 +
 metadata/md5-cache/net-misc/iperf-3.99999.99999    |  14 -
 metadata/md5-cache/sci-mathematics/Manifest.gz     | Bin 27605 -> 27761 bytes
 .../md5-cache/sci-mathematics/coq-serapi-0.15.0-r2 |  16 -
 .../md5-cache/sci-mathematics/coq-serapi-0.15.0-r3 |  16 +
 .../md5-cache/sci-mathematics/coq-serapi-0.16.0    |  16 +
 metadata/md5-cache/sys-apps/Manifest.gz            | Bin 83663 -> 84298 bytes
 metadata/md5-cache/sys-apps/cpuid-20220927         |  12 +
 metadata/md5-cache/sys-apps/hw-probe-1.6.5         |  12 +
 metadata/md5-cache/sys-apps/systemd-251.4          |   4 +-
 metadata/md5-cache/sys-apps/systemd-251.5          |  18 +
 metadata/md5-cache/sys-apps/systemd-utils-251.5    |  18 +
 metadata/md5-cache/sys-auth/Manifest.gz            | Bin 14179 -> 14177 bytes
 metadata/md5-cache/sys-auth/pam_yubico-2.26-r1     |  15 -
 metadata/md5-cache/sys-auth/pam_yubico-2.27        |  16 +
 metadata/md5-cache/sys-libs/Manifest.gz            | Bin 34533 -> 34550 bytes
 metadata/md5-cache/sys-libs/minizip-ng-3.0.6-r1    |  16 +
 metadata/md5-cache/sys-libs/zlib-ng-2.0.5          |  14 -
 metadata/md5-cache/sys-libs/zlib-ng-2.0.6          |   7 +-
 metadata/md5-cache/x11-drivers/Manifest.gz         | Bin 6627 -> 6620 bytes
 .../md5-cache/x11-drivers/nvidia-drivers-390.154   |   2 +-
 .../x11-drivers/nvidia-drivers-470.141.03          |   2 +-
 .../md5-cache/x11-drivers/nvidia-drivers-510.85.02 |   2 +-
 .../md5-cache/x11-drivers/nvidia-drivers-515.49.19 |   2 +-
 .../md5-cache/x11-drivers/nvidia-drivers-515.65.01 |   2 +-
 .../md5-cache/x11-drivers/nvidia-drivers-515.76    |   2 +-
 metadata/news/Manifest                             |  28 +-
 metadata/news/timestamp.chk                        |   2 +-
 metadata/projects.xml                              |  12 -
 metadata/timestamp                                 |   2 +-
 metadata/timestamp.chk                             |   2 +-
 metadata/timestamp.commit                          |   2 +-
 metadata/timestamp.x                               |   2 +-
 metadata/xml-schema/timestamp.chk                  |   2 +-
 net-misc/Manifest.gz                               | Bin 55065 -> 55069 bytes
 net-misc/gallery-dl/Manifest                       |   2 +
 net-misc/gallery-dl/gallery-dl-1.23.2.ebuild       |  38 ++
 net-misc/iperf/Manifest                            |   7 +-
 .../iperf/files/iperf-3.12-Unbundle-cJSON.patch    | 109 +++++
 net-misc/iperf/files/iperf-3.12-fix-bashism.patch  |  43 ++
 net-misc/iperf/iperf-2.9999.ebuild                 |  35 ++
 net-misc/iperf/iperf-2.99999.99999.ebuild          |  35 --
 net-misc/iperf/iperf-3.12.ebuild                   |  55 +++
 net-misc/iperf/iperf-3.99999.99999.ebuild          |  38 --
 profiles/Manifest.gz                               | Bin 147145 -> 147151 bytes
 profiles/base/package.use.mask                     |   7 +
 profiles/package.mask                              |   7 +-
 profiles/use.local.desc                            |   3 +
 sci-mathematics/Manifest.gz                        | Bin 16205 -> 16205 bytes
 sci-mathematics/coq-serapi/Manifest                |   4 +-
 .../coq-serapi/coq-serapi-0.15.0-r2.ebuild         |  64 ---
 .../coq-serapi/coq-serapi-0.15.0-r3.ebuild         |  64 +++
 .../coq-serapi/coq-serapi-0.16.0.ebuild            |  67 +++
 sys-apps/Manifest.gz                               | Bin 49386 -> 49383 bytes
 sys-apps/cpuid/Manifest                            |   2 +
 sys-apps/cpuid/cpuid-20220927.ebuild               |  35 ++
 sys-apps/hw-probe/Manifest                         |   2 +
 sys-apps/hw-probe/hw-probe-1.6.5.ebuild            |  63 +++
 sys-apps/systemd-utils/Manifest                    |   2 +
 sys-apps/systemd-utils/systemd-utils-251.5.ebuild  | 524 ++++++++++++++++++++
 sys-apps/systemd/Manifest                          |   4 +-
 sys-apps/systemd/systemd-251.4.ebuild              |   2 +-
 sys-apps/systemd/systemd-251.5.ebuild              | 529 +++++++++++++++++++++
 sys-auth/Manifest.gz                               | Bin 9563 -> 9559 bytes
 sys-auth/pam_yubico/Manifest                       |   4 +-
 sys-auth/pam_yubico/pam_yubico-2.26-r1.ebuild      |  42 --
 sys-auth/pam_yubico/pam_yubico-2.27.ebuild         |  48 ++
 sys-libs/Manifest.gz                               | Bin 14229 -> 14402 bytes
 sys-libs/minizip-ng/Manifest                       |   5 +
 ...-getrandom-and-arc4random_buf-usage-order.patch |  68 +++
 .../files/minizip-ng-3.0.6-test-temporary.patch    | 129 +++++
 sys-libs/minizip-ng/metadata.xml                   |  16 +
 sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild     |  86 ++++
 sys-libs/zlib-ng/Manifest                          |   4 +-
 sys-libs/zlib-ng/zlib-ng-2.0.5.ebuild              |  75 ---
 sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild              |   4 +-
 x11-drivers/Manifest.gz                            | Bin 4901 -> 4899 bytes
 x11-drivers/nvidia-drivers/Manifest                |  12 +-
 .../nvidia-drivers/nvidia-drivers-390.154.ebuild   |  64 ++-
 .../nvidia-drivers-470.141.03.ebuild               |  64 ++-
 .../nvidia-drivers/nvidia-drivers-510.85.02.ebuild |  64 ++-
 .../nvidia-drivers/nvidia-drivers-515.49.19.ebuild |  64 ++-
 .../nvidia-drivers/nvidia-drivers-515.65.01.ebuild |  64 ++-
 .../nvidia-drivers/nvidia-drivers-515.76.ebuild    |  64 ++-
 244 files changed, 5128 insertions(+), 2783 deletions(-)
 create mode 100644 app-accessibility/brltty/brltty-6.5.ebuild
 delete mode 100644 app-benchmarks/stress-ng/stress-ng-0.14.05.ebuild
 create mode 100644 app-benchmarks/stress-ng/stress-ng-0.14.06.ebuild
 delete mode 100644 app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
 delete mode 100644 app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
 create mode 100644 app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
 delete mode 100644 app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
 delete mode 100644 app-dicts/aspell-da/aspell-da-4.0.ebuild
 create mode 100644 app-text/ghostscript-gpl/ghostscript-gpl-10.0.0.ebuild
 delete mode 100644 app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r2.ebuild
 create mode 100644 app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r3.ebuild
 delete mode 100644 app-text/poppler-data/poppler-data-0.4.11-r1.ebuild
 create mode 100644 app-text/poppler-data/poppler-data-0.4.11-r2.ebuild
 create mode 100644 app-text/qpdf/qpdf-11.1.1.ebuild
 create mode 100644 dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.7.1.ebuild
 create mode 100644 dev-libs/libofx/libofx-0.10.8.ebuild
 create mode 100644 dev-lua/readline/readline-3.2.ebuild
 create mode 100644 dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1-r1.ebuild
 delete mode 100644 dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1.ebuild
 delete mode 100644 dev-ml/re/re-1.10.4-r1.ebuild
 create mode 100644 dev-ml/re/re-1.10.4-r2.ebuild
 create mode 100644 dev-python/pyatspi/pyatspi-2.46.0.ebuild
 delete mode 100644 dev-util/diffoscope/diffoscope-221.ebuild
 delete mode 100644 dev-util/diffoscope/diffoscope-222.ebuild
 create mode 100644 dev-util/diffoscope/diffoscope-223.ebuild
 create mode 100644 dev-util/seer/seer-1.11.ebuild
 delete mode 100644 games-fps/eduke32/eduke32-20220702.10113-r1.ebuild
 create mode 100644 games-fps/eduke32/eduke32-20220929.10163.ebuild
 create mode 100644 mail-client/geary/geary-43.0.ebuild
 delete mode 100644 media-libs/openimageio/openimageio-2.3.12.0-r3.ebuild
 delete mode 100644 media-libs/openimageio/openimageio-2.3.13.0.ebuild
 delete mode 100644 media-libs/openimageio/openimageio-2.3.15.0.ebuild
 delete mode 100644 media-libs/openimageio/openimageio-2.3.16.0.ebuild
 create mode 100644 media-libs/openimageio/openimageio-2.3.20.0.ebuild
 create mode 100644 media-libs/openimageio/openimageio-2.4.4.1.ebuild
 delete mode 100644 media-libs/osl/osl-1.12.4.1-r2.ebuild
 create mode 100644 media-libs/osl/osl-1.12.6.2.ebuild
 create mode 100644 metadata/md5-cache/app-accessibility/brltty-6.5
 delete mode 100644 metadata/md5-cache/app-benchmarks/stress-ng-0.14.05
 create mode 100644 metadata/md5-cache/app-benchmarks/stress-ng-0.14.06
 delete mode 100644 metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0-r3
 delete mode 100644 metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20210920
 delete mode 100644 metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20211129
 create mode 100644 metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20211129-r1
 delete mode 100644 metadata/md5-cache/app-dicts/aspell-da-4.0
 create mode 100644 metadata/md5-cache/app-text/ghostscript-gpl-10.0.0
 delete mode 100644 metadata/md5-cache/app-text/ghostscript-gpl-9.56.1-r2
 create mode 100644 metadata/md5-cache/app-text/ghostscript-gpl-9.56.1-r3
 delete mode 100644 metadata/md5-cache/app-text/poppler-data-0.4.11-r1
 create mode 100644 metadata/md5-cache/app-text/poppler-data-0.4.11-r2
 create mode 100644 metadata/md5-cache/app-text/qpdf-11.1.1
 create mode 100644 metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.7.1
 create mode 100644 metadata/md5-cache/dev-libs/libofx-0.10.8
 create mode 100644 metadata/md5-cache/dev-lua/readline-3.2
 delete mode 100644 metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1
 create mode 100644 metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1-r1
 delete mode 100644 metadata/md5-cache/dev-ml/re-1.10.4-r1
 create mode 100644 metadata/md5-cache/dev-ml/re-1.10.4-r2
 create mode 100644 metadata/md5-cache/dev-python/pyatspi-2.46.0
 delete mode 100644 metadata/md5-cache/dev-util/diffoscope-221
 delete mode 100644 metadata/md5-cache/dev-util/diffoscope-222
 create mode 100644 metadata/md5-cache/dev-util/diffoscope-223
 create mode 100644 metadata/md5-cache/dev-util/seer-1.11
 delete mode 100644 metadata/md5-cache/games-fps/eduke32-20220702.10113-r1
 create mode 100644 metadata/md5-cache/games-fps/eduke32-20220929.10163
 create mode 100644 metadata/md5-cache/mail-client/geary-43.0
 delete mode 100644 metadata/md5-cache/media-libs/openimageio-2.3.12.0-r3
 delete mode 100644 metadata/md5-cache/media-libs/openimageio-2.3.13.0
 delete mode 100644 metadata/md5-cache/media-libs/openimageio-2.3.15.0
 delete mode 100644 metadata/md5-cache/media-libs/openimageio-2.3.16.0
 create mode 100644 metadata/md5-cache/media-libs/openimageio-2.3.20.0
 create mode 100644 metadata/md5-cache/media-libs/openimageio-2.4.4.1
 delete mode 100644 metadata/md5-cache/media-libs/osl-1.12.4.1-r2
 create mode 100644 metadata/md5-cache/media-libs/osl-1.12.6.2
 create mode 100644 metadata/md5-cache/net-misc/gallery-dl-1.23.2
 create mode 100644 metadata/md5-cache/net-misc/iperf-2.9999
 delete mode 100644 metadata/md5-cache/net-misc/iperf-2.99999.99999
 create mode 100644 metadata/md5-cache/net-misc/iperf-3.12
 delete mode 100644 metadata/md5-cache/net-misc/iperf-3.99999.99999
 delete mode 100644 metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0-r2
 create mode 100644 metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0-r3
 create mode 100644 metadata/md5-cache/sci-mathematics/coq-serapi-0.16.0
 create mode 100644 metadata/md5-cache/sys-apps/cpuid-20220927
 create mode 100644 metadata/md5-cache/sys-apps/hw-probe-1.6.5
 create mode 100644 metadata/md5-cache/sys-apps/systemd-251.5
 create mode 100644 metadata/md5-cache/sys-apps/systemd-utils-251.5
 delete mode 100644 metadata/md5-cache/sys-auth/pam_yubico-2.26-r1
 create mode 100644 metadata/md5-cache/sys-auth/pam_yubico-2.27
 create mode 100644 metadata/md5-cache/sys-libs/minizip-ng-3.0.6-r1
 delete mode 100644 metadata/md5-cache/sys-libs/zlib-ng-2.0.5
 create mode 100644 net-misc/gallery-dl/gallery-dl-1.23.2.ebuild
 create mode 100644 net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch
 create mode 100644 net-misc/iperf/files/iperf-3.12-fix-bashism.patch
 create mode 100644 net-misc/iperf/iperf-2.9999.ebuild
 delete mode 100644 net-misc/iperf/iperf-2.99999.99999.ebuild
 create mode 100644 net-misc/iperf/iperf-3.12.ebuild
 delete mode 100644 net-misc/iperf/iperf-3.99999.99999.ebuild
 delete mode 100644 sci-mathematics/coq-serapi/coq-serapi-0.15.0-r2.ebuild
 create mode 100644 sci-mathematics/coq-serapi/coq-serapi-0.15.0-r3.ebuild
 create mode 100644 sci-mathematics/coq-serapi/coq-serapi-0.16.0.ebuild
 create mode 100644 sys-apps/cpuid/cpuid-20220927.ebuild
 create mode 100644 sys-apps/hw-probe/hw-probe-1.6.5.ebuild
 create mode 100644 sys-apps/systemd-utils/systemd-utils-251.5.ebuild
 create mode 100644 sys-apps/systemd/systemd-251.5.ebuild
 delete mode 100644 sys-auth/pam_yubico/pam_yubico-2.26-r1.ebuild
 create mode 100644 sys-auth/pam_yubico/pam_yubico-2.27.ebuild
 create mode 100644 sys-libs/minizip-ng/Manifest
 create mode 100644 sys-libs/minizip-ng/files/minizip-ng-3.0.6-Switch-getrandom-and-arc4random_buf-usage-order.patch
 create mode 100644 sys-libs/minizip-ng/files/minizip-ng-3.0.6-test-temporary.patch
 create mode 100644 sys-libs/minizip-ng/metadata.xml
 create mode 100644 sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild
 delete mode 100644 sys-libs/zlib-ng/zlib-ng-2.0.5.ebuild

diff --git a/Manifest b/Manifest
index 9050abc4ba35..fecbeda8e88c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29598 BLAKE2B 4e0f1d633d5af158544d813f612a2e1733703d2d9d53d1143e793257837a10c7256d45e72018b390ddc71a2fc7e301da708c09218a1586d4337752f95b72ab37 SHA512 219fdabef402601925d6ce321e0c5757463de301711cf3b48de6e7bb893167427a173127608451d82c4865edb0d177224df7a9b2a3e835ca352f156407e261bf
-TIMESTAMP 2022-10-01T23:09:47Z
+MANIFEST Manifest.files.gz 29611 BLAKE2B d9e4624edaf232b4a526deb6809d124da39ca885d52d1df7ec391b07dceb62ea8c23140a133f70a8e619bdccf8add7962ac9fc2c105ebbaa5864747b62dfb04e SHA512 497b86d80cbf7585d5b2848dc38814135e23698fe7b16ef7d73087330610f3bdee06d91998fb26ba23bc144d93de22c4e35637cf7dfb5e3d9861f16cef65df84
+TIMESTAMP 2022-10-02T05:09:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM4yLtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM5HR1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAfLg//QmlwcYo0Ff78VQ8hT0ssRi+m2EgBNXeThB+g9mCsncyn7hnEnRy2gP0J
-soPG5O1I635CRPrJROCaCQBW+1H7K4dPZ7YNEXb79dh2lg8+8QridpAx7L2mrtk0
-rIsm6hSq4XxhfLlwenVCGx2hXurVkBVl3t80auv5vfeFT4TGvISsdxiwS8ckUrPQ
-pmb7a/bLeG0yQ3feS/PtBsOn0DpwUOGSAf4evQqPWu2TETlgi4+FJtIfLJ7NOVyM
-GgzuHAhKqM2p9d3mFQGYkQ/wMBnVOC93s0mFG11Q/9aNNZ0a3ib/5bI0k+Mxu1pR
-pYCmAth33G0VpjEeY2/SxNCB1Iv76unHRMxo+0L8gJa3sOg8ZunSR6PQFR7k8VFq
-V9aPulk6s6ygj5eTxEfk9X0eew/OEWl9Pqr5DCzRPEJV+eO6FWlxekIW+rH9UUvx
-aeKTU8NFR5XQqe5N6XMz+M+KVbSHP1BHLKs7+QA14lcnKB9j2ib1GqsaTbpJv7fG
-iQj2JV/cUHOjIEVwBw/ndpYSczqUZ863l1NyPF3NLPiHhv59K2EEJLmxwNm8qYXs
-PUZcsu36i4yu02YQ8Ud8MuYf2OH7GTAFfMEhk+aXCykl6dwVKbeqKLQlEFHSdbYx
-BdXlvsASbjGIPSVN5q60qiVYk+dCbjjhB3P8L0S9SQV7U3xGy0c=
-=pF11
+klBQNQ/9EW48ns5Kew+o59Prq9MyMBtUlyv32ndqvKJBePyoDxXjKV+HtJOgr3S9
+6VHwjj6JUw0MOYJA9pKrVnG+eJXGudtXPEefUEUkD+hWFYOi3uLsjITqX5p7rEOF
+/enbZKoK2WcvCFhq1HjmTVoz1D3gtDIJMcPUF3XVMfylVgtvEDofzXY33xvu+XEl
+HsYVf8WLtiANRa6hHMx02vfTswPd9plxav72lu39OsWSaziflaUZCOwfitjZrcwK
+/LRKO3UD5tOPr5sArgWO75m3AkUHJuDzEnySlpBkHO6NbY45MPnrjc0bKItYHUQK
+jYD9HIxxIgqX6FehbS31iVgQ1g7MB6AhPdJHy2zhXvXrpQF4REaod+PixvlGtaYd
+ImZYG23ux8Qv8xnTW87B6Q1KCY2pk5X75jrcnAkYeVUsE+9GwbsX6YlbHQJKStVO
+SsGhY39X8nhRTl5puhV8xJCqJC7FQ/g2XQnWoAN/qsgANtZhO8HHC56wtlTxOFMe
+5YC4hMIiMXCIYCohOtQcFQ5A/NffP6jPLz1s8br6AaEWS24I2KYMA8HKga3Wmp4g
+8YIxUeNpXrG4r8HP+bEeHWhlvq10l9WUT2PNAsq7KGrr0WTjojxDl20ph5elHIdO
+W12Wf3qqnto/N93ijA+BvMn2SyFHGa4WZDJLcxorsWlRmQiXP3o=
+=cxNv
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 2b97f735aeab..dd365ff418a7 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 2a1991f58d05..6a6cf1027a02 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index de8b2d10d96c..ffd4fc242b33 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -6,8 +6,10 @@ AUX brltty.rc 241 BLAKE2B 873b1344cc6dee3aa6272d9c8857b58a751200e77d7fa0d96f9ff9
 AUX brltty.tmpfiles.conf 31 BLAKE2B e51c4c6e98da2d68ebd2aca39d3015ca28b40dbee5528155f9efb87ef8ec5264b382c78acf748514bd1f3902dbedcd471f4e18b0361c6a924108a950c75aceb9 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7
 DIST brltty-6.1.tar.xz 3394852 BLAKE2B 03e6358721dcd5c3bdee3301a1ed827a690128ec339669543279c7e9a115bef6c5d8630e4af2d0b214b9c7c3eaa9001ab4c54ae7fb899cb3bc675985f51d6933 SHA512 030ef60ef7a9a60dc2fba2a64ea0a0868395eee6f2f86876b4e4111e804a05b44f798a154a69a8f5e0f6358130993c360a550f7decac0535450f9cf939231eaf
 DIST brltty-6.4.tar.xz 3669296 BLAKE2B 2824b212c7e4fea0f65c7ae111432071805aa63117a7e9a9932d7720ef2157f1e6fd33e3e91e4515c7131bd066db8f910969fb186d2007b63bc83efcbe2332b1 SHA512 384848d05f78732952079d6f5170046927fcb35f400ece71ca897415a793c0aa1047934f8cd5e9e781536fb0b7cb71273283f3bba21e59f082ba8f6f2416352e
+DIST brltty-6.5.tar.xz 3631628 BLAKE2B b2e5f82f15dff9a99bf3d75523f6ec48d531d413d860079af0023b9efdc07a93563226c6388cc89ce025f8d13b1635e883680f0ddb8a688ffcc4cd9c335d7aee SHA512 bbfbb89b1c3ba5063ad3bc0aa97b859dd23acea1feb79dab20c57dc74ff2f26649942fcecc7030a3f70555596f4d9d35cd05616af2a8e101d4d56b4c471a6ad3
 EBUILD brltty-6.1-r1.ebuild 5612 BLAKE2B 5622e19bd95f3d30a0797aac52e3e28efabaa4e20c6f274dbb437ab600d270a1004b1ffc5df3bb91e5b1a0441245dd77aedcad06c539c717d51fb656f7aa5e56 SHA512 dd317fc0e49568a6119c1715c21baa531cf88ba68055f9b35e28ac1b5e1baba64e73bba5ea0c26243903ea7b373a7076a0150ba42783328816ef1c268bf3e682
 EBUILD brltty-6.1.ebuild 5601 BLAKE2B e26efd68d25484109eac679fe9ee28a86da220089f5a642ac412096476727d967f594465c31e2001e5119b5b35e0ac2a092c428844c4e79bec3a923a385a5019 SHA512 a1e938b5e8648286c03ad10164cbae3b3f07ff9faebc6c09f38f4ebc0c4ce6ac8890d6e9ee222af854a603003773de73583b1fdde96b1d54256ced864cdb71b2
 EBUILD brltty-6.4-r1.ebuild 5629 BLAKE2B 4099388966dacb394cf6ad83276136c690c4b4728f8acd8f1243f3abdaea9d4dae08868204944d4bb4489f60561696da2f347ba50589882284044180e977aedd SHA512 22562ce8d7918b6d89a8e29eb452195aa9140457f4a9bfcdc2bb1756b1862c6e61a617cca25828428ee6a93da9e85d9f4e7432cc2bdb5a6938fc46601981b4d7
 EBUILD brltty-6.4.ebuild 5372 BLAKE2B 892ce75770f4795a469fc939bbd102643cb00edbd4fd8e1179d969c4a81d0ba15f88dfe75624fca08bebb5603b6d30f05f6b3a2f14ad8c8caa0325e53b939237 SHA512 60d4da4739317681fb772ce6fe04c9614c409da7c8552ce9de87dc41046d1bee93f981328d6793599ebbaa55392fa2226005aa5c793b305856378163cafab435
+EBUILD brltty-6.5.ebuild 5673 BLAKE2B 6590cdcdef6f514dda9f332803e4e3deb55099a842cace79ae4b6231b1932b044ac64fab6b25b30c5ff919507205b5fe55b7633a24af9b3de782bb91d8638113 SHA512 f75baa4853367a01f1c254acc0ebef4d3fcb8ce9f147b2f047198137fd639043075d2fd60b3cf6b65b13263ff45a47d79dc23dda1751416cd89f5fc7080afc55
 MISC metadata.xml 1716 BLAKE2B ed682382453994ecc32abce819ea08090a44cfa8ee3ba468947d2da7f1051eab5a39514cfb0347a5c39299fba44d8e6af6f6e8dcf343e0c6ad1caf35db0c9ad1 SHA512 a06a879a6858edbcb390e347e864a901e7cb59d95a10967082804ac990fa9256e089379f21130ee3a8cb412cb9372716678d4e26e87de191addf7c2182199418
diff --git a/app-accessibility/brltty/brltty-6.5.ebuild b/app-accessibility/brltty/brltty-6.5.ebuild
new file mode 100644
index 000000000000..d06a26c6dab0
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.5.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+FINDLIB_USE="ocaml"
+JAVA_PKG_WANT_SOURCE="1.8"
+JAVA_PKG_WANT_TARGET="1.8"
+
+inherit findlib toolchain-funcs java-pkg-opt-2 autotools python-r1 tmpfiles
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
+HOMEPAGE="https://brltty.app/"
+SRC_URI="https://brltty.app/archive/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+api +beeper bluetooth doc +fm gpm iconv icu
+		java louis +midi ncurses nls ocaml +pcm policykit python
+		usb systemd +speech tcl xml X"
+REQUIRED_USE="doc? ( api )
+	java? ( api )
+	ocaml? ( api )
+	python? ( api ${PYTHON_REQUIRED_USE} )
+	tcl? ( api )"
+
+DEPEND="
+	acct-group/brltty
+	acct-user/brltty
+	dev-libs/libpcre2[pcre32]
+	bluetooth? (
+		sys-apps/dbus
+		net-wireless/bluez
+	)
+	gpm? ( >=sys-libs/gpm-1.20 )
+	iconv? ( virtual/libiconv )
+	icu? ( dev-libs/icu:= )
+	louis? ( dev-libs/liblouis:= )
+	midi? ( media-libs/alsa-lib )
+	ncurses? ( sys-libs/ncurses:0= )
+	pcm? ( media-libs/alsa-lib )
+	policykit? ( sys-auth/polkit )
+	python? ( ${PYTHON_DEPS} )
+	speech? (
+		app-accessibility/espeak-ng
+		app-accessibility/flite
+		app-accessibility/speech-dispatcher
+	)
+	systemd? ( sys-apps/systemd )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+	usb? ( virtual/libusb:1 )
+	xml? ( dev-libs/expat )
+	X? (
+	app-accessibility/at-spi2-core:2
+		sys-apps/dbus
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXfixes
+		x11-libs/libXt
+		x11-libs/libXtst
+	)"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.8:* )
+	nls? ( virtual/libintl )
+	python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.4-respect-AR.patch
+)
+
+src_prepare() {
+	default
+
+	java-pkg-opt-2_src_prepare
+
+	# We run eautoconf instead of using eautoreconf because brltty uses
+	# a custom build system that uses autoconf without the rest of the
+	# autotools.
+	eautoconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	tc-export AR LD PKG_CONFIG
+
+	export JAVAC=""
+	export JAVA_JNI_FLAGS=""
+	if use java; then
+		export JAVA_HOME="$(java-config -g JAVA_HOME)"
+		export JAVAC_HOME="${JAVA_HOME}/bin"
+		export JAVA_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
+		export JAVAC="$(java-pkg_get-javac) -encoding UTF-8 $(java-pkg_javac-args)"
+	fi
+
+	# Override bindir for backward compatibility.
+	# Also override localstatedir so that the lib/brltty directory is installed
+	# correctly.
+	# Disable stripping since we do that ourselves.
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir="${EPREFIX}"/usr/share/doc/"${P}"/html
+		--localstatedir="${EPREFIX}"/var
+		--runstatedir="${EPREFIX}"/run
+		# the next two lines should be removed once support is added.
+		--disable-emacs-bindings
+		--disable-lua-bindings
+		--disable-stripping
+		--with-updatable-directory="${EPREFIX}"/var/lib/brltty
+		--with-writable-directory="${EPREFIX}"/run/brltty
+		--with-privilege-parameters=lx:user=brltty
+		$(use_enable api)
+		$(use_with beeper beep-package)
+#		$(use_enable emacs emacs-bindings)
+		$(use_with fm fm-package)
+		$(use_enable gpm)
+		$(use_enable iconv)
+		$(use_enable icu)
+		$(use_enable java java-bindings)
+		$(use_enable louis liblouis)
+#		$(use_enable lua lua-bindings)
+		$(use_with midi midi-package)
+		$(use_enable nls i18n)
+		$(use_enable ocaml ocaml-bindings)
+		$(use_with pcm pcm-package)
+		$(use_enable policykit polkit)
+		$(use_enable python python-bindings)
+		$(use_enable speech speech-support)
+		$(use_with systemd service-package)
+		$(use_enable tcl tcl-bindings)
+		$(use_enable xml expat)
+		$(use_enable X x)
+		$(use_with bluetooth bluetooth-package)
+		$(use_with ncurses curses)
+		$(use_with usb usb-package)
+	)
+	# disable espeak since we use espeak-ng
+	use speech && myconf+=( --with-speech-driver=-es )
+
+	econf "${myconf[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myconf[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+src_compile() {
+	emake -j1 JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}"
+
+	if use python; then
+		python_build() {
+			cd "Bindings/Python" || die
+			emake -j1
+		}
+		python_foreach_impl run_in_build_dir python_build
+	fi
+}
+
+src_install() {
+	if use ocaml; then
+		findlib_src_preinst
+	fi
+
+	emake -j1 INSTALL_ROOT="${D}" OCAML_LDCONF= install
+
+	if use python; then
+		python_install() {
+			cd "Bindings/Python" || die
+			emake -j1 INSTALL_ROOT="${D}" install
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+
+	if use java; then
+		java-pkg_doso Bindings/Java/libbrlapi_java.so
+		java-pkg_dojar Bindings/Java/brlapi.jar
+	fi
+
+	insinto /etc
+	doins Documents/brltty.conf
+	newinitd "${FILESDIR}"/brltty.initd brltty
+	pushd Autostart/Systemd 1> /dev/null || die
+	emake -j1 INSTALL_ROOT="${ED}" install
+	popd
+	pushd Autostart/Udev 1> /dev/null || die
+	emake -j1 INSTALL_ROOT="${ED}" install
+	popd
+
+	dodoc Documents/{CONTRIBUTORS,ChangeLog,HISTORY,README*,TODO}
+	if use doc; then
+		HTML_DOCS="doc/Manual-BRLTTY" einstalldocs
+	fi
+
+	keepdir /var/lib/BrlAPI
+	rm -fr "${ED}/run" || die
+	find "${ED}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	elog "please be sure ${EROOT}/etc/brltty.conf is correct for your system."
+	elog
+	elog "To make brltty start on boot on an OpenRC system, type this command:"
+	elog "# rc-update add brltty boot"
+	elog
+	elog "If you are using systemd, type this command:"
+	elog "# systemctl daemon-reload"
+	elog
+	elog "Please reload udev by typing:"
+	elog "# udevadm control --reload"
+}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 9f9ca6de6b22..7c4ce234f420 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index fad299de34e1..37f259d8c6e1 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1,3 @@
-DIST stress-ng-0.14.05.tar.gz 3697305 BLAKE2B f3ce81f93d5a080f62fb1bf0822447b5b09c4cce8601259c15f203d0dbcce40d0b601dc7448e925bfcaf3ea9f28a9c0e606afa9faec7af94814c6c1d68181424 SHA512 b1d1be23ace46d87d4cdef1e7915aaa2e74ac5314ef0cc584ef07fd1533107896c65245fadfb5d4367b935e04583c7fd2f90a3d2a76bdf96dffa4af04a367891
-EBUILD stress-ng-0.14.05.ebuild 1130 BLAKE2B 10336eab5aa1f53c8046691c88ecfbcf28b06a2d2871c302fcf420f67265a8a26f892988253a25d380521d8881e8fb2574b76e0d7b702fc31ab7d1a7868fc42e SHA512 6383540fa6723f68e09013ac72efa1fd2f777e355e9b0355da0c434005c55dbe5d0d4fe93b8496cad8172db1490dc360e176db0d223d4c8e962bc20892d89ed5
+DIST stress-ng-0.14.06.tar.gz 3705069 BLAKE2B fbc7b73cf85f82bb4c7172c4a275c793f553b95b0db36324d83cef2f6fb7e548b9a9222319a5a3ca5aae857916dd0cdd804cae275c575ec2bac912a37917e8a6 SHA512 8d670fe7cc10106839cde891149ad92f0ec025aa2ec4c7d7f60f19728fc2b68f47245303d47ceddc5f17607766a0fe4cfceea83275c7d9c8093f12cc827112b4
+EBUILD stress-ng-0.14.06.ebuild 1130 BLAKE2B 10336eab5aa1f53c8046691c88ecfbcf28b06a2d2871c302fcf420f67265a8a26f892988253a25d380521d8881e8fb2574b76e0d7b702fc31ab7d1a7868fc42e SHA512 6383540fa6723f68e09013ac72efa1fd2f777e355e9b0355da0c434005c55dbe5d0d4fe93b8496cad8172db1490dc360e176db0d223d4c8e962bc20892d89ed5
 MISC metadata.xml 835 BLAKE2B 88b503bcc225861dfd5a5e016bc0c6df87d13e758f9eb8d73103deb5f1d88163f260f24efcb4988a245b1ea2888e18da86d031d52c9dcdc702dbd9a7c510b691 SHA512 dfc8c9cb83e0960fd0881affc5cd12fe843743faa92e3af0edf0ba86ad8107de60669cd32e156be9ea645a817f38f7091be2b9c870902e7109f937e584feac99
diff --git a/app-benchmarks/stress-ng/stress-ng-0.14.05.ebuild b/app-benchmarks/stress-ng/stress-ng-0.14.05.ebuild
deleted file mode 100644
index 261e754e1065..000000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.14.05.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="Stress test for a computer system with various selectable ways"
-HOMEPAGE="https://github.com/ColinIanKing/stress-ng"
-SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
-IUSE="apparmor sctp"
-
-DEPEND="
-	dev-libs/libaio
-	dev-libs/libbsd
-	dev-libs/libgcrypt:0=
-	sys-apps/attr
-	sys-apps/keyutils:=
-	sys-libs/libcap
-	sys-libs/zlib
-	virtual/libcrypt:=
-	apparmor? (
-		sys-apps/apparmor-utils
-		sys-libs/libapparmor
-	)
-	sctp? ( net-misc/lksctp-tools )
-"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( "README.md" "README.Android" "TODO" "syscalls.txt" )
-
-pkg_pretend() {
-	if use apparmor; then
-		CONFIG_CHECK="SECURITY_APPARMOR"
-		check_extra_config
-	fi
-}
-
-src_compile() {
-	tc-export CC
-
-	export MAN_COMPRESS="0"
-
-	local myemakeopts=(
-		HAVE_APPARMOR="$(usex apparmor 1 0)"
-		HAVE_LIB_SCTP="$(usex sctp 1 0)"
-		VERBOSE="1"
-	)
-
-	emake "${myemakeopts[@]}"
-}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.14.06.ebuild b/app-benchmarks/stress-ng/stress-ng-0.14.06.ebuild
new file mode 100644
index 000000000000..261e754e1065
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.14.06.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="Stress test for a computer system with various selectable ways"
+HOMEPAGE="https://github.com/ColinIanKing/stress-ng"
+SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="apparmor sctp"
+
+DEPEND="
+	dev-libs/libaio
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0=
+	sys-apps/attr
+	sys-apps/keyutils:=
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/libcrypt:=
+	apparmor? (
+		sys-apps/apparmor-utils
+		sys-libs/libapparmor
+	)
+	sctp? ( net-misc/lksctp-tools )
+"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.md" "README.Android" "TODO" "syscalls.txt" )
+
+pkg_pretend() {
+	if use apparmor; then
+		CONFIG_CHECK="SECURITY_APPARMOR"
+		check_extra_config
+	fi
+}
+
+src_compile() {
+	tc-export CC
+
+	export MAN_COMPRESS="0"
+
+	local myemakeopts=(
+		HAVE_APPARMOR="$(usex apparmor 1 0)"
+		HAVE_LIB_SCTP="$(usex sctp 1 0)"
+		VERBOSE="1"
+	)
+
+	emake "${myemakeopts[@]}"
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3a154af32f49..042e982f0b99 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
index 8cbf1da13e7c..c83e74caf289 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -2,11 +2,7 @@ AUX johntheripper-jumbo-1.9.0-fix-bashism.patch 939 BLAKE2B e3e4a45a7cba373203d6
 AUX johntheripper-jumbo-1.9.0-gcc11.patch 1713 BLAKE2B b1f3aaf0c76f1c0fc6ad0d498dce4722994ed11a6f0547bb4ff7683083b9c9d59ce817133189853380378121515aa12db1cf08699c40b39e2fdec667045da88d SHA512 d341eeb291b5bf5721b781272ac66aa56e7d38db305f0272e65a0b77bad05ffc631cfe5fe8093f94a8545cc09020d639dfebb1b903585248bd57933661571b4f
 AUX johntheripper-jumbo-1.9.0-opencl-fix.patch 333 BLAKE2B 248ad5ecba48908a982c27c9d8162c22031cfc29f0becb05209f56c837bb850f6032c847a60d8cd05ba88a0f73ad35f27a08fefb734c6bd87f458b22f77db0ab SHA512 81f9dabc6d8ad54944be7eb9b3c7204ce426db842325c31662038e213775c0a86288c860712e6d3c24f7a9d0b7a0fd8962126a25242f45e5f242307691a97d38
 AUX johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch 3933 BLAKE2B cd5d773615f4b239e857b430c35a905be7e0c8bfd83b037f43fe14799340aa6d3a02bf9f3f69c1e69a2b07a4038474c1fc57a8ab056db26fde5aa14b1842df18 SHA512 505cf695a001f22a74998a83eb79ce7b88882eb51a0864833e06bd9344dae36df629ffb6cdcdfaa019b3dfcfdedc8314a30b169d0d5b1f6976408adbaee49023
-DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 2fd6813e234308408d42581705ee8b25f9217a3dfb43f05483156f7bb67d0ce0d6de9c3ce8c2e4a17bb99bb377119dae2897bc08c800e7bc80bc6cf245400df6 SHA512 c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808
-DIST johntheripper-jumbo-1.9.0_p20210920.tar.gz 47758128 BLAKE2B e85255dc218c43e6358f76eac1e79af01d437a7a1fcddd608a390734fdc4070cbf949b8abc080b82decf4a1f5e32d2baa6d2a09d385a31913d8e988c8732e85e SHA512 5121434ad275921fe6288c51fd9dfd36ed3162387e70e8089bbc266d4a17ea461b72ce26b2004acfb62d95a9ee2d570ef3b3f00c1d031abd8cff2f20c3ab480a
 DIST johntheripper-jumbo-1.9.0_p20211129.tar.gz 47758087 BLAKE2B de57218151fbc3bed79322d065ef73deb99b73fb1ce55924197793a320600cc1189dabae43fe5848014c2e72dcb7e1c2a91f2aaba64bd8c7314ded37e23a34c9 SHA512 f8fc6bf102d900bb32c5714bd595a71f67f73a1f0a237d9f851b2f250046307bf1177f3782023cd1bbcc55f9d54fd7b4946e09c7dc1fd908ba6a6bad90b233d6
-EBUILD johntheripper-jumbo-1.9.0-r3.ebuild 3063 BLAKE2B 7a97ec7f5c5fe7be273081073a3dda2f800a00c2ee0379469b374b6ba43fe147143cfdae91c87969a7c5f86d63adefe8ca489122cb2fe27bd7a3f894b91a9735 SHA512 f2e6cbf3150f15f9d9da51415ca574ba3ae7000d0dfe0a4cd783dff23b4109b1076de6c52889142707e3f3cdeb572d0994826e88494a840d744512a0cca2afc9
-EBUILD johntheripper-jumbo-1.9.0_p20210920.ebuild 3160 BLAKE2B b8ca0a496a9f1cd4cd46353eb61db4fdc75cd879ca187b94c2ee62b4f7d98a2c1969faeae0adf9f882d3ecce029e0f7f21302747fbc1dced9c5dbac2fb1c6928 SHA512 53b8987d7001a42a168caee5e3b616ff7ced5f0b2c97b308334acb4cf4c501fcc827d83796f1bfa2f5258c22217787f67e7d1b8470f3a0a1478880ff09241413
-EBUILD johntheripper-jumbo-1.9.0_p20211129.ebuild 3423 BLAKE2B 95f8d15df163ef04dace243266b15c15f023d9ef549e4694dcd6f9e1183a74a6232e11f1e31ca35d1b95a0e51c4798363d27f0eb2d9cffb1cda1c2890271cf0b SHA512 b9a088870b39fb8d99e8400a5b9d2a6e5598e7fae2da79299b00873f68c966a57172d6864e456b4d428f345548474f1658a822ee926f40ce1a4209e5c79b563e
-EBUILD johntheripper-jumbo-9999.ebuild 3372 BLAKE2B adcdc67282888fc8ffb99d837f3358760db08e0113ca1fb3ba5207449577c1cbc321aebde5a9e7165af1e291cecac63c8e69f2c5cb950947c60a21e886aeff4b SHA512 16f08c8635ad421c049091b35f007d9a164e32f278982bad922d18ad95df1f4e9e63c1f2623925630978b724ff6380403b64039044e801199f80abc1b9b0548b
+EBUILD johntheripper-jumbo-1.9.0_p20211129-r1.ebuild 3471 BLAKE2B 156fa82b68ef34eec7f16302f3657817e041e2bbfbb0b6034bad4a336c0e7f519f1b45a61ab1227b62854ea0c989af38b86eb37e1cef86b48752a8e7fbe109f7 SHA512 3c8d3ca05cfde86bff53ea48b69fffbac80ab334f8e7a4a4b4c8337528da4661b46eb3944c451747ada09a072f1c7d0fce8bd18640c74c0630102bad4c1a4e07
+EBUILD johntheripper-jumbo-9999.ebuild 3420 BLAKE2B cb8f328e15f4e7d3ecf09bc00a8774ed2199e87398b0e7944013ea0bdaf8c731aeacc3aa5c1af2682173d0c284366b9f766dd0eb18deceb1d736e4939306804c SHA512 c19de9be866874b5ee7e4f1b4dc98ea0734fa5a3b08ac2399581b756c3eb16aa81580c7bacb1e7f716974ede404ba5e5680cde3a3b03d8e3eb74da6412b646e8
 MISC metadata.xml 473 BLAKE2B ed1c424492ff052e83ce899d8ea4a805ce5d4a5604da336ad16929594d14307c2e264c4eb6e6ee985d3167b8917e8c80c38ed9f97ba5293a0b8f84f472fd9786 SHA512 f124050eecf17e3c2fa01b6140881349e089840c75cb30bf054286a049026bb372cc70e1ce7be3054fffbe5836be7dc1f7fc9e3918f874443644ea99c5b441ab
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
deleted file mode 100644
index f17408ea8cf3..000000000000
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0-r3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs pax-utils
-
-DESCRIPTION="Fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-MY_PN="JohnTheRipper"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git"
-	inherit git-r3
-else
-	JUMBO="jumbo-1"
-	MY_PV="${PV}-${JUMBO}"
-	MY_P="john-${MY_PV}"
-	SRC_URI="https://www.openwall.com/john/k/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-#removed rexgen and commoncrypto
-IUSE="custom-cflags kerberos mpi opencl openmp pcap"
-
-DEPEND=">=dev-libs/openssl-1.0.1:0=
-	virtual/libcrypt:=
-	mpi? ( virtual/mpi )
-	opencl? ( virtual/opencl )
-	kerberos? ( virtual/krb5 )
-	pcap? ( net-libs/libpcap )
-	dev-libs/gmp:=
-	sys-libs/zlib
-	app-arch/bzip2"
-
-RDEPEND="${DEPEND}
-		!app-crypt/johntheripper"
-
-PATCHES=(
-	"${FILESDIR}/${P}-opencl-fix.patch"
-	"${FILESDIR}/${P}-gcc11.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	sed -i 's#$prefix/share/john#/etc/john#' src/configure || die
-	default
-}
-
-src_configure() {
-	cd src || die
-
-	use custom-cflags || strip-flags
-	append-cflags -fcommon
-
-	econf \
-		--disable-native-march \
-		--disable-native-tests \
-		--without-commoncrypto \
-		--disable-rexgen \
-		--with-openssl \
-		--with-systemwide \
-		$(use_enable mpi) \
-		$(use_enable opencl) \
-		$(use_enable openmp) \
-		$(use_enable pcap)
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_test() {
-	pax-mark -mr run/john
-	#if use opencl; then
-		#gpu tests fail in portage, so run cpu only tests
-	#	./run/john --device=cpu --test=0 --verbosity=2 || die
-	#else
-		#weak tests
-	#	./run/john --test=0 --verbosity=2 || die
-		#strong tests
-		#./run/john --test=1 --verbosity=2 || die
-	#fi
-	ewarn "When built systemwide, john can't run tests without reading files in /etc."
-	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
-}
-
-src_install() {
-	# executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -mr "${ED}/usr/sbin/john"
-
-	# grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3
-	for s in \
-		unshadow unafs undrop unique ssh2john putty2john pfx2john keepass2john keyring2john \
-		zip2john gpg2john rar2john racf2john keychain2john kwallet2john pwsafe2john dmg2john \
-		hccap2john base64conv truecrypt_volume2john keystore2john
-	do
-		dosym john /usr/sbin/$s
-	done
-
-	# scripts
-	exeinto /usr/share/john
-	doexe run/*.pl
-	doexe run/*.py
-	cd run
-	for s in *.pl *.py ; do
-		dosym ../share/john/$s /usr/bin/$s
-	done
-	cd ..
-
-	if use opencl; then
-		insinto /etc/john
-		doins -r run/kernels
-	fi
-
-	# config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-	doins -r run/rules run/ztex
-
-	# documentation
-	rm -f doc/README
-	dodoc -r README.md doc/*
-}
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
deleted file mode 100644
index a77f1fbf4199..000000000000
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs pax-utils
-
-DESCRIPTION="Fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-MY_PN="JohnTheRipper"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git"
-	inherit git-r3
-else
-	JUMBO="jumbo-1.1"
-	MY_PV="${PV}-${JUMBO}"
-	MY_P="john-${MY_PV}"
-	HASH_COMMIT="43c7f8850736d4ec68bf0a022ae9fb34c274a01d"
-
-	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/john-${HASH_COMMIT}"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags kerberos mpi opencl openmp pcap"
-
-DEPEND=">=dev-libs/openssl-1.0.1:=
-	virtual/libcrypt:=
-	mpi? ( virtual/mpi )
-	opencl? ( virtual/opencl )
-	kerberos? ( virtual/krb5 )
-	pcap? ( net-libs/libpcap )
-	dev-libs/gmp:=
-	sys-libs/zlib
-	app-arch/bzip2"
-RDEPEND="${DEPEND}
-	!app-crypt/johntheripper"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0-fix-bashism.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	cd src || die
-	eautoreconf
-
-	sed -i 's#$prefix/share/john#/etc/john#' configure || die
-}
-
-src_configure() {
-	cd src || die
-
-	use custom-cflags || strip-flags
-
-	econf \
-		--enable-pkg-config \
-		--disable-native-march \
-		--disable-native-tests \
-		--disable-rexgen \
-		--with-openssl \
-		--with-systemwide \
-		$(use_enable mpi) \
-		$(use_enable opencl) \
-		$(use_enable openmp) \
-		$(use_enable pcap)
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_test() {
-	pax-mark -mr run/john
-	#if use opencl; then
-		#gpu tests fail in portage, so run cpu only tests
-	#	./run/john --device=cpu --test=0 --verbosity=2 || die
-	#else
-		#weak tests
-	#	./run/john --test=0 --verbosity=2 || die
-		#strong tests
-		#./run/john --test=1 --verbosity=2 || die
-	#fi
-	ewarn "When built systemwide, john can't run tests without reading files in /etc."
-	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
-}
-
-src_install() {
-	# Executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -mr "${ED}/usr/sbin/john"
-
-	# grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3
-	local s
-	for s in \
-		unshadow unafs undrop unique ssh2john putty2john pfx2john keepass2john keyring2john \
-		zip2john gpg2john rar2john racf2john keychain2john kwallet2john pwsafe2john dmg2john \
-		hccap2john base64conv truecrypt_volume2john keystore2john
-	do
-		dosym john /usr/sbin/${s}
-	done
-
-	# Scripts
-	exeinto /usr/share/john
-	doexe run/*.pl
-	doexe run/*.py
-	cd run || die
-
-	local s
-	for s in *.pl *.py; do
-		dosym ../share/john/${s} /usr/bin/${s}
-	done
-	cd .. || die
-
-	if use opencl; then
-		insinto /etc/john
-		doins -r run/opencl
-	fi
-
-	# Config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-	doins -r run/rules run/ztex
-
-	# dDocumentation
-	rm -f doc/README || die
-	dodoc -r README.md doc/*
-}
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
new file mode 100644
index 000000000000..37c73b4c41d9
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs pax-utils
+
+DESCRIPTION="Fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+MY_PN="JohnTheRipper"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git"
+	inherit git-r3
+else
+	JUMBO="jumbo-1.1"
+	MY_PV="${PV}-${JUMBO}"
+	MY_P="john-${MY_PV}"
+	HASH_COMMIT="5d0c85f16f96ca7b6dd06640e95a5801081d6e20"
+
+	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/john-${HASH_COMMIT}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags kerberos mpi opencl openmp pcap"
+
+DEPEND=">=dev-libs/openssl-1.0.1:=
+	virtual/libcrypt:=
+	mpi? ( virtual/mpi )
+	opencl? ( virtual/opencl )
+	kerberos? ( virtual/krb5 )
+	pcap? ( net-libs/libpcap )
+	dev-libs/gmp:=
+	sys-libs/zlib
+	app-arch/bzip2"
+# Missing (unpackaged):
+# - Digest::Haval256
+# - Digest::x
+# See bug #777369.
+RDEPEND="${DEPEND}
+	dev-perl/Digest-MD2
+	virtual/perl-Digest-MD5
+	dev-perl/Digest-SHA3
+	dev-perl/Digest-GOST
+	!app-crypt/johntheripper"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-bashism.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	cd src || die
+	eautoreconf
+
+	sed -i 's#$prefix/share/john#/etc/john#' configure || die
+}
+
+src_configure() {
+	cd src || die
+
+	use custom-cflags || strip-flags
+
+	econf \
+		--enable-pkg-config \
+		--disable-native-march \
+		--disable-native-tests \
+		--disable-rexgen \
+		--with-openssl \
+		--with-systemwide \
+		$(use_enable mpi) \
+		$(use_enable opencl) \
+		$(use_enable openmp) \
+		$(use_enable pcap)
+}
+
+src_compile() {
+	# Uses default LD=$(CC) but if the user's set LD, it'll call it
+	# bug #729432.
+	emake LD="$(tc-getCC)" -C src
+}
+
+#src_test() {
+#	pax-mark -mr run/john
+
+	#if use opencl; then
+		# GPU tests fail in portage, so run cpu only tests
+	#	./run/john --device=cpu --test=0 --verbosity=2 || die
+	#else
+		# Weak tests
+		#./run/john --test=0 --verbosity=2 || die
+		# Strong tests
+		#./run/john --test=1 --verbosity=2 || die
+	#fi
+
+#	ewarn "When built systemwide, john can't run tests without reading files in /etc."
+#	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
+#}
+
+src_install() {
+	# Executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -mr "${ED}/usr/sbin/john"
+
+	# grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3
+	local s
+	for s in \
+		unshadow unafs undrop unique ssh2john putty2john pfx2john keepass2john keyring2john \
+		zip2john gpg2john rar2john racf2john keychain2john kwallet2john pwsafe2john dmg2john \
+		hccap2john base64conv truecrypt_volume2john keystore2john
+	do
+		dosym john /usr/sbin/${s}
+	done
+
+	# Scripts
+	exeinto /usr/share/john
+	doexe run/*.pl
+	doexe run/*.py
+	insinto /usr/share/john
+	doins -r run/lib
+	cd run || die
+
+	local s
+	for s in *.pl *.py; do
+		dosym ../share/john/${s} /usr/bin/${s}
+	done
+	cd .. || die
+
+	if use opencl; then
+		insinto /etc/john
+		doins -r run/opencl
+	fi
+
+	# Config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+	doins -r run/rules run/ztex
+
+	# Documentation
+	rm -f doc/README || die
+	dodoc -r README.md doc/*
+}
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
deleted file mode 100644
index 5143d68af9a3..000000000000
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs pax-utils
-
-DESCRIPTION="Fast password cracker"
-HOMEPAGE="http://www.openwall.com/john/"
-
-MY_PN="JohnTheRipper"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git"
-	inherit git-r3
-else
-	JUMBO="jumbo-1.1"
-	MY_PV="${PV}-${JUMBO}"
-	MY_P="john-${MY_PV}"
-	HASH_COMMIT="5d0c85f16f96ca7b6dd06640e95a5801081d6e20"
-
-	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/john-${HASH_COMMIT}"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="custom-cflags kerberos mpi opencl openmp pcap"
-
-DEPEND=">=dev-libs/openssl-1.0.1:=
-	virtual/libcrypt:=
-	mpi? ( virtual/mpi )
-	opencl? ( virtual/opencl )
-	kerberos? ( virtual/krb5 )
-	pcap? ( net-libs/libpcap )
-	dev-libs/gmp:=
-	sys-libs/zlib
-	app-arch/bzip2"
-# Missing (unpackaged):
-# - Digest::Haval256
-# - Digest::x
-# See bug #777369.
-RDEPEND="${DEPEND}
-	dev-perl/Digest-MD2
-	virtual/perl-Digest-MD5
-	dev-perl/Digest-SHA3
-	dev-perl/Digest-GOST
-	!app-crypt/johntheripper"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-bashism.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	cd src || die
-	eautoreconf
-
-	sed -i 's#$prefix/share/john#/etc/john#' configure || die
-}
-
-src_configure() {
-	cd src || die
-
-	use custom-cflags || strip-flags
-
-	econf \
-		--enable-pkg-config \
-		--disable-native-march \
-		--disable-native-tests \
-		--disable-rexgen \
-		--with-openssl \
-		--with-systemwide \
-		$(use_enable mpi) \
-		$(use_enable opencl) \
-		$(use_enable openmp) \
-		$(use_enable pcap)
-}
-
-src_compile() {
-	# Uses default LD=$(CC) but if the user's set LD, it'll call it
-	# bug #729432.
-	emake LD="$(tc-getCC)" -C src
-}
-
-src_test() {
-	pax-mark -mr run/john
-
-	#if use opencl; then
-		# GPU tests fail in portage, so run cpu only tests
-	#	./run/john --device=cpu --test=0 --verbosity=2 || die
-	#else
-		# Weak tests
-		#./run/john --test=0 --verbosity=2 || die
-		# Strong tests
-		#./run/john --test=1 --verbosity=2 || die
-	#fi
-
-	ewarn "When built systemwide, john can't run tests without reading files in /etc."
-	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
-}
-
-src_install() {
-	# Executables
-	dosbin run/john
-	newsbin run/mailer john-mailer
-
-	pax-mark -mr "${ED}/usr/sbin/john"
-
-	# grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3
-	local s
-	for s in \
-		unshadow unafs undrop unique ssh2john putty2john pfx2john keepass2john keyring2john \
-		zip2john gpg2john rar2john racf2john keychain2john kwallet2john pwsafe2john dmg2john \
-		hccap2john base64conv truecrypt_volume2john keystore2john
-	do
-		dosym john /usr/sbin/${s}
-	done
-
-	# Scripts
-	exeinto /usr/share/john
-	doexe run/*.pl
-	doexe run/*.py
-	cd run || die
-
-	local s
-	for s in *.pl *.py; do
-		dosym ../share/john/${s} /usr/bin/${s}
-	done
-	cd .. || die
-
-	if use opencl; then
-		insinto /etc/john
-		doins -r run/opencl
-	fi
-
-	# Config files
-	insinto /etc/john
-	doins run/*.chr run/password.lst
-	doins run/*.conf
-	doins -r run/rules run/ztex
-
-	# Documentation
-	rm -f doc/README || die
-	dodoc -r README.md doc/*
-}
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index 0b2c68d044c4..65429e87891e 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -90,8 +90,8 @@ src_compile() {
 	emake LD="$(tc-getCC)" -C src
 }
 
-src_test() {
-	pax-mark -mr run/john
+#src_test() {
+#	pax-mark -mr run/john
 
 	#if use opencl; then
 		# GPU tests fail in portage, so run cpu only tests
@@ -103,9 +103,9 @@ src_test() {
 		#./run/john --test=1 --verbosity=2 || die
 	#fi
 
-	ewarn "When built systemwide, john can't run tests without reading files in /etc."
-	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
-}
+#	ewarn "When built systemwide, john can't run tests without reading files in /etc."
+#	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
+#}
 
 src_install() {
 	# Executables
@@ -128,6 +128,8 @@ src_install() {
 	exeinto /usr/share/john
 	doexe run/*.pl
 	doexe run/*.py
+	insinto /usr/share/john
+	doins -r run/lib
 	cd run || die
 
 	local s
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 9a8abbcb9931..854164c63ec2 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/aspell-da/Manifest b/app-dicts/aspell-da/Manifest
index 76a147dbf7e3..eb74b954a8ba 100644
--- a/app-dicts/aspell-da/Manifest
+++ b/app-dicts/aspell-da/Manifest
@@ -1,5 +1,3 @@
-DIST aspell-da-4.0.tar.gz 4208911 BLAKE2B 828176450a1d6e5e2e9b07d16c785239a012fc8382d92fcddf6dec812abbf49048b2f1c15de6655e09d74d2f65cd1a43939b3bee8f036ccfdd441f66b5ea259e SHA512 bbc0c4cc0202f989770d84ac9b5ff688b4c8bf0fef7128c36e54c7e4d09e8233eeee986def9a5d75c05d2599eaf96db4be212f6dc758bd23f723f611bf545ba5
 DIST aspell-da-4.1.tar.gz 4239148 BLAKE2B 21c30ec4576b73964d434217eb0212bc2e15774b42d7b4cbc9be37ae97eef42eb66821e22690b2b1d72c91d0240f2152acd1383038426ab65c030bc7f74379f1 SHA512 88a3a60db9be45f3235d75db0f946a5d7da0c2cfcf847ad2672c7b0e243454dce56f5f37d0652c6f2b9aeb08edbbefb80c4f45c909e5ba33aec2714f83fac7c3
-EBUILD aspell-da-4.0.ebuild 448 BLAKE2B 122178a52be12fd9b2e9d3c9ed8c4e6f345c35b9dd4629d3483723e5e8a6cb0d2321af04035c7b614d0059e74aa66d97e9ecc8de016d7dc9fc71211ad81a59aa SHA512 e3a832d942be4ac23dde982a2aa59cba6d144ab2d13893f8c144e868c7287b72745465ae7327b3020438e305b16025ac2003ac92d74394903adad28dd9e7aad9
-EBUILD aspell-da-4.1.ebuild 455 BLAKE2B 22677c6069ea70d722417262460ce82baeaa228ef08baed2449c6aba65cbf108dcb5128ed452657fcab9ddbcbec8c08bdf3c24bfd9a277341e7a10153944ba55 SHA512 79ba6a15b5e6fd6b3afea99b5f69aa03708818acccdc92e51bd59f491c5f0b87a09161730d9523472b96182002ff27569258af60267e1312877b0e7e2635ad62
+EBUILD aspell-da-4.1.ebuild 448 BLAKE2B 122178a52be12fd9b2e9d3c9ed8c4e6f345c35b9dd4629d3483723e5e8a6cb0d2321af04035c7b614d0059e74aa66d97e9ecc8de016d7dc9fc71211ad81a59aa SHA512 e3a832d942be4ac23dde982a2aa59cba6d144ab2d13893f8c144e868c7287b72745465ae7327b3020438e305b16025ac2003ac92d74394903adad28dd9e7aad9
 MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-da/aspell-da-4.0.ebuild b/app-dicts/aspell-da/aspell-da-4.0.ebuild
deleted file mode 100644
index bd50dd9f1db9..000000000000
--- a/app-dicts/aspell-da/aspell-da-4.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ASPELL_LANG="Danish"
-
-inherit aspell-dict-r1
-
-HOMEPAGE="https://github.com/mortenivar/aspell-da"
-SRC_URI="https://github.com/mortenivar/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos"
diff --git a/app-dicts/aspell-da/aspell-da-4.1.ebuild b/app-dicts/aspell-da/aspell-da-4.1.ebuild
index 26c8f5f9d04d..bd50dd9f1db9 100644
--- a/app-dicts/aspell-da/aspell-da-4.1.ebuild
+++ b/app-dicts/aspell-da/aspell-da-4.1.ebuild
@@ -12,4 +12,4 @@ SRC_URI="https://github.com/mortenivar/${PN}/archive/refs/tags/${PV}.tar.gz -> $
 S="${WORKDIR}/${P}"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 9ea77115fc00..525a00588fbd 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 2687037897b2..7605aef94e09 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,8 +1,11 @@
 AUX ghostscript-gpl-9.55.0-no-force-libstdcxx.patch 307 BLAKE2B 6476fd5635a6eae5c2a8ac680ce00214524d7c62e8c5ff331145f3b7cbcc5e1ad2e3486d5abbe8388dcdbb1712315df6e7b5c0f328657d0baecb012843cdeeee SHA512 4b62991bd456ddb2f0a974f41c842ef9afa5912cf8f53275bafe08ec9168a85a4720c02d0f3d843b31f2956a0c65cb86ed7ee5085fc0426ae1ea299b2e2c400b
+DIST ghostscript-10.0.0.tar.xz 62749144 BLAKE2B 10b962d358994506b69aba34827ea9d6a86c61e5093d7371b8350ff29a74b1db4816d0a62ff64f5d0e5a652fcd0304224c6236d33e717299789dfb2c9f350e24 SHA512 660252841e9b24c411bc92d0eb104de464686131e70051f60108db1a6ecfe2ada2ccacbeed8f2ac84bf69338ad75c850e814c9ac4e0351943f9989d66b3b082d
 DIST ghostscript-9.55.0.tar.xz 67417724 BLAKE2B 87827856aa60c2c4a4ed209bc4203a837107df0404af036a48e5baa23fccfc945a97fe328a80b15c7357fc71acb82721d4b96e5f726d8c9d836fee031916aef7 SHA512 42c7e05ba72e9fdd626c5412187b13fc3c9459cae57dfe49ddd3011bf4e2cbd10bc88f09068a9f777c2ec6ae881cd737fd700ab62ec5108f2aca69152588f38e
 DIST ghostscript-9.56.1.tar.xz 62589232 BLAKE2B c0457c98e3f13047d9015d9d1415e2935e142d172aa8c560e68250a4110ccb52167988af70e63d86fc3f462a5d521ac45f7b758cb8d1492670930d9b2dc2e196 SHA512 fe5a5103c081dd87cf8b3e0bbbd0df004c0e4e04e41bded7c70372916e6e26249a0e8fa434b561292964c5f3820ee6c60ef1557827a6efb5676012ccb73ded85
+DIST ghostscript-gpl-10.0-patches.tar.xz 2980 BLAKE2B e2c20195b153bf45f374e84d91a4df1885a3696f4061340a0a2ac5f586b9723b45eade343ad0e5760e66616624b5f7dad82d62747040493d7ca40c13329b2df2 SHA512 dac26d7f75bbdc2a56891db7d607c2120717fdf8b1cd55c53ed3be09de3e0a62338585f4dac74496d634ce03ecb2212f386187e72b5e6b59debf8d07694e0c83
 DIST ghostscript-gpl-9.55-patchset-01.tar.xz 2940 BLAKE2B 450498f0bd191d5936de1c2bdff659f075c39f7f7fefaf85b438f51967c4a8c294c6c887b36d5c0429d3677fb06e171e77da4b81ec911efea96df5b107d489dc SHA512 87411e68a078f77171128392962a9cd7a639bf6082447c658a50017cbf3f4e3ebce63af46eb9befdf2c1317de3a7a17e389f4de6e3aeae83d519b1c7b36de3c8
 DIST ghostscript-gpl-9.56.1-patchset-01.tar.xz 2960 BLAKE2B c43f00dce6d1aada40c8e628a1032afe1bf9789b3ad69d9dac2ae94ba040a380c01884173f0ec05ba59240421dc5a53cae45adbbb13dccc9c366b1a6dea7794f SHA512 a444c687ab0f2c3f945f6854991799c2aeca3c410eba4bc53ad7bcc68b0ba8d187c09baebabb6581144781d35b4f2d4e29ff625ca55b0f640a033ba27e993f30
+EBUILD ghostscript-gpl-10.0.0.ebuild 5059 BLAKE2B 5defd15d00d94ec533c971c6e44fe2fa48ca0d8f2b6787cd15420222ee313283ada5c04a896251cafe325877415d89a3335f843d6ac3772b58dc603118ef088a SHA512 e1745848d00a19d6b5bc53f7c399e062a85d7d238658112b65764f0f958d57f39b463337669f05a41f72c79c02fe6188f530931273ded429771e6072e8652559
 EBUILD ghostscript-gpl-9.55.0-r2.ebuild 5160 BLAKE2B 3a0c5c1e5652b34ce81b381532fc10116ac320f4ba83607f25ba4935f4de72e98a4bc038bd89189da8a59c913775fc1c6377afd0523332c0642a26d40db652cb SHA512 b7318f81333290182e3f1d190c62580eee1c2552ba97433c3caace56565a06d9a0782cf984f940d58f47981c5ed3ddddcfeaf69ec1c456f93ed9171a7ab63445
-EBUILD ghostscript-gpl-9.56.1-r2.ebuild 5138 BLAKE2B 770713367daec1d61666bbe1cb4c33892b8f9a6d174850aa1b66b180367fedae29b2c0044728dc2fba4904a00dcc77437f62577ab972438c8340b355340a7bbd SHA512 e8132f2edb417c090f55d8361d36fca76dc1fa35c0c98ece110706899c3ab449ba15245acf92679a4fc5a25110dea3a8808e7261411b0e096dd46af7e08e4424
+EBUILD ghostscript-gpl-9.56.1-r3.ebuild 5138 BLAKE2B e7f0bb55c6d8d5e653e120cff13720c26e3aab25af387e2b8c7b2b4d75af4bf40e390f62a5d1c6a437a63f16a7defb23693a18ea9907979fa6e7d33cb26c6ffd SHA512 41e3e03cb6f0d9ef90d0785c9add1125615effb883a7361e4f9fb1aba51a150ef86d47ec5c510a1b70e4ee3e61dc2f36a1b9e9cb8d71a2ff0412ea4c9a2b89f7
 MISC metadata.xml 767 BLAKE2B ff690e8acf31dc71da9c563b45316398d4dd74c2c7690df1a2ad0148ac459aead548ac0ed8e203fe8f6d1a375a91807d08d5c053c702f1551a2f32b66444ae74 SHA512 3edb3742706b1cb89ea09428ddcab3959d6dd435e92957cd2982e074acd449560e5abf41af29029593fff280ca02ad909ec05fd83e0d9fc690f5a9227804f3b9
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.0.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.0.0.ebuild
new file mode 100644
index 000000000000..131bd53e91c0
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.0.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+# Use https://gitweb.gentoo.org/proj/codec/ghostscript-gpl-patches.git/ for patches
+# See 'index' branch for README
+MY_PATCHSET="ghostscript-gpl-10.0-patches.tar.xz"
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary"
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+if [[ -n "${MY_PATCHSET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}"
+fi
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cups dbus gtk l10n_de static-libs unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="app-text/libpaper:=
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	>=media-libs/jbig2dec-0.19:=
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/openjpeg-2.1.0:2=
+	>=media-libs/tiff-4.0.1:=
+	>=sys-libs/zlib-1.2.7
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( x11-libs/gtk+:3 )
+	unicode? ( net-dns/libidn:= )
+	X? ( x11-libs/libXt x11-libs/libXext )"
+BDEPEND="virtual/pkgconfig"
+# bug #844115 for newer poppler-data dep
+RDEPEND="${DEPEND}
+	>=app-text/poppler-data-0.4.11-r2
+	>=media-fonts/urw-fonts-2.4.9
+	l10n_ja? ( media-fonts/kochi-substitute )
+	l10n_ko? ( media-fonts/baekmuk-fonts )
+	l10n_zh-CN? ( media-fonts/arphicfonts )
+	l10n_zh-TW? ( media-fonts/arphicfonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if [[ -n ${MY_PATCHSET} ]] ; then
+		# apply various patches, many borrowed from Fedora
+		# https://src.fedoraproject.org/rpms/ghostscript
+		# and Debian
+		# https://salsa.debian.org/printing-team/ghostscript/-/tree/debian/latest/debian/patches
+		eapply "${WORKDIR}"/${MY_PATCHSET%%.tar*}
+	fi
+
+	default
+
+	# Remove internal copies of various libraries
+	rm -r cups/libs || die
+	rm -r freetype || die
+	rm -r jbig2dec || die
+	rm -r jpeg || die
+	rm -r lcms2mt || die
+	rm -r libpng || die
+	rm -r tiff || die
+	rm -r zlib || die
+	rm -r openjpeg || die
+	# Remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -r Resource/CMap || die
+
+	if ! use gtk ; then
+		sed -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			-i base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		-i configure.ac || die
+	# Some files depend on zlib.h directly.  Redirect them. #573248
+	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
+	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+	sed -e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		-i base/lib.mak || die
+
+	# Search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		-i Makefile.in base/*.mak || die "sed failed"
+
+	# Remove incorrect symlink, bug 590384
+	rm ijs/ltmain.sh || die
+	eautoreconf
+
+	cd ijs || die
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		"${EPREFIX}"/usr/share/fonts/urw-fonts \
+		"${EPREFIX}"/usr/share/fonts/Type1 \
+		"${EPREFIX}"/usr/share/fonts
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
+	done
+
+	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--with-system-libtiff \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with X x) \
+		DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd ijs || die
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake DESTDIR="${D}" install
+
+	# Install the CMaps from poppler-data properly, bug #409361
+	dosym -r /usr/share/poppler/cMaps /usr/share/ghostscript/${PV}/Resource/CMap
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if ! use l10n_de; then
+		rm -r "${ED}"/usr/share/man/de || die
+	fi
+}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r2.ebuild
deleted file mode 100644
index 5cca16a3a74c..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r2.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-MY_PN=${PN/-gpl}
-MY_P="${MY_PN}-${PV/_}"
-PVM=$(ver_cut 1-2)
-PVM_S=$(ver_rs 1-2 "")
-
-# Use https://gitweb.gentoo.org/proj/codec/ghostscript-gpl-patches.git/ for patches
-# See 'index' branch for README
-MY_PATCHSET="ghostscript-gpl-9.56.1-patchset-01.tar.xz"
-
-DESCRIPTION="Interpreter for the PostScript language and PDF"
-HOMEPAGE="https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary"
-SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
-if [[ -n "${MY_PATCHSET}" ]] ; then
-	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}"
-	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
-fi
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cups dbus gtk l10n_de static-libs unicode X"
-
-LANGS="ja ko zh-CN zh-TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-DEPEND="app-text/libpaper:=
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.9:2=
-	>=media-libs/jbig2dec-0.19:=
-	>=media-libs/lcms-2.6:2
-	>=media-libs/libpng-1.6.2:=
-	media-libs/libjpeg-turbo:=
-	>=media-libs/openjpeg-2.1.0:2=
-	>=media-libs/tiff-4.0.1:=
-	>=sys-libs/zlib-1.2.7
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	gtk? ( x11-libs/gtk+:3 )
-	unicode? ( net-dns/libidn:= )
-	X? ( x11-libs/libXt x11-libs/libXext )"
-BDEPEND="virtual/pkgconfig"
-# bug #844115 for newer poppler-data dep
-RDEPEND="${DEPEND}
-	>=app-text/poppler-data-0.4.11-r1
-	>=media-fonts/urw-fonts-2.4.9
-	l10n_ja? ( media-fonts/kochi-substitute )
-	l10n_ko? ( media-fonts/baekmuk-fonts )
-	l10n_zh-CN? ( media-fonts/arphicfonts )
-	l10n_zh-TW? ( media-fonts/arphicfonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if [[ -n "${MY_PATCHSET}" ]] ; then
-		# apply various patches, many borrowed from Fedora
-		# https://src.fedoraproject.org/rpms/ghostscript
-		# and Debian
-		# https://salsa.debian.org/printing-team/ghostscript/-/tree/debian/latest/debian/patches
-		eapply "${WORKDIR}/patches/"*.patch
-	fi
-
-	default
-
-	# remove internal copies of various libraries
-	rm -r cups/libs || die
-	rm -r freetype || die
-	rm -r jbig2dec || die
-	rm -r jpeg || die
-	rm -r lcms2mt || die
-	rm -r libpng || die
-	rm -r tiff || die
-	rm -r zlib || die
-	rm -r openjpeg || die
-	# remove internal CMaps (CMaps from poppler-data are used instead)
-	rm -r Resource/CMap || die
-
-	if ! use gtk ; then
-		sed -e "s:\$(GSSOX)::" \
-			-e "s:.*\$(GSSOX_XENAME)$::" \
-			-i base/unix-dll.mak || die "sed failed"
-	fi
-
-	# Force the include dirs to a neutral location.
-	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
-		-i configure.ac || die
-	# Some files depend on zlib.h directly.  Redirect them. #573248
-	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
-	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
-	sed -e '/^zlib_h/s:=.*:=:' \
-		-e 's|-DOPJ_STATIC ||' \
-		-i base/lib.mak || die
-
-	# search path fix
-	# put LDFLAGS after BINDIR, bug #383447
-	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \
-		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
-		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
-		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
-		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
-		-i Makefile.in base/*.mak || die "sed failed"
-
-	# remove incorrect symlink, bug 590384
-	rm ijs/ltmain.sh || die
-	eautoreconf
-
-	cd ijs || die
-	eautoreconf
-}
-
-src_configure() {
-	local FONTPATH
-	for path in \
-		"${EPREFIX}"/usr/share/fonts/urw-fonts \
-		"${EPREFIX}"/usr/share/fonts/Type1 \
-		"${EPREFIX}"/usr/share/fonts
-	do
-		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
-	done
-
-	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
-	econf \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--enable-openjpeg \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--with-system-libtiff \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups pdftoraster) \
-		$(use_with unicode libidn) \
-		$(use_with X x) \
-		DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
-
-	cd "${S}/ijs" || die
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake so all
-
-	cd ijs || die
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-so install
-
-	# move gsc to gs, bug #343447
-	# gsc collides with gambit, bug #253064
-	mv -f "${ED}"/usr/bin/{gsc,gs} || die
-
-	cd "${S}/ijs" || die
-	emake DESTDIR="${D}" install
-
-	# install the CMaps from poppler-data properly, bug #409361
-	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PV}/Resource/CMap"
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	if ! use l10n_de; then
-		rm -r "${ED}"/usr/share/man/de || die
-	fi
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r3.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r3.ebuild
new file mode 100644
index 000000000000..e98a9f07ffc2
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-r3.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+# Use https://gitweb.gentoo.org/proj/codec/ghostscript-gpl-patches.git/ for patches
+# See 'index' branch for README
+MY_PATCHSET="ghostscript-gpl-9.56.1-patchset-01.tar.xz"
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary"
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+if [[ -n "${MY_PATCHSET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}"
+	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
+fi
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cups dbus gtk l10n_de static-libs unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="app-text/libpaper:=
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	>=media-libs/jbig2dec-0.19:=
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/openjpeg-2.1.0:2=
+	>=media-libs/tiff-4.0.1:=
+	>=sys-libs/zlib-1.2.7
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( x11-libs/gtk+:3 )
+	unicode? ( net-dns/libidn:= )
+	X? ( x11-libs/libXt x11-libs/libXext )"
+BDEPEND="virtual/pkgconfig"
+# bug #844115 for newer poppler-data dep
+RDEPEND="${DEPEND}
+	>=app-text/poppler-data-0.4.11-r2
+	>=media-fonts/urw-fonts-2.4.9
+	l10n_ja? ( media-fonts/kochi-substitute )
+	l10n_ko? ( media-fonts/baekmuk-fonts )
+	l10n_zh-CN? ( media-fonts/arphicfonts )
+	l10n_zh-TW? ( media-fonts/arphicfonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if [[ -n "${MY_PATCHSET}" ]] ; then
+		# apply various patches, many borrowed from Fedora
+		# https://src.fedoraproject.org/rpms/ghostscript
+		# and Debian
+		# https://salsa.debian.org/printing-team/ghostscript/-/tree/debian/latest/debian/patches
+		eapply "${WORKDIR}/patches/"*.patch
+	fi
+
+	default
+
+	# remove internal copies of various libraries
+	rm -r cups/libs || die
+	rm -r freetype || die
+	rm -r jbig2dec || die
+	rm -r jpeg || die
+	rm -r lcms2mt || die
+	rm -r libpng || die
+	rm -r tiff || die
+	rm -r zlib || die
+	rm -r openjpeg || die
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -r Resource/CMap || die
+
+	if ! use gtk ; then
+		sed -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			-i base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		-i configure.ac || die
+	# Some files depend on zlib.h directly.  Redirect them. #573248
+	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
+	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+	sed -e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		-i base/lib.mak || die
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		-i Makefile.in base/*.mak || die "sed failed"
+
+	# remove incorrect symlink, bug 590384
+	rm ijs/ltmain.sh || die
+	eautoreconf
+
+	cd ijs || die
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		"${EPREFIX}"/usr/share/fonts/urw-fonts \
+		"${EPREFIX}"/usr/share/fonts/Type1 \
+		"${EPREFIX}"/usr/share/fonts
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
+	done
+
+	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--with-system-libtiff \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with X x) \
+		DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd ijs || die
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake DESTDIR="${D}" install
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PV}/Resource/CMap"
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if ! use l10n_de; then
+		rm -r "${ED}"/usr/share/man/de || die
+	fi
+}
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index c8c6eafb81f6..3f025f274a2a 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,5 +1,5 @@
-DIST poppler-data-0.4.11-extra.tar.xz 3092 BLAKE2B 37d54a15a3725d4fe8c78ac2cb18cb4cc43cc65929822b6e4ac5e17c70f97dd3f4b144c34b4cb1c2439e58d379a61b6b348bc93304a1b730a6e37dd304c763ad SHA512 639dd5467cb06cb417dc1b09ca9db1f7233f902a54220899be3199a1081b91c69ff063f133080175312098ac8078ab8e2c4c91c89b460e8b92e6192f18395531
+DIST poppler-data-0.4.11-2-extra.tar.xz 3124 BLAKE2B 8ae0cb7613d36e2ceddb77736b04a61353cf4bcd3ac74e6cc65e7ddf727b65b98aa57c31bc02782cd74318119f0577cb3b187c9192ee0bb47dc8666e908a919b SHA512 3e43bc37b1a9affe4fabf68c3ea3490cbae0892286b3fd01f60f2fd232da68bc863fe0b058821d7d2e4ac4d7427b0ab02f8374abeba2cad704d578a155f46885
 DIST poppler-data-0.4.11.tar.gz 4497282 BLAKE2B 01f0f9f3d933f45683a702c4d538d8fc59874512290f199b601c16f98f9b596ff249fbc992574d046931cc80f3685f94733248450d3a54f2f961951cdeda7c39 SHA512 a5b7ace28d1677e12f7500ab6345b277dc22cd48ace8d472c083933416879edf4da4efe8217b0e11f75a3387ed98d832fe50567884095b6c0e09ebd8802b0f32
-EBUILD poppler-data-0.4.11-r1.ebuild 1142 BLAKE2B 944b75db65a9767057a4947053a2ce9b51534b9d32eb5840a85bdabec921feeb61a519f2f09768e3db63ccc3962b1d5afe6295a813a064e0778de24619672c66 SHA512 d1b7117ceb94cd66d69e8d1726aebf6d6c86246a19fd77e735dffe0c8ad7d1f28d9d5f89b677c3c1b103f51d5e764ae07c07e30e21ea1f354d0385b9214e8c67
+EBUILD poppler-data-0.4.11-r2.ebuild 1144 BLAKE2B 39ea9433d1590b1b7c33e1ab6d5779ea2787af23c22e17ae22a2337b23ae39f6978dd4ec08b16cd0e6574a5d70a3299f32b3f544bcb9fd2f9d1b5eabdae72489 SHA512 8eea21ecf0c811366f8e0903d4f8c4d3cfa04ecadb2361ea1634db09bdb64f14aa1f2f612023d3750c5f6922b41efa968137f9e7e017d030a770b2c8c5311039
 EBUILD poppler-data-0.4.11.ebuild 736 BLAKE2B e83fee3787fa33200ea16589379bffef0d70fa06313197441ce7b409d24384c1bcfb2aaff17b0ffe034ae0c6c03354ef67c4d6b168d92474b08da47cf8228e67 SHA512 d14cb205804c76b6f8faa8cb0bfbfff01b53e9195595ebbddfd57a7e632e05e89904f0a95b8d6801172289048ed3c6e38162ab9306574ad51a66f137af6a3757
 MISC metadata.xml 256 BLAKE2B 16ea76357721c3ab7d672ade29d27338ddf9da983571e4ca4efe2520c741fc71315d9609b711850b00c19ed4eea848dea0d5b3955eecb401c42c4db257c300bf SHA512 2748afab7ffea0b3ddadf72dc720f7d83a1d76453fa569091abffe834ec187144a47f9365ccb4a97f676dbcfd799a6be92671f283b179fe4589d95486d7fd24d
diff --git a/app-text/poppler-data/poppler-data-0.4.11-r1.ebuild b/app-text/poppler-data/poppler-data-0.4.11-r1.ebuild
deleted file mode 100644
index c65bde103305..000000000000
--- a/app-text/poppler-data/poppler-data-0.4.11-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-POPPLER_DATA_EXTRA_VERSION="0.4.11"
-DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
-HOMEPAGE="https://poppler.freedesktop.org/"
-SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra.tar.xz"
-
-# AGPL-3+ for the extra files needed by ghostscript, bug #844115
-LICENSE="AGPL-3+ BSD GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-src_install() {
-	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
-
-	# We need to include extra cMaps for ghostscript, bug #844115
-	cp "${WORKDIR}"/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra/Identity-* "${ED}"/usr/share/poppler/cMap || die
-
-	# bug #409361
-	dodir /usr/share/poppler/cMaps
-	cd "${ED}"/usr/share/poppler/cMaps || die
-	find ../cMap -type f -exec ln -s {} . \; || die
-}
diff --git a/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild b/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild
new file mode 100644
index 000000000000..3d7a975e6b0e
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.11-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+POPPLER_DATA_EXTRA_VERSION="0.4.11-2"
+DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
+HOMEPAGE="https://poppler.freedesktop.org/"
+SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra.tar.xz"
+
+# AGPL-3+ for the extra files needed by ghostscript, bug #844115
+LICENSE="AGPL-3+ BSD GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+src_install() {
+	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
+
+	# We need to include extra cMaps for ghostscript, bug #844115
+	cp "${WORKDIR}"/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra/Identity-* "${ED}"/usr/share/poppler/cMap || die
+
+	# bug #409361
+	dodir /usr/share/poppler/cMaps
+	cd "${ED}"/usr/share/poppler/cMaps || die
+	find ../cMap -type f -exec ln -s {} . \; || die
+}
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 8e91c672da63..01db16f20b51 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -4,7 +4,10 @@ DIST qpdf-11.0.0-doc.zip 7049971 BLAKE2B 25191511e4327d99eab8bcd08b1db3a16c52898
 DIST qpdf-11.0.0.tar.gz 18452218 BLAKE2B bb1dabae56f6ef5ca635ec7a0434387294ff6b6150ed19335243ac8774f4ecb57a7f97b00ef07c0c4f3bdfd2b510b4699324f77405c2342162c37a7860313c56 SHA512 08f1f3cfb3bc1532d04da9a3453dee6c9b411020c0a1dfe112da1961dd4d6dc76d6e89d57cb00b3b8b0cf0848e9fd3032a16c3c591a89b5631d0badfb44ef234
 DIST qpdf-11.1.0-doc.zip 7053772 BLAKE2B 8e2d377fc40a8206567e82733125b4abf23f07d062e0416ed2f2d9349a3555188cba1b68737cfae8943bcda3b93effdd020548b45d257eb9845fe1b569394000 SHA512 300dca6495ff9770138b7166e584cff1f2d26c60f273030211a895cf0f0147124240c2f22e79fae4f66595b863e2ce9dcdd7e8144c8b64357bf9a9e9b92ca6ea
 DIST qpdf-11.1.0.tar.gz 18452386 BLAKE2B 1df1f148db3132073f5e504b0dc79f8029e7049b334591d5dbd0adb425964d2d97ae5e086a3cbfcd82c82b22491b7b8897db8c3f20dab35feac3657066c6a776 SHA512 4c4daf3e6ae40e57d0d099abb7c9e694b7bec0c6657ffa4dc084f295d57799b8a5cbe5827d346fcbb89fa88a84c4dbd9a5437cc649b617cd479231c9ecc3fb5a
+DIST qpdf-11.1.1-doc.zip 7062109 BLAKE2B f9ffa32efa3835427773ee6ef87985388722b868f5a6e9a6df23e5458c2fde049aadbc98dc6966c0b2268c7a264af07cb448f61e49e04b25d908f2bafe140469 SHA512 6e4b87abefedcaf1e3407d1630f9c6e796db64b3cdae25a9489d8f0b1d5c06673821436877c36f015d6a5d126feefda17bb246f0b8ea87c0617238254816f7c2
+DIST qpdf-11.1.1.tar.gz 18464793 BLAKE2B 66fa80b513bc5ef033a60011e34df1c6e9ac6a8b777ab1eb30aeddfa077827dcfe30f6ea5816ab0ec208840d4dc2b4e3823449378b5bc50073ae1d754fb124c4 SHA512 da7540152a82cbb853089afa2503ece04086513bab662171758f1e0e928ac09cc7c00e61470bd5ec5285d99ef586b59ad66d5ff90e9060b1361d837fe18cbc24
 EBUILD qpdf-10.6.3.ebuild 1855 BLAKE2B 3579d2303c15c8fc84a6bcb804986574f4a7e36f66e69b2411494c8106d6b1874e979809bf828b9a7af410494579da7fad762ff5df374abd0afbb105b7df6175 SHA512 2ceadd6b80689c2ae8a5ddd5e4960f441883005c61d3c6e18d52666421ac747330a6479485a606043e54f2530c8ab1426f6d1d554f7830bdd9d35dc7471f0077
 EBUILD qpdf-11.0.0.ebuild 1797 BLAKE2B 2e5c1be383b083e4d740340053dc6e82257dd96501006b7ec94e3050a484b5007a8fb8c33c38cf7081cb5b3dbcf249d43a2e61531c97cb62381982605ed4295a SHA512 7a6aa841b59f89d7ea46cf6f89cd299ac96c545235467f6f95f18c0bc4590e84ea9ccd821ca2604e13fb2be1704809e2efa403b7d5edf7737a5787268a25be4d
 EBUILD qpdf-11.1.0-r2.ebuild 1867 BLAKE2B c630eff1d313e5b120e219c24d8656f8971523ddc8b87a5e29e5e98daa70904c47da159077253aa1a6d28a7862c3ab9b62580656a79a25c3b9b11eec4a2bada7 SHA512 b096aedd6abf8d176783d591397bef30cc95fadc0239f423d75d72ab29d8fed2ce88c2ac45958b1d530acd89f59d685916aa3db468783661e8a34ba9ddf24ac6
+EBUILD qpdf-11.1.1.ebuild 1867 BLAKE2B c630eff1d313e5b120e219c24d8656f8971523ddc8b87a5e29e5e98daa70904c47da159077253aa1a6d28a7862c3ab9b62580656a79a25c3b9b11eec4a2bada7 SHA512 b096aedd6abf8d176783d591397bef30cc95fadc0239f423d75d72ab29d8fed2ce88c2ac45958b1d530acd89f59d685916aa3db468783661e8a34ba9ddf24ac6
 MISC metadata.xml 444 BLAKE2B 1febc86d8f85aff5ec02d910550aca3bde66111c3e7364b264db3fca10020ea9bc2887dc8283217e2cb8d05ba46c176a92993e0d418528cbe590771dccc49d90 SHA512 dde5e34ef0d6c65df8a2ca8d630182413800f4c10f4b9860ed752623b6f4864dd4969c757e06b2689c8c5da3377bfcc28ec223e531432add083cd4a68211ea1c
diff --git a/app-text/qpdf/qpdf-11.1.1.ebuild b/app-text/qpdf/qpdf-11.1.1.ebuild
new file mode 100644
index 000000000000..774c671b8246
--- /dev/null
+++ b/app-text/qpdf/qpdf-11.1.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake bash-completion-r1
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="https://qpdf.sourceforge.net/"
+# TODO: verify-sig
+SRC_URI="https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI+=" doc? ( https://github.com/qpdf/qpdf/releases/download/v${PV}/${P}-doc.zip )"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# Subslot for libqpdf soname version (just represent via major version)
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples gnutls ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl[tiff(+)]
+		media-libs/tiff
+		sys-apps/diffutils
+	)
+"
+BDEPEND="
+	dev-lang/perl
+	doc? ( app-arch/unzip )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	# Keep an eye on https://qpdf.readthedocs.io/en/stable/packaging.html.
+	local mycmakeargs=(
+		-DINSTALL_EXAMPLES=$(usex examples)
+
+		# Breaks install with USE=-doc in 11.0.0?
+		#-DINSTALL_MANUAL=ON
+	)
+
+	if use ssl ; then
+		local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
+		local crypto_provider_lowercase=${crypto_provider,,}
+		mycmakeargs+=(
+			-DDEFAULT_CRYPTO=${crypto_provider_lowercase}
+			-DREQUIRE_CRYPTO_${crypto_provider}=ON
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	if use doc ; then
+		mv "${WORKDIR}"/${P}-doc "${BUILD_DIR}"/manual/doc-dist || die
+	fi
+
+	cmake_src_install
+
+	# Completions
+	dobashcomp completions/bash/qpdf
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_qpdf
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 171c86e35286..422a37012803 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/intel-vc-intrinsics/Manifest b/dev-libs/intel-vc-intrinsics/Manifest
index f06b47806c9d..5833557f3044 100644
--- a/dev-libs/intel-vc-intrinsics/Manifest
+++ b/dev-libs/intel-vc-intrinsics/Manifest
@@ -1,5 +1,7 @@
 DIST intel-vc-intrinsics-0.4.2.tar.gz 136366 BLAKE2B 2f8b1a6ad8edb720f322668226224b23cc80c4a64b8ac300ff95a470e97f9af8e3317ddc45be668895e86b13074aab2d1846c2dd634f0466f39c9a77ec436851 SHA512 5312dbd06d4af5a4e18f99da867af4b7292daba92186c9de5208280dfe735b7563b73ac8f77f48f9d2f10f2a0d9654abf39c82cf07d829f568f41b3210af22d4
 DIST intel-vc-intrinsics-0.5.0.tar.gz 136657 BLAKE2B d1e946aa82713eaedb13e692045b9e765c50f226a87f7b909d1be1ffe93217af1fa0cdc80b0db752760b66eae5f7bc6ce29ba643af4a50b1013b9b1a3c00a614 SHA512 9204b4e2e0f860d1daf98872c897d98a00a0baeb069503d052464f47892b0fcb90c51f47c07f8fb3545f42ca688168924e829d84063da1894d72be3dff7a9e35
+DIST intel-vc-intrinsics-0.7.1.tar.gz 138162 BLAKE2B 6a3aa8dcec358dd2f19688a57e5efd267eb6fd208f21c0bbda12baae4b73b4a85462e930f06fb34d22fe15103af368e8763031b2ef668a677104c57231740ff4 SHA512 278c67e277c09a2a8f5d6aed77e4c7d7dfd7fc54f9e34b8fae2154641785b66eec298e02bffa84f8cf4d0824e0272f7fb659d0ea19d2a993b5c44bb2e6f5a076
 EBUILD intel-vc-intrinsics-0.4.2-r3.ebuild 796 BLAKE2B 8e38dd60228fe0e6ba004e9505a6c6eb9ee7915e172978499b1db53e54a278ad492151e67f9810ce5bf7c4e4d1ab5c53be15d26f566830d07de9b78ab479a529 SHA512 8e54167cbbb90a05fdf7c68b61f6a801d6e3582bb41154f888d51e9dbf04ec9dfa1f6cb0a07467521e30658eebc986a808e88d43875ab41da9f5437390758ca7
 EBUILD intel-vc-intrinsics-0.5.0-r2.ebuild 796 BLAKE2B 8e38dd60228fe0e6ba004e9505a6c6eb9ee7915e172978499b1db53e54a278ad492151e67f9810ce5bf7c4e4d1ab5c53be15d26f566830d07de9b78ab479a529 SHA512 8e54167cbbb90a05fdf7c68b61f6a801d6e3582bb41154f888d51e9dbf04ec9dfa1f6cb0a07467521e30658eebc986a808e88d43875ab41da9f5437390758ca7
+EBUILD intel-vc-intrinsics-0.7.1.ebuild 796 BLAKE2B 8e38dd60228fe0e6ba004e9505a6c6eb9ee7915e172978499b1db53e54a278ad492151e67f9810ce5bf7c4e4d1ab5c53be15d26f566830d07de9b78ab479a529 SHA512 8e54167cbbb90a05fdf7c68b61f6a801d6e3582bb41154f888d51e9dbf04ec9dfa1f6cb0a07467521e30658eebc986a808e88d43875ab41da9f5437390758ca7
 MISC metadata.xml 778 BLAKE2B 2e8e4d7f56f18f7e4eaa488cdab5d4578e779e8ac75fe96c3e7d5aeae5fc65291401d8ac54a0e89194c44a2146bca4cf9d321917bfab65a93f2118c688422cf4 SHA512 de2fc4d84a08fb98a41bb3e5f11d31535810e6f796aacaeacf784e1ed0fd7d99c5aa3a5e689fe22bbc7149518ea695979b4e66b6dd2b876e4cc9ad126564618c
diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.7.1.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.7.1.ebuild
new file mode 100644
index 000000000000..120d3968bcd9
--- /dev/null
+++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.7.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="13"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake llvm python-any-r1
+
+DESCRIPTION="A set of new intrinsics on top of core LLVM IR instructions"
+HOMEPAGE="https://github.com/intel/vc-intrinsics"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/libxml2:2=
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index cff5cf29a9fb..c5484bec1da6 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,5 +1,7 @@
 DIST libofx-0.10.3.tar.gz 225132 BLAKE2B 29dff4cb79a4a535bf255c787e184d103ecdbe975bb4bb223b675bbacaff9f8a228ae0a3dffe7710c2707496ac65c4f48ce993243b8353172c53cb02067d9267 SHA512 6c024628a6a11d9542c669a438223331a033eb820b1a2c3001c60d1ab3fad45ccdec64f9b54dd206fe0058ead8e14e751eb7a3bd88e8f9e1013b0bdd5b6c5242
 DIST libofx-0.10.7.tar.gz 1420230 BLAKE2B 03a98fa3dc79519a7e84b5c0df1686ef523c2f2209caa4f4cb3e40f2cbac0172956cab107ef4086f0e13aea2898bdd36e7a56140874cbd8a2a88d5634ef988c2 SHA512 da96d24675cf681d007e3d4f7d83f4fc2ca56d991b4128f4e3a870fd66d70302950b24b1e17e78a9795d19704f1af7cd2102929b3290f27204499f42a24502a2
+DIST libofx-0.10.8.tar.gz 1477698 BLAKE2B d2d232845c251d8cf78b17bb40e8057cb4479a03939b5d2b2750e68a24524c07d2a66a636fdb930521d7872a234b4719190ad1a2a185444a3359bea48e3dc413 SHA512 24373066c4de27416452afc9924874b52e82452ca7681b9bad098c839057fc5e06c1d4b297818e68a25d75166e4898d7cc52c8db648a25c363a7f95934a4f7fa
 EBUILD libofx-0.10.3.ebuild 1160 BLAKE2B cdfce6873c28f88c8cdc17b8b640962f494a0ef20e9c02518099ae9498b54eefc103ddaacda063144f7bc28ad7a963fe53503ea8717bc2a02bbbadf3c7f68700 SHA512 da36e60cd6780ab8ce1df578cef553bfec2406e180ad3873098a5cbde535e4a40691ff80daa502f307644c7942e48bd5592758d50eec02a0680e1fa5b6479b7c
 EBUILD libofx-0.10.7.ebuild 990 BLAKE2B 8ca537b4aadb23799fafdba8c57aa4c0576219bcf6bb06f41d26ffb15666c2bff3a1ce0383d478c875ea15ba78cddf2cc006a82f85793c79d6ed7f854f6ac903 SHA512 efc48d240828f7a52daa3c434ee5cffa3f68a5e25afdc19a4c0a0c9a4d978795144249282e4272b148d50bba2a9fdf67c9465b395a9393c199bfc789321a8269
+EBUILD libofx-0.10.8.ebuild 990 BLAKE2B 8ca537b4aadb23799fafdba8c57aa4c0576219bcf6bb06f41d26ffb15666c2bff3a1ce0383d478c875ea15ba78cddf2cc006a82f85793c79d6ed7f854f6ac903 SHA512 efc48d240828f7a52daa3c434ee5cffa3f68a5e25afdc19a4c0a0c9a4d978795144249282e4272b148d50bba2a9fdf67c9465b395a9393c199bfc789321a8269
 MISC metadata.xml 297 BLAKE2B 819f3298f3f9a816e9630ebce9f8d163b5974cbd76a1e6bf5ad5c499a3e926b887c0396b6f1c8d13e765b3b37cce93188d15b2ff0bef52d98b7f9bb516225bbb SHA512 58f2ece0d8cb8ffb32fc849e42a49cd086c08a0dbd4e03ab78ec51a9224f3ce60c69acaa56712567ee4e1a4d87aabd7830d2a60af1a5669af7a9eb7b4ec4f046
diff --git a/dev-libs/libofx/libofx-0.10.8.ebuild b/dev-libs/libofx/libofx-0.10.8.ebuild
new file mode 100644
index 000000000000..87cfdff2482d
--- /dev/null
+++ b/dev-libs/libofx/libofx-0.10.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Library to support the Open Financial eXchange XML format"
+HOMEPAGE="https://github.com/libofx/libofx"
+SRC_URI="https://github.com/libofx/libofx/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/gengetopt
+	sys-apps/help2man
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( app-crypt/gnupg )
+"
+RDEPEND="
+	>app-text/opensp-1.5
+	app-text/openjade
+	>=dev-cpp/libxmlpp-2.40.1:2.6
+	>=net-misc/curl-7.9.7
+	virtual/libiconv
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	# bug #566456
+	append-cxxflags -std=c++14
+
+	econf $(use_enable doc html-docs)
+}
+
+src_compile() {
+	emake all $(usev doc)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.a' -type f -delete || die
+}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 43cefb3fb0d3..51c7ffcd2188 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 28b7198deae9..d3fa129d1aba 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,5 +1,5 @@
 DIST luaexpat-1.4.1.tar.gz 52159 BLAKE2B dd870d2d2db8bc1e399a306eff91138752f346f50ec1283a611c3ef42591e5176beab59aa96b87c772ba0320d98fc8a5907048e539cde6c14757e9a026aacc81 SHA512 fbc03287a237c13f395574ddf08a931ded0f457728b01bdc0a0533d212a0c908d74230be3c9e7f85a54ac244043cd853be3bf13d284185ad3e3ce6818d157635
 DIST luaexpat-1.5.0.tar.gz 53520 BLAKE2B 1793f842771e730022abf512731eece538b6edefd10786295842f467af3cbfbdc94e65ea035b1ce9bc849a1ee4f0ca445bd0b66816a6d18bb786d19ced6b3586 SHA512 0ac151148101d62f1358f5f310be57de5379891ceda76f0eb821a8b56d0d9c781feaf1db601d982339cd4837f9504b1f9b8b14ebf3a7245925473f6824bbc8b3
 EBUILD luaexpat-1.4.1.ebuild 1250 BLAKE2B 87a9e484ee1419e443200bd424823797c5274f9b828bdf03fce94958bf90c9c5d70bb2aa95f5ac43986ab683c2fccc2bcebb33cd7f6520a3eecbc76ae45e7f5f SHA512 2df41c44ea53cd1bce8eebf7dcd5e9a5196afeb3ce8def512724b75979a42d1e9a26cece19e032dd3192879c76232f3a1791e90eec00b6a1449e5bcef2d00388
-EBUILD luaexpat-1.5.0.ebuild 1257 BLAKE2B 3566ca5fc1e101daa7dcf146e52cdaa3a23b10d95126e4ce57ece79e8037afaae682f84f04509f63294a5adc838ec28ce86f8c970b26d68e5cb5a9a9c8c7c700 SHA512 20a12db581401cd4d8650a703ce220c6edf756cdc478ae20061b84e2a45be447660d0c840f1412c0b3ab86c67123c8b2ecfdbbd79cbfa0e6a514ea00236c6f5a
+EBUILD luaexpat-1.5.0.ebuild 1256 BLAKE2B 3da8e85ade1c48adfb4619eb42d8dfb9c500997c1d89ccca8341722b9a70a8f86165927290fe4b5c5b481ceea2d0c7afd2721d5072035b67d542c4efc10de3bd SHA512 513d4e57a2d38ef60926470934a47b974d8c8319fdfdbb3e48aa9d5d5dc6ddafb6eebf6e0e255aec038e023d03b55874a3058024f01558dd09fa4ccdfba1330b
 MISC metadata.xml 667 BLAKE2B 5efd48f296044b9a01c80274ca8fa4ccee0d03a2e6758020d98e123438c13074ec95de3635bbe9abe0838db6f7c65aed8b351b90d1f670ffc331cbf29299d2d7 SHA512 72f967617a90fe28048ab9c128d86daaf360c13333ed8a27eb5628d4f9c39b91f15213b1459631f3eb147429917bb1500047116b4a8c6a7c91f4002b1670bf31
diff --git a/dev-lua/luaexpat/luaexpat-1.5.0.ebuild b/dev-lua/luaexpat/luaexpat-1.5.0.ebuild
index b0c2791bf0e6..6bc0243c6c83 100644
--- a/dev-lua/luaexpat/luaexpat-1.5.0.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-lua/readline/Manifest b/dev-lua/readline/Manifest
index 3ea16641805c..e41f1c82aa9e 100644
--- a/dev-lua/readline/Manifest
+++ b/dev-lua/readline/Manifest
@@ -1,3 +1,5 @@
 DIST lua-readline-3.1.tar.gz 16114 BLAKE2B 372bc61573b20c8ebf66bb684624dde9d5ce7868543294450ef3d47bba5a042c5d7f4262366f2de2db8d3d92bbf7fb4895d29577af34307d7b145e6f913ec957 SHA512 d3bee61b6c876e96d2c1097e29862a3f16d1e666b1087e58899f59a3115f9af31793492edfcc3f3802565f98f276960d382a89c0b6cfb1d54acfd37ad006b74b
+DIST lua-readline-3.2.tar.gz 16215 BLAKE2B 889db8cfefc37008fac9f92b6ef071147763d00f01ca42b31646594e812ab936187e65e8959e723be409d21c3e3cc2d93fe52eafac79e37b7d0cec2216d8accf SHA512 d605b99f2fa06920e67125b462f257f8cd263912b6ffba173bee77425c77f6b08b463ec4c0851c81dfc23e736698c9fbbb40e8a935cada2329b6a8e02a6cdaad
 EBUILD readline-3.1.ebuild 1618 BLAKE2B b027dd645f14d7d36ef7eb4c903b1e6ffb112c506789b4880efe3d84329180d6553c2fdf449cc13fddb538de0a6430a30eb5ce890b5200e9b5c7bc74724e55d3 SHA512 5618f10cf58f52750252aba977b57a3ca993feb244eb9789d9740442a106448d593a7d3b3c932a8c41c8ff885e5a67afcbd4e202f9930e9a0fb8c8e07afa7739
+EBUILD readline-3.2.ebuild 1620 BLAKE2B c010b63f5c37b7864b60870170bca89d3ef52290ac9f21c2874642da0e563d2898dc2eec5253692be0b2c116f97e8a1d64940b003c61c93c274f9c20e590d7c9 SHA512 d6f18c32943bf9828d604d941648d08b7b22f865948a055350008f96e275bf69292ba34c592f5fae969d4882d223a0c2830fd70830a3226dc0feca47ad03c364
 MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
diff --git a/dev-lua/readline/readline-3.2.ebuild b/dev-lua/readline/readline-3.2.ebuild
new file mode 100644
index 000000000000..813f6f10ba3e
--- /dev/null
+++ b/dev-lua/readline/readline-3.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="A simple interface to the readline and history libraries"
+HOMEPAGE="https://pjb.com.au/comp/lua/readline.html"
+SRC_URI="https://pjb.com.au/comp/lua/${P}.tar.gz -> lua-${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+# Tests are interactive
+RESTRICT="test"
+
+RDEPEND="
+	dev-lua/luaposix
+	sys-libs/readline:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local compiler=(
+		"$(tc-getCC)"
+		"${CFLAGS}"
+		"-fPIC"
+		"$(lua_get_CFLAGS)"
+		"-c C-readline.c"
+		"-o C-readline.o"
+	)
+	einfo "${compiler[@]}"
+	${compiler[@]} || die
+
+	local linker=(
+		"$(tc-getCC)"
+		"-shared"
+		"${LDFLAGS}"
+		"$($(tc-getPKG_CONFIG) --libs readline)"
+		"-o C-readline.so"
+		"C-readline.o"
+	)
+	einfo "${linker[@]}"
+	${linker[@]} || die
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	pushd "${BUILD_DIR}" || die
+	LUA_CPATH="./?.so;${ESYSROOT}/usr/$(get_libdir)/lua/$(ver_cut 1-2 $(lua_get_version))/?.so" ${ELUA} test/test_rl.lua || die
+	popd || die
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	insinto "$(lua_get_cmod_dir)"
+	doins C-readline.so
+
+	insinto "$(lua_get_lmod_dir)"
+	doins readline.lua
+
+	popd || die
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	docinto html
+	dodoc doc/readline.html
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index abcbd6db0db4..bd392316b2dc 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/ppx_deriving_yojson/Manifest b/dev-ml/ppx_deriving_yojson/Manifest
index 19c0fb93b1b6..f549d46750c1 100644
--- a/dev-ml/ppx_deriving_yojson/Manifest
+++ b/dev-ml/ppx_deriving_yojson/Manifest
@@ -1,4 +1,4 @@
 AUX ppx_deriving_yojson-3.6.1-src_test_dune-ounit2.patch 251 BLAKE2B eb17ca6a958d9a5e763812d93d1c51cfeeb256bb7444a0a7f4349f3e0e830d605e024b17b5165dd01fae0ed78ae225783a936f91375120c55dee6092c187f823 SHA512 d1a5233ee7dde5367644277a9995e8a2127a8b672ffb384225dca7c0d708dd53e39596a0736213435a7c5e25d7589d367542e841c446805df9fdf4a0d2d21190
 DIST ppx_deriving_yojson-3.6.1.tar.gz 19477 BLAKE2B f7b4e34e1c5ca77af6dbe6f4639c00a3b47076e2cf1f79b157a4c8f9aef34ec0e95e2c6c805fe9d0f9fa0ec72ea0672696b7e7a21d0a7d93764fad2e8d89a15a SHA512 b1bf04f77e1c1a887352b21cfd43a67d37de9f61a70f89d06828c7d9611027711a600b22e4bbc95ab128511a48fce3ae1a1c7a655f25c4bb2b6944444cea4989
-EBUILD ppx_deriving_yojson-3.6.1.ebuild 635 BLAKE2B 42c5a5ad8d4f018780173b14c1c62d4340ba3cfbeffb342a928f908a2279c716c07850e026071143eac849b8187fd987cd781b202e7fb9da266cbd4d7d9b360d SHA512 1f6b8857d2cee27a702066ac731041134bbeac131bc47dced25e376b48b70df8ee9c20f51c86d654bb1a4b0e380824fd6609f0199695da0478ba7b06d9fd992c
+EBUILD ppx_deriving_yojson-3.6.1-r1.ebuild 628 BLAKE2B 3f767ce0353b293e506211cca3b70ce660695028339a04b0245e0e089ac6188d4afab09a98aab663f53f0c8b604bf3585cc8c4288fd84cbdfff6091c9a077a20 SHA512 942b457ec7c650475ccbbf2e6592f13493ad61c4228f0c8d5c5fca060b9cd6d41aa9410b378be1ad42fe1ec47361fb46905221cc7e9e6d7ca377e041aabd4784
 MISC metadata.xml 417 BLAKE2B 13cc573ade509da2ca964fc97824fe0ab1d8d5bf44e0192eb379c3354b3736bf2dbb7d888a0053d5a8fc3c244516565d1e517ce831e50f7c99c4a7648374776e SHA512 4c2c7a85baf1e7787f7284061aa0ddb8e9307a39543315345f72b44e889c44b713d4b3400d884a678784df174384a2cb4cf8b2e461f6db7c19d5264749fd9600
diff --git a/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1-r1.ebuild b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..fa923652fbc2
--- /dev/null
+++ b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="JSON codec generator for OCaml"
+HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving_yojson/"
+SRC_URI="https://github.com/ocaml-ppx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-ml/ppxlib-0.20.0:=
+	dev-ml/ppx_deriving:=
+	dev-ml/result:=
+	dev-ml/yojson:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-ml/ounit2 )"
+
+PATCHES=( "${FILESDIR}"/${PN}-${PV}-src_test_dune-ounit2.patch )
diff --git a/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1.ebuild b/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1.ebuild
deleted file mode 100644
index 33642a0ef4b8..000000000000
--- a/dev-ml/ppx_deriving_yojson/ppx_deriving_yojson-3.6.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="JSON codec generator for OCaml"
-HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving_yojson/"
-SRC_URI="https://github.com/ocaml-ppx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	<dev-ml/yojson-2.0.0:=
-	>=dev-ml/ppxlib-0.20.0:=
-	dev-ml/ppx_deriving:=
-	dev-ml/result:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-ml/ounit2 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-${PV}-src_test_dune-ounit2.patch )
diff --git a/dev-ml/re/Manifest b/dev-ml/re/Manifest
index 190d839416e5..bc3c98223264 100644
--- a/dev-ml/re/Manifest
+++ b/dev-ml/re/Manifest
@@ -3,6 +3,6 @@ DIST ocaml-re-1.10.3.tar.gz 90155 BLAKE2B 44f7779e2004c8ac24f6bf476edaea5f6469fd
 DIST ocaml-re-1.10.4.tar.gz 90379 BLAKE2B 411786bd89c712db0a7fba071abd303895621f0353b52e33dffeba146994cf145ea7f5199435d5b4c4738eedafa5bb00b430c92fe072f13fe455bb30a0b29998 SHA512 1bef38154f856b48985a0dfa975dc8539f146d0308d7c2af01078f5e998683fd635c7ae4a888e95c1a4dc4df9539dcd5dc506a5ef8718386cf0073947507f91a
 DIST ocaml-re-1.9.0.tar.gz 83642 BLAKE2B abcabb80ffef241fc7e8ea075f49365cc64f8749db1d1f7eb654eeb52f5be8e96756f98ae7903391a26d8537f82e105878a38a15923d7f93c61abd5c08d3ff98 SHA512 3e11c6eccf573ab5d7f43accf1f1ac9eda0d7320067e142b9f76b309315c1e30d22c5bb80c7a54b05d9c92d3518d26ea82b5093de9b48f86e3c62d6073f14eda
 EBUILD re-1.10.3.ebuild 622 BLAKE2B e6a938fc279d0e8c4f0a8935bdc01feb72f33cba5ef6830c656f01404acd782d09c56e6fca0fcd0878946598856b0825061e0f05c3a85b6f64a5905ace70260a SHA512 e056c146492c066d9daf8cc77b84e72e656070cd28f12121a30ca00d51134b9b835999b6d52bb616dd498aadb571b9ebd8b99e9fedbb86fdd5ce77d0ad59dc9f
-EBUILD re-1.10.4-r1.ebuild 656 BLAKE2B 7b2b373a1a85e5765f46817196d6c69ff40256d613783a7ca38570246326fcea7348c60df244997729c8a7541315ac20b37c67eaa0c66f10152b747b5076c679 SHA512 064356539f79a0f4414af510c60ef2285094508c089e4e6f5d26e81381ceda6e397a7d862cfaac0fa9a39dea953c119c1c1654e503a5b76eeda64006bf941436
+EBUILD re-1.10.4-r2.ebuild 661 BLAKE2B c81b34e32ad65ebe6fd80fe4e01af5b53e956b4671761d3c7a7dc34bb3c0eddd7106d29ad5a471fe40ee86124253fd473cd3f69b5764245fe6b7133265a0046e SHA512 9677bd9d8f07a070fd539d4e0599801f2da1e04ae44ee2fd5e86c31d5bc7a1e97279637fdb062d429c51aae925694033fc95e3f6736390b1b23d1d36a735b4ab
 EBUILD re-1.9.0.ebuild 610 BLAKE2B 27f97cbc040e5d8d5fb40a945124e757cf89d88599ccb5890f5bfb15d3261fef42314b924e7be64394ef5b8f92a43728a8cff29fd5462e68acbe580fd63d6f6a SHA512 9348d9961e5eeb67f5aa9261a1fea41185f77b135d419bd8fcf0dc508842b4fd244d63f5494ad06ce92ff07b458852ec108e09ca5520ff1cd9d71a1b7f05e268
 MISC metadata.xml 417 BLAKE2B f430469be32b652c280b3044cc455f267f494c8b92778971ca7e497996b9149cfa75e01829552cc5fca41734e8e3d17e7773f7a2484121b1b99a4632a20a075c SHA512 c19dce40e6ed1a36fd00a52ca0b9c85767d01fd7f48181b908b7c205da33032b65da4576f5e6829e925596e0ecca7b49555545aacf0744c3e151c4174a4d086a
diff --git a/dev-ml/re/re-1.10.4-r1.ebuild b/dev-ml/re/re-1.10.4-r1.ebuild
deleted file mode 100644
index ef5769c5cf65..000000000000
--- a/dev-ml/re/re-1.10.4-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Regular expression library for OCaml"
-HOMEPAGE="https://github.com/ocaml/ocaml-re"
-SRC_URI="https://github.com/ocaml/ocaml-re/archive/${PV}.tar.gz
-	-> ocaml-${P}.tar.gz"
-S="${WORKDIR}"/ocaml-${P}
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-ml/ocaml-re
-	>=dev-lang/ocaml-4.09
-	!dev-ml/seq
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-ml/ounit2 )"
-
-PATCHES=( "${FILESDIR}"/ounit2.patch )
diff --git a/dev-ml/re/re-1.10.4-r2.ebuild b/dev-ml/re/re-1.10.4-r2.ebuild
new file mode 100644
index 000000000000..6ce75a9f66cf
--- /dev/null
+++ b/dev-ml/re/re-1.10.4-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Regular expression library for OCaml"
+HOMEPAGE="https://github.com/ocaml/ocaml-re"
+SRC_URI="https://github.com/ocaml/ocaml-re/archive/${PV}.tar.gz
+	-> ocaml-${P}.tar.gz"
+S="${WORKDIR}"/ocaml-${P}
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!dev-ml/ocaml-re
+	!<dev-ml/seq-0.3
+	>=dev-lang/ocaml-4.09
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-ml/ounit2 )"
+
+PATCHES=( "${FILESDIR}"/ounit2.patch )
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a15b29e9b9cc..16fc42cfe997 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/contourpy/Manifest b/dev-python/contourpy/Manifest
index 74feb13e2537..45f6fd47d8ad 100644
--- a/dev-python/contourpy/Manifest
+++ b/dev-python/contourpy/Manifest
@@ -1,3 +1,3 @@
 DIST contourpy-1.0.5.gh.tar.gz 12153420 BLAKE2B 1b3899831938c114480606f0c2ef2962248721884cd2be727f2bd11d12d322e7652c7b63860f4c5d8bd039a7e838f3f360dd1af017219caa97dfc63d69ef7e19 SHA512 47dc08f02920cb0ffc081f313dd041fa36e2fd0a81530374ae77adc288af13cf2c526fc1f45d06ef1c256c4c8fe243e0b36b54d3fff7d4f8bd6f9f4938d3c805
-EBUILD contourpy-1.0.5.ebuild 1021 BLAKE2B 53dd2ded5bfe38ae40bce7666dbe7e1cb2efbfcca5755c55fe4022979a1651a33e6900a04d167f216af66ce53f91c98dca9bb397eb70f3f6e1dc038cfa263cb0 SHA512 54381f8543aba33c13765c538f4918f29ee01dcbd64666d3ef85b6820c79d90747f26dc374539ef851203e7e90546c649cdf20617182542cdd37837f86d18701
+EBUILD contourpy-1.0.5.ebuild 1028 BLAKE2B 18b4adec0c71c0faaec0e420b21493e0b90974bb399de3e183d2cc3d9157da90d4c89e8a0cbaf00aa3de5c24ab929078ca2ae9352b9f9239d6dd8ddbfbdd6dbe SHA512 3f2c36857b75931dc4756533b79e84124a2ac659feb003e9250626dac96a91f633edc7909a20aacf52a91b665be7b7204f1bcb07ca52626790688705ea62be77
 MISC metadata.xml 372 BLAKE2B de3d6cc9d8727bf43be63fdbb8aa2ad375667d189019e189be262e39d028acab98a21e200798c2d5c5c72521aa7d38202e3e235dd44de9b43a7dc9e045d50c47 SHA512 e692f94d805d7f56fc895a4c76dfbacf2f068d687b9191482b946445baa3bd0a685eda7a1b0aec2aaf9a02e6f23d87f0bf22d90f42e3c21d930724c635ff859a
diff --git a/dev-python/contourpy/contourpy-1.0.5.ebuild b/dev-python/contourpy/contourpy-1.0.5.ebuild
index 88d1abc961bc..e8d9091ceba9 100644
--- a/dev-python/contourpy/contourpy-1.0.5.ebuild
+++ b/dev-python/contourpy/contourpy-1.0.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~riscv"
+KEYWORDS="~alpha ~amd64 ~hppa ~riscv"
 
 RDEPEND="
 	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 0d0a499bf44d..63a948390997 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,5 +1,5 @@
 DIST gst-python-1.20.2.tar.xz 153428 BLAKE2B 051be5996530989b0e016662f4bf33ac01d576dff56ef779ae481f6f02143595cb3132b9a1ad56cd26f7de55c5df28d25cac448ef28f1b8595974f468252c6b5 SHA512 99af8bad76f930e6c11dcacac013ffe30670ad77259ebe96ee6059a9c359fd1a9c9b22188856f2f19f31469c152b3ad269ba821d06ef92f0c92b3b0fe0eac0d2
 DIST gst-python-1.20.3.tar.xz 155504 BLAKE2B 2991f106a53da6e968bdbf2b081c464e92902e4b5ed57e7a14ef1c1556ba18d2e63f4402e703953513f68c36405478b0da05f283602f564bec16cbe72b9e686f SHA512 987b444d78b5fb206457245b46b843db9372f9bd316abc57ecd8d50488ef734707a08ac88a9b9d58e2db113e67ce5b524aad82c0086471494c2177c2e272de6e
 EBUILD gst-python-1.20.2.ebuild 1631 BLAKE2B c365d5b9958e7f95f2c78e5e29b5d12589526b8e5be98c78e810872d8fe332250aed63e4e51ca25e45a9dc894c7d9151d762ec595848a064541af3eb78f9fed1 SHA512 4d82a2a5def91828763c71099eea382c407fd84d5dfc8b1c3eb76deaf5bc8563171f050d2db4fde2d830c64af94217fb489e7dfc87b0bbb97de1f1eddd23d3b4
-EBUILD gst-python-1.20.3.ebuild 1632 BLAKE2B 4469a070c62e4654a84e16f55c51a9e1121e6bedcbae10b5ce88b0349ba19cef83beb5a8358194fafcd46711392ceea2d0e06281c5c93a4607601badbb20b948 SHA512 cec0e235b510176e9f01ae065b3f78e4e2d13cc78201e5821b30caaae2c0b338815f62b5e65a6ef4da154005429108196216b5d74e0757176378d6838833ca9c
+EBUILD gst-python-1.20.3.ebuild 1632 BLAKE2B 12307974fead182631fafba6bb46bba652c39d4e256e97aa1fb502ace15cfb07ef84ed676212048e0c93d88e9ebd2cf10a3299f2f76e62464bb40cb73bd7c689 SHA512 59eaf8a7759cd07d207c039ca8f02abdd59d1f3c59970d47dea7ff575fb571f17c10d9bd8aa12cd345419534ed601e65830971d0f36d41ab549147e2a5ac975d
 MISC metadata.xml 267 BLAKE2B 331be70b2fa90cce1bf91ded1dac141de6a9bec40c1736bcb90d280ac7fabf22cfd0a701c7fd5864f007d1159954f7ee55701d5e68b47a1a9a217ca34b7ee619 SHA512 4dcdd6bc6d148a0e02a0f1b766bd0c5712d373d898c06078d8630e0067e858b815117392a11332b257156e95da6337494d99c2724d24cadb97432089908644b5
diff --git a/dev-python/gst-python/gst-python-1.20.3.ebuild b/dev-python/gst-python/gst-python-1.20.3.ebuild
index 768ffde39835..df597b5ae5ad 100644
--- a/dev-python/gst-python/gst-python-1.20.3.ebuild
+++ b/dev-python/gst-python/gst-python-1.20.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit meson python-r1 xdg-utils
 
diff --git a/dev-python/hatch-fancy-pypi-readme/Manifest b/dev-python/hatch-fancy-pypi-readme/Manifest
index 293549fd2e8e..30e3227583f0 100644
--- a/dev-python/hatch-fancy-pypi-readme/Manifest
+++ b/dev-python/hatch-fancy-pypi-readme/Manifest
@@ -1,5 +1,5 @@
 DIST hatch-fancy-pypi-readme-22.3.0.gh.tar.gz 22107 BLAKE2B 7358a35ed9176d5107d406c1f99cfcf17ce409224dcad55ac845087e2fd6cc9ab88e5ea929e3b1304bbff6464cbbbd0b0d9716bcfe199dcd887c809cd6a9356a SHA512 93fe293ddce6dde450bc427d8fa492cf2b1f7d4a0e2d754873f765f588a962ca2c7c48b515ba613503bed6100b302ed91bbedb4d6a9f8d7bc10ab4b1418164e8
 DIST hatch-fancy-pypi-readme-22.7.0.gh.tar.gz 25457 BLAKE2B 7426e6d8407b6b137524e651fdd4637980cdd781735c79df5172d3c9c45e5b7f07957e2591cc84c7eb750ac494770a68a8a7590dc7131eeb48c44bdb5a9995ac SHA512 4c6a02ac3774ee87f1cd725fae341739c3037aae772361e5664539fd0d8c09ba359245ddc925e028387a0359856979e35588d23824a66584a10f9fcac108b7d4
 EBUILD hatch-fancy-pypi-readme-22.3.0.ebuild 850 BLAKE2B ae621f2d85031cec8ac6dd1a22111b24a0c82707bfb3c98eea03bbce13b903334e8e08165662851deae335db56542f83d59f16adcf4d7949fcb63c8b6b55eb78 SHA512 da39c23e7a53f9b4edf7707c28b372a8a931c6f1b3e12c23b204f876b7dd8622740b6a220320cd903e6234ecac1779891ea0622f98c45a585ce50b0d71ed89ac
-EBUILD hatch-fancy-pypi-readme-22.7.0.ebuild 833 BLAKE2B c3107c4ca6914e7f596ab9bb0cafc8ed03ff71d6419e3c5f820f7067151db8bd14f1076fe8685352188969aec07bd4cb0d51acb9014247d8de733f7ccc7e2e13 SHA512 afaa8f6647d897450420e39da5df5e2d68c580d35da441e34c0fc1076e830512840694daf92c60a20f2a8540d3589908382d33df38a461d83134e5e8b7b107b8
+EBUILD hatch-fancy-pypi-readme-22.7.0.ebuild 840 BLAKE2B 08ef518265e0be1ca324fd29090e6cd8f164bfb9f125b754b6c33cd9828a24ba27f1e417444f1eafac251002edb3a6f0a1e36740356df4cbf8be886624ea8941 SHA512 d79c9c8daa6ddb0ecff3b74ddf41c527af5e1f159b89f2befbc432a4cdc71d75bf977de2906b8429704bed52f0c28275b0818de5c1a8dd0cd06198a0543b87c0
 MISC metadata.xml 420 BLAKE2B 03750f71022641e5305e12e60a55fb614deac90677d655989df62c3b57009aba9f91881c7380a3efb6ada27b43036f446d5ebe26a2ae17678c87f681fab360a4 SHA512 54e85d5b2e8dd4faf2eac232d7f79848a6a6b365829cf58f186211de1473a9023a3f7e8defc49f788e89afc4f0a0b55996101ce45a8e76579b5a61ff76970c0f
diff --git a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.7.0.ebuild b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.7.0.ebuild
index 20270b009332..045aedd883d8 100644
--- a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.7.0.ebuild
+++ b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.7.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~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"
 
 RDEPEND="
 	dev-python/hatchling[${PYTHON_USEDEP}]
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 2cb89deeb499..b85188ad1577 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,3 +1,5 @@
 DIST pyatspi-2.38.2.tar.xz 318596 BLAKE2B aba5d4fbbc9e0ce4793843270394712e675e6546c781f0523f7f17a79f018fcf4cf209257e9ef0dc03cbe92be7a17c774fd82f2d9997d9aa8c6b6be65a72ef8a SHA512 03e10af5f0eb2ab89518229f049f497635ec1ae85a948a02813a5eb00eef395a3934f578b56054f8e73ae3c5c28760ad1f2b93e8876b8724c64b622d966aa5d9
+DIST pyatspi-2.46.0.tar.xz 324112 BLAKE2B 653e80be2d17f3246bb6bb60c2135f158185374c995ca37d4f132c90d0bf02b79cfcbc4f64d555c557e9f7fd1cf0720de2c5d177b303e35a84d8e4490ae2e660 SHA512 4e9d177c930db3ccb5aa41280e33a58b6700d9c45f08b6a2f32fce0ecf5f1faa3f91c57281a5661bb9ccaafd0935e90b44f328a62988ae838b4a008916d2aa0f
 EBUILD pyatspi-2.38.2.ebuild 1308 BLAKE2B 1cc1211a2ab3988d8de5ab2e8a69f7589dd23c1f7047589ccdfabd04456083a950fe63ddcc508f86a542295100aea720262f451e839b579521b0f4ee4a424b04 SHA512 dd6208aba13ecd5044af792ed5a4a0713595fa84309d922a8c21e3e65c76ad0f9a05d81d05c91cdea1db6588ac6ae753f9c259826e2593c382e92e463331d65e
+EBUILD pyatspi-2.46.0.ebuild 1324 BLAKE2B d537d1f8bf82951bc862c03c9386619e257c020687eff2c07f328f27d6b46c7d75c1c1067772202d741b8f7cae0abf75d63ec332305a548af5e1e86ea5420c0e SHA512 3a1e7f5a6055cc7743d1fb70df0be64e46caab7737d9e668eb3a3ebbf60e676ed804323b274fb732c4c49f25589a1e7ee931ee6b47593ba85bb6d918baf8b1bb
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-python/pyatspi/pyatspi-2.46.0.ebuild b/dev-python/pyatspi/pyatspi-2.46.0.ebuild
new file mode 100644
index 000000000000..af4901a332e4
--- /dev/null
+++ b/dev-python/pyatspi/pyatspi-2.46.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Python client bindings for D-Bus AT-SPI"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+# Note: only some of the tests are GPL-licensed, everything else is LGPL
+LICENSE="LGPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/atk-2.11.2
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	>=sys-apps/dbus-1
+	>=app-accessibility/at-spi2-core-2.34[introspection]
+"
+BDEPEND="virtual/pkgconfig
+	test? ( x11-libs/gtk+:3 )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure $(use_enable test tests)
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir dbus-run-session emake check
+}
+
+src_install() {
+	installing() {
+		gnome2_src_install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installing
+
+	docinto examples
+	dodoc examples/*.py
+}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index d1912136e317..aae4b75db23b 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,7 +1,7 @@
 DIST weasyprint-55.0.tar.gz 410970 BLAKE2B ba77f249c3568031eff9b7110864b69113f71ea197d0c7136de01bd40155a437b5e540e87219e6ca49428b98d8ec471dcf9ed1d0224d68a3b320e5fffb568239 SHA512 96cc6de5af86da47aa0b5a84c3f00679690774574f3370ca319afe77f3eb9c9725f3b0a6cbddf589f23f444972bc77b07cce7e27ee2c466484636b3cb30250a3
 DIST weasyprint-56.0.tar.gz 419236 BLAKE2B c64d382e4ac169904a51fec17152faacccf4ccdab775a3b34b0db7e0a4306e6cadf6810482cee5535991400455864749cce1fc6ba5e0b469a3eb934d62298028 SHA512 d8efc83f77967a514d26806a9b73ef03e047431c6db9b367cd23a819b4a68714d216081afc74162b60084d0f3755498dc782d0335069bc9e70c42b611b737eec
 DIST weasyprint-56.1.tar.gz 420035 BLAKE2B ac6ff4fae70406c125f8e5c959acba297fa92644dd6a69a95af0192260c6fc8890b1ae790c25eb16f79a3f527a88e4912787c8d29f4ea213c2fc4ecab589ecf8 SHA512 c64bcef9789cb8c52853cfe02f5249240b67fa8368f3467c0e56cefe8ee9fde3dc9a1a489278e7238ed7fddfebba2f238f37245a3ef4d7482a32cee14dbf66b0
-EBUILD weasyprint-55.0.ebuild 1123 BLAKE2B 45b7a9752a12a607acc04b22dfc3f1de638415d863da9675f6dd2290b9ebecd87d7c7cbb5460d91da17cdb46288450d0753d8652769464e69837bfd5ffb21888 SHA512 1de4e361bafac564d025a64c87e04695cf2d48d16f2ef6161ba1e6d72d97e5c5f93be2d4c3e8b93830f0978e3ca1c9c36a9fd781564c6b0b5ea41e83a8526bff
-EBUILD weasyprint-56.0.ebuild 1121 BLAKE2B 88520a8c11658a58b027a2f7f4c43ecd39370646c3c1a243ec8c0a974d7990fc7cc7505cd7e53e6aca5ccda3c81ff457cab356b838a37612f3e0882a10f687f6 SHA512 b80ad7b17f41a4bb8e6f94b2276788e5fae076b83d7d2bb171654729acc601fdaaf70a5e339a50d3e815778bdcf5ffd2f1dfebdb1b2635093ee2f18a60cfe463
-EBUILD weasyprint-56.1.ebuild 1121 BLAKE2B 88520a8c11658a58b027a2f7f4c43ecd39370646c3c1a243ec8c0a974d7990fc7cc7505cd7e53e6aca5ccda3c81ff457cab356b838a37612f3e0882a10f687f6 SHA512 b80ad7b17f41a4bb8e6f94b2276788e5fae076b83d7d2bb171654729acc601fdaaf70a5e339a50d3e815778bdcf5ffd2f1dfebdb1b2635093ee2f18a60cfe463
+EBUILD weasyprint-55.0.ebuild 1123 BLAKE2B 7a654f4b5d6344c6949f9c641b398a447c6140c55fab9a28978eba9cf4f67dface96738fad12b1413880082255d8341acdebe57d92910d87692ffceb473ba9eb SHA512 8f20c4a1c5c41e4aab9e69115b5d6b27142295fc913e1254ef07946e946791720451e26e6a62349981cf009aea675248ce2ff473570b1ba1a79281864d012bf1
+EBUILD weasyprint-56.0.ebuild 1121 BLAKE2B e0869fdb7d851d5306f8b97a8107abfa78bc90949771ae96901cbf44c13312404b7ba75ca6181066d3937bbb241836216a4b73fad8588a200e2fb366aa168f10 SHA512 08956d19a4f078cf6c86119f14f46e9647c8f91ae21331233a614b1e24f9df2b6883bfef307333173824d1dc58f7e20e04789a395b1b7e997427e439d7900b05
+EBUILD weasyprint-56.1.ebuild 1121 BLAKE2B e0869fdb7d851d5306f8b97a8107abfa78bc90949771ae96901cbf44c13312404b7ba75ca6181066d3937bbb241836216a4b73fad8588a200e2fb366aa168f10 SHA512 08956d19a4f078cf6c86119f14f46e9647c8f91ae21331233a614b1e24f9df2b6883bfef307333173824d1dc58f7e20e04789a395b1b7e997427e439d7900b05
 MISC metadata.xml 382 BLAKE2B 3e5d142b055354e1ea440d9efd4bf92458b1da3f777dd90929ce2041ca6e0969fa6e58aacfb4a5a93ff90805e0d8ec4c9c6253559ca54698f5029639ce35ac8a SHA512 43415064a6f56eaca974031e51d63118d1c65b33e4399302fc72cc2cd6f15e0a47cf411b18d3c5136e866115855deb19b6a9e058a18049151959ce5ee29ececf
diff --git a/dev-python/weasyprint/weasyprint-55.0.ebuild b/dev-python/weasyprint/weasyprint-55.0.ebuild
index 2845c46760f7..6ddc00dbc0e9 100644
--- a/dev-python/weasyprint/weasyprint-55.0.ebuild
+++ b/dev-python/weasyprint/weasyprint-55.0.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		|| (
-			>=app-text/ghostscript-gpl-9.56.1-r2
+			>=app-text/ghostscript-gpl-9.56.1-r3
 			<app-text/ghostscript-gpl-9.56.0
 		)
 		media-fonts/ahem
diff --git a/dev-python/weasyprint/weasyprint-56.0.ebuild b/dev-python/weasyprint/weasyprint-56.0.ebuild
index 79a989e6bb59..c68143635427 100644
--- a/dev-python/weasyprint/weasyprint-56.0.ebuild
+++ b/dev-python/weasyprint/weasyprint-56.0.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		|| (
-			>=app-text/ghostscript-gpl-9.56.1-r2
+			>=app-text/ghostscript-gpl-9.56.1-r3
 			<app-text/ghostscript-gpl-9.56.0
 		)
 		media-fonts/ahem
diff --git a/dev-python/weasyprint/weasyprint-56.1.ebuild b/dev-python/weasyprint/weasyprint-56.1.ebuild
index 79a989e6bb59..c68143635427 100644
--- a/dev-python/weasyprint/weasyprint-56.1.ebuild
+++ b/dev-python/weasyprint/weasyprint-56.1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		|| (
-			>=app-text/ghostscript-gpl-9.56.1-r2
+			>=app-text/ghostscript-gpl-9.56.1-r3
 			<app-text/ghostscript-gpl-9.56.0
 		)
 		media-fonts/ahem
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 6055e5158506..ac6ca06cdeda 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 219967ef5178..f080ba1eda8d 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,5 @@
 DIST diffoscope-219.tar.gz 2711533 BLAKE2B 1b244a36ca2622244fb1f11f8fc895680bd1d77b544421e5e2c3662294fdf8e7efe3b67e370a83089c180f3c8563562847cc8b09bec85426e1b05f340575b724 SHA512 615b82cbd2b1a8bcdfae4274c051e4be52fb8ea90c5e56b041dd1d8c520c759d09cd4c080b31154257828316f7b4c0ac79cf0b1e09d762271ce01ffde353ee7a
-DIST diffoscope-221.tar.gz 3145331 BLAKE2B 76369a7719f9a256ca61cc097bc439c5ef267370b78b5e25c466f351fc262b6a9a18f2f82d88ae86fd382a11900c4350ff79c6217c53df42ad56706ee58fa42b SHA512 145390374378f699f7689af0e35897bc9d75cd805722f0db66e689135186eb43def17ec5aac4adf8f7e0045cbddec8a31dc5c8b68eb4e7b0d3bd1f0661f26416
-DIST diffoscope-222.tar.gz 3145249 BLAKE2B ae91a16b4c21754d4c677922fed0a2f6102ba1ee370eac42a4008fcd0898adc7b1e86a900476f08eae8705353f05837daf4fcc4026d5beb27ab982b72a0e12d7 SHA512 b4f2e17fbb755517d922dfcbc0ae57544a89600338bed7d98d59ab024ddc13bcedcddfa6ee808530e163b3f6c3cf627b159b9d0a011765d03a9268839226590f
+DIST diffoscope-223.tar.gz 3145330 BLAKE2B 47ebe733c6330c2c8a7a78dfaad4c364ac3570d5a691b889f3154dcc5f7bec7b97744f04433cf56544ca208233271bbbca8bb767ed43844786fca4e77505d95b SHA512 5f83177133fd4689a77fb08038222998f9597cd63b0f328d3ae55c2ef6f5136f55ab1f5841b70ce1f64a62d216e2332bb4cecb82a3edcc90a6a5841e95955d4c
 EBUILD diffoscope-219.ebuild 3324 BLAKE2B c9c95194b8d7d758834d27a1883bc1a884f6e3670ac81757bc251448e27afa437a4434966eb1cc5f79c026559241978eb913be3ec70b42f86dcba701a968db92 SHA512 5f53cf29280155a033b5aaf64512bd006fb1be72c6f8af2a1e0fc8669d1ac6f05441152fa66c41fbefa6ec74a31c2b1dbc11f08f27ca39f30e43cbc8c991b45e
-EBUILD diffoscope-221.ebuild 3333 BLAKE2B dbbd07f3ba1ed69c7a71444b046c190182a522415def1dfae5f8e4cf22a25bb93d19fc6e61b43e1da9cf95270de7e85ecc66c258635a7d03a81ee7709cf9b657 SHA512 857ddab39cf606bce9f2339986d1b55dfcccee9d774deb469a9c2a169f3799851457611e0250a5d0c3a4d58d7e477a86744568e9d8f15bc8f223810837b38f17
-EBUILD diffoscope-222.ebuild 3333 BLAKE2B dbbd07f3ba1ed69c7a71444b046c190182a522415def1dfae5f8e4cf22a25bb93d19fc6e61b43e1da9cf95270de7e85ecc66c258635a7d03a81ee7709cf9b657 SHA512 857ddab39cf606bce9f2339986d1b55dfcccee9d774deb469a9c2a169f3799851457611e0250a5d0c3a4d58d7e477a86744568e9d8f15bc8f223810837b38f17
+EBUILD diffoscope-223.ebuild 3446 BLAKE2B 24aa2e6955914e21505310a6c935ad141627be46c1a22505fe371e4c3e6623866a6984090967eaddbab9905391b299ea2fe1cc7714b2b7d2a9d068e105a45275 SHA512 562d8964cd5d939e7280ef1d69d7b034b76cf27072391b262536fb3502c9d915562cee2464dda4c5a3e67b210aa3cc8897aaa0616e50b6a04b9c433c93718b32
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-221.ebuild b/dev-util/diffoscope/diffoscope-221.ebuild
deleted file mode 100644
index bd5c0dd544f8..000000000000
--- a/dev-util/diffoscope/diffoscope-221.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 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} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="test? (
-		app-text/docx2txt
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/tlsh[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-222.ebuild b/dev-util/diffoscope/diffoscope-222.ebuild
deleted file mode 100644
index bd5c0dd544f8..000000000000
--- a/dev-util/diffoscope/diffoscope-222.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 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} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="test? (
-		app-text/docx2txt
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/tlsh[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-223.ebuild b/dev-util/diffoscope/diffoscope-223.ebuild
new file mode 100644
index 000000000000..c76f883a24b8
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-223.ebuild
@@ -0,0 +1,113 @@
+# Copyright 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} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+
+RESTRICT="!test? ( test )"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="test? (
+		app-text/docx2txt
+		media-libs/libcaca
+		virtual/imagemagick-tools[jpeg]
+	)"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/tlsh[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
+
+EPYTEST_DESELECT=(
+	# Test seems to use different tarball
+	tests/test_presenters.py::test_text_proper_indentation
+
+	# Needs triage
+	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+	tests/comparators/test_gif.py::test_has_visuals
+
+	# img2txt based failures, bug #797688
+	tests/comparators/test_ico_image.py::test_diff
+	tests/comparators/test_ico_image.py::test_diff_meta
+	tests/comparators/test_ico_image.py::test_diff_meta2
+	tests/comparators/test_ico_image.py::test_has_visuals
+	tests/comparators/test_jpeg_image.py::test_diff
+	tests/comparators/test_jpeg_image.py::test_compare_non_existing
+	tests/comparators/test_jpeg_image.py::test_diff_meta
+	tests/comparators/test_jpeg_image.py::test_has_visuals
+
+	# docx2txt based falures, bug #797688
+	tests/comparators/test_docx.py::test_diff
+
+	# Formatting
+	tests/test_source.py::test_code_is_black_clean
+
+	# Fails on ZFS
+	tests/test_main.py::test_non_unicode_filename
+)
+
+distutils_enable_tests pytest
diff --git a/dev-util/seer/Manifest b/dev-util/seer/Manifest
index 6390a6d96abd..615dfa4e5ae5 100644
--- a/dev-util/seer/Manifest
+++ b/dev-util/seer/Manifest
@@ -1,4 +1,6 @@
 DIST seer-1.10.tar.gz 367629 BLAKE2B e09ed500103428d5aee7138beb2cf8b2dafa167e2c6e3e60d0a5e26be358945af8544a9165dda835b2ec44264da4d16a3a44398000392263d690c6080cad914f SHA512 b691b433e206c78b121a48578ac632f236ca8734f9ee6c5e9c0eb3503ac11ee786595d66ef15c46e7ae5b31a58b444b7631cea2ef67389f0be7e292c7d2279ef
+DIST seer-1.11.tar.gz 380123 BLAKE2B 786061d12127cac2b64012461a8cab4f082c2f028db42c8856187cefae940ed084b70db68f6deb4735e5d6237f2d936be5d28d417f676a18324e37fc14342aec SHA512 be58f4c24f34b7d55689c82c7bf0584780e36d47f2e153555fca51b35763732ff639cd2f8281bf7eba8270d706c5560efea72d2c8b19cca5d4e2480d72f9f440
 EBUILD seer-1.10.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
+EBUILD seer-1.11.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
 EBUILD seer-9999.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
 MISC metadata.xml 318 BLAKE2B a34dc163a2b5e0fc9db7808eaa083a7b978a5578db14c5f33e870a2b73ec21f056c3b287997e8db4c1951e8d56852df746fccc30cf47ad24fdbae13896329014 SHA512 4c3706be2572cfb702b357753b35deb33199ed701d95b37f005919e374712ee5412a8b9214ea4c3c82e8371457b5571ed9a055b1df963196650a64e8c0d67fbd
diff --git a/dev-util/seer/seer-1.11.ebuild b/dev-util/seer/seer-1.11.ebuild
new file mode 100644
index 000000000000..ecf4ab10dc4a
--- /dev/null
+++ b/dev-util/seer/seer-1.11.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+DESCRIPTION="A GUI frontend to gdb"
+HOMEPAGE="https://github.com/epasveer/seer"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/epasveer/seer"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64"
+fi
+
+S="${WORKDIR}"/${P}/src
+
+# Upstream keep 'debian/copyright' up to date
+# https://github.com/epasveer/seer/issues/86
+LICENSE="GPL-3+ CC-BY-3.0 CC-BY-4.0"
+SLOT="0"
+
+DEPEND="
+	dev-qt/qtcharts:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="
+	${DEPEND}
+	sys-devel/gdb
+"
+
+src_install() {
+	cmake_src_install
+
+	domenu resources/seergdb.desktop
+
+	local size
+	for size in 32 64 128 256 512 ; do
+		newicon -s ${size} resources/seergdb_${size}x${size}.png seergdb.png
+	done
+}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index a9d9d1d0b3e9..8c2d75dca49d 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 1d0ad95f7c8d..7f93d9ec506e 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -10,6 +10,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20220702-10113-e27a7b621.tar.xz 20787584 BLAKE2B 977dddf96f54fd2e30de148de16e62a27b736acdb0d17e1d4fef7991b601c141c1242257bb7bed25d50baba4dff04aa3bdc060d4f83ba98fd724342de588c0dc SHA512 fe9ff5444934a4a0c10db9723a3ef317ac7aab55ccbdaf62ffabbd557e91537b92127d16231afff3a4bd9baadae559ff8cd8c3f2d02909a0d8267352fcac01fa
-EBUILD eduke32-20220702.10113-r1.ebuild 5797 BLAKE2B d72ff952d04d8b5f20c12014b01dc765dc77d86d89e8443b328b6b3a22d111c785c6cfa64bce7db12e0259c69f531bd188b7e76659d618ff0eb3bccdc6ed3790 SHA512 29e4916674fdc426a952d699ec4cfb11dd177bba4b8c90f16d6c16fa3abc187c91d53ca6900ca1aa4a4d22db7748220a194b95b3dd143aa3820178b20ac3a22b
+DIST eduke32_src_20220929-10163-2b3f691cd.tar.xz 17454664 BLAKE2B d574adf1bb76107f9dad1683965e55e404b520e5090924750ea62a69c9c9b1328f89717970e1fd2ccec8b35a4eab3d370acd60c6e80218c06dfb3106d273448b SHA512 db8fd5b3d89e7f1ee3c24abc9e118ad847f763f565b23d987b2f51ee81984c12f5d034f6e0501b4e70a9e822d3f542933921b51598d2c2711e0a54e4d942aba2
+EBUILD eduke32-20220929.10163.ebuild 5796 BLAKE2B b8eb9d4666bca02c268260643486738dff6230d67128391187b9dc7c9aa77e2d2a7d7f57a7970b9d9fe0a45c7ca0d669263c0cbdba099f91afd32206b1d916cd SHA512 b6fafde4b64d92f0c27cc8a53686567df0f558c6733495cc83a4dd39511c45c23b3a2638207c63dc429fa27ebb6a1de681b3eb97ffb3cea30d2967244e0859e3
 MISC metadata.xml 1696 BLAKE2B 76d8cb27f0b64251519778ed51c1497807772d552eef3972312b8971e606087f4d44e4fda17499fea766233c1b7aa25ccf1467e76cc74bf1aee58d8cd21f158c SHA512 46dbbacbdcc05ef6907431f8d6bf1385af78c2d717653026ae565a26db2d0c8f05f242aaa78f4b14791c16c40862dc2e4d9a02892f650e222ee8fb4222603a8d
diff --git a/games-fps/eduke32/eduke32-20220702.10113-r1.ebuild b/games-fps/eduke32/eduke32-20220702.10113-r1.ebuild
deleted file mode 100644
index 507d1496e3b8..000000000000
--- a/games-fps/eduke32/eduke32-20220702.10113-r1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop toolchain-funcs xdg-utils
-
-EGIT_COMMIT="e27a7b621"
-MY_BUILD="$(ver_cut 2)"
-MY_DATE="$(ver_cut 1)"
-MY_PV_HRP="5.4"
-MY_PV_OFFENSIVE_XXX="1.33"
-MY_PV_OPL="2.01"
-MY_PV_PSX="1.11"
-MY_PV_SC55="4.02"
-MY_PV_VOXELS="1.21"
-
-DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
-HOMEPAGE="http://www.eduke32.com/"
-SRC_URI="
-	http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
-	https://www.eduke32.com/images/eduke32_classic.png
-	hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
-	offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
-	opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
-	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
-	sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
-	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
-"
-S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
-
-LICENSE="BUILDLIC GPL-2 HRP"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp"
-REQUIRED_USE="
-	hrp? ( duke3d !voxels )
-	offensive? ( duke3d )
-	opl? ( duke3d !sc-55 )
-	psx? ( duke3d )
-	sc-55? ( duke3d !opl )
-	voxels? ( !hrp )
-	vpx? ( opengl )
-"
-
-# There are no tests,
-# instead it tries to build a test game, which does not compile
-RESTRICT="bindist test"
-
-RDEPEND="
-	media-libs/flac:=
-	media-libs/libogg
-	media-libs/libsdl2[alsa,joystick,opengl?,sound,video]
-	media-libs/libvorbis
-	media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis]
-	sys-libs/zlib
-	gtk? ( x11-libs/gtk+:2 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	png? ( media-libs/libpng:0= )
-	vpx? ( media-libs/libvpx:= )
-	xmp? ( media-libs/exempi:2= )
-"
-
-DEPEND="
-	${RDEPEND}
-	timidity? ( media-sound/timidity++ )
-"
-
-BDEPEND="
-	app-arch/unzip
-	x86? ( dev-lang/nasm )
-"
-
-PDEPEND="duke3d? ( games-fps/duke3d-data )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
-	"${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
-	"${FILESDIR}/${PN}-20220204.9957-log-to-tmpdir.patch"
-)
-
-src_unpack() {
-	# Extract only the eduke32 archive
-	unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
-
-	# Unpack only the documentation
-	if use hrp; then
-		unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
-	fi
-	if use offensive; then
-		unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
-	fi
-	if use opl; then
-		unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
-		mv readme.txt opl_readme.txt || die
-	fi
-	if use sc-55; then
-		unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
-	fi
-	if use voxels; then
-		unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
-	fi
-}
-
-src_compile() {
-	local myemakeopts=(
-		ALLOCACHE_AS_MALLOC=0
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		CLANG=0
-		CPLUSPLUS=1
-		CUSTOMOPT=""
-		DEBUGANYWAY=0
-		F_JUMP_TABLES=""
-		FORCEDEBUG=0
-		HAVE_FLAC=1
-		HAVE_GTK2=$(usex gtk 1 0)
-		HAVE_XMP=$(usex xmp 1 0)
-		LINKED_GTK=$(usex gtk 1 0)
-		LTO=1
-		LUNATIC=0
-		KRANDDEBUG=0
-		MEMMAP=0
-		MIXERTYPE=SDL
-		NETCODE=$(usex server 1 0)
-		NOASM=0
-		OPTLEVEL=0
-		OPTOPT=""
-		PACKAGE_REPOSITORY=1
-		POLYMER=$(usex opengl 1 0)
-		PRETTY_OUTPUT=0
-		PROFILER=0
-		RELEASE=1
-		RENDERTYPE=SDL
-		SDL_TARGET=2
-		SIMPLE_MENU=0
-		STRIP=""
-		TANDALONE=0
-		STARTUP_WINDOW=$(usex gtk 1 0)
-		USE_OPENGL=$(usex opengl 1 0)
-		USE_LIBVPX=$(usex vpx 1 0)
-		USE_LIBPNG=$(usex png 1 0)
-		USE_LUAJIT_2_1=0
-		WITHOUT_GTK=$(usex gtk 0 1)
-	)
-
-	emake "${myemakeopts[@]}"
-
-	use tools && emake utils "${myemakeopts[@]}"
-	use voidsw && emake sw "${myemakeopts[@]}"
-}
-
-src_install() {
-	dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
-	use voidsw && dobin voidsw "${FILESDIR}"/voidsw-bin
-
-	if use tools; then
-		local tools=(
-			arttool
-			bsuite
-			cacheinfo
-			generateicon
-			givedepth
-			ivfrate
-			kextract
-			kgroup
-			kmd2tool
-			makesdlkeytrans
-			map2stl
-			md2tool
-			mkpalette
-			transpal
-			unpackssi
-			wad2art
-			wad2map
-		)
-
-		dobin "${tools[@]}"
-	fi
-
-	keepdir /usr/share/games/eduke32
-	insinto /usr/share/games/eduke32
-
-	use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
-	use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
-	use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
-	use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
-	use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
-	use sdk && doins -r package/sdk
-	use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
-
-	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
-
-	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
-	make_desktop_entry mapster32 Mapster32 eduke32 Game
-	use voidsw && make_desktop_entry voidsw-bin VoidSW voidsw Game
-
-	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt )
-	use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
-	use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt )
-	use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt )
-	use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
-	use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-fps/eduke32/eduke32-20220929.10163.ebuild b/games-fps/eduke32/eduke32-20220929.10163.ebuild
new file mode 100644
index 000000000000..2f5ecdbccaa1
--- /dev/null
+++ b/games-fps/eduke32/eduke32-20220929.10163.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs xdg-utils
+
+EGIT_COMMIT="2b3f691cd"
+MY_BUILD="$(ver_cut 2)"
+MY_DATE="$(ver_cut 1)"
+MY_PV_HRP="5.4"
+MY_PV_OFFENSIVE_XXX="1.33"
+MY_PV_OPL="2.01"
+MY_PV_PSX="1.11"
+MY_PV_SC55="4.02"
+MY_PV_VOXELS="1.21"
+
+DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
+HOMEPAGE="http://www.eduke32.com/"
+SRC_URI="
+	http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
+	http://www.eduke32.com/images/eduke32_classic.png
+	hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
+	offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
+	opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
+	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
+	sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
+	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
+"
+S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
+
+LICENSE="BUILDLIC GPL-2 HRP"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp"
+REQUIRED_USE="
+	hrp? ( duke3d !voxels )
+	offensive? ( duke3d )
+	opl? ( duke3d !sc-55 )
+	psx? ( duke3d )
+	sc-55? ( duke3d !opl )
+	voxels? ( !hrp )
+	vpx? ( opengl )
+"
+
+# There are no tests,
+# instead it tries to build a test game, which does not compile
+RESTRICT="bindist test"
+
+RDEPEND="
+	media-libs/flac:=
+	media-libs/libogg
+	media-libs/libsdl2[alsa,joystick,opengl?,sound,video]
+	media-libs/libvorbis
+	media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis]
+	sys-libs/zlib
+	gtk? ( x11-libs/gtk+:2 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	png? ( media-libs/libpng:0= )
+	vpx? ( media-libs/libvpx:= )
+	xmp? ( media-libs/exempi:2= )
+"
+
+DEPEND="
+	${RDEPEND}
+	timidity? ( media-sound/timidity++ )
+"
+
+BDEPEND="
+	app-arch/unzip
+	x86? ( dev-lang/nasm )
+"
+
+PDEPEND="duke3d? ( games-fps/duke3d-data )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
+	"${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
+	"${FILESDIR}/${PN}-20220204.9957-log-to-tmpdir.patch"
+)
+
+src_unpack() {
+	# Extract only the eduke32 archive
+	unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
+
+	# Unpack only the documentation
+	if use hrp; then
+		unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
+	fi
+	if use offensive; then
+		unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
+	fi
+	if use opl; then
+		unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
+		mv readme.txt opl_readme.txt || die
+	fi
+	if use sc-55; then
+		unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
+	fi
+	if use voxels; then
+		unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
+	fi
+}
+
+src_compile() {
+	local myemakeopts=(
+		ALLOCACHE_AS_MALLOC=0
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		CLANG=0
+		CPLUSPLUS=1
+		CUSTOMOPT=""
+		DEBUGANYWAY=0
+		F_JUMP_TABLES=""
+		FORCEDEBUG=0
+		HAVE_FLAC=1
+		HAVE_GTK2=$(usex gtk 1 0)
+		HAVE_XMP=$(usex xmp 1 0)
+		LINKED_GTK=$(usex gtk 1 0)
+		LTO=1
+		LUNATIC=0
+		KRANDDEBUG=0
+		MEMMAP=0
+		MIXERTYPE=SDL
+		NETCODE=$(usex server 1 0)
+		NOASM=0
+		OPTLEVEL=0
+		OPTOPT=""
+		PACKAGE_REPOSITORY=1
+		POLYMER=$(usex opengl 1 0)
+		PRETTY_OUTPUT=0
+		PROFILER=0
+		RELEASE=1
+		RENDERTYPE=SDL
+		SDL_TARGET=2
+		SIMPLE_MENU=0
+		STRIP=""
+		TANDALONE=0
+		STARTUP_WINDOW=$(usex gtk 1 0)
+		USE_OPENGL=$(usex opengl 1 0)
+		USE_LIBVPX=$(usex vpx 1 0)
+		USE_LIBPNG=$(usex png 1 0)
+		USE_LUAJIT_2_1=0
+		WITHOUT_GTK=$(usex gtk 0 1)
+	)
+
+	emake "${myemakeopts[@]}"
+
+	use tools && emake utils "${myemakeopts[@]}"
+	use voidsw && emake sw "${myemakeopts[@]}"
+}
+
+src_install() {
+	dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
+	use voidsw && dobin voidsw "${FILESDIR}"/voidsw-bin
+
+	if use tools; then
+		local tools=(
+			arttool
+			bsuite
+			cacheinfo
+			generateicon
+			givedepth
+			ivfrate
+			kextract
+			kgroup
+			kmd2tool
+			makesdlkeytrans
+			map2stl
+			md2tool
+			mkpalette
+			transpal
+			unpackssi
+			wad2art
+			wad2map
+		)
+
+		dobin "${tools[@]}"
+	fi
+
+	keepdir /usr/share/games/eduke32
+	insinto /usr/share/games/eduke32
+
+	use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
+	use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
+	use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
+	use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
+	use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
+	use sdk && doins -r package/sdk
+	use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
+
+	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
+
+	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
+	make_desktop_entry mapster32 Mapster32 eduke32 Game
+	use voidsw && make_desktop_entry voidsw-bin VoidSW voidsw Game
+
+	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt )
+	use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
+	use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt )
+	use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt )
+	use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
+	use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index e8c8747c4e40..c7fabc5c2368 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index af0000185915..ac4660fcaaa8 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -2,5 +2,7 @@ AUX 40.0-Correct-the-conditional-comments-in-the-test-data.patch 1459 BLAKE2B 36
 AUX 40.0-Fix-accessibility-issues-with-initializer-of-constan.patch 1386 BLAKE2B e7d0a5488a41c80e08073479bfb030148de6e0031532bc322073d71bf503e5c963a24ae7fec571ff0a21b3109d84933f0bef4d95a0d00d7cfd6e1fda98c10e71 SHA512 ef2b8435f13d1a5c144372f925cf6517eabf3db0f092eea04f1f0df9ef10cb1c9e6ff1ff7bb2f7c965789bd3dae7ed92cc4bc0cd1a1ce28c188b350506998df4
 AUX 40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch 849 BLAKE2B 618a25a934d92c2ea4cb2c06d05ab99e9e6ecffc782bedc8de659b084a21d4ea6e37b13a8067b3d85e45d9b9b295843372c7eb988ee5fb67f849d7de0c36deef SHA512 e657bd88cf39d715190dbce1fb8d93df2c91e7f2b7c6d1dd4ed02d177e650195fd179f23440559e84b1f5dfd0ee35e9ea75cdd4a76810f2ebfa8db7b3f9280b2
 DIST geary-40.0.tar.xz 2490940 BLAKE2B 67ff23f9a6f4760947b5d9ac3167ffb91539af7e0afbde2c6bc7b35adbf286868f24ed74b932412e9c039ab4e2e71b4162e08e8bd31fa3abc02d10fb9c1ce47d SHA512 d31716121be63a9d39caf4bffacce0109cebcc8048127c37fac6969b4103ab2cf12aac9bed73623b0f3baf7f39996b8f0b0fe9b57968054d51ae3e209f6b1522
+DIST geary-43.0.tar.xz 2476748 BLAKE2B 760820be83deae838a09c55adc4416348259073be26359bbf10e7998d8d794bd519b8601d79ff15f7980f87d68cdd1603188244b9931c227205f1db1ed014668 SHA512 71bf774aa27d4edef61932197bbf9b58b67ace8dd7969c4669fcd45e33c05a08d3d6eae280ea6a7e9f58db626f541f15b0f0d33f3162bef5fd21a368122dbba0
 EBUILD geary-40.0-r2.ebuild 2450 BLAKE2B 44fcb9c2f422165bee0b0379c925a190ab03e24a6294c2d005cd825410d5b90158854aa5522445bda80b5039c315aa0c7b8e373848b45d99ba76ed82ea9b85c0 SHA512 2aa0b488ef35199f4c79e561cbb7fa6183c3139c79a40426bd4334c91f6e3919ccbdd8fe5adaba69f428aa7a9de7cb8fd0065a623be549090eced35a51f49166
+EBUILD geary-43.0.ebuild 2144 BLAKE2B 66136d0d6f8d2b2d8bccb87e2087d02100b1db25e3060decca47620706764a18b07fa5b369be7334816fbf84a6ddf4cf81d7c12c42ae70af3df751cbb6123828 SHA512 b613944dbcb19b87c9e7c497f44dec01a31f49b5133711a02a60ea0e1b2fe8eac3f22dd974c0f45766895399ec4cfbdada2ad973b2b5c8beba7eedfddab9f606
 MISC metadata.xml 380 BLAKE2B 8dfe66dd2f5e619ff018c1c64f23da3edf82ecf6162f9223068306792716cd0c4c3f7bd31b91ea7fd5fb492c877b4964edec6461f521919c8d88f59c664028e8 SHA512 8cd4286e4a6c2cdf7504938087e77ab5e17242da40104866c834b2426d6664afdb2a2512d47cda85ae842cdeb0800905fa5b69c711480008af826df0963335d2
diff --git a/mail-client/geary/geary-43.0.ebuild b/mail-client/geary/geary-43.0.ebuild
new file mode 100644
index 000000000000..ea3fae6d6368
--- /dev/null
+++ b/mail-client/geary/geary-43.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala virtualx xdg
+
+DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
+HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
+
+LICENSE="LGPL-2.1+ CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, CC licenses for some icons
+SLOT="0"
+IUSE="test ytnef"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# >=gspell-1.7 dep to ensure all libraries used use enchant:2
+DEPEND="
+	>=dev-libs/glib-2.68:2
+	>=x11-libs/gtk+-3.24.23:3
+	>=net-libs/webkit-gtk-2.38:4.1=
+	>=dev-libs/gmime-3.2.4:3.0
+	>=dev-db/sqlite-3.24:3
+
+	x11-libs/cairo[glib]
+	app-text/enchant:2
+	>=dev-libs/folks-0.11:0=
+	>=app-crypt/gcr-3.10.1:0=
+	>=dev-libs/libgee-0.8.5:0.8=
+	net-libs/gnome-online-accounts
+	media-libs/gsound
+	>=app-text/gspell-1.7:=
+	>=dev-libs/icu-60:=
+	app-text/iso-codes
+	>=dev-libs/json-glib-1.0
+	>=gui-libs/libhandy-1.2.1:1=
+	>=dev-libs/libpeas-1.24.0
+	>=app-crypt/libsecret-0.11
+	net-libs/libsoup:3.0
+	dev-libs/snowball-stemmer:=
+	>=dev-libs/libxml2-2.7.8:2
+	ytnef? ( >=net-mail/ytnef-1.9.3 )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/appstream-glib-0.7.10
+	dev-libs/libxml2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( net-libs/gnutls[tools] )
+
+	$(vala_depend)
+	x11-libs/gtk+:3[introspection]
+	net-libs/webkit-gtk:4.1[introspection]
+	dev-libs/gmime:3.0[vala]
+	app-crypt/gcr:0[introspection,vala]
+	dev-libs/libgee:0.8[introspection]
+	media-libs/gsound[vala]
+	app-text/gspell[vala]
+	gui-libs/libhandy:1[vala]
+	app-crypt/libsecret[introspection,vala]
+	net-libs/libsoup:3.0[introspection,vala]
+"
+
+src_prepare() {
+	vala_setup
+	gnome2_environment_reset
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dprofile=release
+		-Drevno="${PR}"
+		-Dvaladoc=disabled
+		-Dcontractor=disabled
+		-Dlibunwind=disabled
+		$(meson_feature ytnef tnef)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 895efec45b0e..5e94c5d606b4 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 209c1a0ee4ed..061d3ca159b5 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,3 +1,3 @@
 DIST gphoto2-2.5.28.tar.bz2 797600 BLAKE2B 78a89eaf5f68f3b902751792404702fa656680e904bc750e6a51934b5cefd8458c95ffd553024e16977270f4b4806c5dc68d9e3accd8759b1357e0619a0dc6a3 SHA512 ca83c677bdaf7c16ed2bc22865bdcc24e1c5721dbcd36a76e2ebe8bb992d46614fd012cd8f38b37598b30b6b57e6bf533318f6a0d490e186f3026676249735c8
 EBUILD gphoto2-2.5.28.ebuild 1044 BLAKE2B 2b009db41989892a376436e08d9bc273d2cffa032e9387db0c3fca148e5b3fee9550a6de5bd825f17cea5995eee4aa393fe8316c35fff7918c87b1398f1eec1f SHA512 e7e25610b51f6d03cc5f30c4e2ed001fb35d640fe94e1830d45e7adbada7ef16ebdab59e547b9e4895d85c51f796120ff757e0caaeb15f33d7d1f4f75659d43a
-MISC metadata.xml 330 BLAKE2B 59a3975ec454edf5966f52db0edb971491c88b2e8777ad0aeb1b66e334ff70e1a7f30e0dafabdba5fb7122c2485f9c787d0bd0415f2242f4e327e66797091b6f SHA512 b86a7023ca0d70907981f5c9d4d134c48d794a9737338c8cda610cd5066f7432ada968f064a36f2b948314508811dc6eba8d9f68c3036d392cf41e57f98fc718
+MISC metadata.xml 384 BLAKE2B 1577d799609489e1e29078aaa779e019b01622aed8322d23aea0b3203f620d123c3bb0b2e5a3696ba89422c52695882253524c2104b47456e2b2a66f782ea9c4 SHA512 96f5267ca8b7ca6a0b22a82c3b386a1094db45056ade223cc3c24e52ef6a37117e283c0bcf6eb89e6a2a47347916ffdcfd5bdffd9049fda1717f2fd044fff9b5
diff --git a/media-gfx/gphoto2/metadata.xml b/media-gfx/gphoto2/metadata.xml
index d745e3097102..c90500dfc28b 100644
--- a/media-gfx/gphoto2/metadata.xml
+++ b/media-gfx/gphoto2/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gphoto</remote-id>
+		<remote-id type="github">gphoto/gphoto2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/gphotofs/Manifest b/media-gfx/gphotofs/Manifest
index ef9951881ac8..229f2f92c5d6 100644
--- a/media-gfx/gphotofs/Manifest
+++ b/media-gfx/gphotofs/Manifest
@@ -1,3 +1,3 @@
 DIST gphotofs-0.5.tar.bz2 261357 BLAKE2B 6c8194308b461fe8b88aba3e6d16a15715cbb9f247aed2f57147e7192f342e3dbb26d0ce112b0203f73c078333706f717eb1822b86b1e0b5da4e632174907b55 SHA512 6f5bcaf8ca820c0590ec95af55ec9438c864a298660ad15c6d6e8f59201a7f873d29f16cf77d13538111f6cec3f958ea0ac88c6c51836ab2d8c9d6cca156ed3a
 EBUILD gphotofs-0.5-r1.ebuild 466 BLAKE2B 3f6c561769e8efe34b2c93bd2e8e453b64d073867260f5a6cd3fefbb7bbaeb5b0b272071d57e7cc1ca173c713f40c1a35847e78e0033f2b46844319e3d187202 SHA512 96f96cda5590aca31efdf280a6c77c27d885a94250fc4f968ab81de4d3585168f9010e679e48ed9cb035de2767e5effb215afda8e515f8ecaf329317b6e92812
-MISC metadata.xml 327 BLAKE2B 26ccf8d21b353214e1b25d9c79c458ea27eed40b864c5aa28fef6e02213424e41360a46f691903ddfcf77395a1ab9ad82e0a2c5076e62603b4b07487d2d92601 SHA512 67bde90ace1663c9f6e595c2e6abe0de14ada46b0289f347acbbabb361fb89e8d2b6c16935b2f614336d39c76310ab4da36b47182cae9af0894c613e9380f35b
+MISC metadata.xml 382 BLAKE2B 2b6e2ea780fe54c4f513d9469ff0396fa59e28df05b4903ae4058ffe437e5bc4a2c2384640ead1353f4f70fac35945d476d369f45779fc4150a08d90cc1e3a89 SHA512 017736ddba4c9e47475c7f79468ae99deeab8812c7013c0b07017c19481e2fc03364ac69b58545f186e69140e5680e4b5178f5dec2b61687bd74ca334f8951a5
diff --git a/media-gfx/gphotofs/metadata.xml b/media-gfx/gphotofs/metadata.xml
index 83d382a44b11..d95ec7a73eb8 100644
--- a/media-gfx/gphotofs/metadata.xml
+++ b/media-gfx/gphotofs/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gphoto</remote-id>
+		<remote-id type="github">gphoto/gphotofs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index a16fc72bd98e..e3860a58bb00 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 6938bf33ef92..62e4a79765f7 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,3 +1,3 @@
 DIST libgphoto2-2.5.30.tar.xz 5890196 BLAKE2B 4da7a650bec695a9d8356d1014081786eb6d31641c4f36f75ba7171b2b395a5e8bf6f59d452adad6d9faa30eea77abeb52e62e645d963bcec2709b3eb5094a4a SHA512 969e5765dc5de9e5fb8156eda679aca069f568e744cc48b643846175eb3cff78bc6ec3a848150a4c636d948018de022f2988da7b94029f103589384f9144b7ed
 EBUILD libgphoto2-2.5.30.ebuild 6255 BLAKE2B e734f6d47914d6469ae4724bb05337bfe5a32227701f3d3444bb251a6ee230cbb08b4446c48ca5ff00d9997c22ff2085d206cf4ee1cbe66830cd53ebdfdba193 SHA512 cdbde5cf9404ea28dc1c8c6d9f66d828a6105d5f563db0becc60984a280c3a4e07672491646d425e0e7ef0d9a6f290e6c656cd38ffc8f751c385a876b6ce9cf6
-MISC metadata.xml 401 BLAKE2B 114b82879f1ab00f4b6b0784a675fc50ba303fee05355f5d6edf32e3f5d3e3015f43e8f300fb9ff45b9dc9100a30431d0458ea8fe1c868090ad739e83587053e SHA512 87a96a6120a0a29c1b05aa43c1548cea9d7fcf0ff3c5815c3369dac7545c8ca05f5a7795f870566bd264cb2873fdf6a79a7dea92d318fca8078d8ec6d8c6a2e3
+MISC metadata.xml 458 BLAKE2B 944547ab787583b1cd6678e3183a3f6cd76cf95461fb05758887ccfd41ceb8fc0bf7278fe786fd36fe2eee3664876fe4692d849a88bff58c3707e57f256b67b0 SHA512 a6c0af734aa579d486cb4f707f84b6b6beb26121092ced9976d05a6428a8096f79591b842d3ad906e5cb76ea1c8cd2bc2d21d587d6cb03041cc3ba72905f76be
diff --git a/media-libs/libgphoto2/metadata.xml b/media-libs/libgphoto2/metadata.xml
index f99b55563f3b..56c76a00492c 100644
--- a/media-libs/libgphoto2/metadata.xml
+++ b/media-libs/libgphoto2/metadata.xml
@@ -10,5 +10,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">gphoto</remote-id>
+		<remote-id type="github">gphoto/libgphoto2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index cada8fc0e831..cadac1ab0b95 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,15 +1,12 @@
-DIST openimageio-2.3.12.0.tar.gz 32452689 BLAKE2B f5fd428c597b573586a4749b56225ad3c035ab1c2122ff3e93df8e90be5796cc57978aa9fc5b102f2cf64d2407e70a11683b5bbee118c9fac3536b965ed044cc SHA512 c8ec0ead8396717b218d937b9193ef9162c68446f6f1d477f3f0ee4b5656c3d7d53b58bf55aa300fbf57d367a47d795861b5683157e0d0271e0ea56f0460c58d
-DIST openimageio-2.3.13.0.tar.gz 32456755 BLAKE2B 897a7db0eabb9a7cc29ab8fea368c32fc70b63b5ecebbcfa8d1fffe55c2435d9638f8a1f69069c45fad3723a2b7dc40e83971f48892afc631a7593a7629fb92a SHA512 fbefa341a11fd502ec9313ca48a0fe433c5822699e4934f6a14089f670314cbe1c9c0b9a491b1d1927bda0223e38a62192c6ddeec6c4c5e6215a8b3fb6900dd8
-DIST openimageio-2.3.15.0.tar.gz 32626322 BLAKE2B 1367e40dbed3d43b53db1b7117c563782396b255e366ea9586438a5c81cb8ae96ff42a0e445c7932bc92dc327adae921b383c2e6d787dc6e67cf71946d6174c1 SHA512 8ed0303fd9314e01cbf6d45627eb6e88e3fd356387a7657a4b31bbe455a4a493f88a2b511c1d5cf86a9c00346dbc03f9b32d2a6df9da033e7e78e86142ce888c
-DIST openimageio-2.3.16.0.tar.gz 32632560 BLAKE2B bde9d46b74135f03215cc3741c0378580dc34381da041b3d06ff50154627edd69b93e1a714bc99c7800fe952300f752cb9d8ca62b042ec91569dbbc9bc10950f SHA512 2249dfc7f9c4ede563d5ed05ed76557e0b81c35054832b4de2a7820c8619886afa3f260cd26b5f4291f74c9d9c16b9a2ac3772e23b5b70bc87c2c7a0d0c10726
 DIST openimageio-2.3.17.0.tar.gz 32640557 BLAKE2B 6e3df687e51615687b2e1f445b9a241fa703fec14f0f93e80c50ce6c2e035489be751656e62dd685bac59f983942615fe8a33eeae7e83fd93b037e58d86a248b SHA512 25cb1a671e7cd5154e363eef178ab091fd7d55868746a4394340567a794f6c6f0295e58721a5b4ee8bf66b4cc0e6a01c3e82f9cc9de9953ae349d45738a04700
 DIST openimageio-2.3.19.0.tar.gz 32641108 BLAKE2B f4fd3ca79beecd839b2510a03856d47a59312b33885e8561e60650c896de05738bf757805bea7f2fb659581bb19ffbd6894513dc925e0af80235da4a5c31c9ce SHA512 f59068d9935ea43e07532e24c45752dc206054034ac79a8ae3ce698343695a4faac7b71ea39bc856946eb084b4287413d75fc5700c59c8d6b409722f47f53072
+DIST openimageio-2.3.20.0.tar.gz 32641238 BLAKE2B a2e266b9c982026370b9472fa7e1875d4c653a20182024bfa886ff0dda982081897241234a6bdff9a764ac0dda0c42a4c4565ca5bbefe44318b1a882870a6291 SHA512 2dbbfa43b2072c8016102b131207f25738a96834373739b004e9dfb76f4630de8badd3b0104f9f6a3e6778899d13c0da4036faad3fdf6c5b12d51340eb2080b8
+DIST openimageio-2.4.4.1.tar.gz 31884126 BLAKE2B e09cc98b9da00ec0a00feaa5c7a41e9dcd9d4799a3b4eb0a123f4864f1d19eb55b0923ca5532f41e93b16891c5a4e27ea0f16ac0bfa97fdee53202d18241c5a8 SHA512 a1fa4d8ef44675bc95e67f9fb5549af96768f295251375fedea5d354df9b70b2a879bba332fa408a6466b25f84e29b67e7e7550e5c13593cf86e421e444d2eab
 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
+DIST openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz 137901071 BLAKE2B 1e260eeba062026c719499425a3f7e3c2ccc7bd662725b6cceab4332d2d026bacc7df4c904cb776637ea60f9e2ba854d6e5010ffdc2a1621ad943b166d8402d3 SHA512 e7f7741d1cfadb3ea9ec5bab0b2556c58424c2dd89f938d5e93aeb99bff55479b11faa19cda4a481339be60de73317faa95e190d34d493c7825f706f4e57e73c
 DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb
-EBUILD openimageio-2.3.12.0-r3.ebuild 4633 BLAKE2B 56cb142c5d962d7d84f7a76180d72805d3b9692b7f3a52a4e13624c80585b7c5cdea618ef8e261cbc8c216d553476b492fd7769f1cba0d13d773ff96706ac608 SHA512 fcf49431e396094527e2668a7710a7d7f559d73545202e84ab54c821da572431d907972d721e2cc4c01a592af57769dd062f93428f231bfae715fa46cbb14ea4
-EBUILD openimageio-2.3.13.0.ebuild 4647 BLAKE2B 60643b8195accd80ab6edea8dac315025cd0c380efe0945ee8784fc576ff96c929a8a9be381aa4519b6e5dd106a7426c066975f156e8533770410d9f32c549d6 SHA512 e98309dfc5d5f14f86aa58a28c231ee4ee52c9d7e6d62f7e4c9ffb41dabf910422017050368fe3251fab09902a115e1c000c6cf6055a469c38c3658aa18d0646
-EBUILD openimageio-2.3.15.0.ebuild 4645 BLAKE2B d243bbb4e839d3d05f9fad6a7e7aabddbd11800e82f8e1552e03bd3188b18f5ba2d5374bff4b8411096d93f2afafda20f374c7df38ddc15de750c92626f782c3 SHA512 e77b06dda8a9f99f853cff9161dd7b49db20c565ec2f35f9f30255766f8056e02a120f3cc6159ee75f39ffd6e5263c3813fda93dab2d68cd6985b048c07f1b06
-EBUILD openimageio-2.3.16.0.ebuild 4647 BLAKE2B a4347189879e50539fdf20840a7485e45b3d46a50588ed8d4b99d23e677971fb629613f70a72d262c742e15f66642eb1e56f0cf5d3a9399e04570866e904aac3 SHA512 a65e58c8371ed08d9e4db86aacf130000ee894f19e8786249944b23cf5d96691e576d75398ce187292d094953135c03278e27c57426c22e7ba78aecfcc6cd289
 EBUILD openimageio-2.3.17.0.ebuild 4645 BLAKE2B 2502e0f959e2c11461e8dee961a1c4f1168e8803ca017b5350cb0a7313d3e7320a03cfb8004b27ca6448bd9a2f0e79b146e67ed6119c3afad002a9fcad588f6e SHA512 a29233608bb70379242ba0ada644e98030b527d178acddf6abbf7cf276a39a3deec488003b5fe4837e6a66f2f2fd4021336289570095553316c1707752d02f31
 EBUILD openimageio-2.3.19.0.ebuild 4647 BLAKE2B a4347189879e50539fdf20840a7485e45b3d46a50588ed8d4b99d23e677971fb629613f70a72d262c742e15f66642eb1e56f0cf5d3a9399e04570866e904aac3 SHA512 a65e58c8371ed08d9e4db86aacf130000ee894f19e8786249944b23cf5d96691e576d75398ce187292d094953135c03278e27c57426c22e7ba78aecfcc6cd289
+EBUILD openimageio-2.3.20.0.ebuild 4896 BLAKE2B 6b5f2ac2ad0b0d2771889def16899a1cc5d4bce8cd013a76b1c22efd9a5d689e4fe1af77fe63950db16cf2411baad965833c265b21dba1234dd80b4b35d4cefa SHA512 836201f3a028440f5ab4747bb495d5e277a98f6468d3dd567abad774c4b7db45ee0b2bfbecab32cc0509c93eacf73f674165a62d6c5fe37cb56b1dfb46464541
+EBUILD openimageio-2.4.4.1.ebuild 5464 BLAKE2B cb303e8afc4ae1cc79b38e88db41df78f9e5a28691432bb02ddc72a60d36292fd48dd5e57b60c4be08e2a2f50e7a6b170c4dcf68f6830ee82f230af18bb170fa SHA512 369dd8489080853d478e3cbcb1b9bbbf769c89de3c5fa7710c29c3b82bc62f17ee1e04bbc5034a555cae3357ffeb9fd4c2b01f7fe8d7fe830c0e7b697efb595f
 MISC metadata.xml 724 BLAKE2B 057b0c63428b1860a3b11442b9687b136a749935e3d0bb2e27eca00245d1d9e6f3e40aa796b723664b9b320d8c958a345812199ed04f8d1a476364a80c76e355 SHA512 5243cd4cac10b569e1488226b61c98012af13f50e32c023176e6a2ba29f7804e164b4774957b35f212bad62f496bb466b242d6bc1be44ca3ea0909371b9d5415
diff --git a/media-libs/openimageio/openimageio-2.3.12.0-r3.ebuild b/media-libs/openimageio/openimageio-2.3.12.0-r3.ebuild
deleted file mode 100644
index caf798e06340..000000000000
--- a/media-libs/openimageio/openimageio-2.3.12.0-r3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{8..10} )
-
-TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
-TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" test? (
-		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-	)"
-S="${WORKDIR}/oiio-${PV}"
-
-LICENSE="BSD"
-# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
-# for changing to openexr 3 which broke ABI.
-SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not quite working yet
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DBUILD_TESTING=$(usex test)
-		-DOIIO_BUILD_TESTS=$(usex test)
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-	if use python; then
-		mycmakeargs+=(
-			-DPYTHON_VERSION=${EPYTHON#python}
-			-DPYTHON_SITE_DIR=$(python_get_sitedir)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.3.13.0.ebuild b/media-libs/openimageio/openimageio-2.3.13.0.ebuild
deleted file mode 100644
index 4c6138dfb63b..000000000000
--- a/media-libs/openimageio/openimageio-2.3.13.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{8..10} )
-
-TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
-TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" test? (
-		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-	)"
-S="${WORKDIR}/oiio-${PV}"
-
-LICENSE="BSD"
-# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
-# for changing to openexr 3 which broke ABI.
-SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not quite working yet
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:0=
-	media-libs/libjpeg-turbo:=
-	sys-libs/zlib:=
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DBUILD_TESTING=$(usex test)
-		-DOIIO_BUILD_TESTS=$(usex test)
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-	if use python; then
-		mycmakeargs+=(
-			-DPYTHON_VERSION=${EPYTHON#python}
-			-DPYTHON_SITE_DIR=$(python_get_sitedir)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.3.15.0.ebuild b/media-libs/openimageio/openimageio-2.3.15.0.ebuild
deleted file mode 100644
index 28c46cd540b3..000000000000
--- a/media-libs/openimageio/openimageio-2.3.15.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{8..10} )
-
-TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
-TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" test? (
-		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-	)"
-S="${WORKDIR}/oiio-${PV}"
-
-LICENSE="BSD"
-# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
-# for changing to openexr 3 which broke ABI.
-SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not quite working yet
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DBUILD_TESTING=$(usex test)
-		-DOIIO_BUILD_TESTS=$(usex test)
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-	if use python; then
-		mycmakeargs+=(
-			-DPYTHON_VERSION=${EPYTHON#python}
-			-DPYTHON_SITE_DIR=$(python_get_sitedir)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.3.16.0.ebuild b/media-libs/openimageio/openimageio-2.3.16.0.ebuild
deleted file mode 100644
index f4ed9a26cc11..000000000000
--- a/media-libs/openimageio/openimageio-2.3.16.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{8..10} )
-
-TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
-TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" test? (
-		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
-		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
-	)"
-S="${WORKDIR}/oiio-${PV}"
-
-LICENSE="BSD"
-# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
-# for changing to openexr 3 which broke ABI.
-SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-X86_CPU_FEATURES=(
-	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not quite working yet
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-"
-RDEPEND="
-	dev-libs/boost:=
-	dev-cpp/robin-map
-	dev-libs/libfmt:=
-	dev-libs/pugixml:=
-	>=media-libs/libheif-1.7.0:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=dev-libs/imath-3.1.2-r4:=
-	>=media-libs/opencolorio-2.1.1-r4:=
-	>=media-libs/openexr-3:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	openvdb? (
-		dev-cpp/tbb:=
-		media-gfx/openvdb:=
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-
-	if use test ; then
-		mkdir -p "${BUILD_DIR}"/testsuite || die
-		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
-		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
-	fi
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DVERBOSE=ON
-		-DBUILD_TESTING=$(usex test)
-		-DOIIO_BUILD_TESTS=$(usex test)
-		-DINSTALL_FONTS=OFF
-		-DBUILD_DOCS=$(usex doc)
-		-DINSTALL_DOCS=$(usex doc)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_CCACHE=OFF
-		-DUSE_DCMTK=$(usex dicom)
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=OFF # not in Gentoo
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_OPENVDB=$(usex openvdb)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-	if use python; then
-		mycmakeargs+=(
-			-DPYTHON_VERSION=${EPYTHON#python}
-			-DPYTHON_SITE_DIR=$(python_get_sitedir)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# can't use font_src_install
-	# it does directory hierarchy recreation
-	FONT_S=(
-		"${S}/src/fonts/Droid_Sans"
-		"${S}/src/fonts/Droid_Sans_Mono"
-		"${S}/src/fonts/Droid_Serif"
-	)
-	insinto ${FONTDIR}
-	for dir in "${FONT_S[@]}"; do
-		doins "${dir}"/*.ttf
-	done
-}
diff --git a/media-libs/openimageio/openimageio-2.3.20.0.ebuild b/media-libs/openimageio/openimageio-2.3.20.0.ebuild
new file mode 100644
index 000000000000..b63857d89012
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.3.20.0.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="245e50edede2792205080eadc1dedce33ff5c1e4"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+	)"
+S="${WORKDIR}/oiio-${PV}"
+
+LICENSE="BSD"
+# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
+# for changing to openexr 3 which broke ABI.
+SLOT="0/$(ver_cut 1-2).1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Not quite working yet
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	dev-libs/boost:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		mkdir -p "${BUILD_DIR}"/testsuite || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+	fi
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DBUILD_TESTING=$(usex test)
+		-DOIIO_BUILD_TESTS=$(usex test)
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_VERSION=${EPYTHON#python}
+			-DPYTHON_SITE_DIR=$(python_get_sitedir)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# TODO: investigate failures
+	local myctestargs=(
+		-E "(openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|rla|targa|tiff-depths|zfile|unit_simd)"
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/openimageio/openimageio-2.4.4.1.ebuild b/media-libs/openimageio/openimageio-2.4.4.1.ebuild
new file mode 100644
index 000000000000..c51efdc3ec4f
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.4.4.1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..11} )
+
+TEST_OIIO_IMAGE_COMMIT="245e50edede2792205080eadc1dedce33ff5c1e4"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+	)"
+S="${WORKDIR}/oiio-${PV}"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Not quite working yet
+RESTRICT="!test? ( test )" # test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	dev-libs/boost:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		mkdir -p "${BUILD_DIR}"/testsuite || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+	fi
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DBUILD_TESTING=$(usex test)
+		-DOIIO_BUILD_TESTS=$(usex test)
+		-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_VERSION=${EPYTHON#python}
+			-DPYTHON_SITE_DIR=$(python_get_sitedir)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# TODO: investigate failures
+	local myctestargs=(
+		-E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd)"
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index a81987c5c540..d5375400dc2c 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,7 +1,7 @@
 AUX osl-1.11.16.0-no-imath.patch 2248 BLAKE2B b139b26a93c97d4584e80346c281e3f89bf2d86ac03ac1d316505b0d0bf1c539633265b92d5bece5873ff7547b85fe7fcb1f58388b669dd01eecf01a01582421 SHA512 ed8d5897968c00113d8a90ff10539c23c6cdf4debdef52acecf5559a599fcde85bdce87862c9327fa0c5548d1100b95864e681a53737a3d6e77f33d0527e9953
 AUX osl-1.11.17.0-llvm14.patch 1187 BLAKE2B 2925b8c83753bfaf3a45cbe3737bdb6490f9ced0131abf8c903075fa5b8949222e10aebf7ef905956efcfd3787c21e6bf5ac43491405b0f56b90dac0ae86a232 SHA512 2862f2b52b68cb5ff057f968cb48b30d54b84f00af251b08eb210a91aa8df940b03657cf61010ea52d99563fa8de8595fd0bde633c7b6d0912fc10276cd2fd16
 DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
-DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4
+DIST osl-1.12.6.2.tar.gz 20247666 BLAKE2B 68905b7dc1a055a7ded26f0a6661ba9db8ddc473fef9ec1de4dab37d0473ce22d123feb33416a44d7b57a80281a64c978540e83f200ac2199a9e49142e00749a SHA512 16e35842735b2dfba7d44a310a918ea8a54798f5ff873ec04bb33b9801612aaf0993ca44b9591fb0b797accb0451137edf6424e1b2a511a011b65f385663d828
 EBUILD osl-1.11.17.0-r4.ebuild 2916 BLAKE2B aa9d9c6a5990f1b1f98dd3f29c929aa3133298e7ce621eb00742049d5737a1bedf22a83332fddfefcdfa2782c412bcb9b6b4abd375bf3fbbd16fb91aa8238011 SHA512 65e0dd27eff41bf877dd9df9c69b300bbef55abbf1145c5e01a30819bb4ed4af717bb704c13f588773621ae3442d258db45014b2fb0ee4108dd52390af28a9de
-EBUILD osl-1.12.4.1-r2.ebuild 2288 BLAKE2B 4eb4472614a960a29ed871f0e6850590594886134a1b56243daa3752e1c0cebb972a20dff41367af764d22bf820747c9b383acc4c2c6979a19b64426f9b2217f SHA512 473a2b7176bb301738667ab997e1f1410904708dfc116f5ef189315fdca10d40e85ab3715d398fb5c2d0f32637bb560e1b8f60a22990d2cc7520f17aa10fc51c
+EBUILD osl-1.12.6.2.ebuild 2722 BLAKE2B 0f78dae18a41abd3aaeede3a09c9a8e08d31b5c6fd5027a5f34f8705e5413674a7a5da04980652c8659483f0445e841104bf62e33e507424b47b69086a00cac0 SHA512 8856b1154cc650fc023eb9e14867bdf0b3467531225a22b17fb045eaf0379d9861080213098775dca0f53bd9638aa5e36d9cc1d000c00b3696637706656d8aa9
 MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
diff --git a/media-libs/osl/osl-1.12.4.1-r2.ebuild b/media-libs/osl/osl-1.12.4.1-r2.ebuild
deleted file mode 100644
index b04804eadb45..000000000000
--- a/media-libs/osl/osl-1.12.4.1-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-# Check this on updates
-LLVM_MAX_SLOT=13
-
-inherit cmake llvm toolchain-funcs python-single-r1
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="http://opensource.imageworks.com/?p=osl"
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}-dev.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenShadingLanguage-${PV}-dev"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/pugixml
-	>=media-libs/openexr-3:0=
-	>=media-libs/openimageio-2.3.12.0:=
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	sys-libs/zlib:=
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pybind11[${PYTHON_USEDEP}]
-		')
-	)
-	partio? ( media-libs/partio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-# Restricting tests as Makefile handles them differently
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.4.1-openexr-3-imath.patch
-)
-
-llvm_check_deps() {
-	has_version -r "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	llvm_pkg_setup
-}
-
-src_configure() {
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local gcc="$(tc-getCC)"
-	# LLVM needs CPP11. Do not disable.
-	local mycmakeargs=(
-		-DCMAKE_CXX_STANDARD=14
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DINSTALL_DOCS=$(usex doc)
-		-DUSE_CCACHE=OFF
-		-DLLVM_STATIC=OFF
-		-DOSL_BUILD_TESTS=$(usex test)
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_PARTIO=$(usex partio)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/osl/osl-1.12.6.2.ebuild b/media-libs/osl/osl-1.12.6.2.ebuild
new file mode 100644
index 000000000000..965e1f0404e3
--- /dev/null
+++ b/media-libs/osl/osl-1.12.6.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+# Check this on updates
+LLVM_MAX_SLOT=15
+
+inherit cmake llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+# If a development release, please don't keyword!
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/pugixml
+	>=media-libs/openexr-3:0=
+	>=media-libs/openimageio-2.3.12.0:=
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	sys-libs/zlib:=
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	partio? ( media-libs/partio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+llvm_check_deps() {
+	has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local gcc="$(tc-getCC)"
+	local mycmakeargs=(
+		# Still needed?
+		# See https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1454
+		#-DCMAKE_CXX_STANDARD=14
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS=$(usex doc)
+		-DUSE_CCACHE=OFF
+		-DLLVM_STATIC=OFF
+		-DOSL_BUILD_TESTS=$(usex test)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_PARTIO=$(usex partio)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_PYTHON=$(usex python)
+		-DPYTHON_VERSION="${EPYTHON/python}"
+		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	# TODO: investigate failures
+	local myctestargs=(
+		-E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward)"
+	)
+
+	cmake_src_test
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 981196ce599d..0d47e6225b78 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 854951fa0047..f1717784a6ba 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Oct 2022 23:09:42 +0000
+Sun, 02 Oct 2022 05:09:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index d73fb4524473..4c69ee82dc87 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 529256 BLAKE2B a8ad285bac1cf4317c62825ad52e916f3d77cdd05175694abbde87461cf015178a8cf1dd6c3af6013668089990ee96f6cb9be7de7409b13ba538d09d94cde515 SHA512 3502c0b489efa2b78e07af6e3b1c1c817c21c7435c1db2224f9b91f9d0ce815b1514a1e3062680326c8a33813260f974b3b492221b06b61e7499b2dcad6eaeb1
-TIMESTAMP 2022-10-01T23:09:46Z
+TIMESTAMP 2022-10-02T05:09:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM4yLpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM5HRxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC1wQ//YZe+GBbbbs/Rei8qgULsEdwmjmMYXaudC69XG4sWM+vzryQs4FQWfBZn
-kClifsmAZzXPkqFdIZYcbC3UxweXocsU3SMbcXV5fFzYfdNH4iX7kFBYNaFYLTyB
-fBjM9wdX86QnjJ0yKo9OTO7O5cOzlo92lNxuVhxRwXK8VwZ4mipfPPCoMyyUPLzX
-brYkaiKjqS6nQAPz8Qqyb1CO9TxuZuPTJCd4h8tx6kWxCuCIh0VjtY1Jp3BLJuNS
-H44Awqq2tGGgl6gOU8BH1+/IRNvBwAF2llOo1PvZj5fw2/ZzfU4PHdmkFXsA3Wee
-o1/ohlxRmWdPUBbXeV1dpQdh/OE4j1/1SubsLWf9xp0pDV/OOMovnYmeMpWdQQCb
-jcwmecfrIVf/3wzIOryold8eaA26cz2kJ17TXGRT9mY/3EGWRonjcO7lrEpefXPV
-GktSHzMHwlYfSoTzUbDbPSxUCAJk9uvW43ubhDrFcwYRsapA0kgpBmUzst/sB/XR
-cy2ifQc2MnTTp3UtBigC4QjApjANtUvWdWZtFeWk/TeTZx/G2VF68rP1MF+1rtTt
-ng8KPGoySLMur+VoOmdwI9IL0Rbkohg2e9o3h5CH/TgcN/1Z1gy/atcd6weMY32E
-3f9gK2xzgl2EiKZU+WYiVf+2DeuFaIf33h9zNMGJCBeFjU5C5LI=
-=fWpG
+klCaYg/+JPUCj+NAL9q5dBUjvENd4siHtE4ZkliEdH9q3G6f3UEy3OS479xvg5cj
+7YsZ2yw0H2UHSzU7eB2PuejrG+u4y5zlcWsZi/Uqcx/03QuA8lJdisYRN8SlBp32
+N1qrrQMmmxN/yv1NClfKodCJINDQGgdf95ohXr9SHV4Ch3M3AoLuZdfnc7/0ELwN
+eqJOAy2PA4/qIkCogCuedkg4c90lJXQ8NmJ4M6N1liUO/WZkRv8Qn8JCDeynVcKu
+fzrKXjUMvBRhZJwo3iY6h0MEmAeCEQqA8xFoEgpDDx1F3YE+Cy+gv94xr2zuYE1o
+ZpSqQMVILLZX3L9a7cOnDOoZcHbGMpOXejhx9TdWwuGCQImQIKPr57ZXRPWwQQDN
+G6y8iumKR70xW2lrIY5Jppr76moZ8Ff4utFZ8oXe11GH/w2j2/OPWOHsZDM1LGfC
+R6EwlOWBJun7OmPJpPetNEZKTxUnY5ND/YL8wXmlA5Xeq6tOM95AkB0IukL7ygOG
+fL80a+uWn3dY9dRpDvE354TTLvpLl9DwCr2r/qY2XbQur13Aa0h9LwuHRArdKdTG
+gOXGFLqf+byZfZ6FLwQDUHjxKzpnA8F8jl9YWzLfofvLrsmYfnqWBxbdS3BqF88v
+hTS8ljlNo+GmPTaNl7eL6BlhahAJl38LVdZJvEwPu+jRk2NgyI4=
+=UdCT
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 854951fa0047..53fdcd033673 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Oct 2022 23:09:42 +0000
+Sun, 02 Oct 2022 05:09:43 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6e6b20375d9f..0561fd6f9fb7 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 8e2a33617a25..90c577f70544 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.5 b/metadata/md5-cache/app-accessibility/brltty-6.5
new file mode 100644
index 000000000000..949dcdb8eaa2
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/brltty-6.5
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig java? ( >=virtual/jdk-1.8:* ) nls? ( virtual/libintl ) python? ( >=dev-python/cython-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=acct-group/brltty acct-user/brltty dev-libs/libpcre2[pcre32] bluetooth? ( sys-apps/dbus net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( 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 ) ) speech? ( app-accessibility/espeak-ng app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:1 ) xml? ( dev-libs/expat ) X? ( app-accessibility/at-spi2-core:2 sys-apps/dbus x11-libs/libX11 x11-libs/libXaw x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst ) ocaml? ( >=dev-ml/findlib-1.0.4-r1[ocamlopt?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind person
+EAPI=8
+HOMEPAGE=https://brltty.app/
+INHERIT=findlib toolchain-funcs java-pkg-opt-2 autotools python-r1 tmpfiles
+IUSE=+api +beeper bluetooth doc +fm gpm iconv icu java louis +midi ncurses nls ocaml +pcm policykit python usb systemd +speech tcl xml X +ocamlopt java python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=acct-group/brltty acct-user/brltty dev-libs/libpcre2[pcre32] bluetooth? ( sys-apps/dbus net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( 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 ) ) speech? ( app-accessibility/espeak-ng app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:1 ) xml? ( dev-libs/expat ) X? ( app-accessibility/at-spi2-core:2 sys-apps/dbus x11-libs/libX11 x11-libs/libXaw x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst ) java? ( >=virtual/jre-1.8:* ) ocaml? ( dev-lang/ocaml:=[ocamlopt?] ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) tcl? ( api )
+SLOT=0
+SRC_URI=https://brltty.app/archive/brltty-6.5.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	findlib	d8fa93cf137156660d0b72144b1e31d9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e99b01862ff187e4e0a6d9ddda0e61f2
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index cee06e7ef9cc..c8aa6c219c96 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.14.05 b/metadata/md5-cache/app-benchmarks/stress-ng-0.14.05
deleted file mode 100644
index 1ad7567b9684..000000000000
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.14.05
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile pretend setup
-DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= apparmor? ( sys-apps/apparmor-utils sys-libs/libapparmor ) sctp? ( net-misc/lksctp-tools )
-DESCRIPTION=Stress test for a computer system with various selectable ways
-EAPI=8
-HOMEPAGE=https://github.com/ColinIanKing/stress-ng
-INHERIT=linux-info toolchain-funcs
-IUSE=apparmor sctp
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= apparmor? ( sys-apps/apparmor-utils sys-libs/libapparmor ) sctp? ( net-misc/lksctp-tools )
-SLOT=0
-SRC_URI=https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V0.14.05.tar.gz -> stress-ng-0.14.05.tar.gz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ecf3b932ecb05aee6ec82419ff14f785
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.14.06 b/metadata/md5-cache/app-benchmarks/stress-ng-0.14.06
new file mode 100644
index 000000000000..32f23ba3ce21
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.14.06
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile pretend setup
+DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= apparmor? ( sys-apps/apparmor-utils sys-libs/libapparmor ) sctp? ( net-misc/lksctp-tools )
+DESCRIPTION=Stress test for a computer system with various selectable ways
+EAPI=8
+HOMEPAGE=https://github.com/ColinIanKing/stress-ng
+INHERIT=linux-info toolchain-funcs
+IUSE=apparmor sctp
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= apparmor? ( sys-apps/apparmor-utils sys-libs/libapparmor ) sctp? ( net-misc/lksctp-tools )
+SLOT=0
+SRC_URI=https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V0.14.06.tar.gz -> stress-ng-0.14.06.tar.gz
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ecf3b932ecb05aee6ec82419ff14f785
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 637fda435750..84e05cb08082 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0-r3 b/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0-r3
deleted file mode 100644
index 33fe19dd29e9..000000000000
--- a/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/openssl-1.0.1:0= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:= sys-libs/zlib app-arch/bzip2
-DESCRIPTION=Fast password cracker
-EAPI=7
-HOMEPAGE=http://www.openwall.com/john/
-INHERIT=flag-o-matic toolchain-funcs pax-utils
-IUSE=custom-cflags kerberos mpi opencl openmp pcap
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/openssl-1.0.1:0= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:= sys-libs/zlib app-arch/bzip2 !app-crypt/johntheripper
-SLOT=0
-SRC_URI=https://www.openwall.com/john/k/john-1.9.0-jumbo-1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=64f0f1b61caf7a05a8550ad2804859c9
diff --git a/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20210920 b/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20210920
deleted file mode 100644
index 1d98f0d91416..000000000000
--- a/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20210920
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/openssl-1.0.1:= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:= sys-libs/zlib app-arch/bzip2
-DESCRIPTION=Fast password cracker
-EAPI=7
-HOMEPAGE=http://www.openwall.com/john/
-INHERIT=autotools flag-o-matic toolchain-funcs pax-utils
-IUSE=custom-cflags kerberos mpi opencl openmp pcap
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/openssl-1.0.1:= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:= sys-libs/zlib app-arch/bzip2 !app-crypt/johntheripper
-SLOT=0
-SRC_URI=https://github.com/openwall/john/archive/43c7f8850736d4ec68bf0a022ae9fb34c274a01d.tar.gz -> johntheripper-jumbo-1.9.0_p20210920.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9ccaca9ac265233737d28e49513119e3
diff --git a/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20211129 b/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20211129
deleted file mode 100644
index 25c7d3b4d92d..000000000000
--- a/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20211129
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/openssl-1.0.1:= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:= sys-libs/zlib app-arch/bzip2
-DESCRIPTION=Fast password cracker
-EAPI=7
-HOMEPAGE=http://www.openwall.com/john/
-INHERIT=autotools flag-o-matic toolchain-funcs pax-utils
-IUSE=custom-cflags kerberos mpi opencl openmp pcap
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/openssl-1.0.1:= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:= sys-libs/zlib app-arch/bzip2 dev-perl/Digest-MD2 virtual/perl-Digest-MD5 dev-perl/Digest-SHA3 dev-perl/Digest-GOST !app-crypt/johntheripper
-SLOT=0
-SRC_URI=https://github.com/openwall/john/archive/5d0c85f16f96ca7b6dd06640e95a5801081d6e20.tar.gz -> johntheripper-jumbo-1.9.0_p20211129.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ca18cabd3a7815c328816aed1c40f2e7
diff --git a/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20211129-r1 b/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20211129-r1
new file mode 100644
index 000000000000..9f64e94299dd
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/johntheripper-jumbo-1.9.0_p20211129-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=>=dev-libs/openssl-1.0.1:= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:= sys-libs/zlib app-arch/bzip2
+DESCRIPTION=Fast password cracker
+EAPI=7
+HOMEPAGE=http://www.openwall.com/john/
+INHERIT=autotools flag-o-matic toolchain-funcs pax-utils
+IUSE=custom-cflags kerberos mpi opencl openmp pcap
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/openssl-1.0.1:= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:= sys-libs/zlib app-arch/bzip2 dev-perl/Digest-MD2 virtual/perl-Digest-MD5 dev-perl/Digest-SHA3 dev-perl/Digest-GOST !app-crypt/johntheripper
+SLOT=0
+SRC_URI=https://github.com/openwall/john/archive/5d0c85f16f96ca7b6dd06640e95a5801081d6e20.tar.gz -> johntheripper-jumbo-1.9.0_p20211129.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=4e6c63a734463c75f5b7aec7d6fc465a
diff --git a/metadata/md5-cache/app-crypt/johntheripper-jumbo-9999 b/metadata/md5-cache/app-crypt/johntheripper-jumbo-9999
index f592a717f6c1..2125de7cdc1a 100644
--- a/metadata/md5-cache/app-crypt/johntheripper-jumbo-9999
+++ b/metadata/md5-cache/app-crypt/johntheripper-jumbo-9999
@@ -1,5 +1,5 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEFINED_PHASES=compile configure install prepare pretend setup unpack
 DEPEND=>=dev-libs/openssl-1.0.1:= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:= sys-libs/zlib app-arch/bzip2
 DESCRIPTION=Fast password cracker
 EAPI=7
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/openssl-1.0.1:= virtual/libcrypt:= mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) kerberos? ( virtual/krb5 ) pcap? ( net-libs/libpcap ) dev-libs/gmp:= sys-libs/zlib app-arch/bzip2 dev-perl/Digest-MD2 virtual/perl-Digest-MD5 dev-perl/Digest-SHA3 dev-perl/Digest-GOST !app-crypt/johntheripper
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=41380867d1c66db8775473f5d70c1650
+_md5_=b805cec1ea03dccebd872b908e55b83a
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 32a80c169ae7..f35c27314c79 100644
Binary files a/metadata/md5-cache/app-dicts/Manifest.gz and b/metadata/md5-cache/app-dicts/Manifest.gz differ
diff --git a/metadata/md5-cache/app-dicts/aspell-da-4.0 b/metadata/md5-cache/app-dicts/aspell-da-4.0
deleted file mode 100644
index 3a9ee227ce83..000000000000
--- a/metadata/md5-cache/app-dicts/aspell-da-4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/which
-DEFINED_PHASES=configure install
-DEPEND=app-text/aspell
-DESCRIPTION=Aspell (Danish) language dictionary
-EAPI=8
-HOMEPAGE=https://github.com/mortenivar/aspell-da
-INHERIT=aspell-dict-r1
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=app-text/aspell
-SLOT=0
-SRC_URI=https://github.com/mortenivar/aspell-da/archive/refs/tags/4.0.tar.gz -> aspell-da-4.0.tar.gz
-_eclasses_=aspell-dict-r1	dc35762817047596da90d52917261158
-_md5_=33f84967e5c720d69a50b47af60c6210
diff --git a/metadata/md5-cache/app-dicts/aspell-da-4.1 b/metadata/md5-cache/app-dicts/aspell-da-4.1
index 2df2cdfc5a20..23a53579c93d 100644
--- a/metadata/md5-cache/app-dicts/aspell-da-4.1
+++ b/metadata/md5-cache/app-dicts/aspell-da-4.1
@@ -5,10 +5,10 @@ DESCRIPTION=Aspell (Danish) language dictionary
 EAPI=8
 HOMEPAGE=https://github.com/mortenivar/aspell-da
 INHERIT=aspell-dict-r1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=app-text/aspell
 SLOT=0
 SRC_URI=https://github.com/mortenivar/aspell-da/archive/refs/tags/4.1.tar.gz -> aspell-da-4.1.tar.gz
 _eclasses_=aspell-dict-r1	dc35762817047596da90d52917261158
-_md5_=57a57dc154090fb7641f4468e943d56d
+_md5_=33f84967e5c720d69a50b47af60c6210
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index c7f8f598a8be..019ba18c1313 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/ghostscript-gpl-10.0.0 b/metadata/md5-cache/app-text/ghostscript-gpl-10.0.0
new file mode 100644
index 000000000000..c313e344edf7
--- /dev/null
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-10.0.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=app-text/libpaper:= media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:= media-libs/libjpeg-turbo:= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:= >=sys-libs/zlib-1.2.7 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) unicode? ( net-dns/libidn:= ) X? ( x11-libs/libXt x11-libs/libXext )
+DESCRIPTION=Interpreter for the PostScript language and PDF
+EAPI=8
+HOMEPAGE=https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary
+INHERIT=autotools toolchain-funcs
+IUSE=cups dbus gtk l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=AGPL-3 CPL-1.0
+RDEPEND=app-text/libpaper:= media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:= media-libs/libjpeg-turbo:= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:= >=sys-libs/zlib-1.2.7 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) unicode? ( net-dns/libidn:= ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.11-r2 >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
+SLOT=0/10.0
+SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs1000/ghostscript-10.0.0.tar.xz https://dev.gentoo.org/~sam/distfiles/app-text/ghostscript-gpl/ghostscript-gpl-10.0-patches.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=575a9100621a7d9823710b293bd68e30
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1-r2 b/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1-r2
deleted file mode 100644
index 1f4a3369b43e..000000000000
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=app-text/libpaper:= media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:= media-libs/libjpeg-turbo:= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:= >=sys-libs/zlib-1.2.7 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) unicode? ( net-dns/libidn:= ) X? ( x11-libs/libXt x11-libs/libXext )
-DESCRIPTION=Interpreter for the PostScript language and PDF
-EAPI=8
-HOMEPAGE=https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary
-INHERIT=autotools toolchain-funcs
-IUSE=cups dbus gtk l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=AGPL-3 CPL-1.0
-RDEPEND=app-text/libpaper:= media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:= media-libs/libjpeg-turbo:= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:= >=sys-libs/zlib-1.2.7 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) unicode? ( net-dns/libidn:= ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.11-r1 >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
-SLOT=0/9.56
-SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/ghostscript-9.56.1.tar.xz https://dev.gentoo.org/~sam/distfiles/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-patchset-01.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.56.1-patchset-01.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a3cf2cc41933938b51eec42900bd4dda
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1-r3 b/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1-r3
new file mode 100644
index 000000000000..f9ed00342f57
--- /dev/null
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.56.1-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=app-text/libpaper:= media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:= media-libs/libjpeg-turbo:= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:= >=sys-libs/zlib-1.2.7 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) unicode? ( net-dns/libidn:= ) X? ( x11-libs/libXt x11-libs/libXext )
+DESCRIPTION=Interpreter for the PostScript language and PDF
+EAPI=8
+HOMEPAGE=https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary
+INHERIT=autotools toolchain-funcs
+IUSE=cups dbus gtk l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=AGPL-3 CPL-1.0
+RDEPEND=app-text/libpaper:= media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:= media-libs/libjpeg-turbo:= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:= >=sys-libs/zlib-1.2.7 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) unicode? ( net-dns/libidn:= ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.11-r2 >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
+SLOT=0/9.56
+SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/ghostscript-9.56.1.tar.xz https://dev.gentoo.org/~sam/distfiles/app-text/ghostscript-gpl/ghostscript-gpl-9.56.1-patchset-01.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.56.1-patchset-01.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a0584df876c3bd663e30570f141bd5a2
diff --git a/metadata/md5-cache/app-text/poppler-data-0.4.11-r1 b/metadata/md5-cache/app-text/poppler-data-0.4.11-r1
deleted file mode 100644
index 03c56be8408b..000000000000
--- a/metadata/md5-cache/app-text/poppler-data-0.4.11-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
-EAPI=8
-HOMEPAGE=https://poppler.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=AGPL-3+ BSD GPL-2 MIT
-SLOT=0
-SRC_URI=https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz https://dev.gentoo.org/~sam/distfiles/app-text/poppler-data/poppler-data-0.4.11-extra.tar.xz
-_md5_=306f8db218a3ee896d0dc1e1dabec3df
diff --git a/metadata/md5-cache/app-text/poppler-data-0.4.11-r2 b/metadata/md5-cache/app-text/poppler-data-0.4.11-r2
new file mode 100644
index 000000000000..6275e7211880
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-data-0.4.11-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
+EAPI=8
+HOMEPAGE=https://poppler.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=AGPL-3+ BSD GPL-2 MIT
+SLOT=0
+SRC_URI=https://poppler.freedesktop.org/poppler-data-0.4.11.tar.gz https://dev.gentoo.org/~sam/distfiles/app-text/poppler-data/poppler-data-0.4.11-2-extra.tar.xz
+_md5_=b29855faf27d7bd8e488db977117fa74
diff --git a/metadata/md5-cache/app-text/qpdf-11.1.1 b/metadata/md5-cache/app-text/qpdf-11.1.1
new file mode 100644
index 000000000000..854eaac07cbe
--- /dev/null
+++ b/metadata/md5-cache/app-text/qpdf-11.1.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl doc? ( app-arch/unzip ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) ) test? ( app-text/ghostscript-gpl[tiff(+)] media-libs/tiff sys-apps/diffutils )
+DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
+EAPI=8
+HOMEPAGE=https://qpdf.sourceforge.net/
+INHERIT=cmake bash-completion-r1
+IUSE=doc examples gnutls ssl test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris
+LICENSE=|| ( Apache-2.0 Artistic-2 )
+RDEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:= ) )
+RESTRICT=!test? ( test )
+SLOT=0/11
+SRC_URI=https://github.com/qpdf/qpdf/releases/download/v11.1.1/qpdf-11.1.1.tar.gz doc? ( https://github.com/qpdf/qpdf/releases/download/v11.1.1/qpdf-11.1.1-doc.zip )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=cbbea2a8900790ca0568a08025855b92
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 2822fd884e81..ab4b2334e50f 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/intel-vc-intrinsics-0.7.1 b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.7.1
new file mode 100644
index 000000000000..3ddb5560bcaa
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.7.1
@@ -0,0 +1,14 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libxml2:2= sys-devel/llvm:13 sys-libs/zlib !!sys-devel/llvm:0
+DESCRIPTION=A set of new intrinsics on top of core LLVM IR instructions
+EAPI=8
+HOMEPAGE=https://github.com/intel/vc-intrinsics
+INHERIT=cmake llvm python-any-r1
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/libxml2:2= sys-devel/llvm:13 sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/intel/vc-intrinsics/archive/refs/tags/v0.7.1.tar.gz -> intel-vc-intrinsics-0.7.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=867cc2b2119ea2e61551aaa75eb3d9e6
diff --git a/metadata/md5-cache/dev-libs/libofx-0.10.8 b/metadata/md5-cache/dev-libs/libofx-0.10.8
new file mode 100644
index 000000000000..a556b5f915dd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libofx-0.10.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gengetopt sys-apps/help2man virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( app-crypt/gnupg )
+DEFINED_PHASES=compile configure install
+DEPEND=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
+DESCRIPTION=Library to support the Open Financial eXchange XML format
+EAPI=8
+HOMEPAGE=https://github.com/libofx/libofx
+INHERIT=flag-o-matic
+IUSE=doc test
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>app-text/opensp-1.5 app-text/openjade >=dev-cpp/libxmlpp-2.40.1:2.6 >=net-misc/curl-7.9.7 virtual/libiconv
+RESTRICT=!test? ( test )
+SLOT=0/10
+SRC_URI=https://github.com/libofx/libofx/releases/download/0.10.8/libofx-0.10.8.tar.gz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4476a429fecde61e815f6919e1f9c6bc
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 1d1d9690c357..ff6dba85d294 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.5.0 b/metadata/md5-cache/dev-lua/luaexpat-1.5.0
index a2dbeda91f11..bd29479018f7 100644
--- a/metadata/md5-cache/dev-lua/luaexpat-1.5.0
+++ b/metadata/md5-cache/dev-lua/luaexpat-1.5.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/lunarmodules/luaexpat
 INHERIT=lua toolchain-funcs
 IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-libs/expat lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/lunarmodules/luaexpat/archive/refs/tags/1.5.0.tar.gz -> luaexpat-1.5.0.tar.gz
 _eclasses_=lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=db75def53e94913ea59538f202762ad8
+_md5_=a4d8221bc913e21aef54c8645fb3619f
diff --git a/metadata/md5-cache/dev-lua/readline-3.2 b/metadata/md5-cache/dev-lua/readline-3.2
new file mode 100644
index 000000000000..904e05ef6733
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/readline-3.2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-lua/luaposix sys-libs/readline:=
+DESCRIPTION=A simple interface to the readline and history libraries
+EAPI=8
+HOMEPAGE=https://pjb.com.au/comp/lua/readline.html
+INHERIT=lua toolchain-funcs
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lua/luaposix sys-libs/readline:=
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pjb.com.au/comp/lua/readline-3.2.tar.gz -> lua-readline-3.2.tar.gz
+_eclasses_=lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a341b95a32a81aaaa5a5a90478d876a2
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 413f3ac01138..ba89f8f4d2e1 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1 b/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1
deleted file mode 100644
index 162650eac336..000000000000
--- a/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-ml/ounit2 ) dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=<dev-ml/yojson-2.0.0:= >=dev-ml/ppxlib-0.20.0:= dev-ml/ppx_deriving:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=JSON codec generator for OCaml
-EAPI=7
-HOMEPAGE=https://github.com/ocaml-ppx/ppx_deriving_yojson/
-INHERIT=dune
-IUSE=+ocamlopt test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=<dev-ml/yojson-2.0.0:= >=dev-ml/ppxlib-0.20.0:= dev-ml/ppx_deriving:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
-SLOT=0/3.6.1
-SRC_URI=https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.6.1.tar.gz -> ppx_deriving_yojson-3.6.1.tar.gz
-_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=7549c77ace839b5bbb34cf6898aaa54f
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1-r1 b/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1-r1
new file mode 100644
index 000000000000..8448c36da861
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ml/ounit2 ) dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/ppxlib-0.20.0:= dev-ml/ppx_deriving:= dev-ml/result:= dev-ml/yojson:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=JSON codec generator for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-ppx/ppx_deriving_yojson/
+INHERIT=dune
+IUSE=+ocamlopt test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-ml/ppxlib-0.20.0:= dev-ml/ppx_deriving:= dev-ml/result:= dev-ml/yojson:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/3.6.1
+SRC_URI=https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.6.1.tar.gz -> ppx_deriving_yojson-3.6.1.tar.gz
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=397237f651de1b81429d101aacd2ef0e
diff --git a/metadata/md5-cache/dev-ml/re-1.10.4-r1 b/metadata/md5-cache/dev-ml/re-1.10.4-r1
deleted file mode 100644
index 235084a2b196..000000000000
--- a/metadata/md5-cache/dev-ml/re-1.10.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-ml/ounit2 ) dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install test
-DEPEND=!dev-ml/ocaml-re >=dev-lang/ocaml-4.09 !dev-ml/seq >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Regular expression library for OCaml
-EAPI=8
-HOMEPAGE=https://github.com/ocaml/ocaml-re
-INHERIT=dune
-IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2-with-linking-exception
-RDEPEND=!dev-ml/ocaml-re >=dev-lang/ocaml-4.09 !dev-ml/seq >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
-SLOT=0/1.10.4
-SRC_URI=https://github.com/ocaml/ocaml-re/archive/1.10.4.tar.gz -> ocaml-re-1.10.4.tar.gz
-_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=057024ee53b25c31439d3af39d16e381
diff --git a/metadata/md5-cache/dev-ml/re-1.10.4-r2 b/metadata/md5-cache/dev-ml/re-1.10.4-r2
new file mode 100644
index 000000000000..dfc12bbad5ae
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/re-1.10.4-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ml/ounit2 ) dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=!dev-ml/ocaml-re !<dev-ml/seq-0.3 >=dev-lang/ocaml-4.09 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Regular expression library for OCaml
+EAPI=8
+HOMEPAGE=https://github.com/ocaml/ocaml-re
+INHERIT=dune
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2-with-linking-exception
+RDEPEND=!dev-ml/ocaml-re !<dev-ml/seq-0.3 >=dev-lang/ocaml-4.09 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/1.10.4
+SRC_URI=https://github.com/ocaml/ocaml-re/archive/1.10.4.tar.gz -> ocaml-re-1.10.4.tar.gz
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=50cc4c67d5a9b081fedec7a86be82532
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 75800c49a714..3102553866af 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/contourpy-1.0.5 b/metadata/md5-cache/dev-python/contourpy-1.0.5
index 74189d5eec1a..d716077d48ff 100644
--- a/metadata/md5-cache/dev-python/contourpy-1.0.5
+++ b/metadata/md5-cache/dev-python/contourpy-1.0.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/contourpy/ https://github.com/contourpy/contourpy/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~hppa ~riscv
+KEYWORDS=~alpha ~amd64 ~hppa ~riscv
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.16[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/contourpy/contourpy/archive/v1.0.5.tar.gz -> contourpy-1.0.5.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fc76ec6aaec9aaf45767afb125d36a5b
+_md5_=77ba7b69f37bc2b6b9a3ce03b198b187
diff --git a/metadata/md5-cache/dev-python/gst-python-1.20.3 b/metadata/md5-cache/dev-python/gst-python-1.20.3
index 974240a8872f..2d36c7452af2 100644
--- a/metadata/md5-cache/dev-python/gst-python-1.20.3
+++ b/metadata/md5-cache/dev-python/gst-python-1.20.3
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 ) >=media-libs/gstreamer-1.20.3:1.0[introspection] >=media-libs/gst-plugins-base-1.20.3:1.0[introspection] >=dev-python/pygobject-3.8:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEPEND=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 ) >=media-libs/gstreamer-1.20.3:1.0[introspection] >=media-libs/gst-plugins-base-1.20.3:1.0[introspection] >=dev-python/pygobject-3.8:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DESCRIPTION=A Python Interface to GStreamer
 EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=meson python-r1 xdg-utils
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+
-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 ) >=media-libs/gstreamer-1.20.3:1.0[introspection] >=media-libs/gst-plugins-base-1.20.3:1.0[introspection] >=dev-python/pygobject-3.8:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.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 ) >=media-libs/gstreamer-1.20.3:1.0[introspection] >=media-libs/gst-plugins-base-1.20.3:1.0[introspection] >=dev-python/pygobject-3.8:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7eff2292db0113db4cd3cdd5e112a74b
+_md5_=17c1e9e12cd79c5aaca480a7cd7d3770
diff --git a/metadata/md5-cache/dev-python/hatch-fancy-pypi-readme-22.7.0 b/metadata/md5-cache/dev-python/hatch-fancy-pypi-readme-22.7.0
index 2a3cc6d97634..3fb2091efa6a 100644
--- a/metadata/md5-cache/dev-python/hatch-fancy-pypi-readme-22.7.0
+++ b/metadata/md5-cache/dev-python/hatch-fancy-pypi-readme-22.7.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/hatch-fancy-pypi-readme/ https://github.com/hynek/hatch-fancy-pypi-readme/
 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=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/hatchling[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hynek/hatch-fancy-pypi-readme/archive/22.7.0.tar.gz -> hatch-fancy-pypi-readme-22.7.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e682f0b456fa06e6dd62453fd5bd870c
+_md5_=1fd8baf0d56dd9eaa108e8df4c5477a5
diff --git a/metadata/md5-cache/dev-python/pyatspi-2.46.0 b/metadata/md5-cache/dev-python/pyatspi-2.46.0
new file mode 100644
index 000000000000..bf2d8195fca6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyatspi-2.46.0
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig test? ( x11-libs/gtk+:3 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=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-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-2.90.1:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Python client bindings for D-Bus AT-SPI
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Accessibility
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2 python-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2 GPL-2+
+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 ) >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-2.90.1:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/dbus-1 >=app-accessibility/at-spi2-core-2.34[introspection]
+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://gnome/sources/pyatspi/2.46/pyatspi-2.46.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=cf025c6b02419350df04947f281324cf
diff --git a/metadata/md5-cache/dev-python/weasyprint-55.0 b/metadata/md5-cache/dev-python/weasyprint-55.0
index 61852c55c284..31ee587b3220 100644
--- a/metadata/md5-cache/dev-python/weasyprint-55.0
+++ b/metadata/md5-cache/dev-python/weasyprint-55.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( >=app-text/ghostscript-gpl-9.56.1-r2 <app-text/ghostscript-gpl-9.56.0 ) media-fonts/ahem media-fonts/dejavu ) test? ( >=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydyf-0.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/pango >=dev-python/pytest-7.1.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 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( || ( >=app-text/ghostscript-gpl-9.56.1-r3 <app-text/ghostscript-gpl-9.56.0 ) media-fonts/ahem media-fonts/dejavu ) test? ( >=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydyf-0.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/pango >=dev-python/pytest-7.1.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 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Visual rendering engine for HTML and CSS that can export to PDF
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/weasyprint/weasyprint-55.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4f56ac5d192365d464dbeb7a70e5a7b0
+_md5_=32f931698bdc13eb98388137c39a4320
diff --git a/metadata/md5-cache/dev-python/weasyprint-56.0 b/metadata/md5-cache/dev-python/weasyprint-56.0
index 9d7ef69744a7..af128fc7af42 100644
--- a/metadata/md5-cache/dev-python/weasyprint-56.0
+++ b/metadata/md5-cache/dev-python/weasyprint-56.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( >=app-text/ghostscript-gpl-9.56.1-r2 <app-text/ghostscript-gpl-9.56.0 ) media-fonts/ahem media-fonts/dejavu ) test? ( >=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydyf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/pango >=dev-python/pytest-7.1.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 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( || ( >=app-text/ghostscript-gpl-9.56.1-r3 <app-text/ghostscript-gpl-9.56.0 ) media-fonts/ahem media-fonts/dejavu ) test? ( >=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydyf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/pango >=dev-python/pytest-7.1.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 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Visual rendering engine for HTML and CSS that can export to PDF
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/weasyprint/weasyprint-56.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b3563835802ae7f7dcecc108e2c674f9
+_md5_=2ce28d7f709c7587057b9358b9ec8424
diff --git a/metadata/md5-cache/dev-python/weasyprint-56.1 b/metadata/md5-cache/dev-python/weasyprint-56.1
index c74f876a6741..2db6f1edc017 100644
--- a/metadata/md5-cache/dev-python/weasyprint-56.1
+++ b/metadata/md5-cache/dev-python/weasyprint-56.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( >=app-text/ghostscript-gpl-9.56.1-r2 <app-text/ghostscript-gpl-9.56.0 ) media-fonts/ahem media-fonts/dejavu ) test? ( >=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydyf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/pango >=dev-python/pytest-7.1.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 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( || ( >=app-text/ghostscript-gpl-9.56.1-r3 <app-text/ghostscript-gpl-9.56.0 ) media-fonts/ahem media-fonts/dejavu ) test? ( >=dev-python/cffi-0.6:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cssselect2-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fonttools-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html5lib-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-4.0.0[jpeg,jpeg2k,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydyf-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyphen-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tinycss2-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-libs/pango >=dev-python/pytest-7.1.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 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Visual rendering engine for HTML and CSS that can export to PDF
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/weasyprint/weasyprint-56.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b3563835802ae7f7dcecc108e2c674f9
+_md5_=2ce28d7f709c7587057b9358b9ec8424
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 7a3b9fb2a5f3..c04029638a4b 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/diffoscope-221 b/metadata/md5-cache/dev-util/diffoscope-221
deleted file mode 100644
index b52ef26390a9..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-221
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-text/docx2txt media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-7.1.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[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.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 prepare test
-DESCRIPTION=Will try to get to the bottom of what makes files or directories different
-EAPI=8
-HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
-INHERIT=distutils-r1
-IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-221.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=911c9fcf082f30db048e57d761b48b3f
diff --git a/metadata/md5-cache/dev-util/diffoscope-222 b/metadata/md5-cache/dev-util/diffoscope-222
deleted file mode 100644
index 06763576be75..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-222
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-text/docx2txt media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-7.1.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[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.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 prepare test
-DESCRIPTION=Will try to get to the bottom of what makes files or directories different
-EAPI=8
-HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
-INHERIT=distutils-r1
-IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-222.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=911c9fcf082f30db048e57d761b48b3f
diff --git a/metadata/md5-cache/dev-util/diffoscope-223 b/metadata/md5-cache/dev-util/diffoscope-223
new file mode 100644
index 000000000000..85cb01533ae4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-223
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-text/docx2txt media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-7.1.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[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.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 prepare test
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=8
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+INHERIT=distutils-r1
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-223.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=9be013debb09ba2029cf6735cfc80c71
diff --git a/metadata/md5-cache/dev-util/seer-1.11 b/metadata/md5-cache/dev-util/seer-1.11
new file mode 100644
index 000000000000..f33262170aff
--- /dev/null
+++ b/metadata/md5-cache/dev-util/seer-1.11
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
+DESCRIPTION=A GUI frontend to gdb
+EAPI=8
+HOMEPAGE=https://github.com/epasveer/seer
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake desktop xdg
+KEYWORDS=~amd64
+LICENSE=GPL-3+ CC-BY-3.0 CC-BY-4.0
+RDEPEND=dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-devel/gdb
+SLOT=0
+SRC_URI=https://github.com/epasveer/seer/archive/refs/tags/v1.11.tar.gz -> seer-1.11.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=86adb8d3c9d398bbac22232ff95c8a65
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 9b5c1f58261f..522869ea84a8 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/eduke32-20220702.10113-r1 b/metadata/md5-cache/games-fps/eduke32-20220702.10113-r1
deleted file mode 100644
index 8200958756f0..000000000000
--- a/metadata/md5-cache/games-fps/eduke32-20220702.10113-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/unzip x86? ( dev-lang/nasm )
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=media-libs/flac:= media-libs/libogg media-libs/libsdl2[alsa,joystick,opengl?,sound,video] media-libs/libvorbis media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) vpx? ( media-libs/libvpx:= ) xmp? ( media-libs/exempi:2= ) timidity? ( media-sound/timidity++ )
-DESCRIPTION=An open source engine port of the classic PC first person shooter Duke Nukem 3D
-EAPI=8
-HOMEPAGE=http://www.eduke32.com/
-INHERIT=desktop toolchain-funcs xdg-utils
-IUSE=duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=BUILDLIC GPL-2 HRP
-PDEPEND=duke3d? ( games-fps/duke3d-data )
-RDEPEND=media-libs/flac:= media-libs/libogg media-libs/libsdl2[alsa,joystick,opengl?,sound,video] media-libs/libvorbis media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) vpx? ( media-libs/libvpx:= ) xmp? ( media-libs/exempi:2= )
-REQUIRED_USE=hrp? ( duke3d !voxels ) offensive? ( duke3d ) opl? ( duke3d !sc-55 ) psx? ( duke3d ) sc-55? ( duke3d !opl ) voxels? ( !hrp ) vpx? ( opengl )
-RESTRICT=bindist test
-SLOT=0
-SRC_URI=http://dukeworld.com/eduke32/synthesis/20220702-10113-e27a7b621/eduke32_src_20220702-10113-e27a7b621.tar.xz https://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3d9c15fbd276508a1119e46c0ca7cf8c
diff --git a/metadata/md5-cache/games-fps/eduke32-20220929.10163 b/metadata/md5-cache/games-fps/eduke32-20220929.10163
new file mode 100644
index 000000000000..d4788cd795fc
--- /dev/null
+++ b/metadata/md5-cache/games-fps/eduke32-20220929.10163
@@ -0,0 +1,18 @@
+BDEPEND=app-arch/unzip x86? ( dev-lang/nasm )
+DEFINED_PHASES=compile install postinst postrm unpack
+DEPEND=media-libs/flac:= media-libs/libogg media-libs/libsdl2[alsa,joystick,opengl?,sound,video] media-libs/libvorbis media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) vpx? ( media-libs/libvpx:= ) xmp? ( media-libs/exempi:2= ) timidity? ( media-sound/timidity++ )
+DESCRIPTION=An open source engine port of the classic PC first person shooter Duke Nukem 3D
+EAPI=8
+HOMEPAGE=http://www.eduke32.com/
+INHERIT=desktop toolchain-funcs xdg-utils
+IUSE=duke3d fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools voidsw voxels vpx xmp
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BUILDLIC GPL-2 HRP
+PDEPEND=duke3d? ( games-fps/duke3d-data )
+RDEPEND=media-libs/flac:= media-libs/libogg media-libs/libsdl2[alsa,joystick,opengl?,sound,video] media-libs/libvorbis media-libs/sdl2-mixer[flac,fluidsynth?,midi,timidity?,vorbis] sys-libs/zlib gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) vpx? ( media-libs/libvpx:= ) xmp? ( media-libs/exempi:2= )
+REQUIRED_USE=hrp? ( duke3d !voxels ) offensive? ( duke3d ) opl? ( duke3d !sc-55 ) psx? ( duke3d ) sc-55? ( duke3d !opl ) voxels? ( !hrp ) vpx? ( opengl )
+RESTRICT=bindist test
+SLOT=0
+SRC_URI=http://dukeworld.com/eduke32/synthesis/20220929-10163-2b3f691cd/eduke32_src_20220929-10163-2b3f691cd.tar.xz http://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=10ed6a96bf5a3ac437b8a843004dc943
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 54dd531084c9..c90b156b0808 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/geary-43.0 b/metadata/md5-cache/mail-client/geary-43.0
new file mode 100644
index 000000000000..5e7b3303a2e7
--- /dev/null
+++ b/metadata/md5-cache/mail-client/geary-43.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-libs/appstream-glib-0.7.10 dev-libs/libxml2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( net-libs/gnutls[tools] ) || ( dev-lang/vala:0.56 ) x11-libs/gtk+:3[introspection] net-libs/webkit-gtk:4.1[introspection] dev-libs/gmime:3.0[vala] app-crypt/gcr:0[introspection,vala] dev-libs/libgee:0.8[introspection] media-libs/gsound[vala] app-text/gspell[vala] gui-libs/libhandy:1[vala] app-crypt/libsecret[introspection,vala] net-libs/libsoup:3.0[introspection,vala] app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.68:2 >=x11-libs/gtk+-3.24.23:3 >=net-libs/webkit-gtk-2.38:4.1= >=dev-libs/gmime-3.2.4:3.0 >=dev-db/sqlite-3.24:3 x11-libs/cairo[glib] app-text/enchant:2 >=dev-libs/folks-0.11:0= >=app-crypt/gcr-3.10.1:0= >=dev-libs/libgee-0.8.5:0.8= net-libs/gnome-online-accounts media-libs/gsound >=app-text/gspell-1.7:= >=dev-libs/icu-60:= app-text/iso-codes >=dev-libs/json-glib-1.0 >=gui-libs/libhandy-1.2.1:1= >=dev-libs/libpeas-1.24.0 >=app-crypt/libsecret-0.11 net-libs/libsoup:3.0 dev-libs/snowball-stemmer:= >=dev-libs/libxml2-2.7.8:2 ytnef? ( >=net-mail/ytnef-1.9.3 )
+DESCRIPTION=A lightweight, easy-to-use, feature-rich email client
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Geary
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson vala virtualx xdg
+IUSE=test ytnef test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+ CC-BY-3.0 CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.68:2 >=x11-libs/gtk+-3.24.23:3 >=net-libs/webkit-gtk-2.38:4.1= >=dev-libs/gmime-3.2.4:3.0 >=dev-db/sqlite-3.24:3 x11-libs/cairo[glib] app-text/enchant:2 >=dev-libs/folks-0.11:0= >=app-crypt/gcr-3.10.1:0= >=dev-libs/libgee-0.8.5:0.8= net-libs/gnome-online-accounts media-libs/gsound >=app-text/gspell-1.7:= >=dev-libs/icu-60:= app-text/iso-codes >=dev-libs/json-glib-1.0 >=gui-libs/libhandy-1.2.1:1= >=dev-libs/libpeas-1.24.0 >=app-crypt/libsecret-0.11 net-libs/libsoup:3.0 dev-libs/snowball-stemmer:= >=dev-libs/libxml2-2.7.8:2 ytnef? ( >=net-mail/ytnef-1.9.3 ) gnome-base/gsettings-desktop-schemas
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/geary/43/geary-43.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=77bbabef16a705318f1169461ce7dd43
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 7149e6832192..bf68da2259c8 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/openimageio-2.3.12.0-r3 b/metadata/md5-cache/media-libs/openimageio-2.3.12.0-r3
deleted file mode 100644
index 6f01bc1ce543..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-2.3.12.0-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( 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_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=7
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-INHERIT=cmake font python-single-r1
-IUSE=dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( 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_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test ) test
-SLOT=0/2.3.1
-SRC_URI=https://github.com/OpenImageIO/oiio/archive/v2.3.12.0.tar.gz -> openimageio-2.3.12.0.tar.gz test? ( https://github.com/OpenImageIO/oiio-images/archive/b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz -> openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz -> openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=41b6d4c19e72645946d4393798abf4e1
diff --git a/metadata/md5-cache/media-libs/openimageio-2.3.13.0 b/metadata/md5-cache/media-libs/openimageio-2.3.13.0
deleted file mode 100644
index 6cb3a4003fab..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-2.3.13.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= media-libs/libjpeg-turbo:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( 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_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=7
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-INHERIT=cmake font python-single-r1
-IUSE=dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= media-libs/libjpeg-turbo:= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( 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_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test ) test
-SLOT=0/2.3.1
-SRC_URI=https://github.com/OpenImageIO/oiio/archive/v2.3.13.0.tar.gz -> openimageio-2.3.13.0.tar.gz test? ( https://github.com/OpenImageIO/oiio-images/archive/b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz -> openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz -> openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ef62490b0f2bd52b6af99be0a3fb7760
diff --git a/metadata/md5-cache/media-libs/openimageio-2.3.15.0 b/metadata/md5-cache/media-libs/openimageio-2.3.15.0
deleted file mode 100644
index c51d5185cf52..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-2.3.15.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( 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_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=7
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-INHERIT=cmake font python-single-r1
-IUSE=dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( 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_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test ) test
-SLOT=0/2.3.1
-SRC_URI=https://github.com/OpenImageIO/oiio/archive/v2.3.15.0.tar.gz -> openimageio-2.3.15.0.tar.gz test? ( https://github.com/OpenImageIO/oiio-images/archive/b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz -> openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz -> openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6b6b03ecdabf968e95e7678d3861f18f
diff --git a/metadata/md5-cache/media-libs/openimageio-2.3.16.0 b/metadata/md5-cache/media-libs/openimageio-2.3.16.0
deleted file mode 100644
index 539d79e7a7a5..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-2.3.16.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( 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_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=8
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-INHERIT=cmake font python-single-r1
-IUSE=dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( 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_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test ) test
-SLOT=0/2.3.1
-SRC_URI=https://github.com/OpenImageIO/oiio/archive/v2.3.16.0.tar.gz -> openimageio-2.3.16.0.tar.gz test? ( https://github.com/OpenImageIO/oiio-images/archive/b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz -> openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz -> openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5ee0926484a5fe02fc51318da5e949de
diff --git a/metadata/md5-cache/media-libs/openimageio-2.3.20.0 b/metadata/md5-cache/media-libs/openimageio-2.3.20.0
new file mode 100644
index 000000000000..473893b663b0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openimageio-2.3.20.0
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( 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_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+DESCRIPTION=A library for reading and writing images
+EAPI=8
+HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
+INHERIT=cmake font python-single-r1
+IUSE=dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( 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_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=!test? ( test ) test
+SLOT=0/2.3.1
+SRC_URI=https://github.com/OpenImageIO/oiio/archive/v2.3.20.0.tar.gz -> openimageio-2.3.20.0.tar.gz test? ( https://github.com/OpenImageIO/oiio-images/archive/245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz -> openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz -> openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=36caf1bcd7d2f2fee7a7fb1fabed78c3
diff --git a/metadata/md5-cache/media-libs/openimageio-2.4.4.1 b/metadata/md5-cache/media-libs/openimageio-2.4.4.1
new file mode 100644
index 000000000000..51d32135621d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openimageio-2.4.4.1
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( 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-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+DESCRIPTION=A library for reading and writing images
+EAPI=8
+HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
+INHERIT=cmake font python-single-r1
+IUSE=dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( 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-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[python,python_targets_python3_11(-)] dev-python/numpy[python_targets_python3_11(-)] dev-python/pybind11[python_targets_python3_11(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
+REQUIRED_USE=python? ( ^^ ( 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/2.4
+SRC_URI=https://github.com/OpenImageIO/oiio/archive/v2.4.4.1.tar.gz -> openimageio-2.4.4.1.tar.gz test? ( https://github.com/OpenImageIO/oiio-images/archive/245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz -> openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz -> openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=83c76ed80b2664ecefda9decf988c9d9
diff --git a/metadata/md5-cache/media-libs/osl-1.12.4.1-r2 b/metadata/md5-cache/media-libs/osl-1.12.4.1-r2
deleted file mode 100644
index d61efc1faa07..000000000000
--- a/metadata/md5-cache/media-libs/osl-1.12.4.1-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-libs/pugixml >=media-libs/openexr-3:0= >=media-libs/openimageio-2.3.12.0:= <sys-devel/clang-14:= sys-libs/zlib:= python? ( 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_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) ) partio? ( media-libs/partio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !!sys-devel/llvm:0
-DESCRIPTION=Advanced shading language for production GI renderers
-EAPI=7
-HOMEPAGE=http://opensource.imageworks.com/?p=osl
-INHERIT=cmake llvm toolchain-funcs python-single-r1
-IUSE=doc partio qt5 test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-libs/pugixml >=media-libs/openexr-3:0= >=media-libs/openimageio-2.3.12.0:= <sys-devel/clang-14:= sys-libs/zlib:= python? ( 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_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) ) partio? ( media-libs/partio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/imageworks/OpenShadingLanguage/archive/v1.12.4.1-dev.tar.gz -> osl-1.12.4.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=118c6788f2e801cebd356af17b40bf30
diff --git a/metadata/md5-cache/media-libs/osl-1.12.6.2 b/metadata/md5-cache/media-libs/osl-1.12.6.2
new file mode 100644
index 000000000000..ffb5cc57926a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/osl-1.12.6.2
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:= dev-libs/pugixml >=media-libs/openexr-3:0= >=media-libs/openimageio-2.3.12.0:= <sys-devel/clang-16:= sys-libs/zlib:= python? ( 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/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) ) partio? ( media-libs/partio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !!sys-devel/llvm:0
+DESCRIPTION=Advanced shading language for production GI renderers
+EAPI=8
+HOMEPAGE=http://opensource.imageworks.com/?p=osl
+INHERIT=cmake llvm toolchain-funcs python-single-r1
+IUSE=doc partio qt5 test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-libs/pugixml >=media-libs/openexr-3:0= >=media-libs/openimageio-2.3.12.0:= <sys-devel/clang-16:= sys-libs/zlib:= python? ( 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/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) ) partio? ( media-libs/partio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+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=https://github.com/imageworks/OpenShadingLanguage/archive/v1.12.6.2.tar.gz -> osl-1.12.6.2.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=88eb2da8e49c78d4f3a41b980f7d4ef1
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index dda18303b44a..4d9ca794adff 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/gallery-dl-1.23.2 b/metadata/md5-cache/net-misc/gallery-dl-1.23.2
new file mode 100644
index 000000000000..e9b38e6b0d46
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gallery-dl-1.23.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/requests-2.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,ssl,xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,ssl,xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,ssl,xml(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Download image galleries and collections from several image hosting sites
+EAPI=8
+HOMEPAGE=https://github.com/mikf/gallery-dl
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/requests-2.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,ssl,xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,ssl,xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,ssl,xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mikf/gallery-dl/archive/v1.23.2.tar.gz -> gallery-dl-1.23.2.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=2c16518c4f8f3290074dd04a18cf2fd6
diff --git a/metadata/md5-cache/net-misc/iperf-2.9999 b/metadata/md5-cache/net-misc/iperf-2.9999
new file mode 100644
index 000000000000..0f6da9cb7f5e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/iperf-2.9999
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install unpack
+DESCRIPTION=Tool to measure IP bandwidth using UDP or TCP
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/iperf2/
+INHERIT=git-r3 toolchain-funcs
+IUSE=ipv6 threads debug
+LICENSE=HPND
+PROPERTIES=live
+SLOT=2
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=101abf96c11c04fb8069bceb3b4010a8
diff --git a/metadata/md5-cache/net-misc/iperf-2.99999.99999 b/metadata/md5-cache/net-misc/iperf-2.99999.99999
deleted file mode 100644
index c31c74a47462..000000000000
--- a/metadata/md5-cache/net-misc/iperf-2.99999.99999
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install unpack
-DESCRIPTION=Tool to measure IP bandwidth using UDP or TCP
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/iperf2/
-INHERIT=git-r3 toolchain-funcs
-IUSE=ipv6 threads debug
-LICENSE=HPND
-PROPERTIES=live
-SLOT=2
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6460174275062423a8037c31b3dada38
diff --git a/metadata/md5-cache/net-misc/iperf-3.12 b/metadata/md5-cache/net-misc/iperf-3.12
new file mode 100644
index 000000000000..c064478a6085
--- /dev/null
+++ b/metadata/md5-cache/net-misc/iperf-3.12
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/cJSON-1.7.15 dev-libs/openssl:= sctp? ( net-misc/lksctp-tools )
+DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
+EAPI=8
+HOMEPAGE=https://github.com/esnet/iperf
+INHERIT=autotools systemd
+IUSE=sctp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=BSD
+RDEPEND=>=dev-libs/cJSON-1.7.15 dev-libs/openssl:= sctp? ( net-misc/lksctp-tools )
+SLOT=3
+SRC_URI=https://github.com/esnet/iperf/archive/3.12.tar.gz -> iperf-3.12.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=645c0632c74b141bc2f6286fc8012aa8
diff --git a/metadata/md5-cache/net-misc/iperf-3.99999.99999 b/metadata/md5-cache/net-misc/iperf-3.99999.99999
deleted file mode 100644
index c5eaa522d711..000000000000
--- a/metadata/md5-cache/net-misc/iperf-3.99999.99999
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install unpack
-DEPEND=dev-libs/openssl:0= sctp? ( net-misc/lksctp-tools )
-DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
-EAPI=7
-HOMEPAGE=https://github.com/esnet/iperf
-INHERIT=git-r3
-IUSE=sctp static-libs
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=dev-libs/openssl:0= sctp? ( net-misc/lksctp-tools )
-SLOT=3
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53
-_md5_=692228b73ae45bbccbd3aebaeff34e72
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 3f01a975ce5a..f3fb07399c95 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0-r2 b/metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0-r2
deleted file mode 100644
index acf891ba7454..000000000000
--- a/metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( sci-mathematics/coq-mathcomp ) dev-ml/dune dev-lang/ocaml
-DEFINED_PHASES=compile install postinst postrm test
-DEPEND=>=sci-mathematics/coq-8.15.0:= >=dev-ml/ppx_sexp_conv-0.13.0:= <dev-ml/ppx_sexp_conv-0.15.0:= dev-ml/cmdliner:= dev-ml/ppx_deriving:= dev-ml/ppx_deriving_yojson:= dev-ml/ppx_import:= dev-ml/sexplib:= dev-ml/yojson:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-DESCRIPTION=Serialization library and protocol for interaction with the Coq proof assistant
-EAPI=8
-HOMEPAGE=https://github.com/ejgallego/coq-serapi/
-INHERIT=elisp-common dune
-IUSE=emacs +ocamlopt test
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=>=sci-mathematics/coq-8.15.0:= >=dev-ml/ppx_sexp_conv-0.13.0:= <dev-ml/ppx_sexp_conv-0.15.0:= dev-ml/cmdliner:= dev-ml/ppx_deriving:= dev-ml/ppx_deriving_yojson:= dev-ml/ppx_import:= dev-ml/sexplib:= dev-ml/yojson:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
-SLOT=0/0.15.0
-SRC_URI=https://github.com/ejgallego/coq-serapi/archive/8.15.0+0.15.0.tar.gz -> coq-serapi-0.15.0.tar.gz
-_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=7bbc8ab1a5df466259cae7563cc710cd
diff --git a/metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0-r3 b/metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0-r3
new file mode 100644
index 000000000000..a931e2093184
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/coq-serapi-0.15.0-r3
@@ -0,0 +1,16 @@
+BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( sci-mathematics/coq-mathcomp ) dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install postinst postrm test
+DEPEND=>=sci-mathematics/coq-8.15.0:= <sci-mathematics/coq-8.16:= >=dev-ml/ppx_sexp_conv-0.13.0:= <dev-ml/ppx_sexp_conv-0.15.0:= dev-ml/cmdliner:= dev-ml/ppx_deriving:= dev-ml/ppx_deriving_yojson:= dev-ml/ppx_import:= dev-ml/sexplib:= dev-ml/yojson:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Serialization library and protocol for interaction with the Coq proof assistant
+EAPI=8
+HOMEPAGE=https://github.com/ejgallego/coq-serapi/
+INHERIT=elisp-common dune
+IUSE=emacs +ocamlopt test
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=>=sci-mathematics/coq-8.15.0:= <sci-mathematics/coq-8.16:= >=dev-ml/ppx_sexp_conv-0.13.0:= <dev-ml/ppx_sexp_conv-0.15.0:= dev-ml/cmdliner:= dev-ml/ppx_deriving:= dev-ml/ppx_deriving_yojson:= dev-ml/ppx_import:= dev-ml/sexplib:= dev-ml/yojson:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/0.15.0
+SRC_URI=https://github.com/ejgallego/coq-serapi/archive/8.15.0+0.15.0.tar.gz -> coq-serapi-0.15.0.tar.gz
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=1ff321b808bc460caca392646a05b12c
diff --git a/metadata/md5-cache/sci-mathematics/coq-serapi-0.16.0 b/metadata/md5-cache/sci-mathematics/coq-serapi-0.16.0
new file mode 100644
index 000000000000..46c251288079
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/coq-serapi-0.16.0
@@ -0,0 +1,16 @@
+BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) test? ( sci-mathematics/coq-mathcomp ) dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install postinst postrm test
+DEPEND=>=sci-mathematics/coq-8.16.0:= <sci-mathematics/coq-8.17:= >=dev-ml/ppx_sexp_conv-0.13.0:= <dev-ml/ppx_sexp_conv-0.15.0:= >=dev-ml/seq-0.3:= dev-ml/cmdliner:= dev-ml/ppx_compare:= dev-ml/ppx_deriving:= dev-ml/ppx_deriving_yojson:= dev-ml/ppx_hash:= dev-ml/ppx_import:= dev-ml/sexplib:= dev-ml/yojson:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Serialization library and protocol for interaction with the Coq proof assistant
+EAPI=8
+HOMEPAGE=https://github.com/ejgallego/coq-serapi/
+INHERIT=elisp-common dune
+IUSE=emacs +ocamlopt test
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=>=sci-mathematics/coq-8.16.0:= <sci-mathematics/coq-8.17:= >=dev-ml/ppx_sexp_conv-0.13.0:= <dev-ml/ppx_sexp_conv-0.15.0:= >=dev-ml/seq-0.3:= dev-ml/cmdliner:= dev-ml/ppx_compare:= dev-ml/ppx_deriving:= dev-ml/ppx_deriving_yojson:= dev-ml/ppx_hash:= dev-ml/ppx_import:= dev-ml/sexplib:= dev-ml/yojson:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/0.16.0
+SRC_URI=https://github.com/ejgallego/coq-serapi/archive/8.16.0+0.16.0.tar.gz -> coq-serapi-0.16.0.tar.gz
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=0546b953905b6413b5fc715159a2bc14
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 4278124a5432..30a9f5381aaa 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/cpuid-20220927 b/metadata/md5-cache/sys-apps/cpuid-20220927
new file mode 100644
index 000000000000..62c12f45936b
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/cpuid-20220927
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/gzip dev-lang/perl
+DEFINED_PHASES=install prepare
+DESCRIPTION=Linux tool to dump x86 CPUID information about the CPUs
+EAPI=8
+HOMEPAGE=http://www.etallen.com/cpuid.html
+INHERIT=toolchain-funcs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=http://www.etallen.com/cpuid/cpuid-20220927.src.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=82a4f090e6b1326092ee1eb773f9d6e9
diff --git a/metadata/md5-cache/sys-apps/hw-probe-1.6.5 b/metadata/md5-cache/sys-apps/hw-probe-1.6.5
new file mode 100644
index 000000000000..a79e88ab5479
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hw-probe-1.6.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=A tool to probe for hardware, check it's operability and find drivers
+EAPI=8
+HOMEPAGE=https://github.com/linuxhw/hw-probe/
+INHERIT=optfeature readme.gentoo-r1
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-lang/perl dev-perl/Digest-SHA1 net-misc/curl sys-apps/dmidecode sys-apps/edid-decode sys-apps/hwinfo sys-apps/pciutils sys-apps/smartmontools sys-apps/usbutils virtual/perl-Data-Dumper
+SLOT=0
+SRC_URI=https://github.com/linuxhw/hw-probe/archive/refs/tags/1.6.5.tar.gz -> hw-probe-1.6.5.tar.gz
+_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=38f305e018cd9edf4f5a6fb337dce788
diff --git a/metadata/md5-cache/sys-apps/systemd-251.4 b/metadata/md5-cache/sys-apps/systemd-251.4
index 7f5e084042b1..4b105ea10d2c 100644
--- a/metadata/md5-cache/sys-apps/systemd-251.4
+++ b/metadata/md5-cache/sys-apps/systemd-251.4
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=http://systemd.io/
 INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-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=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] sec-policy/selinux-ntp ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v251.4/systemd-stable-251.4.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b4eb7bbb3a3c66f0460a56738a992e37
+_md5_=a9c54b66ce5c1551d822a7b58b890f04
diff --git a/metadata/md5-cache/sys-apps/systemd-251.5 b/metadata/md5-cache/sys-apps/systemd-251.5
new file mode 100644
index 000000000000..ca0b5600c43f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-251.5
@@ -0,0 +1,18 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/lxml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-4.15 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=http://systemd.io/
+INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] sec-policy/selinux-ntp ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd-stable/archive/v251.5/systemd-stable-251.5.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=fb9bedff3307537b80db17ca7b5041f8
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-251.5 b/metadata/md5-cache/sys-apps/systemd-utils-251.5
new file mode 100644
index 000000000000..e01671e33fd5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-utils-251.5
@@ -0,0 +1,18 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) >=sys-kernel/linux-headers-3.11 boot? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=Utilities split out from systemd for OpenRC users
+EAPI=8
+HOMEPAGE=https://systemd.io/
+INHERIT=bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+IUSE=+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
+RDEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
+REQUIRED_USE=|| ( boot tmpfiles sysusers udev )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v251.5.tar.gz -> systemd-stable-251.5.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-251.2.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
+_md5_=b7ebc37eb15636641406f9b301ab88f6
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index a173e1e51751..6fedc743ef22 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/pam_yubico-2.26-r1 b/metadata/md5-cache/sys-auth/pam_yubico-2.26-r1
deleted file mode 100644
index d50cd907a68e..000000000000
--- a/metadata/md5-cache/sys-auth/pam_yubico-2.26-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/pam sys-auth/libyubikey >=sys-auth/ykclient-2.15 >=sys-auth/ykpers-1.6 ldap? ( net-nds/openldap:= ) app-text/asciidoc test? ( dev-perl/Net-LDAP-Server )
-DESCRIPTION=Library for authenticating against PAM with a Yubikey
-EAPI=6
-HOMEPAGE=https://github.com/Yubico/yubico-pam
-INHERIT=pam
-IUSE=ldap test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=sys-libs/pam sys-auth/libyubikey >=sys-auth/ykclient-2.15 >=sys-auth/ykpers-1.6 ldap? ( net-nds/openldap:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://opensource.yubico.com/yubico-pam/releases/pam_yubico-2.26.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1c7bddea00469640203288f7ed5d2939
diff --git a/metadata/md5-cache/sys-auth/pam_yubico-2.27 b/metadata/md5-cache/sys-auth/pam_yubico-2.27
new file mode 100644
index 000000000000..8cc09c5e1ae6
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/pam_yubico-2.27
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/pam sys-auth/libyubikey >=sys-auth/ykclient-2.15 >=sys-auth/ykpers-1.6 ldap? ( net-nds/openldap:= ) app-text/asciidoc test? ( dev-perl/Net-LDAP-Server )
+DESCRIPTION=Library for authenticating against PAM with a Yubikey
+EAPI=8
+HOMEPAGE=https://github.com/Yubico/yubico-pam
+INHERIT=autotools pam
+IUSE=ldap test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=sys-libs/pam sys-auth/libyubikey >=sys-auth/ykclient-2.15 >=sys-auth/ykpers-1.6 ldap? ( net-nds/openldap:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Yubico/yubico-pam/archive/refs/tags/2.27.tar.gz -> pam_yubico-2.27.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=3c0e6a489158f3af0f2e9af425ac73c0
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 445b494af920..3cf6e08e1ef4 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/minizip-ng-3.0.6-r1 b/metadata/md5-cache/sys-libs/minizip-ng-3.0.6-r1
new file mode 100644
index 000000000000..3796372eca06
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/minizip-ng-3.0.6-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib-ng virtual/libiconv compat? ( !sys-libs/zlib[minizip] ) openssl? ( dev-libs/openssl:= ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=Fork of the popular zip manipulation library found in the zlib distribution
+EAPI=8
+HOMEPAGE=https://github.com/zlib-ng/minizip-ng
+INHERIT=cmake
+IUSE=compat openssl test zstd
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib-ng virtual/libiconv compat? ( !sys-libs/zlib[minizip] ) openssl? ( dev-libs/openssl:= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/zlib-ng/minizip-ng/archive/refs/tags/3.0.6.tar.gz -> minizip-ng-3.0.6.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=47ac935136359f67c057a2a13f87a959
diff --git a/metadata/md5-cache/sys-libs/zlib-ng-2.0.5 b/metadata/md5-cache/sys-libs/zlib-ng-2.0.5
deleted file mode 100644
index c1949fb4d1d7..000000000000
--- a/metadata/md5-cache/sys-libs/zlib-ng-2.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Fork of the zlib data compression library
-EAPI=7
-HOMEPAGE=https://github.com/zlib-ng/zlib-ng
-INHERIT=cmake
-IUSE=compat cpu_flags_x86_avx2 cpu_flags_x86_sse2 cpu_flags_x86_ssse3 cpu_flags_x86_sse4a cpu_flags_x86_pclmul cpu_flags_arm_crc32 cpu_flags_arm_neon cpu_flags_ppc_vsx2 test
-LICENSE=ZLIB
-RDEPEND=compat? ( !sys-libs/zlib )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/zlib-ng/zlib-ng/archive/2.0.5.tar.gz -> zlib-ng-2.0.5.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7e81e8f2b28620784d6a3e801227dc50
diff --git a/metadata/md5-cache/sys-libs/zlib-ng-2.0.6 b/metadata/md5-cache/sys-libs/zlib-ng-2.0.6
index 7d69a2653289..9385ec33fc7b 100644
--- a/metadata/md5-cache/sys-libs/zlib-ng-2.0.6
+++ b/metadata/md5-cache/sys-libs/zlib-ng-2.0.6
@@ -1,14 +1,15 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Fork of the zlib data compression library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/zlib-ng/zlib-ng
 INHERIT=cmake
 IUSE=compat cpu_flags_x86_avx2 cpu_flags_x86_sse2 cpu_flags_x86_ssse3 cpu_flags_x86_sse4a cpu_flags_x86_pclmul cpu_flags_arm_crc32 cpu_flags_arm_neon cpu_flags_ppc_vsx2 test
+KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
 RDEPEND=compat? ( !sys-libs/zlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zlib-ng/zlib-ng/archive/2.0.6.tar.gz -> zlib-ng-2.0.6.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=53a7827d420c64e05fcd09ed65698948
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=07654b45e3e8e8336d7100c34dba7d38
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 73eea35e297d..ad26ffb1d105 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154
index b0f22ba60db1..0f5e9b3ba672 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154
@@ -12,4 +12,4 @@ RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/
 SLOT=0/390
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.154/NVIDIA-Linux-x86_64-390.154.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.154/NVIDIA-Linux-x86-390.154.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.154.tar.bz2
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=fe8563cee60533dc60ca62677014eac7
+_md5_=2ab79f7f9155248e8744a5c532d26ae0
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03
index c5802a2cb3cb..1fec4b7b8cb0 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03
@@ -12,4 +12,4 @@ RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/
 SLOT=0/470
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/470.141.03/NVIDIA-Linux-x86_64-470.141.03.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.141.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.141.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.141.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.141.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.141.03.tar.bz2
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=d5ff923ab62e2d9c67506d211fa9d252
+_md5_=a83e72a029c94007fd8022b0f43aae8f
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-510.85.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-510.85.02
index 3b7c3773181b..4d585d024321 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-510.85.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-510.85.02
@@ -12,4 +12,4 @@ RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistence
 SLOT=0/510
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/510.85.02/NVIDIA-Linux-x86_64-510.85.02.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/510.85.02/NVIDIA-Linux-aarch64-510.85.02.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-510.85.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-510.85.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-510.85.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-510.85.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-510.85.02.tar.bz2
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=55c52da8ff49cc507ed042222c629879
+_md5_=9ede706a8d7c22edf9f3605d3030ed94
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19 b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19
index 7d558cdd558c..7278ed5f6921 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.49.19
@@ -13,4 +13,4 @@ REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/vulkan
 SRC_URI=https://developer.nvidia.com/vulkan-beta-5154919-linux -> NVIDIA-Linux-x86_64-515.49.19.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-515.65.01.tar.bz2 https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/515.49.19.tar.gz -> open-gpu-kernel-modules-515.49.19.tar.gz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=5f22121f2350838e1e2931fc9874029b
+_md5_=02e0377d5c999b59c6d55bffb44871c7
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.65.01 b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.65.01
index ce81c38d273e..6603f7a1cf86 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.65.01
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.65.01
@@ -13,4 +13,4 @@ REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/515
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/515.65.01/NVIDIA-Linux-x86_64-515.65.01.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/515.65.01/NVIDIA-Linux-aarch64-515.65.01.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-515.65.01.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-515.65.01.tar.xz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=cb75b57efaf3e49492f7f7ec82d41c45
+_md5_=c9cb8db6e468d28aaa306723befa49ed
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.76 b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.76
index 50fc208b88a0..d8adcb935112 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.76
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.76
@@ -13,4 +13,4 @@ REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/515
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/515.76/NVIDIA-Linux-x86_64-515.76.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/515.76/NVIDIA-Linux-aarch64-515.76.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-515.76.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-515.76.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-515.76.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-515.76.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-515.76.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-515.76.tar.xz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=fd87d29e194f8b954c71f8291b9ac898
+_md5_=a086f5c3fb519b786fb6eb5ee5d04b7e
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 59c4b6bd571e..4c08355b61b1 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-01T23:09:46Z
+TIMESTAMP 2022-10-02T05:09:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM4yLpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM5HRxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAZNA/9Eru+9SRFmANRCsqypKKw8RuYTWP6lvJNqsD24ikfgTzkx7KAnB3T6KzV
-yKRphvK7SLqHk+lOb5dJCiBsAYzyTax8W93/dUW6Depvi5olTbTl/7oTDoT0yYRn
-qikLhsAuSSTpYi7XS3B30GkTduO4Z6M/zEN55uxSar0bCnf35Zdp8BruUTfrCuVz
-S3XXGuRZuAqlS6FABla3yYzDHGRnKPU86nb/zPpXG2x0kM3ZhRDRAJ2hAhZ8Uii5
-stzTylHd8qwmsa5ylBtemkRxZP5s72DvfwRDQO5DI2PYjyoD0bjGXcCzc6IvmE+h
-HnUbB6wFEavPV4Ui/yN8OBLKcqqRKYTh7PWR6eoZu933BOcVMvUdMevy15/3+TGG
-RAlVzvUEssvX477468b65i7IkRQn8mbGO5PJxdh4EMefTEpvQ5soIoJeg2VSrTOD
-Ely5CfOZ7LghIKMc2+UvXeo021COEXSu4PH6D9aGpl8xWJK3gfVTbD1N3olB/kqf
-RJ6bT+v6KwfY9YSglqXeU7i4qAJ7vvAx4qOZk1gxAh1PUippOnUvg86/pthcPlYz
-D47BXtbyXAY14f6cGxQNQf2OTtrb7ifvETS8CGEe6sPD2/jdR+s+VVRmchvHhgG2
-m2dOhEre6okfp+VJdIGelu5R2kme6Z4snXkQMJ3gGXvAeXvT8JA=
-=dcQy
+klBIlxAAh2TbWl5vKnzQ+RbOZ5pvUTGYi4ETgxCnSLR0MJNtnIo3OOM8kWKHLjY9
+w0XZYvKG/05Wg1dczdeRyw525sgsAoGrynLN/lcTNqFOQaJWBnPxa1xjM1627W8s
+CSdxeSV5Ldem/TQ0qPi/Bu3iOWnWdGnsU9z+BU2mOBiBWzRu4fKz5rKMJlXa+Qoh
+bH5ttSArbeEou7pfPtUxjFuTiNpEVNyLY7JW4zjC0Mbp+Qh5HoWWg9R17w/1Lbz5
+oeyuQR9poE42WP4AM7rFDVy7PLa1fpA5qRcls/kH6KW8uq7uVXoD5w2si6FKse4h
+5ZsdKvTJBSYktFVay/3P/6Ne+/YaGUUdmLwrOBz6SOr5wZqRoRcinYLqiki+WAq/
+cLr+KoH/6k/JbszukIIR8pzGRFnJ/wqmskxlgBswq5mCyidNWmmkvj0lgx1GMxrv
+2vgiEFLXUaIMuRnW0ihX/sNp35zFc5amOcXHvuupOrh+cFjvc60XRm9jXr8QTcjp
+49o838to5F/J2ifdfykU4qK1gP8AYV20pUrOTkyA5aKxdRnIeQBl8zf3Be24QCdc
+UAynQz6JLUgGHmYZn0nFkLqbUSE31UIdxKuWdQx/LVjnt53VRJ+M0p0ef8d23dVU
+ksp6KiBs1XtceEEqS3gYV/5xXOP0U3M21w1nSbQFXChQIjfS5sQ=
+=kCDw
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 854951fa0047..53fdcd033673 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Oct 2022 23:09:42 +0000
+Sun, 02 Oct 2022 05:09:43 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 5f48a150513b..d69f7dd0d89b 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -965,10 +965,6 @@
       <email>asturm@gentoo.org</email>
       <name>Andreas Sturmlechner</name>
     </member>
-    <member>
-      <email>eva@gentoo.org</email>
-      <name>Gilles Dartiguelongue</name>
-    </member>
     <member>
       <email>floppym@gentoo.org</email>
       <name>Mike Gilbert</name>
@@ -1003,10 +999,6 @@
     <name>GNOME Desktop</name>
     <url>https://wiki.gentoo.org/wiki/Project:GNOME</url>
     <description>The Gentoo Gnome Project aims to bring the current and complete GNOME desktop environment to Gentoo.</description>
-    <member>
-      <email>eva@gentoo.org</email>
-      <name>Gilles Dartiguelongue</name>
-    </member>
     <member is-lead="1">
       <email>leio@gentoo.org</email>
       <name>Mart Raudsepp</name>
@@ -1103,10 +1095,6 @@
     <name>GStreamer package maintainers</name>
     <url>https://wiki.gentoo.org/wiki/Project:GStreamer</url>
     <description>The GStreamer project maintains packages associated with the upstream GStreamer project and associated Gentoo tooling</description>
-    <member>
-      <email>eva@gentoo.org</email>
-      <name>Gilles Dartiguelongue</name>
-    </member>
     <member>
       <email>leio@gentoo.org</email>
       <name>Mart Raudsepp</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index f0e6901c3f4d..5890e35a99a2 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Oct  1 11:09:42 PM UTC 2022
+Sun Oct  2 05:09:42 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 536cbf3a3558..eb1ddf42abfa 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Oct 2022 23:15:01 +0000
+Sun, 02 Oct 2022 05:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 36782054753f..895cbccd5d35 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-063c6f4aa0b99385f2a8080414c7a8381728fc37 1664664491 2022-10-01T22:48:11+00:00
+6684fc8f4a5bc1f68c44b3e530c57920b7d392b0 1664686146 2022-10-02T04:49:06+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 01ec73995f9f..0832b3926f63 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1664665801 Sat 01 Oct 2022 11:10:01 PM UTC
+1664687401 Sun 02 Oct 2022 05:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 854951fa0047..f1717784a6ba 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Oct 2022 23:09:42 +0000
+Sun, 02 Oct 2022 05:09:42 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c739e14bc0fe..266e927695ac 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 48e29b18934b..e9380fa51d0f 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -2,9 +2,11 @@ DIST gallery-dl-1.21.2.tar.gz 434114 BLAKE2B 2f1335d0745c3fd3de95f9f3005fc67f079
 DIST gallery-dl-1.22.4.tar.gz 467129 BLAKE2B f2f656b3255d091361bd2c80bb2647de47af14c11823fcc0e7e5790ea0b04047195e435a7a4c2b24a645c6e2a27cf53c3ce456a405b97ee014272af1a77ea4a1 SHA512 d20535115b464cb51a0fcb6bcd9e64e12fca5a199841cf4e501eae558c842d7d51dda4823b29d7ee2f1e267e59245f8e1cb1a702a96e5c45935918dbf3e6a448
 DIST gallery-dl-1.23.0.gh.tar.gz 473431 BLAKE2B 1f485477ea150585050f24fbe3605195b9b8ffca3d39d3dde5f2160c2ceb3dd75bb691cc14c178d236c690ff6d2effe147242abcb67feda7b77b829f440e2ac4 SHA512 8e17532c094c9516593f9009eca7139e60d7474a56c76bb07a68c03eae4e2e8e31c6bd1f167388d05a1104d5964e2d0b62272c506b2b6988b1832a36a492cbf9
 DIST gallery-dl-1.23.1.gh.tar.gz 477797 BLAKE2B abb04762755cc941d3fef31ba2cf21eab4b0afa196a67276d26199a044950cf68607bf7bd4e26bd3631de1e715a7ca25248a658aac1ac56cbb3e2a6ef5b2d71b SHA512 898fd952cc6e590a11e4154449153bd48547c9f21cba6864c95953f9be18ad27391d8033e5350d41714b28ded5711ddefefd4ca0f3c13016972a16b028a0fc1d
+DIST gallery-dl-1.23.2.gh.tar.gz 482620 BLAKE2B 2a537354f93a1d82659669d9a1cdec425e2438127304a5385a871aa7c4f89afa3f0d91326fd731c6ddc48a4cce67d35335270e602a34761726575e525ac19020 SHA512 75defb234faf0467e5a957594a58a02cfc75180d63a4b2c24d84061d326fbb46f08ad3230b72adf525f1ba82621963564c556047d4aa06c16cc5124ecd8c075f
 EBUILD gallery-dl-1.21.2.ebuild 973 BLAKE2B fef69fc7188b2f8714854ab4d98f726553eabb98a022ab8f28da6da7523594addf4549f249ef7dbae09d136669aeb3bb45da4462c052bbe3acf4f59908af3776 SHA512 70a1b88a1982618d4131124c301c1945724aa33b94b35154dd5f6b25ef45756f95572c0841916edc090752f7d868f18fba25b3b12274f136f72427148c667db4
 EBUILD gallery-dl-1.22.4.ebuild 972 BLAKE2B 338fa4a1e74523fdcce0333bbc1d1f342755c797a23c199e1bc10abc8d3b725fcf96c7a77f74716a876bdda021940589bd996e6247291d57241bf917559c5bd1 SHA512 287b64f38b3989d17adb44e5977a4044f78c974dee031372ff9af17d18d0cfd37c34558b90bfd4d516caf69813025a7e4eee5beaac71fd278b9727966ca08b7e
 EBUILD gallery-dl-1.23.0.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
 EBUILD gallery-dl-1.23.1.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
+EBUILD gallery-dl-1.23.2.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
 EBUILD gallery-dl-9999.ebuild 982 BLAKE2B ed17900756bbc7b118c5cf27cd7d8326b7ba59bec49ac5a334e25d2b4157eda907044b4e2e6bace47afbace4a91a7100607760966f1d3bece4b0bf4f6e6d5315 SHA512 9c2e31d0f84fb5a44d32e3da3a233ba3be15af71dd0ea74d03bebe8115df1d333fb7abaa5a40dd21bc0f5cce325205bca31d0c2819725720c1f2ba190821e9fe
 MISC metadata.xml 722 BLAKE2B d44c3a3cc18ecaceb2e112a314c63bb913448516eec1118a86a4c0e770ed6dca322d4653358bd78b0b3c0dcf10007e1c5d1033dd9d5996f6d6f3dc5659280f74 SHA512 7a95345138c738aec445af215a3381308a40bcc1475d2718880cc124795237bff6bbc4312e63b5a135815b17b37b1b130da90b81b895c16f3f86de4b51fd3f40
diff --git a/net-misc/gallery-dl/gallery-dl-1.23.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.23.2.ebuild
new file mode 100644
index 000000000000..adeefda919ee
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.23.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite,ssl,xml(+)"
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download image galleries and collections from several image hosting sites"
+HOMEPAGE="https://github.com/mikf/gallery-dl"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
+else
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# tests require network access
+RESTRICT="test"
+
+RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+python_compile_all() {
+	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
+}
+
+pkg_postinst() {
+	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+	optfeature "video downloads" net-misc/youtube-dl
+}
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index eee468a022d0..6e7125e6a132 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,13 +1,16 @@
 AUX iperf-2.0.12-ipv6.patch 856 BLAKE2B 321ef3f9f9d87243a32f9f0d0c43083670ef3737758a19138d7d18009fc6456c45fa0b0457048a84ef919576c16ae9155146a9599cb582272cb1c7a3af91a4c0 SHA512 199aee88020c7dc579ba2cbc31cdc049c883211a4a2f58d84c0a07ba6a8d0169c5f4652eb0d89db3b0176b65cb3eb19c1897caf3e414df3b9beedaa51a3f458f
 AUX iperf-2.0.14a.patch 4317 BLAKE2B 96b5894040b22c3e842b815cfe816fdcfda7b397aac6c72e9ef9d8d6d65eaff314054ad1e5c1510b9afb6dcb96051028abfebda23a9a04f5b49eaf380a4d5105 SHA512 cbe1701972b3b51ed10e448e0a769b3fac835b3e4459c81face294b21ec778d7a306c0e5ff284ea22a4b9d2fe51060f2c077b3aa96d43484ac095909da998e19
 AUX iperf-3.10.1-drop-forced-debugging-symbols.patch 4250 BLAKE2B bbad11654523de15816e8b1429a5df99fca6c5b110217896d4554ba54f3d75bc6f9d8487993ba8368d1cc7e385569510727acba86b95251174c0ffe03f6ad115 SHA512 97e8dd9e317c7713d280863f501dc7a056a2c2088cccc9237cec8c4583185161becae692e21253700bce33eadd9aabd69be0deacaf8ac0950456a23501a93f54
+AUX iperf-3.12-Unbundle-cJSON.patch 2894 BLAKE2B 74981580ed628224fbbbf19f35c5a7972b066029d45ba8a86b437f7aafda80a6f1bba5696b5a35f210993bd9af0406de1ff168f41ec36f8bfbe2674dd626b34f SHA512 c9f7d8f0286135043e1d686e2936f4765d8b344b57ea3c7b887c94665201904e10119f6f7fed028fef898ae75a25aa9157b26def007515921ec249503fa9d66a
+AUX iperf-3.12-fix-bashism.patch 1211 BLAKE2B 7b3f8a4262bf6fa9f5604d9aed535e95e1bc01fba8184df489abc9a0527135573310a2da437e5b7fdc8e8a959294c55c7947c9a67c5b2d5bdf56ffff4731a573 SHA512 ff27761303ee30a80502ac163a819cb152f5b80dd29061a6547376edbe122639528c3d118966542b3e223a21f63712ee2a8c23249864316ba7e806352fbd87d5
 AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059b05b56ff66a6d93086b3100aa36db30d2e8efd3914eda148a61c379d6c35a73fd64f74d1e3d7 SHA512 49d79507064de54fbf1c5d11315b7c7be24a854968687ae0de7e0ee34c947495f4c98a5b629d68afcd414fd91cc759cda59c4f367c68137ff6e7bc4a214a6551
 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1
 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
 DIST iperf-3.11.tar.gz 638521 BLAKE2B b2981c170aac947c407b0a5686cd9708012282044be30ec7e5f993a9d61d55c4517003024890a194f6e55d342be0e60f1bcab27460541d2b9631a3bb88e094a5 SHA512 4be3e407f77a083d826bddc5ce2939047c85f5b816a6aeb3293eacabf2ea23bf13df4226e629ade3bf390c2eb08d6a1cb96f8cdb0fefb290a0fa4c8331d11a17
+DIST iperf-3.12.tar.gz 648136 BLAKE2B 95753e4fd2b7ca640b17501f6b21b0e63ea0a3df2ba920c672ffcccd991502cacf4bf3641be1ffbbb993c86e6915ceada5745cffe1796bb86b6a6a1dff8811ae SHA512 9b0600a19750311557833b32ca5c4be809ab98643522f125645dd8f83c482017e42fbe5fc9484624731176a59b67203a468eb81eebf1a37b9c1b3eff818857ba
 EBUILD iperf-2.0.14a.ebuild 863 BLAKE2B 48a3db3ec6b41bad2abef2854e694949a1e14cb71c01b52de2ca28149c9430a9b052f70959b1eb0630ca6ee6460dd54e0e0420a65892e6a86eb3e67875b673b0 SHA512 cd0241a86c550a18572042151c402913ec5e362611580b7a70de5b38c6664c3398f06258be706d311704046f4add0b868a81f913c7afd1d06622307fdc215913
-EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 753dbd819ad867ee52dcdb9af069667d78053826f0028257eaee9fa13b6fab31cb27e5d419baa4c038a3346f607cd06639ed4dcc8fabbee6af943de336e9c45d SHA512 37d2329648792714b13e5fcdd2709b181d1cf32aa159aa39d8e3a1b922a01ef47e13ea340bef966991b7321d93bf9a41e7d2e824204f6770610eb71afeec6f13
+EBUILD iperf-2.9999.ebuild 670 BLAKE2B bb3d273743f45439dbcf4b88ea83010ceac93f7659a33a4c1197b1c946366dc4c00a7f7b017ff2050642b6a1b333934b272345aa3713b1a508f9c232f31dbbae SHA512 4b2ef29cca81a9d849356163c1d2e5c2f8eb19f45ee8c468c30950a2397e4a8a6f8c5ade0db47e9769f8a8e7d2fb77026bfa75b1325475ed9fcf80e07fa731c7
 EBUILD iperf-3.11.ebuild 940 BLAKE2B 123c3572e33d063a05da78244a8f8baca587c5577b2465535ea06f291c4ea91222fe10722d21ef19a7e040ba32eab66dec480ba99e0e3b6f8e7fa0ae3234fdfb SHA512 fd76f0f30e04ab19e943e2c455263487c14f741c3312c89bdaf4218808dbcf667ec6b0582380a710dcfaae99e816f5eb0fc56736f8af6918eabad0e535994534
-EBUILD iperf-3.99999.99999.ebuild 722 BLAKE2B 3e048d5eb49365b5c5f89e4072de496e908269c1dcf754f54810671d6ee66c08c814278be899060a7ac97a04464da4ddcbb9a93e79f5cbc6fa195eed584ea71d SHA512 b47ee419c1d04829ccb9a5a4225d58bb15f723a0f297b01c99f194ec662bba4200371aa0e084e737af0f9ccbbccb656c4e0dd680830fc9af11dc1be342bcd64c
+EBUILD iperf-3.12.ebuild 1158 BLAKE2B 7c1b4ff05d0abbce88f82198a622a211a8caa828b233ab23ac37c7a1f85aa5af0021189a50e3a47a410c4ece37d53070b5ed33eef47d01ae1725f340ea201cb7 SHA512 faf1d8963358d2804ec66480de309c8de0cadc130009209132552805c7bf74b721de464cbf0a6e83839728b3ead8251c4cab78896dd4b41129301795d01784e2
 MISC metadata.xml 570 BLAKE2B e17cc2b8458663f6ed2e9de7cca4e6a0d2e21e7f0c22a92c7b2d8589a944a466436f0dec4e18843641cc9364f407b061ff44dbbe342162ab28556ec953b029b4 SHA512 e3acd2262d442675557b837bbed0feaf7a1f148f7306b64139d8ba39d052794a9e7b60f125eee8745b0d13cdeafbb93012c62d1c524caa1e0f4730d1200426cc
diff --git a/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch b/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch
new file mode 100644
index 000000000000..c5b1b49ec1a7
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch
@@ -0,0 +1,109 @@
+From 85b225cdd00b9a483a603b8b124a829ffbf92b88 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 2 Oct 2022 03:07:40 +0100
+Subject: [PATCH] Unbundle cJSON
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,6 +62,8 @@ AC_ARG_ENABLE([profiling],
+     AS_HELP_STRING([--enable-profiling], [Enable iperf3 profiling binary]))
+ AM_CONDITIONAL([ENABLE_PROFILING], [test x$enable_profiling = xyes])
+ 
++PKG_CHECK_MODULES([libcjson], [libcjson >= 1.7.15])
++
+ # Check for the math library (needed by cjson on some platforms)
+ AC_SEARCH_LIBS(floor, [m], [], [
+ echo "floor()"
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,8 +10,6 @@ include_HEADERS         = iperf_api.h                                   # Define
+ 
+ # Specify the source files and flags for the iperf library
+ libiperf_la_SOURCES     = \
+-                        cjson.c \
+-                        cjson.h \
+                         flowlabel.h \
+                         iperf.h \
+                         iperf_api.c \
+@@ -44,10 +42,13 @@ libiperf_la_SOURCES     = \
+                         units.c \
+                         units.h \
+                         version.h
++libiperf_la_CPPFLAGS    = $(CPPFLAGS) @libcjson_CFLAGS@
++libiperf_la_LIBADD      = @libcjson_LIBS@
+ 
+ # Specify the sources and various flags for the iperf binary
+ iperf3_SOURCES          = main.c
+-iperf3_LDADD            = libiperf.la
++iperf3_CPPFLAGS         = $(CPPFLAGS) @libcjson_CFLAGS@
++iperf3_LDADD            = libiperf.la @libcjson_LIBS@
+ 
+ if ENABLE_PROFILING
+ # If the iperf-profiled-binary is enabled
+--- a/src/iperf.h
++++ b/src/iperf.h
+@@ -65,7 +65,7 @@
+ 
+ #include "timer.h"
+ #include "queue.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "iperf_time.h"
+ 
+ #if defined(HAVE_SSL)
+--- a/src/iperf_api.c
++++ b/src/iperf_api.c
+@@ -81,7 +81,7 @@
+ #endif /* HAVE_SCTP_H */
+ #include "timer.h"
+ 
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "units.h"
+ #include "iperf_util.h"
+ #include "iperf_locale.h"
+--- a/src/iperf_tcp.c
++++ b/src/iperf_tcp.c
+@@ -42,7 +42,7 @@
+ #include "iperf_api.h"
+ #include "iperf_tcp.h"
+ #include "net.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ 
+ #if defined(HAVE_FLOWLABEL)
+ #include "flowlabel.h"
+--- a/src/iperf_udp.c
++++ b/src/iperf_udp.c
+@@ -46,7 +46,7 @@
+ #include "iperf_udp.h"
+ #include "timer.h"
+ #include "net.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "portable_endian.h"
+ 
+ #if defined(HAVE_INTTYPES_H)
+--- a/src/iperf_util.c
++++ b/src/iperf_util.c
+@@ -46,7 +46,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ 
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "iperf.h"
+ #include "iperf_api.h"
+ 
+--- a/src/iperf_util.h
++++ b/src/iperf_util.h
+@@ -28,7 +28,7 @@
+ #define __IPERF_UTIL_H
+ 
+ #include "iperf_config.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include <sys/select.h>
+ #include <stddef.h>
+ 
diff --git a/net-misc/iperf/files/iperf-3.12-fix-bashism.patch b/net-misc/iperf/files/iperf-3.12-fix-bashism.patch
new file mode 100644
index 000000000000..1f3a321f42c9
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.12-fix-bashism.patch
@@ -0,0 +1,43 @@
+https://github.com/esnet/iperf/pull/1398
+
+From 3a03f775ca103f2e824abef903130280c57ca8ac Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 2 Oct 2022 02:58:59 +0100
+Subject: [PATCH] config/iperf_config_static_bin.m4: fix bashism
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Fixes configure warnings/errors like:
+```
+./configure: 2670: test: x: unexpected operator
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/config/iperf_config_static_bin.m4
++++ b/config/iperf_config_static_bin.m4
+@@ -7,6 +7,6 @@ AC_ARG_ENABLE([static-bin],
+     [:])
+ AM_CONDITIONAL([ENABLE_STATIC_BIN], [test x$enable_static_bin = xno])
+ 
+-AS_IF([test "x$enable_static_bin" == xyes],
++AS_IF([test "x$enable_static_bin" = xyes],
+  [LDFLAGS="$LDFLAGS --static"]
+  [])
+--- a/configure
++++ b/configure
+@@ -2667,7 +2667,7 @@ else
+ fi
+ 
+ 
+-if test "x$enable_static_bin" == xyes
++if test "x$enable_static_bin" = xyes
+ then :
+   LDFLAGS="$LDFLAGS --static"
+ 
+
diff --git a/net-misc/iperf/iperf-2.9999.ebuild b/net-misc/iperf/iperf-2.9999.ebuild
new file mode 100644
index 000000000000..cd4130c2772c
--- /dev/null
+++ b/net-misc/iperf/iperf-2.9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3 toolchain-funcs
+
+DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
+HOMEPAGE="https://sourceforge.net/projects/iperf2/"
+EGIT_REPO_URI="https://git.code.sf.net/p/iperf2/code"
+
+LICENSE="HPND"
+SLOT="2"
+IUSE="ipv6 threads debug"
+
+DOCS=( INSTALL README )
+
+src_configure() {
+	econf \
+		$(use_enable debug debuginfo) \
+		$(use_enable ipv6) \
+		$(use_enable threads)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	dodoc doc/*
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.99999.99999.ebuild
deleted file mode 100644
index 6c9197a333b9..000000000000
--- a/net-misc/iperf/iperf-2.99999.99999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 toolchain-funcs
-
-DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
-HOMEPAGE="https://sourceforge.net/projects/iperf2/"
-EGIT_REPO_URI="https://git.code.sf.net/p/iperf2/code"
-
-LICENSE="HPND"
-SLOT="2"
-IUSE="ipv6 threads debug"
-
-DOCS=( INSTALL README )
-
-src_configure() {
-	econf \
-		$(use_enable debug debuginfo) \
-		$(use_enable ipv6) \
-		$(use_enable threads)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	dodoc doc/*
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-misc/iperf/iperf-3.12.ebuild b/net-misc/iperf/iperf-3.12.ebuild
new file mode 100644
index 000000000000..6ee24b228358
--- /dev/null
+++ b/net-misc/iperf/iperf-3.12.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf"
+SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P/_/}
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="sctp"
+
+DEPEND="
+	>=dev-libs/cJSON-1.7.15
+	dev-libs/openssl:=
+	sctp? ( net-misc/lksctp-tools )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md RELNOTES.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
+	"${FILESDIR}"/${PN}-3.12-fix-bashism.patch
+	"${FILESDIR}"/${PN}-3.12-Unbundle-cJSON.patch
+)
+
+src_prepare() {
+	default
+
+	# Drop bundled cjson
+	rm src/cjson.{c,h} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with sctp)
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	systemd_dounit contrib/iperf3.service
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild
deleted file mode 100644
index fcfe1f4f75f0..000000000000
--- a/net-misc/iperf/iperf-3.99999.99999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf"
-EGIT_REPO_URI="https://github.com/esnet/iperf"
-S="${WORKDIR}/${P/_/}"
-
-LICENSE="BSD"
-SLOT="3"
-IUSE="sctp static-libs"
-
-DEPEND="
-	dev-libs/openssl:0=
-	sctp? ( net-misc/lksctp-tools )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md RELNOTES.md )
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with sctp)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/iperf.confd iperf3
-	newinitd "${FILESDIR}"/iperf3.initd iperf3
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 737ee681ed3f..bd8aa6ccbf0f 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index fbcf23d6eee7..f56d328b23a3 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,13 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@gentoo.org> (2022-10-02)
+# USE=compat / possibly allowing sys-libs/zlib needs to be figured out,
+# but packages want to use the actual zlib-ng library, so we need to
+# mask it and can't hold the whole thing up on the compat effort.
+sys-libs/zlib-ng compat
+sys-libs/minizip-ng compat
+
 # Matt Turner <mattst88@gentoo.org> (2022-09-26)
 # Requires nautilus-43.0 which is not in tree yet.
 >=x11-terms/gnome-terminal-3.46 nautilus
diff --git a/profiles/package.mask b/profiles/package.mask
index 4ea2ad75db93..5b103b7dc310 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -392,12 +392,6 @@ sys-devel/automake:1.15
 # This is likely to cause issues in tests; Unmask if using for other purposes
 >=dev-php/PHP_Timer-5.0
 
-# Sam James <sam@gentoo.org> (2021-12-01)
-# OSL 12 is a development release (for now).
-# Doesn't work with LLVM 13 yet; mask to help
-# Blender compatibility (no mixed LLVM versions).
-=media-libs/osl-1.12*
-
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-11-23)
 # Does not support updated dev-java/pdfbox-2.0.24, Bug #803488
 # Blocks (CVE-2018-11797, CVE-2021-{27807,27906,31811,31812})
@@ -436,6 +430,7 @@ sys-devel/automake:1.11
 >=gnome-extra/gnome-calculator-43
 >=gnome-extra/gnome-shell-extensions-43
 >=mail-client/evolution-3.46
+>=mail-client/geary-43
 media-libs/libshumate
 net-libs/libsoup:3.0
 net-libs/rest:1.0
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 193003b70e65..abd8f9a27c20 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8472,6 +8472,9 @@ sys-libs/libunwind:libatomic - Use libatomic instead of builtin atomic operation
 sys-libs/libxcrypt:compat - Build with compatibility interfaces for other crypt implementations
 sys-libs/libxcrypt:system - Install as system libcrypt.so rather than to an alternate directory (will collide with sys-libs/glibc's version)
 sys-libs/llvm-libunwind:clang - Force building using installed clang (rather than the default CC/CXX; required for testing).
+sys-libs/minizip-ng:compat - Enable compatibility with sys-libs/zlib's USE=minizip
+sys-libs/minizip-ng:openssl - Use dev-libs/openssl for further encryption capabilities
+sys-libs/minizip-ng:zstd - Add Zstandard compression support via app-arch/zstd
 sys-libs/musl-nscd:minimal - Only installs the header files
 sys-libs/ncurses:ada - Add bindings for the ADA programming language
 sys-libs/ncurses:stack-realign - Realign the stack in the 32-bit build for compatibility with older binaries at some performance cost. Avoids crashes in older 32-bit binaries. Only affects x86/32-bit multilib builds on amd64.
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 5cccc279364c..b00ddd40cdc9 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/coq-serapi/Manifest b/sci-mathematics/coq-serapi/Manifest
index 9e8f2153507b..58995fd4f584 100644
--- a/sci-mathematics/coq-serapi/Manifest
+++ b/sci-mathematics/coq-serapi/Manifest
@@ -1,5 +1,7 @@
 AUX 50sertop-gentoo.el 85 BLAKE2B d06e7c0823a3bedbf5f9c91ea8ea26bc9ed9d2ea44030316a1f3d65c19e51d874f03c845af5ae8237a9562cff7c81e24196c5ae29e54d79d1ba322f51904ba5d SHA512 42e61d798800d2e4c7e0702bdff53401a06ff6def54a1c7c0a8a6fd3e6a2f502c48bc84a04356818aa2ec5241bdd63b407837df123bfad76fafb78cf8a5a6cca
 AUX coq-serapi-sertop.el-path.patch 319 BLAKE2B 272eca8af934e10e978d149f90ee702fba443db7506468dda344242c5fe8a336f3ba3836c536bfac9ec6e540e1ee2f4c1a031d69e42901fbea92441b64e4c2a5 SHA512 5d228659e7c07e8fae69ffbff9d6a9de3113aa444c467194ce9e238a0db86c59c2be45b3e14683e47c2453c701b869e53647c9b051652af5ced8f4b3b5a15e73
 DIST coq-serapi-0.15.0.tar.gz 268083 BLAKE2B aeea2cb8ed0f648f307715c464f2da90585718aa8afedf69b4e1c282265a12a3937044397787404e43286cebaaf1f48efde93d845cd71c1c97cc1b2e9a2a8835 SHA512 3ba1b63002d36a4c0e64f86170d31c4131dc02e8cb8573b39f03ed44d1e5f29c064c472bebad367b875b02e36ced6bfe8c5fb2023bd798b3b79f74a5a2f54189
-EBUILD coq-serapi-0.15.0-r2.ebuild 1403 BLAKE2B c0ccb04d66e214da207cc225e75ce7a81c176ce810bb473f829abe4c4668a44d43d9bec11a6db394c2139add2539bc8888fd6fcd456f0d32366a4b1c51916934 SHA512 b95f91e5050104df60329ba167454863a25bbcad5c8b7427e7ab903747bf78a57b5a058994f46441f38627363264ccad048cc66bd436933039649165a2d75fa4
+DIST coq-serapi-0.16.0.tar.gz 270647 BLAKE2B 8189e70bfa4208a613ec7a89d6fc72c15a9c1c29ed49cd53a561b72b4b9e55196bcb92d5e962309d8843036c30ec177588e2db7dd091443947b02e78f2df1880 SHA512 56cc74e9d2b1e13c7ffb94b32e206671ac904f6d7e633c830175eed6f7cb75a2b212be916316784dc7d697c6e5779e27ed402d5e7edbee8b7d84d2c533dc38c3
+EBUILD coq-serapi-0.15.0-r3.ebuild 1431 BLAKE2B 56b745512274a5a7ddd28c717a686632798a2d9cac5ef1c02eb1bf72e4426ff660ad0925951781b07d278568ff8d9c4af94329629039b05678f2372bf59a2861 SHA512 4959a6e5187b01c7fe1cfaaf0576439cacb04817b2ccb2f4724739360849800c7d5f2aac98380ca63e4e9ebea8fd316c0715b18f91015270bb6616914f821753
+EBUILD coq-serapi-0.16.0.ebuild 1492 BLAKE2B 0d0967c554d1b9fbd37f98d87b2e7d34c90996ec12acf9e675bad538344979373c741c6a80df47bf65cc0ba9c40ae4be9d4f5ea17e52264e200b14a6f8466901 SHA512 d904ce6d5c6ce1ffe3ac4ccf51b6910e8458584e20364dd0331d8097fae2682dee93333f1b94ed7e432b31f3fee2aa756ebca5ca6c9f5442f3042b81dfb09361
 MISC metadata.xml 935 BLAKE2B e1444df414ce499df466597f5e0949e8ebf2d6da23d77028546324109659f58c5f0284a315ea062410a2f2e4631aac8d3564664719e89d76ad6ded9bb8ba7a5f SHA512 172fedbb2aa42e2be9aff426d64fcd69d2dfa206bb0e6072c6ecdc14a1923a2f0676303d8d8aebfe9a3e96e0a1e89185d2d4952bdb9ba1fff44b3891f26d6bf7
diff --git a/sci-mathematics/coq-serapi/coq-serapi-0.15.0-r2.ebuild b/sci-mathematics/coq-serapi/coq-serapi-0.15.0-r2.ebuild
deleted file mode 100644
index 2290f780d192..000000000000
--- a/sci-mathematics/coq-serapi/coq-serapi-0.15.0-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COQV=8.15.0
-
-inherit elisp-common dune
-
-DESCRIPTION="Serialization library and protocol for interaction with the Coq proof assistant"
-HOMEPAGE="https://github.com/ejgallego/coq-serapi/"
-# The tarball in SRC_URI is comprised of <supported coq>+<package version>
-SRC_URI="https://github.com/ejgallego/${PN}/archive/${COQV}+${PV}.tar.gz
-		-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${COQV}-${PV}
-
-LICENSE="GPL-3+"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="emacs +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sci-mathematics/coq-${COQV}:=
-	>=dev-ml/ppx_sexp_conv-0.13.0:= <dev-ml/ppx_sexp_conv-0.15.0:=
-	dev-ml/cmdliner:=
-	dev-ml/ppx_deriving:=
-	dev-ml/ppx_deriving_yojson:=
-	dev-ml/ppx_import:=
-	dev-ml/sexplib:=
-	dev-ml/yojson:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	test? ( sci-mathematics/coq-mathcomp )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-sertop.el-path.patch )
-SITEFILE="50sertop-gentoo.el"
-
-src_compile() {
-	dune_src_compile
-
-	use emacs && elisp-compile sertop.el
-}
-
-src_install() {
-	dune_src_install
-
-	rm -r "${D}"/usr/share/emacs || die
-	if use emacs ; then
-		elisp-install ${PN} sertop.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/coq-serapi/coq-serapi-0.15.0-r3.ebuild b/sci-mathematics/coq-serapi/coq-serapi-0.15.0-r3.ebuild
new file mode 100644
index 000000000000..ddda9b6a1dce
--- /dev/null
+++ b/sci-mathematics/coq-serapi/coq-serapi-0.15.0-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COQV=8.15.0
+
+inherit elisp-common dune
+
+DESCRIPTION="Serialization library and protocol for interaction with the Coq proof assistant"
+HOMEPAGE="https://github.com/ejgallego/coq-serapi/"
+# The tarball in SRC_URI is comprised of <supported coq>+<package version>
+SRC_URI="https://github.com/ejgallego/${PN}/archive/${COQV}+${PV}.tar.gz
+		-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COQV}-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=sci-mathematics/coq-${COQV}:= <sci-mathematics/coq-8.16:=
+	>=dev-ml/ppx_sexp_conv-0.13.0:= <dev-ml/ppx_sexp_conv-0.15.0:=
+	dev-ml/cmdliner:=
+	dev-ml/ppx_deriving:=
+	dev-ml/ppx_deriving_yojson:=
+	dev-ml/ppx_import:=
+	dev-ml/sexplib:=
+	dev-ml/yojson:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+	test? ( sci-mathematics/coq-mathcomp )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-sertop.el-path.patch )
+SITEFILE="50sertop-gentoo.el"
+
+src_compile() {
+	dune_src_compile
+
+	use emacs && elisp-compile sertop.el
+}
+
+src_install() {
+	dune_src_install
+
+	rm -r "${D}"/usr/share/emacs || die
+	if use emacs ; then
+		elisp-install ${PN} sertop.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-mathematics/coq-serapi/coq-serapi-0.16.0.ebuild b/sci-mathematics/coq-serapi/coq-serapi-0.16.0.ebuild
new file mode 100644
index 000000000000..1c0a68608d2c
--- /dev/null
+++ b/sci-mathematics/coq-serapi/coq-serapi-0.16.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COQV=8.16.0
+
+inherit elisp-common dune
+
+DESCRIPTION="Serialization library and protocol for interaction with the Coq proof assistant"
+HOMEPAGE="https://github.com/ejgallego/coq-serapi/"
+# The tarball in SRC_URI is comprised of <supported coq>+<package version>
+SRC_URI="https://github.com/ejgallego/${PN}/archive/${COQV}+${PV}.tar.gz
+		-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${COQV}-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=sci-mathematics/coq-${COQV}:= <sci-mathematics/coq-8.17:=
+	>=dev-ml/ppx_sexp_conv-0.13.0:= <dev-ml/ppx_sexp_conv-0.15.0:=
+	>=dev-ml/seq-0.3:=
+	dev-ml/cmdliner:=
+	dev-ml/ppx_compare:=
+	dev-ml/ppx_deriving:=
+	dev-ml/ppx_deriving_yojson:=
+	dev-ml/ppx_hash:=
+	dev-ml/ppx_import:=
+	dev-ml/sexplib:=
+	dev-ml/yojson:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+	test? ( sci-mathematics/coq-mathcomp )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-sertop.el-path.patch )
+SITEFILE="50sertop-gentoo.el"
+
+src_compile() {
+	dune_src_compile
+
+	use emacs && elisp-compile sertop.el
+}
+
+src_install() {
+	dune_src_install
+
+	rm -r "${D}"/usr/share/emacs || die
+	if use emacs ; then
+		elisp-install ${PN} sertop.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 3ce4b196da52..9f4b5c96809c 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index d4dc3aecc62e..72c1cf20f5a4 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,4 +1,6 @@
 AUX cpuid-20220620-makefile.patch 1359 BLAKE2B b16bd455de251f3989718fa56c1b19f97d79271998ccf774f74f0886ab8072be482e480604bfad462e0ac9c325470d12e80150e6fc588abfae629cd6499e0ea4 SHA512 680e477460679ae016c95d0e0c5cef916486629011b43cafb5f90c1c097b8c245d4c8b7861a20bdeee05b87b2220ad37a5ca589ff952dd9d7580ca301aac0ada
 DIST cpuid-20220812.src.tar.gz 137109 BLAKE2B 158f152d55b0d8f8ca2df59fc19b9f91142296ef4657b6b2b39ca401abfb26db822be7eadb3a4010847483e75aa213b64756dec6cc625db8c96c8fe8e2a8c468 SHA512 f57c1bb78bad3a9a0d210d5da2a57ea6ffeca83c677f20423dc11af551684ba417b8e5641559cf1d5077567937bd2b2350f232e317ff7be388727983be2c1f6a
+DIST cpuid-20220927.src.tar.gz 137355 BLAKE2B 70c51273fb87fe86a4bf1ddef938275474ad3af496cfdbc8e1b8e7dcf3f33b478340fcd3c8c49c6a0d2fe4927e399977e9c53cab118da0098eae2cc83cea51fc SHA512 f621c4cf8cbe027133442aa29018b9b52eb4d0e45a362cf613fee772456ac9e3347582c2feacb6d3358602f6da6425fcd88924e1ba937c89a5eaac43b1f9143f
 EBUILD cpuid-20220812.ebuild 600 BLAKE2B 1ebc72661435e3d658e51857de187ab6ebf663548f0431f18c5240350d70bf7bd3390503bb5b45d527f28697ff6eaf0ab093847bf812a109f405ba75f95760d8 SHA512 2a2860ba8cb11dcc186d3cfea20232055a184de370651887aacf9db71ffa6cb80594e057ff8f7a4a81f926f38ef1c148cb2a690f9c1ac371acf46dcb01a3e06a
+EBUILD cpuid-20220927.ebuild 602 BLAKE2B 0b44750e78eaccaa51fef6961672ee30daffe9d77ec413201a4779b94ecce53fa10539907cdd3d79d1f6dcdc5a3e542c8cfc0a10deaf6fac01d48b9bbffdf089 SHA512 7abdb0e2514f001cae3c99bd2f0e128a2d17e7ee2d38cbeb7d0043635b02747415ff3c3b3ac86fbd2313d2dc6351e1c0a0094c048fa4e4e0146e3fa5b0290d6d
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20220927.ebuild b/sys-apps/cpuid/cpuid-20220927.ebuild
new file mode 100644
index 000000000000..0f77190b474c
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20220927.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
+HOMEPAGE="http://www.etallen.com/cpuid.html"
+SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BDEPEND="
+	app-arch/gzip
+	dev-lang/perl
+"
+
+DOCS=( "ChangeLog" "FUTURE" )
+
+PATCHES=( "${FILESDIR}/${PN}-20220620-makefile.patch" )
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
+
+src_install() {
+	emake BUILDROOT="${ED}" install
+
+	einstalldocs
+}
diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index 6fe85d6b02d7..3840aff89d5c 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1,4 +1,6 @@
 AUX README.gentoo 296 BLAKE2B df18c0796912c5cfe6e8f88427ea690512bfd519aa3502528df6f6936571497937a22f8edcd9e9143d915e648f9b341043141cc6d0ae35de55d22d44c0335f6e SHA512 4ae61b89352a4bbe70f4ea1b85eb19e58c2b81475722dda25c289fbe15e7e6e07df51b08471c5d3c5d7a3b12cc09ba599e0d2158dee68c9c66f60908d57b4326
 DIST hw-probe-1.6.4.tar.gz 162317 BLAKE2B 5fc5ddf032c6b2504430349089d95be5310a7ac7752a2b6c3c504240dae6572ee773f8360d6449e9122b20de904a7348a2bdc0af660de44f14cf37b16664ef2a SHA512 c812ebdb23f6b8a4df2f2849a29ecc1307c09f758aeb912face6e899510af69f9dee606fb0ff1807a6de1e89a5f7a8b3259b894cc823b9d25efbf26accf60ac4
+DIST hw-probe-1.6.5.tar.gz 163190 BLAKE2B 1d2ceb152d387018f427cd623897f8c4cc8828a6952c54bb9caa673797ac347b64d9daffcddeca16e8274e5ad42c2cff22efe3330209da1eee5476636167f0ad SHA512 68d6709ca4efe82e0e5de3b580c68f76fa31384af0c53645b6609cee14b944a410e58b12ac13f879d8d86220c1088cfaad17dc6edd24cf27700e449add6f6488
 EBUILD hw-probe-1.6.4.ebuild 2308 BLAKE2B e1619f4d5de09a5d7d2d2b55623d2db2ea5cd3833ac62c49b65fc8e1bc4af837c5f13bb50570d4a402949203b88035874d87c725eb563552816ac3c2afc065e5 SHA512 03e09dc195acb9f079e8980e6a3cd74cfe4da63a846fd177e27888b047ea974345a6a6d5c50eec59e8ac20899857f143cd268065727c0fe631737f81e0839f07
+EBUILD hw-probe-1.6.5.ebuild 2310 BLAKE2B e0be3c494d1c55e417aa6cda7fb5dce20fbdfde3c7a6a8912dea50d689429d76f1070cc04fbe2d38818db82284d4b14a73ad11bfa3d91f0d07f5d8b999bdc63c SHA512 ff0384687c15d332a47e890f49efae9da2a153eebcd971510b7f47704c10a72b87a1e829cf1faa7a47584259b68aeb1b2742ca38ea46782cbeb7db33cb12061d
 MISC metadata.xml 647 BLAKE2B 522741fd8d5f7b64d686ce02dd5ccd7d9ba42df1e50a3e51921fa17c110c6db114ee22d5a903c8bb61a2a5f3884fad5e8b1a929a062af111fd52faf047638ab1 SHA512 ef6e4af1150d72b3cc26ba56267dae006ae8a19a8df2606a9f02df0dc6b091f0bd3dd9caee2171e896dd7b5e582b853f228e899dbd9281dd07b435a1da1f6b7b
diff --git a/sys-apps/hw-probe/hw-probe-1.6.5.ebuild b/sys-apps/hw-probe/hw-probe-1.6.5.ebuild
new file mode 100644
index 000000000000..89965032f4b0
--- /dev/null
+++ b/sys-apps/hw-probe/hw-probe-1.6.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature readme.gentoo-r1
+
+DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
+HOMEPAGE="https://github.com/linuxhw/hw-probe/"
+SRC_URI="https://github.com/linuxhw/hw-probe/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Digest-SHA1
+	net-misc/curl
+	sys-apps/dmidecode
+	sys-apps/edid-decode
+	sys-apps/hwinfo
+	sys-apps/pciutils
+	sys-apps/smartmontools
+	sys-apps/usbutils
+	virtual/perl-Data-Dumper
+"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	default
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "showing Machine Check Exceptions." app-admin/mcelog
+	optfeature "showing additional I/O statistics." app-admin/sysstat
+	optfeature "showing display data channel (ddc) information." app-misc/ddcutil
+	optfeature "showing smart card (reader) information." dev-libs/opensc
+	optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools
+	optfeature "showing information of attached scanners." media-gfx/sane-backends
+	optfeature "showing GPU information provided by MESA." media-libs/mesa
+	optfeature "showing zeroconf statistics." net-dns/avahi
+	optfeature "showing HP printer statistics." net-print/hplip
+	optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill
+	optfeature "showing additional CPU capabilities." sys-apps/cpuid
+	optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm
+	optfeature "showing available I2C sensors." sys-apps/i2c-tools
+	optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi
+	optfeature "showing information about tested memory for faults." sys-apps/memtester
+	optfeature "showing 'Plug & Play' devices." sys-apps/pnputils
+	optfeature "showing systemd boot process information." sys-apps/systemd
+	optfeature "showing ACPI statistics and tables." sys-power/iasl
+	optfeature "showing information about NUMA." sys-process/numactl
+	optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs
+	optfeature "showing available Xinput devices." x11-apps/xinput
+}
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 667614b003a9..c85e4fd161c4 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -4,5 +4,7 @@ AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762
 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
 DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
+DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
 EBUILD systemd-utils-251.4-r2.ebuild 12095 BLAKE2B 21014fadfa7a5ea04e2cabde58ff7a5c404c28feb224680309c49f3f056b2b0af92688d245f17f42896e71bd1e59879ed070c691dfadaaa29e90580a3a216038 SHA512 f3bb8010c6162fc601b95eebc297ae8f3f5256bd6a20c70423aec1c90854744c773f63affe3f610c3b28ab795f5579cfb45ec57f70cb5eb6121c4347a7f45e95
+EBUILD systemd-utils-251.5.ebuild 12004 BLAKE2B 813622adb081673984af0142e4fcec51259441bcc31d2cd2985cd93c31ab6790a82081469525b6e3a05e9fe17f9cc581f717903aefa267aeb5167edebf714521 SHA512 3cfc14f2d5d0570dc6be9d4ad1ad9ebcc17c59970e5840a02a84bda6d80f35b33facddd46554a1857ecc38fc6e69875681e292d57a2dc32205e4e2f88a377c54
 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4
diff --git a/sys-apps/systemd-utils/systemd-utils-251.5.ebuild b/sys-apps/systemd-utils/systemd-utils-251.5.ebuild
new file mode 100644
index 000000000000..9350a1bda9be
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-251.5.ebuild
@@ -0,0 +1,524 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+	MY_P="systemd-stable-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+	MY_P="systemd-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-251.2"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	elibc_musl? ( >=sys-libs/musl-1.2.3 )
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.11
+	boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	boot? ( !<sys-boot/systemd-boot-250 )
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!sys-apps/hwids[udev]
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+	local PATCHES=(
+		# Breaks Clang. Revert the commit for now and force off F_S=3.
+		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
+	)
+
+	if use elibc_musl; then
+		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+		# Applied upstream in 251.3
+		rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
+	fi
+	default
+
+	# Remove install_rpath; we link statically
+	local rpath_pattern="install_rpath : rootlibexecdir,"
+	grep -q -e "${rpath_pattern}" meson.build || die
+	sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+src_configure() {
+	# Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+	# wasn't backported to 250.x, but it turns out to break Clang
+	# anyway:  bug #841770.
+	#
+	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+	# to unset F_S first, then explicitly set 2, to negate any default
+	# and anything set by the user if they're choosing 3 (or if they've
+	# modified GCC to set 3).
+	#
+	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+		# We can't unconditionally do this b/c we fortify needs
+		# some level of optimisation.
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use split-usr)
+		$(meson_use split-usr split-bin)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot efi)
+		$(meson_native_use_bool boot gnu-efi)
+		$(meson_native_use_bool boot kernel-install)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+		# Link staticly with libsystemd-shared
+		-Dlink-boot-shared=false
+		-Dlink-udev-shared=false
+
+		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+		-Dstandalone-binaries=true
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+efi_arch() {
+	case "$(tc-arch)" in
+		amd64) echo x64 ;;
+		arm)   echo arm ;;
+		arm64) echo aa64 ;;
+		x86)   echo x86 ;;
+	esac
+}
+
+multilib_src_compile() {
+	local targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			targets+=(
+				bootctl
+				kernel-install
+				man/bootctl.1
+				man/kernel-install.8
+				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+				src/boot/efi/systemd-boot$(efi_arch).efi
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers.standalone
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles.standalone
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+			)
+			if use test; then
+				targets+=( test-tmpfiles )
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				src/udev/ata_id
+				src/udev/cdrom_id
+				src/udev/fido_id
+				src/udev/mtd_probe
+				src/udev/scsi_id
+				src/udev/udev.pc
+				src/udev/v4l_id
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/64-btrfs.rules
+			)
+			if use test; then
+				targets+=(
+					# Used by udev-test.pl
+					systemd-detect-virt
+					test/sys
+					test-udev
+
+					test-fido-id-desc
+					test-udev-builtin
+					test-udev-event
+					test-udev-netlink
+					test-udev-node
+					test-udev-util
+				)
+			fi
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			udev:shared_library
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if multilib_is_native_abi || use udev; then
+		meson_src_compile "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use sysusers; then
+			tests+=(
+				test-sysusers.standalone
+			)
+		fi
+		if use tmpfiles; then
+			tests+=(
+				test-systemd-tmpfiles.standalone
+				test-tmpfiles
+			)
+		fi
+		if use udev; then
+			tests+=(
+				rule-syntax-check
+				test-fido-id-desc
+				test-udev-builtin
+				test-udev-event
+				test-udev-netlink
+				test-udev-node
+				test-udev-util
+			)
+			if [[ -w /dev ]]; then
+				tests+=( udev-test )
+			else
+				ewarn "Skipping udev-test (needs write access to /dev)"
+			fi
+		fi
+	fi
+	if use udev; then
+		tests+=(
+			test-libudev
+			test-libudev-sym
+			test-udev-device-thread
+		)
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test "${tests[@]}"
+	fi
+}
+
+src_install() {
+	local rootprefix="$(usex split-usr '' /usr)"
+	meson-multilib_src_install
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use boot; then
+			into /usr
+			dobin bootctl kernel-install
+			doman man/{bootctl.1,kernel-install.8}
+			insinto usr/lib/systemd/boot/efi
+			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+		fi
+		if use sysusers; then
+			into "${rootprefix:-/}"
+			newbin systemd-sysusers{.standalone,}
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			into "${rootprefix:-/}"
+			newbin systemd-tmpfiles{.standalone,}
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+		fi
+		if use udev; then
+			into "${rootprefix:-/}"
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+
+			exeinto "${rootprefix}"/lib/udev
+			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+			insinto "${rootprefix}"/lib/udev/rules.d
+			doins rules.d/*.rules
+
+			insinto "${rootprefix}"/lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+		fi
+	fi
+	if use udev; then
+		meson_install --no-rebuild --tags libudev
+		gen_usr_ldscript -a udev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		into /usr
+		exeinto usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+
+		insinto "${rootprefix}"/lib/systemd/network
+		doins network/99-default.link
+
+		# Remove to avoid conflict with elogind
+		# https://bugs.gentoo.org/856433
+		rm rules.d/70-power-switch.rules || die
+		insinto /lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+
+		insinto /lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+
+		dobashcomp shell-completion/bash/udevadm
+
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+		udev_reload
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 1487e606e591..eb8155eef186 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -7,7 +7,9 @@ AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f1
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
 DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d33998674be50020b8db0627bb9d0c86be6576c404ce786b01ceec86f1c75b174c6fc2d7e0d7fbab802a78f48c9d0915c2b8 SHA512 fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f
 DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
+DIST systemd-stable-251.5.tar.gz 11444428 BLAKE2B 96df35dae789b11ead1960e1139046972a29c41f74ca800e0fafd84e6a8c238f8d4a30e2991ee94e07e866bc0c3137774ee116f276ac1203cca85254ccf91913 SHA512 2c645a694d45a2670920115529c5f34001153dafe26e5c4e65f8d1a37922a351569d056fc002f1af72dfc173988f93e11893460f64b497e3d5fc339083dcb2fa
 EBUILD systemd-251.3.ebuild 15507 BLAKE2B a5b9463fe2f440b01ab987b134fb147f88a811393e8122f2e404ca8163c7805cf42844292da3dbed72140e188958ccd67f11fc000c94b2e76aea0054a7a0606e SHA512 d1cd4e249b30fe9f975c4a70d7efd08b718dab197d84de621ab2e407299de764a1b47dc7d5df60028e3a2a5feedc9824b5d295a71c5583c369cc8283565de281
-EBUILD systemd-251.4.ebuild 15507 BLAKE2B 029709d318486fec25bebb409fa6a4d57741b5653e77722be5fe306820c0ea0e73036955406e5f1cbfebeb1f8b08fbd6da5a283d195763c6834abf8f0624ead3 SHA512 48e379d8b9a91b662c3400938f622f4f7f47c3a890892cb73a3b77fa21ec849ef7237797a2bca9c702115a51378cd180a4fa7bc33cd2f2c95d27c6cdc7136343
+EBUILD systemd-251.4.ebuild 15502 BLAKE2B 9c32b7812ce4660295199025e9da9d7aed979369f3d2275b4892bea90b356c520930675cadbaa98b1beccdc4f560c0720e854df76293a2c8acef02333e06ddb4 SHA512 b31f0361384923e6172b52232534c6f0a884d9fda7883794718292966863a95a990a159a43ac4513641f4967e318f2c6d7eac4631a452391db4396122d727b7e
+EBUILD systemd-251.5.ebuild 15510 BLAKE2B 6230fd24121c666d23af77e4eac37a1647c9271c4cfd7731acae7fd0c2392c048b6113b94a79e54066d77c6866e4700648ced41b54245068aca926705c8975cd SHA512 b2a54d4ed138e47dd41463c2e30f3c0b992cad176e2c46bebb98e115283863c242460e3de6049b7ac5817d7d0e62c25b46336686ad82b75cd759770f14c42d09
 EBUILD systemd-9999.ebuild 15374 BLAKE2B 932ea3a520d8e5371dc88d6bb474a0068141a9565332652589fc5d944a5e55cc81985ca5e05acb3d2c554da4355bcf3f80c6584469ac2bad41604c5dd8c9a099 SHA512 f26a179ce91729627b7c6c78ea8ca6515696bc330f1f012b2b02d15a5134028fe5066f03b0a4b78cfde77d37eafdda75731a5ff8dec82c694c49547f61c839bf
 MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565
diff --git a/sys-apps/systemd/systemd-251.4.ebuild b/sys-apps/systemd/systemd-251.4.ebuild
index 77e48349d5ef..487bf56cfcf6 100644
--- a/sys-apps/systemd/systemd-251.4.ebuild
+++ b/sys-apps/systemd/systemd-251.4.ebuild
@@ -23,7 +23,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	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"
 fi
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
diff --git a/sys-apps/systemd/systemd-251.5.ebuild b/sys-apps/systemd/systemd-251.5.ebuild
new file mode 100644
index 000000000000..df1093c4548c
--- /dev/null
+++ b/sys-apps/systemd/systemd-251.5.ebuild
@@ -0,0 +1,529 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..11} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
+REQUIRED_USE="
+	dns-over-tls? ( || ( gnutls openssl ) )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="4.15"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	iptables? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	selinux? (
+		sec-policy/selinux-base-policy[systemd]
+		sec-policy/selinux-ntp
+	)
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-apps/hwids[udev]
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
+			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+		# Breaks Clang. Revert the commit for now and force off F_S=3.
+		# bug #841770.
+		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+		)
+	fi
+
+	# Fails with split-usr.
+	sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	# Broken with FORTIFY_SOURCE=3 without a patch. We have to revert
+	# the upstream patch for it because it breaks Clang: bug #841770.
+	#
+	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+	# to unset F_S first, then explicitly set 2, to negate any default
+	# and anything set by the user if they're choosing 3 (or if they've
+	# modified GCC to set 3).
+	#
+	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+		# We can't unconditionally do this b/c we fortify needs
+		# some level of optimisation.
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		$(meson_use split-usr)
+		$(meson_use split-usr split-bin)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
+		$(meson_native_use_bool gnutls)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool iptables libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+	local sbin=$(usex split-usr sbin bin)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils && ! use split-usr; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 14f0d54d6218..1470548a8801 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/pam_yubico/Manifest b/sys-auth/pam_yubico/Manifest
index 574b205fe09f..beff30492277 100644
--- a/sys-auth/pam_yubico/Manifest
+++ b/sys-auth/pam_yubico/Manifest
@@ -1,3 +1,3 @@
-DIST pam_yubico-2.26.tar.gz 423451 BLAKE2B be65b9726d3b5d353577014c78163d9e092d3d98baf9c22c2a43bbbb5362589c18713712d218fd154cf493211cefd2924158b326db45c2b7dd0aee9aa9080de5 SHA512 4adba37f07e1fe1a2c4b534246ef0e862be76e3b1ce0ed6f11f15436f537cd5963f00abf48f6faa7e65b025ff6924dbaf918db1675b1e2cb89a802d2f2d6a4ec
-EBUILD pam_yubico-2.26-r1.ebuild 906 BLAKE2B 5626b331513510a3a08522b477c07ca6d10bda7ebd0cf7d68c7bed65381a5013767a5c12986b6094bc64f8bcec25c87a1e3ae4bff5fe542358e9f4d652e96eb7 SHA512 b8db00bcbb8748926c4fa3d6f8a29d9fa574ce2aac7d07c6de82d7493c49055437a4428aa11a5eb936c789d4d84e00d24126e2a4f0d6cfd09ac3a4d9a7cca7d4
+DIST pam_yubico-2.27.tar.gz 81374 BLAKE2B 132dc43ee25deb0a4bdac3dd3aa98952f102a8e437d126894e626da2dd6966271350dd460e901527ffd91d051102e11f68e0ad354ec8f59902eb78314cf60992 SHA512 7d341e18f884216fc3372bdb837491c637235737dc04029fea30d7451718ab917ea99dd4a1249cbb4d10fb64b6bb6753b84a02e9bffbce2223d224d7420aeced
+EBUILD pam_yubico-2.27.ebuild 1011 BLAKE2B 9c415f6d6c29c2529acb1adb251cf94acf0a4968f4863636a5983a6f2a0fd33660a720e0fb7aec4974447cff8f1cbcee3cce4ffb17efbdf39bb4b024c72da1cb SHA512 6c9c6ddb9552a18b63641786f178daafb325b36dd6b3f52a4f0d9043d12e0eeaf79edac41d71e2ac9ef9131e70e65346bd31aebc2c9eae89b13ee0879726a4c9
 MISC metadata.xml 340 BLAKE2B e837716f925129355286f7fa7bf703ee5486d87c67a5d06669b7f7a0c35312cb79dcc93eb76e6bdbe2cd627426fe2fab68533e551f6461176422cf5eb037f182 SHA512 66aa57dd3603d6249cc5fd844370cae5dfe9ccc07433aaf31802d6c3c1fe6c8264a3ff67f30fbfb4df1367cfb9ba2ff43e048c4bd673224697d07e26f5fb526f
diff --git a/sys-auth/pam_yubico/pam_yubico-2.26-r1.ebuild b/sys-auth/pam_yubico/pam_yubico-2.26-r1.ebuild
deleted file mode 100644
index eaf84fc6bbfa..000000000000
--- a/sys-auth/pam_yubico/pam_yubico-2.26-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pam
-
-DESCRIPTION="Library for authenticating against PAM with a Yubikey"
-HOMEPAGE="https://github.com/Yubico/yubico-pam"
-SRC_URI="http://opensource.yubico.com/yubico-pam/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/pam
-	sys-auth/libyubikey
-	>=sys-auth/ykclient-2.15
-	>=sys-auth/ykpers-1.6
-	ldap? ( net-nds/openldap:= )"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	test? ( dev-perl/Net-LDAP-Server )"
-
-src_configure() {
-	#challenge response could be optional but that seems horribly dangerous to me
-	local myeconfargs=(
-		--with-cr
-		--with-pam-dir="$(getpam_mod_dir)"
-		$(use_with ldap)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc doc/*
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-auth/pam_yubico/pam_yubico-2.27.ebuild b/sys-auth/pam_yubico/pam_yubico-2.27.ebuild
new file mode 100644
index 000000000000..06d9db589c2b
--- /dev/null
+++ b/sys-auth/pam_yubico/pam_yubico-2.27.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools pam
+
+DESCRIPTION="Library for authenticating against PAM with a Yubikey"
+HOMEPAGE="https://github.com/Yubico/yubico-pam"
+SRC_URI="https://github.com/Yubico/yubico-pam/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap test"
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/yubico-pam-${PV}"
+
+RDEPEND="
+	sys-libs/pam
+	sys-auth/libyubikey
+	>=sys-auth/ykclient-2.15
+	>=sys-auth/ykpers-1.6
+	ldap? ( net-nds/openldap:= )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	test? ( dev-perl/Net-LDAP-Server )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	#challenge response could be optional but that seems horribly dangerous to me
+	local myeconfargs=(
+		--with-cr
+		--with-pam-dir="$(getpam_mod_dir)"
+		$(use_with ldap)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dodoc doc/*
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index add71caf80b8..42acc302dd93 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest
new file mode 100644
index 000000000000..ae6ee5bf9d19
--- /dev/null
+++ b/sys-libs/minizip-ng/Manifest
@@ -0,0 +1,5 @@
+AUX minizip-ng-3.0.6-Switch-getrandom-and-arc4random_buf-usage-order.patch 2040 BLAKE2B 679a4c8878b06eb28352942e6b0f8285daf0f2d1cc3315071e3592f10fcfaaa11caf1b67e4a73c83201a85bf63750bbf7d3d0d4d7c2a5b2dd1b317eb5beac9f6 SHA512 b1913d03a49931b929435372b2e07d63ec13bf0513ac39549612514443efcd114d143848e6d0a6de751f1ed8499ecae4ecbfb0fce579e6e66549ea90f862417d
+AUX minizip-ng-3.0.6-test-temporary.patch 6922 BLAKE2B 65bc4803aec94e56d7d868096320bac78f425485cff9c0d8d7214e5321e136e239100c292356be69e638f34bba6104bbca95e3db7e8b9f71ccec5e60cab92510 SHA512 e52ebc658cf1bc6df0fcff481562fe61527fbae6fd4a1477ef0a9185e967d9eb0ea7678e6f330429f993fae97a639baf82df672fc1a71275c7f3d7f1c83c8596
+DIST minizip-ng-3.0.6.tar.gz 642138 BLAKE2B 3faddeef035da0417671ef5578b90ad9ec9a69f376d04fb8095f93e27e3276931ef432e179613e841e754ff6e915e8c631eeaa48795aaa87773e45465bd14afa SHA512 92aaad655e7dbec60ab8075435ccdc72314f75f0516aa4a16094215df2b14b108c2b49cdf6c876e396f0f43f52ad63f52ce7db2e119efe25c55b8b873bef9d4f
+EBUILD minizip-ng-3.0.6-r1.ebuild 2493 BLAKE2B 8a8e100a651d7557535991fc3c93dea319a21f95384625d30130c8b29a3c895193f054f65506bb88be56b80f18465a8adce7fd5ea2e2bc643811da5607facb8b SHA512 a0b261602e0fe1d4f0dc2a620d677c4d4f9cf1df88eec77e640f2eb08e327e88cd8fa2cb1b63171223fa92c9dd6854d8b3934a39e75026be1d04dba634ff4db3
+MISC metadata.xml 638 BLAKE2B 8a74cb73b53a8fa34aa5ad31ff7770fe47a6224161b6cce692d837004ffcbad15de7d318b3eb9dfa6db0f6f83eae0ed6238df19c27a82daeb7d958113f96478f SHA512 596d4f19cd3680b59ba2f94a8ebedb1fa84f5ca9e3d5125c76b5e787cd8b2e560152bf8151bfe140d03beae6a244b7a87210cc211c8493e0766852c776eef721
diff --git a/sys-libs/minizip-ng/files/minizip-ng-3.0.6-Switch-getrandom-and-arc4random_buf-usage-order.patch b/sys-libs/minizip-ng/files/minizip-ng-3.0.6-Switch-getrandom-and-arc4random_buf-usage-order.patch
new file mode 100644
index 000000000000..92db9c05b5d1
--- /dev/null
+++ b/sys-libs/minizip-ng/files/minizip-ng-3.0.6-Switch-getrandom-and-arc4random_buf-usage-order.patch
@@ -0,0 +1,68 @@
+https://github.com/zlib-ng/minizip-ng/pull/651
+
+From 1be6ea22e127a99786aefd2896e08bab43ad1333 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 2 Oct 2022 01:39:17 +0100
+Subject: [PATCH] Switch getrandom() and arc4random_buf() usage order
+
+We need to match the order of inclusions at the top of the file
+otherwise we might end up trying to use arc4random_buf() when
+available (because HAVE_ARC4RANODM_BUF is set) even though
+we hit HAVE_GETRANDOM first above and only included
+<sys/random.h> because of it.
+
+Besides, if getrandom() is available, we should really prefer
+it anyway.
+
+Fixes an implicit function declaration:
+```
+minizip-ng-3.0.6/mz_os_posix.c:124:5: error: implicit declaration of function 'arc4random_buf' [-Werror=implicit-function-declaration]
+```
+--- a/mz_os_posix.c
++++ b/mz_os_posix.c
+@@ -117,7 +117,22 @@ void mz_os_utf8_string_delete(uint8_t **string) {
+ 
+ /***************************************************************************/
+ 
+-#if defined(HAVE_ARC4RANDOM_BUF)
++#if defined(HAVE_GETRANDOM)
++int32_t mz_os_rand(uint8_t *buf, int32_t size) {
++    int32_t left = size;
++    int32_t written = 0;
++
++    while (left > 0) {
++        written = getrandom(buf, left, 0);
++        if (written < 0)
++            return MZ_INTERNAL_ERROR;
++
++        buf += written;
++        left -= written;
++    }
++    return size - left;
++}
++#elif defined(HAVE_ARC4RANDOM_BUF)
+ int32_t mz_os_rand(uint8_t *buf, int32_t size) {
+     if (size < 0)
+         return 0;
+@@ -139,21 +154,6 @@ int32_t mz_os_rand(uint8_t *buf, int32_t size) {
+     }
+     return size - left;
+ }
+-#elif defined(HAVE_GETRANDOM)
+-int32_t mz_os_rand(uint8_t *buf, int32_t size) {
+-    int32_t left = size;
+-    int32_t written = 0;
+-
+-    while (left > 0) {
+-        written = getrandom(buf, left, 0);
+-        if (written < 0)
+-            return MZ_INTERNAL_ERROR;
+-
+-        buf += written;
+-        left -= written;
+-    }
+-    return size - left;
+-}
+ #else
+ int32_t mz_os_rand(uint8_t *buf, int32_t size) {
+     static unsigned calls = 0;
diff --git a/sys-libs/minizip-ng/files/minizip-ng-3.0.6-test-temporary.patch b/sys-libs/minizip-ng/files/minizip-ng-3.0.6-test-temporary.patch
new file mode 100644
index 000000000000..d38603ac7378
--- /dev/null
+++ b/sys-libs/minizip-ng/files/minizip-ng-3.0.6-test-temporary.patch
@@ -0,0 +1,129 @@
+https://github.com/zlib-ng/minizip-ng/issues/623
+https://github.com/zlib-ng/minizip-ng/commit/6261d6f5ec5bd275257354c048f68ad9723c3231
+
+From 6261d6f5ec5bd275257354c048f68ad9723c3231 Mon Sep 17 00:00:00 2001
+From: Nathan Moinvaziri <nathan@solidstatenetworks.com>
+Date: Sat, 11 Jun 2022 10:36:42 -0700
+Subject: [PATCH] Generate test files in binary temp directory.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -804,6 +804,8 @@ if(MZ_BUILD_TESTS AND MZ_BUILD_UNIT_TESTS)
+         endif()
+     endif()
+ 
++    set(TEST_TEMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/Testing/Temporary)
++
+     add_test(NAME test_cmd COMMAND test_cmd WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+     function(create_compress_tests EXTRA_NAME EXTRA_ARGS)
+@@ -840,33 +842,43 @@ if(MZ_BUILD_TESTS AND MZ_BUILD_UNIT_TESTS)
+         foreach(INDEX RANGE ${COMPRESS_METHOD_COUNT})
+             list(GET COMPRESS_METHOD_NAMES ${INDEX} COMPRESS_METHOD_NAME)
+             list(GET COMPRESS_METHOD_ARGS ${INDEX} COMPRESS_METHOD_ARG)
++
++            set(COMPRESS_METHOD_DEST_DIR
++                ${TEST_TEMP_DIR}/${COMPRESS_METHOD_NAME}-${EXTRA_NAME})
++            set(COMPRESS_METHOD_PATH
++                ${TEST_TEMP_DIR}/${COMPRESS_METHOD_NAME}-${EXTRA_NAME}.zip)
++
+             add_test(NAME ${COMPRESS_METHOD_NAME}-zip-${EXTRA_NAME}
+                      COMMAND minizip_cmd ${COMPRESS_METHOD_ARG} -o ${EXTRA_ARGS}
+-                        result.zip test.c test.h empty.txt random.bin uniform.bin fuzz
++                        ${COMPRESS_METHOD_PATH}
++                        test.c test.h empty.txt random.bin uniform.bin fuzz
+                      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+             add_test(NAME ${COMPRESS_METHOD_NAME}-list-${EXTRA_NAME}
+-                     COMMAND minizip_cmd -l ${EXTRA_ARGS} result.zip
++                     COMMAND minizip_cmd -l ${EXTRA_ARGS} ${COMPRESS_METHOD_PATH}
+                      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+             if(NOT MZ_COMPRESS_ONLY)
+                 add_test(NAME ${COMPRESS_METHOD_NAME}-unzip-${EXTRA_NAME}
+-                         COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out result.zip
++                         COMMAND minizip_cmd -x -o ${EXTRA_ARGS}
++                            -d ${COMPRESS_METHOD_DEST_DIR} ${COMPRESS_METHOD_PATH}
+                          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+             endif()
+             add_test(NAME ${COMPRESS_METHOD_NAME}-append-${EXTRA_NAME}
+                     COMMAND minizip_cmd ${COMPRESS_METHOD_ARG} -a ${EXTRA_ARGS}
+-                        result.zip single.txt
++                        ${COMPRESS_METHOD_PATH} single.txt
+                     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+             if(NOT MZ_COMPRESS_ONLY)
+                 add_test(NAME ${COMPRESS_METHOD_NAME}-append-unzip-${EXTRA_NAME}
+-                            COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out result.zip
++                            COMMAND minizip_cmd -x -o ${EXTRA_ARGS}
++                                -d ${COMPRESS_METHOD_DEST_DIR} ${COMPRESS_METHOD_PATH}
+                             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+             endif()
+             add_test(NAME ${COMPRESS_METHOD_NAME}-erase-${EXTRA_NAME}
+-                    COMMAND minizip_cmd -o -e result.zip test.c test.h
++                    COMMAND minizip_cmd -o -e ${COMPRESS_METHOD_PATH} test.c test.h
+                     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+             if(NOT MZ_COMPRESS_ONLY)
+                 add_test(NAME ${COMPRESS_METHOD_NAME}-erase-unzip-${EXTRA_NAME}
+-                         COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out result.zip
++                         COMMAND minizip_cmd -x -o ${EXTRA_ARGS}
++                            -d ${COMPRESS_METHOD_DEST_DIR} ${COMPRESS_METHOD_PATH}
+                          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+             endif()
+         endforeach()
+@@ -891,43 +903,49 @@ if(MZ_BUILD_TESTS AND MZ_BUILD_UNIT_TESTS)
+     if(NOT MZ_COMPRESS_ONLY)
+         if(MZ_ZLIB OR MZ_LIBCOMP)
+             add_test(NAME unzip-tiny
+-                     COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out
++                     COMMAND minizip_cmd -x -o ${EXTRA_ARGS}
++                        -d ${TEST_TEMP_DIR}/unzip-tiny
+                         fuzz/unzip_fuzzer_seed_corpus/tiny.zip
+                      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+         endif()
+         if(MZ_BZIP2)
+             add_test(NAME unzip-bzip2
+-                     COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out
++                     COMMAND minizip_cmd -x -o ${EXTRA_ARGS}
++                        -d ${TEST_TEMP_DIR}/unzip-bzip2
+                         fuzz/unzip_fuzzer_seed_corpus/bzip2.zip
+                      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+         endif()
+         if(MZ_LZMA)
+             add_test(NAME unzip-lzma
+-                     COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out
++                     COMMAND minizip_cmd -x -o ${EXTRA_ARGS}
++                        -d ${TEST_TEMP_DIR}/unzip-lzma
+                         fuzz/unzip_fuzzer_seed_corpus/lzma.zip
+                      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+         endif()
+         if(MZ_PKCRYPT)
+             add_test(NAME unzip-pkcrypt
+-                     COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out -p test123
++                     COMMAND minizip_cmd -x -o ${EXTRA_ARGS}
++                        -d ${TEST_TEMP_DIR}/unzip-pkcrypt -p test123
+                         fuzz/unzip_fuzzer_seed_corpus/encrypted_pkcrypt.zip
+                      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+         endif()
+         if(MZ_WZAES)
+             add_test(NAME unzip-wzaes
+-                     COMMAND minizip_cmd -x -o ${EXTRA_ARGS} -d out -p test123
++                     COMMAND minizip_cmd -x -o ${EXTRA_ARGS}
++                        -d ${TEST_TEMP_DIR}/unzip-wzaes -p test123
+                         fuzz/unzip_fuzzer_seed_corpus/encrypted_wzaes.zip
+                      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
+         endif()
+     endif()
+     if(NOT MZ_COMPRESS_ONLY AND NOT MZ_DECOMPRESS_ONLY)
+         if(MZ_ZLIB AND NOT MZ_LIBCOMP)
++            file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test/random.bin DESTINATION ${TEST_TEMP_DIR})
+             add_test(NAME gz
+                 COMMAND minigzip_cmd random.bin
+-                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
++                WORKING_DIRECTORY ${TEST_TEMP_DIR})
+             add_test(NAME ungz
+-                COMMAND minigzip_cmd -x -d out random.bin.gz
+-                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
++                COMMAND minigzip_cmd -x -d ${TEST_TEMP_DIR} random.bin.gz
++                WORKING_DIRECTORY ${TEST_TEMP_DIR})
+         endif()
+     endif()
+ endif()
+
diff --git a/sys-libs/minizip-ng/metadata.xml b/sys-libs/minizip-ng/metadata.xml
new file mode 100644
index 000000000000..f1896c5bcb81
--- /dev/null
+++ b/sys-libs/minizip-ng/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="compat">Enable compatibility with <pkg>sys-libs/zlib</pkg>'s USE=minizip</flag>
+		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for further encryption capabilities</flag>
+		<flag name="zstd">Add Zstandard compression support via <pkg>app-arch/zstd</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">zlib-ng/minizip-ng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild b/sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild
new file mode 100644
index 000000000000..42790b51b0d3
--- /dev/null
+++ b/sys-libs/minizip-ng/minizip-ng-3.0.6-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution"
+HOMEPAGE="https://github.com/zlib-ng/minizip-ng"
+SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="compat openssl test zstd"
+RESTRICT="!test? ( test )"
+
+# Automagically prefers sys-libs/zlib-ng if installed, so let's
+# just depend on it as presumably it's better tested anyway.
+RDEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	sys-libs/zlib-ng
+	virtual/libiconv
+	compat? ( !sys-libs/zlib[minizip] )
+	openssl? ( dev-libs/openssl:= )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.6-Switch-getrandom-and-arc4random_buf-usage-order.patch
+	"${FILESDIR}"/${P}-test-temporary.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMZ_COMPAT=$(usex compat)
+		-DMZ_BUILD_TESTS=$(usex test)
+		-DMZ_BUILD_UNIT_TESTS=$(usex test)
+		-DMZ_FETCH_LIBS=OFF
+		-DMZ_FORCE_FETCH_LIBS=OFF
+
+		# Compression library options
+		-DMZ_ZLIB=ON
+		-DMZ_BZIP2=ON
+		-DMZ_LZMA=ON
+		-DMZ_ZSTD=$(usex zstd)
+		-DMZ_LIBCOMP=OFF
+
+		# Encryption support options
+		-DMZ_PKCRYPT=ON
+		-DMZ_WZAES=ON
+		-DMZ_OPENSSL=$(usex openssl)
+		# TODO: Re-enable, ideally unconditionally, for arc4random
+		# Revisit when https://github.com/zlib-ng/minizip-ng/pull/648 fixed
+		-DMZ_LIBBSD=ON
+		-DMZ_SIGNING=ON
+
+		# Character conversion options
+		-DMZ_ICONV=ON
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# TODO: investigate
+		-E "(raw-unzip-pkcrypt|raw-append-unzip-pkcrypt|raw-erase-unzip-pkcrypt|deflate-unzip-pkcrypt|deflate-append-unzip-pkcrypt|deflate-erase-unzip-pkcrypt|bzip2-unzip-pkcrypt|bzip2-append-unzip-pkcrypt|bzip2-erase-unzip-pkcrypt|lzma-unzip-pkcrypt|lzma-append-unzip-pkcrypt|lzma-erase-unzip-pkcrypt|xz-unzip-pkcrypt|xz-append-unzip-pkcrypt|xz-erase-unzip-pkcrypt|zstd-unzip-pkcrypt|zstd-append-unzip-pkcrypt|zstd-erase-unzip-pkcrypt)"
+	)
+
+	# TODO: A bunch of tests end up looping and writing over each other's files
+	# It gets better with a patch applied (see https://github.com/zlib-ng/minizip-ng/issues/623#issuecomment-1264518994)
+	# but still hangs.
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	if use compat ; then
+		ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous"
+		ewarn "Please be careful!"
+	fi
+}
diff --git a/sys-libs/zlib-ng/Manifest b/sys-libs/zlib-ng/Manifest
index 4d4cb0a359ac..73ff3ca26501 100644
--- a/sys-libs/zlib-ng/Manifest
+++ b/sys-libs/zlib-ng/Manifest
@@ -1,5 +1,3 @@
-DIST zlib-ng-2.0.5.tar.gz 810110 BLAKE2B 70a7a4a4f5bcc792fcf5f41487160aa15481bc5512ddd567f59ac96ebd1b8ff7c1edb7e5887f16ee502a75fabb36caf88f0d88563a0d860679b0bfd0e0b9f12a SHA512 a643089a8189bf8bd24d679b84f07ae14932b4d88b88e94c44cca23350d6a9bbdaa411822d3651c2b0bf79f30c9f99514cc252cf9e9ab0b3a840540206466654
 DIST zlib-ng-2.0.6.tar.gz 817951 BLAKE2B 52993caadf14817e328b180d728586e1332ea04504288264934ef49441cb8b8c4a2412d4c11d1982f3764fef5e4fb7ebab442b407e57d9d5f08a5b2ed890bba9 SHA512 4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5
-EBUILD zlib-ng-2.0.5.ebuild 1971 BLAKE2B 6c6f5f9b1af80c9a7dfa525c849990a590d140c382ee99a9c7965426f4974e34bffc6a18e6b047b336b5d41bf3939e4e6a039f29837ea6add42f0b9dac64b68e SHA512 6305b130787419a29e6c70a7af35e24ed04fb2365898e6a38c46894f6e2660686805d381f30dda00377db30c2088010c1308a9aa3665f678cb518dc4b5f0928b
-EBUILD zlib-ng-2.0.6.ebuild 1971 BLAKE2B c165390bac57c8a5627f24b7bfa169ed6f5ae3f3a77b66796f74627640ac9f739cf1db4a7ba74568fe87d393d2eea8522e0aa4cd88831ed997868736026ce212 SHA512 1237b6fb1f97f421214ab10fd16c8ce961935b3bca20370e82491f4c681c1a5a72d68953a705ac82c11e4b4eadf703145b0b6577cd7cd9bbd641fa33b857b72a
+EBUILD zlib-ng-2.0.6.ebuild 1970 BLAKE2B a9d6e0225a11ad9bdb35221ba1847a3d56a322188c9fe6e4801aa1088263d373982d29b67c61ae09654d8d6c9ec5cfc838d059f4c2ca20d68a5af59673c38221 SHA512 1deaa597f60bcd5b3d3f8e665d6e2eac5baa792f8e6a21ec71232af84dafd937aefe7878b9f6622969dafd31c6678e431873baff426d4cadedf505149ae2a9e4
 MISC metadata.xml 431 BLAKE2B 49465a63458ac9b7d807d699d45046fd7dc849796f039956effee297fd4da30109bc6f0644cc46aec680f6a94fb6b839d857b17a2699907fd43317794a12cf78 SHA512 16c8b051776ba1ba37b01eac4127d3a84811b3f4cc9f733480ddd12992bb7119cf3c8a22dc18e4086cf71fe7a16266c21684bc7040070eaf1a8dde1783c8d59e
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.5.ebuild b/sys-libs/zlib-ng/zlib-ng-2.0.5.ebuild
deleted file mode 100644
index 35316b265096..000000000000
--- a/sys-libs/zlib-ng/zlib-ng-2.0.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Fork of the zlib data compression library"
-HOMEPAGE="https://github.com/zlib-ng/zlib-ng"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-#KEYWORDS="~amd64 ~x86"
-
-CPU_USE=( cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} )
-IUSE="compat ${CPU_USE[@]} test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="compat? ( !sys-libs/zlib )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DZLIB_COMPAT="$(usex compat)"
-		-DZLIB_ENABLE_TESTS="$(usex test)"
-		# Unaligned access is controversial and undefined behaviour
-		# Let's keep it off for now
-		# https://github.com/gentoo/gentoo/pull/17167
-		-DWITH_UNALIGNED="OFF"
-	)
-
-	# The intrinsics options are all defined conditionally, so we need
-	# to enable them on/off per-arch here for now.
-	if use amd64 || use x86 ; then
-		mycmakeargs+=(
-			-DWITH_AVX2=$(usex cpu_flags_x86_avx2)
-			-DWITH_SSE2=$(usex cpu_flags_x86_sse2)
-			-DWITH_SSSE3=$(usex cpu_flags_x86_ssse3)
-			-DWITH_SSE4=$(usex cpu_flags_x86_sse4a)
-			-DWITH_PCLMULQDQ=$(usex cpu_flags_x86_pclmul)
-		)
-	fi
-
-	if use arm || use arm64 ; then
-		mycmakeargs+=(
-			-DWITH_ACLE=$(usex cpu_flags_arm_crc32)
-			-DWITH_NEON=$(usex cpu_flags_arm_neon)
-		)
-	fi
-
-	if use ppc || use ppc64 ; then
-		# The POWER8 support is VSX which was introduced
-		# VSX2 was introduced with POWER8, so use that as a proxy for it
-		mycmakeargs+=(
-			-DWITH_POWER8=$(usex cpu_flags_ppc_vsx2)
-		)
-	fi
-
-	# TODO: There's no s390x USE_EXPAND yet
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use compat ; then
-		ewarn "zlib-ng is experimental and replacing the system zlib is dangerous"
-		ewarn "Please be careful!"
-		ewarn
-		ewarn "The following link explains the guarantees (and what is NOT guaranteed):"
-		ewarn "https://github.com/zlib-ng/zlib-ng/blob/2.0.x/PORTING.md"
-	fi
-}
diff --git a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
index 5abbd8a2ea61..4347d46652d3 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.0.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 CPU_USE=( cpu_flags_{x86_{avx2,sse2,ssse3,sse4a,pclmul},arm_{crc32,neon},ppc_vsx2} )
 IUSE="compat ${CPU_USE[@]} test"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index d1abad3a0b8e..ebc94b59a446 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 8de6135bcb88..c341d17eed7f 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -50,10 +50,10 @@ DIST nvidia-xconfig-510.85.02.tar.bz2 109790 BLAKE2B 09313f0f423c52c81550e8d94b8
 DIST nvidia-xconfig-515.65.01.tar.bz2 109681 BLAKE2B b41b3ec377c79af6906a47c826d9930cc5ea6e85e8404e6882f3bc03cfccfa03d8ef7c280453ab29edb208173aeb576d33df00f92c225a86bc3cb571b352cdbc SHA512 6f0752e32af6772e85bd2799ea2d895bd5b5faee4c1b6813eb839e75af43d07ef09be6606e7dfc40491e07c25333e9c4145465f97dc0338053e8be1c19220bf9
 DIST nvidia-xconfig-515.76.tar.bz2 110126 BLAKE2B de3c76133cdf20f927f242c39cc8db9bd8a03d27be2f3f3007ad69597e9aeeb5596602b18ea49d9de57d832e374568b19a05ce068521c4e0a067c359da55b873 SHA512 36d8831679427e331e3143ff1f46ff90498dcbefa5708f748be9ae608ff149ee23b8aaa80567a91f642de84be63a301c0b0bd9a46344cf6f2493c4a38466f709
 DIST open-gpu-kernel-modules-515.49.19.tar.gz 7417963 BLAKE2B 3dd1ce0f55776413697252f901183359be764dfed067b14f6d5c9fc6a234b6f96fbe046729be9f5136fa8e11c813e9ffe54d510d772d5ccb562aa3d65a127088 SHA512 a601e25898aa9a1fc96fe61e0be97cd82ab42136faf153710f205960b9d3fb42bc445ba78542150ee31f000653cd456ec2266426c7a741b9dd06c39fd1f52e51
-EBUILD nvidia-drivers-390.154.ebuild 14665 BLAKE2B 25a1be1a47db1dcc19c6c8e82a58c6962a31d89774dff2f516a77ff891533a3bb97524fb41a5b1d888bfbbeab16f25db71d52f7ae06c8680e8d69b60323e67b0 SHA512 a5bfed0269dc862d451eb35965aff3b6797c4cb87b62ac415011a90113194294ccaa6175a709bb0f7bebac9233158dd8265e784cda57dd7f35bf5c0fc6d14aa0
-EBUILD nvidia-drivers-470.141.03.ebuild 15313 BLAKE2B 29370d25f2e3524ce6be82a2088756ff9ff789a6dd85c300d4a6a349c454b224802ce42b570cdbd336f8e941984dee6d311af7e702914db68adadaa6df395b84 SHA512 3b0a90341efa01daea7b77292e43d6e1ff53ec51de029c358624b26ca907a8c0259aebcc23d67ca8fc6ed810d7c4991cb0b183131aeaf901052098893ec63812
-EBUILD nvidia-drivers-510.85.02.ebuild 15643 BLAKE2B d4ed16b54ca6860b86cdb972429056296e305438886877fc4536cb3b2d4074af857bdc9da35f08685914fdfbd6a2e453c78ba701d7ab177f23065221104a115e SHA512 6c7c5da56c68516bd2cc7ff0920021d2901270869993117636ce61602f368172fa8da771ab0c8df7144051a104e67a512d3dc43302605168d0af0ad39859b738
-EBUILD nvidia-drivers-515.49.19.ebuild 17426 BLAKE2B 03d1b9564daad4c54f8e3bf4f15abcf043f16487bdb419ad509dc8ef5672042a3bd63486d63690004d27c11183c64e1595b5b4bde42b19a6e3a6e50e2e93f4e0 SHA512 443f051d3ca32fb6a63c24acc0c58c621d1c0f9c4938dac3cb7f0644b09ed29896fa696212644a8d4ac8a85d393e4cfa1d0badb3c3308af2473521d72e86dc36
-EBUILD nvidia-drivers-515.65.01.ebuild 17426 BLAKE2B 76d42afbf430b26c776f1575acecd44363c8b56d62a1337a15d7ec85fc72988a874b76ae5c970df69c60c9d31ea3c37fd2421a0dfc71ea5c155f08330a014781 SHA512 dfb52d5708179ae8b13f2c21e89b76c3020cd1bbf98b9ede0ea16a226b7dc20fb925abc2d792378e31b9cf1f169ff2a5c3a029244ab7cc8003071bb65a1bdbf5
-EBUILD nvidia-drivers-515.76.ebuild 17427 BLAKE2B ec6f7d37a8f3289acf592ffe0039363b4996a43a3ab6f04a8ff8037a552d9eb4afd3979912d74bc80fc4b320c8e4090e4a274916c18a31c7dfe3a08896a58de8 SHA512 707ccb77d7463bb9a85ec12124f120957aae7b636461ce8bb8caa2e91aa7bc62a4f86ca031f5f4514e730cb7f97fa848b68d39ff3ed3f69f8c99d34cd5025872
+EBUILD nvidia-drivers-390.154.ebuild 17098 BLAKE2B d488b4c674b11e27620cbc7a5d8c70b3c3574875aa28a7beb8c17c1924db07250b70e9e632a72b02d1f08323da428bc22e03ce5b7d150c719ef0e3fd81d7c914 SHA512 376ec2f3846977b633834768b50e25d6e85113856a75eeae7da3adf026ce913419b85711ef12e90e9e02847679f9657219d2169daf622cefa6f9d8fb35e5ff13
+EBUILD nvidia-drivers-470.141.03.ebuild 17746 BLAKE2B f596673e5524053db9a9cf7d24fa4e6c988c844037e5539ecaefd1cff8f15b9a97782cc84dc18c53d2d338c2a4b641f12df7939e17615a9603a20f80dfe9ddb0 SHA512 2d444b40d64b61db77b033a16fd575e9760bc2bbade324df6da33afeac9d6fe249d742957003d248a88eec8ce1116d80a4ac4e557de227686c9f6de77cdbd4a8
+EBUILD nvidia-drivers-510.85.02.ebuild 18076 BLAKE2B 3dcdb0fb2aa554826074a961e2d5c51fcd1830690ed285b42905f93e5b9ab2404e7f07f978b20325e86b12773e64c33e57d6887935cfefe8e8c71202c91a36b4 SHA512 7ea7663a83ad9b3bf57ef8c01623ce1605f418a39734729aba1168c47ddf4127fae2f5d468d57b9cff813021d51c1d8b5c2834490751cf0a1bd114ccb9e847a1
+EBUILD nvidia-drivers-515.49.19.ebuild 19859 BLAKE2B 6be68405dd9020391fcb4df15ffbd26c8fcb2d4c10d5e14ca743c7223a939082f3b13aa546a736ac7ad3cdf76b582e9553d67c3559d7a5a5d7a937c6cde21506 SHA512 4a059345503c1dca814bd11ed49651cc094991443574759758ddc3530107d25e4a9d09447615013cc9e0c73c908f7829693430c22575d5dfc9bfa0c02c1829b2
+EBUILD nvidia-drivers-515.65.01.ebuild 19859 BLAKE2B fed776b2d2dd46f3216ee8ebc3e499c5eddac77b3663af5584509e1cd18a2d429d6d1359abd969e44004e07ec6e585f8837866b8d90a6c79ca38b947f65ab951 SHA512 7ea63231cb0acbba3d319032506f45b7bd95269535be01ae554f2c36a01eb02ff0552d448c4bb5de19604c6af1de1533cf8c63bb577758cac1864b5abca4ab97
+EBUILD nvidia-drivers-515.76.ebuild 19860 BLAKE2B 7c6ee74f6c7ec7c665f510d8bcd2ab11e538dc48e979b263d6caa241b3ac421a24aeae259dfc16ce8557f65e525d864303b1c652923ed1a47c1a19528d38d4b3 SHA512 7400c35b9eb2c75460de38f6698b32144cc1241da14ee931316ac59933893084149b487e9d2ccabe80b16ccb4cc906f7b896c63342fcd4cfe9103b33cef5399e
 MISC metadata.xml 1320 BLAKE2B f8aa8f9a39d6da284b60afb50087acf75744057628e79b77a95e6bebb1e386e9d1a819f41e73d3e94b8ab74322ec8e8b077ad6d2af0804a5c6f20b4dd5f2897d SHA512 9fb939f8c8892ce43afc4f577181474c88a0aae3cc58af57987000b82f6c52f3f7b40fc538fa8eae0d5dbaf1fe3734d84f72fda2106853edd945149b3f2d2747
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
index e3155fa43d82..056c04443660 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
@@ -97,7 +97,7 @@ pkg_setup() {
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="X86_KERNEL_IBT: is set, be warned the modules may not load with it.
+	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, be warned the modules may not load.
 	If run into problems, either unset or pass ibt=off to the kernel."
 
 	kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
@@ -112,6 +112,68 @@ pkg_setup() {
 
 	[[ ${MERGE_TYPE} == binary ]] && return
 
+	# do some extra checks manually as it gets messy to handle builtin-only
+	# and some other conditional checks through CONFIG_CHECK
+	# TODO?: maybe move other custom checks here for uniformity
+	local warn=()
+
+	if linux_chkconfig_builtin DRM_NOUVEAU; then
+		# suggest =m given keeps KMS_HELPER enabled and can serve as fallback
+		warn+=(
+			"  CONFIG_DRM_NOUVEAU: is builtin (=y), and will prevent loading NVIDIA"
+			"    modules (can be safely kept as a module (=m) instead)."
+		)
+	fi
+
+	if linux_chkconfig_builtin DRM_SIMPLEDRM; then
+		# wrt prebuilts, Fedora is pushing =y and gentoo-kernel-bin uses its
+		# configs (bug #840439), but without Fedora's kernel patch to
+		# workaround this issue (which is unlikely to work for us anyway)
+		# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/228
+		warn+=(
+			"  CONFIG_DRM_SIMPLEDRM: is builtin (=y), and may conflict with NVIDIA"
+			"    (i.e. blanks when X/wayland starts, and tty loses display)."
+			"    For prebuilt kernels, unfortunately no known good workarounds."
+		)
+	fi
+
+	if ! linux_chkconfig_present FB_EFI &&
+		! linux_chkconfig_present FB_SIMPLE &&
+		! linux_chkconfig_present FB_VESA
+	then
+		# nvidia-drivers does not handle the tty (beside mode restoration) but,
+		# given few options are viable, try to warn if all missing
+		warn+=(
+			"  CONFIG_FB_(EFI|SIMPLE|VESA): none set, but note at least one is normally"
+			"    needed to get a display for the tty console. In most cases, it is"
+			"    recommended to enable FB_EFI=y and disable FB_SIMPLE (can be quirky)."
+			"    Non-EFI systems are likely to want FB_VESA=y. Users with multiple GPUs"
+			"    or not using the tty may be able to safely ignore this warning."
+		)
+	fi
+
+	if kernel_is -ge 5 18 13; then
+		if linux_chkconfig_present FB_SIMPLE; then
+			warn+=(
+				"  CONFIG_FB_SIMPLE: is set, recommended to disable and switch to FB_EFI"
+				"    as it is currently known broken with >=kernel-5.18.13 + NVIDIA."
+				"    https://github.com/NVIDIA/open-gpu-kernel-modules/issues/341"
+			)
+		fi
+
+		if linux_chkconfig_present SYSFB_SIMPLEFB &&
+			{ linux_chkconfig_present FB_EFI || linux_chkconfig_present FB_VESA; }
+		then
+			warn+=(
+				"  CONFIG_SYSFB_SIMPLEFB: is set, this may prevent FB_EFI or FB_VESA"
+				"    from providing a working tty console display (ignore if unused)."
+			)
+		fi
+	fi
+
+	(( ${#warn[@]} )) &&
+		ewarn "Detected potential configuration issues with used kernel:${warn[*]/#/$'\n'}"
+
 	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
 	use x86 && BUILD_PARAMS+=' ARCH=i386'
 	BUILD_TARGETS="modules"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild
index f956843454c4..0f4634979526 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild
@@ -99,7 +99,7 @@ pkg_setup() {
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="X86_KERNEL_IBT: is set, be warned the modules may not load with it.
+	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, be warned the modules may not load.
 	If run into problems, either unset or pass ibt=off to the kernel."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
@@ -115,6 +115,68 @@ pkg_setup() {
 
 	[[ ${MERGE_TYPE} == binary ]] && return
 
+	# do some extra checks manually as it gets messy to handle builtin-only
+	# and some other conditional checks through CONFIG_CHECK
+	# TODO?: maybe move other custom checks here for uniformity
+	local warn=()
+
+	if linux_chkconfig_builtin DRM_NOUVEAU; then
+		# suggest =m given keeps KMS_HELPER enabled and can serve as fallback
+		warn+=(
+			"  CONFIG_DRM_NOUVEAU: is builtin (=y), and will prevent loading NVIDIA"
+			"    modules (can be safely kept as a module (=m) instead)."
+		)
+	fi
+
+	if linux_chkconfig_builtin DRM_SIMPLEDRM; then
+		# wrt prebuilts, Fedora is pushing =y and gentoo-kernel-bin uses its
+		# configs (bug #840439), but without Fedora's kernel patch to
+		# workaround this issue (which is unlikely to work for us anyway)
+		# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/228
+		warn+=(
+			"  CONFIG_DRM_SIMPLEDRM: is builtin (=y), and may conflict with NVIDIA"
+			"    (i.e. blanks when X/wayland starts, and tty loses display)."
+			"    For prebuilt kernels, unfortunately no known good workarounds."
+		)
+	fi
+
+	if ! linux_chkconfig_present FB_EFI &&
+		! linux_chkconfig_present FB_SIMPLE &&
+		! linux_chkconfig_present FB_VESA
+	then
+		# nvidia-drivers does not handle the tty (beside mode restoration) but,
+		# given few options are viable, try to warn if all missing
+		warn+=(
+			"  CONFIG_FB_(EFI|SIMPLE|VESA): none set, but note at least one is normally"
+			"    needed to get a display for the tty console. In most cases, it is"
+			"    recommended to enable FB_EFI=y and disable FB_SIMPLE (can be quirky)."
+			"    Non-EFI systems are likely to want FB_VESA=y. Users with multiple GPUs"
+			"    or not using the tty may be able to safely ignore this warning."
+		)
+	fi
+
+	if kernel_is -ge 5 18 13; then
+		if linux_chkconfig_present FB_SIMPLE; then
+			warn+=(
+				"  CONFIG_FB_SIMPLE: is set, recommended to disable and switch to FB_EFI"
+				"    as it is currently known broken with >=kernel-5.18.13 + NVIDIA."
+				"    https://github.com/NVIDIA/open-gpu-kernel-modules/issues/341"
+			)
+		fi
+
+		if linux_chkconfig_present SYSFB_SIMPLEFB &&
+			{ linux_chkconfig_present FB_EFI || linux_chkconfig_present FB_VESA; }
+		then
+			warn+=(
+				"  CONFIG_SYSFB_SIMPLEFB: is set, this may prevent FB_EFI or FB_VESA"
+				"    from providing a working tty console display (ignore if unused)."
+			)
+		fi
+	fi
+
+	(( ${#warn[@]} )) &&
+		ewarn "Detected potential configuration issues with used kernel:${warn[*]/#/$'\n'}"
+
 	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
 	BUILD_TARGETS="modules"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.85.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.85.02.ebuild
index 72881337a6cd..de65d9d7dbde 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.85.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.85.02.ebuild
@@ -102,7 +102,7 @@ pkg_setup() {
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="X86_KERNEL_IBT: is set, be warned the modules may not load with it.
+	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, be warned the modules may not load.
 	If run into problems, either unset or pass ibt=off to the kernel."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
@@ -118,6 +118,68 @@ pkg_setup() {
 
 	[[ ${MERGE_TYPE} == binary ]] && return
 
+	# do some extra checks manually as it gets messy to handle builtin-only
+	# and some other conditional checks through CONFIG_CHECK
+	# TODO?: maybe move other custom checks here for uniformity
+	local warn=()
+
+	if linux_chkconfig_builtin DRM_NOUVEAU; then
+		# suggest =m given keeps KMS_HELPER enabled and can serve as fallback
+		warn+=(
+			"  CONFIG_DRM_NOUVEAU: is builtin (=y), and will prevent loading NVIDIA"
+			"    modules (can be safely kept as a module (=m) instead)."
+		)
+	fi
+
+	if linux_chkconfig_builtin DRM_SIMPLEDRM; then
+		# wrt prebuilts, Fedora is pushing =y and gentoo-kernel-bin uses its
+		# configs (bug #840439), but without Fedora's kernel patch to
+		# workaround this issue (which is unlikely to work for us anyway)
+		# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/228
+		warn+=(
+			"  CONFIG_DRM_SIMPLEDRM: is builtin (=y), and may conflict with NVIDIA"
+			"    (i.e. blanks when X/wayland starts, and tty loses display)."
+			"    For prebuilt kernels, unfortunately no known good workarounds."
+		)
+	fi
+
+	if ! linux_chkconfig_present FB_EFI &&
+		! linux_chkconfig_present FB_SIMPLE &&
+		! linux_chkconfig_present FB_VESA
+	then
+		# nvidia-drivers does not handle the tty (beside mode restoration) but,
+		# given few options are viable, try to warn if all missing
+		warn+=(
+			"  CONFIG_FB_(EFI|SIMPLE|VESA): none set, but note at least one is normally"
+			"    needed to get a display for the tty console. In most cases, it is"
+			"    recommended to enable FB_EFI=y and disable FB_SIMPLE (can be quirky)."
+			"    Non-EFI systems are likely to want FB_VESA=y. Users with multiple GPUs"
+			"    or not using the tty may be able to safely ignore this warning."
+		)
+	fi
+
+	if kernel_is -ge 5 18 13; then
+		if linux_chkconfig_present FB_SIMPLE; then
+			warn+=(
+				"  CONFIG_FB_SIMPLE: is set, recommended to disable and switch to FB_EFI"
+				"    as it is currently known broken with >=kernel-5.18.13 + NVIDIA."
+				"    https://github.com/NVIDIA/open-gpu-kernel-modules/issues/341"
+			)
+		fi
+
+		if linux_chkconfig_present SYSFB_SIMPLEFB &&
+			{ linux_chkconfig_present FB_EFI || linux_chkconfig_present FB_VESA; }
+		then
+			warn+=(
+				"  CONFIG_SYSFB_SIMPLEFB: is set, this may prevent FB_EFI or FB_VESA"
+				"    from providing a working tty console display (ignore if unused)."
+			)
+		fi
+	fi
+
+	(( ${#warn[@]} )) &&
+		ewarn "Detected potential configuration issues with used kernel:${warn[*]/#/$'\n'}"
+
 	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
 	BUILD_TARGETS="modules"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.19.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.19.ebuild
index 2158dbd987aa..58ea8699f7d7 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.19.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.49.19.ebuild
@@ -104,7 +104,7 @@ pkg_setup() {
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="X86_KERNEL_IBT: is set, be warned the modules may not load with it.
+	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, be warned the modules may not load.
 	If run into problems, either unset or pass ibt=off to the kernel."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
@@ -127,6 +127,68 @@ pkg_setup() {
 
 	[[ ${MERGE_TYPE} == binary ]] && return
 
+	# do some extra checks manually as it gets messy to handle builtin-only
+	# and some other conditional checks through CONFIG_CHECK
+	# TODO?: maybe move other custom checks here for uniformity
+	local warn=()
+
+	if linux_chkconfig_builtin DRM_NOUVEAU; then
+		# suggest =m given keeps KMS_HELPER enabled and can serve as fallback
+		warn+=(
+			"  CONFIG_DRM_NOUVEAU: is builtin (=y), and will prevent loading NVIDIA"
+			"    modules (can be safely kept as a module (=m) instead)."
+		)
+	fi
+
+	if linux_chkconfig_builtin DRM_SIMPLEDRM; then
+		# wrt prebuilts, Fedora is pushing =y and gentoo-kernel-bin uses its
+		# configs (bug #840439), but without Fedora's kernel patch to
+		# workaround this issue (which is unlikely to work for us anyway)
+		# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/228
+		warn+=(
+			"  CONFIG_DRM_SIMPLEDRM: is builtin (=y), and may conflict with NVIDIA"
+			"    (i.e. blanks when X/wayland starts, and tty loses display)."
+			"    For prebuilt kernels, unfortunately no known good workarounds."
+		)
+	fi
+
+	if ! linux_chkconfig_present FB_EFI &&
+		! linux_chkconfig_present FB_SIMPLE &&
+		! linux_chkconfig_present FB_VESA
+	then
+		# nvidia-drivers does not handle the tty (beside mode restoration) but,
+		# given few options are viable, try to warn if all missing
+		warn+=(
+			"  CONFIG_FB_(EFI|SIMPLE|VESA): none set, but note at least one is normally"
+			"    needed to get a display for the tty console. In most cases, it is"
+			"    recommended to enable FB_EFI=y and disable FB_SIMPLE (can be quirky)."
+			"    Non-EFI systems are likely to want FB_VESA=y. Users with multiple GPUs"
+			"    or not using the tty may be able to safely ignore this warning."
+		)
+	fi
+
+	if kernel_is -ge 5 18 13; then
+		if linux_chkconfig_present FB_SIMPLE; then
+			warn+=(
+				"  CONFIG_FB_SIMPLE: is set, recommended to disable and switch to FB_EFI"
+				"    as it is currently known broken with >=kernel-5.18.13 + NVIDIA."
+				"    https://github.com/NVIDIA/open-gpu-kernel-modules/issues/341"
+			)
+		fi
+
+		if linux_chkconfig_present SYSFB_SIMPLEFB &&
+			{ linux_chkconfig_present FB_EFI || linux_chkconfig_present FB_VESA; }
+		then
+			warn+=(
+				"  CONFIG_SYSFB_SIMPLEFB: is set, this may prevent FB_EFI or FB_VESA"
+				"    from providing a working tty console display (ignore if unused)."
+			)
+		fi
+	fi
+
+	(( ${#warn[@]} )) &&
+		ewarn "Detected potential configuration issues with used kernel:${warn[*]/#/$'\n'}"
+
 	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
 	BUILD_TARGETS="modules"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild
index e1f5cfc6ceff..9c35dd8fe324 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.65.01.ebuild
@@ -104,7 +104,7 @@ pkg_setup() {
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="X86_KERNEL_IBT: is set, be warned the modules may not load with it.
+	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, be warned the modules may not load.
 	If run into problems, either unset or pass ibt=off to the kernel."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
@@ -127,6 +127,68 @@ pkg_setup() {
 
 	[[ ${MERGE_TYPE} == binary ]] && return
 
+	# do some extra checks manually as it gets messy to handle builtin-only
+	# and some other conditional checks through CONFIG_CHECK
+	# TODO?: maybe move other custom checks here for uniformity
+	local warn=()
+
+	if linux_chkconfig_builtin DRM_NOUVEAU; then
+		# suggest =m given keeps KMS_HELPER enabled and can serve as fallback
+		warn+=(
+			"  CONFIG_DRM_NOUVEAU: is builtin (=y), and will prevent loading NVIDIA"
+			"    modules (can be safely kept as a module (=m) instead)."
+		)
+	fi
+
+	if linux_chkconfig_builtin DRM_SIMPLEDRM; then
+		# wrt prebuilts, Fedora is pushing =y and gentoo-kernel-bin uses its
+		# configs (bug #840439), but without Fedora's kernel patch to
+		# workaround this issue (which is unlikely to work for us anyway)
+		# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/228
+		warn+=(
+			"  CONFIG_DRM_SIMPLEDRM: is builtin (=y), and may conflict with NVIDIA"
+			"    (i.e. blanks when X/wayland starts, and tty loses display)."
+			"    For prebuilt kernels, unfortunately no known good workarounds."
+		)
+	fi
+
+	if ! linux_chkconfig_present FB_EFI &&
+		! linux_chkconfig_present FB_SIMPLE &&
+		! linux_chkconfig_present FB_VESA
+	then
+		# nvidia-drivers does not handle the tty (beside mode restoration) but,
+		# given few options are viable, try to warn if all missing
+		warn+=(
+			"  CONFIG_FB_(EFI|SIMPLE|VESA): none set, but note at least one is normally"
+			"    needed to get a display for the tty console. In most cases, it is"
+			"    recommended to enable FB_EFI=y and disable FB_SIMPLE (can be quirky)."
+			"    Non-EFI systems are likely to want FB_VESA=y. Users with multiple GPUs"
+			"    or not using the tty may be able to safely ignore this warning."
+		)
+	fi
+
+	if kernel_is -ge 5 18 13; then
+		if linux_chkconfig_present FB_SIMPLE; then
+			warn+=(
+				"  CONFIG_FB_SIMPLE: is set, recommended to disable and switch to FB_EFI"
+				"    as it is currently known broken with >=kernel-5.18.13 + NVIDIA."
+				"    https://github.com/NVIDIA/open-gpu-kernel-modules/issues/341"
+			)
+		fi
+
+		if linux_chkconfig_present SYSFB_SIMPLEFB &&
+			{ linux_chkconfig_present FB_EFI || linux_chkconfig_present FB_VESA; }
+		then
+			warn+=(
+				"  CONFIG_SYSFB_SIMPLEFB: is set, this may prevent FB_EFI or FB_VESA"
+				"    from providing a working tty console display (ignore if unused)."
+			)
+		fi
+	fi
+
+	(( ${#warn[@]} )) &&
+		ewarn "Detected potential configuration issues with used kernel:${warn[*]/#/$'\n'}"
+
 	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
 	BUILD_TARGETS="modules"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.76.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.76.ebuild
index b7fba7fefd0f..5aff3c436a26 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.76.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.76.ebuild
@@ -104,7 +104,7 @@ pkg_setup() {
 	Cannot be directly selected in the kernel's menuconfig, and may need
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
-	local ERROR_X86_KERNEL_IBT="X86_KERNEL_IBT: is set, be warned the modules may not load with it.
+	local ERROR_X86_KERNEL_IBT="CONFIG_X86_KERNEL_IBT: is set, be warned the modules may not load.
 	If run into problems, either unset or pass ibt=off to the kernel."
 
 	use amd64 && kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
@@ -127,6 +127,68 @@ pkg_setup() {
 
 	[[ ${MERGE_TYPE} == binary ]] && return
 
+	# do some extra checks manually as it gets messy to handle builtin-only
+	# and some other conditional checks through CONFIG_CHECK
+	# TODO?: maybe move other custom checks here for uniformity
+	local warn=()
+
+	if linux_chkconfig_builtin DRM_NOUVEAU; then
+		# suggest =m given keeps KMS_HELPER enabled and can serve as fallback
+		warn+=(
+			"  CONFIG_DRM_NOUVEAU: is builtin (=y), and will prevent loading NVIDIA"
+			"    modules (can be safely kept as a module (=m) instead)."
+		)
+	fi
+
+	if linux_chkconfig_builtin DRM_SIMPLEDRM; then
+		# wrt prebuilts, Fedora is pushing =y and gentoo-kernel-bin uses its
+		# configs (bug #840439), but without Fedora's kernel patch to
+		# workaround this issue (which is unlikely to work for us anyway)
+		# https://github.com/NVIDIA/open-gpu-kernel-modules/issues/228
+		warn+=(
+			"  CONFIG_DRM_SIMPLEDRM: is builtin (=y), and may conflict with NVIDIA"
+			"    (i.e. blanks when X/wayland starts, and tty loses display)."
+			"    For prebuilt kernels, unfortunately no known good workarounds."
+		)
+	fi
+
+	if ! linux_chkconfig_present FB_EFI &&
+		! linux_chkconfig_present FB_SIMPLE &&
+		! linux_chkconfig_present FB_VESA
+	then
+		# nvidia-drivers does not handle the tty (beside mode restoration) but,
+		# given few options are viable, try to warn if all missing
+		warn+=(
+			"  CONFIG_FB_(EFI|SIMPLE|VESA): none set, but note at least one is normally"
+			"    needed to get a display for the tty console. In most cases, it is"
+			"    recommended to enable FB_EFI=y and disable FB_SIMPLE (can be quirky)."
+			"    Non-EFI systems are likely to want FB_VESA=y. Users with multiple GPUs"
+			"    or not using the tty may be able to safely ignore this warning."
+		)
+	fi
+
+	if kernel_is -ge 5 18 13; then
+		if linux_chkconfig_present FB_SIMPLE; then
+			warn+=(
+				"  CONFIG_FB_SIMPLE: is set, recommended to disable and switch to FB_EFI"
+				"    as it is currently known broken with >=kernel-5.18.13 + NVIDIA."
+				"    https://github.com/NVIDIA/open-gpu-kernel-modules/issues/341"
+			)
+		fi
+
+		if linux_chkconfig_present SYSFB_SIMPLEFB &&
+			{ linux_chkconfig_present FB_EFI || linux_chkconfig_present FB_VESA; }
+		then
+			warn+=(
+				"  CONFIG_SYSFB_SIMPLEFB: is set, this may prevent FB_EFI or FB_VESA"
+				"    from providing a working tty console display (ignore if unused)."
+			)
+		fi
+	fi
+
+	(( ${#warn[@]} )) &&
+		ewarn "Detected potential configuration issues with used kernel:${warn[*]/#/$'\n'}"
+
 	BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
 	BUILD_TARGETS="modules"
 
-- 
cgit v1.2.3