From dcf9ac80d0667a18496506842a8903ba5dab2fc7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 20 Apr 2023 05:59:19 +0100
Subject: gentoo auto-resync : 20:04:2023 - 05:59:19

---
 Manifest                                           |   30 +-
 Manifest.files.gz                                  |  Bin 29454 -> 29458 bytes
 app-admin/Manifest.gz                              |  Bin 32073 -> 32081 bytes
 app-admin/awscli/Manifest                          |    2 +
 app-admin/awscli/awscli-1.27.116.ebuild            |   80 ++
 app-admin/rsyslog/Manifest                         |    3 +
 app-admin/rsyslog/rsyslog-8.2304.0.ebuild          |  496 +++++++++
 app-emacs/Manifest.gz                              |  Bin 67838 -> 67831 bytes
 app-emacs/doom-modeline/Manifest                   |    2 +
 app-emacs/doom-modeline/doom-modeline-3.4.0.ebuild |   33 +
 app-emacs/projectile/Manifest                      |    6 +-
 app-emacs/projectile/projectile-2.5.0-r1.ebuild    |   15 +-
 app-emacs/projectile/projectile-2.6.0.ebuild       |   15 +-
 app-emacs/projectile/projectile-2.7.0.ebuild       |   15 +-
 app-emacs/shrink-path/Manifest                     |    2 +-
 app-emacs/shrink-path/shrink-path-0.3.1.ebuild     |   13 +-
 dev-cpp/Manifest.gz                                |  Bin 13076 -> 13081 bytes
 dev-cpp/cpp-httplib/Manifest                       |    8 +-
 dev-cpp/cpp-httplib/cpp-httplib-0.11.3.ebuild      |   40 -
 dev-cpp/cpp-httplib/cpp-httplib-0.12.0.ebuild      |    2 +-
 dev-cpp/cpp-httplib/cpp-httplib-0.12.1.ebuild      |    2 +-
 dev-cpp/cpp-httplib/cpp-httplib-0.12.2.ebuild      |   50 +
 dev-java/Manifest.gz                               |  Bin 57488 -> 57479 bytes
 dev-java/commons-logging/Manifest                  |    2 +-
 .../commons-logging-1.3.0_pre20230319.ebuild       |    2 +-
 dev-lua/Manifest.gz                                |  Bin 7308 -> 7303 bytes
 dev-lua/luasec/Manifest                            |    2 +-
 dev-lua/luasec/luasec-1.3.1.ebuild                 |    2 +-
 dev-lua/mpack/Manifest                             |    2 +-
 dev-lua/mpack/mpack-1.0.10.ebuild                  |    2 +-
 dev-python/Levenshtein/Levenshtein-0.21.0.ebuild   |   45 +
 dev-python/Levenshtein/Manifest                    |    2 +
 dev-python/Manifest.gz                             |  Bin 258589 -> 258593 bytes
 dev-python/aws-sam-translator/Manifest             |    2 +
 .../aws-sam-translator-1.65.0.ebuild               |   60 ++
 dev-python/boto3/Manifest                          |    2 +
 dev-python/boto3/boto3-1.26.116.ebuild             |   66 ++
 dev-python/botocore/Manifest                       |    2 +
 dev-python/botocore/botocore-1.29.116.ebuild       |   72 ++
 dev-python/cfn-lint/Manifest                       |    2 +
 dev-python/cfn-lint/cfn-lint-0.77.2.ebuild         |   64 ++
 dev-python/hypothesis/Manifest                     |    2 +
 dev-python/hypothesis/hypothesis-6.72.1.ebuild     |   77 ++
 dev-python/pyasn1-modules/Manifest                 |    2 +
 .../pyasn1-modules/pyasn1-modules-0.3.0.ebuild     |   32 +
 dev-python/pyasn1/Manifest                         |    2 +
 dev-python/pyasn1/pyasn1-0.5.0.ebuild              |   22 +
 dev-python/python-email-validator/Manifest         |    2 +
 .../python-email-validator-2.0.0_p2.ebuild         |   31 +
 dev-python/python-engineio/Manifest                |    2 +
 .../python-engineio/python-engineio-4.4.1.ebuild   |   53 +
 dev-python/ytmusicapi/Manifest                     |    2 +
 dev-python/ytmusicapi/ytmusicapi-1.0.1.ebuild      |   22 +
 dev-tcltk/Manifest.gz                              |  Bin 5490 -> 5485 bytes
 dev-tcltk/snack/Manifest                           |    2 +-
 dev-tcltk/snack/snack-2.2.10-r12.ebuild            |    2 +-
 dev-tcltk/tclpython/Manifest                       |    2 +-
 dev-tcltk/tclpython/tclpython-5.0-r2.ebuild        |    2 +-
 kde-frameworks/Manifest.gz                         |  Bin 13763 -> 13764 bytes
 kde-frameworks/extra-cmake-modules/Manifest        |    2 +-
 .../extra-cmake-modules-5.104.0.ebuild             |    2 +-
 media-sound/Manifest.gz                            |  Bin 56768 -> 56767 bytes
 media-sound/lilypond/Manifest                      |    2 +-
 media-sound/lilypond/lilypond-2.24.0.ebuild        |    2 +-
 metadata/Manifest.gz                               |  Bin 3515 -> 3511 bytes
 metadata/dtd/timestamp.chk                         |    2 +-
 metadata/glsa/Manifest                             |   28 +-
 metadata/glsa/timestamp.chk                        |    2 +-
 metadata/md5-cache/Manifest.gz                     |  Bin 28082 -> 28077 bytes
 metadata/md5-cache/app-admin/Manifest.gz           |  Bin 54404 -> 54733 bytes
 metadata/md5-cache/app-admin/awscli-1.27.116       |   16 +
 metadata/md5-cache/app-admin/rsyslog-8.2304.0      |   17 +
 metadata/md5-cache/app-emacs/Manifest.gz           |  Bin 108718 -> 108863 bytes
 metadata/md5-cache/app-emacs/doom-modeline-3.4.0   |   13 +
 metadata/md5-cache/app-emacs/projectile-2.5.0-r1   |    6 +-
 metadata/md5-cache/app-emacs/projectile-2.6.0      |    6 +-
 metadata/md5-cache/app-emacs/projectile-2.7.0      |    6 +-
 metadata/md5-cache/app-emacs/shrink-path-0.3.1     |    2 +-
 metadata/md5-cache/dev-cpp/Manifest.gz             |  Bin 24775 -> 24770 bytes
 metadata/md5-cache/dev-cpp/cpp-httplib-0.11.3      |   15 -
 metadata/md5-cache/dev-cpp/cpp-httplib-0.12.0      |    4 +-
 metadata/md5-cache/dev-cpp/cpp-httplib-0.12.1      |    4 +-
 metadata/md5-cache/dev-cpp/cpp-httplib-0.12.2      |   17 +
 metadata/md5-cache/dev-java/Manifest.gz            |  Bin 71649 -> 71657 bytes
 .../dev-java/commons-logging-1.3.0_pre20230319     |    4 +-
 metadata/md5-cache/dev-lua/Manifest.gz             |  Bin 8279 -> 8284 bytes
 metadata/md5-cache/dev-lua/luasec-1.3.1            |    4 +-
 metadata/md5-cache/dev-lua/mpack-1.0.10            |    4 +-
 metadata/md5-cache/dev-python/Levenshtein-0.21.0   |   17 +
 metadata/md5-cache/dev-python/Manifest.gz          |  Bin 342449 -> 344201 bytes
 .../md5-cache/dev-python/aws-sam-translator-1.65.0 |   16 +
 metadata/md5-cache/dev-python/boto3-1.26.116       |   16 +
 metadata/md5-cache/dev-python/botocore-1.29.116    |   16 +
 metadata/md5-cache/dev-python/cfn-lint-0.77.2      |   16 +
 metadata/md5-cache/dev-python/hypothesis-6.72.1    |   16 +
 metadata/md5-cache/dev-python/pyasn1-0.5.0         |   16 +
 metadata/md5-cache/dev-python/pyasn1-modules-0.3.0 |   16 +
 .../dev-python/python-email-validator-2.0.0_p2     |   16 +
 .../md5-cache/dev-python/python-engineio-4.4.1     |   16 +
 metadata/md5-cache/dev-python/ytmusicapi-1.0.1     |   15 +
 metadata/md5-cache/dev-tcltk/Manifest.gz           |  Bin 9273 -> 9279 bytes
 metadata/md5-cache/dev-tcltk/snack-2.2.10-r12      |    4 +-
 metadata/md5-cache/dev-tcltk/tclpython-5.0-r2      |    4 +-
 metadata/md5-cache/kde-frameworks/Manifest.gz      |  Bin 39230 -> 39237 bytes
 .../kde-frameworks/extra-cmake-modules-5.104.0     |    4 +-
 metadata/md5-cache/media-sound/Manifest.gz         |  Bin 73601 -> 73604 bytes
 metadata/md5-cache/media-sound/lilypond-2.24.0     |    4 +-
 metadata/md5-cache/net-dialup/Manifest.gz          |  Bin 6614 -> 5962 bytes
 metadata/md5-cache/net-dialup/freeradius-3.0.25-r2 |   17 -
 metadata/md5-cache/net-dialup/freeradius-3.0.26    |   17 -
 metadata/md5-cache/net-dialup/freeradius-3.2.0     |   17 -
 metadata/md5-cache/net-dialup/freeradius-3.2.1     |   17 -
 metadata/md5-cache/net-im/Manifest.gz              |  Bin 16405 -> 16406 bytes
 .../md5-cache/net-im/element-desktop-bin-1.11.23   |   14 -
 .../md5-cache/net-im/element-desktop-bin-1.11.29   |   14 +
 metadata/md5-cache/net-misc/Manifest.gz            |  Bin 89067 -> 89070 bytes
 metadata/md5-cache/net-misc/s3cmd-2.3.0            |    4 +-
 metadata/md5-cache/sci-mathematics/Manifest.gz     |  Bin 27787 -> 27626 bytes
 .../md5-cache/sci-mathematics/cadabra-2.4.2.1-r1   |   17 -
 metadata/md5-cache/sys-apps/Manifest.gz            |  Bin 87036 -> 87045 bytes
 metadata/md5-cache/sys-apps/flatpak-1.12.8         |    4 +-
 metadata/md5-cache/sys-apps/flatpak-1.14.4-r1      |    4 +-
 metadata/md5-cache/www-servers/Manifest.gz         |  Bin 9473 -> 9312 bytes
 metadata/md5-cache/www-servers/nginx-1.23.2        |   18 -
 metadata/md5-cache/xfce-base/Manifest.gz           |  Bin 5795 -> 5958 bytes
 .../md5-cache/xfce-base/xfce4-appfinder-4.19.0     |   14 +
 metadata/md5-cache/xfce-extra/Manifest.gz          |  Bin 8663 -> 9147 bytes
 .../xfce-extra/xfce4-battery-plugin-1.1.5          |   14 +
 .../xfce-extra/xfce4-calculator-plugin-0.7.2       |   14 +
 .../xfce-extra/xfce4-fsguard-plugin-1.1.3          |   14 +
 metadata/news/Manifest                             |   28 +-
 metadata/news/timestamp.chk                        |    2 +-
 metadata/timestamp                                 |    2 +-
 metadata/timestamp.chk                             |    2 +-
 metadata/timestamp.commit                          |    2 +-
 metadata/timestamp.x                               |    2 +-
 metadata/xml-schema/timestamp.chk                  |    2 +-
 net-dialup/Manifest.gz                             |  Bin 5234 -> 5226 bytes
 net-dialup/freeradius/Manifest                     |    8 -
 net-dialup/freeradius/freeradius-3.0.25-r2.ebuild  |  267 -----
 net-dialup/freeradius/freeradius-3.0.26.ebuild     |  267 -----
 net-dialup/freeradius/freeradius-3.2.0.ebuild      |  309 ------
 net-dialup/freeradius/freeradius-3.2.1.ebuild      |  311 ------
 net-im/Manifest.gz                                 |  Bin 10063 -> 10057 bytes
 net-im/element-desktop-bin/Manifest                |    4 +-
 .../element-desktop-bin-1.11.23.ebuild             |   86 --
 .../element-desktop-bin-1.11.29.ebuild             |   86 ++
 net-misc/Manifest.gz                               |  Bin 53979 -> 53975 bytes
 net-misc/s3cmd/Manifest                            |    2 +-
 net-misc/s3cmd/s3cmd-2.3.0.ebuild                  |    2 +-
 sci-mathematics/Manifest.gz                        |  Bin 18532 -> 18527 bytes
 sci-mathematics/cadabra/Manifest                   |    2 -
 sci-mathematics/cadabra/cadabra-2.4.2.1-r1.ebuild  |  104 --
 sys-apps/Manifest.gz                               |  Bin 49319 -> 49317 bytes
 sys-apps/flatpak/Manifest                          |    4 +-
 sys-apps/flatpak/flatpak-1.12.8.ebuild             |    2 +-
 sys-apps/flatpak/flatpak-1.14.4-r1.ebuild          |    2 +-
 www-servers/Manifest.gz                            |  Bin 4546 -> 4547 bytes
 www-servers/nginx/Manifest                         |    7 -
 www-servers/nginx/nginx-1.23.2.ebuild              | 1049 --------------------
 xfce-base/Manifest.gz                              |  Bin 3046 -> 3040 bytes
 xfce-base/xfce4-appfinder/Manifest                 |    2 +
 .../xfce4-appfinder/xfce4-appfinder-4.19.0.ebuild  |   42 +
 xfce-extra/Manifest.gz                             |  Bin 7556 -> 7563 bytes
 xfce-extra/xfce4-battery-plugin/Manifest           |    2 +
 .../xfce4-battery-plugin-1.1.5.ebuild              |   52 +
 xfce-extra/xfce4-calculator-plugin/Manifest        |    2 +
 .../xfce4-calculator-plugin-0.7.2.ebuild           |   47 +
 xfce-extra/xfce4-fsguard-plugin/Manifest           |    2 +
 .../xfce4-fsguard-plugin-1.1.3.ebuild              |   46 +
 170 files changed, 1966 insertions(+), 2730 deletions(-)
 create mode 100644 app-admin/awscli/awscli-1.27.116.ebuild
 create mode 100644 app-admin/rsyslog/rsyslog-8.2304.0.ebuild
 create mode 100644 app-emacs/doom-modeline/doom-modeline-3.4.0.ebuild
 delete mode 100644 dev-cpp/cpp-httplib/cpp-httplib-0.11.3.ebuild
 create mode 100644 dev-cpp/cpp-httplib/cpp-httplib-0.12.2.ebuild
 create mode 100644 dev-python/Levenshtein/Levenshtein-0.21.0.ebuild
 create mode 100644 dev-python/aws-sam-translator/aws-sam-translator-1.65.0.ebuild
 create mode 100644 dev-python/boto3/boto3-1.26.116.ebuild
 create mode 100644 dev-python/botocore/botocore-1.29.116.ebuild
 create mode 100644 dev-python/cfn-lint/cfn-lint-0.77.2.ebuild
 create mode 100644 dev-python/hypothesis/hypothesis-6.72.1.ebuild
 create mode 100644 dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild
 create mode 100644 dev-python/pyasn1/pyasn1-0.5.0.ebuild
 create mode 100644 dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild
 create mode 100644 dev-python/python-engineio/python-engineio-4.4.1.ebuild
 create mode 100644 dev-python/ytmusicapi/ytmusicapi-1.0.1.ebuild
 create mode 100644 metadata/md5-cache/app-admin/awscli-1.27.116
 create mode 100644 metadata/md5-cache/app-admin/rsyslog-8.2304.0
 create mode 100644 metadata/md5-cache/app-emacs/doom-modeline-3.4.0
 delete mode 100644 metadata/md5-cache/dev-cpp/cpp-httplib-0.11.3
 create mode 100644 metadata/md5-cache/dev-cpp/cpp-httplib-0.12.2
 create mode 100644 metadata/md5-cache/dev-python/Levenshtein-0.21.0
 create mode 100644 metadata/md5-cache/dev-python/aws-sam-translator-1.65.0
 create mode 100644 metadata/md5-cache/dev-python/boto3-1.26.116
 create mode 100644 metadata/md5-cache/dev-python/botocore-1.29.116
 create mode 100644 metadata/md5-cache/dev-python/cfn-lint-0.77.2
 create mode 100644 metadata/md5-cache/dev-python/hypothesis-6.72.1
 create mode 100644 metadata/md5-cache/dev-python/pyasn1-0.5.0
 create mode 100644 metadata/md5-cache/dev-python/pyasn1-modules-0.3.0
 create mode 100644 metadata/md5-cache/dev-python/python-email-validator-2.0.0_p2
 create mode 100644 metadata/md5-cache/dev-python/python-engineio-4.4.1
 create mode 100644 metadata/md5-cache/dev-python/ytmusicapi-1.0.1
 delete mode 100644 metadata/md5-cache/net-dialup/freeradius-3.0.25-r2
 delete mode 100644 metadata/md5-cache/net-dialup/freeradius-3.0.26
 delete mode 100644 metadata/md5-cache/net-dialup/freeradius-3.2.0
 delete mode 100644 metadata/md5-cache/net-dialup/freeradius-3.2.1
 delete mode 100644 metadata/md5-cache/net-im/element-desktop-bin-1.11.23
 create mode 100644 metadata/md5-cache/net-im/element-desktop-bin-1.11.29
 delete mode 100644 metadata/md5-cache/sci-mathematics/cadabra-2.4.2.1-r1
 delete mode 100644 metadata/md5-cache/www-servers/nginx-1.23.2
 create mode 100644 metadata/md5-cache/xfce-base/xfce4-appfinder-4.19.0
 create mode 100644 metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.5
 create mode 100644 metadata/md5-cache/xfce-extra/xfce4-calculator-plugin-0.7.2
 create mode 100644 metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.3
 delete mode 100644 net-dialup/freeradius/freeradius-3.0.25-r2.ebuild
 delete mode 100644 net-dialup/freeradius/freeradius-3.0.26.ebuild
 delete mode 100644 net-dialup/freeradius/freeradius-3.2.0.ebuild
 delete mode 100644 net-dialup/freeradius/freeradius-3.2.1.ebuild
 delete mode 100644 net-im/element-desktop-bin/element-desktop-bin-1.11.23.ebuild
 create mode 100644 net-im/element-desktop-bin/element-desktop-bin-1.11.29.ebuild
 delete mode 100644 sci-mathematics/cadabra/cadabra-2.4.2.1-r1.ebuild
 delete mode 100644 www-servers/nginx/nginx-1.23.2.ebuild
 create mode 100644 xfce-base/xfce4-appfinder/xfce4-appfinder-4.19.0.ebuild
 create mode 100644 xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.5.ebuild
 create mode 100644 xfce-extra/xfce4-calculator-plugin/xfce4-calculator-plugin-0.7.2.ebuild
 create mode 100644 xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.3.ebuild

diff --git a/Manifest b/Manifest
index 8c06200c5fda..cdf33b99ea1c 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29454 BLAKE2B c3221fdddafdd417b564080b080492c1791765048d9f8346cc73d878d940f6c536a0b0a8ea499c01de3dee831293b429270601db1261adfa3bdcf2076eb1405e SHA512 acd71da9e0ebfd0bd2e183d50087b7e0f4bccced4ac66340f4a7c9212ea789d22490c5de3e50b209b782539989f98af019e681952f5fb17d2cb37180db2773bf
-TIMESTAMP 2023-04-19T22:09:57Z
+MANIFEST Manifest.files.gz 29458 BLAKE2B b7b02dae5a2b82c4d587d1f164f41e27cd06749ea08d97c80692e2f890e6b69884252a76310c8ed5a4e6175b6b441119d12c9250fbb1848eeb0e1f30f6e14dd3 SHA512 34cdd790d11c109a45ea24e86dd19be92ac41f5d40f18ffa1cce0f25233261b358d7c8fb7468c2857f53b94406914a3fa7aa72feb718e57f4a60242520f5a1d6
+TIMESTAMP 2023-04-20T04:10:11Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRAZrVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRAuyNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC+MRAAo0X624WZExwjJm+PiQpudeGpKBQ/M0v0C+aoqlHX//Wo2n0YUPl+xW0e
-7Kxtzq3khlf53Cgh2Zm3OwMHji8sR84fPJglO69AlumkcSOZiVh3ZFCdL2Arsh1v
-AlndUnGUS+elrI+UeI+e26PpDglN/uh1Pxkz1oLqCL/ZS+Juvyqqw9SDJSgh/ALK
-oh158jXQQVMcvx2j4moLywVqyqZsOcuB+lt/0BL4ahc7fxl9uKAtoUC5pfK6M51d
-N6wW9S58feYcqfOy93vC8jPO4rWtqrJ1n6GxtOgvbUJCG7KQKbxS3jSXdLdtEiLf
-ivDby2I90SqAhvqO4qKO5G7oSnhelP3Ezqw7PxjNWfQparrM64QgEVtVLWosVy5B
-foc+3BblI2vGIvAa//QDUsY8+8Vaxe5ZWxZc3VdYa0P9OwiJ98BT5Z3uvu3VGVNj
-sdv/wetwgbxH51o80Rv0UFehLU27PHN/wiLCFaVPMKgersTv2BU4RwbQnptQ/diI
-ZP8DtdZJwvaIjvg+m1h6tWoGbXowu3VKu0znf28J6j7Bu9spwyX7NZC9RGiHLXle
-xIFCRxEXxJHCGwE+bDbEJPCbnEw4/3miqMJro1kcoAuwu8RVRWvof3o1o7zG0RLo
-FjiR5GksYuNUGQi4dXMdaq822Es8toI3hEqdZ4s6qWpvEIxnOBU=
-=j5Im
+klC/jRAAgH/ofOoTemcG3uF2UamDSa1fO4pbWFRHZwjEGRhz4Bt3yY0HQOjiP+yG
+6MGk0pv+3OOeZM8qj6/50/onejl+w9dFAlH7CCHrnYVZHRN2eGNhnhBtkGOZINS5
+Ce34Y7/vMq89A738tT+vTTY2nZY7iZAhC5/dUAWrM8ypLb8nLJNizL2MAEK8fjFh
+Mc80oA4c1IA2xHGV6TjEj49m3+WFJytqS9l9fpSi552b2fYN8hCXL5m26rAY3T9m
+Sz9x3+APzKVUIEGkyx/In7DPcs2hNw7Md1KD+6Kh/TUrqlzVAFf4tu2NSyOSjx3J
+w8LMBxmIvSvLRDtJNijXNeJAvD7YqstdRNhd2n+13h0ChxTCLv6aAXEJUt8F9sfQ
+jrkeKbyevSymfnnZuI7+OhBhNzFr8FwrnCeTa9bM3exC0hfnxPIG09gk5yz51M4x
+6p9PJhuKBFucfdFZtgJGLb5m859VW7DsOrpNOLgos6X6hTH5tx+U6DLXDJA1ufEh
+vELFH0t2H/5Em4k2hEeXTDu+uEn2mhRHIKc0CisNMED/oNEEUJuArJw5HgQgfsob
+DUrqFzxTES/p2R9C2fv0oN698PEIzF98ByF6sVQ4fdSz+VXD9Sgr/a71eEpVMqgh
+4dIIyahEH3/A89p0BGw5CRnG2TH2rZBR6Z80gqo3jGTCvsDlhkA=
+=7gWN
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index f9608b98cba0..e201d821812e 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 8f0900d4d0ac..de865bff7d89 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 8a607377b5a3..dc6c6422ac9e 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST aws-cli-1.27.112.gh.tar.gz 2398322 BLAKE2B aad52e0df4da8c59441b6540f0ce3ac2
 DIST aws-cli-1.27.113.gh.tar.gz 2398657 BLAKE2B 00fc53140bb5085713fecfb4182bb37a032d8cd02de4328435a04e2052ee058ca64ab05666562dd9665c86f95afccb94d1230b248408412a024c973b05ddadcd SHA512 238fd1743b008e76a50edbf688020ecf5d0a302f66d288cdc440893a40471525f9cdd85b8f3fa48370d235de2cafed9b616b335541194e5312e3869c5db746dd
 DIST aws-cli-1.27.114.gh.tar.gz 2406530 BLAKE2B a566214d83d0238c74e306d82829bc9a512aa03def8a4f3ccffc819ded588427051c524fbd91c32f1dd6f6eafd54e6fe40a1e701c9985a1ec587f362fe1c2920 SHA512 60df892a996b5b5c36478e86f321ae9abe3c2d3faafc3187d0b9442d060633ddeddbeeab7ee42a0eca7cb45b07f8c86bbf9d626362a26c503f10b1c693dd1f2a
 DIST aws-cli-1.27.115.gh.tar.gz 2406947 BLAKE2B ef5ac62ef273d92b19d1ef2ea755b35f2353a3aea66e935e44408f11c84320701b7419cfbf36f3ed220d62f3ca3d95ee455b50db4fbed70da7cdef885401090b SHA512 878da56008e5c8cd8347571187713c0624dfedae58bcf02df2082560cdcd082721cd215c4e4bce0b82281bdc61979f4006dd3b860bde65adbf072b45ec89130b
+DIST aws-cli-1.27.116.gh.tar.gz 2408827 BLAKE2B 5b0f0df52ce6772a393f8e31f0161a516ff3abdb2f170ecda587ecc740058ed6b1085a223802374511c8bbd7064dbeeebe1df3282d03c4f48bdb7d93ab46301a SHA512 52ed834dc11e9aed8b50ee2d8a3d3c56a7f1748884323eaaf1337965d11f07867c0a97b5becb397536aee996e556caf57215208883d79684a6df500341414c1b
 EBUILD awscli-1.27.104.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.109.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.112.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.113.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.114.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.115.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.116.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.116.ebuild b/app-admin/awscli/awscli-1.27.116.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.116.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 91b0220df8e2..bf9741ca21c2 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -10,10 +10,13 @@ AUX rsyslog.service 644 BLAKE2B 311072ff896b07d82e9d88b34120b4fa903b7a84c5ac9686
 DIST rsyslog-8.2208.0.tar.gz 3262298 BLAKE2B c13920c755a24d8060335f3281a349d2f32c3c99de7351991e09e62302f6d9f61f4390b7945e30816c7d28afe5f757f6a49b2855e40e3f2f518a423662196b1b SHA512 e63f2465011722eb1bc99676ef6afd66e655af4fb9d751b3d8776499d054c422b195c65fef9ea6b9012d9fb334b7ed8a1c918167fecff389cbb79aa6b74acb73
 DIST rsyslog-8.2210.0.tar.gz 3266727 BLAKE2B fc94e7d9b7d828c35e6117ff44d40aa421b79ecd9072cc143177cb77ac6e84adaa5e2b9ae9a66e4bb70d8b93411715f63f0e3707e53c965ef892d9146ec43c92 SHA512 c665b7f7a3c5ef31c9b62b50f815cfbb52db0cbe4a06934f4f1c3cd2a56fb49c319d33857ee92ab843aa5894cac16c16b8eccdf83714f31ab57a95049c4af231
 DIST rsyslog-8.2302.0.tar.gz 3273655 BLAKE2B 41ab639dcc93e325b6e092bc7c2c8fa60ce6192ec20033665930573ed5944af5830fc91aa3e607501c2b4759775efcd55631f82096e18ff1df67f00c3e956d6b SHA512 ebdf179c320425a137d1d20eef15163b342165435879e55531aa0dd9ae459fa35266696cc80fecae63a7e1eef31be51ba4154360e5dbe3c00471a84883c03168
+DIST rsyslog-8.2304.0.tar.gz 3274047 BLAKE2B 13c0e200acf750e9b40b14153270b0f45358ac8be7a9d0e1fa879e686da9f5a3be3b7915e3c90757a42dbdfbf4c36301cfea213aafe5a0481e1b117f28cf3cf6 SHA512 ca8df2d1d38c78d853b1081c731d9f94cad653a915259b699f3a78a88bcf9c9d1d18b91667ef954fc96a0bd251aa3afd2b6264ce5a6b4ca700687a654507b64f
 DIST rsyslog-doc-8.2208.0.tar.gz 6563848 BLAKE2B ec68684f1d7d895833f656ba6224a8013213a12b1bc7a28a268f2f629c25a3fbac7c379091f17eae24b6d71278c087e4a4cbed1656554de743fe5616a96559bf SHA512 428c2fe9e5025928d4a9d33f05f4eb20ac1bbde052b7fa2a8a0e45bfffe111eecc94eb2b6ec129de1011f0eabb106b4fb41d402b2a270e4148d3b1081e3b1da0
 DIST rsyslog-doc-8.2210.0.tar.gz 6572454 BLAKE2B feb865e3585ee441117f38de61748a6ca99767dae113cfcf2cd0d0a124cc692889be713134163fc91f4ab43b9fe530e3c7c0b84e4bd4e70081c4539297ae1406 SHA512 e7847a9307a91fdf87d6cf91d2391eb75869679905b9598310c456fb3fe1864fc06dbdc649778f5b3788e47ffda0a6d89cb894258e55db441f7df7e74b0ae9f4
 DIST rsyslog-doc-8.2302.0.tar.gz 6586882 BLAKE2B bd79d53670234df46fae79234e03bbee05129dcd5bfe36d74595ce90e91ed8efa2d32cc817dadc9634a67eab7b9e640ad686685495cff75ebb1ff16730c8e904 SHA512 b922a4ed3e7b7235aa4a00c26a45b3b9f3a092679a7ce324543eea0c59cb34ad5a0ee2cac3a37e8964a4bc059cbcc661932496c7ff5765ef4f2da19cb6d35ee2
+DIST rsyslog-doc-8.2304.0.tar.gz 6586061 BLAKE2B 4680db37eaa8583e21865fafb62ba07ffa235f4184a43bf9a1930166aa26a3bccdc15c43ba26504d157339eb02b05ea95076cf738abc3323eef16e07b42de2af SHA512 1ce8a8cf40cb767e4e62016aa2513f93535a3bd3c47ef34bc1efca007f7afe5c84ca4d30e911903dc8ba529ede0a07feb05ace075b5ef6c1757e5727d11f112e
 EBUILD rsyslog-8.2208.0-r2.ebuild 13135 BLAKE2B 84fdc7404bb080cc57d8cc5e260df6646d6c84af17bad0e0eac1394f7556088dd45650422d9fb98bba64e9583baad5d047f223c5f58d893aa5893e2f4acc375f SHA512 5309c9083aae3407ab2f57849508a8e1b9e2b7e4a268f52c53977a3ee4b30a0a9670ede9b050eedc88cbcbad73f17e5896e3c234dd3fe938c61ebdd0017c2d06
 EBUILD rsyslog-8.2210.0-r2.ebuild 13176 BLAKE2B 8a99355f5ae45c15f1e39b19cbc0d3ca4d08d20ccca21d381eb49d21d437109325a4572c4e08cac21167720548830fa0a8d390d6452afae97d79e858cc22f08b SHA512 4ae5f2a663f2dab7afe5133d4e7d7528c2078091da97b93753563c4e0619175f156f762199ddfd1cef87f3486b13d6ab22774e2a473e2124f7362edea3df6dec
 EBUILD rsyslog-8.2302.0.ebuild 13136 BLAKE2B 0e9eea82ae95e53cce39fa765fef26a4fe934a133ca30b0ac02cddd9038b71727595e6e74d85f3a8002f32f43400634c16cd411f8ec41bab3170a6dbb89b62c9 SHA512 250f1194bd28feeea036c99d19f4302c5e9bb5f3de8dd26c19acac5dfb06062a1329f5dd88d37633c91bf63b4281a10c7319f6a1bd957ed4b777e1d378952b01
+EBUILD rsyslog-8.2304.0.ebuild 13139 BLAKE2B af709abeded1a831b1289b322ad135d898dfcaf5ae1508924d1190f5e6f1d9fc66a5fd8eb65db515d3f219a0b116e5ec30d5955ef49e4194353640dc410598ac SHA512 3621b8b40cc3fc38fc1eb3168e4e270e693f155ea7d61f4ae96fea07c9d3a95b729ab3806ec39a06a864fa0c6cb7db5891512670ca792f5eb5ab7c4e3ff7a96d
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/rsyslog-8.2304.0.ebuild b/app-admin/rsyslog/rsyslog-8.2304.0.ebuild
new file mode 100644
index 000000000000..0d3d01886462
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.2304.0.ebuild
@@ -0,0 +1,496 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+
+IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
+IUSE+=" systemd test usertools +uuid xxhash zeromq"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	imhttp? (
+		dev-libs/apr-util
+		www-servers/civetweb
+		virtual/libcrypt:=
+	)
+	impcap? ( net-libs/libpcap )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? (
+		>=dev-libs/hiredis-0.11.0:=
+		dev-libs/libevent[threads(+)]
+	)
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		>=dev-libs/openssl-0.9.8y:0=
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-4:=[drafts]
+	)"
+
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	BDEPEND+=" >=sys-devel/bison-2.4.3"
+	BDEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		--disable-imfile-tests  # Some imfile tests fail (noticed in version 8.2208.0)
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without dependencies
+		--enable-imbatchreport
+		--enable-imdiag
+		--enable-imdocker
+		--enable-imfile
+		--enable-improg
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without dependencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmtaghostname
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		--enable-fmunflatten
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmdb2diag
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis imhiredis)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable imhttp)
+		$(use_enable impcap)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/${PN}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/${PN}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	if ! hash certtool &>/dev/null; then
+		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index a4af323791b6..2f687bf3bdbe 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/doom-modeline/Manifest b/app-emacs/doom-modeline/Manifest
index ab95d7eccb96..566e33e18d73 100644
--- a/app-emacs/doom-modeline/Manifest
+++ b/app-emacs/doom-modeline/Manifest
@@ -1,4 +1,6 @@
 AUX 50doom-modeline-gentoo.el 77 BLAKE2B 0b7e10cff2a5e20083f8ba376e3e72ea1fc423cb8fa605b59cfc601aac72fe8611a6b558924c52b1f74ef2413d2efea806c929fa1d4b8b212cabbb9ef62d730f SHA512 6dc0e3ec4c48923a850466c86b97a63472e0861dcd8bfc8d346cac17e3cf1f0aa03fe0c3d9b75efaa73ec919073024320d3b4cfc17e8c1a2c0b2a17a43c72339
 DIST doom-modeline-3.3.2.tar.gz 61363 BLAKE2B 2b80748265f911954e1726dc30e6bacf4ba7ffb6eb589e8f67c366b818e212376039eb025d380937b327f7d3d4a980ec6bfe0589ac38af1e0d678a8f6038b97f SHA512 ff0b41c5f8dc7e5a4a5bccaa710b445a1894948893cd7dea6c564d3a9b1be5cd7cd005e6a28613a6800526d5158faebfef51d21b9e911d97416821210954f0b3
+DIST doom-modeline-3.4.0.tar.gz 62357 BLAKE2B d3af3875b25f9ef8d2b75e1acd4ed9c7f8e3d5ba306731f019ae076d14339c97b9f7f59bbb0806e5443c39d855aa0af9c2f9509ca93b11a9a275aa341e4d431b SHA512 1ed7c061e43fdb1e5a9fbe1cc5f87021a90796057206c64ff4f590089e0b5bd835d27f95129c92e1deb50012dc033608b071fadd294df4f102d67cb2872b8b86
 EBUILD doom-modeline-3.3.2.ebuild 684 BLAKE2B 219fe787946a1be4dcc961f1075516627361510c4f5692a6b22ef1979b60d1d366aa766b72218e84d95d776714206d3b6205fd5068f650a1b481018ee67feaae SHA512 005a0d8ce43cc80450f760c70a9ad80d401946ba4c6673af26c16f8b84017512a7686ce6ca38f75b4bf21ca4a0ec52400bc6ee20643d48b1bfdf524ab0578902
+EBUILD doom-modeline-3.4.0.ebuild 684 BLAKE2B 219fe787946a1be4dcc961f1075516627361510c4f5692a6b22ef1979b60d1d366aa766b72218e84d95d776714206d3b6205fd5068f650a1b481018ee67feaae SHA512 005a0d8ce43cc80450f760c70a9ad80d401946ba4c6673af26c16f8b84017512a7686ce6ca38f75b4bf21ca4a0ec52400bc6ee20643d48b1bfdf524ab0578902
 MISC metadata.xml 437 BLAKE2B 4510e1869b8871d0c054ec00c7c639125d52f451ffc129fe5a8255026ddd3c2fe36d8e9f5ef9a47c7f0b87b356d67e16cc2ab84b6414b7399b402df3fb0d3d89 SHA512 cda6737b5873ec737482048c543f9a5e8a8137d13072d663c8b714e0607c47c8d77ffdef9a2d9c8713c0c321c0e7bd3cd1531546f53c045000853badd575e61e
diff --git a/app-emacs/doom-modeline/doom-modeline-3.4.0.ebuild b/app-emacs/doom-modeline/doom-modeline-3.4.0.ebuild
new file mode 100644
index 000000000000..6740287569c1
--- /dev/null
+++ b/app-emacs/doom-modeline/doom-modeline-3.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Fancy and fast mode-line for Emacs inspired by minimalism design"
+HOMEPAGE="https://seagle0128.github.io/doom-modeline/
+	https://github.com/seagle0128/doom-modeline/"
+SRC_URI="https://github.com/seagle0128/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND="
+	app-emacs/all-the-icons
+	app-emacs/compat
+	app-emacs/shrink-path
+"
+BDEPEND="${RDEPEND}"
+
+elisp-enable-tests ert test
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/projectile/Manifest b/app-emacs/projectile/Manifest
index 049b4fc7f037..644a1eb68066 100644
--- a/app-emacs/projectile/Manifest
+++ b/app-emacs/projectile/Manifest
@@ -2,7 +2,7 @@ AUX 50projectile-gentoo.el 141 BLAKE2B e56b9486e81ed169662cb21ca2a19f43b96701b77
 DIST projectile-2.5.0.tar.gz 1915860 BLAKE2B 4d215e2c1e44c7f85121fc36445112f3064129fe95866b4fbb2e14b11d31519057d9cc69bcdf44c82cd516768cc73a031da48a7c5352b9825816db54810cafcb SHA512 3faeb7db70e5e2198ad307c1d5d24a5fadd207765387e7094691e40071411506e6df690995f923bf246b7176173ca41882d369276862b631d7436747bfeae3a3
 DIST projectile-2.6.0.tar.gz 1922935 BLAKE2B 40e5fc3d152b4fa244bb42cd606d4d6c92e9a212a3d58b7e5e3b333a6b9eb07ca05d61c18aa1859ba5e99872c92f2b8ae11442e5ebda22b057cb49017b1deff8 SHA512 28898d8e48c1dc90ada0f3648e8ef96bff96a3873af61d7f454160fa9fb5f2e8b08c7e0ab99953170b252a29bc04ccb3c10803807b0b96cfcead167855642fed
 DIST projectile-2.7.0.tar.gz 1926804 BLAKE2B 2dc52883335dda0bb6b5d9bf606cf56ee38730c2d14ddca5a8e5fac1169b9ae91f8c264d7f1d0a311bea21690ad292194f9b2bdab7d4dc2b03abafda706a67bc SHA512 bdd4484b916f59434f33bfc6eb663bb75ba6196b632894f27a46f90ea75f0268eb847142c9ff97386ca9ae6a2dc2fa6f26b20b34e2f3d00c80674784a32d10f8
-EBUILD projectile-2.5.0-r1.ebuild 632 BLAKE2B e2eb2aff7145a90c26b8f75980820b524c82bcdebba00f480062ec64944169b32022fa17bf122e3de5cfed44ee8fb079dd390cf8d75aef4fdaa9419495feec23 SHA512 63e99fca3a2a32f62b11fb36e65fbac031cd8bdc88fd387e3b6658ae466e2d78b19d27952b9b010f9f92c50c7e3daaa5ffc9ba5851a916ccd16b3e8fa22ba0d2
-EBUILD projectile-2.6.0.ebuild 632 BLAKE2B e2eb2aff7145a90c26b8f75980820b524c82bcdebba00f480062ec64944169b32022fa17bf122e3de5cfed44ee8fb079dd390cf8d75aef4fdaa9419495feec23 SHA512 63e99fca3a2a32f62b11fb36e65fbac031cd8bdc88fd387e3b6658ae466e2d78b19d27952b9b010f9f92c50c7e3daaa5ffc9ba5851a916ccd16b3e8fa22ba0d2
-EBUILD projectile-2.7.0.ebuild 632 BLAKE2B e2eb2aff7145a90c26b8f75980820b524c82bcdebba00f480062ec64944169b32022fa17bf122e3de5cfed44ee8fb079dd390cf8d75aef4fdaa9419495feec23 SHA512 63e99fca3a2a32f62b11fb36e65fbac031cd8bdc88fd387e3b6658ae466e2d78b19d27952b9b010f9f92c50c7e3daaa5ffc9ba5851a916ccd16b3e8fa22ba0d2
+EBUILD projectile-2.5.0-r1.ebuild 583 BLAKE2B b3ac5979e3893823fdb1b3ae129ba7394cc58588c39f10666d81ec984d5dabebcbc6152858e261399b40b460f747e9d185aa9774fe0b92ce4a4ad388539d36dd SHA512 79c51a8472f6d9819612c784f44fdc0490098f803afd5216ca453a292cb64a2a0331ea1224ff04bc5890e82d2ec081bfffb078c0d92d2271146c5a8a2b088286
+EBUILD projectile-2.6.0.ebuild 583 BLAKE2B b3ac5979e3893823fdb1b3ae129ba7394cc58588c39f10666d81ec984d5dabebcbc6152858e261399b40b460f747e9d185aa9774fe0b92ce4a4ad388539d36dd SHA512 79c51a8472f6d9819612c784f44fdc0490098f803afd5216ca453a292cb64a2a0331ea1224ff04bc5890e82d2ec081bfffb078c0d92d2271146c5a8a2b088286
+EBUILD projectile-2.7.0.ebuild 583 BLAKE2B b3ac5979e3893823fdb1b3ae129ba7394cc58588c39f10666d81ec984d5dabebcbc6152858e261399b40b460f747e9d185aa9774fe0b92ce4a4ad388539d36dd SHA512 79c51a8472f6d9819612c784f44fdc0490098f803afd5216ca453a292cb64a2a0331ea1224ff04bc5890e82d2ec081bfffb078c0d92d2271146c5a8a2b088286
 MISC metadata.xml 730 BLAKE2B 026ad65ade8e08d1874db2ff46be522a975ae4f1c81a04510e46912bdf7ff171e5523c48b863a5d2cfee3818ec28d0dd82aa135de272b60923d200396a09ac44 SHA512 81f9d1c00773d81a5c680e3ee57455b92d85e0e136d5a8125418e419f07c91a6c16cc5e899f995c5610904a605a03aa405f319fc4f5399df5e9b7942a68c1bcd
diff --git a/app-emacs/projectile/projectile-2.5.0-r1.ebuild b/app-emacs/projectile/projectile-2.5.0-r1.ebuild
index f1dc336ca4fe..4e3c229ebadd 100644
--- a/app-emacs/projectile/projectile-2.5.0-r1.ebuild
+++ b/app-emacs/projectile/projectile-2.5.0-r1.ebuild
@@ -6,21 +6,22 @@ EAPI=8
 inherit elisp
 
 DESCRIPTION="A project interaction library for Emacs"
-HOMEPAGE="https://docs.projectile.mx"
-SRC_URI="https://github.com/bbatsov/projectile/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.projectile.mx
+	https://github.com/bbatsov/projectile/"
+SRC_URI="https://github.com/bbatsov/projectile/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/buttercup )"
 
 SITEFILE="50projectile-gentoo.el"
 DOCS=( README.md )
 
+elisp-enable-tests buttercup test
+
 src_test() {
 	mkdir -p "${HOME}"/.emacs.d || die  # For "projectile--directory-p" test
-	buttercup -L . -L test --traceback full || die
+
+	elisp-test
 }
diff --git a/app-emacs/projectile/projectile-2.6.0.ebuild b/app-emacs/projectile/projectile-2.6.0.ebuild
index f1dc336ca4fe..4e3c229ebadd 100644
--- a/app-emacs/projectile/projectile-2.6.0.ebuild
+++ b/app-emacs/projectile/projectile-2.6.0.ebuild
@@ -6,21 +6,22 @@ EAPI=8
 inherit elisp
 
 DESCRIPTION="A project interaction library for Emacs"
-HOMEPAGE="https://docs.projectile.mx"
-SRC_URI="https://github.com/bbatsov/projectile/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.projectile.mx
+	https://github.com/bbatsov/projectile/"
+SRC_URI="https://github.com/bbatsov/projectile/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/buttercup )"
 
 SITEFILE="50projectile-gentoo.el"
 DOCS=( README.md )
 
+elisp-enable-tests buttercup test
+
 src_test() {
 	mkdir -p "${HOME}"/.emacs.d || die  # For "projectile--directory-p" test
-	buttercup -L . -L test --traceback full || die
+
+	elisp-test
 }
diff --git a/app-emacs/projectile/projectile-2.7.0.ebuild b/app-emacs/projectile/projectile-2.7.0.ebuild
index f1dc336ca4fe..4e3c229ebadd 100644
--- a/app-emacs/projectile/projectile-2.7.0.ebuild
+++ b/app-emacs/projectile/projectile-2.7.0.ebuild
@@ -6,21 +6,22 @@ EAPI=8
 inherit elisp
 
 DESCRIPTION="A project interaction library for Emacs"
-HOMEPAGE="https://docs.projectile.mx"
-SRC_URI="https://github.com/bbatsov/projectile/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.projectile.mx
+	https://github.com/bbatsov/projectile/"
+SRC_URI="https://github.com/bbatsov/projectile/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/buttercup )"
 
 SITEFILE="50projectile-gentoo.el"
 DOCS=( README.md )
 
+elisp-enable-tests buttercup test
+
 src_test() {
 	mkdir -p "${HOME}"/.emacs.d || die  # For "projectile--directory-p" test
-	buttercup -L . -L test --traceback full || die
+
+	elisp-test
 }
diff --git a/app-emacs/shrink-path/Manifest b/app-emacs/shrink-path/Manifest
index b28cea595c94..b89d6ff95e26 100644
--- a/app-emacs/shrink-path/Manifest
+++ b/app-emacs/shrink-path/Manifest
@@ -1,4 +1,4 @@
 AUX 50shrink-path-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST shrink-path.el-v0.3.1.tar.bz2 15743 BLAKE2B 8f5db089737f2d31c9f5852265f1b33679de3cc72989bf04b8d50871b3b8fa356da6823177759561b99ee5b032fb10ba1c51f49cdd7d74daafb1d6cac44ba2b7 SHA512 f4cc191186c2a2e706ff08fbcd43f24dd67297a368c42da72626d70e3522d5b24ceba45a2e17821f6288576f10e0208e3d643946108edd6180502dd1bad019ed
-EBUILD shrink-path-0.3.1.ebuild 807 BLAKE2B 5eaf0c7e143a4be9461323872f58dd65d860bee34f4fea69f0a287b34d0f556f5244e4d79d3df402baabe869e42cc790024edbd067fc58ff314036b7d2cac8d9 SHA512 81efbd89ae887678d8165c07aef4cbddc6dd201eadabf266795579c068702877ebf87c73023930c4eeb8ee234a3d4ca4b71d9451fc2d2db76c6f37e239705b53
+EBUILD shrink-path-0.3.1.ebuild 700 BLAKE2B dc2bc050b1ecf02c52eb9e9f41f19f04c7c7fe884f7350f203d8be3e5f445e696ae2911f527c8d7bab8c35f55278e10a0dc25e9fd016b307ce913597c3c3458d SHA512 f3b807b757248dd7982b96d7969618a218cac6d0c579121311a57c8e70bedce2aafe7d8d5fd89515071af995c708e76a5db751797020c6e5a0d1956ab192c96d
 MISC metadata.xml 433 BLAKE2B eaf63f4513651f57d6e4a5032a2f244011234c6fd995939ed294ed8ceefc75487664cd769ed64eaf82b6040bbddecfb4f85ffc907a5103febf53cb605afd9a40 SHA512 65fcabbc6edff9aa6580630195a5ed911046fce5b61371881ccc4c7f19645c592f236a2ea06bd07469c3b47034e3639d0b4e450d4660a3eac0f7cf6750fee317
diff --git a/app-emacs/shrink-path/shrink-path-0.3.1.ebuild b/app-emacs/shrink-path/shrink-path-0.3.1.ebuild
index c855273dc798..519ca144af61 100644
--- a/app-emacs/shrink-path/shrink-path-0.3.1.ebuild
+++ b/app-emacs/shrink-path/shrink-path-0.3.1.ebuild
@@ -13,29 +13,22 @@ S="${WORKDIR}"/${PN}.el-v${PV}
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-emacs/s
 	app-emacs/dash
 	app-emacs/f
 "
-BDEPEND="
-	${RDEPEND}
-	test? ( app-emacs/buttercup )
-"
+BDEPEND="${RDEPEND}"
 
 DOCS=( README.org )
 SITEFILE="50${PN}-gentoo.el"
 
+elisp-enable-tests buttercup test
+
 src_prepare() {
 	sed -i 's|it "same as shrink-path"|xit "same as shrink-path"|' \
 		"${S}"/test/shrink-path-test.el || die
 
 	default
 }
-
-src_test() {
-	buttercup -L . -L test --traceback full test || die
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 95e630a2fd22..9e75814a4533 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index 7c76a69b72e1..9eaa49df2750 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,9 +1,9 @@
-DIST cpp-httplib-0.11.3.tar.gz 633203 BLAKE2B 7418b958610a5f9fa634bd67622d176bdbb54a93c6478578ea0f9a9f1104b72923a8909702ae994edecc6e1f37d63ba09444913d44785e944426464df7c48cb1 SHA512 b0c46bf11c8bc84ab52143559ff1c4682b02504921855e5cd7e82bc65a04b192281ef7a124c7c7dfe928ae3842d5065097b6a4608be1c74dc51b563b15b93d0f
 DIST cpp-httplib-0.11.4.tar.gz 634929 BLAKE2B b6a6626de54e6828f08cd8f36934716969bc6c0485b8899522de2bd0c6b325c52c7541eccc095093062b4a3744b6170b10169d7e4a7a32a2cd683c292f9da85c SHA512 3f8a905cebee388526ebffeb431a90c9de2e8e92058ec0847f55fe0a43957ce6edaf093b3a516563d18d6105557af39270b9803865d400bbd849a60a5c8e8c17
 DIST cpp-httplib-0.12.0.tar.gz 635941 BLAKE2B b6f7d0d0be9da6afc4850313cd7508114463af7a94054b9495d069079120c3ca33d9e26865be538c0d002f1c31b88ec9cd7dd03d45ed620fbd851b0f19870eae SHA512 316ae9c2289d94cdd7dbd7ff70f056a54fba6ffdaf882b3e2c615e060ad8627e8a1b3fa452e6f30581859f9c7c6d919f47c2c98779401f4a92e1ce82188206fe
 DIST cpp-httplib-0.12.1.tar.gz 637858 BLAKE2B a4bc22f971e7dc011f172602f0579f09270eabad527dbba838df71908a6cbe66d432c8aef3a674ccbc3b39fbce477bc828afb5ec72b11f9ca2e0e77094b2d88e SHA512 a65ee9b4990572f92ade06fa6dc79535bc4d7c2bac47b85eba5e224fcb2d6dff7911127be72543b82a370628081acc81a88d1169a9cf30714f11c1227c40fe52
-EBUILD cpp-httplib-0.11.3.ebuild 1072 BLAKE2B 465523bfe5f4b175ecf7aaee78f5d174238661de3d42f7dc2a4ef3cf64daf71ded669b630add0973cd7eb338cef4578c8dac9a84c170e360b9948fd0ac3b4b96 SHA512 fddfbe66fc4d8d4cd4a09431ff27bcf306cf1ccb8f8965d8d5be6953bd99f235310bc3a12bd17c5712b5f88f9bee981a87b017303b53adb4407eea413c20c8e2
+DIST cpp-httplib-0.12.2.tar.gz 638460 BLAKE2B 91d039d39a43a73f052d63d0e1073350965bfa3b9653f0cab7d9353ed2d1acf91d2e3c20415f2a9398e64776baaedcb498b9de90046e785637de5382c41bb9ed SHA512 dda47f76eaf5b4daa35f1295e482f1d81dd8823ae06339b9f4c93e4fbe7b54ae28760d3083b5d5cff212f1a679616adfa47dbb9d06c6810fac4b58197f575429
 EBUILD cpp-httplib-0.11.4.ebuild 1346 BLAKE2B d0a866c23f8258c2a00eefb79d463100f7f4dbdaf83c786fa4d7ca2eaf45d361e6c297995fa6e89ab77e0a1aae3389a50ecbbd58e55d7d42a10e1ffede8ac9d3 SHA512 9441870620115100f50cc0d8b292c9e94540fd7a23c083ae7d070e5742a865f2a7e98f353e60d73070948e4dc11c5fa75010629f37df69bce6fc35a44edf0c50
-EBUILD cpp-httplib-0.12.0.ebuild 1297 BLAKE2B fcbd19ba11378072fa99a5c8184195ea53c3e816ebdca56abc634917a4ca094ddc6cdb9dd69be6bebab5b3ff7a28f5b6798bc22cbfdf6c845971ea1db08a813c SHA512 1922607bf9e9e76f1d7e3d5314030993b16e696da2c0ede95769b2d80583bcc5d670a200616d720e19554d38fcccf0c7cf1e564cfa22f20c5857868afd1f7b3d
-EBUILD cpp-httplib-0.12.1.ebuild 1297 BLAKE2B fcbd19ba11378072fa99a5c8184195ea53c3e816ebdca56abc634917a4ca094ddc6cdb9dd69be6bebab5b3ff7a28f5b6798bc22cbfdf6c845971ea1db08a813c SHA512 1922607bf9e9e76f1d7e3d5314030993b16e696da2c0ede95769b2d80583bcc5d670a200616d720e19554d38fcccf0c7cf1e564cfa22f20c5857868afd1f7b3d
+EBUILD cpp-httplib-0.12.0.ebuild 1307 BLAKE2B fea93d77fe60ec8d76fc0ea434dc1a8557c1f347adff8614a0ce8320ee04664dc49cc04666c0e9ca7be8ada8449c2f3c730affa7f913c0400e3a8290489a5505 SHA512 6ceb616dfef38b656bee3ece74711ded94b7316b8c77e55d7f2aadcc7fa1f64947fc0fdb208542d364bf510b003eb40aafdc6949c3a68984fa2e0315ea7ff366
+EBUILD cpp-httplib-0.12.1.ebuild 1307 BLAKE2B fea93d77fe60ec8d76fc0ea434dc1a8557c1f347adff8614a0ce8320ee04664dc49cc04666c0e9ca7be8ada8449c2f3c730affa7f913c0400e3a8290489a5505 SHA512 6ceb616dfef38b656bee3ece74711ded94b7316b8c77e55d7f2aadcc7fa1f64947fc0fdb208542d364bf510b003eb40aafdc6949c3a68984fa2e0315ea7ff366
+EBUILD cpp-httplib-0.12.2.ebuild 1308 BLAKE2B db07c6062ec6f4f51e3caec0486bc4afe8d7edb7e8800ae9ae1634c87abeb0f01b9938f34e16cbd6ebe58a0a0d404a04a442bd42ff2ab594481f5ee8db32ffe6 SHA512 d26d50ed425f9830a14741376febe3618c1ba688fcd8e5f7f2ed997b45e90ee2c8371b736bdca4358cb375514edb8b4048e4d9977bb73545647c4b13dff3d612
 MISC metadata.xml 744 BLAKE2B c3cbea51dafa4c3faa9ad130a2cb493ec87489a574dea464d884b15188c54bd60cb9e6dc30fa8f453bff041d374a3e9ff3f20a78580bdc8fad2bf26b0e3b3c90 SHA512 361401b649e07b2a4d577788d8552fc744271fa8e14e8a53083fa5aeea8a39f183eb6c736c941e10878ef24700a1e2a80201bc36ed646406586835cacdeee1a2
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.11.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.11.3.ebuild
deleted file mode 100644
index a24f0b6165e2..000000000000
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.11.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="C++ HTTP/HTTPS server and client library"
-HOMEPAGE="https://github.com/yhirose/cpp-httplib"
-SRC_URI="https://github.com/yhirose/cpp-httplib/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/0.11" # soversion
-KEYWORDS="amd64 ~x86"
-
-IUSE="brotli ssl zlib"
-
-RDEPEND="
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHTTPLIB_COMPILE=yes
-		-DBUILD_SHARED_LIBS=yes
-		-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no
-		-DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no
-		-DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no
-		-DHTTPLIB_REQUIRE_BROTLI=$(usex brotli)
-		-DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl)
-		-DHTTPLIB_REQUIRE_ZLIB=$(usex zlib)
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	cmake-multilib_src_configure
-}
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.12.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.12.0.ebuild
index b4b2e67701ea..8910a1019604 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.12.0.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.12.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/yhirose/cpp-httplib/archive/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0/0.11"  # soversion
+SLOT="0/$(ver_cut 1-2)"  # soversion
 KEYWORDS="amd64 ~x86"
 
 IUSE="brotli ssl test zlib"
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.12.1.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.12.1.ebuild
index b4b2e67701ea..8910a1019604 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.12.1.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.12.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/yhirose/cpp-httplib/archive/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0/0.11"  # soversion
+SLOT="0/$(ver_cut 1-2)"  # soversion
 KEYWORDS="amd64 ~x86"
 
 IUSE="brotli ssl test zlib"
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.12.2.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.12.2.ebuild
new file mode 100644
index 000000000000..c80732341223
--- /dev/null
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.12.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit cmake-multilib python-any-r1 toolchain-funcs
+
+DESCRIPTION="C++ HTTP/HTTPS server and client library"
+HOMEPAGE="https://github.com/yhirose/cpp-httplib/"
+SRC_URI="https://github.com/yhirose/cpp-httplib/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"  # soversion
+KEYWORDS="~amd64 ~x86"
+
+IUSE="brotli ssl test zlib"
+REQUIRED_USE="test? ( brotli ssl zlib )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DHTTPLIB_COMPILE=yes
+		-DBUILD_SHARED_LIBS=yes
+		-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no
+		-DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no
+		-DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no
+		-DHTTPLIB_REQUIRE_BROTLI=$(usex brotli)
+		-DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl)
+		-DHTTPLIB_REQUIRE_ZLIB=$(usex zlib)
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake-multilib_src_configure
+}
+
+multilib_src_test() {
+	cp -p -R --reflink=auto "${S}/test" ./test || die
+
+	emake -C test "CXX=$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 139c05fea522..f31fd9d81738 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 93cae60c6bce..49b93635bc80 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -3,5 +3,5 @@ AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
 DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e
 EBUILD commons-logging-1.2-r6.ebuild 4146 BLAKE2B 3d9d1e7121406deb2cfbb50ce274df70a0c165d99870f77a69068447e68588bd43b259b076bd5dc2e853a4d79e2df80844caaebd4d4dfe095701f3c4799a98c6 SHA512 7bee2954d057db0c3bbfd3b8bba6b7c9e1cc2f708b5d85070defde51fb6c9d2f8f10b1be122fcfadabfaffc612d2b63ef355818cc6a14253a9de05b79c0c0dde
-EBUILD commons-logging-1.3.0_pre20230319.ebuild 4233 BLAKE2B 13ff753003fac3d88cab8e760cb946efa3249d37dc06eaaa05e1f9d14f62014ab6a4e93965e5701e54519a28e690784c3762152f5a0281493781ad13f5aeaac0 SHA512 52a59dff35802c58872d3a79804cc47701e1f152b0de5d356b2aec2f015a235edcebbcb6046ae183af71d242091efe6ae46cbf1346cdbaa49534aa820e307822
+EBUILD commons-logging-1.3.0_pre20230319.ebuild 4232 BLAKE2B ed7da971dfb3e962ebdf328afab4d1f126efdeb48cbe14e34d85bd166980a3c6efe5a87ae565728e6df8ea2a0bd2ee0b1548a76d0050bfc37c89fa0a1e448915 SHA512 278663f90115823b5f832caf311801a3067a63218a5bfd86470dfaafce60f29f0672edf2a1fbef0226cb0da6f1b0a24d91aa8f79b4c99ed442b6fc5177dae3df
 MISC metadata.xml 925 BLAKE2B 4834c919748bbef9b8ac9cbb0545a3b13cdd8c97f0ce6039e09f5fa63522f0506e89ab1749fb273d7cf511414b4d16f661ac156f953dfee1ac3a01f6723b1b99 SHA512 3ea4a17834b877e710c618d6a9669275e76b6305b4c090b4b2462c54a132da20c9f39063c8e9763e712ae21f4c86ca8d02892a47039184dd3ed1680fee8b5849
diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
index b478d6426af2..78119f70a2ef 100644
--- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="log4j"
 
 CDEPEND="
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 17ca229c6d0d..77b896141d17 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index 150e71a4ab6a..e26140ff2d78 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,5 +1,5 @@
 DIST luasec-1.2.0.tar.gz 53379 BLAKE2B dad93b341565b602fa02a5551a127bce42e76cee5abb0314f9cc4a98f162d23b0f8b4b9c0f16423095e4b54ec5ab260ee06bef5993ad46f559ad1295dcc28856 SHA512 5564f73495bef7c5683285ff7648c7b82a3a3dfdce96e88c77cc8835427b6595a694e5a2bf0a4f6332fe52b8aed3d94531607df81260d7597458a6fb0465d3fe
 DIST luasec-1.3.1.tar.gz 54807 BLAKE2B e09d340b8bc391830d671dd5cbec76bd5190bebdd2e534800bea8efd19749a4379e2681bb7a6e6551da49109345f0b846904c222c0ecada6135d775e2060bfc7 SHA512 cfa4187518445abc6591bd0c24924122b62252be25ffd5564cf291f9a2ae3702a5fa299ffd265d2e0e8315b90d6783eccace4ff560f54f299161d3c5e3749508
 EBUILD luasec-1.2.0.ebuild 1737 BLAKE2B 633fd25ccf721edb600c479956f37504d46bca254e6df6f512325fbfa6c1964d07fe16256df50cb950358321993686de87bfa1d732a4550dc8c7718de1cc2202 SHA512 41d17718b574d404deb383f45b98de42271ab443b3e7f9069363008c1188ab17e720a6d52d7428a4ea69288f524880110f768ccfb0e1f37c03977be1241b9159
-EBUILD luasec-1.3.1.ebuild 1743 BLAKE2B 64fef07c045159eb73f3cb7c39147f7f89fba5ab013af0969180d3435fa1f297daf5c6821d8a20e91121708a55ee88b70617cd69c836d1bc2988413b150d54c3 SHA512 d9b987fa9f13ab9ff264817ee112f0ee3ab6ae6b97d99b8eb3a53fcb088dade71b2a217d4c2cd3c88f5d08b4cfbe213cf25b67533a10892fd98c6b6d39b528e6
+EBUILD luasec-1.3.1.ebuild 1742 BLAKE2B 9d3c7af0e7443dd15d2593e56b50ff8ecded5b7f2848a9251e851170324c6be73c06bc5e5ad92afa55fbdd5d863efc344793b958a775350b0ed889c9c0248f39 SHA512 8c455577dc86a3bb505ac95ec0eb8ae5ab977abcbcb8aad3bb64162e3d1bc12ec25ef804460fac857128402b3259bde575a674aa16667f74f7d982713c5b5212
 MISC metadata.xml 597 BLAKE2B 6398ca37e0d10458a7b1a111d2d0e8d44aa64136ada116a8bb73bf200be4c10f673c8f574733043eb7b2216c28b003c30a993736145344ae72ef25f001a5783e SHA512 399501a7a9c0b08d8747b30478a3810dde63efb48d2d42eeff1ba7355c882e35fd3528424930f618d51182f80641c1c6fb4662b31ec21cf38abd0f0fde0d17dd
diff --git a/dev-lua/luasec/luasec-1.3.1.ebuild b/dev-lua/luasec/luasec-1.3.1.ebuild
index 56a3d8392158..3764a56b37dd 100644
--- a/dev-lua/luasec/luasec-1.3.1.ebuild
+++ b/dev-lua/luasec/luasec-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-lua/luasocket-3.0_rc1_p20200328-r103[${LUA_USEDEP}]
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index 2f5e58bfa601..df433f0a27b1 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,5 +1,5 @@
 DIST mpack-1.0.10.tar.gz 16256 BLAKE2B 56f279be5b84e89a18a6010320eff9f006cfba6df9621e7b4c338a866170a69589e9e50d0d7deb238ff40634f28aa4d0c43a135c6b7fa9a38ec41b8b669945cd SHA512 879e200d806a4aeb3dc31bf44781bb92b377ee86fe3050692179bff794a2748c175135e4ab5eb59f29202bd36ff27ecc26bab07d0c46c11414361f72abf3dc53
 DIST mpack-1.0.9.tar.gz 16087 BLAKE2B 062f0deaa9ea359486933b5736591ea3ee78886e31259b721d88ef44762403185b881d076ca35fe6e8c16ab756d36698fec1ca893ab3667635e388456a8ad417 SHA512 c663a6cb29c1ae3f88baf25d36b076c35b35b96a16f9df472f8063009dc70886071cc27bf9224aceb86afb5c590ac072fd484435f40ecc4961eabfb5df08f395
-EBUILD mpack-1.0.10.ebuild 2302 BLAKE2B 2f8039340d91352998fd3a1a366edc12264c9816f1eaa27aa5cb200ad405847639d4f05ab48ec2c5a3dccf44e8a32a66b09668d8e47cd18f22fcc3ca44147a01 SHA512 98d2a1fe6aa9c22a4f74f43e1710d81cf1b78972b74e1d9d1ec7754ffe704f6421be2cc16e79fdcd0a4c29313794239b38d97d4a2af52cc544060d1b2295f951
+EBUILD mpack-1.0.10.ebuild 2301 BLAKE2B d015309660bec8ac5772a6d04fc7b8b0f857cf033f0496d02e90d8e38e5643bc2637c6de97696c1cd7e71a796884000ffcf7968344d25c252ca6c3a1015a4cf5 SHA512 2e570d674a4d7af05e60b4f435c52a5ec61119d95e08f62846135297926dfc406f63a7e50f5ba6955d8a046eeb58e19d53d133be67cbeec4de7d4efeea3aaad6
 EBUILD mpack-1.0.9-r1.ebuild 2299 BLAKE2B 81972f5a84aa553852c0c6fc59010e1f67116280ea0e2106d0dadd9bc1f6cb3e990367561c5790f8b646c65b49c8267a83d343021ff3c144f432ef94f0468ff1 SHA512 1c51651b30ff803991d706755ae64262e56c629b701d5487e6e9f5f73b3a9ca8278175cc772f916bc225541d6ca311af7412f87658abd91452ce5289c49efae5
 MISC metadata.xml 337 BLAKE2B 552e6b193055ff86ce3bc29ec14b7ba72bf99ba5458c8588af1d53b6d393759118103d95f9b3e3f4c8582b19f7daccf0a5b619a8b171f5c74e2a8ad4f0648875 SHA512 6cc2098e7e31232ff9b6aa2cecfe7f9cde61d1ee36efb190d87330a5b6088a9d43f999d3cbce632925c01e35806c09022170230934f526febe1bd24c384b3ce1
diff --git a/dev-lua/mpack/mpack-1.0.10.ebuild b/dev-lua/mpack/mpack-1.0.10.ebuild
index 1c6415df4d35..60ae13d835e1 100644
--- a/dev-lua/mpack/mpack-1.0.10.ebuild
+++ b/dev-lua/mpack/mpack-1.0.10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/Levenshtein/Levenshtein-0.21.0.ebuild b/dev-python/Levenshtein/Levenshtein-0.21.0.ebuild
new file mode 100644
index 000000000000..35b4a12135b8
--- /dev/null
+++ b/dev-python/Levenshtein/Levenshtein-0.21.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
+HOMEPAGE="
+	https://pypi.org/project/Levenshtein/
+	https://github.com/maxbachmann/Levenshtein/
+"
+SRC_URI="
+	https://github.com/maxbachmann/Levenshtein/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	>=dev-cpp/rapidfuzz-cpp-1.7.0
+"
+RDEPEND="
+	<dev-python/rapidfuzz-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# sterilize build flags
+	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/Levenshtein/Manifest b/dev-python/Levenshtein/Manifest
index b2f9c5095573..4a4352533efd 100644
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@@ -1,5 +1,7 @@
 DIST Levenshtein-0.20.9.gh.tar.gz 36617 BLAKE2B 8e995f1c1648c81bea20844f7afc3c5dddd7dc31e5b6fc99a96930130c7f85bb32c4c4c85b319149d8511f6591ede96098038ea1b502a3e33a42ca3d21db4e2a SHA512 1d5dccd33ae8bd19b234861435212c7a57ba330a5f76a45c9e5b8ac3e401bc3d5eb3c72aea20e66bf0ebaaa6b760131dfef07fb5a2cf4d7191b595e1d962d93c
+DIST Levenshtein-0.21.0.gh.tar.gz 36616 BLAKE2B 8408ba8231a8ff3f6bf9e6cc7ea763061ca1c826236d74877213caef0ce736695865dc3c02565cce960b794d07f96f6413ca144565d6693debf90a1b5718524b SHA512 bb1cf70497e89db5b427eb4ac79708d205fc9edfc9588d30c63ef6e3e77b9369c8892edc31c32cb135d54947e8eedb770d06a7d5c6f8743d44378d7d1a12d459
 DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
 EBUILD Levenshtein-0.12.2.ebuild 630 BLAKE2B 7f74159f1e57e0b9040b8b0a6af3c52d1c64661639b2f3ef1a569b5ad91d36a939c044ec3e4ba499158e57930285b8a81cf8a48e89b5b330966cefaffd015c4e SHA512 8ce08ce36977336487a1b870c2e474bc257f05db1b14b39cdcd56d5f0bb3cb14ab768ba6e13a79804f99578ff6dc841b7e19186b9ce6e1b529b4c7ac2a636b0a
 EBUILD Levenshtein-0.20.9.ebuild 1045 BLAKE2B cd155abb675212a0b0fc245d7ffa8c3bd8ae451ad4be29adb0b5b198bc5602cff51894b31493f19acdc2ae2107ee6e38b78564e40303ee020ec90b8949929fb5 SHA512 4355a6ac8bc2a2da72a20028cfbb5c8556d5c723a69b1776bf04b3e0570e457e3ed081f257476036379c05feda4320dbc195b6cf4a3ab71fa109ea35fc820b1d
+EBUILD Levenshtein-0.21.0.ebuild 1052 BLAKE2B 78c4982ff3a84e825de376aa38a9fb809cc59c2233d8f08219e07abbacc567c7b03eb193d512126989dceb464ef327fba6ad393c77cd254cd2c3a4743f60010b SHA512 971223c21f452cfe06615a81ec054d2b3312b7552757a6763864d9dc3db908adfd4e4f85851522483b6b4f0c0e04a950345d6930fbbf9afacde3d6b57da34402
 MISC metadata.xml 378 BLAKE2B 59900a9f2532c274a220466ff9bd5db4a4830b221119a95a0fdf82928b90c64b458b16c26257b69093ac08346bafbe54189bdb873bb8f119753a4f2243973eb9 SHA512 26b3ddc5d3843122a47941cb1e388e41f6a3f98e3f8d2f5108f50240b5c9005edb2b1e2df55c9046d48a8b4e07941f8ccd4fdee129f4ac948a47a6207b73c7ba
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 29a51b09a379..7233dd940b94 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 54ae9f6fb098..c1d5ca603e4b 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,7 +1,9 @@
 DIST serverless-application-model-1.62.0.gh.tar.gz 5177544 BLAKE2B ad0fdca32821e9b5dab86d03e65ad1a458493ecba0e75f6b2dc8b9978a6085ae5269496e231a2f09cd228e6bd2a66b3803953d2ca5aa7c265fa1019305aa1a9c SHA512 42f1d3ff352a02ab73f5a16cfeb800a80852986b09f71d9468b23c22b8dafff3a20e8ac92956020280884e4318bd80369b5b04ea6e9f0a28067dd792f1623747
 DIST serverless-application-model-1.63.0.gh.tar.gz 5213667 BLAKE2B b75315d1c28789e9f0b8aa4774292ff2531806c1d59a8c16ab683fee439d188025c9cc62c2de037f2d947ad3b7eaa8bb4fbe8a5507ef1a4f3619f758cdf2eadc SHA512 eb6dc0f545550f726b59a2ea1994f8dfcc8eaf7a1fbca6ab12bfbe891813b208d869e25c0b320411aa6476dcf8c86fb19db9e13ddf0419d90d3c3403bd57485c
 DIST serverless-application-model-1.64.0.gh.tar.gz 5231257 BLAKE2B 53eeb37d69ae0f133b936eb8bb20005ecdad5d71956becd61a9e9080be9bead1bebe98b89d0f67604ac74731b2ac7061f74fae67f0c8e12bf10f7a9dfc40eb3e SHA512 9584657026ca7c260fb9851e8669b19c896a88a4455c6e50e734c1d9b375b69d5cf85b64f960fa0987e8a34823343de3e8c8080413da07fcfb69dc491e72c761
+DIST serverless-application-model-1.65.0.gh.tar.gz 5310251 BLAKE2B 41d4b2a8902dc1bbd2b01f534475005b2c288d33d5bc76049af8b034d428f40b063de71830e4ea3552ab00b7b437e197cf561982d28d74f9762b175a956d587b SHA512 d4a7475f955145e9d141b1d3795bef5e1eb1c330e07b01e5f0e6207f33b73622dcce4ab9bbf10413513321f64e09d59f61aaf01d9fe9f0760b9b31d10c6e3d68
 EBUILD aws-sam-translator-1.62.0.ebuild 1544 BLAKE2B 9572110682a5bfaeee90d69c6026a0130cacda3efb2d2da2952d675f5764745fb8fa7e7b1e586b2b029f5d8b955d9934228210734b060af23abdde9b2e18c487 SHA512 48956aabc1cd71db9d3cddb180c37387c8e5e4e314411a41f3ad791bbe6b2435208c9e045dead45d6e10944271b7f9954e2d1ae9290a3078d1e35391c0f52512
 EBUILD aws-sam-translator-1.63.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
 EBUILD aws-sam-translator-1.64.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
+EBUILD aws-sam-translator-1.65.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.65.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.65.0.ebuild
new file mode 100644
index 000000000000..5a83e871d7a8
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.65.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	<dev-python/pydantic-2[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts=
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index a91cbd07c36f..88306f517a1e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,11 +4,13 @@ DIST boto3-1.26.112.gh.tar.gz 636498 BLAKE2B 2768bdc1fec35eca4a3079bf12933fc2832
 DIST boto3-1.26.113.gh.tar.gz 636722 BLAKE2B 0b5c3819c004ba425294208f114b4b11713730a18e45cf274b8bfe1f762f59e2c404e0a4ccbbec16be934931e7b37c2bd462b7df7d6d47275b1de26300de216e SHA512 bafda63eddb19b97538224e9c12bc3178a0999cc4d2547cb7ec7335f28a7fe3875130573d4fab2fe21000cc1e3bc4e3a7a5ae99bc8f0e9dc7e2b40ad6fb5a2e0
 DIST boto3-1.26.114.gh.tar.gz 637000 BLAKE2B 06f74ac214f4c2161ebe464e1c8fc42c74cb4429110c8ce979db3962fde5240c62ac94b4b9ca002fff89a36659a8830265ac693bd9522082b8cae21108e16cf9 SHA512 324ea177c8ee98a0935d1935f08b31f1640eedf8a7dd19f2bc958f6c1c2fb9deea29f0482b1f4c903d70860a93274dd0d70eafe0564116361daf5e7df51abd26
 DIST boto3-1.26.115.gh.tar.gz 637877 BLAKE2B 861cf3a197002bcfac3f1ca3428bd01f1a8e103462e0de83ed33bb7575de0056f4222195c70dcd0e40dcf3744467e8c017bfe361e589eaf641fec76d6d3eea94 SHA512 337e90d91bb9efcff89b410d5222dead7ce1d0f35257bebe0309cd5fa657facd1a0352bee0ea23d3b94ad852da03a182b7dabf4c2d854390fd227bd58fabc6d3
+DIST boto3-1.26.116.gh.tar.gz 638605 BLAKE2B 946634bfaa4f0b4bd3689a11d8dc3e982dd8166c2b4409335bd1be58c356bbcbf2e5d22c7f319d29a549c69d4a14a3d2afb369c345c643cfa369fb3c9843e04f SHA512 2434fbf7ef2434365863ae8c67c16209a6537afb21697e24efd466146f6fe03566bec220943392139231d55aa570ba3d696a086fc087e4f9d1908da96794c77a
 EBUILD boto3-1.26.104.ebuild 1508 BLAKE2B 42be8b915da646a7afe6dfc988542d3d79b5dbdc565d2e738d210e3f77b7c5ba6dfbac45e46b9cc3cc4770611cbc0c155abc7f1807ff0cb8e6033f927bea4048 SHA512 06404c0363c0c7c0d378d1c2b91073c137a1685d2d846d98c655e6d001df5cde0eb51bf6e160879af2b56321a02e84146ce634855f70c7c3fbbd1adbb9b8ef8e
 EBUILD boto3-1.26.109.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.112.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.113.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.114.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.115.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+EBUILD boto3-1.26.116.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-9999.ebuild 1514 BLAKE2B 5d31d27ac50ed037fb8be61559bac03bd2a8c63f3220ac93ecc864c0e3cbd34763b9b70761a9f364cbc85a0edd84c6f6eeff614292f31473b4935e5bb86fae7b SHA512 26bd2959c745f0e423d683d2fedeab9a438d215fa9b28b403d0cea81caac7436f05382b2a91a183bc1095f3b205e3b2115f931cd7803e0b9838c2a507562da5c
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.116.ebuild b/dev-python/boto3/boto3-1.26.116.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.116.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index fdb670e0cea0..28df11c378ed 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,11 +4,13 @@ DIST botocore-1.29.112.gh.tar.gz 11380151 BLAKE2B 0392abe4e6be29a9e3eae1e693d7cc
 DIST botocore-1.29.113.gh.tar.gz 11386284 BLAKE2B a3611f356f25080f00f675b20a8b49952bcf1e464b9a114bf37392ebdf4573ac1e9eb6373c61dbf87f8101e055f4f6600f7825f45b00c5723c1528d74865dd6c SHA512 8a16fdde7099ae75a3587ee0c0108c12a6c5c27dbbbfc2d98eb3ccd4c66b45f0389a722f1b10ac3f3cc69ea7ba9135cc0604e35126cc2691a26f4a6173d5258a
 DIST botocore-1.29.114.gh.tar.gz 11388772 BLAKE2B 6c9ce892cccf2f85ba4bcd49b31309528016313bb699efbca3b00d3cf3797de5e1b35bd71a3b5bd6d471e9c411ad7750ebd25c03571aa18c34cd42bc2f47bc19 SHA512 6633a2aaf2865a89976ba4097fa64cee4167a9144d4eadc7d9be711e65735bab08d2c03c18ae52c4901fea47265301cb95c91306b261fb48b4119bec66cde376
 DIST botocore-1.29.115.gh.tar.gz 11394187 BLAKE2B 621be4a22b7f06d520bcd630ed6e1a8721d11d5c7822f56f54907177d0773b69247b627a42cfbb1b8e053f54ea16f7238acc0d485379c1e071b6e917ea625596 SHA512 525d8f219cad541c4cc125c2d5eeb7595fba6192bda23e7bcc02a65e4ec413756ae3d8ab5bcb3185b5c837bc7214c22146e52716ff010cc396bc8d32cd98b956
+DIST botocore-1.29.116.gh.tar.gz 11399292 BLAKE2B 47a53b2612804911465f6f56a78f79e389ac7bd2e29e3f45c60f25ec1e700df8956dac034d058974bb453623d5ed5edc416d07b45427cb1ef3c584b5ec4b97f3 SHA512 81636c104a0c4b4f04ebeb066171be206929d5eaf2c40e6f383e701a9dc917f84d4b2f9ef2d7a26b278960af7561316d289be4150eede9a56be20dbf606aa57c
 EBUILD botocore-1.29.104.ebuild 1827 BLAKE2B d9e353ffebf3b77bdb5b034da339f9f3cf95937e288fa522fcc40f88a4752c58ae085406bfefa595c3738ec118712cdb4ee0509c1dee7a00e2c76cd2a657009c SHA512 f0d3e81726bd65bf4c097b63e8673881949970e29d976de53c1facbccf8cd1d214fea9153f4820a5889f1892979342a0255e110b243ba613d4e803a940d46602
 EBUILD botocore-1.29.109.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.112.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.113.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.114.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.115.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
+EBUILD botocore-1.29.116.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-9999.ebuild 1736 BLAKE2B 6ca7ea14855f5f8db2d166ba1f29835d4c994a0a8fa38f3852406289a4465c091909562ac678f1c0bf7e640a594731b0d4319efc0f34f6bc640fbae06746c4bc SHA512 f891bf0eded88d9af3b87fc7c9ee4c6a129d263e672821f3b9654d43bb3bcac41305b834192088d15b50f3f9d36ea95374180cf13e1cb67149595ec63e4cc155
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.116.ebuild b/dev-python/botocore/botocore-1.29.116.ebuild
new file mode 100644
index 000000000000..491b6bbc21f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.116.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index d3541f511a58..76672693c9f4 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -4,10 +4,12 @@ DIST cfn-lint-0.76.1.gh.tar.gz 3631194 BLAKE2B 95d395369fc230fe4e6c5d5e2a0e4bf24
 DIST cfn-lint-0.76.2.tar.gz 3402554 BLAKE2B e5f9405d2852e3b81140a24d94c90a3bf8c919eb6823280a0a887c6acc56ec71d991cbc76532cc49d1189a8f64750ba3e9db02fb3b46b27a28ec3468f4dd268e SHA512 96351ade16308be18baace1351e263a179eacc0b3635e9baa959baadaebb6a08825f6cb9cd83cb83b8635785c7f54405bfcf00f85d6d95d101d3298919cd1ea7
 DIST cfn-lint-0.77.0.tar.gz 3474124 BLAKE2B 5715618f6b44a7a88ef3af8d21d038fa4ce4707973e64eb9712ff524cd5276e71802ad4b9a55580ac469b6474c7d48a8ccee04660bcaf7934df7a23cab1e5a9a SHA512 6509197ef29d8bcbfc416df0a63f89736f704b147bbeb489586b6a06e1818f1d91e59429c73a9e9e23dadb20325a3c79d0b8e1b4637cd0e131f9673422e36734
 DIST cfn-lint-0.77.1.tar.gz 3483399 BLAKE2B 6eaaba9cf70044c673164bce3a062b00ae7703b091e2c0e8d5065e815278fdb88d75f2592695cd1be1612421f95c806f6eaf3be9f4725abec0cf5e39070ff175 SHA512 0d18e7bc19d5562c88194f834267fa6d2fd8125754399ef281598beb68752e7935a653fbe3a0573f4887cb7a76c41b49ad8e268d390db59dd79794cde4939f31
+DIST cfn-lint-0.77.2.tar.gz 3483728 BLAKE2B f7c3cb5be3fbc81f10515bec145030c21c9a754ecbb887267ee85ea9fecd41e57be8572d30f204a54c3e22191c58d2c7d7112115e2c6cd0a23490c4c7633d270 SHA512 8e901564b34e601e62a276b8f8a4b5687de651aafa6da6dc295e846b04e703bda24e6a72b71797c82d2c2f4c93978da92a08999cb73be6a48c9ffd4a40ccb0e6
 EBUILD cfn-lint-0.74.3.ebuild 1623 BLAKE2B 07a514b96d3f3b0084e82698f7c50c57d7c592573c964aa5cad35681347b31035bac3ba580764b5538bf71b35622fd697e782162fb4796cb60afb69d8f3bf11f SHA512 5b8ae5749d2bcf6faa296cb046185888b6e42213341d990839a3de496b0cd3dce699a0a7fd318537b9405a5a6b7a2104ea7b40adfbdf1f4f63721a28e32a5988
 EBUILD cfn-lint-0.75.1.ebuild 1625 BLAKE2B 22541f210143e50b731ad2234f300f8175a3626288cb0d8358e6d690d81a56eac4c34521c5ea0468e6fef9a95e4c0bbbba1d8792c1e8490c4b787413730088e7 SHA512 4a2d0db8bc62e0041ee27fc776e3a75e7839333ff3c58affd65128a45e615ba2037d8b819972d584f67afcd18a5b85f2c4ff8c46b32676b6db70c81f6cd347ef
 EBUILD cfn-lint-0.76.1.ebuild 2157 BLAKE2B 57d16cabb2460f7161933f9ca3814baccad5e3c0ebedc0332e07574db35c4432a916415fba17e063da1d71f09436663450b0ab42d19eefcf16c7b24f940fe71f SHA512 511eecc772689a9e13a80070c96670ac0b45bc207ca90b228e8b0acd36c73cc9df7a33ff4714512f59e0221e36be9ba3099c1711402bc39eacd5e0a7415d7b92
 EBUILD cfn-lint-0.76.2.ebuild 1977 BLAKE2B eb75179972626397fd5d225f0f228a69eee61257c23bc63685a96e495183b733ec146fad85ca4e821fe6f1cfbe55b079329a4d52fb83f0391f74cd124a6637f2 SHA512 656b2acf67cb7944a727297cd6df99cc9640177304661b9626d075499b50d60b7941ac3473430cc2f9fda1b19b693a056d52da6198b2b73e4eac634070a794da
 EBUILD cfn-lint-0.77.0.ebuild 2013 BLAKE2B e685a47e788380adf32a251c55c6fbe770afbc84b493da3accec08e3227435425c424cabe0f46c9e7660829bc6cd6ee8408eeb4df64a143312a3b244e21a5b41 SHA512 0d6a0021003a3f905f1d31545ad66438d4540f3ad4bad8b094c8bb1fcc4d125266fdf12d6a67fae2281dcf7886e003295697c081240617b714f014f1e2e995e1
 EBUILD cfn-lint-0.77.1.ebuild 2013 BLAKE2B e685a47e788380adf32a251c55c6fbe770afbc84b493da3accec08e3227435425c424cabe0f46c9e7660829bc6cd6ee8408eeb4df64a143312a3b244e21a5b41 SHA512 0d6a0021003a3f905f1d31545ad66438d4540f3ad4bad8b094c8bb1fcc4d125266fdf12d6a67fae2281dcf7886e003295697c081240617b714f014f1e2e995e1
+EBUILD cfn-lint-0.77.2.ebuild 2013 BLAKE2B e685a47e788380adf32a251c55c6fbe770afbc84b493da3accec08e3227435425c424cabe0f46c9e7660829bc6cd6ee8408eeb4df64a143312a3b244e21a5b41 SHA512 0d6a0021003a3f905f1d31545ad66438d4540f3ad4bad8b094c8bb1fcc4d125266fdf12d6a67fae2281dcf7886e003295697c081240617b714f014f1e2e995e1
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.77.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.77.2.ebuild
new file mode 100644
index 000000000000..2b6753f1c840
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.77.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.64.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 59e11b3323b2..e52016774ae0 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -5,6 +5,7 @@ DIST hypothesis-6.70.1.gh.tar.gz 9351685 BLAKE2B 99488f4caae4da403ebe28c2c18829d
 DIST hypothesis-6.70.2.gh.tar.gz 9351849 BLAKE2B 074003592741cd89ae9ae44b3857daa3f5d1c8cbb0ab3513f3930b27fcc4e27417994c4240fbbba4649cb04716820db0e9c4f4ac745c194535a81b8a6197f7c3 SHA512 20f812ca8e005877893eacde1bac796495f8697ecbbd6da5f807a9ce6d7e310682030323a8b7bb3e646040253968d2f15cb6fcc858f47be631ef62af4924ac78
 DIST hypothesis-6.71.0.gh.tar.gz 9357031 BLAKE2B e4a83a94bb6971c3ecba4cc69655f9da23a83ab48332a7a748ca7364d9e549a671bf466e32f6e65447f809a9917fc8fd2548dd26764173ea5849a4df3e027b54 SHA512 dea1d5ec1b753649345edd784183f171531adb583e33d0e5d12b14554169fa054e05f4c16135171c708c208b42968082b3ce79cc0441efccf1eff6da37c59f97
 DIST hypothesis-6.72.0.gh.tar.gz 9357320 BLAKE2B a688d3bfa90d4b335c022ed823e3ab3c9bb7b6e4404e62259e65faf7d2867d6cb8379b14a8328294c325506278c6523b9a14f6798110d67c9b636a89720a3ab9 SHA512 7d5cdf91114a34267edcca10295ee84005f2799ed58e7125c584fcc49171e60383a80c7a0040e41d24b3225113cb354966d40f61c94a28bcdbd596582577372b
+DIST hypothesis-6.72.1.gh.tar.gz 9358351 BLAKE2B fbb760194c944cc939e9a9b83a461be22f9e5081d865f0dfa3834375d464714178dca64b9e1993fa4b0855e90f6e133a81d22699acc91560f60f137e8589798c SHA512 1a9d4b103f714e27ec5e33efbdfda0cc3febbe77caf6f605db7fb3b2df857712682a3cce80e75f45f9cd88b1715789d7fc2c5a7d50edbf66a699f5381e2671e5
 EBUILD hypothesis-6.68.2.ebuild 2132 BLAKE2B be04a23a6cc71d17c7585c98d1df3e8bf9a32c84897a5328fba61561c756d8bbcbfdcf778debfa99d3555f430f697720a1bcf083e3422d55116f5649e901ae44 SHA512 61d1b1390b920c328bbafd1b80c7f1c934f5483972bfaba692ed95cd5478bbaa62bc65438665037b6bc10b0050477c02597f2fdc9536963d6769f23cdcd5f721
 EBUILD hypothesis-6.69.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.70.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
@@ -12,4 +13,5 @@ EBUILD hypothesis-6.70.1.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d3171848
 EBUILD hypothesis-6.70.2.ebuild 2136 BLAKE2B 35dccc51dab2ed18059ac3a0f38dd2ef843ced097a386c953410198590c3b4ac2b1564bb9a347a59644e153a6de8924f72a6eba3927da545526a31d5853c4463 SHA512 d718a18708427023d2057554e99e463d35995663899ee6d4289a96dc039f498e2b5b5ad0b21b952ef598c84a867c3bbcc7a1d97fc34c11fcd2f8fb018542a5f4
 EBUILD hypothesis-6.71.0.ebuild 2136 BLAKE2B 35dccc51dab2ed18059ac3a0f38dd2ef843ced097a386c953410198590c3b4ac2b1564bb9a347a59644e153a6de8924f72a6eba3927da545526a31d5853c4463 SHA512 d718a18708427023d2057554e99e463d35995663899ee6d4289a96dc039f498e2b5b5ad0b21b952ef598c84a867c3bbcc7a1d97fc34c11fcd2f8fb018542a5f4
 EBUILD hypothesis-6.72.0.ebuild 2136 BLAKE2B 35dccc51dab2ed18059ac3a0f38dd2ef843ced097a386c953410198590c3b4ac2b1564bb9a347a59644e153a6de8924f72a6eba3927da545526a31d5853c4463 SHA512 d718a18708427023d2057554e99e463d35995663899ee6d4289a96dc039f498e2b5b5ad0b21b952ef598c84a867c3bbcc7a1d97fc34c11fcd2f8fb018542a5f4
+EBUILD hypothesis-6.72.1.ebuild 2125 BLAKE2B 51d07695cdc9af22cb2b6cba55a932a31325861d109fa77216c3dfbd5bda0ddf4246014e90faa2559e7f50334ad5eb33efb377be5319525e664f5c334106ba87 SHA512 bcc6d5b8eafde5dcd3aef80abc3485974131f29975500ee6359fad0aec7d1759848fd131d9901a13a5bc48ca880149b9ef72e5baad1a1368a9300bac65cd7807
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.72.1.ebuild b/dev-python/hypothesis/hypothesis-6.72.1.ebuild
new file mode 100644
index 000000000000..15f6983ab24d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.72.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 766a745fd9a7..68ee8006bcae 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,3 +1,5 @@
 DIST pyasn1-modules-0.2.8.tar.gz 242864 BLAKE2B 22b6cc27d45d19d8e7f5b12c8aeff1fa379bd567fda6b1dc0fafd00c0f4367d32f21cd48cf3cba140f2f11ba7d258140e8014c8420300451ab1acff475d28da7 SHA512 fdfcaa065deffdd732deaa1fa30dec2fc4a90ffe15bd12de40636ce0212f447611096d2f4e652ed786b5c47544439e6a93721fabe121f3320f13965692a1ca5b
+DIST pyasn1_modules-0.3.0.tar.gz 307901 BLAKE2B bfcfd1442b3e9cd542d4f47160b54308ff5ab0373394f55007a1a3963342b8217bd89b5b71dba9e4a69071e805610c3060a28df40249c9b8a1898f941d40e35a SHA512 fedcf95e0452e133fc0735a1be29fb5e7df563243203463c66b85d9af6194a550c78a96fec2d915be1aa6b98428f51b6ed4feb7ed3838c515d044fbafeb2cb46
 EBUILD pyasn1-modules-0.2.8-r2.ebuild 710 BLAKE2B f34ef1392d3590c62c16a6cef73c0317cfb989f5834cdf960ba520dcffaa3ef7a1f8aaaabbb0e2fbfdc5c85b3402f7d4a2695182657a9f51ada761390b767b8b SHA512 c7aaa157aa60e9fcd28a99eb1a475c05e9c79498185800c9a68b09580186d980e1848f322a569391d0b8b85e628b2d8d7e53078aef24745e4b9e3bdd67d3d9f9
+EBUILD pyasn1-modules-0.3.0.ebuild 742 BLAKE2B 79395fa48e1dc288fe582b0788e4fe958add00519b9d51abee39cd068badc64969c9c82d03b8cf188f6d0d1d588d84fb40de86df210c4006585b8d1fb6a05639 SHA512 9c64f4ccfbe8d567071f176ed9200655a633600e898dd8a96ab7e9fe08a2c1f8b34874c8a1062138d6c2cc63015f0816ee923bfc03e9d0e2493bf1a11a95b5ac
 MISC metadata.xml 404 BLAKE2B b5d3c68b942e6c2ff5a1cf31cc0b43ca1570e1d4280a85f376d7b81abbe540ca889f87039dd26fe1f595a2ca8b47acc4ec03bfc5598ba06a8e651c60c2277c93 SHA512 c4784ac61152a9d609e337f7c186b214b2e3add22d54ea7cfaaa0c8fc4fb9e0895617d0b73692aa7326088dd7b7e1ced8a871ac8312abc1f6b09fb558a4d385b
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild
new file mode 100644
index 000000000000..cdca036e890e
--- /dev/null
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="pyasn1 modules"
+HOMEPAGE="
+	https://pypi.org/project/pyasn1-modules/
+	https://github.com/etingof/pyasn1-modules/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	<dev-python/pyasn1-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.4.6[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/${P}
+	doins -r tools
+}
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index cdd06630f231..49bbb62c8726 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -1,3 +1,5 @@
 DIST pyasn1-0.4.8.tar.gz 146820 BLAKE2B 5c00b47c2014e599d1aa2e14c3004b3688786c7afd160c85709d5a0f324166abb1d29ebbd9f3e13100166e7176710e4dc6e1b8fcf80db5f5bdaa202912f8a023 SHA512 e64e70b325c8067f87ace7c0673149e82fe564aa4b0fa146d29b43cb588ecd6e81b1b82803b8cfa7a17d3d0489b6d88b4af5afb3aa0052bf92e8a1769fe8f7b0
+DIST pyasn1-0.5.0.tar.gz 145117 BLAKE2B dbbec0bebcfe11b8de983716fedf1bf28e6bcf7d5f89e3dcba929884347cc7cd3a8ef8b5ec44bbc799a7bae3de39c90cf5e48111384de571dc2034a79c3bb52b SHA512 763690184ce891555564d76902042791865815e59e1325100fca692140110e5e182ef3da84ffdf96b1876edeb2757bbb09c06d26e752a8110760dafbf9e3ca00
 EBUILD pyasn1-0.4.8-r2.ebuild 576 BLAKE2B 00dacaef0995fc35ed70642fa1bec28624baada731eff7aaf4e1cd52969f5aca31caf81c8c3a51802989ade2d7ce9c63ff5b9755b32647e1654515efca99b3cf SHA512 4c11a0897c61c2df488b3ffa6f9d9df870cce6df24935d0ff341edb78e0fcabe1baa88874e19ba51afee71528948337dfedde9d6c58a1936c72e2f3b5c1851ac
+EBUILD pyasn1-0.5.0.ebuild 584 BLAKE2B bdbf18b0540a0d0ed7c77c5167af5007ce43d5e018c45185fb26bd42ec0cd58ce603dd106300d59d3309d79b1a448a5a1ae3edf60195051f996f41eda2def8e1 SHA512 465a49b59cb7cd812bfad82290cb05ed93b92cbba2017b1e80860233c6e3bf92880e5b625f3d51209635979c4aa4d366eaafb6394d0c69a5b41adbbf3db85d06
 MISC metadata.xml 401 BLAKE2B 28d1b58f4b16507dd595524f0eb3fafa93a68222bc56f0040b33e7458b2ac471409c798af1014ccc50207fd0ac66a566aba36e1f0c04a22499396620f3477945 SHA512 a25c0976b4d0ff8a6ede6b84b6933b3405f8cdbf74416f01e91508f0c72d2dda4b4ff63c011846052b683bc7a3f7e5e0ea068d3b506d256bb15fd8dffafc94e0
diff --git a/dev-python/pyasn1/pyasn1-0.5.0.ebuild b/dev-python/pyasn1/pyasn1-0.5.0.ebuild
new file mode 100644
index 000000000000..65fba7ed2b93
--- /dev/null
+++ b/dev-python/pyasn1/pyasn1-0.5.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="ASN.1 library for Python"
+HOMEPAGE="
+	https://pypi.org/project/pyasn1/
+	https://github.com/etingof/pyasn1/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx "docs/source"
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index 2126ee03a92e..1b21c253b312 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,7 +1,9 @@
 DIST email_validator-2.0.0.post1.tar.gz 45136 BLAKE2B d800462f55ee0693917a5348107bd68af2a9c0b6e1a3ccbf28aa22716bbf6da2998bbf4b16352e719c13761b895a85566911bfd4422a516d77214a729da41aca SHA512 0e72d88dea00ade9a8727a4d3ff9a239f581afc14bf7c7a22a582d69e70c7653371c035451493b89fc1a49c70aab8cdfe6159285ea5e8976e645199319004029
+DIST email_validator-2.0.0.post2.tar.gz 45253 BLAKE2B b213ebab2a10acf6c2ab95d382fa78ef92f41ff85ce25c1cfa5a65403e728fd05c66df3dccbaec77eea469d0665701ad5d8047c31e69b57ed8e6fe52f3a1f9c5 SHA512 8c4abc955d909ef05ca89d6c6931bce06de199c33c5f8d0744d44ff00ee69c1841f295882af3da03963cc90ef031da46cdaef90249f73e0c7b47f19dfb816b62
 DIST python-email-validator-1.3.1.gh.tar.gz 28691 BLAKE2B eb69028066e969a935117f51a32d75595468797a82608bcb7f6ebcbebada01aac29e3e223efc849dc519d85897a375cdc584760f3cb5a431e2c39aa566c20514 SHA512 7806ef35c07cf0cfef3d8c6c7fe6dd3cb58da091a134b57d879a2cfcdf6425f8729ab8b03194135749ae47b369da47434c1d130432cfaa8eeaf5d07149c15dc2
 DIST python-email-validator-2.0.0.gh.tar.gz 39007 BLAKE2B 319fa94979fdb6b701c1c8f754f2915e02a53de7ee6f06a5409980b1e4dedca75d08cd24e4f5ee35e7803c7ff4dbb03c1e75645dd7e0443ccaa2b26b6035648a SHA512 6448c55dea3d43d1d457f4b3f24360aaaa6e4ea8f81db891e94d2ff685ae1d8bc1023d4a6329fc495ff6069fc1a6861185e66eada9d2ed6546e6c6b8716df802
 EBUILD python-email-validator-1.3.1.ebuild 1393 BLAKE2B 6d324c6f5d1e8168fce94318f9442ba56be3145be51e13a225a4552f548c3b2aab0074799cd56907fafa33c1b0da5086c81f17c07d5b596422c30b600061fc65 SHA512 9fcfb4934e63a335a83da858a01395d0daadebf103b507a93afb28121a2b25b33f9468c50ebaeb8a79e40aefaa29c366baca48b25e505181ce612f5ddbd69660
 EBUILD python-email-validator-2.0.0.ebuild 828 BLAKE2B efe0b549e13517620e3847193b530df0bf80b2e8833ee5fa26825814420fb25f33160b551a17add594526a5447cb9fa58f07f9370e1c1be73e943fdfc9a6b14e SHA512 15e5968f2161094cf942cd74ac8940c53aa5b08c1922dcf04b37dd3571975f5634f1364131029e5474a9ff7f9f5586e5b9c301df43840c4e59af12b60e14084e
 EBUILD python-email-validator-2.0.0_p1.ebuild 751 BLAKE2B 6aa61d4427e06bf092290229fc2e312887ae2768277b31df970dac273ae6eb0d398193701adf5f081708969e60ce7a75d52d74b0a8b5481d85458752f9ceb1ff SHA512 61b5cf8802aa26b9bd67ebab128c8a7a524524f07486b9fa4aca63bcc9de22c75444d81b582c8f849736690786327fd00513328b76b498f5f20ca00a53896ccb
+EBUILD python-email-validator-2.0.0_p2.ebuild 732 BLAKE2B c90a5170a2cdf999773cd290573b3eef8194e7b3f92abadb5b74c9a7fcd81f72688957de5c6b7dc9eb0dd05894a489bee490f44ae8367c76c9cff98016325bc7 SHA512 cc80bb82876cac3713e6c7790f056eb9a7ddf6e6695e7eb5e95a4ac882aa5b38e9bfa35b3ebf8c5e2ed0f1fa350ac14e0704ece9b57d886bf55a0bbb52e7a8fc
 MISC metadata.xml 792 BLAKE2B 8655d15948883c5b7ad17e943028e0ab70e09d17fe7591c5e094bb46cee2595db382a008fe9d20121cee7473f1cf66efb1b71cdd345828be125c36fe67f376c6 SHA512 9065dee947add0fa203dd9a092910c165944dfc7ecee69c17092526fccfdccfa7864d4402314d9c25389f26b161251dfa58eaf2b21113da0642a62976abd50d7
diff --git a/dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild b/dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild
new file mode 100644
index 000000000000..2778e3b55030
--- /dev/null
+++ b/dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=email-validator
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A robust email syntax and deliverability validation library"
+HOMEPAGE="
+	https://github.com/JoshData/python-email-validator/
+	https://pypi.org/project/email-validator/
+"
+
+LICENSE="CC0-1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -m "not network"
+}
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 5215a4698a46..fa2a4b266397 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,3 +1,5 @@
 DIST python-engineio-4.4.0.gh.tar.gz 309353 BLAKE2B 4cf40802fddcce2e53e205bdbe73bdf0ec822e15581fe4a9939b8d05c3eb6ba82a99d089d4708169b197aa79e5b5f14001ff86f72025fc6d96c99ed6d73fe620 SHA512 b7995aaf2583ec58ac87f048608653ade3846dd103616ee90b3dc12cc7e27c7d37959cd3e1ebf6e138395ff6fad8cd011407b6660258715e513bf72c8a3e1f6f
+DIST python-engineio-4.4.1.gh.tar.gz 309475 BLAKE2B 4ae5dd9887f4d3a70d4983d2a0f0de29b1a54d30961bfc430b8850ff4af73fa1cd9abad6caeb8248a44def42b02e26ecb0632dd9b4d57e2a7f44b33762659304 SHA512 a903ae4f5a4679f6d46fda09901b637ef8dcf2896ece8781460d27aab7c8da606e16a89ac5dea94c156d8196a7e931626b2310b41ddc61d4241b5e004ad2ca64
 EBUILD python-engineio-4.4.0.ebuild 1340 BLAKE2B 59c5e2dd26758fa40545965b509e7e0d72543f8413d2ea10cb6ec32383e686fff0314c61f7ba2d67819b8b57fd9ffb90413df024a20736222988acae3f9b3ff1 SHA512 228d7ed354b92b770fffa5c6fbc21c91de61839643bd83c4279a84cd70950f67108c6a9fce4e2e2bdbadd9d17f9d17613ce36cada9e671fada933fb720983783
+EBUILD python-engineio-4.4.1.ebuild 1340 BLAKE2B 59c5e2dd26758fa40545965b509e7e0d72543f8413d2ea10cb6ec32383e686fff0314c61f7ba2d67819b8b57fd9ffb90413df024a20736222988acae3f9b3ff1 SHA512 228d7ed354b92b770fffa5c6fbc21c91de61839643bd83c4279a84cd70950f67108c6a9fce4e2e2bdbadd9d17f9d17613ce36cada9e671fada933fb720983783
 MISC metadata.xml 518 BLAKE2B 7325d24cc26b1a3b4e2dec04159cdd4ebcceaf0384fccbee11205f9c000b1e9f84f97c742a6181dbad419e2527c6f874bc3f89760daa6b6dd2feb9b1f874b515 SHA512 40fe9ac96224019d28206f75ae6249c75dbcb759918c03826af4f8a394586bd5df445ef475cd009e8af93ea5c7424abebbbfd65ac2e2eb7bdd9e8a29f2dcb34f
diff --git a/dev-python/python-engineio/python-engineio-4.4.1.ebuild b/dev-python/python-engineio/python-engineio-4.4.1.ebuild
new file mode 100644
index 000000000000..a47389eb7079
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.4.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server"
+HOMEPAGE="
+	https://python-engineio.readthedocs.io/
+	https://github.com/miguelgrinberg/python-engineio/
+	https://pypi.org/project/python-engineio/"
+SRC_URI="
+	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+# Can use eventlet, werkzeug, or gevent, but no tests for werkzeug
+BDEPEND="
+	test? (
+		dev-python/tornado[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+EPYTEST_IGNORE=(
+	# eventlet is masked for removal
+	tests/common/test_async_eventlet.py
+)
+
+EPYTEST_DESELECT=(
+	# also eventlet
+	tests/common/test_server.py::TestServer::test_async_mode_eventlet
+	tests/common/test_server.py::TestServer::test_connect
+	tests/common/test_server.py::TestServer::test_service_task_started
+	tests/common/test_server.py::TestServer::test_upgrades
+)
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index 49e6a2d16fab..a1286230cf76 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,7 +1,9 @@
 DIST ytmusicapi-0.25.0.tar.gz 61709 BLAKE2B 7a4f0cf52d8d1a5e3310c5df39435d317916562f7d0277b0518e03193daf7995333853c4baf026ed0331ac1ef294897f034b7c97765764a795f34b7581f1788e SHA512 6c131c7c6d808d5a3c02795d5d28e687d92223fed809701d76318a145c7c82c12266b04f37aacb78750a4249f53e759dc891611dcb2edf61fefb19f133072d24
 DIST ytmusicapi-0.25.2.tar.gz 63496 BLAKE2B a3409c29165871a90aef7951e63bd676db0f37a1a027d43bd56a0caed2cfd708f4a402168566a45841e9c500b0c371031f6b470598dea5ca880b7f9029e62d96 SHA512 cbdf327f51f4b1836c7cb14966b6c88b7d1b3b338779131b75aa9c12e96a9bb1d9f232a0a2e732bd12758a0d90e4f0600848ea99bd11a456aca8be502724db07
 DIST ytmusicapi-1.0.0.tar.gz 67193 BLAKE2B c0d2a7580f734d8b34e90a004e9bad7d1fe55c53a22a8fc71399ffe80c0c56fef7d2c4ef99c7b3c97db5d0e087d5a9e4ce48df78e3b257b09d40ef281a953f5e SHA512 27b492d60dce637f2b9defb868c0fdeb270fb0eb4082adcafb5fc314b6fd505ea7e5a93a4596405cad6957caef96e92367dd9bb736cd98a6ebdeff2fc76cf3f7
+DIST ytmusicapi-1.0.1.tar.gz 67455 BLAKE2B 1bb69e263331b300a7ea5e45bca3b43cc2057c48309a0bef4102b8096089ce8d5da163f6e5a63a0259274e2f05303e9d89cedd2949d60ae63a3c05253e7aa0d7 SHA512 eadd80ed7aae0697e06e22bdc513f60fe9be3ebd589be5ecae58aa52806abbed0150fa222d8a418f93705790f48de2b6be9bc3d82888f04972dea5b492ab9eb3
 EBUILD ytmusicapi-0.25.0.ebuild 503 BLAKE2B 276d9472f84a0fb37daa93c00ae142aa7ed776bc98295bb627db2da26928e0c40c7a45d54bdc7769b3ca8bd4bd1ca80d86f79b46794579c3c8bf55feb6181eef SHA512 3f6c02ed0a5ebc92c48dffe7b54c7edc0a6983327617e5ae0139e0b59d77e1897f55a85d86c17a63ec3af558ae7693262966c064a2483f9fb87a7e84e5c508e2
 EBUILD ytmusicapi-0.25.2.ebuild 504 BLAKE2B ed64585f3d92a8034283d5516f454b8a99adb67d1c0067e4dc6e0e85be31a9392b1932b5d64487b1c0817f13607cf4ac16ee3c5d50d0316df93a89535d675cf9 SHA512 f9825708162f4661d96df20510350c10356d866338c67e7346359d6795c8ea34be7c1bdf3fdcd7a53257374b632c17d4db1c47d34113e642c976ec3d307d302b
 EBUILD ytmusicapi-1.0.0.ebuild 504 BLAKE2B ed64585f3d92a8034283d5516f454b8a99adb67d1c0067e4dc6e0e85be31a9392b1932b5d64487b1c0817f13607cf4ac16ee3c5d50d0316df93a89535d675cf9 SHA512 f9825708162f4661d96df20510350c10356d866338c67e7346359d6795c8ea34be7c1bdf3fdcd7a53257374b632c17d4db1c47d34113e642c976ec3d307d302b
+EBUILD ytmusicapi-1.0.1.ebuild 504 BLAKE2B ed64585f3d92a8034283d5516f454b8a99adb67d1c0067e4dc6e0e85be31a9392b1932b5d64487b1c0817f13607cf4ac16ee3c5d50d0316df93a89535d675cf9 SHA512 f9825708162f4661d96df20510350c10356d866338c67e7346359d6795c8ea34be7c1bdf3fdcd7a53257374b632c17d4db1c47d34113e642c976ec3d307d302b
 MISC metadata.xml 589 BLAKE2B bf51d5de92082a99ffb69839a9cadcea1d740f05d83194b951383713bcfbc4c95021ef27382cc6020298c3b8817553549ba150876c1398094dcc9a7de38bc04c SHA512 d34382f0041b2f74892661880ee7a318d7571254b18bf41d1152560e06f8d1b2da7432b4e9eb8a0d8b6cba645da9a3bf9c6a7c33002471a17d8c516c0aee8f70
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.0.1.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.0.1.ebuild
new file mode 100644
index 000000000000..3d685ec4c091
--- /dev/null
+++ b/dev-python/ytmusicapi/ytmusicapi-1.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Unofficial API for YouTube Music"
+HOMEPAGE="https://ytmusicapi.readthedocs.io/
+	https://github.com/sigma67/ytmusicapi/"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx-rtd-theme
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 7cd9b398b2eb..622660ce725a 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index 1ed936be0620..98554d6bcce5 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -11,5 +11,5 @@ AUX snack2.2.10-seektell-fix.patch 496 BLAKE2B a2e4e782788054c047596bd989241b9ec
 AUX tcl-snack-2.2.10-python3.patch 12145 BLAKE2B eb33937789e0eab1316fdfcd472b5cf701a4072e498052cb2889e8c9e5a4502f193f386b83c96a2e98efcfca3dfeb389414e1b924b677ef68edfafe0e706048f SHA512 3480d83824e1d7e8250947d6f9d5a38704b302491980b7e8ad46a4d6790e3bdf9588b1d63048a9a5ed081c44b8f6c1dc42e79d3ad543f473b5469c711dc60394
 DIST snack2.2.10.tar.gz 1798252 BLAKE2B e27b8e7d6082cdcfc06e7eea5ab832fb78ba104de9e56a69c6c9cd688183f7d4c6bdb974e4d5d2bf5ef2bc5518a913ddf17c90db8d10cef4dbee533307cc7718 SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b
 EBUILD snack-2.2.10-r11.ebuild 2776 BLAKE2B a6926c255a08e4c0c5dfc188eb42f6b6e1cc665444f3b07656a1e25a07e5cde521ee7cfe53875bec8a9a0d65f77fc1e990145100ad0e43cd5fd3e161db69570f SHA512 8e3384391281be405d4c0419b73a40cd7727c298a1938fb6e2d4ed954d73537ebff26a9c0aa05a42c37e2e076423877ed789acc8346369a19babdf5ef49e7de7
-EBUILD snack-2.2.10-r12.ebuild 2780 BLAKE2B af0777250b707c0c4191874469a823e6770ec7a36d12eaa645f313842715455817c7c1ff7cc34900fe3be121202c2a8a14548be6d3548bcd970ddcb54de172d3 SHA512 42f406b16e56ad7ee7b76511e4806f97a19f616999500a87e9d4dfb2b5ca3ae0297ada3281d0cf6e9e7b6d0a95bbabb2c71cd685df335df373b9e5dc3d5bb6b3
+EBUILD snack-2.2.10-r12.ebuild 2779 BLAKE2B c46577c93d8cc81ebdf297ce906263835aac310f238dddb3e0261d5637e1dc9026c6402541eac13647710a35038275f12b254d8fd11f2524707aa5f2aaf027e8 SHA512 9fd0db0fcb862f3c8da5c77b4de3be2e55bc657ca787feb8f3fc82d1a805c041bbb22b4b64018e015c2c6d59caf1995e1df1c6cc6fe7f3201be09e82db09e1d2
 MISC metadata.xml 260 BLAKE2B 9864f2503702b03d3ad715b3f2bd7ef7077f9ddef089de0d6a0840599d99a7f99d439ee50c12afc9ca99b0e288babf74b0bb2a6132ae6dd656b8d7c15e9b10a9 SHA512 3d1e4f14995736fb28198da21587a813a31f1330873ae3078dcd9a2452c1196d23e45983877d2e296353e1ac35cc6ff461b309585237bcc768e37e6b2728c23b
diff --git a/dev-tcltk/snack/snack-2.2.10-r12.ebuild b/dev-tcltk/snack/snack-2.2.10-r12.ebuild
index e22a0370efb7..1c0a69bc0d86 100644
--- a/dev-tcltk/snack/snack-2.2.10-r12.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r12.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.speech.kth.se/snack/"
 SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="alsa examples python vorbis"
 RESTRICT="!test? ( test )"
diff --git a/dev-tcltk/tclpython/Manifest b/dev-tcltk/tclpython/Manifest
index 7cbffdc2deb6..84a388f08586 100644
--- a/dev-tcltk/tclpython/Manifest
+++ b/dev-tcltk/tclpython/Manifest
@@ -1,5 +1,5 @@
 AUX tclpython-5.0-gentoo.patch 1476 BLAKE2B 86b099a5a30506c4f3dfb4c382a34dbc211b8eceabe039e033d6ec45d80d03bf64a259673ac80f4478b49a55e4605c8387bf17f3c9e3f4467345ca66ba2d98c7 SHA512 abc41ffae87ad1dabbac1dbc747c7df199559aa4d9be9676282d55020d5f1c9bde444ceb59363ddbcb2e786749fa9e42a0192d300be0fd945a01021da2abe8a9
 DIST tclpython-5.0.tar.gz 19327 BLAKE2B bad25a6eb04dbcd9ca3e9bc81d44f098f31f2acf367ecc32307596d5da3ed95752b3c60d9ee74fc04e21669e0361f0790edad3ad5793c78ece4904beacd92900 SHA512 fe15218fe00e921384dbd9611685b86cb6dfacb515a95545079550aeadaaafc3964e6ef0594a268a3fd900f40d178659e8b7f6f2a6d9aa507b59a8be0bd116af
 EBUILD tclpython-5.0-r1.ebuild 1015 BLAKE2B 6cfe7f84d570bf93b99f428caefee349f95cc76aa60fa3a2f1b390e1e063296cfd0a4c2a9fb5343c8eca4c37606c4989b4ac21f04bea9d48de421d8ba78bd458 SHA512 b8739544082ba402c035672e86b2eeeeafb7c6701e3b05f37b00efe43c7636e3023e709d569e10342a46c5e0469f02dbde40978e962871f2f809b6dbff226317
-EBUILD tclpython-5.0-r2.ebuild 1016 BLAKE2B 7d862af578fc5b76fbd09658c6701bced8a99992b6a577985913e1443dadc39270327b78041066c7ca01352d3dfae72c37c8536e240179935479aac08d579f1f SHA512 fdd34b4fc066e2338dce7a1b333e4ecb04004ee2697b93882ba095940c8dfb55daba5e446dc60f243acd0da36ed7d74a4c49599ceab9ae16d2470669f492f8b9
+EBUILD tclpython-5.0-r2.ebuild 1015 BLAKE2B 644370d61b4cb895acb0b28fe50f48f28f321ec8a11c75cc49a91c5d5c8fb053b12bba657ddbe4f8b0f3488cc80a85a392f1c4323fabe46724fe01076725e527 SHA512 829e3782785436621af2f057b7716e288550d0d30ebfbc578c10300fa3a4f3fffcd13d2e69a5e13f0162eca8a7e40d5b6365e8113bb92f7359f50f92e3a6806f
 MISC metadata.xml 337 BLAKE2B 3c1da9bcf75dfa06284eddc662e59132d4afc9085ae4327cea50f90bed808266c9857398857a99b8c560110b9339e46a8e74f5e7ce30865474c7aad7aeaaf040 SHA512 065bb7cb172671b9b9cad10777fd6af45f3946c4eb4b7ef34d476f21b93627470c8c9adf21b0d5323495e2787817eaeef9d5b7216da11632ba62a2fb054755d7
diff --git a/dev-tcltk/tclpython/tclpython-5.0-r2.ebuild b/dev-tcltk/tclpython/tclpython-5.0-r2.ebuild
index b3ea890c0af4..8bdb8a174f15 100644
--- a/dev-tcltk/tclpython/tclpython-5.0-r2.ebuild
+++ b/dev-tcltk/tclpython/tclpython-5.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/amykyta3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 46d92ccc3941..d6baa8747564 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index b23dfe9e0085..2e91d8a09385 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -5,6 +5,6 @@ DIST extra-cmake-modules-5.102.0.tar.xz 330720 BLAKE2B 1f2036a3a9cf240afa822024d
 DIST extra-cmake-modules-5.104.0.tar.xz 330988 BLAKE2B 9092045fe525f42647d426231997765fd7170b7768408b560af2599231a5183ec02314422deca2b1354cdfa291e1b16e29d3a368e97365e421c3945d763427e8 SHA512 63a3c4d66a07d48bf0a9ebe4fd009b5e043baee42d8a3f58b286e2b825250de05b896aa7e9c06f543eb29a12dd16be7ef5fb773c06477195cf6f018877805014
 DIST extra-cmake-modules-5.105.0.tar.xz 330968 BLAKE2B 96ba9374e8cdf8cba016017a411f90e5faf3c5055ed4444eded3395dd586b3039f7e125ac2ccba0d20520f00ee8af642e094381d0ef71455b4269c17d1885146 SHA512 04de829d7b0d42eba010aad235d68cea7e0fc4970e5ca86bdf441630893887baefe20588ed8e2fbe5bcdd51cfc352e94192e642e7dac9932de8e8f99a1734ca1
 EBUILD extra-cmake-modules-5.102.0.ebuild 1843 BLAKE2B b2933a9332c598b23d2111464284a69e2d31b0aa6e5f8e15f5ad00319d6357aa87286fc1e220296022291939e531d01b40d74ddb786689a9414f29d449c785e0 SHA512 db0f077d4048816189ea9c66c96f96d02bfdfb1598851fcd2b378036ad7de740a1d99c196b7739c9dfcf8f97db883515a041342ea39115320315b415c580d40b
-EBUILD extra-cmake-modules-5.104.0.ebuild 1848 BLAKE2B 7d58e0a2cd4fdea3cdc0a4a87f245ea7b45bab483df1566796a024c11f9b61ea00c30087e10df3b1a5fd01901913624fad978445c432d02eb5d631bd870ea0de SHA512 1d50f3c6d04ffb9fdf1f6ccbd567cd733e7dfd6959a49cd15eb09d257a607e4cfa75949e58989835005bc1f2e603e90e16b7c8eaaa971424bb79c892da8fadf4
+EBUILD extra-cmake-modules-5.104.0.ebuild 1847 BLAKE2B 4944a847a4651f0ac31424331400a855758a63bf31d06e609e6ca3cd75d11dbc9113e42e03d5475abe3a371f2b5d53b1e94808ba783e20f748f34b63d8321631 SHA512 658ac13b1145cbcb29993ebf16d27f849a6cd50b2452b7273ac31f4b835563a8aa292ec31b507ca09dbe4331d50c88712a837125c1a756c572e95f6df4e3df03
 EBUILD extra-cmake-modules-5.105.0.ebuild 1848 BLAKE2B 7d58e0a2cd4fdea3cdc0a4a87f245ea7b45bab483df1566796a024c11f9b61ea00c30087e10df3b1a5fd01901913624fad978445c432d02eb5d631bd870ea0de SHA512 1d50f3c6d04ffb9fdf1f6ccbd567cd733e7dfd6959a49cd15eb09d257a607e4cfa75949e58989835005bc1f2e603e90e16b7c8eaaa971424bb79c892da8fadf4
 MISC metadata.xml 480 BLAKE2B ab8e3f4e0a74a0e856bba9cf47e40254738c6d545a569bf12fae38e8e6d1e5d0cfd5a0ffaf6d5266a1532ea455d5f7f5421f1b88fa09539af6e31d2e85e170ad SHA512 0161373d45e5fd9a1c3c4f47892fcf1173419481f8de3ee73cc029ac628d36551516d0b99acc8b227b336ec5ce138844fd2654555edff3a73b8c07dbd931e468
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild
index 4f1be6b93a0d..a96dc9fd82c8 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 4a191f8351b2..9cce289e30da 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 3f3e9ad3e9ca..00bcf25e4b32 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -12,6 +12,6 @@ EBUILD lilypond-2.22.0-r1.ebuild 3259 BLAKE2B c8709c461436475455a836636c8bcdf54b
 EBUILD lilypond-2.22.1-r1.ebuild 3290 BLAKE2B 01d01846137ce0dceaf18f48111e017a54daf3206cd5dbd0ae0de7e2ffa93b00b4a7ddcfda9652d532ff4be45409eff60c60c883cf7d142dc825227ead8e3ae9 SHA512 96a1abf83d5a2d72f01b3b3eb85494dfe4b7b85d3150c3a83efdda5f69e4f388820be5324a9f1f47210255eb9c0754f8df7e851cf0a36400581b31f28540fbb7
 EBUILD lilypond-2.23.0-r1.ebuild 3169 BLAKE2B 045cac5a2d298d354ce29bc3c8fcbff0d2f823bda6ae8adf343769b3fa56d48d67d458b98cdd3bd1913e57c32a7473bf9d52efab3a19ef13d259904e193e34cc SHA512 be484e2cd71f4d50b124d9f07bf392e9d8bd81cd16f7591d297458d26ddc8885d6634943725b4729bbf1217fa2bfe89769ed4286e30936d4a3ff3c88ec668b2f
 EBUILD lilypond-2.23.2-r1.ebuild 3184 BLAKE2B 5e6eed86581df8a3c82ef0fff2e3ba8b5217a3c3521c376674e0e0511d287a0ba9f46bd6faa80a2c1c72002e6a31b0b94ed5d036652d766065067616e0390abc SHA512 9090401ac88a635445adeb1dd75f006aa3da92ab023eb8a810aeabe55f528d703f9e188e512ccfcc1e95af736a82c2e75521adcd0417d1797eb9a1cf88ce8461
-EBUILD lilypond-2.24.0.ebuild 2964 BLAKE2B 9aa5dd1a58c9332b8b32f5ab3f2db086b03ad2c129b1ac8a42c84af002680f0b0a21fa3b895f7da3ffe2786d72e58e54d77431fc45ddecf563ac8a1a927b6d70 SHA512 0afcea6aaf06151b5419475719203f9de05b87dd8027920e4701468264317473b61ec0c81b2cf1a48298b18e5df48b93942c77efb000ae5788962c2367e4759e
+EBUILD lilypond-2.24.0.ebuild 2962 BLAKE2B 1079f054e38b500db87f42f68c3621c3e5496fb9471fb9bdae081733a9a13497546539f12615a59ccc150ce93f23439525a78e999ec9bb7cbb17c1d23c73c209 SHA512 a27184adfb49b65d87a6fdd6f8d90cda84231f7828a5410ea5a960227459fabd860c9cec1ec7053946d72a31a7bfb4f77b4e2dbabbf7ab94811e7fc1149bdd11
 EBUILD lilypond-9999.ebuild 3143 BLAKE2B 68754245d21139e75a4638996f678860d3ec787e2140bcc73ddb5bb8e94e9f621cb1e1581dafe236ed5f57d334d6a106922f788cee74d7a62285043235e85180 SHA512 3538857063127913029e53ac786578306b0c9041bcfca71ab94a52982b58b1bdb95da5037a4ab6f7b311f6a8d4e7cff05187a894ec96041d9e9569fa78606ef4
 MISC metadata.xml 527 BLAKE2B b110a46a24ff9f9f8b93e28a17c40ff7d0674e9162e7804b476e9568fc4ddd1afd9c7386a129e9b2c3adf2010221e463cf0a32c720edda7fa31feb8ce806f5d0 SHA512 1f5cb81806c3155895a5a3a2b773c3ebbbfb35d7cafdb37b96961a46f6db11762a25444a868af975183b386bcc8dd8bf665e082a65d1c8423b224ea3185b31cd
diff --git a/media-sound/lilypond/lilypond-2.24.0.ebuild b/media-sound/lilypond/lilypond-2.24.0.ebuild
index 572a35713b01..f703d97eea69 100644
--- a/media-sound/lilypond/lilypond-2.24.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.24.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MAIN_VER=$(ver_cut 1-2)
 	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm arm64 ~hppa ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d4129f755027..2222fcd8ba11 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 9127621cf080..74d491312ee1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 19 Apr 2023 22:09:54 +0000
+Thu, 20 Apr 2023 04:10:05 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 19a7a69e4722..f87b3349d76e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-04-19T22:09:57Z
+TIMESTAMP 2023-04-20T04:10:10Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRAZrVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRAuyJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC49Q//fg8xkr8SQDCIUMR9Mi3s1O//jBMYXWHu4OsNbCiPiRK8N5rBHsjiTGKx
-Y0E/gFWNw4nQCY5iwLTrKV9GyGUhctItk43g5JtupHUOXiMUF6iMWNwmsHGp+jIn
-D0VHxPXu/Vidt+gNIOv9HBF/Kxf8JcTVuIHeRhjh7sB3hY/RtKVSBTBIwVLMLUl7
-O8py89NMX/WMomAN5H9qKUXRKwHnareAPBn/0dA/HioZNzF2/UvvNnFCz7lrdzLr
-oOMFw74d9KFz9fdwUssIW/q5tLqLjSs4Eu/67MplHSMzOsIenNPQz/dxG7utEosq
-0gcKGllVkH2ycrxw+jGDMGRJt+LAUgKJl71+i0d2udhXQHclNNwW9+ieurl4gPch
-n64MkUSydR4KVow0PpFGxJupTOHOqFSQnVg0y1xSud5lVJLiCUkiZdty8QBeJhJV
-YNRs9NEfFMxfhf4qExGnE7Re09Pvr1Z7Dbbsvw5U1Z7pFTY08AQzG8OUul1eZFjc
-4YeX+EtQ0bUjgDjp9f05RNC4kSQq4ta46+OkmxZ/kD9WqzqI4KpUYGCZntxrGf2M
-CMpzikzjt2p7hJ5FhWRz1G2oHdn6eDaYqvcUCip7GE/yGnS8Y8tqdPxn72JbiHge
-tNCF8RHdMhbUcLlZTu2e8SsLNP7YCCIUSs3Lf3dMH5+Yt1vZYl0=
-=heMX
+klBI0hAArUu793zUBj9019n2QmgbI0zQEEeBLyqby444EqvKFRvcax/9qWdQG1BN
+TuUGK+H6l4/d13UgQnObZ6pYEGuP7pXUMpQigGojbdksXWaVC4qinHdCAERkQENT
+jD8q/E3/JFS8V6nJ5utM6wcTwB2dhFcACrcOlr1gSduSUyeB3/h6fSJ9K+8N3zfZ
+Yb625zLlYgAc08XElbR6foawR98rPS7iDjmpuWTrBFVhUqOGGf0gAROOvtf1Pijm
+j04vp1yOJQMa72PfbVEfWyHYKdJ7KppowMyjjrDcGhOQQnMn3HdGeAeCv4BPPgkf
+Z5RQzmGVNpMlk9NVRPLnZNDSLBoSSihgsH1vsaDso4uwnbrBy9nY8U11m+RWNLK7
+QOevg0roa+bQoKyVc2KTIRSuS+s5n/BwVWvy4hZl/QKuR8bdvpSYpTz9leCkIxQ4
+CZXP8YC367pA8XkhN+OpCu0izYhDDtWYjvUDJvYqJDPdypfnd2JMhG9Bxwb3a4Tg
+t7EgbyDcw9EFbZuvAmE/m6fFiDeOTFj97D73K+x00lLRq5vtCnSySIxmT2TbSHpy
+lr3L/fVxJQ2serztsuL/7ZfQ1xnUhgSjz4yZE1LeuJK0Ej99UKjgWiU9EHviW/Dh
+eDVVtaUrgc2/1WUqVJuvEMuNYJJw5Rj4dQiY/uHrejQTZyDQ5qc=
+=h8XC
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9127621cf080..74d491312ee1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 19 Apr 2023 22:09:54 +0000
+Thu, 20 Apr 2023 04:10:05 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 512605cd2c5c..dbe2a93b4343 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index b429ea3e5f4d..6de36dbfdcc4 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.116 b/metadata/md5-cache/app-admin/awscli-1.27.116
new file mode 100644
index 000000000000..f34939a3dbd8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.116
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.116[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.116[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.27.116.tar.gz -> aws-cli-1.27.116.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2304.0 b/metadata/md5-cache/app-admin/rsyslog-8.2304.0
new file mode 100644
index 000000000000..e5dffb6e2fd3
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2304.0
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads(+)] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=8
+HOMEPAGE=https://www.rsyslog.com/
+INHERIT=autotools linux-info python-any-r1 systemd
+IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads(+)] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
+REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2304.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2304.0.tar.gz )
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=374fe18711fb36b65fa63e9b2934a5bf
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 9b1f701bbd55..4ca0cc7a5176 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/doom-modeline-3.4.0 b/metadata/md5-cache/app-emacs/doom-modeline-3.4.0
new file mode 100644
index 000000000000..1ff996ba649f
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/doom-modeline-3.4.0
@@ -0,0 +1,13 @@
+BDEPEND=app-emacs/all-the-icons app-emacs/compat app-emacs/shrink-path >=app-editors/emacs-25.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Fancy and fast mode-line for Emacs inspired by minimalism design
+EAPI=8
+HOMEPAGE=https://seagle0128.github.io/doom-modeline/ https://github.com/seagle0128/doom-modeline/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-emacs/all-the-icons app-emacs/compat app-emacs/shrink-path >=app-editors/emacs-25.3:*
+SLOT=0
+SRC_URI=https://github.com/seagle0128/doom-modeline/archive/v3.4.0.tar.gz -> doom-modeline-3.4.0.tar.gz
+_eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
+_md5_=9501fd19bbdb9a4adf38a4ea4e7fbcf3
diff --git a/metadata/md5-cache/app-emacs/projectile-2.5.0-r1 b/metadata/md5-cache/app-emacs/projectile-2.5.0-r1
index 25dc59c5df06..14eb913fcfcc 100644
--- a/metadata/md5-cache/app-emacs/projectile-2.5.0-r1
+++ b/metadata/md5-cache/app-emacs/projectile-2.5.0-r1
@@ -2,7 +2,7 @@ BDEPEND=test? ( app-emacs/buttercup ) >=app-editors/emacs-25.3:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=A project interaction library for Emacs
 EAPI=8
-HOMEPAGE=https://docs.projectile.mx
+HOMEPAGE=https://docs.projectile.mx https://github.com/bbatsov/projectile/
 INHERIT=elisp
 IUSE=test
 KEYWORDS=~amd64
@@ -10,6 +10,6 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.3:*
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/bbatsov/projectile/archive/refs/tags/v2.5.0.tar.gz -> projectile-2.5.0.tar.gz
+SRC_URI=https://github.com/bbatsov/projectile/archive/v2.5.0.tar.gz -> projectile-2.5.0.tar.gz
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=64cb276ca252518c404fd9f49a78f40f
+_md5_=4ad66eae66bf2c07ddeb71c1ebe7dbc6
diff --git a/metadata/md5-cache/app-emacs/projectile-2.6.0 b/metadata/md5-cache/app-emacs/projectile-2.6.0
index 9a31d3c625d2..b3463ff5747a 100644
--- a/metadata/md5-cache/app-emacs/projectile-2.6.0
+++ b/metadata/md5-cache/app-emacs/projectile-2.6.0
@@ -2,7 +2,7 @@ BDEPEND=test? ( app-emacs/buttercup ) >=app-editors/emacs-25.3:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=A project interaction library for Emacs
 EAPI=8
-HOMEPAGE=https://docs.projectile.mx
+HOMEPAGE=https://docs.projectile.mx https://github.com/bbatsov/projectile/
 INHERIT=elisp
 IUSE=test
 KEYWORDS=~amd64
@@ -10,6 +10,6 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.3:*
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/bbatsov/projectile/archive/refs/tags/v2.6.0.tar.gz -> projectile-2.6.0.tar.gz
+SRC_URI=https://github.com/bbatsov/projectile/archive/v2.6.0.tar.gz -> projectile-2.6.0.tar.gz
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=64cb276ca252518c404fd9f49a78f40f
+_md5_=4ad66eae66bf2c07ddeb71c1ebe7dbc6
diff --git a/metadata/md5-cache/app-emacs/projectile-2.7.0 b/metadata/md5-cache/app-emacs/projectile-2.7.0
index d7883ce536ba..bc9badc05d2c 100644
--- a/metadata/md5-cache/app-emacs/projectile-2.7.0
+++ b/metadata/md5-cache/app-emacs/projectile-2.7.0
@@ -2,7 +2,7 @@ BDEPEND=test? ( app-emacs/buttercup ) >=app-editors/emacs-25.3:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=A project interaction library for Emacs
 EAPI=8
-HOMEPAGE=https://docs.projectile.mx
+HOMEPAGE=https://docs.projectile.mx https://github.com/bbatsov/projectile/
 INHERIT=elisp
 IUSE=test
 KEYWORDS=~amd64
@@ -10,6 +10,6 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.3:*
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/bbatsov/projectile/archive/refs/tags/v2.7.0.tar.gz -> projectile-2.7.0.tar.gz
+SRC_URI=https://github.com/bbatsov/projectile/archive/v2.7.0.tar.gz -> projectile-2.7.0.tar.gz
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=64cb276ca252518c404fd9f49a78f40f
+_md5_=4ad66eae66bf2c07ddeb71c1ebe7dbc6
diff --git a/metadata/md5-cache/app-emacs/shrink-path-0.3.1 b/metadata/md5-cache/app-emacs/shrink-path-0.3.1
index 1af99b4ef682..2f9c40332114 100644
--- a/metadata/md5-cache/app-emacs/shrink-path-0.3.1
+++ b/metadata/md5-cache/app-emacs/shrink-path-0.3.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/bennya/shrink-path.el/-/archive/v0.3.1/shrink-path.el-v0.3.1.tar.bz2
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=96c15b96c5b818318007718414870860
+_md5_=d27e2a080bd0ea97e1ad302197d2bee9
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index bd7c03c860af..65844d067610 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.11.3 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.11.3
deleted file mode 100644
index 4ec27cc1cdbd..000000000000
--- a/metadata/md5-cache/dev-cpp/cpp-httplib-0.11.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=C++ HTTP/HTTPS server and client library
-EAPI=8
-HOMEPAGE=https://github.com/yhirose/cpp-httplib
-INHERIT=cmake-multilib python-any-r1
-IUSE=brotli ssl zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/0.11
-SRC_URI=https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.11.3.tar.gz -> cpp-httplib-0.11.3.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3a9c61ec679cbb364c77efb4be2aed2b
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.0 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.0
index 30eb7a22ad37..dbf9cdb20a71 100644
--- a/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.0
+++ b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.0
@@ -11,7 +11,7 @@ LICENSE=MIT
 RDEPEND=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( brotli ssl zlib )
 RESTRICT=!test? ( test )
-SLOT=0/0.11
+SLOT=0/0.12
 SRC_URI=https://github.com/yhirose/cpp-httplib/archive/v0.12.0.tar.gz -> cpp-httplib-0.12.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=096df3e9e11d942050d4fe095e2cf7d9
+_md5_=f82328ce55a00274e8409b86ff149898
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.1 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.1
index bebf7ccc0529..2494cfb358f9 100644
--- a/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.1
+++ b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.1
@@ -11,7 +11,7 @@ LICENSE=MIT
 RDEPEND=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( brotli ssl zlib )
 RESTRICT=!test? ( test )
-SLOT=0/0.11
+SLOT=0/0.12
 SRC_URI=https://github.com/yhirose/cpp-httplib/archive/v0.12.1.tar.gz -> cpp-httplib-0.12.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=096df3e9e11d942050d4fe095e2cf7d9
+_md5_=f82328ce55a00274e8409b86ff149898
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.2 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.2
new file mode 100644
index 000000000000..8d11c220eefc
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.2
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=C++ HTTP/HTTPS server and client library
+EAPI=8
+HOMEPAGE=https://github.com/yhirose/cpp-httplib/
+INHERIT=cmake-multilib python-any-r1 toolchain-funcs
+IUSE=brotli ssl test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test? ( brotli ssl zlib )
+RESTRICT=!test? ( test )
+SLOT=0/0.12
+SRC_URI=https://github.com/yhirose/cpp-httplib/archive/v0.12.2.tar.gz -> cpp-httplib-0.12.2.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9b2d0b132eacde873944624bcca1ee75
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 9810a1fa5243..c7b26a6bcd87 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319 b/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
index 4ab70a6a53a8..0b8247295fa4 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
+++ b/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-logging/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=log4j doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-core:2 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apache/commons-logging/archive/d376d3128663e53de4af948e161291e7ec0c6ec1.tar.gz -> commons-logging-1.3.0_pre20230319.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=eafcf90c3b26571db693efe16c0e018d
+_md5_=909b2811569b04162a94292f6bab3b4b
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 19d12fbf6a28..498460c362a1 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/luasec-1.3.1 b/metadata/md5-cache/dev-lua/luasec-1.3.1
index 78d12e111c41..6964baa65963 100644
--- a/metadata/md5-cache/dev-lua/luasec-1.3.1
+++ b/metadata/md5-cache/dev-lua/luasec-1.3.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/brunoos/luasec
 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 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lua/luasocket-3.0_rc1_p20200328-r103[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-libs/openssl:0= 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 )
 SLOT=0
 SRC_URI=https://github.com/brunoos/luasec/archive/v1.3.1.tar.gz -> luasec-1.3.1.tar.gz
 _eclasses_=lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7ff58a1d4989497bccd35baebafefcde
+_md5_=5407e43486ea9592d1a64901b74a4d0d
diff --git a/metadata/md5-cache/dev-lua/mpack-1.0.10 b/metadata/md5-cache/dev-lua/mpack-1.0.10
index da94a91c8a48..4c749eccdb43 100644
--- a/metadata/md5-cache/dev-lua/mpack-1.0.10
+++ b/metadata/md5-cache/dev-lua/mpack-1.0.10
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/libmpack/libmpack-lua/
 INHERIT=lua toolchain-funcs
 IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libmpack 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libmpack/libmpack-lua/archive/1.0.10.tar.gz -> mpack-1.0.10.tar.gz
 _eclasses_=lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9bb87be2d7fb72d7c1b4d6e686516dc7
+_md5_=8fa273ce7221af344e27d7d1166ee0f1
diff --git a/metadata/md5-cache/dev-python/Levenshtein-0.21.0 b/metadata/md5-cache/dev-python/Levenshtein-0.21.0
new file mode 100644
index 000000000000..3d854fc8d1c2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Levenshtein-0.21.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( <dev-python/rapidfuzz-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-cpp/rapidfuzz-cpp-1.7.0
+DESCRIPTION=Functions for fast computation of Levenshtein distance, and edit operations
+EAPI=8
+HOMEPAGE=https://pypi.org/project/Levenshtein/ https://github.com/maxbachmann/Levenshtein/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=<dev-python/rapidfuzz-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/maxbachmann/Levenshtein/archive/v0.21.0.tar.gz -> Levenshtein-0.21.0.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=6e75087b58eba3be3ee4e767a28da5e1
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 3932daf1f230..f93d6dfaf258 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/aws-sam-translator-1.65.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.65.0
new file mode 100644
index 000000000000..4ae577f52550
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.65.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydantic-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
+EAPI=8
+HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydantic-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.65.0.tar.gz -> serverless-application-model-1.65.0.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=3b51212bb788567e5b2f86181133b284
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.116 b/metadata/md5-cache/dev-python/boto3-1.26.116
new file mode 100644
index 000000000000..06e4035bd6b6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.116
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.116[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.116[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.26.116.tar.gz -> boto3-1.26.116.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=19c6bcfc191ce918489bff494ff185c2
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.116 b/metadata/md5-cache/dev-python/botocore-1.29.116
new file mode 100644
index 000000000000..db257660913d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.116
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.29.116.tar.gz -> botocore-1.29.116.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=fdf90804b518aea7cdc6e38fa5f2e79b
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.77.2 b/metadata/md5-cache/dev-python/cfn-lint-0.77.2
new file mode 100644
index 000000000000..1629529d1036
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.77.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/aws-sam-translator-1.64.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.64.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn-lint-0.77.2.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=568a98f93d062f3e2dd78ccb37890455
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.72.1 b/metadata/md5-cache/dev-python/hypothesis-6.72.1
new file mode 100644
index 000000000000..27c7a58a0b41
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.72.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.72.1.tar.gz -> hypothesis-6.72.1.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=04e8bbefff19cc821007fb364b7062ff
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.5.0 b/metadata/md5-cache/dev-python/pyasn1-0.5.0
new file mode 100644
index 000000000000..cc1021f25119
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyasn1-0.5.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=ASN.1 library for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pyasn1/ https://github.com/etingof/pyasn1/
+INHERIT=distutils-r1 pypi
+IUSE=test doc python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD-2
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyasn1/pyasn1-0.5.0.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=83596061c6ca443afc9fd0d55183187b
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.3.0 b/metadata/md5-cache/dev-python/pyasn1-modules-0.3.0
new file mode 100644
index 000000000000..b8c90becc984
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( <dev-python/pyasn1-0.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.4.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=pyasn1 modules
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pyasn1-modules/ https://github.com/etingof/pyasn1-modules/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD-2
+RDEPEND=<dev-python/pyasn1-0.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.4.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyasn1-modules/pyasn1_modules-0.3.0.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=53c61a7395ec73d051305e0a7afa557f
diff --git a/metadata/md5-cache/dev-python/python-email-validator-2.0.0_p2 b/metadata/md5-cache/dev-python/python-email-validator-2.0.0_p2
new file mode 100644
index 000000000000..2f832b523655
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-email-validator-2.0.0_p2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/idna-2.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A robust email syntax and deliverability validation library
+EAPI=8
+HOMEPAGE=https://github.com/JoshData/python-email-validator/ https://pypi.org/project/email-validator/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=CC0-1.0
+RDEPEND=>=dev-python/idna-2.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/e/email-validator/email_validator-2.0.0.post2.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=51dfffad11c6be98811559b8b9520732
diff --git a/metadata/md5-cache/dev-python/python-engineio-4.4.1 b/metadata/md5-cache/dev-python/python-engineio-4.4.1
new file mode 100644
index 000000000000..7ab1aefe84ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-engineio-4.4.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/tornado[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websockets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/alabaster[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python implementation of the Engine.IO realtime server
+EAPI=8
+HOMEPAGE=https://python-engineio.readthedocs.io/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/aiohttp[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/miguelgrinberg/python-engineio/archive/v4.4.1.tar.gz -> python-engineio-4.4.1.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e12d11a5485fb0f6a8c7784468f910ce
diff --git a/metadata/md5-cache/dev-python/ytmusicapi-1.0.1 b/metadata/md5-cache/dev-python/ytmusicapi-1.0.1
new file mode 100644
index 000000000000..e4f175d031ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ytmusicapi-1.0.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Unofficial API for YouTube Music
+EAPI=8
+HOMEPAGE=https://ytmusicapi.readthedocs.io/ https://github.com/sigma67/ytmusicapi/
+INHERIT=distutils-r1 pypi
+IUSE=doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/y/ytmusicapi/ytmusicapi-1.0.1.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=eb5bee540e093608539e8e256631930a
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 9ca9c1dc8f63..7ea94b385b6c 100644
Binary files a/metadata/md5-cache/dev-tcltk/Manifest.gz and b/metadata/md5-cache/dev-tcltk/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r12 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r12
index c2fb14a04a8a..6d4b88573950 100644
--- a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r12
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r12
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.speech.kth.se/snack/
 INHERIT=distutils-r1 flag-o-matic toolchain-funcs virtualx
 IUSE=alsa examples python vorbis python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) vorbis? ( media-libs/libvorbis )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=8d771fe165aae26d9c3bcf3bff64cb87
+_md5_=41a6a8c821fc950c597555661502410d
diff --git a/metadata/md5-cache/dev-tcltk/tclpython-5.0-r2 b/metadata/md5-cache/dev-tcltk/tclpython-5.0-r2
index 046644fd40f2..4e8cdc50b826 100644
--- a/metadata/md5-cache/dev-tcltk/tclpython-5.0-r2
+++ b/metadata/md5-cache/dev-tcltk/tclpython-5.0-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://jfontain.free.fr/tclpython.htm
 INHERIT=python-single-r1 toolchain-funcs
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-lang/tcl:0=
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/amykyta3/tclpython/archive/5.0.tar.gz -> tclpython-5.0.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0a7e143ccfde2e509b338e2321a0aa17
+_md5_=96260444ea837d57080a2d00ef5d826f
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 71eedc419942..7466124ef187 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0
index 1b1cd9a9fbe0..ee2a12c338f1 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
 INHERIT=cmake frameworks.kde.org python-any-r1
 IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 RESTRICT=!test? ( test )
 SLOT=5/5.104
 SRC_URI=mirror://kde/stable/frameworks/5.104/extra-cmake-modules-5.104.0.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	frameworks.kde.org	6556398a532490b4d6d03158a82e455a	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=10da7dc076d69f7e4c5dbd378850d9eb
+_md5_=b5a4df1ffb7cce852d0b262f61267bdb
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index d9585f62a271..02ddedbb6b61 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/lilypond-2.24.0 b/metadata/md5-cache/media-sound/lilypond-2.24.0
index de9b03cf85ae..f04e9b5cfcc9 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.24.0
+++ b/metadata/md5-cache/media-sound/lilypond-2.24.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://lilypond.org/
 INHERIT=elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 IUSE=debug doc emacs profile l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm arm64 ~hppa ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~riscv x86
 LICENSE=GPL-3 FDL-1.3
 RDEPEND=app-text/ghostscript-gpl dev-scheme/guile:12=[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 x11-libs/pango emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://lilypond.org/download/sources/v2.24/lilypond-2.24.0.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	dcd21c5d379fc2217e95f529504c5fe0	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ca4d491d1d12ab046396d5b32ff8a5fe
+_md5_=bd301263202c705f0e504f418229c8ea
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 8aed313e4ffd..06de0b06d650 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.25-r2 b/metadata/md5-cache/net-dialup/freeradius-3.0.25-r2
deleted file mode 100644
index 29480884e842..000000000000
--- a/metadata/md5-cache/net-dialup/freeradius-3.0.25-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install preinst prepare setup
-DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Highly configurable free RADIUS server
-EAPI=7
-HOMEPAGE=https://freeradius.org/
-INHERIT=autotools pam python-single-r1 systemd
-IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam pcap postgres python readline redis rest samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=test firebird? ( bindist )
-SLOT=0
-SRC_URI=https://github.com/FreeRADIUS/freeradius-server/archive/release_3_0_25.tar.gz -> freeradius-3.0.25.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	4efe951aa8ce2c16288d7c915196fe29	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bc93bbb0acb5b4832f47511660a93ed9
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.26 b/metadata/md5-cache/net-dialup/freeradius-3.0.26
deleted file mode 100644
index 32ead80a2baa..000000000000
--- a/metadata/md5-cache/net-dialup/freeradius-3.0.26
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install preinst prepare setup
-DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Highly configurable free RADIUS server
-EAPI=7
-HOMEPAGE=https://freeradius.org/
-INHERIT=autotools pam python-single-r1 systemd
-IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam pcap postgres python readline redis rest samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=test firebird? ( bindist )
-SLOT=0
-SRC_URI=https://github.com/FreeRADIUS/freeradius-server/archive/release_3_0_26.tar.gz -> freeradius-3.0.26.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	4efe951aa8ce2c16288d7c915196fe29	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=abb76326388851961671fc23753b7cff
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.2.0 b/metadata/md5-cache/net-dialup/freeradius-3.2.0
deleted file mode 100644
index ddee56cb6611..000000000000
--- a/metadata/md5-cache/net-dialup/freeradius-3.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install preinst prepare setup
-DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Highly configurable free RADIUS server
-EAPI=8
-HOMEPAGE=https://freeradius.org/
-INHERIT=autotools pam python-single-r1 systemd
-IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam postgres python readline redis samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=firebird? ( bindist )
-SLOT=0
-SRC_URI=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_0/freeradius-server-3.2.0.tar.bz2
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	4efe951aa8ce2c16288d7c915196fe29	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=835edd8720e4ab8b60ed47bfa7c79fb1
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.2.1 b/metadata/md5-cache/net-dialup/freeradius-3.2.1
deleted file mode 100644
index c016ccae1e30..000000000000
--- a/metadata/md5-cache/net-dialup/freeradius-3.2.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install preinst prepare setup
-DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Highly configurable free RADIUS server
-EAPI=8
-HOMEPAGE=https://freeradius.org/
-INHERIT=autotools pam python-single-r1 systemd
-IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam postgres python readline redis samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=firebird? ( bindist )
-SLOT=0
-SRC_URI=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_1/freeradius-server-3.2.1.tar.bz2
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	4efe951aa8ce2c16288d7c915196fe29	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=870293cc160b353f7ac95c1f2c0c3e0e
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 1f51e4cde802..4e2686a9eff1 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/element-desktop-bin-1.11.23 b/metadata/md5-cache/net-im/element-desktop-bin-1.11.23
deleted file mode 100644
index dac1ca8e95e6..000000000000
--- a/metadata/md5-cache/net-im/element-desktop-bin-1.11.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DESCRIPTION=A glossy Matrix collaboration client for desktop (binary package)
-EAPI=8
-HOMEPAGE=https://element.io
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=optfeature unpacker xdg
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-crypt/libsecret dev-db/sqlcipher dev-libs/expat dev-libs/glib:2 dev-libs/nettle dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/pango
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_1.11.23_amd64.deb
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3b016ac973b1bf5ad05126dbfc466d59
diff --git a/metadata/md5-cache/net-im/element-desktop-bin-1.11.29 b/metadata/md5-cache/net-im/element-desktop-bin-1.11.29
new file mode 100644
index 000000000000..16411c1ac2d6
--- /dev/null
+++ b/metadata/md5-cache/net-im/element-desktop-bin-1.11.29
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DESCRIPTION=A glossy Matrix collaboration client for desktop (binary package)
+EAPI=8
+HOMEPAGE=https://element.io
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=optfeature unpacker xdg
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-crypt/libsecret dev-db/sqlcipher dev-libs/expat dev-libs/glib:2 dev-libs/nettle dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/pango
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_1.11.29_amd64.deb
+_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=3b016ac973b1bf5ad05126dbfc466d59
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 78ffd0aff65a..0140ca9735ed 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/s3cmd-2.3.0 b/metadata/md5-cache/net-misc/s3cmd-2.3.0
index ee87419587d2..532271ff4780 100644
--- a/metadata/md5-cache/net-misc/s3cmd-2.3.0
+++ b/metadata/md5-cache/net-misc/s3cmd-2.3.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://s3tools.org/s3cmd
 INHERIT=distutils-r1
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~ia64 x86 ~amd64-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=|| ( dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/file[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/s3tools/s3cmd-2.3.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7a0dba1fbefea4cfd0ca4aa107fd510b
+_md5_=6bd36b74384405971d3e4ec21962234c
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index e680a7c9c1c1..77e22527be45 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/cadabra-2.4.2.1-r1 b/metadata/md5-cache/sci-mathematics/cadabra-2.4.2.1-r1
deleted file mode 100644
index 0a1175607cd2..000000000000
--- a/metadata/md5-cache/sci-mathematics/cadabra-2.4.2.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=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(-)] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-text/dvipng dev-cpp/glibmm:2 dev-db/sqlite:3= dev-libs/boost:= dev-libs/gmp:=[cxx] dev-libs/jsoncpp:= dev-libs/libsigc++:2 dev-texlive/texlive-basic python_single_target_python3_9? ( dev-python/gmpy:2[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/sympy[python_targets_python3_9(-)] jupyter? ( dev-python/jupyter[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/gmpy:2[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/sympy[python_targets_python3_10(-)] jupyter? ( dev-python/jupyter[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/gmpy:2[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/sympy[python_targets_python3_11(-)] jupyter? ( dev-python/jupyter[python_targets_python3_11(-)] ) ) gtk? ( dev-cpp/gtkmm:3.0 )
-DESCRIPTION=Field-theory motivated approach to computer algebra
-EAPI=8
-HOMEPAGE=https://cadabra.science/
-INHERIT=xdg-utils python-single-r1 cmake
-IUSE=gtk +jupyter test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-text/dvipng dev-cpp/glibmm:2 dev-db/sqlite:3= dev-libs/boost:= dev-libs/gmp:=[cxx] dev-libs/jsoncpp:= dev-libs/libsigc++:2 dev-texlive/texlive-basic python_single_target_python3_9? ( dev-python/gmpy:2[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/sympy[python_targets_python3_9(-)] jupyter? ( dev-python/jupyter[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/gmpy:2[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/sympy[python_targets_python3_10(-)] jupyter? ( dev-python/jupyter[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/gmpy:2[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/sympy[python_targets_python3_11(-)] jupyter? ( dev-python/jupyter[python_targets_python3_11(-)] ) ) gtk? ( dev-cpp/gtkmm:3.0 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/kpeeters/cadabra2/archive/2.4.2.1.tar.gz -> cadabra-2.4.2.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b60bac52009a77570cf7b9d7020e3cf6
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 71da77952f5d..c1411066ba16 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/flatpak-1.12.8 b/metadata/md5-cache/sys-apps/flatpak-1.12.8
index 49e284ede91d..c3e28b24a7ac 100644
--- a/metadata/md5-cache/sys-apps/flatpak-1.12.8
+++ b/metadata/md5-cache/sys-apps/flatpak-1.12.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://flatpak.org/
 INHERIT=linux-info python-any-r1
 IUSE=doc introspection policykit seccomp systemd X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
 PDEPEND=sys-apps/xdg-desktop-portal
 RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= gnome-base/gsettings-desktop-schemas >=net-libs/libsoup-2.4:2.4= >=sys-apps/bubblewrap-0.5.0 sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.12.8/flatpak-1.12.8.tar.xz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bb326fc41ad9381d69ae59c9fbf6da1b
+_md5_=63a7e4edf478b6497fa4ce71afb1f15a
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.14.4-r1 b/metadata/md5-cache/sys-apps/flatpak-1.14.4-r1
index 9a1ff7956726..a4c62f5993b7 100644
--- a/metadata/md5-cache/sys-apps/flatpak-1.14.4-r1
+++ b/metadata/md5-cache/sys-apps/flatpak-1.14.4-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://flatpak.org/
 INHERIT=linux-info python-any-r1 systemd
 IUSE=doc introspection policykit seccomp systemd X
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
 PDEPEND=sys-apps/xdg-desktop-portal
 RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-0.12:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] dev-util/ostree[curl] >=gnome-base/dconf-0.26:= gnome-base/gsettings-desktop-schemas net-misc/curl:= >=sys-apps/bubblewrap-0.5.0 sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.14.4/flatpak-1.14.4.tar.xz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7b5082fd40cd779145a2ae60137f0ac6
+_md5_=93ab0b846359e1f60bc23432f97a42c2
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 7c49d566829b..63b7d7d844e8 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/nginx-1.23.2 b/metadata/md5-cache/www-servers/nginx-1.23.2
deleted file mode 100644
index 0e56df4b0458..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.23.2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=nginx_modules_http_brotli? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=8
-HOMEPAGE=https://nginx.org
-INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
-IUSE=aio debug +http +http2 +http-cache libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite pcre !pcre2 ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.23.2.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/openresty/headers-more-nginx-module/archive/d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz -> ngx_http_headers_more-d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.7.7.tar.gz -> njs-0.7.7.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz -> ngx_http_lua-b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz -> ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz ) nginx_modules_http_security? ( https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v1.0.3.tar.gz -> modsecurity-nginx-1.0.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz -> ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.7.7.tar.gz -> njs-0.7.7.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	ssl-cert	33f6c352c602e87ceda767a86f3b7131	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b2c522d2420dd6609aadc96d7d72280b
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 58d0c21b97ff..000e4b58149a 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.19.0 b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.19.0
new file mode 100644
index 000000000000..7983da51ed0f
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.19.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=postinst postrm
+DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/garcon-4.18.0:= >=xfce-base/libxfce4util-4.18.0:= >=xfce-base/libxfce4ui-4.18.0:=[gtk3(+)] >=xfce-base/xfconf-4.18.0:=
+DESCRIPTION=A tool to find and launch installed applications for the Xfce desktop
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/xfce4-appfinder/start https://gitlab.xfce.org/xfce/xfce4-appfinder/
+INHERIT=xdg-utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/garcon-4.18.0:= >=xfce-base/libxfce4util-4.18.0:= >=xfce-base/libxfce4ui-4.18.0:=[gtk3(+)] >=xfce-base/xfconf-4.18.0:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-appfinder/4.19/xfce4-appfinder-4.19.0.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=72f56833015dfca30fd372e8a4e52fde
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 2c315f01e841..580b850eaf48 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.5 b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.5
new file mode 100644
index 000000000000..0084d7d1ef01
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.16.0:3 >=xfce-base/libxfce4ui-4.14.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.14.0:= >=xfce-base/xfce4-panel-4.14.0:=
+DESCRIPTION=A battery monitor panel plugin for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/
+INHERIT=linux-info xdg-utils
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~riscv ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.16.0:3 >=xfce-base/libxfce4ui-4.14.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.14.0:= >=xfce-base/xfce4-panel-4.14.0:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-1.1.5.tar.bz2
+_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9bdc692c32158f8cc7b2bb4223eab479
diff --git a/metadata/md5-cache/xfce-extra/xfce4-calculator-plugin-0.7.2 b/metadata/md5-cache/xfce-extra/xfce4-calculator-plugin-0.7.2
new file mode 100644
index 000000000000..46c81b908846
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-calculator-plugin-0.7.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.50.0 x11-libs/libX11 >=x11-libs/gtk+-3.22.0:3 >=xfce-base/libxfce4ui-4.12.0:= >=xfce-base/libxfce4util-4.12.0:= >=xfce-base/xfce4-panel-4.12.0:=
+DESCRIPTION=A calculator plugin for the Xfce4 panel
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-calculator-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-calculator-plugin/
+INHERIT=xdg-utils
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.50.0 x11-libs/libX11 >=x11-libs/gtk+-3.22.0:3 >=xfce-base/libxfce4ui-4.12.0:= >=xfce-base/libxfce4util-4.12.0:= >=xfce-base/xfce4-panel-4.12.0:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-calculator-plugin/0.7/xfce4-calculator-plugin-0.7.2.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=761be81ac6a3d959306759464826fd71
diff --git a/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.3 b/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.3
new file mode 100644
index 000000000000..a9de7c069bbb
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.22.0:3 >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:=
+DESCRIPTION=A filesystem guard plug-in for the Xfce panel
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/
+INHERIT=xdg-utils
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.22.0:3 >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-fsguard-plugin/1.1/xfce4-fsguard-plugin-1.1.3.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6be434d148537a127dc0ed3fae12a9bd
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 8a5c9978484e..dc066a036a9b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-04-19T22:09:57Z
+TIMESTAMP 2023-04-20T04:10:10Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRAZrVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRAuyJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAMbg//ex11fxlPSn4sN8t44ubqYl7qOgHsy5VA0VWkKOacD7S+o/1zO4cjDw1f
-60bwvmuLwPFJB606no+i90VS6Fn1A+Q89Hi02DVK98UkhvB0K0R74BJugh9aOOCe
-77RNUz1rkXZVxGp9wWdf65Jq9SKLmEmKSQ9VmZo6a+0Yqy09UPGzVUleZrA8jzuY
-mzLyZ2jk25b5Bw3f0c1NHBwH59ts0N7LJ32+yK2mz3IXLr9IuBekv1WVXUAkkXv4
-df28vtoqfINr89bwZg6YPEBNDiQDFHnzOM707rnDvX6gaOu1mQaAStkECPWMe2vD
-6Al7W9DVeOfDczsXxqhYHaqINuiwQDHIyjnw9CsIU1RCjO9Sm9YGASY2PmZPcQvC
-e9DcP8vV5+X+qIenpFMoPWXTg5Unxru7ZoeUvRqiMimcpYYVaVc2RBJX0s4P7CJS
-eoWAG0S+bXu2Df83Ylh2oAaR2kEly4vVV9zDPkBU68EAD7PmFD0btgwYSFvntvI5
-VIQLsvNaXDrQaq/1HDUriw8IS4H/I3GwM4dqu6pr9IhH9+dVb/sV434q5zZuBSQp
-b9jMLvXoPbyi1PlygUgOE8mhp0FiJzS7yDMEDuHVgQG7fJE4/MVoxNMFrNl/Ut2n
-UETbvD1IsVkOIEpEfptqyOHYd/OmTfRacpQw8N5NsylsLy3Uq+4=
-=e5hX
+klAFbg//fkhPqKn9BSSFV+bfTk6j75TLc4T8fsim2drQrTr5DMfbpYjRMQocQjSR
+hdIch8SgKF0uPmQTjjbxB5hstYjKImWpvcgRIfw6es29NWriV7qsmtPiO8WAHUqY
+p/POZ9P2fcREB5kPDP6U6VAexkiNYArzF/oMTvxP98XBKatyXFNpCV5xjZ0+WRxH
+hq+BWpTlxyU0xmVKKtS2PP9EGgBjTE5CcBcdIJP7dlfPwYaLyRcp4WVTfAkVAkU4
+DVkd+nzhj4dQhqUNdrUeapKq41U5LBZaJLYiiHTRIeM5/GTO7u4wkEmR84l2zsIy
++f12YI8L/fvxlRSrBceS+mme2lBrG3u1UJOqWwbVFDYdR56BHpfmxleO5A/xx0Fw
+lj4vAdFCg5sTL/knn871mi+o+hRsT5p1OzOvP9SvA6gVh7uaCj+eIW89cbVuCtY7
+J4jb9Z2vD8Ftp2e48nHwpm5eZb0SS8JHSJUSovnwG3cs18PE8T5dpeYUKIgJmd7k
+omlOTk1VLD+1M0hkdz1+o/8gtEu4sYJli0Vzu/Kr6eJ3tWLKKiSG8Ov8pK/LhynD
+bZVa1S+MTAXSbTCY8ny5MmJcfYqivjGFZVBMJ9q2PmO+o00lsB8ZB0+gkShswUK2
+gOPlgtfBP62QGif7VeBRtKAUjskiF/GKFnAGMAqkb9701a0JX1g=
+=buIL
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9127621cf080..74d491312ee1 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 19 Apr 2023 22:09:54 +0000
+Thu, 20 Apr 2023 04:10:05 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 9bdb9623809d..cf35e7038429 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Apr 19 10:09:54 PM UTC 2023
+Thu Apr 20 04:10:05 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 69223dc1742b..227575ebe3b7 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 19 Apr 2023 22:15:01 +0000
+Thu, 20 Apr 2023 04:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 543d33dc22a6..ace763304f9f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3f8f5a4c8a6f10cefbf7fceeed6e46cb4fb7886d 1681937367 2023-04-19T20:49:27+00:00
+d583809b1a045ee3cffa6a674d4bbeaeb9206223 1681963349 2023-04-20T04:02:29+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c3ed21170c6f..933fe2b4662c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1681942201 Wed 19 Apr 2023 10:10:01 PM UTC
+1681963801 Thu 20 Apr 2023 04:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 9127621cf080..74d491312ee1 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 19 Apr 2023 22:09:54 +0000
+Thu, 20 Apr 2023 04:10:05 +0000
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 54179f70d79e..b8b6679f0df6 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 277b959d58e5..95afb69b663b 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,14 +1,6 @@
 AUX freeradius-3.0.20-systemd-service.patch 2162 BLAKE2B 3aa32e5a15efa223aab7880b0cb651edca6695a3727b4df7692f656d1f34366a2a16c364c2a5b544a0ad04bca795be269d4d7dc37bc4c3c6d28387bc3e411ad8 SHA512 8a9f5ecaf559132932ed2e46151ff41e5570df3e844f33ee49004ace0aa7b458a6000ec0d1ed01c34b6236c3dde2ca72cb1031b4badcfa4d6826dbf16ca28259
 AUX radius.conf-r6 599 BLAKE2B 35c97ec8a31577afc89bc4f6d7a1310624bea46c2a12ea3cc010fda237b47d5a543225f54d7d4a8b00c1e15f904b149414c597525dd8b6425f20785ca636798d SHA512 acc9b0b178096e44ebfb84228caab1c82bf2f7bb38be386755169bbfb628165b6ac57194ed5a35e566dd0a2d8425f6790b43228a715e633ae8f59e2ab2b574da
 AUX radius.init-r4 753 BLAKE2B 18c83f704ac30d14d56ce8a2f5e3176dcd1aab83cc4525b728e3080e81470a9b4124af49459c69070d9c3ed67a95c7593b6d01f0259403fa9ceee43abd541f7c SHA512 8b05604a72a6a0dea3e654f36b13e1ed517d0c277d128475bcca768204d720b3cd9730e5776371818b8deb0f9fd099458bf5a3276ea9b61e3dbacafaaa527892
-DIST freeradius-3.0.25.tar.gz 5300245 BLAKE2B bf8908aa7bfabb9e15fa841457f176a4f2697bdec7994485516ef338908b46f2168260b7acf1a7120a687e543f0381bb787567bb4d564b9d14a3eb464a0e9ed6 SHA512 13382a53e6a1a4495c6f53e662ce21b80d73b6134a72f099f05495b64c56ae1a6c1cd1281311f1c3695d8532207fe5bd3d2026ed2c45f3cb5adb1011f1505ee7
-DIST freeradius-3.0.26.tar.gz 5300930 BLAKE2B e8922182f69ff201af331a03ef109072d24fb169c14179c5e71910ed3f767526afd7efe6000fd8a3881fa2ddb0487ebd12f8fdf6845136fdc15fdcb8a83fdf39 SHA512 83825ce1dd3d2e005c11d10ebadd2b37884130c158d3ea43595fa52478e3d194725b15dc73633758b0b1e916e00ea9358d254c38c2b721c475c9a4235aa1a5a3
-DIST freeradius-server-3.2.0.tar.bz2 3399380 BLAKE2B 103cb1faf7efd78520dd613da51671ff37b870fcd356d7d11454d655cf460bcb4132cd91b99be70557242907dd5e4d741b6a776de81c37a24ab9d04a4fe5866b SHA512 e7aa7bfc5a6968cdb860bb565ebd45bc1b3f78a665a9888a8b8dacaa1c5256755468aed33bdffe39465f8678c1fb9d6f47f0dbcf0178dfdcb38d99e3bc4b747d
-DIST freeradius-server-3.2.1.tar.bz2 3399164 BLAKE2B d0e69d468736d2a5dd85b32bb8b1fa44f2e56725ae525a3895df1b926f5ce525c70af08c2b76b62a9479d00d02c3e4915586fb1e5c7d42955c6b9e5cdeda8f6e SHA512 0f9e98cbf0eff4c5af54731ec34a8c9070252eaf2f91ca0c87caae939f6356fa91a6e1ed98ba66dbf1c1bafecdfcf38603fb4f65a5955e88974f49a5b7885f7a
 DIST freeradius-server-3.2.2.tar.bz2 3418998 BLAKE2B 584d1ff79cf3a75c79f5b24f9e47d7c8d8caee0d706eb47bb387300172f0699f904804d963aab8c252a21fe67f7885a47659b8cd9db5292a6d4db087d72e8e38 SHA512 91dc574560a1f75cafa8bc78c0676f0e3dae7154ecbb395e0e1f6738f78d8bcfe1bff122364452798fd0434c4056fd946799b8f29a1141398bf0542a37870689
-EBUILD freeradius-3.0.25-r2.ebuild 7515 BLAKE2B 63f05fa3d9556b614f5b1f60e5b49876880757f648b1a34031e2647e8fe285aa1ac0888107c47344bca0f69bcc0187698a4296f83945e3cf2f8c9a86c8bffe12 SHA512 a0a7fcfddec67576dd3a5df61b844d1cb1d1f28935b97e3196074df2650d45be152facdf5df26d0f476ddc72a77d95e402543b84c23159c9fb74ab6caea15a81
-EBUILD freeradius-3.0.26.ebuild 7518 BLAKE2B a869e680f55f1fa1c02a366f293425123398e6ca1499c28aee3e53b6a17fd92d221bfcac7ded79be8e7891dc3ccc8e883f326c13ea2e97403b597d3c5cdeb6db SHA512 79735a74828928dacea3ecbdf371c2865b91eb3fbd57be3cc72f91ed4b55f4b79f4eda42f19cf43f71b5f67c461563e22b1cd762ef3bf3d9beae2c03fc230d66
-EBUILD freeradius-3.2.0.ebuild 8313 BLAKE2B d5a2314f7b780349240de777500770f2851ee72cc6683a6645340dd0f1a53a1aa14424956ac75576519cfe89927b88597f1689350c99eb460777365794a6f51d SHA512 c14101fe8d2bfb93f2206acd332b08b325253a9d8e76d167ab21f49f74ed0126682c16ec074a65e7dbbe6e09b7aed9cae45f36bc85a6f376e3da929453c6af61
-EBUILD freeradius-3.2.1.ebuild 8354 BLAKE2B a325035ef6e125e1e70c67f1cecf49f73c7faacbb71353297f1f70a3779f5cae0145def15931229116ce8d665d1b886c001998db3a314a80c2b598cd5e1955d1 SHA512 5aaf707ea4df676033644bfa34da17e0fb89e8c7a324bb73b2065be67458b0dafb290338ac4898c80acb25fe55bc28bc41537d3596944109a6f32a92271e9b71
 EBUILD freeradius-3.2.2.ebuild 8297 BLAKE2B d76dc490ecac214b216eff0a3b74e40f88fe3e3bb0f91344ab649da88a8d30b9e323428ed17350f937a7334f1e78273bd299e6f9ca605456897cf4650a4dab35 SHA512 c260d7ff7feb0324c1169e692dc82e86b627cb73b86ec300a794e15039d8cc7be6313f8d85e2de0f7deb823e74f6c9c3c81de8b325ba5a7b6bebac34a9976f7a
 MISC metadata.xml 754 BLAKE2B 2aaf6e500fe361f2c456ea4e4d9da51c3056d8c993725bd3372cc3ebfecec129b8196cecf4829083084d3c664c338569db75fd2304dfc9123e04db3b222642ed SHA512 b6e99eefac90938f55be7abd56604e5ba37bacbcde609f7f9c71deef4d80c6257404baa1b676f426d9182345d4b742591b677b64c016eabdfafb1b18eb2d35e9
diff --git a/net-dialup/freeradius/freeradius-3.0.25-r2.ebuild b/net-dialup/freeradius/freeradius-3.0.25-r2.ebuild
deleted file mode 100644
index 0218f364f4ec..000000000000
--- a/net-dialup/freeradius/freeradius-3.0.25-r2.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit autotools pam python-single-r1 systemd
-
-MY_PV=$(ver_rs 1- "_")
-
-DESCRIPTION="Highly configurable free RADIUS server"
-HOMEPAGE="https://freeradius.org/"
-SRC_URI="https://github.com/FreeRADIUS/freeradius-server/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/freeradius-server-release_${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="
-	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
-	pcap postgres python readline redis rest samba sqlite ssl systemd
-"
-
-RESTRICT="test firebird? ( bindist )"
-
-# NOTE: Temporary freeradius doesn't support linking with mariadb client
-#       libs also if code is compliant, will be available in the next release.
-#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
-
-# TODO: rlm_mschap works with both samba library or without. I need to avoid
-#       linking of samba library if -samba is used.
-RDEPEND="acct-group/radius
-	acct-user/radius
-	!net-dialup/cistronradius
-	dev-lang/perl:=
-	sys-libs/gdbm:=
-	sys-libs/talloc
-	virtual/libcrypt:=
-	firebird? ( dev-db/firebird )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	memcached? ( dev-libs/libmemcached )
-	mysql? ( dev-db/mysql-connector-c:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
-	odbc? ( dev-db/unixODBC )
-	oracle? ( dev-db/oracle-instantclient[sdk] )
-	pam? ( sys-libs/pam )
-	pcap? ( net-libs/libpcap )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	redis? ( dev-libs/hiredis:= )
-	rest? ( dev-libs/json-c:= )
-	samba? ( net-fs/samba )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		dev-libs/openssl:0=[-bindist(-)]
-	)
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 721040
-QA_SONAME="usr/lib.*/libfreeradius-.*.so"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
-)
-
-pkg_setup() {
-	if use python ; then
-		python-single-r1_pkg_setup
-		export PYTHONBIN="${EPYTHON}"
-	fi
-}
-
-src_prepare() {
-	# most of the configuration options do not appear as ./configure
-	# switches. Instead it identifies the directories that are available
-	# and run through them. These might check for the presence of
-	# various libraries, in which case they are not built.  To avoid
-	# automagic dependencies, we just remove all the modules that we're
-	# not interested in using.
-
-	eapply_user
-	default
-
-	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
-	use ldap || { rm -r src/modules/rlm_ldap || die ; }
-	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
-	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
-	use pam || { rm -r src/modules/rlm_pam || die ; }
-	# Drop support of python2
-	rm -r src/modules/rlm_python || die
-	use python || { rm -r src/modules/rlm_python3 || die ; }
-	use rest || { rm -r src/modules/rlm_rest || die ; }
-	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
-	# Do not install ruby rlm module, bug #483108
-	rm -r src/modules/rlm_ruby || die
-
-	# these are all things we don't have in portage/I don't want to deal
-	# with myself
-	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
-	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
-	rm -r src/modules/rlm_opendirectory || die # requires some membership.h
-	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
-
-	# sql drivers that are not part of experimental are loaded from a
-	# file, so we have to remove them from the file itself when we
-	# remove them.
-	usesqldriver() {
-		local flag=$1
-		local driver=rlm_sql_${2:-${flag}}
-
-		if ! use ${flag}; then
-			rm -r src/modules/rlm_sql/drivers/${driver} || die
-			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
-		fi
-	}
-
-	sed -i \
-		-e 's:^#\tuser = :\tuser = :g' \
-		-e 's:^#\tgroup = :\tgroup = :g' \
-		-e 's:/var/run/radiusd:/run/radiusd:g' \
-		-e '/^run_dir/s:${localstatedir}::g' \
-		raddb/radiusd.conf.in || die
-
-	# verbosity
-	# build shared libraries using jlibtool -shared
-	sed -i \
-		-e '/$(LIBTOOL)/s|--quiet ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		Make.inc.in || die
-
-	sed -i \
-		-e 's|--silent ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		scripts/libtool.mk || die
-
-	# crude measure to stop jlibtool from running ranlib and ar
-	sed -i \
-		-e '/LIBRARIAN/s|".*"|"true"|g' \
-		-e '/RANLIB/s|".*"|"true"|g' \
-		scripts/jlibtool.c || die
-
-	usesqldriver mysql
-	usesqldriver postgres postgresql
-	usesqldriver firebird
-	usesqldriver iodbc
-	usesqldriver odbc unixodbc
-	usesqldriver oracle
-	usesqldriver sqlite
-	usesqldriver mongodb mongo
-
-	eautoreconf
-}
-
-src_configure() {
-	# do not try to enable static with static-libs; upstream is a
-	# massacre of libtool best practices so you also have to make sure
-	# to --enable-shared explicitly.
-	local myeconfargs=(
-		--enable-shared
-		--disable-static
-		--disable-ltdl-install
-		--with-system-libtool
-		--with-system-libltdl
-		--with-ascend-binary
-		--with-udpfromto
-		--with-dhcp
-		--with-iodbc-include-dir=/usr/include/iodbc
-		--with-experimental-modules
-		--with-docdir=/usr/share/doc/${PF}
-		--with-logdir=/var/log/radius
-		$(use_enable debug developer)
-		$(use_with ldap edir)
-		$(use_with ssl openssl)
-		$(use_with systemd systemd)
-	)
-	# fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myeconfargs+=( --enable-heimdal-krb5 )
-	fi
-
-	if use python ; then
-		myeconfargs+=(
-			--with-rlm-python3-bin=${EPYTHON}
-			--with-rlm-python3-config-bin=${EPYTHON}-config
-		)
-	fi
-
-	use readline || export ac_cv_lib_readline=no
-	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# verbose, do not generate certificates
-	emake \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS=''
-}
-
-src_install() {
-	dodir /etc
-	diropts -m0750 -o root -g radius
-	dodir /etc/raddb
-	diropts -m0750 -o radius -g radius
-	dodir /var/log/radius
-	keepdir /var/log/radius/radacct
-	diropts
-
-	# verbose, do not install certificates
-	# Parallel install fails (#509498)
-	emake -j1 \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS='' \
-		R="${D}" \
-		install
-
-	if use pam; then
-		pamd_mimic_system radiusd auth account password session
-	fi
-
-	# fix #711756
-	fowners -R radius:radius /etc/raddb
-	fowners -R radius:radius /var/log/radius
-
-	dodoc CREDITS
-
-	rm "${ED}/usr/sbin/rc.radiusd" || die
-
-	newinitd "${FILESDIR}/radius.init-r4" radiusd
-	newconfd "${FILESDIR}/radius.conf-r6" radiusd
-
-	if ! use systemd ; then
-		# If systemd builtin is not enabled we need use Type=Simple
-		# as systemd .service
-		sed -i -e 's:^Type=.*::g' \
-			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
-			"${S}"/debian/freeradius.service
-	fi
-	systemd_dounit "${S}"/debian/freeradius.service
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_config() {
-	if use ssl; then
-		cd "${ROOT}"/etc/raddb/certs || die
-		./bootstrap || die "Error while running ./bootstrap script."
-		chown root:radius "${ROOT}"/etc/raddb/certs || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
-	fi
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} && use ssl; then
-		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
-		elog "to start the radiusd service."
-	fi
-}
diff --git a/net-dialup/freeradius/freeradius-3.0.26.ebuild b/net-dialup/freeradius/freeradius-3.0.26.ebuild
deleted file mode 100644
index a2e2c1dd3980..000000000000
--- a/net-dialup/freeradius/freeradius-3.0.26.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit autotools pam python-single-r1 systemd
-
-MY_PV=$(ver_rs 1- "_")
-
-DESCRIPTION="Highly configurable free RADIUS server"
-HOMEPAGE="https://freeradius.org/"
-SRC_URI="https://github.com/FreeRADIUS/freeradius-server/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/freeradius-server-release_${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="
-	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
-	pcap postgres python readline redis rest samba sqlite ssl systemd
-"
-
-RESTRICT="test firebird? ( bindist )"
-
-# NOTE: Temporary freeradius doesn't support linking with mariadb client
-#       libs also if code is compliant, will be available in the next release.
-#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
-
-# TODO: rlm_mschap works with both samba library or without. I need to avoid
-#       linking of samba library if -samba is used.
-RDEPEND="acct-group/radius
-	acct-user/radius
-	!net-dialup/cistronradius
-	dev-lang/perl:=
-	sys-libs/gdbm:=
-	sys-libs/talloc
-	virtual/libcrypt:=
-	firebird? ( dev-db/firebird )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	memcached? ( dev-libs/libmemcached )
-	mysql? ( dev-db/mysql-connector-c:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
-	odbc? ( dev-db/unixODBC )
-	oracle? ( dev-db/oracle-instantclient[sdk] )
-	pam? ( sys-libs/pam )
-	pcap? ( net-libs/libpcap )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	redis? ( dev-libs/hiredis:= )
-	rest? ( dev-libs/json-c:= )
-	samba? ( net-fs/samba )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		dev-libs/openssl:0=[-bindist(-)]
-	)
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 721040
-QA_SONAME="usr/lib.*/libfreeradius-.*.so"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
-)
-
-pkg_setup() {
-	if use python ; then
-		python-single-r1_pkg_setup
-		export PYTHONBIN="${EPYTHON}"
-	fi
-}
-
-src_prepare() {
-	# most of the configuration options do not appear as ./configure
-	# switches. Instead it identifies the directories that are available
-	# and run through them. These might check for the presence of
-	# various libraries, in which case they are not built.  To avoid
-	# automagic dependencies, we just remove all the modules that we're
-	# not interested in using.
-
-	eapply_user
-	default
-
-	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
-	use ldap || { rm -r src/modules/rlm_ldap || die ; }
-	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
-	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
-	use pam || { rm -r src/modules/rlm_pam || die ; }
-	# Drop support of python2
-	rm -r src/modules/rlm_python || die
-	use python || { rm -r src/modules/rlm_python3 || die ; }
-	use rest || { rm -r src/modules/rlm_rest || die ; }
-	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
-	# Do not install ruby rlm module, bug #483108
-	rm -r src/modules/rlm_ruby || die
-
-	# these are all things we don't have in portage/I don't want to deal
-	# with myself
-	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
-	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
-	rm -r src/modules/rlm_opendirectory || die # requires some membership.h
-	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
-
-	# sql drivers that are not part of experimental are loaded from a
-	# file, so we have to remove them from the file itself when we
-	# remove them.
-	usesqldriver() {
-		local flag=$1
-		local driver=rlm_sql_${2:-${flag}}
-
-		if ! use ${flag}; then
-			rm -r src/modules/rlm_sql/drivers/${driver} || die
-			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
-		fi
-	}
-
-	sed -i \
-		-e 's:^#\tuser = :\tuser = :g' \
-		-e 's:^#\tgroup = :\tgroup = :g' \
-		-e 's:/var/run/radiusd:/run/radiusd:g' \
-		-e '/^run_dir/s:${localstatedir}::g' \
-		raddb/radiusd.conf.in || die
-
-	# verbosity
-	# build shared libraries using jlibtool -shared
-	sed -i \
-		-e '/$(LIBTOOL)/s|--quiet ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		Make.inc.in || die
-
-	sed -i \
-		-e 's|--silent ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		scripts/libtool.mk || die
-
-	# crude measure to stop jlibtool from running ranlib and ar
-	sed -i \
-		-e '/LIBRARIAN/s|".*"|"true"|g' \
-		-e '/RANLIB/s|".*"|"true"|g' \
-		scripts/jlibtool.c || die
-
-	usesqldriver mysql
-	usesqldriver postgres postgresql
-	usesqldriver firebird
-	usesqldriver iodbc
-	usesqldriver odbc unixodbc
-	usesqldriver oracle
-	usesqldriver sqlite
-	usesqldriver mongodb mongo
-
-	eautoreconf
-}
-
-src_configure() {
-	# do not try to enable static with static-libs; upstream is a
-	# massacre of libtool best practices so you also have to make sure
-	# to --enable-shared explicitly.
-	local myeconfargs=(
-		--enable-shared
-		--disable-static
-		--disable-ltdl-install
-		--with-system-libtool
-		--with-system-libltdl
-		--with-ascend-binary
-		--with-udpfromto
-		--with-dhcp
-		--with-iodbc-include-dir=/usr/include/iodbc
-		--with-experimental-modules
-		--with-docdir=/usr/share/doc/${PF}
-		--with-logdir=/var/log/radius
-		$(use_enable debug developer)
-		$(use_with ldap edir)
-		$(use_with ssl openssl)
-		$(use_with systemd systemd)
-	)
-	# fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myeconfargs+=( --enable-heimdal-krb5 )
-	fi
-
-	if use python ; then
-		myeconfargs+=(
-			--with-rlm-python3-bin=${EPYTHON}
-			--with-rlm-python3-config-bin=${EPYTHON}-config
-		)
-	fi
-
-	use readline || export ac_cv_lib_readline=no
-	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# verbose, do not generate certificates
-	emake \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS=''
-}
-
-src_install() {
-	dodir /etc
-	diropts -m0750 -o root -g radius
-	dodir /etc/raddb
-	diropts -m0750 -o radius -g radius
-	dodir /var/log/radius
-	keepdir /var/log/radius/radacct
-	diropts
-
-	# verbose, do not install certificates
-	# Parallel install fails (#509498)
-	emake -j1 \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS='' \
-		R="${D}" \
-		install
-
-	if use pam; then
-		pamd_mimic_system radiusd auth account password session
-	fi
-
-	# fix #711756
-	fowners -R radius:radius /etc/raddb
-	fowners -R radius:radius /var/log/radius
-
-	dodoc CREDITS
-
-	rm "${ED}/usr/sbin/rc.radiusd" || die
-
-	newinitd "${FILESDIR}/radius.init-r4" radiusd
-	newconfd "${FILESDIR}/radius.conf-r6" radiusd
-
-	if ! use systemd ; then
-		# If systemd builtin is not enabled we need use Type=Simple
-		# as systemd .service
-		sed -i -e 's:^Type=.*::g' \
-			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
-			"${S}"/debian/freeradius.service
-	fi
-	systemd_dounit "${S}"/debian/freeradius.service
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_config() {
-	if use ssl; then
-		cd "${ROOT}"/etc/raddb/certs || die
-		./bootstrap || die "Error while running ./bootstrap script."
-		chown root:radius "${ROOT}"/etc/raddb/certs || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
-	fi
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} && use ssl; then
-		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
-		elog "to start the radiusd service."
-	fi
-}
diff --git a/net-dialup/freeradius/freeradius-3.2.0.ebuild b/net-dialup/freeradius/freeradius-3.2.0.ebuild
deleted file mode 100644
index 30a0e6a740ac..000000000000
--- a/net-dialup/freeradius/freeradius-3.2.0.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit autotools pam python-single-r1 systemd
-
-MY_PN=${PN}-server
-MY_P=${MY_PN}-${PV}
-MY_PV=$(ver_rs 1- "_")
-
-DESCRIPTION="Highly configurable free RADIUS server"
-HOMEPAGE="https://freeradius.org/"
-SRC_URI="https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${MY_PV}/${MY_P}.tar.bz2"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="
-	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
-	postgres python readline redis samba sqlite ssl systemd
-"
-
-RESTRICT="firebird? ( bindist )"
-
-# NOTE: Temporary freeradius doesn't support linking with mariadb client
-#       libs also if code is compliant, will be available in the next release.
-#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
-
-# TODO: rlm_mschap works with both samba library or without. I need to avoid
-#       linking of samba library if -samba is used.
-
-# TODO: unconditional json-c for now as automagic dep despite efforts to stop it
-# ditto libpcap. Can restore USE=rest, USE=pcap if/when fixed.
-
-RDEPEND="acct-group/radius
-	acct-user/radius
-	!net-dialup/cistronradius
-	dev-libs/libltdl
-	dev-libs/libpcre
-	dev-libs/json-c:=
-	dev-lang/perl:=
-	net-libs/libpcap
-	sys-libs/gdbm:=
-	sys-libs/libcap
-	sys-libs/talloc
-	virtual/libcrypt:=
-	firebird? ( dev-db/firebird )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	memcached? ( dev-libs/libmemcached )
-	mysql? ( dev-db/mysql-connector-c:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
-	odbc? ( dev-db/unixODBC )
-	oracle? ( dev-db/oracle-instantclient[sdk] )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-	redis? ( dev-libs/hiredis:= )
-	samba? ( net-fs/samba )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] )
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# bug #721040
-QA_SONAME="usr/lib.*/libfreeradius-.*.so"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
-)
-
-pkg_setup() {
-	if use python ; then
-		python-single-r1_pkg_setup
-		export PYTHONBIN="${EPYTHON}"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Most of the configuration options do not appear as ./configure
-	# switches. Instead it identifies the directories that are available
-	# and run through them. These might check for the presence of
-	# various libraries, in which case they are not built.  To avoid
-	# automagic dependencies, we just remove all the modules that we're
-	# not interested in using.
-	# TODO: shift more of these into configure args below as things
-	# are a bit better now.
-	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
-	use ldap || { rm -r src/modules/rlm_ldap || die ; }
-	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
-	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
-	use pam || { rm -r src/modules/rlm_pam || die ; }
-
-	# Drop support for python2
-	rm -r src/modules/rlm_python || die
-
-	use python || { rm -r src/modules/rlm_python3 || die ; }
-	#use rest || { rm -r src/modules/rlm_rest || die ; }
-	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
-	# Do not install ruby rlm module, bug #483108
-	rm -r src/modules/rlm_ruby || die
-
-	# These are all things we don't have in portage/I don't want to deal
-	# with myself.
-	#
-	# Requires TNCS library
-	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die
-	# Requires libeap-ikev2
-	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die
-	# Requires some membership.h
-	rm -r src/modules/rlm_opendirectory || die
-	# ?
-	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
-
-	# SQL drivers that are not part of experimental are loaded from a
-	# file, so we have to remove them from the file itself when we
-	# remove them.
-	usesqldriver() {
-		local flag=$1
-		local driver=rlm_sql_${2:-${flag}}
-
-		if ! use ${flag} ; then
-			rm -r src/modules/rlm_sql/drivers/${driver} || die
-			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
-		fi
-	}
-
-	sed -i \
-		-e 's:^#\tuser = :\tuser = :g' \
-		-e 's:^#\tgroup = :\tgroup = :g' \
-		-e 's:/var/run/radiusd:/run/radiusd:g' \
-		-e '/^run_dir/s:${localstatedir}::g' \
-		raddb/radiusd.conf.in || die
-
-	# - Verbosity
-	# - B uild shared libraries using jlibtool -shared
-	sed -i \
-		-e '/$(LIBTOOL)/s|--quiet ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		Make.inc.in || die
-	sed -i \
-		-e 's|--silent ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		scripts/libtool.mk || die
-
-	# Crude measure to stop jlibtool from running ranlib and ar
-	sed -i \
-		-e '/LIBRARIAN/s|".*"|"true"|g' \
-		-e '/RANLIB/s|".*"|"true"|g' \
-		scripts/jlibtool.c || die
-
-	usesqldriver mysql
-	usesqldriver postgres postgresql
-	usesqldriver firebird
-	usesqldriver iodbc
-	usesqldriver odbc unixodbc
-	usesqldriver oracle
-	usesqldriver sqlite
-	usesqldriver mongodb mongo
-
-	eautoreconf
-}
-
-src_configure() {
-	# Do not try to enable static with static-libs; upstream is a
-	# massacre of libtool best practices so you also have to make sure
-	# to --enable-shared explicitly.
-	local myeconfargs=(
-		# Revisit confcache when not needing to use ac_cv anymore
-		# for automagic deps.
-		#--cache-file="${S}"/config.cache
-
-		--enable-shared
-		--disable-ltdl-install
-		--disable-silent-rules
-		--with-system-libtool
-		--with-system-libltdl
-
-		--enable-strict-dependencies
-		--without-rlm_couchbase
-		--without-rlm_securid
-		--without-rlm_unbound
-		--without-rlm_idn
-		#--without-rlm_json
-		#$(use_with rest libfreeradius-json)
-
-		# Our OpenSSL should be patched. Avoid false-positive failures.
-		--disable-openssl-version-check
-		--with-ascend-binary
-		--with-udpfromto
-		--with-dhcp
-		--with-pcre
-		--with-iodbc-include-dir=/usr/include/iodbc
-		--with-experimental-modules
-		--with-docdir=/usr/share/doc/${PF}
-		--with-logdir=/var/log/radius
-
-		$(use_enable debug developer)
-		$(use_with ldap edir)
-		$(use_with ssl openssl)
-		$(use_with systemd systemd)
-	)
-
-	# bug #77613
-	if has_version app-crypt/heimdal ; then
-		myeconfargs+=( --enable-heimdal-krb5 )
-	fi
-
-	if use python ; then
-		myeconfargs+=(
-			--with-rlm-python3-bin=${EPYTHON}
-			--with-rlm-python3-config-bin=${EPYTHON}-config
-		)
-	fi
-
-	if ! use readline ; then
-		export ac_cv_lib_readline=no
-	fi
-
-	#if ! use pcap ; then
-	#	export ac_cv_lib_pcap_pcap_open_live=no
-	#	export ac_cv_header_pcap_h=no
-	#fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Verbose, do not generate certificates
-	emake \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS=''
-}
-
-src_install() {
-	dodir /etc
-
-	diropts -m0750 -o root -g radius
-	dodir /etc/raddb
-
-	diropts -m0750 -o radius -g radius
-	dodir /var/log/radius
-
-	keepdir /var/log/radius/radacct
-	diropts
-
-	# - Verbose, do not install certificates
-	# - Parallel install fails (bug #509498)
-	emake -j1 \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS='' \
-		R="${D}" \
-		install
-
-	if use pam ; then
-		pamd_mimic_system radiusd auth account password session
-	fi
-
-	# bug #711756
-	fowners -R radius:radius /etc/raddb
-	fowners -R radius:radius /var/log/radius
-
-	dodoc CREDITS
-
-	rm "${ED}"/usr/sbin/rc.radiusd || die
-
-	newinitd "${FILESDIR}"/radius.init-r4 radiusd
-	newconfd "${FILESDIR}"/radius.conf-r6 radiusd
-
-	if ! use systemd ; then
-		# If systemd builtin is not enabled we need use Type=Simple
-		# as systemd .service
-		sed -i -e 's:^Type=.*::g' \
-			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
-			"${S}"/debian/freeradius.service
-	fi
-
-	systemd_dounit "${S}"/debian/freeradius.service
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_config() {
-	if use ssl ; then
-		cd "${ROOT}"/etc/raddb/certs || die
-
-		./bootstrap || die "Error while running ./bootstrap script."
-		chown root:radius "${ROOT}"/etc/raddb/certs || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
-	fi
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} && use ssl ; then
-		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
-		elog "to start the radiusd service."
-	fi
-}
diff --git a/net-dialup/freeradius/freeradius-3.2.1.ebuild b/net-dialup/freeradius/freeradius-3.2.1.ebuild
deleted file mode 100644
index 86036194b49c..000000000000
--- a/net-dialup/freeradius/freeradius-3.2.1.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools pam python-single-r1 systemd
-
-MY_PN=${PN}-server
-MY_P=${MY_PN}-${PV}
-MY_PV=$(ver_rs 1- "_")
-
-DESCRIPTION="Highly configurable free RADIUS server"
-HOMEPAGE="https://freeradius.org/"
-SRC_URI="https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${MY_PV}/${MY_P}.tar.bz2"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="
-	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
-	postgres python readline redis samba sqlite ssl systemd
-"
-
-RESTRICT="firebird? ( bindist )"
-
-# NOTE: Temporary freeradius doesn't support linking with mariadb client
-#       libs also if code is compliant, will be available in the next release.
-#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
-
-# TODO: rlm_mschap works with both samba library or without. I need to avoid
-#       linking of samba library if -samba is used.
-
-# TODO: unconditional json-c for now as automagic dep despite efforts to stop it
-# ditto libpcap. Can restore USE=rest, USE=pcap if/when fixed.
-
-RDEPEND="acct-group/radius
-	acct-user/radius
-	!net-dialup/cistronradius
-	dev-libs/libltdl
-	dev-libs/libpcre
-	dev-libs/json-c:=
-	dev-lang/perl:=
-	net-libs/libpcap
-	sys-libs/gdbm:=
-	sys-libs/libcap
-	sys-libs/talloc
-	virtual/libcrypt:=
-	firebird? ( dev-db/firebird )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	memcached? ( dev-libs/libmemcached )
-	mysql? ( dev-db/mysql-connector-c:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
-	odbc? ( dev-db/unixODBC )
-	oracle? ( dev-db/oracle-instantclient[sdk] )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-	redis? ( dev-libs/hiredis:= )
-	samba? ( net-fs/samba )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] )
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# bug #721040
-QA_SONAME="usr/lib.*/libfreeradius-.*.so"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
-)
-
-pkg_setup() {
-	if use python ; then
-		python-single-r1_pkg_setup
-		export PYTHONBIN="${EPYTHON}"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Most of the configuration options do not appear as ./configure
-	# switches. Instead it identifies the directories that are available
-	# and run through them. These might check for the presence of
-	# various libraries, in which case they are not built.  To avoid
-	# automagic dependencies, we just remove all the modules that we're
-	# not interested in using.
-	# TODO: shift more of these into configure args below as things
-	# are a bit better now.
-	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
-	use ldap || { rm -r src/modules/rlm_ldap || die ; }
-	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
-	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
-	use pam || { rm -r src/modules/rlm_pam || die ; }
-
-	# Drop support for python2
-	rm -r src/modules/rlm_python || die
-
-	use python || { rm -r src/modules/rlm_python3 || die ; }
-	#use rest || { rm -r src/modules/rlm_rest || die ; }
-	# Do not install ruby rlm module, bug #483108
-	rm -r src/modules/rlm_ruby || die
-
-	# These are all things we don't have in portage/I don't want to deal
-	# with myself.
-	#
-	# Requires TNCS library
-	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die
-	# Requires libeap-ikev2
-	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die
-	# Requires some membership.h
-	rm -r src/modules/rlm_opendirectory || die
-	# ?
-	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
-
-	# SQL drivers that are not part of experimental are loaded from a
-	# file, so we have to remove them from the file itself when we
-	# remove them.
-	usesqldriver() {
-		local flag=$1
-		local driver=rlm_sql_${2:-${flag}}
-
-		if ! use ${flag} ; then
-			rm -r src/modules/rlm_sql/drivers/${driver} || die
-			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
-		fi
-	}
-
-	sed -i \
-		-e 's:^#\tuser = :\tuser = :g' \
-		-e 's:^#\tgroup = :\tgroup = :g' \
-		-e 's:/var/run/radiusd:/run/radiusd:g' \
-		-e '/^run_dir/s:${localstatedir}::g' \
-		raddb/radiusd.conf.in || die
-
-	# - Verbosity
-	# - B uild shared libraries using jlibtool -shared
-	sed -i \
-		-e '/$(LIBTOOL)/s|--quiet ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		Make.inc.in || die
-	sed -i \
-		-e 's|--silent ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		scripts/libtool.mk || die
-
-	# Crude measure to stop jlibtool from running ranlib and ar
-	sed -i \
-		-e '/LIBRARIAN/s|".*"|"true"|g' \
-		-e '/RANLIB/s|".*"|"true"|g' \
-		scripts/jlibtool.c || die
-
-	usesqldriver mysql
-	usesqldriver postgres postgresql
-	usesqldriver firebird
-	usesqldriver iodbc
-	usesqldriver odbc unixodbc
-	usesqldriver oracle
-	usesqldriver sqlite
-	usesqldriver mongodb mongo
-
-	eautoreconf
-}
-
-src_configure() {
-	# Do not try to enable static with static-libs; upstream is a
-	# massacre of libtool best practices so you also have to make sure
-	# to --enable-shared explicitly.
-	local myeconfargs=(
-		# Revisit confcache when not needing to use ac_cv anymore
-		# for automagic deps.
-		#--cache-file="${S}"/config.cache
-
-		--enable-shared
-		--disable-ltdl-install
-		--disable-silent-rules
-		--with-system-libtool
-		--with-system-libltdl
-
-		--enable-strict-dependencies
-		--without-rlm_couchbase
-		--without-rlm_securid
-		--without-rlm_unbound
-		--without-rlm_idn
-		#--without-rlm_json
-		#$(use_with rest libfreeradius-json)
-
-		# Our OpenSSL should be patched. Avoid false-positive failures.
-		--disable-openssl-version-check
-		--with-ascend-binary
-		--with-udpfromto
-		--with-dhcp
-		--with-pcre
-		--with-iodbc-include-dir=/usr/include/iodbc
-		--with-experimental-modules
-		--with-docdir=/usr/share/doc/${PF}
-		--with-logdir=/var/log/radius
-
-		$(use_enable debug developer)
-		$(use_with ldap edir)
-		$(use_with redis rlm_cache_redis)
-		$(use_with redis rlm_redis)
-		$(use_with redis rlm_rediswho)
-		$(use_with ssl openssl)
-		$(use_with systemd systemd)
-	)
-
-	# bug #77613
-	if has_version app-crypt/heimdal ; then
-		myeconfargs+=( --enable-heimdal-krb5 )
-	fi
-
-	if use python ; then
-		myeconfargs+=(
-			--with-rlm-python3-bin=${EPYTHON}
-			--with-rlm-python3-config-bin=${EPYTHON}-config
-		)
-	fi
-
-	if ! use readline ; then
-		export ac_cv_lib_readline=no
-	fi
-
-	#if ! use pcap ; then
-	#	export ac_cv_lib_pcap_pcap_open_live=no
-	#	export ac_cv_header_pcap_h=no
-	#fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Verbose, do not generate certificates
-	emake \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS=''
-}
-
-src_install() {
-	dodir /etc
-
-	diropts -m0750 -o root -g radius
-	dodir /etc/raddb
-
-	diropts -m0750 -o radius -g radius
-	dodir /var/log/radius
-
-	keepdir /var/log/radius/radacct
-	diropts
-
-	# - Verbose, do not install certificates
-	# - Parallel install fails (bug #509498)
-	emake -j1 \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS='' \
-		R="${D}" \
-		install
-
-	if use pam ; then
-		pamd_mimic_system radiusd auth account password session
-	fi
-
-	# bug #711756
-	fowners -R radius:radius /etc/raddb
-	fowners -R radius:radius /var/log/radius
-
-	dodoc CREDITS
-
-	rm "${ED}"/usr/sbin/rc.radiusd || die
-
-	newinitd "${FILESDIR}"/radius.init-r4 radiusd
-	newconfd "${FILESDIR}"/radius.conf-r6 radiusd
-
-	if ! use systemd ; then
-		# If systemd builtin is not enabled we need use Type=Simple
-		# as systemd .service
-		sed -i -e 's:^Type=.*::g' \
-			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
-			"${S}"/debian/freeradius.service
-	fi
-
-	systemd_dounit "${S}"/debian/freeradius.service
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_config() {
-	if use ssl ; then
-		cd "${ROOT}"/etc/raddb/certs || die
-
-		./bootstrap || die "Error while running ./bootstrap script."
-		chown root:radius "${ROOT}"/etc/raddb/certs || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
-	fi
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} && use ssl ; then
-		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
-		elog "to start the radiusd service."
-	fi
-}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 3558d982b642..83e9a2a2ab5c 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index a6e416db1aac..3c3c9c34db8a 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST element-desktop_1.11.23_amd64.deb 86329464 BLAKE2B 1dfef4eeebc78b9bf61795d8e59fee4069484dcc4ec53cb6ecc077cbead0eb563ccb5e3c52b47c274e15afe9cf244808904dbd8f87b6d2608098c4eb8498e456 SHA512 6aad946b1398b3da0b5993883aeffaa08d9b3f5104759eda3379e4dc2586106358aad7d88ee4b1484e11606a36781f909f52d4bb12c3eeb421f84a94abc0732e
-EBUILD element-desktop-bin-1.11.23.ebuild 1963 BLAKE2B e843aa50d0998da1414493ad816142d88a5576a18bdf81e57cd0ad876b92ed96f9095d0775db3f582b7486d3258f3e5f375d76d28cc6236a7be3eaf889b53460 SHA512 4ca00093b9d031d33965fc661e09fcd075b48e3b1cfe2bd523d5ba733837cd5e5a57b7c8edfcebe19161caf51f9e0d335d91d3a7463ba7979dc84b8d09c5b4aa
+DIST element-desktop_1.11.29_amd64.deb 90337796 BLAKE2B 03118df614b06197e073c1f23c8434af9df491d1c441f5b314de929865e4ea6de8c6a2cac20506a061138105fa26c6f8f080c5eb757d17165a701b72571ce1a9 SHA512 7b8f96d34938eb42890c7cb5f344a1580cb4136cdc04f98ccceeeae89a9f325620143bbad17a9229016c16198fa54299f0025b0dda01693396433eade5f12ae9
+EBUILD element-desktop-bin-1.11.29.ebuild 1963 BLAKE2B e843aa50d0998da1414493ad816142d88a5576a18bdf81e57cd0ad876b92ed96f9095d0775db3f582b7486d3258f3e5f375d76d28cc6236a7be3eaf889b53460 SHA512 4ca00093b9d031d33965fc661e09fcd075b48e3b1cfe2bd523d5ba733837cd5e5a57b7c8edfcebe19161caf51f9e0d335d91d3a7463ba7979dc84b8d09c5b4aa
 MISC metadata.xml 248 BLAKE2B 88afa54e3134b10ecc3f3f7e19fb6b209f3908a517788151cfe6c6ced2b21d368f19a6de982c28575b14a8769069c02b70f639ab73618a9b949c0e9eaf4f17a0 SHA512 3ec152d35cfd434c4ba49a51afd5f2eeaed478983f49f5e61e0713af7da791faee69713a3740182302d8129fb538e8296d0b40152e23e7d5e6d1a996322e7122
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.11.23.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.11.23.ebuild
deleted file mode 100644
index a265fd85b2b5..000000000000
--- a/net-im/element-desktop-bin/element-desktop-bin-1.11.23.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature unpacker xdg
-
-MY_PN="${PN/-bin}"
-
-DESCRIPTION="A glossy Matrix collaboration client for desktop (binary package)"
-HOMEPAGE="https://element.io"
-SRC_URI="https://packages.element.io/debian/pool/main/e/element-desktop/${MY_PN}_${PV}_amd64.deb"
-S="${WORKDIR}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="splitdebug"
-
-RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
-	app-crypt/libsecret
-	dev-db/sqlcipher
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nettle
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
-	x11-libs/pango"
-
-QA_PREBUILT="opt/Element/chrome-sandbox
-	opt/Element/chrome_crashpad_handler
-	opt/Element/element-desktop
-	opt/Element/libEGL.so
-	opt/Element/libGLESv2.so
-	opt/Element/libffmpeg.so
-	opt/Element/libvk_swiftshader.so
-	opt/Element/libvulkan.so.1
-	opt/Element/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node
-	opt/Element/resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node"
-
-src_prepare() {
-	default
-	rm opt/Element/{LICENSE.electron.txt,LICENSES.chromium.html} || die
-}
-
-src_install() {
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	insinto /
-	doins -r usr
-	doins -r opt
-	local f
-	for f in ${QA_PREBUILT}; do
-		fperms +x "/${f}"
-	done
-	fperms u+s /opt/Element/chrome-sandbox
-
-	dosym ../../opt/Element/${MY_PN} /usr/bin/${MY_PN}
-	dosym ${MY_PN} /usr/bin/riot-desktop
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "emojis" media-fonts/noto-emoji
-}
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.11.29.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.11.29.ebuild
new file mode 100644
index 000000000000..a265fd85b2b5
--- /dev/null
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.11.29.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature unpacker xdg
+
+MY_PN="${PN/-bin}"
+
+DESCRIPTION="A glossy Matrix collaboration client for desktop (binary package)"
+HOMEPAGE="https://element.io"
+SRC_URI="https://packages.element.io/debian/pool/main/e/element-desktop/${MY_PN}_${PV}_amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="splitdebug"
+
+RDEPEND="
+	|| (
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		( app-accessibility/at-spi2-atk dev-libs/atk )
+	)
+	app-crypt/libsecret
+	dev-db/sqlcipher
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nettle
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libdrm
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/pango"
+
+QA_PREBUILT="opt/Element/chrome-sandbox
+	opt/Element/chrome_crashpad_handler
+	opt/Element/element-desktop
+	opt/Element/libEGL.so
+	opt/Element/libGLESv2.so
+	opt/Element/libffmpeg.so
+	opt/Element/libvk_swiftshader.so
+	opt/Element/libvulkan.so.1
+	opt/Element/resources/app.asar.unpacked/node_modules/matrix-seshat/native/index.node
+	opt/Element/resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node"
+
+src_prepare() {
+	default
+	rm opt/Element/{LICENSE.electron.txt,LICENSES.chromium.html} || die
+}
+
+src_install() {
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	insinto /
+	doins -r usr
+	doins -r opt
+	local f
+	for f in ${QA_PREBUILT}; do
+		fperms +x "/${f}"
+	done
+	fperms u+s /opt/Element/chrome-sandbox
+
+	dosym ../../opt/Element/${MY_PN} /usr/bin/${MY_PN}
+	dosym ${MY_PN} /usr/bin/riot-desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "emojis" media-fonts/noto-emoji
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index eb8db96d63da..ec01232fe50e 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index b161d1b70d2a..a3391ae6fd31 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,5 +1,5 @@
 DIST s3cmd-2.2.0.tar.gz 134390 BLAKE2B d578aa13a7b8599c70dc6daa5d21950331b0b07278479d1f3947e6be78a9bd108c7f8ea6f198fa518dfa6ad44d907d979a29d5d9f1a15e4f73484fcebb118225 SHA512 07b2410554233b435b3476e09fd14354abaa19374cc1211f861147023470599483c18d213a44b5c9aee32d71b5a4bc5d9ce25721fb077cbadfd208d457e13845
 DIST s3cmd-2.3.0.tar.gz 136754 BLAKE2B 61feff68d008536d4d31009f4ad18da37ccd0cdab9bfdf151b7112ac66f43bde78f042bc2ad36998fe070428a10a9ba99db5d6d39e9eb74e829a855eb11d1697 SHA512 3507fb8b597617a384508149cb30bdfa8bc8a7b3705782fbf9a943c4be413dc5b7cfb3572b632e8bebbb644ab31f418428ccca996c0d2ba840ad88df1f5a406a
 EBUILD s3cmd-2.2.0.ebuild 674 BLAKE2B 9f9b7d82fa49a30972d1459df8e974c719072e089085f87a06aea04f18711dfd0ab11179965edea3d15e9474efbf386fa6ce06373e380d968733c4c921b194e5 SHA512 fe813bfb528da9b94cb6578da6d99ec9f9b496069ef920ff53e820ab388f317d6b72d7fbc7aea5298e4d78631645b75b6c6fba69f9988bd02d24ebf78b907f1d
-EBUILD s3cmd-2.3.0.ebuild 681 BLAKE2B 01dd77b557e1cc39965ddd034563fc7fa23d1ec8ad44b0f4270715a40244597cdd9c59f7cb030e01cb5686eb00721a5946d85cf668eb9caf5403aa30598ba063 SHA512 e750b867d470f37ff107263d617348e539a128f315042dba42b962ad1733c01c2a0ab0ef4149a17a652bb0d7ac919602289cb8b787dd49828c9a3e769855e483
+EBUILD s3cmd-2.3.0.ebuild 680 BLAKE2B 41049389392e606df69ed9da80d40eb24cc8346813d779c43896d7d7ed8550658674f2f75cba7e6c6bc012f1865ab480ec40e02754cfad9f362bc562a20fc072 SHA512 128f873a514aebbebe49a76d49e5144b47f1ed3345312304dcbd15a3e76f2d046a2f127fc42231678e38d7daa11e271dfc9d7b378fca8e8ab8ef4700afa327bb
 MISC metadata.xml 795 BLAKE2B f1d85ae68ca459fbf61bc0cfb20da9e3d5380f33f8ebbac3335ed7432e50a44612238331ceb725c6e6ec116a19a6cf6d41bfc4895f9a892e698dc2ccad185d51 SHA512 01531459d573097f668c7c584732f17bdff1dde9d49b2e9c424134e346f0b430957a64bfb4075ef41b08ca1f86d5b6a6b5285de81f9f1f9d3d52bb081ded06eb
diff --git a/net-misc/s3cmd/s3cmd-2.3.0.ebuild b/net-misc/s3cmd/s3cmd-2.3.0.ebuild
index 7d393a837804..8ee0e8104a82 100644
--- a/net-misc/s3cmd/s3cmd-2.3.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-linux ~x64-macos"
 
 RDEPEND="
 	|| (
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 379d6a4eb82c..cde0fbc857fe 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/cadabra/Manifest b/sci-mathematics/cadabra/Manifest
index bb163aa67baa..0bc9e4162539 100644
--- a/sci-mathematics/cadabra/Manifest
+++ b/sci-mathematics/cadabra/Manifest
@@ -1,8 +1,6 @@
 AUX cadabra2-CMake.patch 3184 BLAKE2B afa702834d5eb82a8056307b419fc20bbc2d45b0474994328b70fee383dff415ea37ef2e70c83e9cb7776e06f9295cf5cb9afddddaf857227f7a72f362b61726 SHA512 ddd6b451f81e465d4fef9401340808922bcb1074895173d83d699614e0c967024863848fabdd207f7124ff6396e8c2c75d2ed1425ba73d7bb6d5ac6fe56a87f1
-DIST cadabra-2.4.2.1.tar.gz 25154623 BLAKE2B 99c24728c80c5909df338b9214774123c2aac63e475138b5059c0c7824685827765d7906c17200ab3bad63e08b3637c7eb67b2f25bb3477eab4ca02fcbedbb56 SHA512 9dd280dfaca3cf1def268bca7884b0d00287bba5bfb7b80e8bdf4759f91c83117d146af2a24e05d2a8bdc8a5be412529a805713861a56a7186c35fe07ff8d0db
 DIST cadabra-2.4.2.2.tar.gz 25156757 BLAKE2B 05d4e490d1fa740b3dd505b72d5f4f298e62e234859e81b5bdf865e895ab820b3cd5d6db3ecda1cac0426b031cc5c87428d464bdb66b24cb9b945ababc860a90 SHA512 c5c55abad090d72f981341d94d3e299583f446a4bff1df994a60c740cede9e543b5cdee146dae2a846deec4adf446172e62b0f12deab8c89e7a085ffa7006acf
 DIST cadabra-2.4.3.2.tar.gz 25157173 BLAKE2B 895b91a01f5dedc87294903959ee3aca0234016fce0094f4288c07e2d265f90f834670b9c50dcfa059e46564c773f73f049cf65db74f49932e442d15d68ecd88 SHA512 21c76804442397fa3d5fa407fc74395fc800d01c2a5d84270e9cf3abd875c8ff96e2ba8f8349037797ff4ef3d2b9033c2a1a6af45bb75c3a201acdd7357adb6f
-EBUILD cadabra-2.4.2.1-r1.ebuild 2366 BLAKE2B bb04d2b44dfa890cb72b67988aececd2317433c3b2f88e7e2a15078a647b097804076b48bdc5a6386ced66c4a875e9ab9c5d0a19d01f4655a5bc91ea4ceeff78 SHA512 a81b0bb03307ce1ef3b03772e183cd60a858e2aa04de7ad281d4fadddb7452b69dd5f2d248b2b5cd0a6e6cf67456e3eaa8c1a2bb54c6096200c5d19d104d67b1
 EBUILD cadabra-2.4.2.2-r1.ebuild 2366 BLAKE2B bb04d2b44dfa890cb72b67988aececd2317433c3b2f88e7e2a15078a647b097804076b48bdc5a6386ced66c4a875e9ab9c5d0a19d01f4655a5bc91ea4ceeff78 SHA512 a81b0bb03307ce1ef3b03772e183cd60a858e2aa04de7ad281d4fadddb7452b69dd5f2d248b2b5cd0a6e6cf67456e3eaa8c1a2bb54c6096200c5d19d104d67b1
 EBUILD cadabra-2.4.3.2.ebuild 2365 BLAKE2B 2074e07f0b3f7b4d9186f843a10abfd647f36855bab1d3831a3f079912db36363cc4cb3ce8553fb63d9b2e5538d3274216843c93de2e9d90e1a609d49b415e7f SHA512 0b27c49db0d95481f091833886ddf7ffb876f29f4065a9a821fd1207b1c612d80de92ebd929ffd71385409099a6c3d1d9369fb457e6a51e4ca3b34a6d9cdb4ec
 MISC metadata.xml 1342 BLAKE2B 2f34aae73fc01d4b8fd4326505b7b0785663c62593641d1d0a01f64adc12cbc8676271612ce91258927ac22957a8d5aba53dd2627130582c744bc32c28e0e207 SHA512 41dffbcfae16f8f0702df5a1837b225100761d48817a2d70fa03aca6246b9d3184d60989cf265282286b02a77a126ac82695c2d74c6de91da45e8f64fcb91811
diff --git a/sci-mathematics/cadabra/cadabra-2.4.2.1-r1.ebuild b/sci-mathematics/cadabra/cadabra-2.4.2.1-r1.ebuild
deleted file mode 100644
index 729dbdb870fa..000000000000
--- a/sci-mathematics/cadabra/cadabra-2.4.2.1-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MAJOR=$(ver_cut 1)
-CADABRA=${PN}${MAJOR}
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit xdg-utils python-single-r1 cmake
-
-DESCRIPTION="Field-theory motivated approach to computer algebra"
-HOMEPAGE="https://cadabra.science/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kpeeters/${CADABRA}.git"
-else
-	SRC_URI="https://github.com/kpeeters/${CADABRA}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${CADABRA}-${PV}
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${MAJOR}"
-IUSE="gtk +jupyter test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/dvipng
-	dev-cpp/glibmm:2
-	dev-db/sqlite:3=
-	dev-libs/boost:=
-	dev-libs/gmp:=[cxx]
-	dev-libs/jsoncpp:=
-	dev-libs/libsigc++:2
-	dev-texlive/texlive-basic
-	$(python_gen_cond_dep '
-		dev-python/gmpy:2[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-		jupyter? ( dev-python/jupyter[${PYTHON_USEDEP}] )
-	')
-	gtk? ( dev-cpp/gtkmm:3.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')"
-
-PATCHES=( "${FILESDIR}"/${CADABRA}-CMake.patch )
-
-DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md JUPYTER.rst README.rst )
-
-# Because we do not want to pull in "_XDG_DEPEND" dependencies with USE="-gtk"
-xdg_update() {
-	if use gtk ; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-src_prepare() {
-	# Clean postinst script which calls libtool and icon-cache update
-	echo '#!/bin/sh' > "${S}"/config/postinst.in || die
-
-	# Fix "PYTHON_EXECUTABLE" in Jupyter kernel
-	sed -i "s|@PYTHON_EXECUTABLE@|${EPYTHON}|"  \
-		"${S}"/jupyterkernel/kernelspec/kernel.json.in || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_SYSTEM_JSONCPP=ON
-		-DPACKAGING_MODE=ON
-		-DUSE_PYTHON_3=ON
-		-DBUILD_AS_CPP_LIBRARY=OFF
-		-DENABLE_JUPYTER=OFF  # special Xeus Jupyter kernel (uses xtl)
-		-DENABLE_MATHEMATICA=OFF
-		-DINSTALL_TARGETS_ONLY=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DENABLE_FRONTEND=$(usex gtk)
-		-DENABLE_PY_JUPYTER=$(usex jupyter)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_update
-}
-
-pkg_postrm() {
-	xdg_update
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7f1f7a448257..b020125740ff 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index f7c992509b41..30898e28d447 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -5,7 +5,7 @@ DIST flatpak-1.12.8.tar.xz 1568984 BLAKE2B 6db457eba6b5c03ae4b7037e55f0537821152
 DIST flatpak-1.14.1.tar.xz 1626500 BLAKE2B bf33dcd5a0f0289e5bff32794012dcfc45dcdbb11ef0da5c68769c18b1bcd12fcc0308ea275a7532f59998db6afa019746313387b0f9636c7d9b91ceb7d66665 SHA512 1f22622b9a797b644b5fe9d26c3c4ec3f6b1a3b81a12d498e5aeeecb1a965c9aaa5c1d18843c938f116855bbbed3a8d9866997440f86241abe70eae13be7cdcb
 DIST flatpak-1.14.4.tar.xz 1637484 BLAKE2B cf208c581ad76d46489ba473d290c35907da0d1d473bf2b4792fb56c31e7110cd38f1c6fc4ad04aa3675868d17116ba52a84b028d7b7789c1736cfe26f3cabfe SHA512 3f97096affd4f1de184ded353f1ab403d9f1813b199b9a1595596cc7c5d6b46062aa2ef184255823f50ae95ca60d0542d9b9e520f9a605f9bc51091863bf89b0
 EBUILD flatpak-1.12.3-r1.ebuild 2520 BLAKE2B 1164a0b45277b5352f03f59cac94dba8cf9107a7f620bab0b1c1b64173c67bf2a7aa80294c0e3869743bed0387f3e0a90618ab85a1bcf098c550243bed899d8a SHA512 e53ad1f5cd51861d4b687c6212577631521c743bf4fbb18b544c8c8df9e7720e50c87a8e54a01ea27bd649f4e1f6feea19c5f5b1abcf6365ce8fa3b62fc5c849
-EBUILD flatpak-1.12.8.ebuild 2524 BLAKE2B 2c807dea263ed1f6cfafd6f7adc1e9bf4f95f98e3916c53c2cdf273cd2493f6a0996832c919b108316a9f13e818f858ee1c6c9932767a69f067787516991e9ad SHA512 a0290e67752a99df6572c1a795da29f61a4c128ce52e29fc9b0c52d17374ad07bdfd9d84d9e63bf0d825b007f42299dcc263ca3ae564ca89720bac1ff9d49ec7
+EBUILD flatpak-1.12.8.ebuild 2523 BLAKE2B 46fd265834c106fa8edc9bf0b48b81f5681f926fd4ab2185fa7f97f7196d4361713623dd70b53c2f83b6c73ee50603c5149f9d1bd28f65c5c3213694ccc431dd SHA512 916330aabfcf005bc6b37ec9386c1849127b556e648e876164b1c9a7ddbaad628b12d6c4e89edb3ea1ca440781dcd12b95420114d2a31680a1f74c8d8cf94b21
 EBUILD flatpak-1.14.1.ebuild 2626 BLAKE2B 0276683806ca4180a9addbb33bdb1edf23ec8623ddd2f85238a82342a4426f8960d02b76f03b0099116e727bbc3c8e4df698ab451f63251f4c0fbc89921697d8 SHA512 4788847c696f9177459613d09b79f9414d5b773f790fa96c528d7ca7e17e6c423c08a57cdedc94a71edb42e7f07c2577304f691df1db24db77d931156ae4ccdd
-EBUILD flatpak-1.14.4-r1.ebuild 2726 BLAKE2B d5a0a567faf9282b4d84514181b97ed64ffbd411e41868eac6c33feb4fc75f1e301b9a8f5bfcf9838e4aeda314dee390607ad3ae871a5a54cc4c0bb329ba433d SHA512 98a4bcdb2fc063ce9374af50cc633387df71bb2444033925ae1e664ac7f7acc4d058875d79de740ca7c42a75fddb939d0a6dd21fa4fda53f7e520c4fae4f6e3d
+EBUILD flatpak-1.14.4-r1.ebuild 2725 BLAKE2B 7bbfe07f6c3c8fa58a40e3e451b257080666bf792e7a37a441e5abeeb6d49e5ee3bdaa361c2d2074b5e5fe54fbe52f9815c803a913852f24f785b9c2a283ac8e SHA512 2c4b3f76dcefeac510107d16f5f0df839927735f21516e6ab782608215fb387f58238d012b497b5de88ac9c07e3574aa69b78e0fd94c38ffe5143ae5dbf7693c
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.12.8.ebuild b/sys-apps/flatpak/flatpak-1.12.8.ebuild
index 6983ea31deb9..6ce89dfdade3 100644
--- a/sys-apps/flatpak/flatpak-1.12.8.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 IUSE="doc introspection policykit seccomp systemd X"
 RESTRICT="test"
 
diff --git a/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild b/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild
index 859b8ef2a2a8..2feeffe4d50c 100644
--- a/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="doc introspection policykit seccomp systemd X"
 RESTRICT="test"
 
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 97432759ece9..3b3e404b4cf7 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 1a71ec601fd2..84c11c60907a 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -25,14 +25,11 @@ DIST ngx_devel_kit-0.3.1.tar.gz 66542 BLAKE2B 8242d884464d99a131a48f599f9d0c2b54
 DIST ngx_http_auth_pam-1.5.2.tar.gz 7016 BLAKE2B 1efc8d2d12aa09a2b2a36f6f6d0132ac21fcd1720a2843ce598450198e2b7fe902e9ded15a78b66e8a897e811faa872e4e391bf211c795e320c1ccd57607c319 SHA512 b82e401533c44298c41bc9a1caaf3f7850e42da151c06a77a927f817810ebf5ce01c49ca81de42c326345765c784bb55e28fbf0f6a5500626f51e58a216b53c4
 DIST ngx_http_cache_purge-2.3.tar.gz 12248 BLAKE2B f83b267f4c19a9d4af5964522695814c164d200ecd4108bf8f6b5c21388eba8af989bdda646dee18a03174211e8c090a04736bbeb44043cb0e19fbccdc66278e SHA512 50a31dbf2216a6fae74a186af56dec4600cf55777e76a10ac0075f609e7737135aab063a64f2590dddcd0369ebebd4a523027f3d9ebcca74f7b4355be1c5dcc0
 DIST ngx_http_dav_ext-3.0.0.tar.gz 14558 BLAKE2B 0d370bfe34600d43a540dd19a386aa52ce135b2eae14e4e108a359d5ff3405939130d1c802062c7523057ec35d38322d3fbed8c13deb58ce7a08ebf9e3f106d4 SHA512 d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
-DIST ngx_http_echo-0.62.tar.gz 53329 BLAKE2B 7d92184f7fb878cb5261be1c68de4432d472469028e20c2150925ab3d9a1c472ef557a11b84ee60d7ae6b48d08b35890c50161540668918492f2092dd0272962 SHA512 240896b1c559a71ca6ca87136d8535edd25b1d65ebb80d46080ad41c09ed1cec9737828f9efe260782294d660cea66cf402f4e75bba3fed26f3a94de0ae2f89b
 DIST ngx_http_echo-0.63.tar.gz 53421 BLAKE2B 613d4f265b9bcf9b4a44a18749314075e797dca4b350e6c4bc2e7ddd52edadc52660504ee57d0c859ec0a20f6b2e425727e5ec4b30282e67498010fc8d959baa SHA512 c325ac4e3f3f735739e156d8c7ada503b34475c62533b4830231ff1b42c25cb0c841aae06b3448b589c2ab35da8d211436ed194d6fd062cad925af8152c5e789
 DIST ngx_http_fancyindex-0.4.4.tar.gz 26292 BLAKE2B a1ed76cb31cd4f7a349bcbe63d75f8e00331d0ba4ee9b7b1df41dac77fe64ebe6c72a6fd5f6ebc9de53e8d3a8a2ad5185fbaa533d8ff008fcf92f6956f267d80 SHA512 bf8ebb188c10fee5e6ebcb338fe20fdf859bb88d9b2b0e3da6f3e2f1847738d30760d2642d0dfe257092bdf2399b561631556a3a8e2fb33dc9cd0c59d371c173
 DIST ngx_http_geoip2_module-3.4.tar.gz 8877 BLAKE2B cd59ebbd2ca47f6af0b22b8b91768053d2c991f7adf19941625e3570d81dcb73989101795d641e4efce1eed37d454bca73d603b5d0e4511e3bd63100c7acf750 SHA512 18dea21e5ae2647bea1fc448058a1b773c936917245edef8d861d5e23ed92e9a3b1ec4ef43ffb2ece7b5899d787910adcf4fbd39f84d7e8d7c54759e2fee5b72
 DIST ngx_http_headers_more-0.34.tar.gz 28827 BLAKE2B 48badf603b93601b11c837057760f768ef2579062786bb366795617635747b654cecafa3a230eec1a3e442ab768fb068867ceb93385b14b6452b621764acfd3f SHA512 2c0c140feeb29f0154a223dc3020ff956f894d63e0232a7bc0ca33fcb26f8b807bda868159ae30b6cac7456ec25b831c3d299ea18e234202ae5d14c1ff471a4b
-DIST ngx_http_headers_more-d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz 28810 BLAKE2B cb71e6b8a9da6c72bc542e837391e932c5803d52cbf01eab0b70f501b620d7de03009a25d10e9ba9de46a6c9ffca109b50dea47cded687412eb55210ba6e68c8 SHA512 80193f95f9754b1d6fb784cde6b4c4d6f72b5cff406c26329a93ad87a5833cd87ef7a8113d719bbe6913fd8e1fb29f438fa81e6dada8c0fc39bf0f2e47fe08ae
 DIST ngx_http_lua-b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz 718179 BLAKE2B ac4893892dd2836e46055d57feb492e3122ab2c3c91e56917e52cb8ccc683469ab77d26990b9ee4a4bb3bf639267cce7ded7b07463912cc5579a7a09730da8b2 SHA512 f547c4f0490a25600b4533050db3b5d2ea595ad72e0737fc0be8060eddf7b5712e3dcca59e4d29999415c9455798e232a7de53a9380cbd38f264b4ea371e86c1
-DIST ngx_http_naxsi-0.56.tar.gz 192120 BLAKE2B cdbfc278f346ccdc0d5407d70ddd4740816d9fe786d3d65189d47e6f3b030c02352a30ed86bf1650139a21a8408e74c1ec7d7aa3512df1428870279ab384dd15 SHA512 4660751849bce303af6010b7257532404710106a94817e78d4bc4b566f8019620f24f30207f1d4366b88132a5124e34b164dc67ed80b6710f4bad66115564cbd
 DIST ngx_http_naxsi-4140b2ded624eb36f04c783c460379b9403012d0.tar.gz 166325 BLAKE2B f80353bfc1f3fc009b847de1c1c5d623a84682efc588649cbd156f669336c95f337442ebf350c79321bf59477215f083817929f13550b22dc7f393583aa16ba1 SHA512 6d6565189d9fabdcf318270107455bb4915d2a43284fb2f77b5cf025a4b4843e990c1c1dbc254e0f3879ca7d30ac7bcd7eb8637f491d5b7f05193aa9865be7cc
 DIST ngx_http_naxsi_libinjection-49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz 2123473 BLAKE2B 69208f09ca9f10f59f53a3e949894ebc6e51b0ed5708e551759fd8fbc002c83f5a0462fd22eaf52cae290992633729f47403b33c41539437e40700fb7763ac2a SHA512 ed643aaed8d70dae028ec3df48be3aa2c03955073039cd14fb6187bf162cfee9131ab3e5900ddc349526b171f4da0e01e13b39a669cb85838c1f254476a3c1b8
 DIST ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz 196994 BLAKE2B 90baeb4fb03aeb309bcf1a987420067ca81843ff9b85b8fc26ba703741571e631826e5928a439a3ae79f2f5e369a3acb2cd803789308642ae757d67722ac7f33 SHA512 ad5424d65909d1cf0c2b64d7a4bc3123f4d3e240f1c9d611f6b6fc41167d169f474c723b1c327d42bd295f973a6365ad32e3f095b8c7c7cddc7e54aea138ca31
@@ -40,16 +37,12 @@ DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 BLAKE2B 54ec1bd0d1cc43cdaafc93ebd46
 DIST ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz 17379 BLAKE2B 4790657b3f207eca460a26f5c4d1139dcd495e29fffedab8d716105e6dc3039cbeeecf5f6005d364470951e25b472860b46e3e08bc9573a5a7b4a23f53532f8a SHA512 6603e15aa33edca5e647fd04b4f008f1729c78c527be262ef481890f37a6d57e89609cebfb7459fad18b249024fbe3722e09473987401e8d8dfdd7cf50e4df4f
 DIST ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz 130073 BLAKE2B 3c93cef79425a46e22ae39adf13d5ebb0e5d36f5d6be8555ec068dd0017918f5355d82fbbe90ba934e58c52e89c2096e24012f75390c7159d1ebacfaaa112308 SHA512 fad2a0d3ac332b6e67c52e3525f6df8a432df3e92bc173190b8107fba7f24476ab9dae4824630299af68c15e856409bd47a3a79fb5b65e03a5133eb90142b8fc
 DIST ngx_http_vhost_traffic_status-0.2.1.tar.gz 179679 BLAKE2B 3f0f950745695997232f4ae07487e58d798a3a4f2cd0ba8d922865a39e010e1282932469fbeee615a115358f1e9e36f67876fa507fbefb7c146d701ea68a864d SHA512 fadd4727ffc56111b443364d90e5b0597f09b25006404b11377586f0ed754f5a85e0b84796360be927bd455f43eb28e18004991f086b611146cd340937a6e5e9
-DIST ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz 380721 BLAKE2B 8a63d9663aa896869345b97e4bb2a9ac93585d6d7ee16891c98f6445b90002ab90989d195399bf90c5a8ad32c4c908794b7cc33fa45183f9069c51906abb1606 SHA512 46451b3c9b7a3c57145fc8e1de9d8ee984286acff2fc3f4e6c4a39589eb42dd686844410312701d167eb369ab5943184b4fde1ef319359e272dad6fcdb8cad25
 DIST ngx_memc_module-0.19.tar.gz 34654 BLAKE2B 536384c264d88535179634d459d3a47b1d9b11885fbce46fbe9fa4df3dce365320b5963c56aecde3b0039d4f9954943d95f25c5f4fada6256861257f82ebbb12 SHA512 a64ec8dffcd011db2cd12b501271bf5c408f2f31fd2bf477b8db4e88adc5bb5732c4c2181ed8378cab6a937869d8f747ef52b22fe256c90df8440b91890edbe7
 DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc8b2b93f692615a1b39c1f327393647f80e7a27e6929799a6e7e3469b61e1cd72f7821f7a820da4dd7cd9a96d85c SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
-DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST ngx_rtmp-1.2.2.tar.gz 519934 BLAKE2B 8745816b879f506720955d6c7e5e8af036e88b3601a680071ffb255a3ec31d69e132b5cc8b493202fa985eb30b8529428f683b5154a0054c0ee990d3185c7abf SHA512 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
-DIST njs-0.7.7.tar.gz 609779 BLAKE2B 878c1a106237d42f03074051d12a2de409a1ce3088ec3fd8a43032183608b68e0a11f438668aaca3135ac2280875f248467d6fa801539fcfc6d1436db1579199 SHA512 3fd9e9b84e416e95dbdffced78eabd76a519cccec7c386d8acaccd0d891dea5ceeb702408d4450107c7e3909586753e4eeb5e38c06657cd8f273180beb8fae74
 DIST njs-0.7.8.tar.gz 613161 BLAKE2B f6b10be576119f418cdbe052a0c82b847d1b43278f4f0764ac7a9c7309162bf48fd60b40542b97e43fa925c87817b19785ffc6c83fa0611ca73256932e8481cb SHA512 086ddb2e5189a8853598870b795bfa788e9e75da9d2502541a49314e8149d7c279acca0709c4c517db26611a416dc5fb989be807cf1697c7411aded1bd5b8237
 EBUILD nginx-1.23.2-r3.ebuild 40462 BLAKE2B fa567a68adeeecd7f8fc1b1f8f2c0fc9717ecb6e7925b1a8466801adf8ad9ec9a15d222784042455c9ae0995ea3f9dcd2dc55d5bfa24957bd1883668539d9d5e SHA512 0148cc685da8ef69bd24beac14450a7bb75133cfe9ccbab77642e1278d131b00080463bf0654c33668da3c1440b6ed448f584bf541c36475a15a3991c2c71d26
-EBUILD nginx-1.23.2.ebuild 39690 BLAKE2B bc9ea5141f66d21cb003b09c37e9a23da3405323364cb3f9fab3c5f161e6b4d2a261a720a3b31e204906b98a6ba9c4da7d614a1e5732038fb6af482ae1664823 SHA512 d2df73e079653c42258661511df7c1ba4ea558cbd28f48b862d721d95726906c3e4e293f4c3f71cb97050b313eba11110091bc04191ba264c99a073ed18ad06a
 EBUILD nginx-1.23.3.ebuild 40461 BLAKE2B 7a6c11e2893e65d21149c5abf6f062aaffcea8d285f88ffbfbce5603c86d9c0ed6d2cb8f7c0304357836fcca4dd36c6b89cd772d2faf2d9a6c9d432086414961 SHA512 0d993b9d066a000382250cf81bb28b6ee5de60bc87e96e7953e4db8ed84c2d220b5c8c6ad5028db82f6ed221ce43da72fe4785eec07c3f4675659a45a9538980
 EBUILD nginx-1.23.4.ebuild 40465 BLAKE2B 8e085ffcae73c70815bbff1e8ab130f216151d26382bcbec2a47fb1164b5ff2d6ae79f1752ff47ebc6a4015db2d2bfcbb28a8a50468c333d6533e407babf2d42 SHA512 84c693c89795831eda35b9faf21ed23817754649c72e2cb217651f5f8098b8adf138bb97763db3638aecb5eff1c66ceca65ee7e7789b3267c0330d2e19582261
 EBUILD nginx-1.24.0.ebuild 40465 BLAKE2B ba7ca9b20d0a448f8f18059be2ff32090397e779a0a2e803d0b45acd27d25e9a469b28c8d19aeb9640b9d8b5c15110502aa2334e67393c222f8a20aebdb2fd0b SHA512 9c1bc760256fca5974dd5e7659292b61d18b629b407a91d052b829dd4f6a70d97a9cfa7c4cc2d0607d34fc8757bd7f75d700bdcdbd1954848a8cf17c1459f43e
diff --git a/www-servers/nginx/nginx-1.23.2.ebuild b/www-servers/nginx/nginx-1.23.2.ebuild
deleted file mode 100644
index 283d53ed7cd3..000000000000
--- a/www-servers/nginx/nginx-1.23.2.ebuild
+++ /dev/null
@@ -1,1049 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.1"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="1.0.0rc"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="68b3ab3b64a0cee7f785d161401c8be357bbed12"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/openresty/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="d502e41996d24a382bd9c632e3ae3efa0a5fca66"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/openresty/headers-more-nginx-module/archive/${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.4"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="b6d167cf1a93c0c885c28db5a439f2404874cb26"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-LUA_COMPAT=( luajit )
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.2"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.62"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# modsecurity for nginx (https://github.com/SpiderLabs/ModSecurity-nginx, https://github.com/SpiderLabs/ModSecurity, Apache-2.0)
-HTTP_SECURITY_MODULE_PV="1.0.3"
-HTTP_SECURITY_MODULE_P="modsecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v${HTTP_SECURITY_MODULE_PV}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/ModSecurity-nginx-${HTTP_SECURITY_MODULE_PV}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="8c02220d484d7848bc8e3a6d9b1c616987e86f66"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.4"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.7.7"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	acct-group/nginx
-	acct-user/nginx
-	virtual/libcrypt:=
-	pcre? ( dev-libs/libpcre:= )
-	pcre2? ( dev-libs/libpcre2:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	http2? (
-		>=dev-libs/openssl-1.0.1c:0=
-	)
-	http-cache? (
-		dev-libs/openssl:0=
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? ( dev-libs/openssl:0= )
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( ${LUA_DEPS} )
-	nginx_modules_http_auth_pam? ( sys-libs/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? ( dev-libs/modsecurity )
-	nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		${LUA_REQUIRED_USE}
-		nginx_modules_http_rewrite
-		pcre
-		!pcre2
-	)
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-
-	use nginx_modules_http_lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_sticky; then
-		cd "${HTTP_STICKY_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_sticky-nginx-1.23.0.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		cd "${NJS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_javascript_cve_2022-38890.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-nginx-1.23.0.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre --without-pcre2 )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(dirname $(lua_get_shared_lib))
-		export LUAJIT_INC=$(lua_get_include_dir)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export AR CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${ESYSROOT}/usr/include" \
-		--with-ld-opt="-L${ESYSROOT}/usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"/etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${ED}"/usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	# Don't create /run
-	rm -rf "${ED}"/run || die
-
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{AUTHORS,CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(ver_cut 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if ver_test ${_replacing_version} -ge 1.4.1-r2; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ver_test ${_replacing_version_branch} -lt 1.10; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX}"/var/log/nginx \
-				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 0221ab7eacde..73970b006c7c 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index 1734273903c9..f0eca7c9135e 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-appfinder-4.18.0.tar.bz2 562219 BLAKE2B 05aeedcfe6b00509f7c87affbd9ee12d72ad2298168497fa957a0ec189f18348606ff29c177f4c3c5b3e9b7c937d67727828b97b786038ebfd03259f473fae0d SHA512 e33144910bb4391beb6ca88e312c592593ce50a40e10487c5b72eca492dd2f7c3ab7324ce62413ad6f3df0025de29ece96b5d0a566eecbc87bd1d0e62c9156ad
+DIST xfce4-appfinder-4.19.0.tar.bz2 577596 BLAKE2B d6d8bc4f3cbbd1c8e31b4f2a9964833e35eca18de26c5e6fb4cc8b8fdfafe832018e1b7113fdef0bd0f88b04a4cdc2cfc70ab84089fda990b6e0c7fd658f832c SHA512 4796eac89c15b7349c390adcb151908d6cbfa89363daea3638066f5d8108abe5f8140b6a070f9fa8689f876fe62645a43be0f1fc46ec40c036dbf1550b7bfb79
 EBUILD xfce4-appfinder-4.18.0.ebuild 915 BLAKE2B f7d50d29ceab8c3f2a35a26a9ffc60d04f45d6cf2bf9eb8bf3a4a63b95403a592a4394bfaea075e6174dcde4e40d418086cecdbd79145fb4d88b2a9254e6dbe5 SHA512 bbb0c806edac85c8525aee9d0f7bc12c33b8bff76d2555144b24f587a38103952be0656f443fde6af176475e3eaa498fe5fb8823031cd737cf0068a47f479f17
+EBUILD xfce4-appfinder-4.19.0.ebuild 928 BLAKE2B 18942f3eda0172d6703f9120efa75553f399879103ed4b59a6ff48a51dbe4632ae4d93a0b6e1be378c5ef237ce058d96bd085321c195763f9e9e01433ac6ea02 SHA512 13dd8a82ed36fd679d0afda6bcb68135c5af71009bd99930815cf4a868f826711dff3e195222a35fe6618459e4dc9dcc0d9c4e4ece6f7ba8a544df56d1dcf7ec
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.19.0.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.19.0.ebuild
new file mode 100644
index 000000000000..f7376d553e51
--- /dev/null
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.19.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/xfce4-appfinder/start
+	https://gitlab.xfce.org/xfce/xfce4-appfinder/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/gtk+-3.24.0:3
+	>=xfce-base/garcon-4.18.0:=
+	>=xfce-base/libxfce4util-4.18.0:=
+	>=xfce-base/libxfce4ui-4.18.0:=[gtk3(+)]
+	>=xfce-base/xfconf-4.18.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 6a35162c23ad..d98dd98c2c4a 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-battery-plugin/Manifest b/xfce-extra/xfce4-battery-plugin/Manifest
index fb3863b6b394..40845d068cf5 100644
--- a/xfce-extra/xfce4-battery-plugin/Manifest
+++ b/xfce-extra/xfce4-battery-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-battery-plugin-1.1.4.tar.bz2 458485 BLAKE2B 5af18d0f8944afdc6c93852220cd87020d7ea18ce27e224def5ed71f3d9490e2e30982bbff322a76feb3d6464888a8cd64e40c9938484256432537ea1a150009 SHA512 6a59630800a79d2c62434c1c50f5d891ae9ebae48037ea0859d6edd66c856a76e6f11c6e8866ca3c94ae1e5b57bdba4e9fadd4bc92c7fcef278cd2f7b82203f2
+DIST xfce4-battery-plugin-1.1.5.tar.bz2 465191 BLAKE2B 6aa8f1d3cd3dbf3fe29fede154ad51c7cf521c04191699582678e930c2ff0a20c2f50bda22d9576b1f29b595767c5ee1ce4a7ef60cdf3fd69271796d2af8ae2e SHA512 e6e09a4839911dda50fe1fed100d5fd46f6da47e5042529c2cbffa5498babc838bed56178baa23d2162b70cd6e5f005276d4b9f1fc44a1891737c94c2bf525d0
 EBUILD xfce4-battery-plugin-1.1.4.ebuild 947 BLAKE2B 9597ec94647ad333f7fa3ac115be76fe23774371985c604bce0d0c1557e1f2943d33447c25644ef0e7b645ddac8c836839a77dc115ce1f9ac77cc9fa6eecf85c SHA512 4ad657d1ed698f4d85270990fa48649257d4cbc395ff9ac80e750bb51dbc3ba6e2fba0f15ac78192e777373126060ade7dbcec58b0109ebda328ce34786beac8
+EBUILD xfce4-battery-plugin-1.1.5.ebuild 1024 BLAKE2B 65c5bcf9f3f8e60528eca06b4f704e732d159f994782b3adaff97bc8ce3b0346a8a946e66d5f1703ad4ecabd635c8c2fbc48cbf725747efe535c1b926a85dea3 SHA512 c8198bfdc1734bf2a0b7e700ccafb90be1dd994f19160e8e5d0b1928c68be6b65d8b3647c034a56882e80b824dbb8f65cc28ff28b537cc89d0a663de0819cedc
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.5.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.5.ebuild
new file mode 100644
index 000000000000..36a3ac9eb607
--- /dev/null
+++ b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info xdg-utils
+
+DESCRIPTION="A battery monitor panel plugin for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/start
+	https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/
+"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=xfce-base/libxfce4ui-4.14.0:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.14.0:=
+	>=xfce-base/xfce4-panel-4.14.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	if use kernel_linux; then
+		CONFIG_CHECK="~ACPI_BATTERY"
+		linux-info_pkg_setup
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-calculator-plugin/Manifest b/xfce-extra/xfce4-calculator-plugin/Manifest
index 965a58945da0..518958ec19aa 100644
--- a/xfce-extra/xfce4-calculator-plugin/Manifest
+++ b/xfce-extra/xfce4-calculator-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-calculator-plugin-0.7.1.tar.bz2 402401 BLAKE2B feadd3401f5e7b3bd1bc9277e04d63329fa0d35583c6af959fa350c6622012b4089fd1143dd8f7e987cde8a6b313fba75cfba751e2afb6bcba43d9787d17784b SHA512 05544e5f0e293fe44ae35b3e11a2e6fac8df13743649d0702c01c6a4b2df0557f8f9712acef6bd51aaa65f5542234a6a649017bf2fe2a6d2860ae2e534e7cff2
+DIST xfce4-calculator-plugin-0.7.2.tar.bz2 422611 BLAKE2B 72bc2e8414b4f638299d42d8e3cd808949c966e40e96823ef5d47ba66e915429a66c7ab45acdda1a930383bc7cae63c2323e05ee8f9a5748c7f0e6d8f58b63e0 SHA512 98fa51ff0afbb09e3066f629113f6a584c5afd9228c87ee67afd7a56b065060ece16ee646ec6a2c685907a0d9733cba19cbf25bc034e009a013af2122155cc2c
 EBUILD xfce4-calculator-plugin-0.7.1.ebuild 785 BLAKE2B 8c47dbf9344935cb2823299b22c534390ca74f5de2ed4d22fb93a03ef55136d60f26f8d8402af56d8f3fb18ebfca65868d3bad13ab1d972ddc50a6a674213ad8 SHA512 07501a338dbd6019302fd41ef3dc6a4e23ba35fe8a463bbc792508b7a828ca50ee35b193ff7da5ae826af20d2693359493fc362c8a379ee2d71239ba7e8f26a1
+EBUILD xfce4-calculator-plugin-0.7.2.ebuild 894 BLAKE2B 4b302a2ad3df5c5fdbdf4ab896cb6dd421056dcad728850cf16416a8789f604fe875ebed75cf0d9a1bb67e9d449589b6011e2feb602782561659d922d74fc9f0 SHA512 f6ed29e0929888acb2dbe4f3ffd0bc4506d5d659a04fa02a1b5d00abdd6090d0247a14f00dd551225a93822eb38be6bf672ea3219c844a1bc3665b6ee51bd3d7
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-extra/xfce4-calculator-plugin/xfce4-calculator-plugin-0.7.2.ebuild b/xfce-extra/xfce4-calculator-plugin/xfce4-calculator-plugin-0.7.2.ebuild
new file mode 100644
index 000000000000..14de8bbbdf6a
--- /dev/null
+++ b/xfce-extra/xfce4-calculator-plugin/xfce4-calculator-plugin-0.7.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A calculator plugin for the Xfce4 panel"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+HOMEPAGE="
+	https://docs.xfce.org/panel-plugins/xfce4-calculator-plugin/start
+	https://gitlab.xfce.org/panel-plugins/xfce4-calculator-plugin/
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0
+	x11-libs/libX11
+	>=x11-libs/gtk+-3.22.0:3
+	>=xfce-base/libxfce4ui-4.12.0:=
+	>=xfce-base/libxfce4util-4.12.0:=
+	>=xfce-base/xfce4-panel-4.12.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-fsguard-plugin/Manifest b/xfce-extra/xfce4-fsguard-plugin/Manifest
index f63c8f205387..c021b453feb7 100644
--- a/xfce-extra/xfce4-fsguard-plugin/Manifest
+++ b/xfce-extra/xfce4-fsguard-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-fsguard-plugin-1.1.2.tar.bz2 402703 BLAKE2B d7d4b936510d7cdc153d47c54178aebfb9f3339f6413a1013a18301806e05cf76ff2439e7b1e00637407c113149f9e72632e66e01f287e817d93ba5af208947a SHA512 ff42f3d92292357f432a69fc401dec474b1eadabbcd7602f4453f7567faaa623d3672664c3a2baa98ea4e522c6a607b5a40327c5fea33b2d8535f15a4d511ebb
+DIST xfce4-fsguard-plugin-1.1.3.tar.bz2 409310 BLAKE2B 6ad78241e49a667a7a9a2ab98daf74badd564b2aa20235f93abe80c9d30daf9b463392b2fbe044758e08975200f727eb78c9111b87c472c7bec9208f466f0c1b SHA512 4115a86a6ba38f8283752bb45527dac03b66ba3fb9d708391d9d98d9ecc97169ecbdfc515a01ad2ee2915144037e07ea1f9c8e9b831d47deba6e7c86d0f8563b
 EBUILD xfce4-fsguard-plugin-1.1.2.ebuild 837 BLAKE2B 3365606792973baa209f117d6219b2b579e715b618774a2e8c18bb9887a70d585d1da4c70d0b1158bb97defde236300c1fec2adf5e4230b50e06d4ce304fab85 SHA512 65c6f6e90d060dac0013e9b291de0e55c98bc317898551c8b6cc25d2ee92f9ef9ca1a5a8a69299e67dff65e2230526d42b6a023840f61adf668c579e6cd6c16e
+EBUILD xfce4-fsguard-plugin-1.1.3.ebuild 946 BLAKE2B f41da8b9a57c4a0f11b40528b1f8fd2eef2c2a4c3589d208850f010fd90db9044c30e6bb70dc645d8bba504efc209f498ff061c607008ec426338d2c17b4cf8b SHA512 4b9ea0039ad441cce037e416baae1fa881556d1f9cb52cd3e85ac9faa745a8d2184f1ad6bbf2033fd69e0453a2359862470c8418ca79df4244ade2cbff03ccc9
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.3.ebuild b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.3.ebuild
new file mode 100644
index 000000000000..826f77ab8c7a
--- /dev/null
+++ b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A filesystem guard plug-in for the Xfce panel"
+HOMEPAGE="
+	https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start
+	https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/
+"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0
+	>=x11-libs/gtk+-3.22.0:3
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfce4-panel-4.12:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
-- 
cgit v1.2.3