gentoo auto-resync : 04:04:2023 - 11:22:14

author: V3n3RiX <venerix@koprulu.sector> 2023-04-04 11:22:15 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-04-04 11:22:15 +0100
commit: 7f6382ebb44b75c53021d4c4ab77d6b34aed21ac (patch)
tree: 4d92ef3af5a26ff8a8a5a1ec4f21d18c65f56fe2
parent: 41e5b5c1f11820df590e0a245bbddf224bc07823 (diff)
191 files changed, 2599 insertions, 398 deletions
diff --git a/Manifest b/Manifest
index 4067fce5411b..317ae4a35b53 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29406 BLAKE2B 1d603a41dd8afcc6c690a5033613c328202749554417734984e7c949ab6c612737f999ba30c087384aeb5582c9682e538461a9ec7c6ca8b3d1244ca68398d848 SHA512 4c0ec7c85ea2e03617d45515491169bfff9bbe793b2f3426cf47e9d39dfe619b19e56b781eac3b6fad2a0179fbf5c186fbbc80d3e7d777d855fab80caf324eb2
-TIMESTAMP 2023-04-04T03:39:44Z
+MANIFEST Manifest.files.gz 29444 BLAKE2B 1b7e29b0aad27016d9974c8980774130d849e4ff3238e0df66385c3a5e0eb0cef83eeb30f45bd96e417ed2363d5d9f0f86f191aaa2fa0aa4eecf03dab326c42d SHA512 2f3b4d9680775206cbb8e4ab18e5de5c799af49aaa10e34e9c4e7155deb11c7ae0474f49bd81e1b0207538881fd7872aa922fc7d7e522da789eb4ae3e722cb9e
+TIMESTAMP 2023-04-04T09:39:45Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQrnABfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQr8GFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDQUQ//UBVhnBwgTvHJaYbzOHAHtYjik/r1wy++luBFTVhzJOmzEqDZQ/qwPvIz
-v3oteZm/vZJ2ScDsrsCkoToXF1aZJufd/qtK99SiZIIoehJO8Et89cE7/e+Z0IW2
-jXVn+5rliFV78gqokf8hxJ3db5CUsfGCUt9/hfPyMu5GLiAKyDR/T5xb4tvidlY9
-Cjs81lCwDdeEAp9nT0MuKJQzxt2UzXif5GY0Hu9Zc6hut+H8op9YGVkIrgvI4dxm
-O4Dpx6r9oyHaQDTUHjBgOvpu+mfiUKlkcpcVsUUGZarI1GIchxyviuVUE7LgqwQZ
-XuZBccufZL9Fga9v/lGpK2MYsYD8uBcYontnQuUADpOHqWNSlR42ihszd7wJNdV9
-sEAlDP6pHaCMfzzwnBGpx4msXVfY+TyNENX6lvh+vIRqYgWxi2lempNh7kJxJqLM
-3/W6gbBN65/7panPkUDS2gOCvVBQenkhj3yVLwrmfZRoBLxC4X/lJEykrPF3jEY/
-IWYxHcuBosng4tCHL6iLiLQazZq2+83hBxlPt+mtr1QG7jx5QMGGzwO48iwOrlVC
-u7Er3M0lS1+4ure7BIj7XX3ELbJ5LfX7yxEBj1WAHGAJMiyuHePylpRlXhDmFWO2
-ol7mv+dfw6i8LSCreV4zOG2gUWuvQTwjzDCqHipOKwBlyxrLGUk=
-=nLJ5
+klDZ0A/+M9VR8+EcseGVNvL8Mi9+9aith2aZgeGGcHhHeHAFynTbNVt5ryxsSt5c
+E0RnZ/7RsuN2ipcuxDRx2DS4WnUf/bZf5eO3e+cAeGQ2HEJ4WkZpD65yCIE7nwHR
+aEWs2px9ShgkkNbFXEVnUT8oJNfDg6MaexxD9/sdN1P9sD8B/6EVYTL0UyKu2EaU
+zzw6m2d5x0kgXyP4+jMmkpkBhtnNSwalidCMJhtIxNOpbjIQjsni6tPIoZTJFEZi
+S+kEEISQKlp8eoAvLpSIS3CiQHyz+F3iO7vIfQbHEa8+dBYHvpAH4I5mm/xzzsRU
+XIBZGbDoUd0BgOI0V/0/A0qWM6vfdydUzDbYk6ZXzgOAEMPUoTdFx1x1rJC66sRR
+DSXFs+pzJtYA+CVP8cOdo4o9X/45xxo4+/VOdQv96cw4M2YvDOrSbrpfrpY4f30T
+Ktq/SNa99H5jnJXdNE/FCCT27f8217buO9AnmXdox9W75DO9rr7gB2ekWC4PXRlU
+hW/y88+n3c4sn64MbpDydqUyYWF2KWDi2IWOa5wMaINwn0RNe/BH2JGZJe7n5dr2
+mek7ikUr5iPwbK8aT09ESqYM9jBLef30gPJ6rdlYavt9mQr7KuIPkokD/uObFi6T
+N7hy1kYTs5m007On/X4VqQmx3rKKzL9CajReFI3/ialJ5QRMZ7Y=
+=Efgp
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ab22001fa83b..bf89275242d9 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f4ceee58dc4d..5571a73e6bc4 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index aafa2786d736..88672127d70e 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,6 +3,7 @@ DIST aws-cli-1.27.101.gh.tar.gz 2390624 BLAKE2B ccb01bf7d3349c709b095b7a1fe3b0e3
 DIST aws-cli-1.27.102.gh.tar.gz 2390826 BLAKE2B b756ebd3f73d24f3456f4a1ece5230bc91335e2fd655220cfdfb85a4d853f6e18370adbf83ac650e6e5b375c681280bea414a1411fcda4a952f3788ddc11f1f5 SHA512 9a4018224bf1cd22377650ac5beabf44db3069196ef7bf21880edeb2e547e85b1ef9febb3355f22957d8c69e321a3be934ccf01ae817ab2151e1e51a503ad1b1
 DIST aws-cli-1.27.103.gh.tar.gz 2392724 BLAKE2B 294a0cfc4d5ad4a258edf38728dced04d50937cadd5418b5be8fde36f75a3c0ffd8367db19b79ecbe0adc3467a09d8552222625bb0e6d6fde8d43ea0a04b7255 SHA512 771f28f6a6c3526aeee6b6487a018093b7ac60f4ecab4dec1af70a9dbc90ebcc39b56ffab6c5f3b965e27c545accc99910bfd28639f540dccb19461ccb237623
 DIST aws-cli-1.27.104.gh.tar.gz 2392876 BLAKE2B 860f0d8ddf4c283d7b4e98ded1c9ca66b23e6a63107be0810b1ec3a513a05196aaa3d613a0597af84f4637621b05ab30e89f221bd47478342693611be5ee306d SHA512 57e26dcca866ab7c30abf0c2e15ea7ce617c0abe123a983157ab188c6c7c8d217d8515f1c9e329ae1fd53561e6aa6711e2ee50d9258fe3aadeca7a9b5de92ac4
+DIST aws-cli-1.27.105.gh.tar.gz 2393577 BLAKE2B 03c629f92caeb1c1ac7d11c214da1160b9147c75ebd88bf82fd4ae07dde2e4e5d6a8974bda42849afaa2648b2121a723c1f3112cece81e5cc21ac4bf7929f9ce SHA512 2e0f3a9f034d84f0f20c0126e243e02786222cff045c562b59a8b5170c37f4b5892641cfd589e6b40278f3b40522bf8aa6df7a06b00eefa53337bd24e52d56cb
 DIST aws-cli-1.27.89.gh.tar.gz 2382599 BLAKE2B 3a2dae3cc1928e149dd605de1e9a350989e1cf4f813dc14466ba40c0a2747e69b6a8c5716d48f2526920798f0d341dcaa7ec0c2fd95af1b5decd3830814a243b SHA512 9a90c933e5ae3f25271ec369607cb6c44adf96dc9d324205714c9790b6744d7f2c8e4c6b901d4bb4f58b6871c315e0543b3f846cf530e7f95ed31d196f8c3326
 DIST aws-cli-1.27.94.gh.tar.gz 2385480 BLAKE2B 8712056c53d704e368f81d38779201d0ef28d0b633ac4a877957b5d6338a6daf45b5408dcf0bee3f6c48a0b10af625bfee835f63e837814b42ec3a57745e4d61 SHA512 48dc09f0af71eb9b9d93ffd2c008511e2379f2a47d4913c6c4296804d3ec3c30a1811564c017388329cac9261b1c3021fadc60771ca9d0952982401f5e4f7c59
 DIST aws-cli-1.27.99.gh.tar.gz 2388286 BLAKE2B f9be204722470fdbc5b4a1f7453370033c78800dac6d4ca63480705988e6bd02899f0646c034f39a3e87a2988f79d9d23989ba9f4036e931102ca4c0e46989b1 SHA512 a07ac30eab8cd8f19f35bb7d203b6ef150c585a61df63dfa54d469591e57766f3cbdab3053a155837da82d1c9f702302f4821558c7b7cb9dc985fec7a58dacf1
@@ -11,6 +12,7 @@ EBUILD awscli-1.27.101.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb2
 EBUILD awscli-1.27.102.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.103.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.104.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.105.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.89.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.94.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.99.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
diff --git a/app-admin/awscli/awscli-1.27.105.ebuild b/app-admin/awscli/awscli-1.27.105.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.105.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-portage/Manifest.gz b/app-portage/Manifest.gz
index 1b9ac7551621..70bfb6bab948 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elsw/Manifest b/app-portage/elsw/Manifest
index a5f50d0c94c5..413cba742ae8 100644
--- a/app-portage/elsw/Manifest
+++ b/app-portage/elsw/Manifest
@@ -1,4 +1,4 @@
 DIST elsw-0.0.0.tar.gz 9857 BLAKE2B 8948b41bd163c393c735f08e94440905cca93078d8eefbb7b7136542a54a3139baaa4b40725667239fd249d9f569ececaf13631162502e3f58e5b288fdf1ae4f SHA512 9e0323ebdc01e6e2af2e021f2bfae2f977567697600167860de7a95d8c80e3119214524a6514114747bdebd269bf68d14f2e0369765d7fea62ae0adaf060e94c
-EBUILD elsw-0.0.0-r1.ebuild 615 BLAKE2B b4cccbe945b62bf866665ab951e114c00543ebbe445da12059855f2bb6969d8cfa3587f2fe26a42a3fcdecd3188e4eddeeb35f9e7c06f3cfbc20f4986334191f SHA512 dce9198d691ecefce094890095aceb8a812e1af781d5983173c182a5ade72fa4e23b5920ae89974cfc6635cf9f0c9d2f7bf36db0032de3bdbceece3b43f75f52
+EBUILD elsw-0.0.0-r1.ebuild 622 BLAKE2B d284da5336b2a2241b86aba04cda4d6a3499525be1d89dc824349de31d189b3d401134578182c4bda195800ab57cc04d974c7569f77abd5359fa48a57e5455ed SHA512 59d7fa116fa86c93aa5cdee56e991e0983bafdd23fa4fb5a4181b403951d0ef101974890dc686a46103558a26fb236dbf3f33b20e07c3e86b7c017344d6b1c0c
 EBUILD elsw-9999.ebuild 604 BLAKE2B 8288bb38f4fd2a2ceab00868f6da6c32cff7e36ceb95518e7c3978644623daec88048041b92bae42c75216afa7d3556528b8a752c3bbab80870f646b489c72f4 SHA512 50f6baee9be8bfc1bbbf5b1e47553be3b5054b983ae151e95a86196a36fd6429e3652fb9bbd508dade32ef1ae03ac338cbde3e09e91345b55206bed5aa55a3c8
 MISC metadata.xml 569 BLAKE2B 31216d894073274a09af9c69f3d1696ca5e2003eae2740888574d1c9d5b742996719208d9910562f3cc3d3599c867449fd28a444fabb79f2b77ec0f3b80615c5 SHA512 c90f29a651ca6b48df95caefcd9b5fc38c91c6e3254ecbccc0cf5055cb30fc6f0d3fb524a8f7f56afb69d91517032dcb04b54456381ca7f2aa8b324c701c90a0
diff --git a/app-portage/elsw/elsw-0.0.0-r1.ebuild b/app-portage/elsw/elsw-0.0.0-r1.ebuild
index 1e0d5bf49807..1091938d70d0 100644
--- a/app-portage/elsw/elsw-0.0.0-r1.ebuild
+++ b/app-portage/elsw/elsw-0.0.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/xgqt/python-${PN}.git"
 else
 	inherit pypi
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 37247cbdf801..6ebf16def837 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index f430c29797b3..529f654b40de 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -5,6 +5,6 @@ DIST sqlite-doc-3410200.zip 10633275 BLAKE2B 1323179d04b9fa21df4ed93ad1aa89ff943
 DIST sqlite-src-3400100.zip 13725560 BLAKE2B 24d2efbbf7f8f35888b1e53c98f9c7fece9b1cf0b175bf49b78869253aa753ce47e2db67247183c07368e69d6eb63a6e39c06b212c8fd5ca36c892ff535bedca SHA512 78f8c6396bf8da090671c6f4c41255e60788324fccdaad906c53610eb6e37705f4d25c7f84da3be00b511ddf9f2e0545901f33f5ae4b6e00b1ea9413af095299
 DIST sqlite-src-3410200.zip 13836230 BLAKE2B 4edcd65728143b1ea27abe65db8c8353dfa309858e6f40d70f3c376ef9e5613d92c41ed5a3c3282cacef8a29a434e3881f6e47ba5642820331170ceb69321d86 SHA512 28cfa72f2b39d851c38fb757a0c6d0696c22548792ce2fa1be5e2f6084e4bf0a5fb216902b59ccba5b6ebaf140aab954ed7676d84841b58ad063404a119a0c17
 EBUILD sqlite-3.40.1.ebuild 13018 BLAKE2B cacf271b8d62005ff052e2f76e64be08d772807e24c7609cce41e610633faceff5ed3583fab6e15489d8ee79f8643b637accbfb05aac1d537ef48529d663b8da SHA512 dfd0999b6bd41f54829d8d30679ac9592f9ba239864a70d3c1c79d09f173dace94dc9b23b15b94f2e6a9ba336f76b3871a65d901b28e58ab1c1080c128bb897e
-EBUILD sqlite-3.41.2-r1.ebuild 13055 BLAKE2B b46dc8bbcd9ba01c1d0a1d7fa7882e097d8d231235c5ae4786e94b68264c9c6fbcec67f81ea14a209c98c828d159439b35ac84814dc6f8c32829808de6db67c6 SHA512 111ecbe9049636d4ae89313ac9fe8281467e0b7befb2a1b3ca64f04461e5b756618cf02290b293e07c60a2ac953282550ebf3a0699123063e2b036327783e7a0
+EBUILD sqlite-3.41.2-r1.ebuild 13050 BLAKE2B 95e6bd038d07e5559e09ad858ea9cf06003219bd41fd8d76939e2b15d292f032e67f5bfc6805260e0f586951b965cba8583558bc60f5ac1f3d190c9f285e405a SHA512 48b0447186218f941ac5970358f905b8c6e3857f13494e24b611b77acd52a1afd189d37082de7493903c5f35a3b151d1ef2228d9fa37c6a8dd13dcd6555a8ac5
 EBUILD sqlite-9999.ebuild 12967 BLAKE2B f6724f1c26d68d81390a6acecbefacae560d4c396f870749131202fcd9c59262fa07bba6b3629ef9c988ca8758ba29927df178dc0d35c717f9799682ddf6e344 SHA512 02598d374b55edf52ea3641b06812b554f80beb48137166b81b285499b92872574131e1afef3ab5d3ea6b7791cf1c2e47e86e144c2e2ad472be7adc07229353a
 MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38
diff --git a/dev-db/sqlite/sqlite-3.41.2-r1.ebuild b/dev-db/sqlite/sqlite-3.41.2-r1.ebuild
index 95cbc793093a..994648f6fe83 100644
--- a/dev-db/sqlite/sqlite-3.41.2-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.41.2-r1.ebuild
@@ -24,7 +24,7 @@ else
 	"
 	S="${WORKDIR}/${PN}-src-${SRC_PV}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="public-domain"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 8522b7231e2f..2927ed42d764 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/byte-buddy/Manifest b/dev-java/byte-buddy/Manifest
index 7086d85f812c..dd2c8b272741 100644
--- a/dev-java/byte-buddy/Manifest
+++ b/dev-java/byte-buddy/Manifest
@@ -1,5 +1,5 @@
 DIST byte-buddy-1.12.21.tar.gz 1931819 BLAKE2B 6b37b21d5f31c1564a3cc4d30870a7eca3c4c0512815db881a20602dc7ac970145dd9cc2bd6af4f2fdca0ff542b43dc675376c91f7ea7fdf3ea306112eba842b SHA512 9513caa9a5fc0924aea46e8de21ad2ad90320a582ad17be93f6305eb27f98d3af2c3fa09565083b5d97c0d9f0a1b0a9c7105738c4b65616e78bf2e7657c4ee76
 DIST byte-buddy-1.14.0.tar.gz 1989303 BLAKE2B c284f54ebc6bf67e4706380f0876f403fcf5ae172a690888d13d6b3399cf41bf1fd8890bf15059f71a9457ec6343254ad1f421f8e4975aa70dd9a2103ab59610 SHA512 e6ccda287935b5ff7104d5c0e4904b0595918a21bcc90c6ac5b2358cc0371b22a4fcac2a95dde9e377c5d1e43077c8b57ea9520a9093b2380ab53c830f107ced
 EBUILD byte-buddy-1.12.21.ebuild 4845 BLAKE2B 1464adfb8d4e25f149a6125e95b2b1befceb4963f66df40d42546fc39874aeb70b93949616afee90098b2b473daa8e53cb7c2047399ff9bbf74902ca00cebe8f SHA512 4c1a8dec6ea9a423b5dd45926322c431347631ec50223cae1a0ba63b9667d361c44dc3118b5a2da4a9c6dbc7a5070b0b6e04adbb2fccf48a429169dbb36b5a19
-EBUILD byte-buddy-1.14.0.ebuild 4846 BLAKE2B 0e4e0561f4562c2d72542199585d74b2cd402f207e0c973a8c63c6cf3252c20b21baa8e7274ba5d74a61cabec2346916802ad91954e5731ae4b229275fe118d1 SHA512 793665c7cbbde6575862cc0a42fb0a0e2b7ea42beef699d4c4df3c8056293e923d69e57a6f3c53d60d02bec2e5c9c381002047a43ef1dd4c5e030e21136c1d6f
+EBUILD byte-buddy-1.14.0.ebuild 4845 BLAKE2B e18ff465a87146c95e62a90951e52b390e4e3b5c25dfc6fbd8deb63c5050e9cbf20ceebd247c3f0448c8cfc9922572cbec892ab7b68aea7204f833fc8d196e26 SHA512 434691663d4381eedf6224ad0dd4dabf79a73ec6348bb8729069723ff246457bad62ff0024035a12abc536f05b1d148ae003f1e1241060c87545425679252c1e
 MISC metadata.xml 440 BLAKE2B ef73e69de33dc6bbea38c81b8744fad5ce4764644d9cc6168d7c0f175856e30c3a577ffc597f25f8caf26bacfd80663b55eddde047a346fcb582d883269233b9 SHA512 b27c92e768c2783c90c8b4693c3265a9533a09abe76b2b3bd54e3865d270eed91414fcd89513bc30feb0243ea21f63d354b907b74eb18e98f899811101a6c956
diff --git a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
index 24240d077be8..ed2c40b5bb64 100644
--- a/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
+++ b/dev-java/byte-buddy/byte-buddy-1.14.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/raphw/byte-buddy/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-11:*
diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index 1d583f326306..683242aa66ad 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -3,5 +3,5 @@ DIST jakarta-activation-2.1.0.tar.gz 118866 BLAKE2B 169457c88cb99bbcb712c9c6d2c6
 DIST jakarta-activation-api-2.1.1.tar.gz 127696 BLAKE2B d0f89e64a02fa88e251ab6f5eafa1001c987147c2163862e270b36e86c7c811bb32bfbab1aba32c8c4b8e7eab4eeed7478618974191b2f5386a0194a6a556a19 SHA512 95dd5b6696cf3ec66ce843334375740057c37dc5b4503173f607c95bd6020e8d0b8f87ec13b6d9be4d397096300cc0acb323b5700ad7ff0428a178272c1da41f
 EBUILD jakarta-activation-api-1.2.2-r1.ebuild 1318 BLAKE2B 71bb89fe608cd872d7e64983e23fb95d872c48b15c084578e1b9ee75fa3d0f082d683b3cd1cbe37878273c1dfd2a41ff503f4386a22bd02b29f2fa5e061b6417 SHA512 0bbc0afb65d84e25ee3fd9ea64fc9c629581f7553cc22c0b5c09a91cf272e4c60b7a6d352c88c4f8441d139849edbfd644b05f4595353f586578b80935df16fb
 EBUILD jakarta-activation-api-2.1.0-r1.ebuild 701 BLAKE2B c2db36550fec9ac2ff7cd6fc12d8e3fde9d9763ab8044844d339533374593306f86e2ab1e5817a9441a6eff9aebdcd670e17317d3f25d72a3fd9daa99d73d8f3 SHA512 0cbfff8f7e559bda9b6ec241c0c17624d1cb7b932396c580db35d670a5c83de65472f277b5ad357b97290d35297efd3818671f5d1331dbf894eb04c339f4d730
-EBUILD jakarta-activation-api-2.1.1.ebuild 683 BLAKE2B 30c71c982c4986d013e9415140bde63739ce666a8e69c10c93b48d9c0ae5281a666d5498159929e0fd623186e5252c365f3bb763c00075dcb363b242fcba33b5 SHA512 52cfcdeb35534067df68415b46617628c44a1a63c9db0eb5e16df9e0f0c5972ce459a22b3d0eb61a0f05ca041adf794e752f8cc4eed4d597c54ecd6c0881164c
+EBUILD jakarta-activation-api-2.1.1.ebuild 681 BLAKE2B 07d24ea06ffe0e17b3c4645f04c85d385e5efeffab1f52f24b5fdcd58d71e438d0c09accada8d1c75acb181796dc7532ec5caf1f499ae1032d8c52860f33cb55 SHA512 f7b9ee69a3bb8a8637978d4fe25105084e0ca9744987bb99da2148fc853d79d083925f096aec44d0eb55c7c822c6414a040902734f59ea2ba58b8621077bbb6f
 MISC metadata.xml 364 BLAKE2B 448ad0f93216312753658b97fd1cd9ff50754cec6a892f36e228e515be0a360318fed182eb99b131d3ccece5e65bc09a0ec9ab6759a412e0a5f9de68b2c1557c SHA512 98caf2cfedd7ec5bbd34d650db5377ede7e44c3d2f359cb7e86f0412c2962f7a677761002910db9692cba6831a108e819888dce270eb63ed75d73d4835a580b3
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
index c2eded75a497..81fd0c8051e6 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/jaf-api-${PV}/api"
 
 LICENSE="EPL-1.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jakarta-mail-api/Manifest b/dev-java/jakarta-mail-api/Manifest
index 1fdfe9929160..d2d5dcd88c8e 100644
--- a/dev-java/jakarta-mail-api/Manifest
+++ b/dev-java/jakarta-mail-api/Manifest
@@ -1,5 +1,5 @@
 DIST jakarta-mail-api-2.1.0.tar.gz 1072862 BLAKE2B dcfe0cbbd777dfe2bb703ddc67803402a6a617f6956822e574b7f9b01f2541d0e06eacb3cd192b08205a6ff8151c7a93ad0db758a7df0eec0085e3964a3f88b8 SHA512 38d3e0476073b4faa732e6840d251f9ec90c42a7558b1ac628e83dfdad65f74c8cb3f87b6e1964f15354b5bcfee7fce2d0bdee20fa49073985db0e4401bc7627
 DIST jakarta-mail-api-2.1.1.tar.gz 1214949 BLAKE2B d92861ed3c957db8d7fda2ec25269ed7b3ec27d55c6b8865278cd6b1dcdef750ecb126136760f15bf86216c14bb00a856a60719f6121ccb87b41523662754ab1 SHA512 e367c27d85aa9513ab1a4ff0a1eb9ef947b6fad6b0c24263c5f0c0befc8f152e193eedb4a0c9687aa3decac07615094904639e11db395d25dd45c5d9fd8677cc
 EBUILD jakarta-mail-api-2.1.0-r1.ebuild 2293 BLAKE2B 1ec3e487f4e1f8792d0d7c8076d4a13360ebb75fcb7ec2c5f92f2d040b773986be280cf5ed900f63482b6f385d261d38120da6b863d8670f464f480eb95e6d75 SHA512 f3066baed89428e280d1e543077dae08c838714c88e3d7509edbc900f8b03e1b3bf8d3127296ff6ecf9d7456bb28f5e17fc9da847c51175a18ac70d90de5d52a
-EBUILD jakarta-mail-api-2.1.1.ebuild 1962 BLAKE2B b70dc393b3f04bd51250badc48b5b9d02799e698640299b50157a31fe3655b6e024e0f9ed33a8cb9ccf0671e7b41723ed1a0d7c2f4c48770806d616cefd9c211 SHA512 ea740ca3b0fe3f551c807e10a759cbc664cdc9edb96cb5e0ddfd785bd4d765d3be21331002cff5505d706b0bc67b4656f9bfd891fa7cb5505f88fa08dd7e61fa
+EBUILD jakarta-mail-api-2.1.1.ebuild 1960 BLAKE2B c565b2472138787093cb687bac8eb13be959dee3813cf111780fe12a520145918b7a57b03ef6579818ad300337495087e8aaf7befd95dae5b9fe4077d91d4cf4 SHA512 15e693d6655c8e0d68c03bf4e4a166311823cbdfb24e0e0b72399da7add47b7d9f5af3a8c1e9ee1398ef2c0af02b1fffaf31b2a9429ad4bad0a84cfefadc42ec
 MISC metadata.xml 541 BLAKE2B 4cef0be3e1f59957b3e9c4d1fcabd325f72da186319c5637c7c39f77e1413a3d93c8735bcd197d9bb9503affe9a9fc3e1ec594af0c1007a56b63a97061b11d5e SHA512 834f676928f44a0d0a72c3726a90f7992ead5678e0215e5706501facc75e50fce4b630b09640562329417676a82e8b1c1a357c512517d72d28c37d4d8d939eed
diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
index ded09b444ccb..9a5fec2d653a 100644
--- a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/mail-api-${PV}/api"
 
 LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	dev-java/jakarta-activation-api:2
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 2f403f617793..19f6c2344d43 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Type-Tiny-XS/Manifest b/dev-perl/Type-Tiny-XS/Manifest
index 9b483f53981e..35e9b4c56abb 100644
--- a/dev-perl/Type-Tiny-XS/Manifest
+++ b/dev-perl/Type-Tiny-XS/Manifest
@@ -1,5 +1,5 @@
 DIST Type-Tiny-XS-0.022.tar.gz 81002 BLAKE2B c2d2feb551ddb4dd4cf558732692a8026923cc0da184d19b9263bb86a948dea8a7ba521598cedb00a26989ef2bf14340f975ce57bfff09997cb16d55f4bc88ab SHA512 6774980289ceaa7aa8517681cb2d4638a0020b4eb584d6e281d22edcfff829131f2472a4982c1d044e8aa96baf71381bed78d02a096507c7bba3ca137e63dbbc
 DIST Type-Tiny-XS-0.025.tar.gz 153300 BLAKE2B 9398c44356543e56f4cc52e68d9a5e766e9cfaa39dbc0eb2e882edfb56f181817775bc03a3d1c003fa60257ee4dacc4606e02777df595af61ebf3d59a2d26f08 SHA512 c990733efd4f057730ded8b7b2530251254ccaf1fb4398ff31ba12fe41c61cb24e817be20adc29002ab6281f703ba20c00f563b6e43e4983bc02d3aa7d0ceeee
 EBUILD Type-Tiny-XS-0.22.0.ebuild 629 BLAKE2B 5ab2420e58ed826b901642bc08271b3915710ad9afd89bc59124604d61b850ea6cd7b284ad2ed60ca2e5512017bd497009fe6db8f76dc27854324f6d974547b3 SHA512 b72afb8b80b9bfbe5d7733bdbef6c136d656cb83f674712cb5c6771d709372f1aeadcc2b97d86fc780317883f7c1b6d15af96d9069d25bf7261e5c08e6660f3f
-EBUILD Type-Tiny-XS-0.25.0.ebuild 676 BLAKE2B 662fb2b24c4c785b23446a14efb370ede16d0dddb3a2d8ebbe60c33f09417a898842165a3872e40bc4c59e03387b80a4f02d0baec7693c95e37ac8ff6191c7bf SHA512 fdad3f9e1e85bb1813d9cd8590afe8cb61c63ff3999b88979eb2341a58accceb8e03a6507553a3078dab70fc5806fcd6cd3dd474632a2aaa0ab951b91e141dd7
+EBUILD Type-Tiny-XS-0.25.0.ebuild 675 BLAKE2B 8a0ffb17127793abce333f5dd3f01475fb5e02b4c877f7a0b96c7b67ae28ad1f4dc33ae8b15dd44ceee985494780c59ffddf767a0b3df5451ca83b26288535ec SHA512 6e15b3873d6a0704f7389757c9a774a0d1035978d7f1fa7894facbee1297f50e5fd5433f262cfcd0aa72d387148d7cf6c0f53c17b0badce552bbf568ad8d03da
 MISC metadata.xml 451 BLAKE2B 9f868c1d91975ad15328d10729feee6f0f0d010e3f2f7aa1a72c0b5df570c902421ca4badae30163ebdf29d3985fe33018f5ac43a082703ffaca37831d9ced50 SHA512 5945d96f433ca131cca0f525d0957bc661946c4dfac3cb98929f2f2f335800d289028c65f0c11f954b286809512694b08dd6323c48ca1242cc3f1cf692314148
diff --git a/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.25.0.ebuild b/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.25.0.ebuild
index ad4a77162c82..0379597a9514 100644
--- a/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.25.0.ebuild
+++ b/dev-perl/Type-Tiny-XS/Type-Tiny-XS-0.25.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="provides an XS boost for some of Type::Tiny's built-in type constraints"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b9cf8f68dcfb..626803b648fc 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 371a883a3705..bf3175d65c94 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,5 +1,7 @@
 DIST awx-21.13.0.gh.tar.gz 16221713 BLAKE2B 7e875efced94fb22d782deb9583fddfa13e10079a202298d0ca05af58048d4bf70480aacec7f0e3c408c9600fff126886cb6912bdadb3f48a33932c9debd2344 SHA512 90628347f71663d4e13fed2cc529b3bda858d07130b74593582e82e19b8c6e6049c9ad6cdd419e4efa4bd366771e993665ef4527f5de336edd5f020c9a93ca7a
 DIST awx-21.14.0.gh.tar.gz 16484659 BLAKE2B 3541286c899eceb3a64719b08c0456abe34d70f6e97f3ecf24c4066da1173be02e613e42ecb1193f371703f8fa55abf0eba0106ccf884e6bb53bca9f2f2d2a0e SHA512 5c7efae528cdebffbce745f5e63807944db5a3a4b72880515da6d25de414d2d8c8a1ffb74f9f78f8cf72a6584437b627d8d53fd555021b943653d28427bd1021
+DIST awx-22.0.0.gh.tar.gz 16988159 BLAKE2B 88b2e8a1f035ca34c7dfd6ddb83ca9b72824153611861286c771a0493bf6c9fefa593d9e92116e9adf1968ee39c128af318fb7d5ef542e1d4603e235a7471412 SHA512 5ce0ea43d758e63ace024cee1c67e19a154104508dea2b67bdb275189e1f993b3b0c782e704d319196dcaabcf09db12ff36fcf73a35e5c4fdd5076a7e0649e10
 EBUILD awxkit-21.13.0.ebuild 1095 BLAKE2B 30ed96e9027d4aa915e502b7700acc5b7df74f6f46ea5d6f9feecd7b8f6649113c018f73b1507e3a2e3d13499e024d3e90d2d524b97f91e267a468b7afe06eb7 SHA512 37c7bb2792c17805fd96113fc7a6d6dee39c195d2760b89614ceb79ca4396333fab167ab022de5fe9600221f54623ff9505d1c6a025e595516b35c9a7bfd663b
 EBUILD awxkit-21.14.0.ebuild 1095 BLAKE2B 30ed96e9027d4aa915e502b7700acc5b7df74f6f46ea5d6f9feecd7b8f6649113c018f73b1507e3a2e3d13499e024d3e90d2d524b97f91e267a468b7afe06eb7 SHA512 37c7bb2792c17805fd96113fc7a6d6dee39c195d2760b89614ceb79ca4396333fab167ab022de5fe9600221f54623ff9505d1c6a025e595516b35c9a7bfd663b
+EBUILD awxkit-22.0.0.ebuild 1120 BLAKE2B 46ec711a264814630cb4147d859992a8c5ccd5d13d6d43f655af2643e7ea9865281d0f9abede93bb66aa585c9025a5809a55fac4d0bf0c2604e47961628c6bfc SHA512 11ba01f282a7f6e5b64a9f1adcfc3c7913c6a2a409965607e312fa9d7fe401ca9d0b5b099ae8a5b2bd91c19d4c06db0a9f744d3b7e44ba73b14bd056e7eed90d
 MISC metadata.xml 512 BLAKE2B be7f98bdaff6b814e03c9f6c816a0f1f59dc2e8763298f8a48107ea50b0534eddb314bb6d8b8a0f8c1d7c89c381916031544eea4a06068fb9acab4d2c8c48a57 SHA512 7322d992e1d67ea200df0cbf144d08fd387d7cd6ccb72191fc94dd605c9aeecb4b8083917760e2203296d5514fccd7ca621133aef6622658d1ef2c33171c8b7d
diff --git a/dev-python/awxkit/awxkit-22.0.0.ebuild b/dev-python/awxkit/awxkit-22.0.0.ebuild
new file mode 100644
index 000000000000..d080ce8c4341
--- /dev/null
+++ b/dev-python/awxkit/awxkit-22.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+MY_P=awx-${PV}
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="
+	https://github.com/ansible/awx/
+	https://pypi.org/project/awxkit/
+"
+# no sdist, as of 22.0.0
+SRC_URI="
+	https://github.com/ansible/awx/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/awxkit"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+	printf '%s\n' "${PV}" > VERSION || die
+
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-e "/'clean'/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 25eda8df51ef..e89982d7e0f7 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,6 +3,7 @@ DIST boto3-1.26.101.gh.tar.gz 627662 BLAKE2B 322a6e723851464409512e9d8dd17b5f2aa
 DIST boto3-1.26.102.gh.tar.gz 627980 BLAKE2B d9dc7d2f62496f2e78427b7fd96f4a210afabb4a4a574a8860767c5bb48e68410cc9f2f2b64aa5e0e5337721d2f59edc7993ee32ea5e1aa5543533d3f1e18d52 SHA512 0988f113a519ffbd6c8a2238dc66a21d4aa87a7dda77d99a4343088b7ea03855f6da12712251502e54cf60ee0bbe066b3fbb30ad7aeb18d67ed9ca96035eb1cf
 DIST boto3-1.26.103.gh.tar.gz 629982 BLAKE2B 1b70ecf1bc7ec297f01dfd209597719eca2e9d3a8d2a772558696c8cf4df03df5d8f9ea6d6a34beeb8d0377dd0e8ee92ebf7e3fc82b5da59f4994e84321b9e93 SHA512 094a5edde02137d739c9d017f9331671b0b2b5701db9bcc3c7bcb5d42457b407811d70b8ef9b24cfa30229dda028d58e6bb45a043c18b5c765afa3204ce77244
 DIST boto3-1.26.104.gh.tar.gz 630394 BLAKE2B 8444d5c3d0c60db0a77d7d96d518ffd6d10a62075a774173e990077b6e8a29ddc202eec997c0c7f4efbad5eb4235bc47b9a8144419a9d4d48006c1240732baea SHA512 cf456b10474e50d666582c585a350bf6abb80f4357938909444a6795206e513655d1f63178851c33a73bce428c0f5de5bd252707cf959a6c92aaa4f5130a1550
+DIST boto3-1.26.105.gh.tar.gz 631136 BLAKE2B 13dea08a41a45cd7ec5eba37e1980dc8f45592f7e8058739ed55e863c14c083cbdbf1bf9380bfd2845ffcea645570db9e0e61d4ce35315fbdd5ca1f7c14acab8 SHA512 abaeb464cf581ffcaf450ec33468d822960ffee7f5463c187d55ddb0955ae17f1fab8f2a486a9ad6425f850f067091a01aa356cebb441049ca126b0bce198a4d
 DIST boto3-1.26.89.gh.tar.gz 615718 BLAKE2B 3257e6efafaf139daf935385c252c10929be2a4277a8f0f192afc6dbd7cc32fa8f940a4e59ebbe25931c399dedb926a3c1848bd9cc0a7f0d377acb302eabe3b0 SHA512 02ee02b05023e9184f779ab8ff21afa6f7e56f7d2e883d021b2567676c5fc57cad6b475d55316a2017c2a837c41d2f5604824f440060e2f96804c5a61ccdd143
 DIST boto3-1.26.94.gh.tar.gz 617861 BLAKE2B 908b40868735038810cf75c903bbc8bad00a6ea8776b2a5a236683f18f2185971f8a13db5349086b1aef2c4d51361c8ebf30f2d671cea7f4101c9882a59b6acf SHA512 036278668afa33dfdaab9cc2e02c2c3e0596ec1c1b407767f22bc6a4cd87913f883f85430ff6a120c5e0fdd2194b70c911fe7a207bc26ed5fcd415f3754cde35
 DIST boto3-1.26.99.gh.tar.gz 625932 BLAKE2B 961a640995abdafbf2cd73f83ed5af0e1314cebbc5dc154771204e7c16532ad4a84aed08cbd7789af30de518bf2e8bd5204e9a540a2d3a08e75222c2eeb9a68a SHA512 ff726483a83a11a8c088905998af0a1a791e87503b39422811d82b3122275a24eb955636407422af7552908eee22d4c1369779a7798f09f958a8af5234c0c11d
@@ -11,6 +12,7 @@ EBUILD boto3-1.26.101.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad33966
 EBUILD boto3-1.26.102.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.103.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.104.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+EBUILD boto3-1.26.105.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.89.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
 EBUILD boto3-1.26.94.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.99.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
diff --git a/dev-python/boto3/boto3-1.26.105.ebuild b/dev-python/boto3/boto3-1.26.105.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.105.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 82cf332b8302..2ffab1795eb1 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,6 +3,7 @@ DIST botocore-1.29.101.gh.tar.gz 11311820 BLAKE2B 51be1b936b407a8d29912f6891c786
 DIST botocore-1.29.102.gh.tar.gz 11312537 BLAKE2B 6e5ac46612a692c72c7b9f3587d651a37422143dfae1fd25e999e255028e82a185dbd51ecf0a5de7d66a1ee715a6296d5d9c1f9474c210286b2df4e84946a3b8 SHA512 c0f0a69f81e1f2e57b3c048bae8e297e488f3e18bd2a443a6a6e56d49b97776c6b0fd7e613353eda3a7ee1f807ed717b639cc5fb685f83708f24de9d432f20fd
 DIST botocore-1.29.103.gh.tar.gz 11356652 BLAKE2B 4b583e094c1dce78257c7a21a1b1bb5fb5705af71f6fbd5215d34bc5dc745d47d19ec2ee4e667d9430f366385aaa45e4c2b139102c1c9de129b06ecb37338bda SHA512 a430fad7d729853d0ea405e772d482e6c9db60e6f580f51ddcec87816e13aa3f7ddded9bf8ce288c84c0e28f2b4b29922b1af9a0a8934123f17bc351a267a6c7
 DIST botocore-1.29.104.gh.tar.gz 11360726 BLAKE2B f051024952f137e42a544d60cefbcf4f359a4b68bfad332060703db6e04ff448b6b501541bc1d372aa6d9f30be6931110a02b40505d3fb2de77560bddc0e0d88 SHA512 c97b01240c5502a94d9afaea061e47155efb8a9c11f86778ef3c1595f40cf24f600116a5728025df3af6ed3466115fb94a046dc2e0fb2ed47a1233ffa0def027
+DIST botocore-1.29.105.gh.tar.gz 11363053 BLAKE2B 50cdf2f1c2bc60441e3083737509415355a80604f99de8c89026c743750570af3c9571c62d9d9469ccee6934c1fbf169656510da10be69e1360f7e1456cebc68 SHA512 ea68dcf04d006c7324c412ca8f664aa76020f32483fc4e9842a2eed3be7db42f0e13dca60517b372b09f18ffbbf9ba9de78a19e3713c79a1fcd46babe10fd078
 DIST botocore-1.29.89.gh.tar.gz 11227280 BLAKE2B 41a1243972e591ea23fb2eebaa5b5fb9547bbd8ccd72fc907c487fd56ebf90d8120ceee472e34a29cd2b036926bc93bda33b564b1b7083e8984daf366eced1f8 SHA512 356298fd3be39957dd60e6268cfd2652998e62950b9060e0774c68e158506dcfea8188059b588c08f520617af38b91eb6b71c16b92f7a71f75f33cb73e7786cf
 DIST botocore-1.29.94.gh.tar.gz 11242930 BLAKE2B d6abdda0ad69bfa635c2cdccefff5c0feaa27fb1a307d5cacb140ded35c246a52ebbe5657a9317bdc1441939d2bd62d5829b2ecce01c05976f56737f92fc3f62 SHA512 23c1fb835d492f414a0a67ac03e50ea31f6343676c7e6e8649067b11e3213f84eb068562fe5bd9a49ead9e37381ab132ac820d98fa4af805b41eaf53b0f9cb1b
 DIST botocore-1.29.99.gh.tar.gz 11285143 BLAKE2B ba594544fb219cec77659cfa48fb6e3a8241b92c911d9983450648ce97652cad7654181637fed8373fe49e33524f63920128afd4ca9c00bce45603b1ab917648 SHA512 319d70412843149aa43c8d7faeff04122d96091081d30c2da0962fadb27104a24cc147fac2c95492aa407b2f8a25ebed9e7d149c29d5d38134d836581c801bdd
@@ -11,6 +12,7 @@ EBUILD botocore-1.29.101.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f
 EBUILD botocore-1.29.102.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.103.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.104.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
+EBUILD botocore-1.29.105.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.89.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
 EBUILD botocore-1.29.94.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.99.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
diff --git a/dev-python/botocore/botocore-1.29.105.ebuild b/dev-python/botocore/botocore-1.29.105.ebuild
new file mode 100644
index 000000000000..491b6bbc21f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.105.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 4df746c578e1..07722b329e53 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,7 +1,9 @@
 DIST cfn-lint-0.74.3.gh.tar.gz 3456672 BLAKE2B 9cc68ddefda86ee26e900989e40c7ded067fecb35cf077d559ebcacd6838378028010630e340dd52f04750dcc12094fb800e8e48a4c9e0607645463d3ca55827 SHA512 aad2209fa16f717d20127b2cf47d9aba586b85ccd41caf3ad8a50a6894cc3402d929be4cf9f76530223a3d69d79d843ef0edf802e53984b5c34563cf766f8189
 DIST cfn-lint-0.75.1.gh.tar.gz 3487870 BLAKE2B 26aaf3b24023260d7a7d8f2b89fc9135e0c34786540c21d1c1763decad42167f1a29b01859bfcb17fe5ac1fbbb08aebf04191c6d1b21b335c92e2424c986cada SHA512 d4dfa9331c77f7c323b217203c470e15b4a62a86b42497934a4f9609d54a499211058cba4c561034f6c3dd6ba52ade30084e9a9d25da135289f783ed972a14ae
 DIST cfn-lint-0.76.1.gh.tar.gz 3631194 BLAKE2B 95d395369fc230fe4e6c5d5e2a0e4bf246f1f312c6595e998004d43a7662e43ed0612a56893956fbb15e99ed197d9af2723fc1c2ea9b14fc27d8b4ff7b29e484 SHA512 5c65111fa7f57b268f2f3f52157d464de467cfdf16cd672e399ab7b2d23d648346c6754c45cd169f993ae15180ffafc710c9f2fa0675a7ecb1d8fc5b3d0ec5ce
+DIST cfn-lint-0.76.2.tar.gz 3402554 BLAKE2B e5f9405d2852e3b81140a24d94c90a3bf8c919eb6823280a0a887c6acc56ec71d991cbc76532cc49d1189a8f64750ba3e9db02fb3b46b27a28ec3468f4dd268e SHA512 96351ade16308be18baace1351e263a179eacc0b3635e9baa959baadaebb6a08825f6cb9cd83cb83b8635785c7f54405bfcf00f85d6d95d101d3298919cd1ea7
 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
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.76.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.76.2.ebuild
new file mode 100644
index 000000000000..1f880341bf0e
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.76.2.ebuild
@@ -0,0 +1,63 @@
+# 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.62.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/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/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 33e5f4fdba0a..7b18e819a0ec 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,3 +1,4 @@
+DIST fakeredis-2.10.3.tar.gz 94025 BLAKE2B faf178d53e783c4475513bf9f485b6eaefc63bc45c5ebd95ecfa1aaed982e236877230ea19526d8d12f152f1c429c5003b04abd2cc4f7ed43dbde581b07fbdf1 SHA512 694b1b540e8b9b32a5a44e3094b8bab307c5af400335efe9eb034c5ed161c1583d4700c08ef16991a1f03502aeb835d89b327448c3385de548dd39aafdbcc2a8
 DIST fakeredis-py-2.10.0.gh.tar.gz 160050 BLAKE2B 9c97abe80ca683cd068e3e8616b068c166f08f1b1eb360b76c57da4b9d68396a5dd6fb4152e92dcd73a1407c50e259db54ba5edd61bc2dca774672de84fcf2d3 SHA512 31df18ead5e2937a7a98297f4dc08790371968dd1fa6d9dfa54eb35ab27c2a4a88e2186c252c8a630e0e70fa04e67eccb68e687f9383b6770313cf8b79f6b3bc
 DIST fakeredis-py-2.10.1.gh.tar.gz 159626 BLAKE2B 41d28b57c369273d96a985d6b47c8b162d1fc94c508daae12048e139c9d7bb9c44b39c95eb77cfb06d24cd1b44ccaa65f3d32f4976bfdda72e319d5da1cd69c4 SHA512 5659f5e3a6344448916bfe9ad88fff45b266488aa6d4e0b503f8594308ecfb8e97b1f588b658cb01a5dbe5fc06e64a1bbb6eafaa28aed0b8761b5e15638615ea
 DIST fakeredis-py-2.10.2.gh.tar.gz 159702 BLAKE2B ec385c01af9e32705435148c1c61d74c14d7b22a60b6a3466f1831f557bfe997af6ee96429cfdba00a1328db3cabe1579d65411e7c2b9972e5421963cd66815b SHA512 2a3a87dcbe136465ff0465585562a5b8b0bc73504f491d3ec9c6e959b6cffaa3edbaa1c2e5199138f7a49dfdec3c3da6a2ae338228a8fe21c670a82c062c544a
@@ -5,5 +6,6 @@ DIST fakeredis-py-2.9.2.gh.tar.gz 165549 BLAKE2B 351e07976ed6a4d11429c83aefe3a0e
 EBUILD fakeredis-2.10.0.ebuild 2078 BLAKE2B c6481d6fc5e3cb23da987fea9f8815178c869780aad971e74aaa9cd4d2e3618ce3efc0975f38958aeeab6b1a449f1dbff929a513dd61834ddf60ab321d676e57 SHA512 0b77127ac49f0afb4dc88f6eaa96afff9ad16ec96f99ef1330b03933eb1becfb7d574f2e99b6bfcfa08f981b1094da7aaa4509e640792dbc007440d794a7eacf
 EBUILD fakeredis-2.10.1.ebuild 2078 BLAKE2B c6481d6fc5e3cb23da987fea9f8815178c869780aad971e74aaa9cd4d2e3618ce3efc0975f38958aeeab6b1a449f1dbff929a513dd61834ddf60ab321d676e57 SHA512 0b77127ac49f0afb4dc88f6eaa96afff9ad16ec96f99ef1330b03933eb1becfb7d574f2e99b6bfcfa08f981b1094da7aaa4509e640792dbc007440d794a7eacf
 EBUILD fakeredis-2.10.2.ebuild 2078 BLAKE2B c6481d6fc5e3cb23da987fea9f8815178c869780aad971e74aaa9cd4d2e3618ce3efc0975f38958aeeab6b1a449f1dbff929a513dd61834ddf60ab321d676e57 SHA512 0b77127ac49f0afb4dc88f6eaa96afff9ad16ec96f99ef1330b03933eb1becfb7d574f2e99b6bfcfa08f981b1094da7aaa4509e640792dbc007440d794a7eacf
+EBUILD fakeredis-2.10.3.ebuild 1903 BLAKE2B 9235ec04001d8088f7257dfe8d44a62dd14f1bcf92b7fbc7c8815f395e7eabf8db8c06c95f19530b14bfb1fc14b3080937d6b0c430bb6608fc010d176be8f470 SHA512 31c30a29c8e775fe2d7b2893a28411b752fde2ddbd145959ba7e265489cf682c89dd0c5a3d560ac98da99086d5c17d18846c26c0f5f284858647ebecb3068322
 EBUILD fakeredis-2.9.2.ebuild 2006 BLAKE2B ad4067fe1ebe53ed63e9ffdf4b77a6c8674d35578a57b4850e49ebad22c0af3cbb3d2503f0ac009da77cb8c70b7d775999e6ba5bd01d7aaf566409fae27f265d SHA512 de60340d08236aa5f1818375ce6abe12a8f32d6117de8c3dbf4797377de70cda47e8dfd411ebf79d4d11ac8ca4e8690f5c46db233af85b4f9c58b30f7b157a5b
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.10.3.ebuild b/dev-python/fakeredis/fakeredis-2.10.3.ebuild
new file mode 100644
index 000000000000..425cda7c342a
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.10.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
+	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
+		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index ae5844bdbd02..f640453f7b6f 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,5 +1,7 @@
 DIST nbclassic-0.5.1.tar.gz 20178622 BLAKE2B 1ff79c9af218011c697016ecef149f42e683607eebb8e199ef75957d9d3127858ce8f443aeedb60844e3277b4c8cd4959d123658a5103ab2112fec469ef01a96 SHA512 1dabc27ad115d1961e7881e7a51653449cae291c74aea222bbf92d49cb7bc9657ae1f1d9a81eafbd70bc0cafd57b75cd2c76bebf91aabc5fdd9eede534f1cec9
 DIST nbclassic-0.5.3.tar.gz 20199979 BLAKE2B aa509bbd2bab51b94f475e81b7e1c5661370e850680df8f64c86d76ff2aed7a84a0e6c00f36a695ef7f84cdc731fb7613107abc96fb13a3127ded6689d6e81a1 SHA512 07e26d4cb30e3388420ced182a31a050419f4a872256efca6684e4af0e08ec8bf7f6f14f127fe1391457ad5fc792377a1a7bafc0fa1a92eec455454c6321a9ec
+DIST nbclassic-0.5.4.tar.gz 20200456 BLAKE2B 65f571da08f7b101e369aaa7e80d969a6b1ee989d7eea17d7de2638d4908c27dd20a874ee990f65a8fd7dd4535b2d518e4392501e5badc3fec309acfc22e5ff0 SHA512 f85e0388c02a4f601b00329787152fa74862e7a5d9148b63d52a48395898b3428d3b07f0733fa9a0b5336e37d6fb441585555e45e2e265bba6bb9b82f45e7bbc
 EBUILD nbclassic-0.5.1.ebuild 2340 BLAKE2B c255b1211422b66ca539c8387ad2b17608b36d125ba974f2e8dba44e5b925197d44498d4fa7e41ab3b303f8f5c5c35b59bafd8b9e78f74bc700bd73210f475b7 SHA512 8a1c4f60fc19ba1ad88ce4ab1e01d6589345d001e33bb393c6db7d096ae3ddab7bb9d36a3e4cfdaa37db7b68db10f3bddebf494e436ce263d8386cc7bd90e05e
 EBUILD nbclassic-0.5.3-r1.ebuild 2176 BLAKE2B 318dad079306f7d10d0c85576d69e72ecdb2e1cd20dfa18f23aa68a135b907fc5731b6c0a842eb9fbc95c167fe1e5d7cf2511e8b68b2bfb309e484231dbaa427 SHA512 a8ccf1a23635ad9228faa9c0a9081642b74fc1d178082d95e50f1379257cd43ab58a146ebd5b46164f51954a41c086bd2ea01cecd29e6ca88a0f69aa426853c4
+EBUILD nbclassic-0.5.4.ebuild 2176 BLAKE2B 318dad079306f7d10d0c85576d69e72ecdb2e1cd20dfa18f23aa68a135b907fc5731b6c0a842eb9fbc95c167fe1e5d7cf2511e8b68b2bfb309e484231dbaa427 SHA512 a8ccf1a23635ad9228faa9c0a9081642b74fc1d178082d95e50f1379257cd43ab58a146ebd5b46164f51954a41c086bd2ea01cecd29e6ca88a0f69aa426853c4
 MISC metadata.xml 407 BLAKE2B 8be751d3f2e0e1e2952c39cd1846285ebb994d833022767dde609294ee9f98044b1189934e7d27c3134b1f06c95705687491dbf52739bdd0bc17f06cfdff53cf SHA512 6cc07376da4e55e5df153fdb0f43371ed415bed6db1bce2f67dd113d1e0f1994974dd6bee746021efb2d8c36ca2ca534109227c541d38b37b652a68b9642f2cb
diff --git a/dev-python/nbclassic/nbclassic-0.5.4.ebuild b/dev-python/nbclassic/nbclassic-0.5.4.ebuild
new file mode 100644
index 000000000000..7bda1e205baf
--- /dev/null
+++ b/dev-python/nbclassic/nbclassic-0.5.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=jupyter
+
+inherit distutils-r1 pypi xdg-utils
+
+DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/nbclassic/
+	https://pypi.org/project/nbclassic/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~x86"
+
+RDEPEND="
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
+	>=dev-python/notebook_shim-0.1.0[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+"
+PDEPEND="
+	<dev-python/notebook-7[${PYTHON_USEDEP}]
+"
+
+# dev-python/nbval is missing impls
+BDEPEND="
+	test? (
+		dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		virtual/pandoc
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx-rtd-theme \
+	dev-python/nbsphinx \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/myst-parser \
+	dev-python/ipython_genutils
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_tornasync.plugin
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# move /usr/etc stuff to /etc
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 006bfb72dc3e..0eaf3758b02c 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,5 +1,5 @@
 DIST nbclient-0.7.2.gh.tar.gz 76883 BLAKE2B d90b9dd7b15757a44c86084b68b916aab663c0e20a5c1012bda9f86a0ec1104a01cd78d27bc6e510eceeee12f2356a312d8080e1568e4c54dd2e916af85dc304 SHA512 17f1bfbfa156688e895ab1a0d0f74903f43c62a373a40cfcc50a654d86ebbaeb5ed101562716140a3878a9667bb131c49e06caf2e3127160700baf181cd1c29b
 DIST nbclient-0.7.3.gh.tar.gz 77997 BLAKE2B 613c06596ea0cc970d57115950248cbb052babccec397a9aa543b0058cdb94f797a7c5cf554a9122927a4138f0f06827a77f535fc83a858519873bda0c389230 SHA512 bdd093cafbe6a101de779de2e51d7e2e9abce80fa8ef5b5340b4cb8fb53d0051f6f677006cadaa3a69e727634043b7ab5416777e7cf8e0507d5d1d163016f8d5
 EBUILD nbclient-0.7.2.ebuild 1537 BLAKE2B f965f30cdc05718f56aff073f684f013b9283c3609c0c439d1c8beac5e20b046bb285abdd4eaf9316c9aaaa0cb93aba7fc5ec9b23fa699966f610ed2eb52b379 SHA512 bb7a6f4b1c39ff1b3f1897db1648ce76cb964cb404f0b9d85359a4ad37cb63a93ff9a3681b221777ca7d07880c03855bffba1e086307744c3329ce79d53fdc6f
-EBUILD nbclient-0.7.3.ebuild 1545 BLAKE2B 2b8c840da50d2e662ce61f08de3545fb5f1863d68c0a41ed6d4f53ccb224c6a9def9767c6bfbe66b7fee5161ab642f39bd6a813a34832e678ac19d6438e4a2e3 SHA512 410063f6cc4f6151479d88dd547aa9f6db27dd38d90f8e953974f7e8b23a32986be0d6e641b7fa919114456af82f6546633376d95c3f21017b5ae4e283acc70b
+EBUILD nbclient-0.7.3.ebuild 1582 BLAKE2B 71fb45afb9454abe16040ef5b43884354b9b8ac27fac29299893db3ca7aa40c82fbb8615e80f13615b9698c9e639cdaac451860208ff4c88a5739b9566f5e96c SHA512 959d6d1b43945cce7644fcd0a914f435dc4850631f415cfc316448ac6506c181da70e2e1f286cfb56bd5c52804cda3794cf323b44d7efafc197824dadcba574c
 MISC metadata.xml 405 BLAKE2B d1efa5f7bb2a959bdbc6093b1bd3930e6cdb9bffbe872c6775c15dfc1024ae24d6bcb4651c8e1fb06242b17d6a86f683de3b528bbf1a60b5656a90c1f4ac81b7 SHA512 5b0de690d37dd5928e3bfd0b380336d154cced094e342b41dfd16d0caddd2b792a2158b209404a36461cf4d1b12d836024eae2aedf15093b90f4e363382b38bf
diff --git a/dev-python/nbclient/nbclient-0.7.3.ebuild b/dev-python/nbclient/nbclient-0.7.3.ebuild
index 1f8c2146f764..2b4347e7c776 100644
--- a/dev-python/nbclient/nbclient-0.7.3.ebuild
+++ b/dev-python/nbclient/nbclient-0.7.3.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/ipykernel[${PYTHON_USEDEP}]
 		dev-python/ipywidgets[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index d04b64f6d0b6..aed7404ef621 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,5 +1,7 @@
 DIST nbconvert-7.2.10.tar.gz 870708 BLAKE2B 837b5cf70f530b8fd3d566809d8d4faefdb3c4581b46e317d218a08bb06b80fdf59dcbd6c337b7fd62a9fdff676ea1cec941a7f6641c54ebee066a1bec19ffcd SHA512 078d6f1375f595f30db9eeebab55842353d549a294290a185c3817fc0bb2459c392120f089890409eec7cfe0fec7909752d20e4c55123249a4685d34655e0c05
 DIST nbconvert-7.2.9.tar.gz 870386 BLAKE2B aea62f29d3e696c70d77ab73cc89347a4e0c8e077e98c45331608f7117fb3c98165bf3da89e4f3bf23b9d62c618289d98c9103c5b2998ca81f65cbfda65ca536 SHA512 0053e0e88f279d2fe430e516bcc19f98191e9ce414546ab1ff214f37c8f1cdfc4fc101faa4b5f1d5955fdc65c87aad367f5a5f12ce5991c68c015c5083f2f30c
+DIST nbconvert-7.3.0.tar.gz 879918 BLAKE2B cf1414f5c6a41222f576a66ca8aa49f98d5ee4a0cd6bedcd779a6c429d46550e0435e60723255358f1ccf51b508d74e7461521889cbb7e6dfb10377175ea78a2 SHA512 a7030cced31ae749d9625f7fb7cc2bee17c10fcd90e83f36efed1c00758d02e47ed9d90aa907c2acbe979810a561d48d9fe854a3786b60418beacdd471b14b8f
 EBUILD nbconvert-7.2.10-r1.ebuild 3045 BLAKE2B d069c02a385aa2d8b9790693ca87ed0c2ef6fb22ee41c3d967858989f55074d36c6244ffbfa28c7de3c373dea930e6ff9d7270980b95c20120d4876d34261cbc SHA512 43d0bb082c8c0a4c925b44fbece61e3727b046cafa1302dd1618f777e4ce36a6def606dcc1a6e9d955c77b0523b0c5fdb46c584a27e8818f99e6193f79e06dc8
 EBUILD nbconvert-7.2.9.ebuild 2772 BLAKE2B 9b7225971cad9b1d88969dd826d4e0712bdd2a7f8e84ad766f375668c03b72832c5cbfa31199a6bcc60ac0d61baf2ddd71dcf4baeda08c7ee9b70b91b0671da6 SHA512 9198cc3fcf2b48e4888d62b656de9b1915600694d18ff092ba01ec553e39184ed126af9641819286e45e36cc60e726eca1a64b5d79ec7bd0554ac72a56b557c5
+EBUILD nbconvert-7.3.0.ebuild 3045 BLAKE2B d069c02a385aa2d8b9790693ca87ed0c2ef6fb22ee41c3d967858989f55074d36c6244ffbfa28c7de3c373dea930e6ff9d7270980b95c20120d4876d34261cbc SHA512 43d0bb082c8c0a4c925b44fbece61e3727b046cafa1302dd1618f777e4ce36a6def606dcc1a6e9d955c77b0523b0c5fdb46c584a27e8818f99e6193f79e06dc8
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-7.3.0.ebuild b/dev-python/nbconvert/nbconvert-7.3.0.ebuild
new file mode 100644
index 000000000000..f8c9b4fd4ccd
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-7.3.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 multiprocessing pypi virtualx
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="
+	https://nbconvert.readthedocs.io/
+	https://github.com/jupyter/nbconvert/
+	https://pypi.org/project/nbconvert/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	' 3.9)
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.7[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
+	>=dev-python/mistune-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.1[${PYTHON_USEDEP}]
+	dev-python/tinycss2[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		>=dev-python/ipywidgets-7[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	mkdir -p share/templates/classic/static || die
+	# tries to refetch stuff even if it's already present
+	sed -e 's:css = .*:raise PermissionError("You shall not fetch!"):' \
+		-i hatch_build.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Missing pyppeteer for now
+		# TODO: Doesn't skip?
+		nbconvert/exporters/tests/test_webpdf.py
+		# Needs pyppeteer too
+		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+		# TODO
+		nbconvert/exporters/tests/test_qtpng.py::TestQtPNGExporter::test_export
+		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_convert_full_qualified_name
+		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_post_processor
+		# latex failing, might be too new pandoc
+		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_filename_spaces
+		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_pdf
+		# too new pandoc but we don't have old anymore
+		nbconvert/utils/tests/test_pandoc.py::TestPandoc::test_minimal_version
+		nbconvert/utils/tests/test_pandoc.py::TestPandoc::test_pandoc_available
+	)
+
+	# virtx implies nonfatal, make it explicit to avoid confusion
+	nonfatal epytest -n "$(makeopts_jobs)" --pyargs nbconvert || die
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc && ! has_version app-text/pandoc-bin; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc or app-text/pandoc-bin."
+	fi
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index dbbb15c75cf9..618260d0f5f3 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,3 @@
-DIST pillow-9.4.0.gh.tar.gz 50412873 BLAKE2B 12003b8b9e582c47b45d82f4a10553e376dcb38e65154eca5753b2908d6ecad10fc732d622856c7742fb413abbf4afc926e3d30e1e9e410e966f18da4ddde6c1 SHA512 6c08336e5ca1e652bb3237ae092be61b78dc1cf65603d6b23369eb8e0554786114a8f87ab092a5fb9577e02cd0bb381353fa657e03090baeb91b4b8e3c740d51
 DIST pillow-9.5.0.gh.tar.gz 50491974 BLAKE2B 663c14b89ddd1e2d49872994033a04e500d0b6eccbb8d6ce094f58ae1aaf3f215e9984f2afeb43fb83e0c3c93af1150beeb7d5f0abb77c59087901b53fd24e37 SHA512 da0c7a1bde4741ced168c013fdc7afa8af1100bba878bdaeeb9804fed4dcf70c07ed62004ab2c73694eae3d28e2d72d46c155f78b540075aafb36c8e7a5649ff
-EBUILD pillow-9.4.0.ebuild 3362 BLAKE2B 6fccf270776d72312006668c36082cc7c93460c7cec31609440bf13bfd0ce1f2654c93e55f49aa29224a6c90f8118634e98902ac2790597ec593843e63b781c4 SHA512 6142e5ea001d076ae56e08486cf3c839532c0f01779ef2949d09b3d8aaa3ac1d54c036d3727ed3aa08b5b500aaef4349554792d2672772b6cf84f5e88dda4e6f
 EBUILD pillow-9.5.0.ebuild 3362 BLAKE2B 6fccf270776d72312006668c36082cc7c93460c7cec31609440bf13bfd0ce1f2654c93e55f49aa29224a6c90f8118634e98902ac2790597ec593843e63b781c4 SHA512 6142e5ea001d076ae56e08486cf3c839532c0f01779ef2949d09b3d8aaa3ac1d54c036d3727ed3aa08b5b500aaef4349554792d2672772b6cf84f5e88dda4e6f
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-9.4.0.ebuild b/dev-python/pillow/pillow-9.4.0.ebuild
deleted file mode 100644
index 6c245bd70d77..000000000000
--- a/dev-python/pillow/pillow-9.4.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="
-	https://python-pillow.org/
-	https://github.com/python-pillow/
-	https://pypi.org/project/Pillow/
-"
-SRC_URI="
-	https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	imagequant? ( media-gfx/libimagequant:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		|| (
-			media-gfx/imagemagick[png]
-			media-gfx/graphicsmagick[png]
-		)
-	)
-"
-
-EPYTEST_DESELECT=(
-	# TODO; incompatible Qt version?
-	Tests/test_qt_image_qapplication.py::test_sanity
-)
-
-usepil() {
-	usex "${1}" enable disable
-}
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		disable_platform_guessing = True
-		$(usepil truetype)_freetype = True
-		$(usepil jpeg)_jpeg = True
-		$(usepil jpeg2k)_jpeg2000 = True
-		$(usepil lcms)_lcms = True
-		$(usepil tiff)_tiff = True
-		$(usepil imagequant)_imagequant = True
-		$(usepil webp)_webp = True
-		$(usepil webp)_webpmux = True
-		$(usepil xcb)_xcb = True
-		$(usepil zlib)_zlib = True
-	EOF
-
-	# setup.py won't let us add the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but it doesn't for this setup.py.
-	export \
-		INCLUDE="${ESYSROOT}"/usr/include \
-		LIB="${ESYSROOT}"/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO (is clipboard unreliable in Xvfb?)
-		Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
-	)
-
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index d3e13dcd9e5a..e9c5ca13ed40 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -2,8 +2,10 @@ DIST python-zeroconf-0.47.3.gh.tar.gz 151413 BLAKE2B eff81832a029cf173c552903552
 DIST python-zeroconf-0.47.4.gh.tar.gz 151640 BLAKE2B 4591135e81fc0c1c22444fb8823f5ad246f234a79a9aa2697a947a7838f5880007e2acbfe8c60a3f69c0a1cf803e35b35b17b7cf013dc7408e759273bbca94b2 SHA512 2b8438e0832cfc6ac40d54eaed75749389fd9287b82b074f129bba76e7f31e3cfd58e5de28c54b3cf3e14d3c8540ff09b5f10d85f705ede2ef18718b1a87ebf1
 DIST python-zeroconf-0.51.0.gh.tar.gz 152236 BLAKE2B 2339bd47e4f8abecb5b56c722e275c0cef63d4ab389c58b9a50e22e2a450b527f11727615a9c61e6e23d275195353121c5697f2fd496fbf9370465db5d9258c8 SHA512 e62d74ce164cd92913382e5a5530e2732a739e065f3f2fa7bc5cc7f62e863c98e8979ab08f5527f301e833cd1107c2d1c412db1dfafbf2bd1546b6e197d2c43a
 DIST zeroconf-0.53.0.tar.gz 138658 BLAKE2B 9a0af4a08a51d8b39d6eac30a1ad92d5e7c14bdaa3a7d8b57b3664c91c0c740af6f08c3bbe1d5ffb4a950e4cc1bec12b9426b595f76232d48510dd5df25c1b57 SHA512 9309b385a1acdcdb7d2812e0b554373fc2a5324f804636cf32449aa158ac629387f670c1770bce5e11245f9e482a6bb379f7e3cbf935a1977fca8158181163d5
+DIST zeroconf-0.54.0.tar.gz 139937 BLAKE2B ef8e8ad309a73bd725ad1aa8af54dd14d338f68c5f23643a45cd88a2e8ec8a64b6c589ec0d00a341769003e858554da0edac49722d81c92ec36638cfe4d8d0e2 SHA512 ac2f2c76e8d551102919ae27dcbcdaea80e4ec1b0514edab7d9776feb20466933669590af5f9de90395df909c371a6d30cc086daa8861464ba51f2aafd3a0592
 EBUILD zeroconf-0.47.3.ebuild 1714 BLAKE2B d5a5092327d4de61e1bec37c6d963030c5703ed4fe3360ab91f42133456367390bc547fb8f591512d86093078f2a279b16fcbbaff49252b6589498c55ac805b3 SHA512 1d6fc8b09de6aa52049ae8bffa2cde9d5a1299495b8af075805059d55c1a09d206b8cc161fc32728cb3cfcfbff4757f28baac6ced0ab3cad3dab7f88acec9fde
 EBUILD zeroconf-0.47.4.ebuild 1716 BLAKE2B d8ab5caed8f2a6af3e2d2de5a1e57d4a9a1feb1406b2d9e3f2c33aca8d32c1bd5d1ec157525de42c134c78f657f60b657497ce1225ae8daafca7e51e570a49df SHA512 9a319e0420919cd2220f727decbfe3ccc04e7fdd9a1e7afb64e4dad04ca7550fd64a5f08f33b20cc022b9dae248d45d233c6a3e97ce0d7c329238932f608cd9d
 EBUILD zeroconf-0.51.0.ebuild 1716 BLAKE2B d8ab5caed8f2a6af3e2d2de5a1e57d4a9a1feb1406b2d9e3f2c33aca8d32c1bd5d1ec157525de42c134c78f657f60b657497ce1225ae8daafca7e51e570a49df SHA512 9a319e0420919cd2220f727decbfe3ccc04e7fdd9a1e7afb64e4dad04ca7550fd64a5f08f33b20cc022b9dae248d45d233c6a3e97ce0d7c329238932f608cd9d
 EBUILD zeroconf-0.53.0.ebuild 1565 BLAKE2B 0f7d4a9fbd5f7975ab67b763d3fa31ed9a93eb89fd3df81e45b31c6d4a589a000ee7b5981b6247d2d07d94f8e7bea6928ca4eba9de8d8cba2d0b6f97b93dd6af SHA512 2249906f572d4bdf4d9a1a1723428e0a6ddcb053df65f7bdcdca46bcc65eaa63d5bd3637c8eb051d11f46e07ba577949e2f9658ad631dcf98b81ce78bf7afa1a
+EBUILD zeroconf-0.54.0.ebuild 1565 BLAKE2B 0f7d4a9fbd5f7975ab67b763d3fa31ed9a93eb89fd3df81e45b31c6d4a589a000ee7b5981b6247d2d07d94f8e7bea6928ca4eba9de8d8cba2d0b6f97b93dd6af SHA512 2249906f572d4bdf4d9a1a1723428e0a6ddcb053df65f7bdcdca46bcc65eaa63d5bd3637c8eb051d11f46e07ba577949e2f9658ad631dcf98b81ce78bf7afa1a
 MISC metadata.xml 395 BLAKE2B e1ce7a8fbd6d50fd59fbce671a535a3af2fde79dcc98f146c4e361759e61ce6d7e4e241866262fcd78744c673212d1946830c3d7628956b498a98d0af36d4c3d SHA512 544cb62da7212926b63c4e19467fc3e3f7c8210320a8096dc913a846d392e9a09c2b9860312f88effc8ad7a54e0329149a68012b08c674663af5779957e037f9
diff --git a/dev-python/zeroconf/zeroconf-0.54.0.ebuild b/dev-python/zeroconf/zeroconf-0.54.0.ebuild
new file mode 100644
index 000000000000..18c772b8a425
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.54.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/python-zeroconf/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
+	' 3.{9..10})
+"
+# the build system uses custom build script that uses distutils to build
+# C extensions, sigh
+BDEPEND="
+	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+		tests/test_core.py::Framework::test_launch_and_close_v4_v6
+		tests/test_core.py::Framework::test_launch_and_close_v6_only
+		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+
+		# fragile to timeouts (?)
+		tests/services/test_browser.py::test_service_browser_expire_callbacks
+		tests/utils/test_asyncio.py::test_run_coro_with_timeout
+	)
+
+	epytest -o addopts=
+}
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index f8522a5fd473..04522fcade82 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,5 +1,3 @@
-DIST python-zstandard-0.19.0.gh.tar.gz 683942 BLAKE2B 5b28fb6360147f87fb658d28652e5e43b0e41ff3cc31e46d91b1dcdd5334869f9a10a598f3d1d15a8c0f02afc59d009a8088ba3e81066f1a5f1ad9c05ebd4a1d SHA512 56e7b43161940f182ff5a0745bb6bdb2710c9a61140c4a84b690e0abd18c8b862211ab2b1ba36cfd99fe75bb0ae00af7de798b010b2bd4c5a44d691d4fa0c63d
 DIST python-zstandard-0.20.0.gh.tar.gz 712241 BLAKE2B 6ec393a440eb2a0527e655ee1aec16a47120578bbbb69d2f208b4367be199041887bf02d8feeb74f87992d0ab2b5e668cf8b3d8cd8967bd6dc47d4e052781ebc SHA512 bdbbd829e431a9b1ad1247b83e2e6102314a257a32c92a5c666c5ac050eb115bccd9d358240ac9ab41e975ade13bbbc155c66cb8fb583d2ee8dbd28ae323e4f8
-EBUILD zstandard-0.19.0.ebuild 1647 BLAKE2B 6cbfffbbf41c2fe9dd8dd0be1f192fed7b01e40f595bb82afc85c187f60631f8eead8210b6bddd72462d1078cffe36d41dea46e485b367aac63a2a620e968cd7 SHA512 f32c7c1e1a6916ce7e42263912257c8bb302bb5b6cb257f6078b75e83801aca9fd4a5aaa6b4c5b9407596e6a63294103310c116570c484f697b3739211c429a4
 EBUILD zstandard-0.20.0.ebuild 1610 BLAKE2B b4cb2ef474608e71db82f3cec2179b7b5dce739ac5d9cc177a663ccde37e9bb7372c3d545b208ff1e0b2198513d97f1c55186e1af1d121558fe05342e65fb8ef SHA512 d209fecdac0dbfef460976efc5aad831980f36451fb05acc43b993832e84ff271f897d47d74bf61293d0fb09b1908ac2021140062cb45923828c80f06709eb6f
 MISC metadata.xml 378 BLAKE2B dd5834c84bb375812b3a3cfcc00d29aa43ac8954b044e188e8f38bdca93fdf1ce98fe78b78dbeccd935c83ca10f3ce18f893e5720dd8991118b6c69149a4ac61 SHA512 06554d973b525d53c680c3e43041f33125dad222339e645294fbc22670a7eadb0e9bf8a3b0771d2b2fb8f136d958eadb32c295179d1547c50ae26754360609f3
diff --git a/dev-python/zstandard/zstandard-0.19.0.ebuild b/dev-python/zstandard/zstandard-0.19.0.ebuild
deleted file mode 100644
index 1a91f27e8b20..000000000000
--- a/dev-python/zstandard/zstandard-0.19.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-zstandard-${PV}
-DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="
-	https://github.com/indygreg/python-zstandard/
-	https://pypi.org/project/zstandard/
-"
-SRC_URI="
-	https://github.com/indygreg/python-zstandard/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# <zstd-1.5.4 for bug #893948
-DEPEND="
-	<app-arch/zstd-1.5.4:=
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# the C backend is repeatedly broken, so force CFFI instead
-	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
-		-i zstandard/__init__.py || die
-	# unreliable, fails on x86
-	sed -e 's:test_estimated_compression_context_size:_&:' \
-		-i tests/test_data_structures.py || die
-	# unbundle zstd
-	: > zstd/zstdlib.c || die
-	# it does random preprocessing on that, so we can't use #include
-	cp "${ESYSROOT}/usr/include/zstd.h" zstd/zstd.h || die
-	sed -i -e '/include_dirs/a    libraries=["zstd"],' make_cffi.py || die
-
-	distutils-r1_src_prepare
-
-	DISTUTILS_ARGS=(
-		--no-c-backend
-	)
-}
-
-src_test() {
-	rm -r zstandard || die
-	distutils-r1_src_test
-}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 698cada7ac62..800997c49cd3 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/pathutil/Manifest b/dev-ruby/pathutil/Manifest
index 8b5f0e9e1bdc..2bd35f6343ce 100644
--- a/dev-ruby/pathutil/Manifest
+++ b/dev-ruby/pathutil/Manifest
@@ -1,3 +1,4 @@
+AUX pathutil-0.16.2-ruby30.patch 5578 BLAKE2B eb42f2c3ec294b25d86312966c39613fbd0ca646b6eb3e933b0f849bf9f9a2dbea80b340c62d1342abbd10e2598a60d48c102e2f12e49dba24c21d7eaec72f5c SHA512 cc9f7f94b5a830c6f377e5414da317492caf6b5bd89ee8c414753c09c427b2a87852ce8767effacfd0af2ca260c8b05e322e7772b7cc786c4f4531bcf8107cc2
 DIST pathutil-0.16.2.tar.gz 26079 BLAKE2B 5a9d1dac1f1171ee6bc447725c04883cb56a9071927f3e0fdbcb9754345ac77a6609533a1308a411cb22658caeb2a4bed49225923af109bca288cfb3aeb3d669 SHA512 d06daf365b94dacd33966f3928a53f0f00d2fca7b9f6348a7efd2b55ab5ba937459e5bd78fde241f30749a1ae55e4ae3ba1ed8945b5333464e7d3ce9666cd054
 EBUILD pathutil-0.16.2-r1.ebuild 955 BLAKE2B 02b346d9ebc67e43fbc05e23bc16b18d9b4724a60c718e6e166ac888cb626804d72c3579214f1b5b681c1a548c4318df250f3fb0901c749c89293999d0a6a792 SHA512 e3ffca48a818a20238f37a48aea17e06cfe012318fb064cbdad0be26e95ff0e725c0a127215c1a64fa3c4d1fc8377c97aaf8b88e9cbe925025d15f6d58a032ca
 MISC metadata.xml 397 BLAKE2B 3f14fd5aaeb2954c6d714e28bf89c6cae920c80c130de454d453a61b81598a673200ed6ce07035be2769bf5f3f36eb926540f0ff7236b5da65cd021b508f104b SHA512 58d97f4464d9603f6c3dddd30c5258cccb03a4d0784ba8f268710d977d49437a677c9b9596485656762e5e2ef4694ca2b1f4018fefb9e84066c3296d73cfb18d
diff --git a/dev-ruby/pathutil/files/pathutil-0.16.2-ruby30.patch b/dev-ruby/pathutil/files/pathutil-0.16.2-ruby30.patch
new file mode 100644
index 000000000000..374cd4005930
--- /dev/null
+++ b/dev-ruby/pathutil/files/pathutil-0.16.2-ruby30.patch
@@ -0,0 +1,195 @@
+From 3451a10c362fc867b20c7e471a551b31c40a0246 Mon Sep 17 00:00:00 2001
+From: Tom Dunlap <tom@motevets.com>
+Date: Tue, 9 Jun 2020 12:59:32 -0400
+Subject: [PATCH] Fix ruby keyword parameter deprecation warnings
+
+In ruby 2.7, using the last argument as keyword parameters became
+deprecated in preparation for ruby 3.0. When running the tests, we saw
+numerous deprecation warnings. This commit fixes up those deprecation
+warnings by explicitly passing the last argument(s) as keyword
+argument(s).
+
+See: https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
+
+Fixes #4
+
+Side note: this commit did not fix the `#binread` method because it was
+untested, and when attempting to add tests, we got the following failing
+test:
+
+```
+1) Pathutil#binread when set to normalize should use encode to convert CRLF to LF
+   Failure/Error:
+     File.binread(self, *args, kwd).encode({
+       :universal_newline => true
+     })
+
+   TypeError:
+     no implicit conversion of Hash into Integer
+   # ./lib/pathutil.rb:509:in `binread'
+   # ./lib/pathutil.rb:509:in `binread'
+   # ./spec/tests/lib/pathutil_spec.rb:943:in `block (4 levels) in <top (required)>'
+```
+
+...which appears to be occuring because of an interface mismatch as
+`IO#binread` does not take keyword arguments.
+
+https://ruby-doc.org/core-2.7.1/IO.html#method-c-binread
+---
+ lib/pathutil.rb                         | 36 ++++++++-----------------
+ spec/tests/lib/pathutil/helpers_spec.rb |  4 +--
+ spec/tests/lib/pathutil_spec.rb         | 13 +++------
+ 3 files changed, 16 insertions(+), 37 deletions(-)
+
+diff --git a/lib/pathutil.rb b/lib/pathutil.rb
+index 1a15873..80913f2 100644
+--- a/lib/pathutil.rb
++++ b/lib/pathutil.rb
+@@ -456,14 +456,10 @@ def safe_copy(to, root: nil, ignore: [])
+     to   = self.class.new(to)
+ 
+     if directory?
+-      safe_copy_directory(to, {
+-        :root => root, :ignore => ignore
+-      })
++      safe_copy_directory(to, root: root, ignore: ignore)
+ 
+     else
+-      safe_copy_file(to, {
+-        :root => root
+-      })
++      safe_copy_file(to, root: root)
+     end
+   end
+ 
+@@ -494,14 +490,10 @@ def read(*args, **kwd)
+     kwd[:encoding] ||= encoding
+ 
+     if normalize[:read]
+-      File.read(self, *args, kwd).encode({
+-        :universal_newline => true
+-      })
++      File.read(self, *args, **kwd).encode(universal_newline: true)
+ 
+     else
+-      File.read(
+-        self, *args, kwd
+-      )
++      File.read(self, *args, **kwd)
+     end
+   end
+ 
+@@ -534,13 +526,13 @@ def readlines(*args, **kwd)
+     kwd[:encoding] ||= encoding
+ 
+     if normalize[:read]
+-      File.readlines(self, *args, kwd).encode({
++      File.readlines(self, *args, **kwd).encode({
+         :universal_newline => true
+       })
+ 
+     else
+       File.readlines(
+-        self, *args, kwd
++        self, *args, **kwd
+       )
+     end
+   end
+@@ -556,11 +548,11 @@ def write(data, *args, **kwd)
+     if normalize[:write]
+       File.write(self, data.encode(
+         :crlf_newline => true
+-      ), *args, kwd)
++      ), *args, **kwd)
+ 
+     else
+       File.write(
+-        self, data, *args, kwd
++        self, data, *args, **kwd
+       )
+     end
+   end
+@@ -670,9 +662,7 @@ def expanded_paths(path)
+   private
+   def safe_copy_file(to, root: nil)
+     raise Errno::EPERM, "#{self} not in #{root}" unless in_path?(root)
+-    FileUtils.cp(self, to, {
+-      :preserve => true
+-    })
++    FileUtils.cp(self, to, preserve: true)
+   end
+ 
+   # --
+@@ -697,15 +687,11 @@ def safe_copy_directory(to, root: nil, ignore: [])
+             }"
+ 
+           elsif file.file?
+-            FileUtils.cp(file, to, {
+-              :preserve => true
+-            })
++            FileUtils.cp(file, to, preserve: true)
+ 
+           else
+             path = file.realpath
+-            path.safe_copy(to.join(file.basename), {
+-              :root => root, :ignore => ignore
+-            })
++            path.safe_copy(to.join(file.basename), root: root, ignore: ignore)
+           end
+         end
+       end
+diff --git a/spec/tests/lib/pathutil/helpers_spec.rb b/spec/tests/lib/pathutil/helpers_spec.rb
+index 4d64d0a..0dfbc00 100644
+--- a/spec/tests/lib/pathutil/helpers_spec.rb
++++ b/spec/tests/lib/pathutil/helpers_spec.rb
+@@ -76,9 +76,7 @@
+           #
+ 
+           after do
+-            described_class.load_yaml("hello: world", {
+-              :aliases => true
+-            })
++            described_class.load_yaml("hello: world", aliases: true)
+           end
+         end
+ 
+diff --git a/spec/tests/lib/pathutil_spec.rb b/spec/tests/lib/pathutil_spec.rb
+index 784a16b..0ee7a12 100644
+--- a/spec/tests/lib/pathutil_spec.rb
++++ b/spec/tests/lib/pathutil_spec.rb
+@@ -944,9 +944,7 @@
+ 
+     context "with an encoding argument" do
+       before do
+-        file.write("hello", {
+-          :encoding => "ASCII"
+-        })
++        file.write("hello", encoding: "ASCII")
+       end
+ 
+       #
+@@ -1050,11 +1048,10 @@
+           name1.join(name2.basename, name1.basename).touch
+           name1.join(name1.basename).touch
+ 
+-          name1.safe_copy(name2, {
+-            :root => tmpdir1, :ignore => [
++          name1.safe_copy(name2, root: tmpdir1, ignore: [
+               name1.join(name2.basename, name1.basename)
+             ]
+-          })
++          )
+         end
+ 
+         #
+@@ -1077,9 +1074,7 @@
+           name1.join(name2.basename, name1.basename).touch
+           name1.join(name1.basename).touch
+ 
+-          name1.safe_copy(name2, {
+-            :root => tmpdir1
+-          })
++          name1.safe_copy(name2, root: tmpdir1)
+         end
+ 
+         #
diff --git a/dev-ruby/websocket/Manifest b/dev-ruby/websocket/Manifest
index e9240361a3a5..15c01570206d 100644
--- a/dev-ruby/websocket/Manifest
+++ b/dev-ruby/websocket/Manifest
@@ -1,5 +1,4 @@
 AUX websocket-1.2.9-default-port.patch 4427 BLAKE2B 90268a5b0686a9a054ee4d0193a0890cdfd5d3e92c5bb502602aa3ba74c858879e1a5eb8a6f5e07e3cae9c53ea64e0c1ebe64bc017a2e395b3f609d43a83df5d SHA512 7a9fbf2a4160d187e6e833ec9ef918a619bc311521c10e6bc88e2d8e249e45dc168912fad05c3a4560aa9a6f2f96b1eaa541735b1f2dcb247410d82bae1f74ad
 DIST websocket-1.2.9.gem 28160 BLAKE2B 1d0423050d26ee9c719de1803bd5fbcda80acb2c47825e2ad4203b8ac6e3e9a925fbe3cab8f5c0b283841dbfdbb97b753cc4f2c7a9c689486dadd9573b8fb87d SHA512 42044df313e1ca2525700decaac6f77b8bf9d4f1dd21723de408c636196e9f77c4b9d865abeb1de68575ad3b59ad48a9e7c30f0e16dbd15695958f8cf6ca3d57
-EBUILD websocket-1.2.9-r1.ebuild 456 BLAKE2B aaf39296991f53d2420afb12079398d077161c10227610406c58dc352cad6fa221ae5f01538530c436e64fdc22e94126097782aae20e879e6e209adcbd928776 SHA512 727dcafa0759cc4160c5cb1aeedafc191399281a9c11cd796fadb32be7b6c75d8c5082051f885389c6ed50c2ee5be01a9d0516d5c41cc4a2f39088c9ea9bde73
 EBUILD websocket-1.2.9-r2.ebuild 540 BLAKE2B b304dfa6a91fb9150d698196e6476ec60c233d177d370c9947c8b2ccbe1d4af016dd3ca1b04deb8f43f50c6986666fa7999d334d7261b56c9431ec482e00e7cb SHA512 e6e767444565ee65ef165b5a9e1196c318ea536dfbad4b4293dfbb5d626e8f715c18f762923b51e877fe23ff8e4b75047bea26febae63c96e8dfb317c7eed7de
 MISC metadata.xml 348 BLAKE2B 97c5037c95e1f278b4e7607286707298751b9aef68d81d99448842de0561c9657e191dc72ddb530e0202c6be2c0433482d1e0066bd56dcab3b0edd8daa6195d2 SHA512 7d0a8b7a151834686c239ef6f56d2648701f37512fdd1effd3cca0204e2dc445a586bfad9acfb7b38c094db15154b861a31c6dc9bbeba7559932e87d61742821
diff --git a/dev-ruby/websocket/websocket-1.2.9-r1.ebuild b/dev-ruby/websocket/websocket-1.2.9-r1.ebuild
deleted file mode 100644
index 3c499c7c78fb..000000000000
--- a/dev-ruby/websocket/websocket-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Universal Ruby library to handle WebSocket protocol"
-HOMEPAGE="https://github.com/imanel/websocket-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5686da7b91ad..b4d92a93080b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/clippy/Manifest b/dev-util/clippy/Manifest
index fe260bb85635..8227e1feff2a 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -1,3 +1,5 @@
 DIST clippy-8.4.2.tar.gz 9893223 BLAKE2B 670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac SHA512 1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7
+DIST clippy-8.5.tar.gz 10068379 BLAKE2B ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4 SHA512 13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f
 EBUILD clippy-8.4.2.ebuild 1040 BLAKE2B c4e25fface9b5c8306da6a5f0170bd3e71d1cd8689823d8c9bebc532acd0ab3d76dea9803a650da0faaa18cc2f24ea8976ae4e6da08679792e9cfb17c80bd5e3 SHA512 6fa6bddf3e0ef21c623be03b2ab4dffd27aae176cecababd901d53d883e416fe69f1fb66ea92abd7b51c2c5a1ca15646f2ea45c833bdd8313de89af2925bc5fc
+EBUILD clippy-8.5.ebuild 1042 BLAKE2B c27e6af0eeac3f71b2a143a0b9f65fe06e3357a92e8b3ccf2e0c5d54d2f22a0327001b62175e205d54f9777515bd2f5f964660e3f23271890e8f078ef7256922 SHA512 7554bceed36172c152089fd0e12750023d9cfea77fa4a9c093079500be0dac50bc452b8df260670fe10d84eb9ed4874ed46c925954c47af8aabbf673102b59e8
 MISC metadata.xml 326 BLAKE2B b909c2525951476b2905e143974e734364023b9ac622f01ddae1e16427359ea47af02af11a3bb6ac5c51ef519c9c66995c8cba31d9ca41f1e48f33106a0678b3 SHA512 ee570ffd0054e2c132d637b41921bb25f3172fdfb0bcbc5d2214eaa3bb95c109ca58a5e6cd7ebd386de497ef3e20cf3696243dcc5e82fc4cfae25bba51be4db9
diff --git a/dev-util/clippy/clippy-8.5.ebuild b/dev-util/clippy/clippy-8.5.ebuild
new file mode 100644
index 000000000000..c9bb649db28e
--- /dev/null
+++ b/dev-util/clippy/clippy-8.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="frr-${PV}"
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools python-single-r1
+
+DESCRIPTION="Standalone clippy tool built from FRR sources"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/frr-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# standalone clippy does not have any tests
+# restrict to prevent bug 811753
+RESTRICT="test"
+
+DEPEND="
+	${PYTHON_DEPS}
+	virtual/libelf:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug #884291
+	unset YACC
+	export LEX=flex
+
+	econf --enable-clippy-only
+}
+
+src_install() {
+	# 830087
+	find "lib" -type f -name "clippy" -print0 |
+		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
+		xargs -I '{}' dobin '{}' ||
+		die "Failed to install 'lib/clippy'"
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index e852ef55f08c..e1c08e6ce0f7 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index d527eb5f79d5..0e47aa55fa25 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -92,7 +92,12 @@ qmail_set_cc() {
 
 	echo "${cc} ${CFLAGS} ${CPPFLAGS}"  > ./conf-cc || die 'Patching conf-cc failed.'
 	echo "${ld} ${LDFLAGS}" > ./conf-ld || die 'Patching conf-ld failed.'
-	sed -e "s#'ar #'$(tc-getAR) #" -e "s#'ranlib #'$(tc-getRANLIB) #" -i make-makelib.sh || die
+
+	# This function is used also by sys-apps/ucspi-tcp and sys-process/daemontools-encore
+	# but they don't have make-makelib.sh script, see bugs #902009 and #902019
+	if [[ -f make-makelib.sh ]]; then
+		sed -e "s#'ar #'$(tc-getAR) #" -e "s#'ranlib #'$(tc-getRANLIB) #" -i make-makelib.sh || die
+	fi
 }
 
 genqmail_src_unpack() {
diff --git a/eclass/sgml-catalog-r1.eclass b/eclass/sgml-catalog-r1.eclass
index 2258b3e2bf0f..eff6db31062f 100644
--- a/eclass/sgml-catalog-r1.eclass
+++ b/eclass/sgml-catalog-r1.eclass
@@ -35,7 +35,7 @@ sgml-catalog-r1_update_catalog() {
 
 	if [[ ${#cats[@]} -gt 0 ]]; then
 		ebegin "Updating ${EROOT}/etc/sgml/catalog"
-		printf 'CATALOG "%s"\n' "${cats[@]}" > "${T}"/catalog &&
+		printf 'CATALOG "%s"\n' "${cats[@]#${ROOT}}" > "${T}"/catalog &&
 		mv "${T}"/catalog "${EROOT}"/etc/sgml/catalog
 		eend "${?}"
 	else
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b8b1f962e817..185471b59824 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index fa245d4157ac..0ca3a6b4047a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Apr 2023 03:39:40 +0000
+Tue, 04 Apr 2023 09:39:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 341620b48c3f..bf0dccb27627 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-04T03:39:44Z
+TIMESTAMP 2023-04-04T09:39:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQrnABfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQr8GBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC6JxAAirBZSolC9oyx45HEzsCaJ0rz1qu7paFbPzwLfMp+SztikGbhDT9oqEtv
-XC2QXQ2IPGtrFCGFAmIttWaad8nYlH/SdSywKvSERusiDg4UQR8MgPRF5oJD5Pj1
-0Wntd249sKCL8XdeGKGd7MnuMxnC/VKGCamANiKbNu0XEAP2qnHykJlFX+jt9Unn
-HIXzyQM9PW/JfMu5YJYITVfW9XGgJn5DGlxwa8Tz5YYI3cNb9acvaeVDiWFxbKlP
-pG8vMl9GaECIl01xPBcRMXQP1xw9F3KBNyA3I2MYy7eLSm8qMKzI4CVmOC1UA7tC
-MBmzH63PDb9oYzNSGyiiNZqJkAajma1DrD26cDCSZpPqKnd9dA8zp2x78scZ1YCi
-kjSdULRcVt6nuTIEHYfLroL8fgI3hlCdepq8/D9fK5cnl7w7NcjITiSrlBlryd3w
-tOZ6jIOgtwfrTBuEvjTyqpibVVittetqUyoLbvKAtOwp5tSkAp44dmR4qi5qC3+F
-S0ZxaJT3zbxjDpRLp5e05S7tKKQlUismTF1mMP0f4L4Y4xsERlXEezg1SqGqTz9s
-l8TsomHs2b1i9NqhhwiRyD+V5JJIMoufw5JA/QAgkKI+HaO/06NNKGig2HUxMZSv
-60HGM2b7Oj2jVn2IIcKQ3N/tpQ2vkoD3z1OpqHTnWCaPPkNryiU=
-=Kx6i
+klCPRxAAitC91usW4Bog+TlSmKHl/qmu6h5QD9IMvS206BFu0EkYz805TE4WaYOW
+xTHYFoqb+WBnFWQ4FWKaDXPRExTmy7dpdDKfmg2BRPnjcM4xpZOrLEWn1Nc/gJRl
+CTDW+gGLmhOgLMi1BP7PG2Qzowz0PwAUFyjxAe2pZrjhf1odmv+czEn4Kv28XI/N
+XcKd1JzbjNuLTEgf5DneTbt2o8xTOSp55Jk77sI6dfOmn/+uCjZNGVquXmrpR1Dk
+5Fb0HfmSzyNFuJGY6do3gq/+R1DiooITuY1fScSnJLvV1WgdrtzwGw6fDVCNIIEh
+/X2oWglHDAicLlKK77g901nDYLA1iM7rrYSc8dsKv+nSpp6PjR6jyVmWNwlwxdVj
+UxXDKsju9rmDAh7qrre7niGa7FmQpLAEFh59MAHdgYrKPmk198+XxfzQ3HklY5Ga
+A4vebCWgWNBslNhcFGETS/I2QKVUeS2CcxN05T2R2ociXoUipytniw8U8tnnNJZ8
+UMg0zd116yonOgwsdzu7FM6pEVJQ2wpwMS8cB4lNK3SJpwfXbFNlHAN46A7UwW3r
+y3iVFMYpEbhctDCqeIaMjzPHxIQ+qS7YQW2D653gdtmVKP5IuNfjNvTPKxGAoD9+
+DF6HPKmwF5oIZnpCQCsu0ksUcTh9N42U9Lcmr/ueELfIxgV9eC8=
+=fw/s
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index fa245d4157ac..0ca3a6b4047a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Apr 2023 03:39:40 +0000
+Tue, 04 Apr 2023 09:39:42 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b9b498198cdf..f770154e4ae7 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 6c32e72a3dc9..1fb7894d5ca9 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.105 b/metadata/md5-cache/app-admin/awscli-1.27.105
new file mode 100644
index 000000000000..90fed9c0e950
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.105
@@ -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.105[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/setuptools-65.7.1[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.105[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.105.tar.gz -> aws-cli-1.27.105.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	761304ceeb845986696f9a65cf4b6f01	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-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 6105cb813cbb..7be6cfc0a25c 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/elsw-0.0.0-r1 b/metadata/md5-cache/app-portage/elsw-0.0.0-r1
index 1971be189648..51092f2dad4f 100644
--- a/metadata/md5-cache/app-portage/elsw-0.0.0-r1
+++ b/metadata/md5-cache/app-portage/elsw-0.0.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/xgqt/python-elsw/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/portage[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 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/e/elsw/elsw-0.0.0.tar.gz
 _eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	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_=efb303645659a5ade394bfbdde5c596a
+_md5_=530e996acdc09bfd69c804b163f0cb9d
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 5ffab9a356bb..9d1975ee1b0d 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r4 b/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r4
index eecb055f5372..8df38f2f1b21 100644
--- a/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r4
+++ b/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-text/docbook-sgml-dtd:3.0 >=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/docbook/docbook-dsssl/1.79/docbook-dsssl-1.79.tar.bz2
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=411be6bc60ab4c77c07c8d0674f4fecf
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r5 b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r5
index c8ee3a8e3d1b..69c8c81bf2d9 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r5
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r5
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=3.0
 SRC_URI=https://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=fdb06a3cda921068879568f2436a89ee
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r5 b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r5
index c5795a62e0e6..650fd8ffd861 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r5
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r5
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=3.1
 SRC_URI=https://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=fdb06a3cda921068879568f2436a89ee
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.0-r5 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.0-r5
index 6980c3709b79..36e0fdab791c 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.0-r5
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.0-r5
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=4.0
 SRC_URI=https://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=fdb06a3cda921068879568f2436a89ee
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r5 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r5
index f0e6c185c621..fc65f110c823 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r5
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r5
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=4.1
 SRC_URI=https://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=7eae3a9935391eed0d9ff6e56b4d87f6
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.2-r4 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.2-r4
index dd8b498f9156..0b92f5db753a 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.2-r4
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.2-r4
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=4.2
 SRC_URI=https://www.oasis-open.org/docbook/sgml/4.2/docbook-4.2.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=65bc7a02443ac6426dab280814952bb9
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.3-r4 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.3-r4
index 0f30c9d415f2..68ddb7cfbdbb 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.3-r4
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.3-r4
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=4.3
 SRC_URI=https://docbook.org/sgml/4.3/docbook-4.3.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=f7ada44940721d006791548dff3dd960
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.4-r2 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.4-r2
index f25005c8c2e4..0e8a660c61e5 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.4-r2
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.4-r2
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=4.4
 SRC_URI=https://docbook.org/sgml/4.4/docbook-4.4.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=d9db66ec5f57c494f771e8aae13bf7be
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r2 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r2
index eff11897292a..831de6a2907d 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r2
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r2
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=4.5
 SRC_URI=https://docbook.org/sgml/4.5/docbook-4.5.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=9f6cec8ad25f14cddfeefb26484cb629
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r7 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r7
index 98f2eb5cc086..2099b2359a1a 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r7
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r7
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
 SLOT=4.1.2
 SRC_URI=https://docbook.org/xml/4.1.2/docbkx412.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=8e5d751740564c3b398c87a526e2d7ec
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r3 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r3
index 87457bb26b40..184c8cece656 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r3
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r3
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
 SLOT=4.2
 SRC_URI=https://docbook.org/xml/4.2/docbook-xml-4.2.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=ba000bdac341e44bb35e6fe1e6884641
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r2 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r2
index e444939b03fd..e6e155508ade 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r2
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r2
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
 SLOT=4.3
 SRC_URI=https://docbook.org/xml/4.3/docbook-xml-4.3.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=ba000bdac341e44bb35e6fe1e6884641
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r3 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r3
index 830068d3ed81..19d2310db93e 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r3
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r3
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
 SLOT=4.4
 SRC_URI=https://docbook.org/xml/4.4/docbook-xml-4.4.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=57c1c8281f55012e526503949386cdce
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r2 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r2
index afc7e770df28..b52ce9b88e66 100644
--- a/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r2
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r2
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
 SLOT=4.5
 SRC_URI=https://docbook.org/xml/4.5/docbook-xml-4.5.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=57c1c8281f55012e526503949386cdce
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r3 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r3
index 0dee21e38a5d..269a9e277ffc 100644
--- a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r3
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r3
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/build-docbook-catalog-1.6 >=app-text/sgml-common-0.6.3-r7
 SLOT=1.0
 SRC_URI=https://www.oasis-open.org/docbook/xml/simple/1.0/docbook-simple-1.0.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=2f65738a2cd409ffc7f3d40f609db531
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r4 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r4
index 769805a9ce8d..62ccb17da66b 100644
--- a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r4
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r4
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/build-docbook-catalog-1.6 >=app-text/sgml-common-0.6.3-r7
 SLOT=4.1.2.4
 SRC_URI=mirror://gentoo/sdb4124.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=15da3c143284e6a7026b49c22c23741e
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.5-r3 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.5-r3
index fd7a81ccc8e0..0cf1c25e40f8 100644
--- a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.5-r3
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.5-r3
@@ -9,5 +9,5 @@ LICENSE=docbook
 RDEPEND=>=app-text/build-docbook-catalog-1.6 >=app-text/sgml-common-0.6.3-r7
 SLOT=4.1.2.5
 SRC_URI=https://www.oasis-open.org/docbook/xml/simple/4.1.2.5/simple4125.zip
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=f39a797eee41f2a2eaca251ec2a3bb2e
diff --git a/metadata/md5-cache/app-text/html401-19991224-r4 b/metadata/md5-cache/app-text/html401-19991224-r4
index 8d1a006cec40..159ff3743c76 100644
--- a/metadata/md5-cache/app-text/html401-19991224-r4
+++ b/metadata/md5-cache/app-text/html401-19991224-r4
@@ -8,5 +8,5 @@ LICENSE=W3C
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=https://www.w3.org/TR/1999/REC-html401-19991224/html40.tgz
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=9aa293994276484cc3670c6c9a238a6d
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
index d0d1c87db140..7cec0e1dae04 100644
--- a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-3+ MIT SGMLUG
 RDEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff virtual/latex-base >=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/-/archive/0.9.73/linuxdoc-tools-0.9.73.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	latex-package	c20e442c3953c765f636630631c96194	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	perl-functions	c3fca037246e877693badea0df3b0ef8	sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	latex-package	c20e442c3953c765f636630631c96194	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	perl-functions	c3fca037246e877693badea0df3b0ef8	sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=752f85885f5bfb20a100018fc7d65c07
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.82 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.82
index 761e599b25ed..56431e4566f0 100644
--- a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.82
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.82
@@ -11,5 +11,5 @@ LICENSE=GPL-3+ MIT SGMLUG
 RDEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff virtual/latex-base >=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/-/archive/0.9.82/linuxdoc-tools-0.9.82.tar.bz2
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	latex-package	c20e442c3953c765f636630631c96194	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	perl-functions	c3fca037246e877693badea0df3b0ef8	sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	latex-package	c20e442c3953c765f636630631c96194	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	perl-functions	c3fca037246e877693badea0df3b0ef8	sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=725f449837ca82885893e7f858e202f1
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r9 b/metadata/md5-cache/app-text/openjade-1.3.2-r9
index 6baeaccc1faa..f7c556c9f335 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r9
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r9
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1 >=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/openjade/openjade/1.3.2/openjade-1.3.2.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=0db35bbcc9b09e0c287abefd42c40ab1
diff --git a/metadata/md5-cache/app-text/sgml-common-0.6.3-r7 b/metadata/md5-cache/app-text/sgml-common-0.6.3-r7
index 242dcb9e8c75..829ccec88f51 100644
--- a/metadata/md5-cache/app-text/sgml-common-0.6.3-r7
+++ b/metadata/md5-cache/app-text/sgml-common-0.6.3-r7
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=FDL-1.1+ GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/sgml-common/sgml-common-0.6.3-gentoo.tar.gz
-_eclasses_=prefix	eab3c99d77fe00506c109c8a736186f7	sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=prefix	eab3c99d77fe00506c109c8a736186f7	sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=5b729bea012c18211b768f840b17af23
diff --git a/metadata/md5-cache/app-text/xhtml1-20020801-r6 b/metadata/md5-cache/app-text/xhtml1-20020801-r6
index 721a8523fd5a..788fc6c30fde 100644
--- a/metadata/md5-cache/app-text/xhtml1-20020801-r6
+++ b/metadata/md5-cache/app-text/xhtml1-20020801-r6
@@ -9,5 +9,5 @@ LICENSE=W3C
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=mirror://gentoo/xhtml1-20020801.tgz
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=b844cd3ea9c337d78eb0da85ce3d842a
diff --git a/metadata/md5-cache/app-text/xhtml11-20101123 b/metadata/md5-cache/app-text/xhtml11-20101123
index bb708a6cc5cd..c30e04567ea7 100644
--- a/metadata/md5-cache/app-text/xhtml11-20101123
+++ b/metadata/md5-cache/app-text/xhtml11-20101123
@@ -9,5 +9,5 @@ LICENSE=W3C
 RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=http://www.w3.org/TR/xhtml11/xhtml11.tgz -> xhtml11-20101123.tar.gz
-_eclasses_=sgml-catalog-r1	c931ba6cf39bb03a7cd1e7c0704bb42f
+_eclasses_=sgml-catalog-r1	40da8a44bfe6d80c370ce8e61eb5cee6
 _md5_=a1c0b135e8b7f4d05cb967a7d07914a8
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 9d8bb364493e..9ef70a0a4d98 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/sqlite-3.41.2-r1 b/metadata/md5-cache/dev-db/sqlite-3.41.2-r1
index 69deb50171ae..53d2fbc814aa 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.41.2-r1
+++ b/metadata/md5-cache/dev-db/sqlite-3.41.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://sqlite.org/
 INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
 IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=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(-)?] icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:= )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://sqlite.org/2023/sqlite-src-3410200.zip doc? ( https://sqlite.org/2023/sqlite-doc-3410200.zip )
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e536c0ab439bfd1278d1a55ae0cafeee
+_md5_=58dd655baeea17652b652dda4938ebbd
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 5a86117ad739..a90e27e35557 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/byte-buddy-1.14.0 b/metadata/md5-cache/dev-java/byte-buddy-1.14.0
index ffc54ee2de63..1d891960d40b 100644
--- a/metadata/md5-cache/dev-java/byte-buddy-1.14.0
+++ b/metadata/md5-cache/dev-java/byte-buddy-1.14.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://bytebuddy.net
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=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/raphw/byte-buddy/archive/byte-buddy-1.14.0.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=1d9735ab9dd2cc168b8360d9d1677994
+_md5_=d84470f756500db38afd88e36d5da887
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1 b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1
index f4d84fa0c859..016cb81fa3bf 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://jakartaee.github.io/jaf-api/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jakartaee/jaf-api/archive/2.1.1.tar.gz -> jakarta-activation-api-2.1.1.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=a969ba3cd4005831d1e73a0de211e048
+_md5_=6d2f859a5591fa6ba3c10133e6dc2fe9
diff --git a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.1 b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.1
index 6e36675547fa..8b7cab7c49cb 100644
--- a/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.1
+++ b/metadata/md5-cache/dev-java/jakarta-mail-api-2.1.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://jakartaee.github.io/mail-api/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakartaee/mail-api/archive/2.1.1.tar.gz -> jakarta-mail-api-2.1.1.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=7f7c5612addf0e15e55a59e17c953b13
+_md5_=9e3062cfbd382a2dbd78bd7f700886a6
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 913d4e8febc5..edb801ada310 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.25.0 b/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.25.0
index 89d4df82df66..21f8da70c950 100644
--- a/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.25.0
+++ b/metadata/md5-cache/dev-perl/Type-Tiny-XS-0.25.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Type-Tiny-XS
 INHERIT=perl-module
 IUSE=test minimal test
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/Type-Tiny ) dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-XS-0.025.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=afe3cf8fe44b2337ac04f451f5fee27a
+_md5_=d6a96d7d4dd8e7cfd6b004c6def2a7b7
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 2b97b9d35188..ba8e0efc954a 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/awxkit-22.0.0 b/metadata/md5-cache/dev-python/awxkit-22.0.0
new file mode 100644
index 000000000000..f7f1fc195ee4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/awxkit-22.0.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Command line interface for Ansible AWX
+EAPI=8
+HOMEPAGE=https://github.com/ansible/awx/ https://pypi.org/project/awxkit/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ansible/awx/archive/22.0.0.tar.gz -> awx-22.0.0.gh.tar.gz
+_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	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_=b84e9b386712eae8abe79c245fddea47
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.105 b/metadata/md5-cache/dev-python/boto3-1.26.105
new file mode 100644
index 000000000000..084ae2655a52
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.105
@@ -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.105[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/setuptools-65.7.1[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.105[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.105.tar.gz -> boto3-1.26.105.gh.tar.gz
+_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	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.105 b/metadata/md5-cache/dev-python/botocore-1.29.105
new file mode 100644
index 000000000000..8ec02f90b291
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.105
@@ -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/setuptools-65.7.1[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.105.tar.gz -> botocore-1.29.105.gh.tar.gz
+_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	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.76.2 b/metadata/md5-cache/dev-python/cfn-lint-0.76.2
new file mode 100644
index 000000000000..5b4e0639b438
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.76.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/aws-sam-translator-1.62.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/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/setuptools-65.7.1[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.62.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/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.76.2.tar.gz
+_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	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_=19179a33cd541aa4a9182d3e5d11a366
diff --git a/metadata/md5-cache/dev-python/fakeredis-2.10.3 b/metadata/md5-cache/dev-python/fakeredis-2.10.3
new file mode 100644
index 000000000000..b015866c99cb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fakeredis-2.10.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-db/redis dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/redis-4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sortedcontainers-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.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/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Fake implementation of redis API for testing purposes
+EAPI=8
+HOMEPAGE=https://github.com/cunla/fakeredis-py/ https://pypi.org/project/fakeredis/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/redis-4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sortedcontainers-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.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/f/fakeredis/fakeredis-2.10.3.tar.gz
+_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	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_=dac72955ae9201db2a4e99b9d757aad3
diff --git a/metadata/md5-cache/dev-python/nbclassic-0.5.4 b/metadata/md5-cache/dev-python/nbclassic-0.5.4
new file mode 100644
index 000000000000..928bc8b155f4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nbclassic-0.5.4
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/jupyter-server-terminals[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-jupyter[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-tornasync[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/requests-unixsocket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( virtual/pandoc ) test? ( dev-python/argon2-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-4.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook_shim-0.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/send2trash-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-4.2.1[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/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/nbsphinx[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/myst-parser[python_targets_python3_11(-)] dev-python/ipython_genutils[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-python/nbsphinx[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/myst-parser[python_targets_python3_10(-)] dev-python/ipython_genutils[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(-)] dev-python/nbsphinx[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/myst-parser[python_targets_python3_9(-)] dev-python/ipython_genutils[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/jupyter_packaging-0.12.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=Jupyter Notebook as a Jupyter Server Extension
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbclassic/ https://pypi.org/project/nbclassic/
+INHERIT=distutils-r1 pypi xdg-utils
+IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~x86
+LICENSE=BSD
+PDEPEND=<dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=dev-python/argon2-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-4.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook_shim-0.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/send2trash-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-4.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 )
+REQUIRED_USE=|| ( 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/n/nbclassic/nbclassic-0.5.4.tar.gz
+_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	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	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9f0cae560dfa6124cfc94268654f1823
diff --git a/metadata/md5-cache/dev-python/nbclient-0.7.3 b/metadata/md5-cache/dev-python/nbclient-0.7.3
index c14b8bf03dce..bd33f40f8623 100644
--- a/metadata/md5-cache/dev-python/nbclient-0.7.3
+++ b/metadata/md5-cache/dev-python/nbclient-0.7.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbconvert[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter_client-6.1.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.3[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(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/flaky[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbconvert[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testpath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmltodict[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter_client-6.1.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.3[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(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A client library for executing Jupyter notebooks
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/nbclient/archive/v0.7.3.tar.gz -> nbclient-0.7.3.gh.tar.gz
 _eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	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_=b7f607ab40e81fb56e9af6dfa7fc007c
+_md5_=977a8a7ecfd72924a098dcc72b051317
diff --git a/metadata/md5-cache/dev-python/nbconvert-7.3.0 b/metadata/md5-cache/dev-python/nbconvert-7.3.0
new file mode 100644
index 000000000000..1e36359012fe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nbconvert-7.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipywidgets-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[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(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Converting Jupyter Notebooks
+EAPI=8
+HOMEPAGE=https://nbconvert.readthedocs.io/ https://github.com/jupyter/nbconvert/ https://pypi.org/project/nbconvert/
+INHERIT=distutils-r1 multiprocessing pypi virtualx
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.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 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/n/nbconvert/nbconvert-7.3.0.tar.gz
+_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	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	virtualx	817571665ee28575da44ee08135089e5
+_md5_=9f9f6e99ef546979667641e70ec9cef7
diff --git a/metadata/md5-cache/dev-python/pillow-9.4.0 b/metadata/md5-cache/dev-python/pillow-9.4.0
deleted file mode 100644
index 24d051338755..000000000000
--- a/metadata/md5-cache/dev-python/pillow-9.4.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[tk?,threads(+)] ) >=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/setuptools-65.7.1[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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= )
-DESCRIPTION=Python Imaging Library (fork)
-EAPI=8
-HOMEPAGE=https://python-pillow.org/ https://github.com/python-pillow/ https://pypi.org/project/Pillow/
-INHERIT=distutils-r1 toolchain-funcs virtualx
-IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=HPND
-RDEPEND=imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) dev-python/olefile[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=[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[tk?,threads(+)] )
-REQUIRED_USE=test? ( jpeg jpeg2k lcms tiff truetype ) || ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-pillow/Pillow/archive/9.4.0.tar.gz -> pillow-9.4.0.gh.tar.gz
-_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	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_=a098adb8226306ea57e1f4445b2800da
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.54.0 b/metadata/md5-cache/dev-python/zeroconf-0.54.0
new file mode 100644
index 000000000000..1030fb10a7bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zeroconf-0.54.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=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(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
+EAPI=8
+HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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://files.pythonhosted.org/packages/source/z/zeroconf/zeroconf-0.54.0.tar.gz
+_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	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_=152fa021562410281ccaf7caa8e8f363
diff --git a/metadata/md5-cache/dev-python/zstandard-0.19.0 b/metadata/md5-cache/dev-python/zstandard-0.19.0
deleted file mode 100644
index a726cb3dff5f..000000000000
--- a/metadata/md5-cache/dev-python/zstandard-0.19.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <app-arch/zstd-1.5.4:= python_targets_python3_9? ( >=dev-python/cffi-1.14.0-r2:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.14.0-r2:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.14.0-r2:=[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/setuptools-65.7.1[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
-DEPEND=<app-arch/zstd-1.5.4:=
-DESCRIPTION=Zstandard Bindings for Python
-EAPI=8
-HOMEPAGE=https://github.com/indygreg/python-zstandard/ https://pypi.org/project/zstandard/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=<app-arch/zstd-1.5.4:= python_targets_python3_9? ( >=dev-python/cffi-1.14.0-r2:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.14.0-r2:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.14.0-r2:=[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://github.com/indygreg/python-zstandard/archive/0.19.0.tar.gz -> python-zstandard-0.19.0.gh.tar.gz
-_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	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_=962b9411f6ddcb32d459e23f9f29f49f
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index ab9c93a0e61d..deb6f6fae601 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1 b/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
deleted file mode 100644
index 149c87a58710..000000000000
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec-its[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Universal Ruby library to handle WebSocket protocol
-EAPI=8
-HOMEPAGE=https://github.com/imanel/websocket-ruby
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/websocket-1.2.9.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f44d965cf5927ee374ca464673bbf0b3
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 68db75523229..b235ae55244b 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/clippy-8.5 b/metadata/md5-cache/dev-util/clippy-8.5
new file mode 100644
index 000000000000..a8a2f500a642
--- /dev/null
+++ b/metadata/md5-cache/dev-util/clippy-8.5
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bison sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare setup
+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 ) virtual/libelf:=
+DESCRIPTION=Standalone clippy tool built from FRR sources
+EAPI=8
+HOMEPAGE=https://frrouting.org/
+INHERIT=autotools python-single-r1
+IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm64 ~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 ) virtual/libelf:=
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/FRRouting/frr/archive/frr-8.5.tar.gz -> clippy-8.5.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=2772e008075b990e36b1f2293acc5477
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 9b0e76caf682..9c085360a088 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r14 b/metadata/md5-cache/mail-mta/netqmail-1.06-r14
index 0166054093fc..17ac1cbc12c5 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r14
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r14
@@ -12,5 +12,5 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( https://mirror.alexh.name/qmail/netqmail/netqmail-1.05-tls-smtpauth-20190114.patch http://inoa.net/qmail-tls/vu555316.patch https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch ) )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c6d63215ebf4bd626074ac56aa39b64d
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r16 b/metadata/md5-cache/mail-mta/netqmail-1.06-r16
index 21a9d7053eea..2bc67ea88379 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r16
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r16
@@ -13,5 +13,5 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( https://mirror.alexh.name/qmail/netqmail/netqmail-1.05-tls-smtpauth-20190114.patch http://inoa.net/qmail-tls/vu555316.patch https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch ) )
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=0e74e4590c8c33782dbd89dbeaa62245
diff --git a/metadata/md5-cache/mail-mta/notqmail-1.08-r5 b/metadata/md5-cache/mail-mta/notqmail-1.08-r5
index 906a23a663dd..4b344a43a835 100644
--- a/metadata/md5-cache/mail-mta/notqmail-1.08-r5
+++ b/metadata/md5-cache/mail-mta/notqmail-1.08-r5
@@ -14,5 +14,5 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/notqmail/notqmail/releases/download/notqmail-1.08/notqmail-1.08.tar.xz https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> notqmail-1.08-tls-spp.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> notqmail-1.08-spp.patch ) ) ssl? ( https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> notqmail-1.08-tls-20200107.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch ) )
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=628be83ae1235987fba48a21783b9529
diff --git a/metadata/md5-cache/mail-mta/notqmail-1.08-r6 b/metadata/md5-cache/mail-mta/notqmail-1.08-r6
index 105536913965..a5ed5d071001 100644
--- a/metadata/md5-cache/mail-mta/notqmail-1.08-r6
+++ b/metadata/md5-cache/mail-mta/notqmail-1.08-r6
@@ -14,5 +14,5 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/notqmail/notqmail/releases/download/notqmail-1.08/notqmail-1.08.tar.xz verify-sig? ( https://github.com/notqmail/notqmail/releases/download/notqmail-1.08/notqmail-1.08.tar.xz.sig ) https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> notqmail-1.08-tls-spp.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> notqmail-1.08-spp.patch ) ) ssl? ( https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> notqmail-1.08-tls-20200107.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch ) )
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=0e1d27a23236ef8bd00cfe6626dbcf9c
diff --git a/metadata/md5-cache/mail-mta/notqmail-9999 b/metadata/md5-cache/mail-mta/notqmail-9999
index a680965d8216..62f3ff8a553a 100644
--- a/metadata/md5-cache/mail-mta/notqmail-9999
+++ b/metadata/md5-cache/mail-mta/notqmail-9999
@@ -14,5 +14,5 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> notqmail-1.08-tls-spp.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> notqmail-1.08-spp.patch ) ) ssl? ( https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> notqmail-1.08-tls-20200107.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch ) )
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=7b2ab6c357b73af05fcbaa26c357f556
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index b598d34673f2..32b6d9879b03 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.1 b/metadata/md5-cache/net-analyzer/zabbix-6.4.1
new file mode 100644
index 000000000000..21c3f964e7bd
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/6.4
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.1.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.1-go-deps.tar.xz )
+_eclasses_=go-module	f9700c7efec1fd4955363169e9930c1c	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=33a048596fcccf3bfd46f4fd45e87ec6
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 0928bb7599a5..74b9bc48773a 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/mattermost-desktop-bin-5.3.0_rc7 b/metadata/md5-cache/net-im/mattermost-desktop-bin-5.3.0
index 19bb5399c248..727f346d9dce 100644
--- a/metadata/md5-cache/net-im/mattermost-desktop-bin-5.3.0_rc7
+++ b/metadata/md5-cache/net-im/mattermost-desktop-bin-5.3.0
@@ -4,9 +4,10 @@ EAPI=8
 HOMEPAGE=https://mattermost.com/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop xdg
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0 GPL-2+ LGPL-2.1+ MIT
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2[X] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/wayland media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gtk+:3[X] 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
 SLOT=0
-SRC_URI=amd64? ( https://releases.mattermost.com/desktop/5.3.0-rc.7/mattermost-desktop-5.3.0-rc.7-linux-x64.tar.gz ) arm64? ( https://releases.mattermost.com/desktop/5.3.0-rc.7/mattermost-desktop-5.3.0-rc.7-linux-arm64.tar.gz )
+SRC_URI=amd64? ( https://releases.mattermost.com/desktop/5.3.0/mattermost-desktop-5.3.0-linux-x64.tar.gz ) arm64? ( https://releases.mattermost.com/desktop/5.3.0/mattermost-desktop-5.3.0-linux-arm64.tar.gz )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c4e0d977efe38f6d49d1a8a1265bfb32
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 7810a9104d69..734f7467b9fe 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libnetconf2-2.1.31 b/metadata/md5-cache/net-libs/libnetconf2-2.1.31
new file mode 100644
index 000000000000..6d6b16a17832
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnetconf2-2.1.31
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/openssl:0= >=net-libs/libyang-2.0.194 net-libs/libssh:0=[server] virtual/libcrypt:= test? ( dev-util/cmocka )
+DESCRIPTION=C library for building NETCONF servers and clients
+EAPI=8
+HOMEPAGE=https://github.com/CESNET/libnetconf2
+INHERIT=cmake
+IUSE=doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:0= >=net-libs/libyang-2.0.194 net-libs/libssh:0=[server] virtual/libcrypt:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/CESNET/libnetconf2/archive/v2.1.31.tar.gz -> libnetconf2-2.1.31.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5edfbf37c62b0ea4092a34024086d1bc
diff --git a/metadata/md5-cache/net-libs/libyang-2.1.55 b/metadata/md5-cache/net-libs/libyang-2.1.55
new file mode 100644
index 000000000000..566194fbe8d2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libyang-2.1.55
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libpcre2 test? ( dev-util/cmocka )
+DESCRIPTION=YANG data modeling language library
+EAPI=8
+HOMEPAGE=https://github.com/CESNET/libyang
+INHERIT=cmake
+IUSE=doc test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libpcre2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/CESNET/libyang/archive/v2.1.55.tar.gz -> libyang-2.1.55.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f2bcfc123dfeaccf2b02467e9662f579
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 29db2b876228..dfb467d01dc1 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/dot-forward-0.71-r4 b/metadata/md5-cache/net-mail/dot-forward-0.71-r4
index 808a8621362f..4d85967abb19 100644
--- a/metadata/md5-cache/net-mail/dot-forward-0.71-r4
+++ b/metadata/md5-cache/net-mail/dot-forward-0.71-r4
@@ -10,5 +10,5 @@ RDEPEND=acct-group/nofiles acct-group/qmail
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cr.yp.to/software/dot-forward-0.71.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=39e8e03e8a7bacfe198b72bd4ff2c576
diff --git a/metadata/md5-cache/net-mail/dot-forward-0.71-r5 b/metadata/md5-cache/net-mail/dot-forward-0.71-r5
index 57470f78d6ac..1a48a73438a3 100644
--- a/metadata/md5-cache/net-mail/dot-forward-0.71-r5
+++ b/metadata/md5-cache/net-mail/dot-forward-0.71-r5
@@ -10,5 +10,5 @@ RDEPEND=acct-group/nofiles acct-group/qmail
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cr.yp.to/software/dot-forward-0.71.tar.gz https://dev.gentoo.org/~sam/distfiles/net-mail/dot-forward/dot-forward-0.71-fix-build-for-clang16.patch.xz
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=d041ee4f6940bb43a41415198e0e0862
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r5 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r5
index d3c4c51c3ed6..ad541371f3a9 100644
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r5
+++ b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r5
@@ -11,5 +11,5 @@ RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* )
 REQUIRED_USE=?? ( mysql postgres )
 SLOT=0
 SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5d0b8d9686fcc56b4181abd8ebe6e874
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.2.2-r1 b/metadata/md5-cache/net-mail/ezmlm-idx-7.2.2-r1
index 78ace08cda9a..5785fa8e9ea2 100644
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.2.2-r1
+++ b/metadata/md5-cache/net-mail/ezmlm-idx-7.2.2-r1
@@ -11,5 +11,5 @@ RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* )
 REQUIRED_USE=?? ( mysql postgres sqlite )
 SLOT=0
 SRC_URI=https://untroubled.org/ezmlm/archive/7.2.2/ezmlm-idx-7.2.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d6cc4e13132030fd1d64ca40bd83f135
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r2 b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r2
index 2990d6f2b90e..2bc602f2510c 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r2
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.15-r2
@@ -12,5 +12,5 @@ RDEPEND=net-mail/autorespond >=net-mail/vpopmail-5.4.33 virtual/libcrypt:= virtu
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.15.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	webapp	1aad5c010cfdf11d0376c80467b0de4c	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	webapp	1aad5c010cfdf11d0376c80467b0de4c	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=37388a12078878e0f2c6c5f188352b2a
diff --git a/metadata/md5-cache/net-mail/qmailadmin-1.2.16-r1 b/metadata/md5-cache/net-mail/qmailadmin-1.2.16-r1
index 5d95cfc3122d..d7f45081fba9 100644
--- a/metadata/md5-cache/net-mail/qmailadmin-1.2.16-r1
+++ b/metadata/md5-cache/net-mail/qmailadmin-1.2.16-r1
@@ -12,5 +12,5 @@ RDEPEND=virtual/libcrypt:= virtual/qmail >=net-mail/vpopmail-5.4.33 net-mail/aut
 RESTRICT=userpriv
 SLOT=0
 SRC_URI=mirror://sourceforge/qmailadmin/qmailadmin-1.2.16.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	webapp	1aad5c010cfdf11d0376c80467b0de4c	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	webapp	1aad5c010cfdf11d0376c80467b0de4c	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7c0d4c338679d261e318f71cba0dd4f9
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r9 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r9
index 30b23b8e3b37..7b311b6e2185 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r9
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r9
@@ -12,5 +12,5 @@ RDEPEND=acct-group/vpopmail acct-user/vpopmail virtual/libcrypt:= virtual/qmail
 REQUIRED_USE=mysql? ( !postgres )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=65d2d68ba4f8d9045e9317eb1c8372d0
diff --git a/metadata/md5-cache/net-mail/vqadmin-2.3.7-r1 b/metadata/md5-cache/net-mail/vqadmin-2.3.7-r1
index 2e9f09ad90aa..06da577baf6b 100644
--- a/metadata/md5-cache/net-mail/vqadmin-2.3.7-r1
+++ b/metadata/md5-cache/net-mail/vqadmin-2.3.7-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libcrypt:= virtual/qmail >=net-mail/vpopmail-5.3 net-mail/qmailadmin app-admin/webapp-config
 SLOT=0
 SRC_URI=http://www.inter7.com/vqadmin/vqadmin-2.3.7.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	webapp	1aad5c010cfdf11d0376c80467b0de4c	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	webapp	1aad5c010cfdf11d0376c80467b0de4c	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=139d5ccd8073a684936acd81af3f79f1
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index de69592827ae..7ca25e67719c 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/frr-8.5 b/metadata/md5-cache/net-misc/frr-8.5
new file mode 100644
index 000000000000..22b8bd98a1f7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/frr-8.5
@@ -0,0 +1,17 @@
+BDEPEND=~dev-util/clippy-8.5 sys-devel/flex app-alternatives/yacc doc? ( dev-python/sphinx ) 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 configure install prepare setup
+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 ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.8.0[ssh] ) snmp? ( net-analyzer/net-snmp:= ) elibc_musl? ( sys-libs/queue-standalone ) test? ( python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pytest[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pytest[python_targets_python3_11(-)] ) )
+DESCRIPTION=The FRRouting Protocol Suite
+EAPI=7
+HOMEPAGE=https://frrouting.org/
+INHERIT=autotools pam python-single-r1 systemd
+IUSE=doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm64 ~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 ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.8.0[ssh] ) snmp? ( net-analyzer/net-snmp:= ) python_single_target_python3_9? ( dev-python/ipaddr[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/ipaddr[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/ipaddr[python_targets_python3_11(-)] ) !net-misc/quagga
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FRRouting/frr/archive/frr-8.5.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_=ace2b25e0242784d8c32fddd6590d77a
diff --git a/metadata/md5-cache/net-misc/netopeer2-2.1.59 b/metadata/md5-cache/net-misc/netopeer2-2.1.59
new file mode 100644
index 000000000000..46b3aafd71eb
--- /dev/null
+++ b/metadata/md5-cache/net-misc/netopeer2-2.1.59
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/openssl:= net-misc/curl:= >=net-misc/sysrepo-2.2.60 >=net-libs/libnetconf2-2.1.31 net-libs/libssh:= >=net-libs/libyang-2.1.55
+DESCRIPTION=Server for implementing NETCONF configuration management
+EAPI=8
+HOMEPAGE=https://github.com/CESNET/netopeer2
+INHERIT=cmake
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:= net-misc/curl:= >=net-misc/sysrepo-2.2.60 >=net-libs/libnetconf2-2.1.31 net-libs/libssh:= >=net-libs/libyang-2.1.55
+SLOT=0
+SRC_URI=https://github.com/CESNET/netopeer2/archive/v2.1.59.tar.gz -> netopeer2-2.1.59.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=0a22fbeebfad6f113d78cf289a25d608
diff --git a/metadata/md5-cache/net-misc/sysrepo-2.2.60 b/metadata/md5-cache/net-misc/sysrepo-2.2.60
new file mode 100644
index 000000000000..8f35e763a35a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sysrepo-2.2.60
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-libs/libyang-2.1.55
+DESCRIPTION=YANG-based configuration and operational state data store
+EAPI=8
+HOMEPAGE=https://www.sysrepo.org
+INHERIT=cmake
+IUSE=doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/libyang-2.1.55
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sysrepo/sysrepo/archive/v2.2.60.tar.gz -> sysrepo-2.2.60.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=027f3e6597852da31e0e3c72a96fada9
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 1eab7c1f1b27..2c70b18a581f 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/mldonkey-3.1.7-r4 b/metadata/md5-cache/net-p2p/mldonkey-3.1.7-r4
new file mode 100644
index 000000000000..e4bb0af11dc3
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/mldonkey-3.1.7-r4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-lang/perl dev-ml/camlp4:= gd? ( media-libs/gd:2=[truetype] ) magic? ( sys-apps/file ) upnp? ( net-libs/libnatpmp net-libs/miniupnpc:= ) acct-user/p2p app-arch/bzip2 sys-libs/zlib <dev-lang/ocaml-4.10:=[ocamlopt?] bittorrent? ( || ( <dev-lang/ocaml-4.06[ocamlopt?] dev-ml/num ) )
+DESCRIPTION=Multi-network P2P application written in Ocaml, with Gtk, web & telnet interface
+EAPI=7
+HOMEPAGE=http://mldonkey.sourceforge.net/ https://github.com/ygrek/mldonkey
+INHERIT=autotools flag-o-matic systemd toolchain-funcs
+IUSE=bittorrent doc fasttrack gd gnutella magic +ocamlopt upnp
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-ml/camlp4:= gd? ( media-libs/gd:2=[truetype] ) magic? ( sys-apps/file ) upnp? ( net-libs/libnatpmp net-libs/miniupnpc:= ) acct-user/p2p app-arch/bzip2 sys-libs/zlib
+RESTRICT=!ocamlopt? ( strip )
+SLOT=0
+SRC_URI=https://github.com/ygrek/mldonkey/releases/download/release-3-1-7-2/mldonkey-3.1.7-2.tar.bz2
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=aa124bb05b43a403f5298014e271bdad
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 830d1514abbb..b30b5f7034be 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230403 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230403
new file mode 100644
index 000000000000..a7e0f1816a4d
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230403
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/python-gnupg[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/python-gnupg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/python-gnupg[python_targets_python3_9(-)] ) ) sec-keys/openpgp-keys-gentoo-auth test? ( app-crypt/gnupg sys-apps/grep[pcre] )
+DEFINED_PHASES=compile install setup test unpack
+DESCRIPTION=Gentoo Authority Keys (GLEP 79)
+EAPI=8
+HOMEPAGE=https://www.gentoo.org/downloads/signatures/
+INHERIT=edo python-any-r1
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=public-domain
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://qa-reports.gentoo.org/output/keys/active-devs-20230403.gpg -> openpgp-keys-gentoo-developers-20230403-active-devs.gpg
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=f1445caae6f2f6dc9e7d68e376ab2c17
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index e40b1f3d38a4..178d4b2e854f 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18 b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
index 737ef8020801..d2ce3265bfc8 100644
--- a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
+++ b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
@@ -10,5 +10,5 @@ RDEPEND=!app-doc/ucspi-tcp-man selinux? ( sec-policy/selinux-ucspitcp )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz mirror://qmail/ucspi-rss.diff http://smarden.org/pape/djb/manpages/ucspi-tcp-0.88-man.tar.gz http://xs3.b92.net/tomislavr/ucspi-tcp-0.88-rblspp.patch ipv6? ( https://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff19.bz2 )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7787623dd7d4141eb841f39bfdf2dae8
diff --git a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r19 b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r19
index fbfe83e2c416..6bcb1e8ecbf1 100644
--- a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r19
+++ b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r19
@@ -10,5 +10,5 @@ RDEPEND=!app-doc/ucspi-tcp-man selinux? ( sec-policy/selinux-ucspitcp )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz mirror://qmail/ucspi-rss.diff http://smarden.org/pape/djb/manpages/ucspi-tcp-0.88-man.tar.gz http://xs3.b92.net/tomislavr/ucspi-tcp-0.88-rblspp.patch ipv6? ( https://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff20.bz2 )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=952b5ee5f14e272eb6bf04c4d89313f4
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 4996c2356be3..87356fb628a8 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/bmake-20230321 b/metadata/md5-cache/sys-devel/bmake-20230321
new file mode 100644
index 000000000000..4eac94a0c46f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/bmake-20230321
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=NetBSD's portable make
+EAPI=8
+HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
+KEYWORDS=~amd64 ~loong ~ppc ~ppc64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20230321.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
+_md5_=690eb2c92c2223c30fe9db6bc467b1bd
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index c4c173da40ec..c00065bf95be 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/daemontools-0.76-r11 b/metadata/md5-cache/sys-process/daemontools-0.76-r11
new file mode 100644
index 000000000000..94ac17fba4dc
--- /dev/null
+++ b/metadata/md5-cache/sys-process/daemontools-0.76-r11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DESCRIPTION=Collection of tools for managing UNIX services
+EAPI=8
+HOMEPAGE=https://cr.yp.to/daemontools.html
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=public-domain GPL-2
+RDEPEND=selinux? ( sec-policy/selinux-daemontools )
+SLOT=0
+SRC_URI=https://cr.yp.to/daemontools/daemontools-0.76.tar.gz http://smarden.org/pape/djb/manpages/daemontools-0.76-man-20020131.tar.gz
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=2bbba5126bd3afde08087ee7c034b899
diff --git a/metadata/md5-cache/sys-process/daemontools-encore-1.11-r1 b/metadata/md5-cache/sys-process/daemontools-encore-1.11-r1
index 239560213344..4b706360e305 100644
--- a/metadata/md5-cache/sys-process/daemontools-encore-1.11-r1
+++ b/metadata/md5-cache/sys-process/daemontools-encore-1.11-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 MIT
 RDEPEND=!app-doc/daemontools-man !sys-process/daemontools selinux? ( sec-policy/selinux-daemontools )
 SLOT=0
 SRC_URI=https://untroubled.org/daemontools-encore/daemontools-encore-1.11.tar.gz
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	a234da8a4ae9107e4006551475712881	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmail	30f39e6819a20ba64005ceeadd3845e0	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=e6aa17633178d03914b9164bb9243aac
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index a13720671b0c..1346d82dc44d 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-04T03:39:44Z
+TIMESTAMP 2023-04-04T09:39:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQrnABfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQr8GFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAdnhAAtO92bO+fs3BsNzcJJKalH49E08Fafsx8o2zOrHXZ/fpW9I3T5vAMPswf
-K0PBZ095sI4bTiepvHwWL0S1QMiOaBRstolJrolE/jTn5JYh0eXSW/v7iz5fzOcn
-F1zJC9GjU5iMqUvIOZMPbD3ZrqiMVtD1Eywq9gQnQ0fv33RT6zJSkc+uIGbHVzj6
-RPcHnqGOnTETc9H9BGCXmX++6NvTXVMpo77dveW3eDE9Z1wwRkuoX0vgGsTRN6td
-njOw692tuOEm9giDBQHJVrz81yxml1uk/GcnH14Uci56STexI4+m50f5n6cgM5pz
-CQ+EjLehxJhuUxcfDpS/TMIlYSu7ukcm8whW3FrxKOi3G8Y+d6AqvV0TVZeFo31G
-VT1LmReAVbgzgy+47pCkEWyRFo7PnaTTmkpoQgDZuy7QvbM3UjJcgClb5QW/60w0
-2NtGO0OHXWkU+i09mnMU5aQjauO5+19aO1cJac0I6TA6tgkMMfyLl72tV/9UXuT7
-yMr4WhItNLnilpe6Tn1APlpXhuYPQ+1G3t7MmrNNFxxRAPGewd2IEnNtAuqrbw2P
-aJUBhokXV4v1jtvDeLiWEt95cHVQFd6B3cHvLWs7Aa1x6FFF7PGfEPKNSm92Cdns
-Wqo553rUcRHq5/t7HUzDYO4o4WpWa9cR/I244WRLjpBNOIxXTSY=
-=udgE
+klCoMhAAk51ZZlabhm0Oy5vGaN2QTTRXKckJrW8P2N3VjEvfEkYFc9zNSaup1A7y
+uBKr3xtxFQPSwRkIoCja7gFkLzoV5mba5Q6IdhCr6nPW0zMf9popKhpmZ3wGA2nb
+SJC7Tg1033WIwa7zYnctVotEQXXDYjN1n/Efsdt75l80zaXp49+T1kekkUHH0BZn
+R2wbxT9ql33SchdDVT1MVCTgKOxRAK15HnwSlUXU9S/ipFXtkWoGVU386qIjDrSy
+Lcnqoxx+L7tpMH9KRig6p4Vw8VtXfxQ13tXbJz7uuPWBgozxPiTDJVj71JXuoX1E
+4BJswhv38ZhNQRUn+mRSTlWQlMbCLkJwWbhtivdTz5beTvLOBxpOngXWw789NI+X
+PtGYYYSTyhc3QkpusxjVBxPYbOBCzAHzfVgzd8HsrspQocFvhzju3QnmOa5S31kK
+PfSwlOqsT/FBDtzIa+sckCFD/0p/eHd2WjHLXMytrnSaBl+MZ9JdVQKuSsEaQfPb
+LE4EvmrZkwJAN9KYFyGI8cEnC2CpVlWVCk95nqBrH4gyCkdAXQ6ArCXiLtnAC4lx
+24aNWNfaixTmgj80yGeEduU22hW7SqVpvdUaqWyaSbeHWu/og+K+ttRQbAhZus4t
+xJ27SlOZVyP0zxnfSZfhJujgdYdQuoDMtg8dJoOJ3s12P85t420=
+=+SV3
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index fa245d4157ac..0ca3a6b4047a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Apr 2023 03:39:40 +0000
+Tue, 04 Apr 2023 09:39:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 91b32b3974fd..910f615fd68b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Apr  4 03:39:40 AM UTC 2023
+Tue Apr  4 09:39:42 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ebf5d522c452..ff84830ea583 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Apr 2023 03:45:01 +0000
+Tue, 04 Apr 2023 09:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 3492879d3706..3b805b7ebb32 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-526704c7f0e3ba66dd5028f1a747e6512029360d 1680572085 2023-04-04T01:34:45+00:00
+6aff85369909ec04e1370741a006d65ca3827a01 1680598903 2023-04-04T09:01:43+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5a3d481bbdba..dfb632f55222 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1680579601 Tue 04 Apr 2023 03:40:01 AM UTC
+1680601201 Tue 04 Apr 2023 09:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index fa245d4157ac..0ca3a6b4047a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 04 Apr 2023 03:39:40 +0000
+Tue, 04 Apr 2023 09:39:42 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 3ba6b866abab..a38e2b267780 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 20b1b9298b62..d8445632a9ab 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -44,6 +44,8 @@ DIST zabbix-6.2.9-go-deps.tar.xz 17974816 BLAKE2B a942d2ee65aaee0286d335951f8641
 DIST zabbix-6.2.9.tar.gz 41776052 BLAKE2B 59f103883e982296cb7b400db81c02e602b5cf39c9ed10670d0c8017c77331e2a378d1a0f716671d1a9a0670a5800fde2f9b6663eaae85fce9a1c0a91a3487d9 SHA512 a2712bc194adfc707831f32360984332591fe0b9e2f72a92f96c2d4994b1539d27ca53963a98b68c7f94cf13c1afc0438d9bbc7db733773fdb05d507873f09a9
 DIST zabbix-6.4.0-go-deps.tar.xz 21481908 BLAKE2B 83280695c1f47c9d5c794e8da0e4140ff2c432aa2d2ff14e755f855a621472c81d2dbd5dfad7fd0d735d784f834e0a2c220acb35cb5c3dddeba22494a5a0d674 SHA512 f07faa620d885a3fb81ec1e273de44831f6e95295c309997cc650958b870a9d458289e3dfaf9cea97f1e8067a9b624d2e9a5125394ac3a3117c0875f9f76f8ea
 DIST zabbix-6.4.0.tar.gz 42787621 BLAKE2B defb3819e5320488f5f35d6fbc52877a30313e9f745447559eea40b74d786a55d4a3971b1ff6072eedf805296c9b5bfe98fa3395affb50e2ba5be439091212d6 SHA512 e572c6de1a7e2f1cf5ea4a56886aabe0915d41c0f8fb6e6812dba6f7766deebe8cd743dbc8a80839fc49a794b799b93cd30dfa0741cf6fa7e1652058211f97bb
+DIST zabbix-6.4.1-go-deps.tar.xz 21571696 BLAKE2B e312fdfdc5687b94c6b2368a42d9189e7671624100d908af8ecca55fd8d590cbbea986301e638ab6b423a2b3f58bd2e1a1719b4dc6535564ba65e5aed476f3d3 SHA512 9db079435e6ececf692c9ba4d3b2af4eaedf79c742def69566e285ddd065fe9647e2472464a7a28eb99c3e6008142d7df3f5a49d71d1fb5eb73203a9996faf93
+DIST zabbix-6.4.1.tar.gz 43014634 BLAKE2B 498358bf2a5de028b1bb0c8a5ebbe45451ec9be8fe2b08726f5c853b750a504f1dd7fe1b7c68d7f05fe65382077b65716dcd554d225019433d61ecd4dd6656c9 SHA512 4f82cdbf527b34e3689b280e8a0405faa1d9066a6288b273ac50f3b3008c0a6b8fcc325b760de4204dbf52a1301d7e59eadbe74a3f7a5fc3e26d6eb2f7a5c17f
 EBUILD zabbix-4.0.44.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514afc03ea29c23495c84d493109da12faf142b9bbde2330995e2b2299b0ebd29af78c59330a6184df570072a148 SHA512 e72962f9d932ebd4114d3a6277a9a73523589deb2d68926193e9e1a85df89f4c7aa28367794300f609975133e68f756a31ab4388edbfe3ccc1e9138e3dfc0d56
 EBUILD zabbix-4.0.45.ebuild 9427 BLAKE2B 55a59585793b3217720c9a2c44b6371feb9e465fd8ad31adf040b0f8e21c883cee98b1fd26518a7c72e24ad8d42bf2523b575e94af6d80bc7ad739c8372811e6 SHA512 988468624b1f2825a14b9626ad4d53684144078fb97a225b52f8db5aba240a01d13de581a61943b3cb58f7316676c04211d51e4e043a9b487735934d9163accc
 EBUILD zabbix-5.0.30.ebuild 10142 BLAKE2B ffd5ab5a402b325ba940def36626cb3c8e6484ae8648010dde643921a793a07850b29c57c5f0b73f74d0fdd0c68c758327906696e4813f5c032cbbc761843bbc SHA512 50a9cfeb2756b2ec52f072566cc906a1bf15b0b9c96c0842dfd8d56e0e1ec26dcc0c170c0d304b8113e086545041aaa6e7acd83d2bba172e280d75f59933c619
@@ -59,4 +61,5 @@ EBUILD zabbix-6.2.7.ebuild 10208 BLAKE2B d70477439d64051a0398205cce5ec3f5b47fbb1
 EBUILD zabbix-6.2.8.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 EBUILD zabbix-6.2.9.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 EBUILD zabbix-6.4.0.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
+EBUILD zabbix-6.4.1.ebuild 10209 BLAKE2B a9bdb478ee3bcf0258ff08f869d73d050d8bbdbb56491b50707388729f90abfe01599a787def5b1ef89c0a7049b6780a247bbbe334105771a384cf5ae53f44a0 SHA512 1140da0734d117b1616d9dc951b7b083873b966dc2d0c1dba7d6ef61b9aa62713efd0382254646099c164cb13fb52f6f914913e9ec3d8c66a236b9c9d2a7ad6b
 MISC metadata.xml 1655 BLAKE2B 46ab1f5adaff6069890380b23a6edaf8f0f7380ffc4a320f17df52f2e59867bdcf09633d9c6e242434919d3512d557c2f623d2826b1453424c43dc0b0ee0a262 SHA512 62e5a8853c13dac034360bd1a7b61987b548641b76860f05a8f75181b8d8029e06bc9cbf136d42836e714cf0c193b04a589d214a7864d607bf93dd97066f1a70
diff --git a/net-analyzer/zabbix/zabbix-6.4.1.ebuild b/net-analyzer/zabbix/zabbix-6.4.1.ebuild
new file mode 100644
index 000000000000..f3edadcff0ce
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.4.1.ebuild
@@ -0,0 +1,397 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 11d3faa29daf..597633fef04c 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index 00426f89502c..8e9b3fedbec9 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -1,10 +1,10 @@
 DIST mattermost-desktop-5.2.2-linux-arm64.tar.gz 116257022 BLAKE2B 42019e849b415870e0f3cda7fd9c0e559945456ac4d06319edf074aecc9ca9bb330aa8547104d4d132f00e237324b6c9bc94dd8e1cd1bc83f50ab50f094a7fc3 SHA512 67f32eff87eae54c4cbfe2ffbec3aca1f6be39836d4e912870809a628888bbe12c2c30a16c7abc1caab0bba77c1f1b97baa01ee10d3f91615b89a57041a4c64a
 DIST mattermost-desktop-5.2.2-linux-x64.tar.gz 115646636 BLAKE2B f3d01c913205dcf2c14cfcfcfc8eba06909c36446a8d6f450270f50328adaf585c5eefa68de212fcc61d012d74b69053790ba9494ee291a90c2b382b530e2e23 SHA512 5ef578c2af8afcd55b75f93904eead8257c0f1e9614de34a13705da2c8ce8f0da2ea57cc62b1fffb12b8effa2a2a98bb200c43a7f43635dc910fa91f7e629f35
-DIST mattermost-desktop-5.3.0-rc.7-linux-arm64.tar.gz 99876187 BLAKE2B 65e3b197ae8518fe4b30009471473c7b39aa4e0bf6f74e0bd0ad0b44dbca551fb195aaf5357828037d791c716a69b713cf9f787eb7456ff6ae126328eb89bc61 SHA512 0903015f786e712c5bcdf3268966161c8efe8e7bc5b75934a885655457112229bc40e466c0b146621416c336f6bde8d4de15769258d486376382f0db28d95f4f
-DIST mattermost-desktop-5.3.0-rc.7-linux-x64.tar.gz 99666928 BLAKE2B 7a41fd359d47a109f5e54729a582215228dcd1e0466672a13278b9efc90d8a8b2d849dc07f29443c6655a0a5f45e934ea0c5064655fbd7cb76e9604d2dd56e0e SHA512 b4a6f08c2c95e09087f2eb34e3ba0600d2f5dca24bd419cb20ae47eb55f6810195bf0fea46b4b17782453348da148c2814018cd68f3935d42bfcc65a318cdb17
+DIST mattermost-desktop-5.3.0-linux-arm64.tar.gz 99876870 BLAKE2B 1934720e90900195ac3a560dae0e41f3b809b924fafbad23d1b7fc382b7dc0d22fdce6b128c0ff080a51bc804919b7d6006ed3df77771ee7ed1d42975cfde22d SHA512 1eac35df02d9228f5256d10101b19cdc62faf04eba01f1d41ec8c10ac91e603d28d097fbcc92db5a14b6cb0c00bf696d22e4aad57a7a229036c09218962d3bfc
+DIST mattermost-desktop-5.3.0-linux-x64.tar.gz 99665838 BLAKE2B 6d607ffec23ea8a9fb4a28f304bae49f17332a8dda9a4a803e378ea4c029e2e05a6d0af37fbb698677676e3c6192de2b2e2b0a8a5d2ed41366f5664efb0c9481 SHA512 87a8f8eaea60c2a2543f31d0d241170b606f13766f706927cc088d76de5a7c6d6ef766bf4f4a3d8a882dec87f51dc3732678849b97caa02c1e5124e4847ade80
 DIST mattermost-desktop-5.3.1-rc.1-linux-arm64.tar.gz 99877655 BLAKE2B 2687bf25445c57c22f640cc112b7aaeffa44e0d2f23d94df7acc48fa008f7f00a8e7d584a627a3e53d638f599084def76db2528e194ec42fb8774dc484f143c3 SHA512 4ec2ea132893139bdf0d70e66533a080c92a78cdd3633d7b2ad569a31103eb5aaacb13a7ae2d7ee2806793fd242e5816aaf6c2e5b8eb9aee7ecdc179385e8a57
 DIST mattermost-desktop-5.3.1-rc.1-linux-x64.tar.gz 99666860 BLAKE2B ded28bc1229723572b8419549a8c8707629da9f27d817fdd595f42a21749ad89bdaef3679f8af29f4d14bbd9dfec702686af1dea929907c3be8365e5d9fa5b5d SHA512 5d532e756b4331ffb88fadbf422faa9831828da1ad5061557cdf4c63c7d5425203d21fa57699de22863730a79ed1e243042b1070ad44363a20517b89d00648ba
 EBUILD mattermost-desktop-bin-5.2.2.ebuild 2000 BLAKE2B 7e988c16f8b3be6548b28f2ba57b7eaea9ed895ce4bb29e26e4826a1c733dcaa6133cc419e794ef2024807ccc4f8c650bc6434bd13ce8ee2b00cc4ce0b086c43 SHA512 e4b4d944a7682832ef891ddeff5d66592d037640a3b66bb6d245ecdaec0916b0d949aacea04a44460029800cf261d380301170ec57d81bf43331eed5e0d42035
-EBUILD mattermost-desktop-bin-5.3.0_rc7.ebuild 2108 BLAKE2B 122d42cf063f40b8c76332dd415246046cf52161e71c6f1b2e0bf1b49273381c6b611a07edfa06463ffd3fda261b1c10e17179ed2b9ffd49b981d34ee7c39fa3 SHA512 8bf3bc1cbbf9cd13685360c1dd6093e9dde7ed3f8ccc92dd79f59b18dfec275ae56c380a0a1f9fbdd834e97e530632b5e95629fcb66527822e576646439b47b8
+EBUILD mattermost-desktop-bin-5.3.0.ebuild 2108 BLAKE2B 122d42cf063f40b8c76332dd415246046cf52161e71c6f1b2e0bf1b49273381c6b611a07edfa06463ffd3fda261b1c10e17179ed2b9ffd49b981d34ee7c39fa3 SHA512 8bf3bc1cbbf9cd13685360c1dd6093e9dde7ed3f8ccc92dd79f59b18dfec275ae56c380a0a1f9fbdd834e97e530632b5e95629fcb66527822e576646439b47b8
 EBUILD mattermost-desktop-bin-5.3.1_rc1.ebuild 2108 BLAKE2B 122d42cf063f40b8c76332dd415246046cf52161e71c6f1b2e0bf1b49273381c6b611a07edfa06463ffd3fda261b1c10e17179ed2b9ffd49b981d34ee7c39fa3 SHA512 8bf3bc1cbbf9cd13685360c1dd6093e9dde7ed3f8ccc92dd79f59b18dfec275ae56c380a0a1f9fbdd834e97e530632b5e95629fcb66527822e576646439b47b8
 MISC metadata.xml 332 BLAKE2B beedbcc827eb536d370b912224e48761a546d80fe89cfeadcdd9bcbd749211c88dd141bb8c8fb23250c2366c025207dc5919e50f0e41e5a2de322a59dcaeff6c SHA512 7360c3eb9ae59c3e359685f02f2f30835bc63f3be85b30de26a26ef92bf2c3b354405dd76e798fb83aaed8ac65296d9bdbd123513b404810826f8c58a2f1aa6d
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.3.0_rc7.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.3.0.ebuild
index 6239ac543889..6239ac543889 100644
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.3.0_rc7.ebuild
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.3.0.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 8587e7b85e2d..cca4edafba44 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest
index 5a9e275e7321..72ee3e6d4dad 100644
--- a/net-libs/libnetconf2/Manifest
+++ b/net-libs/libnetconf2/Manifest
@@ -1,5 +1,7 @@
 DIST libnetconf2-2.1.11.tar.gz 302413 BLAKE2B c5a1316b61c1d36a57d65bb556f9f3c72dcc4e614f12ea8178cc84e28b1139173ecc951cbddf63d60c58cd4e7b6477ecd719bf9aa375ab73ad32f1c82dd3a59e SHA512 fad29d5f3c486bf4f56a9065ef447886b7ffef7c33cdc109e7702ed343ae9fe31b49d40fa3e85f07e92c4aa713d6b11b5afabfa4756cc487dd184f0653fc6d56
+DIST libnetconf2-2.1.31.tar.gz 323423 BLAKE2B 8a6a3e4e7eaf94ce2afba688555956159fb48ad83e802f187acc222dc3e3c62ab718758dfaa39abc81417895098c75cb0ee490ac64412634e88cef7389556ecb SHA512 f174aee332aa775308d8fbd7aff450af9531c94dfe76279a87acd3554f07957c468a1ef2d2c2c6a63748f87920790616426839cb9c3e0c50ec2c88c98273d8aa
 DIST libnetconf2-2.1.7.tar.gz 302011 BLAKE2B b83faebb8d04d9ecaa0bc3aa1fed1bc3b94388d1a6dbc8d3e8c2ff2bb73dc57a460eaf9cc7bf2d07a8e09ef612826417990d8c70bab9c58f9cb71b53766b035b SHA512 fd46a3c31a062324e6c9f2d66006ba8cd852ccb389bf8749d1d0d085b880409e1e373d1d1f2d79c1d88f5eaa72d56195889c07863d0eab1607da89484e21b86f
 EBUILD libnetconf2-2.1.11.ebuild 899 BLAKE2B 71e421249cde80f2e0e7894380b79657d17e392e65375c6b0e405c001ebedd91caf06ede41b7ba2a651ee1222042b5d560b0d05b843f1e6fb2ead8fc48bb78b6 SHA512 0dffcd5a2134c7955b90b3d6f1447fa9502d33d3b20615ab15210b2dc286e53eecb36a4e553990df02095b1030cf686e04027ff4bf1e8ee4be175b88389e295f
+EBUILD libnetconf2-2.1.31.ebuild 900 BLAKE2B 32fd5a419ab10c7ae5d1f9fe4e420349eadda0d96f0eb5bb2ecbeb9e42446433102c40f5a1be01fc50a4dd5edff7cb623db5b48e9a74733e4f6594928df17e0a SHA512 05666c48fb53de3c48cf30b5342cd0a92d20f518d86ff7b5c688286f2ac7bbd91127bfb5c3284a979cb12a4d577702ef25e5bbe39f949fc6018b5cfa7922bec9
 EBUILD libnetconf2-2.1.7.ebuild 899 BLAKE2B cf01499bf3d24a41dc06bda655a31ec2a31b1c0197006284eac60778e4fd380100ef0688d6cfa050ca0cbac85429b7a4f52e36259350e168ef85a83fe92202d2 SHA512 13952d8764b3ed0b316ca5e7f5b0358eddd829132d33f4a0bf6cfed804e29551345afe280b24f902e26702105126fc7e0c441176f14d2681fce937abb5fb9b48
 MISC metadata.xml 331 BLAKE2B cdf31d4cc5f23689277be613336e351a92be7cc1ac1aeafb1e52fa88985f1fcb9d6b71de3ee149b0b0269f9660ec357d83d7ae4b18355a1121bf3d38b957f7e9 SHA512 33da7a046f20febb4e756f73dad37dd66ba07b7da865f07ee72b08026be7f81a026960ec7d4abe558a33ffd162806456454da89733944d974cc7132555176b16
diff --git a/net-libs/libnetconf2/libnetconf2-2.1.31.ebuild b/net-libs/libnetconf2/libnetconf2-2.1.31.ebuild
new file mode 100644
index 000000000000..c4fd71dd523d
--- /dev/null
+++ b/net-libs/libnetconf2/libnetconf2-2.1.31.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C library for building NETCONF servers and clients"
+HOMEPAGE="https://github.com/CESNET/libnetconf2"
+SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	>=net-libs/libyang-2.0.194
+	net-libs/libssh:0=[server]
+	virtual/libcrypt:="
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_VALGRIND_TESTS=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r doc/.
+}
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index de642c94842c..6b8e126972d4 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,3 +1,5 @@
 DIST libyang-2.0.194.tar.gz 1150705 BLAKE2B aa323b39752ac426f35e1ef17ca4a61d726c48916b740511ed03b06b8132747207dd4620842f9730ff1d05f216086310bc1634f393163067c119f5eec0aa91b1 SHA512 33d043ff696fc59c1cf5265a463b85a17459086162a03c56b1894cc524b7325ded2e14a71fce55ee70d02ea1119eef523190708c5f7b22438ab8ffd014fccefb
+DIST libyang-2.1.55.tar.gz 1201664 BLAKE2B b23d886163b1082c8895d1450113f364288eb6f77c4c73f7da1576877c35312b5558dbaf90e43268e18dd9348b024547c8cc4ee3a7ddabfb3762ffe67c47dc17 SHA512 dd0b58aec7e2d84f62636c62c9e7f67f0b4819e8d5ce9236874a3531607aa6fb58ccdcf537534eae8bfa700c37b8e3524be659929f4e7e03f8f67968bc352cb4
 EBUILD libyang-2.0.194-r1.ebuild 803 BLAKE2B de09c48bf684fb9f7af8c46a84e7ac896e4dc91d386f69051209026ea02d745b9c8a44202eccce6f44f16d5dec7b9831ac73d067cc615a8ec0ac90cbb4623205 SHA512 ccbfa21e011b26c04b12f80765a2b6bc561c04d89c9f7987086a0aaad0ca242c2eabcbcf5a1aab889db1fb281e93b4ae34be610e58284ef48c6674e1ffd20f8b
+EBUILD libyang-2.1.55.ebuild 805 BLAKE2B cd15f8c1d942beca2d24cd95e2d7408185cf18db7837ffe3c57cd75ec5c063fcf2fba852d539acb2b66b643e85ca2e48e9f5c8773e7b92e20a724234ad2cff37 SHA512 5a7ba4b3979c81f9a17fd96e392e673d2fea5e43b0b78b4ff94943a36fdb5174369fa7657a131afdd64daec4d4abbdcc3a2d16c3804910d3a45c8c9f77502b72
 MISC metadata.xml 327 BLAKE2B ea8b33be859f8dd94b8aeff9bec39e90b9b0c2984c7df56de4ff7b0c39006723b721119b6fde6fe120f9d423559e8450ecbee3dbe1a65705f9c3e55c34eba1e3 SHA512 14c3ef2d8d242a8bcf7786419afe8b723455603bf187dad10f619b67c9c30bc0e0ab681974b294a4c73f0a32ca68366a1b7b2a730f6d3362af348765c0da1e31
diff --git a/net-libs/libyang/libyang-2.1.55.ebuild b/net-libs/libyang/libyang-2.1.55.ebuild
new file mode 100644
index 000000000000..76927273f0fa
--- /dev/null
+++ b/net-libs/libyang/libyang-2.1.55.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="YANG data modeling language library"
+HOMEPAGE="https://github.com/CESNET/libyang"
+SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libpcre2"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_VALGRIND_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r doc/.
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d7ca0d0d5533..dcfd715e4a02 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index d22420539303..5e7a0e4aecd2 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -4,5 +4,7 @@ AUX frr-8.4.2-musl-gcc12.patch 525 BLAKE2B 8aa00d5a41445e6a035e77481bf6dc3cf4538
 AUX frr-openrc-v1 7078 BLAKE2B d5c0276540fa09318f6e92575dd7e03f3bc6ebfce186d062c2d65fa49c502b3b4de0fd32914ce7c4708bb6f6188296f75d387e0384c142381bb77cfb706c7e1c SHA512 8e6f0e58863402f0169b8a7625d049bf85db60bebe40a42dfb450a1bddfcd6f8f436002de6c1ff599c8f848e4ba85a70e4058cb55a9a49fafb1e69a8e7eb9f57
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
 DIST frr-8.4.2.tar.gz 9893223 BLAKE2B 670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac SHA512 1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7
+DIST frr-8.5.tar.gz 10068379 BLAKE2B ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4 SHA512 13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f
 EBUILD frr-8.4.2.ebuild 3569 BLAKE2B baf427a9cd97f4fb334552f7d369e15ee9e20e6b2a152a3eea39b7ce5d516b83d2f1800b573b2af1dbebbb3f77ecbbccd84c082efac977f645b0787f2e581d16 SHA512 8a5bdcd9e0ff695792bc3588343e88e9df36d1d9bc033f88ca1c1b7e8e431f146e9e98ce95889e122b85715e42ecd412752458dc52f2b07c11cb4b5c4645707c
+EBUILD frr-8.5.ebuild 3527 BLAKE2B 5cf9bc7c4b68d50208f522287ae4ae08f8c5efab7e4d467c5ed25b098eb768e4489d3f07364d45c8f5ad992066df14275e1e36ac9735d4e4990c07fcfd1f6c17 SHA512 4c2d8c0f39ce1a1e568453d2820bb7e78cfad084de8edfd4124ec84fce7ccadacf41f8aedb9dca79b92837f0468e5523e031c1877e710e22645609a21773f2c7
 MISC metadata.xml 737 BLAKE2B bfa681c872de365cf4cb98c3fa20b57de000039a9bdc504cb62e080472c8cbf7ed5ac104a9a11c69bb09233500fcb7dda70b2aed57eb9987bbc1e1a96a9a755d SHA512 94a6a8cd0ed7be3f0f82a7a677221740151fc121be204b36c2f943921564b76763e43a2b3afdd042ed639a6243e60e39deaaa9dfcce4afadd32fc71ef7a2015a
diff --git a/net-misc/frr/frr-8.5.ebuild b/net-misc/frr/frr-8.5.ebuild
new file mode 100644
index 000000000000..dedac1e7cf84
--- /dev/null
+++ b/net-misc/frr/frr-8.5.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools pam python-single-r1 systemd
+
+DESCRIPTION="The FRRouting Protocol Suite"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
+# FRR tarballs have weird format.
+S="${WORKDIR}/frr-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-user/frr
+	dev-libs/json-c:0=
+	>=net-libs/libyang-2.0.0
+	sys-libs/libcap
+	sys-libs/readline:0=
+	virtual/libcrypt:=
+	grpc? ( net-libs/grpc:= )
+	nhrp? ( net-dns/c-ares:0= )
+	pam? ( sys-libs/pam )
+	rpki? ( >=net-libs/rtrlib-0.8.0[ssh] )
+	snmp? ( net-analyzer/net-snmp:= )
+"
+BDEPEND="
+	~dev-util/clippy-${PV}
+	sys-devel/flex
+	app-alternatives/yacc
+	doc? ( dev-python/sphinx )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
+	!net-misc/quagga
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
+	"${FILESDIR}"/${PN}-8.4.1-logrotate.patch
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang tools
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--with-pkg-extra-version="-gentoo"
+		--enable-configfile-mask=0640
+		--enable-logfile-mask=0640
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/lib/frr
+		--sbindir="${EPREFIX}"/usr/lib/frr
+		--libexecdir="${EPREFIX}"/usr/lib/frr
+		--sysconfdir="${EPREFIX}"/etc/frr
+		--localstatedir="${EPREFIX}"/run/frr
+		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
+		--with-clippy="${BROOT}"/usr/bin/clippy
+		--enable-user=frr
+		--enable-group=frr
+		--enable-vty-group=frr
+		--enable-multipath=64
+		$(use_enable doc)
+		$(use_enable fpm)
+		$(use_enable grpc)
+		$(use_enable ipv6 ospf6d)
+		$(use_enable ipv6 ripngd)
+		$(use_enable ipv6 rtadv)
+		$(use_enable kernel_linux realms)
+		$(use_enable nhrp nhrpd)
+		$(usex ospfapi '--enable-ospfclient' '' '' '')
+		$(use_enable rpki)
+		$(use_enable snmp)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	# Install user documentation if asked
+	use doc && dodoc -r doc/user/_build/html
+
+	# Create configuration directory with correct permissions
+	keepdir /etc/frr
+	fowners frr:frr /etc/frr
+	fperms 775 /etc/frr
+
+	# Create logs directory with the correct permissions
+	keepdir /var/log/frr
+	fowners frr:frr /var/log/frr
+	fperms 775 /var/log/frr
+
+	# Install the default configuration files
+	insinto /etc/frr
+	doins tools/etc/frr/vtysh.conf
+	doins tools/etc/frr/frr.conf
+	doins tools/etc/frr/daemons
+
+	# Fix permissions/owners.
+	fowners frr:frr /etc/frr/vtysh.conf
+	fowners frr:frr /etc/frr/frr.conf
+	fowners frr:frr /etc/frr/daemons
+	fperms 640 /etc/frr/vtysh.conf
+	fperms 640 /etc/frr/frr.conf
+	fperms 640 /etc/frr/daemons
+
+	# Install logrotate configuration
+	insinto /etc/logrotate.d
+	newins redhat/frr.logrotate frr
+
+	# Install PAM configuration file
+	use pam && newpamd "${FILESDIR}"/frr.pam frr
+
+	# Install init scripts
+	systemd_dounit tools/frr.service
+	newinitd "${FILESDIR}"/frr-openrc-v1 frr
+
+	# Conflict files, installed by net-libs/libsmi, bug #758383
+	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+}
diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
index ec9b5087a552..4388a9789618 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -1,5 +1,7 @@
 DIST netopeer2-2.1.16.tar.gz 371327 BLAKE2B fb9022cdad297ce366c00efbb0394feaa4dcff766f35c614354ea83a31871f24e05893e418face4e14df4d677c84e254cd8058259cddbc86ab4c94903eabd0f5 SHA512 9d0f1ddd38db2e9ac9a15ca1d8929eb32f682dd47c491a475acc406849fac0bc5f61f15cfabdacdedafe572855cf31cff4294c34eda2cad61e7518b62f40f71d
 DIST netopeer2-2.1.23.tar.gz 375193 BLAKE2B 14407c1d4b6a382fd0f9cf1c5d2d5f5d0aea27bac7f9b5597fe500a227b9e990e82a87da0216b310abe66f88ab5116d2f4cf101f186b9264e77a67af656a1d64 SHA512 5dcd9850151b71fe25a286bd37b672191125abe6a9e52a815f9ee88fa8200da17016f5aacbe5bcd33767cddbd18833df71d4b06b1fed1b97536e494fa70ca22f
+DIST netopeer2-2.1.59.tar.gz 390371 BLAKE2B 777ff3a5db93bbeabb0f19dfb9a23b67f1945a834cfff716b3144fe24c62f848f048e35fac8ae6d10a7040bdbb29e1ff8ff3559f68a46ccf23fe958152adc3da SHA512 4eb889cb018f22308578712edcaf2f2e20dc4fddf45dded66f644c5288e3ef16cdcf00e61f3d03a2b8e97c4f31441d46651fea12bc3af229aae9b720de59789f
 EBUILD netopeer2-2.1.16.ebuild 977 BLAKE2B eb43aec29553758503be90b21b00ea2492f88ae588947fe2e8c79495687b10f5d2a511ad001022fa0b1eb43655f7b56f7d311a8c060dce182d7ab130477c7059 SHA512 5823d2d5c2e3a2d93e62bd5481e9193d7eb417cb673306328a1736a4aade595a511dde32f2d20c9e3f4189b538cdc617a94151ec4f2a18dd1c09ce7fc0fc7c83
 EBUILD netopeer2-2.1.23.ebuild 978 BLAKE2B 8705bc45bfac2149cbf885480493a157435416e5b16a636ed4158058c9dbfb52af6654d6d247bec2d956c2c9d6b8f8ee143b6227ecaf6f74d0f8f05d01fbbc1a SHA512 f8a1f8c1e50979ddf8fd9e6a092857dde693f8c34e6c4234153db0c7cbc522d8229983d618559b6138490e7427878c797771fc674cdff48bffc437374879fac4
+EBUILD netopeer2-2.1.59.ebuild 978 BLAKE2B ec8a4deda4292cd86139e21f1d260108ebfdb728bce072e194fc62f290fbdef6cd265e877318f9b717871c7cd27ce0b378b33c8d48f074c4ffe53c75c655ae74 SHA512 989e7e29727e132b2849fc330a66f202573184cacd81faa3176fec39e34e7db9d1a51a13ca885d9b4b2209e36dd622c757bf7aa961e6986c2457b288a7e03ed1
 MISC metadata.xml 329 BLAKE2B 65eb219ac645e711725eef7985454f1d818421b3c152fbc28d1ec9efe1154233b16749cd4f2aeb87c41fe305979c62605409da6f2df68d589ec2d6e4bd657c5a SHA512 a3fc10fa1cc2754842547ecfd1b80ed16e32e7b406a1fb4fb1f8959423e85cdd9e5145b48649d19c95abac1702440abb6ac4a1b7f7715e15ff2264e8796da4dd
diff --git a/net-misc/netopeer2/netopeer2-2.1.59.ebuild b/net-misc/netopeer2/netopeer2-2.1.59.ebuild
new file mode 100644
index 000000000000..fa4f9528e25b
--- /dev/null
+++ b/net-misc/netopeer2/netopeer2-2.1.59.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Server for implementing NETCONF configuration management"
+HOMEPAGE="https://github.com/CESNET/netopeer2"
+SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/openssl:=
+	net-misc/curl:=
+	>=net-misc/sysrepo-2.2.60
+	>=net-libs/libnetconf2-2.1.31
+	net-libs/libssh:=
+	>=net-libs/libyang-2.1.55"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGENERATE_HOSTKEY=OFF
+		-DINSTALL_MODULES=OFF
+		-DMERGE_LISTEN_CONFIG=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_VALGRIND_TESTS=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/netopeer2
+	doins -r scripts/.
+}
+
+pkg_postinst() {
+	elog "In order to do initial server setup please"
+	elog "run setup scripts located in /etc/netopeer2"
+}
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index db0c0662311b..9591aa48f2af 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,3 +1,5 @@
 DIST sysrepo-2.1.64.tar.gz 722294 BLAKE2B 55f71bd2bfa987775d324763d989f57ef79c74d45c261e2f880740201ca5585107459f849d915e3bf4084c9f5ff538a7867787ce53145ad1a64e418384e3558c SHA512 363d6a0dd057326125aa11c51bb1e80a2a521708a95b95eecf2b416a2ebd938b5ac6b8ae49311376bfbae5599679e23f62503da946920bffb48379c665183b40
+DIST sysrepo-2.2.60.tar.gz 782781 BLAKE2B afaef4e0a3d21a636f84d76ee0de55b1365e0e66cb9335ca748752747af99eb58c368eafd7c087a1df050ff4d1c2800601d125915f2debaad8ccc77278d30b84 SHA512 720299b57a0615ba99e01e7d42bc85d5ba5482d82680c47961f6876400009850e8fdf5c0753c39600ef0947a318394eb6108772ac1a575584f26bdc6e2305a57
 EBUILD sysrepo-2.1.64.ebuild 776 BLAKE2B 3e6dd00c074d731486e9018b8f18330fecbf0e9ad53bd1c188b8e244addbdd048269b0599c5b7e4b6be05a3aaef55c134e7b531036b0cce1314228bbab19fe71 SHA512 ecc9a8ebde90c90e3548c71bb75450862917c2266cbe8ce536e436604f0d155ed01ff5e7ac2ce8568503bcaff4d6e182624e484c02e7f8c1d92cd80d07201cc1
+EBUILD sysrepo-2.2.60.ebuild 776 BLAKE2B 7ba6f051c14fbb69e0bc1942a0d276c2839d7560a416e332ed2fadbc268621f170f312371b24adda40bbd3f4fd2104cfcc54e327eca52380b24422a7d084d722 SHA512 43d869a5ac452c4c0d648af5dc811c25ec53e409fc0849552db8ca269d529ca09c024171b02b85f7ea58abaea828ad5f977dde9d2e47a854679ff02a31306387
 MISC metadata.xml 328 BLAKE2B e91ac8ab81f342a9cdbf7b924f37c12f2adade3b0dee1972a3b2f2035997d6e8f5de414a052f2e154f6cecba1ab310103db2fd60e16d085875200bf08fcea522 SHA512 acdb3728e90337d98aea6f5174aba7a81d84259226ec6dda4607524184137b75431e621ebe29b99d371f6b3ff54aed15732a1d89229bf8cb100b52b4e0ae1a99
diff --git a/net-misc/sysrepo/sysrepo-2.2.60.ebuild b/net-misc/sysrepo/sysrepo-2.2.60.ebuild
new file mode 100644
index 000000000000..7bec12ea56df
--- /dev/null
+++ b/net-misc/sysrepo/sysrepo-2.2.60.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="YANG-based configuration and operational state data store"
+HOMEPAGE="https://www.sysrepo.org"
+SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=net-libs/libyang-2.1.55"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_VALGRIND_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r doc/.
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index a20e61e6c67b..a3f0ef175a1a 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 3ceed6950401..c3e5f232c6c8 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -4,4 +4,5 @@ AUX mldonkey.initd 1488 BLAKE2B 062bc7f00dc798bab4da0a0bdef87c5d2a3388a67ceddbbb
 AUX mldonkey.service 274 BLAKE2B 2ff70c85d4f8f07435ce973d4b8bd3f90999b433187060ebb1500f9964a5df7b3aa05cd0391efa748201b5d3ce496f985b971200bdf19e36a9edc6cf66f24fa2 SHA512 62fab67f8ca13e539b3ecfefe8d16a8cfbaad296f1a9d3f16dea8dcaa189946f2631545c940bb88e29ae119ad7285fbd7cd1cd047fe7a85b746d1ee36e13d8ce
 DIST mldonkey-3.1.7-2.tar.bz2 2801815 BLAKE2B f914648b4e2a358e51518f3b58dc0df803cdb28d7706783504644266690514c17c2cae0688011073391db221eb8f38c7cbaf1e913220d824e41ca2e23d4c8587 SHA512 11cb0fa0db95e918c291009f4121a1b34cf485e5ac6826a72a4dc520dd78d21ced40d205fa26eb451c7d3eb31f2193cbb64e46c99c85dc932762c1bcc4da4934
 EBUILD mldonkey-3.1.7-r3.ebuild 4857 BLAKE2B 8f6bdde47da366f77b82a483c90230df04d808d44c7bf8f7a0ece44314b34ea84cb788146f391a5aa9bc232680f425766f8e60b68985b1838ebea73bac5fad34 SHA512 15043f2496ff641e0fd64aa06985862614b416c21508bbc9093e80d0a059d3b3a6646e479d32a2bab567efe43641a5d5bb105bf51806c2431853f51918176b7c
+EBUILD mldonkey-3.1.7-r4.ebuild 3598 BLAKE2B 1a4ce653ee4925c6081a488fa2bc362a67957bced94bd47147c894cf42b965a8dd642c4bb77b3bc0ca2166dd593ca07a11071b28d4d1628586003c90f9bab1f3 SHA512 8dfd0e5c20f3b330ef4ec4fd106ec630dc10fdb3c6ba5f233d53eb310d38173a60662ebc77ae46de0a84070eace5feb0492fea0d9d90d45c7a7b98213ccf6312
 MISC metadata.xml 810 BLAKE2B 111ab6f9b165a59465beb7ac8c7cdf6651c72484dc2a5f77f0b6cbad44d6a71d44ca27aeb3785af9b2cbb0a5ae624b784db88b7790abdae98b36bf393a1cca08 SHA512 e59c710af7fab80b1da8ec97acd5d43cf8e725bc97c6b1d6257134e689ef6abdf9a8b5716131e512ee1ae4abc1fdb2f15a36dc09f40ef7aa726d414e2e0614a6
diff --git a/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild b/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
new file mode 100644
index 000000000000..cb2eae216dbe
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-3.1.7-r4.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Multi-network P2P application written in Ocaml, with Gtk, web & telnet interface"
+HOMEPAGE="http://mldonkey.sourceforge.net/ https://github.com/ygrek/mldonkey"
+SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}-2/${P}-2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="bittorrent doc fasttrack gd gnutella magic +ocamlopt upnp"
+
+RDEPEND="dev-lang/perl
+	dev-ml/camlp4:=
+	gd? ( media-libs/gd:2=[truetype] )
+	magic? ( sys-apps/file )
+	upnp? (
+		net-libs/libnatpmp
+		net-libs/miniupnpc:=
+	)
+	acct-user/p2p
+	app-arch/bzip2
+	sys-libs/zlib
+"
+# Can't yet use newer OCaml
+# -unsafe-string usage:
+# https://github.com/ygrek/mldonkey/issues/46
+DEPEND="${RDEPEND}
+	<dev-lang/ocaml-4.10:=[ocamlopt?]
+	bittorrent? (
+		|| (
+			<dev-lang/ocaml-4.06[ocamlopt?]
+			dev-ml/num
+		)
+	)"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+PATCHES=( "${FILESDIR}/cpp17-byte-namespace.patch" )
+
+S="${WORKDIR}/${P}-2"
+
+pkg_setup() {
+	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
+	# results in relocations if gcc wants to create a PIE executable
+	if gcc-specs-pie ; then
+		append-ldflags -nopie
+		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
+		ewarn "We have appended -nopie to ocaml build options"
+		ewarn "because linking an executable with pie while the objects are not pic will not work"
+	fi
+}
+
+src_prepare() {
+	cd config || die
+	eautoconf
+	cd .. || die
+	if ! use ocamlopt; then
+		sed -i -e "s/ocamlopt/idontwantocamlopt/g" "${S}/config/configure" || die "failed to disable ocamlopt"
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=()
+
+	local my_extra_libs
+	if use gd; then
+		my_extra_libs="-lpng"
+	fi
+
+	econf LIBS="${my_extra_libs}"\
+		--sysconfdir=/etc/mldonkey \
+		--sharedstatedir=/var/mldonkey \
+		--localstatedir=/var/mldonkey \
+		--enable-checks \
+		--disable-batch \
+		$(use_enable bittorrent) \
+		$(use_enable fasttrack) \
+		$(use_enable gnutella) \
+		$(use_enable gnutella gnutella2) \
+		$(use_enable gd) \
+		$(use_enable magic) \
+		$(use_enable upnp upnp-natpmp) \
+		--disable-force-upnp-natpmp \
+		--disable-gui
+		${myconf[@]}
+}
+
+src_compile() {
+	export OCAMLRUNPARAM="l=256M"
+	emake -j1 # Upstream bug #48
+	emake utils
+}
+
+src_install() {
+	local myext i
+	use ocamlopt || myext=".byte"
+	for i in mlnet mld_hash get_range copysources subconv; do
+		newbin "${i}${myext}" "${i}"
+	done
+	use bittorrent && newbin "make_torrent${myext}" make_torrent
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newconfd "${FILESDIR}/mldonkey.confd" mldonkey
+	newinitd "${FILESDIR}/mldonkey.initd" mldonkey
+
+	if use doc ; then
+		docompress -x "/usr/share/doc/${PF}/scripts" "/usr/share/doc/${PF}/html"
+
+		dodoc distrib/ChangeLog distrib/*.txt docs/*.txt docs/*.tex docs/*.pdf docs/developers/*.{txt,tex}
+
+		docinto scripts
+		dodoc distrib/{kill_mldonkey,mldonkey_command,mldonkey_previewer,make_buginfo}
+
+		docinto html
+		dodoc docs/*.html
+
+		docinto html/images
+		dodoc docs/images/*
+	fi
+}
+
+pkg_postinst() {
+	if [ -f /etc/conf.d/mldonkey ] && grep -qE "^(BASEDIR|SUBDIR|LOW_DOWN|LOW_UP|HIGH_DOWN|HIGH_UP|SERVER|PORT|TELNET_PORT|USERNAME|PASSWORD|MLDONKEY_TIMEOUT)=" /etc/conf.d/mldonkey; then
+		ewarn "The following settings are deprecated and will be ignored,"
+		ewarn "please remove them from /etc/conf.d/mldonkey:"
+		ewarn "LOW_DOWN LOW_UP HIGH_DOWN HIGH_UP SERVER PORT TELNET_PORT USERNAME PASSWORD MLDONKEY_TIMEOUT"
+	fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7e082d3d2cf0..a4ea472099b2 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index b7db461b44dc..e5a99801ab96 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2023-04-02)
+# Archived upstream since two years, meant to be used with Rails
+# 5.2. Continued as Turbo as part of the hotwire project in Rails.
+# Masked for removal on 2023-05-02
+dev-ruby/turbolinks
+dev-ruby/turbolinks-source
+
 # Michał Górny <mgorny@gentoo.org> (2023-03-31)
 # Packages with non-functional tests and no py3.11 support.  They were
 # only needed for media-fonts/noto-emoji[buildfont], and that variant
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 56b18ee0ceac..6c88572a710b 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-gentoo-developers/Manifest b/sec-keys/openpgp-keys-gentoo-developers/Manifest
index f6cfbb7a56cb..a15d61dcba67 100644
--- a/sec-keys/openpgp-keys-gentoo-developers/Manifest
+++ b/sec-keys/openpgp-keys-gentoo-developers/Manifest
@@ -1,5 +1,7 @@
 AUX keyring-mangler.py 3005 BLAKE2B e5435432b79156c26120af950f46f9a916af7261a78b40081eb140e18b3fd4f0d2ce55cd2ed305bdd4f60b569edfb513c1151a6255838a750d37225715e87e4f SHA512 bd4dc3dee66c0f0b8b657da1fabfbda96ea03b77d1080fa1d07b14d2a9571fe91f7589131893b75548122e772678760c7722fd8a46e120c40d8dbb8cb4341dc9
 DIST openpgp-keys-gentoo-developers-20230327-active-devs.gpg 3134134 BLAKE2B 31a06e5552253c494cdb8defdc81198fa55d1d2e33950415125edeff0075243ce170243188c5b016e4ecf4184c99d072d79a8b0de49a642bcdd1b4d01971ff47 SHA512 9b67b485a323f08786552a0e6dcc378cbe331accc2960b7121c344275629933733e5e268d3d5d96b70c40a541a1b6447c983fc11caadc1455d0b7609d9360b9c
+DIST openpgp-keys-gentoo-developers-20230403-active-devs.gpg 3033398 BLAKE2B 233549fa600d855df1f4130224c63b10d0df3312886bef1c0486553db3025554a4fff7af104a3f0869390d53837a8d0182d830432e855273da28c753ea579d7e SHA512 33264b9ef002656f5c58dc2b2ff568d01b624c68e2e42db0d388b9a99b45c2d605df0d5db7b5029c0946f524fa7168252ba87908336e6f9ad0717c20d43cd112
 EBUILD openpgp-keys-gentoo-developers-20230327.ebuild 7516 BLAKE2B 43511ae0601dba57fd74cacdcb54d8524daa8b7dcedfaed9db28743ba2a73fef0387be91a7d960bb1070dfa3d5cd5989f7625c7aa45a4bc66fb9936ac824f7e3 SHA512 ed9783038397f41655917fd354aca496f9bfa8b4ca54b736d5173d17308b056aa0ef87d2d9984a709fee3fc42c3d9fa2b36dc88058c2e86261989c7b47b84bf5
+EBUILD openpgp-keys-gentoo-developers-20230403.ebuild 7524 BLAKE2B b25f55fc15605a7ae98ea6c232c3c52c522478eef6e7c0454560874de41639b9af22b569b45e5363481ce5b1f0e55b0fae92c9be98fdd9cdd5a7a2c1b4cbd195 SHA512 59df2a70e59e2c029f383c971e0a00cd10c11fa8c8eaaf692fca4c11645a5877f0c0a4d121257fee42442b1f9252b497ba625e1ab1c4fd4d08aaaf59d91eff1d
 EBUILD openpgp-keys-gentoo-developers-99999999.ebuild 7524 BLAKE2B b25f55fc15605a7ae98ea6c232c3c52c522478eef6e7c0454560874de41639b9af22b569b45e5363481ce5b1f0e55b0fae92c9be98fdd9cdd5a7a2c1b4cbd195 SHA512 59df2a70e59e2c029f383c971e0a00cd10c11fa8c8eaaf692fca4c11645a5877f0c0a4d121257fee42442b1f9252b497ba625e1ab1c4fd4d08aaaf59d91eff1d
 MISC metadata.xml 264 BLAKE2B 630ac0044f623dc63de725aae23da036b649a2d65331c06fbe9eb66d18ad1a4d3fd804cdffc4703500662b01272063af346680d2550f2fb6a262d6acee8c6789 SHA512 3cf1981080b4a7634537d20a3e837fa802c52ae5ee750531cc4aa3f8478cda78579375602bc058abbd75f9393f9681b79603c3ddd9af809a1e72f7336a708056
diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild
new file mode 100644
index 000000000000..19dd6bb3b88d
--- /dev/null
+++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20230403.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit edo python-any-r1
+
+DESCRIPTION="Gentoo Authority Keys (GLEP 79)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+if [[ ${PV} == 9999* ]] ; then
+	PROPERTIES="live"
+
+	BDEPEND="net-misc/curl"
+else
+	SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND+="
+	$(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]')
+	sec-keys/openpgp-keys-gentoo-auth
+	test? (
+		app-crypt/gnupg
+		sys-apps/grep[pcre]
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]"
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		curl https://qa-reports.gentoo.org/output/active-devs.gpg -o ${P}-active-devs.gpg || die
+	else
+		default
+	fi
+}
+
+src_compile() {
+	export GNUPGHOME="${T}"/.gnupg
+
+	get_gpg_keyring_dir() {
+		if [[ ${PV} == 9999* ]] ; then
+			echo "${WORKDIR}"
+		else
+			echo "${DISTDIR}"
+		fi
+	}
+
+	local mygpgargs=(
+		--no-autostart
+		--no-default-keyring
+		--homedir "${GNUPGHOME}"
+	)
+
+	# From verify-sig.eclass:
+	# "GPG upstream knows better than to follow the spec, so we can't
+	# override this directory.  However, there is a clean fallback
+	# to GNUPGHOME."
+	addpredict /run/user
+
+	mkdir "${GNUPGHOME}" || die
+	chmod 700 "${GNUPGHOME}" || die
+
+	# Convert the binary keyring into an armored one so we can process it
+	edo gpg "${mygpgargs[@]}" --import "$(get_gpg_keyring_dir)"/${P}-active-devs.gpg
+	edo gpg "${mygpgargs[@]}" --export --armor > "${WORKDIR}"/gentoo-developers.asc
+
+	# Now strip out the keys which are expired and/or missing a signature
+	# from our L2 developer authority key
+	edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+			"${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+			"${WORKDIR}"/gentoo-developers.asc \
+			"${WORKDIR}"/gentoo-developers-sanitised.asc
+}
+
+src_test() {
+	export GNUPGHOME="${T}"/tests/.gnupg
+
+	local mygpgargs=(
+		# We don't have --no-autostart here because we need
+		# to let it spawn an agent for the key generation.
+		--no-default-keyring
+		--homedir "${GNUPGHOME}"
+	)
+
+	# From verify-sig.eclass:
+	# "GPG upstream knows better than to follow the spec, so we can't
+	# override this directory.  However, there is a clean fallback
+	# to GNUPGHOME."
+	addpredict /run/user
+
+	# Check each of the keys to verify they're trusted by
+	# the L2 developer key.
+	mkdir -p "${GNUPGHOME}" || die
+	chmod 700 "${GNUPGHOME}" || die
+	cd "${T}"/tests || die
+
+	# First, grab the L1 key, and mark it as ultimately trusted.
+	edo gpg "${mygpgargs[@]}" --import "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc
+	edo gpg "${mygpgargs[@]}" --import-ownertrust "${BROOT}"/usr/share/openpgp-keys/gentoo-auth-ownertrust.txt
+
+	# Generate a temporary key which isn't signed by anything to check
+	# whether we're detecting unexpected keys.
+	#
+	# The test is whether this appears in the sanitised keyring we
+	# produce in src_compile (it should not be in there).
+	#
+	# https://www.gnupg.org/documentation/manuals/gnupg/Unattended-GPG-key-generation.html
+	edo gpg "${mygpgargs[@]}" --batch --gen-key <<-EOF
+		%echo Generating temporary key for testing...
+
+		%no-protection
+		%transient-key
+		%pubring ${P}-ebuild-test-key.asc
+
+		Key-Type: 1
+		Key-Length: 2048
+		Subkey-Type: 1
+		Subkey-Length: 2048
+		Name-Real: Larry The Cow
+		Name-Email: larry@example.com
+		Expire-Date: 0
+		Handle: ${P}-ebuild-test-key
+
+		%commit
+		%echo Temporary key generated!
+	EOF
+
+	# Import the new injected key that shouldn't be signed by anything into a temporary testing keyring
+	edo gpg "${mygpgargs[@]}" --import "${T}"/tests/${P}-ebuild-test-key.asc
+
+	# Sign a tiny file with the to-be-injected key for testing rejection below
+	echo "Hello world!" > "${T}"/tests/signme || die
+	edo gpg "${mygpgargs[@]}" -u "Larry The Cow <larry@example.com>" --sign "${T}"/tests/signme || die
+
+	edo gpg "${mygpgargs[@]}" --export --armor > "${T}"/tests/tainted-keyring.asc
+
+	# keyring-mangler.py should now produce a keyring *without* it
+	edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+			"${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+			"${T}"/tests/tainted-keyring.asc \
+			"${T}"/tests/gentoo-developers-sanitised.asc | tee "${T}"/tests/keyring-mangler.log
+	assert "Key mangling in tests failed?"
+
+	# Check the log to verify the injected key got detected
+	grep -q "Dropping key.*Larry The Cow" "${T}"/tests/keyring-mangler.log || die "Did not remove injected key from test keyring!"
+
+	# gnupg doesn't have an easy way for us to actually just.. ask
+	# if a key is known via WoT. So, sign a file using the key
+	# we just made, and then try to gpg --verify it, and check exit code.
+	#
+	# Let's now double check by seeing if a file signed by the injected key
+	# is rejected.
+	if gpg "${mygpgargs[@]}" --keyring "${T}"/tests/gentoo-developers-sanitised.asc --verify "${T}"/tests/signme.gpg ; then
+		die "'gpg --verify' using injected test key succeeded! This shouldn't happen!"
+	fi
+
+	# Bonus lame sanity check
+	edo gpg "${mygpgargs[@]}" --check-trustdb 2>&1 | tee "${T}"/tests/trustdb.log
+	assert "trustdb call failed!"
+
+	check_trust_levels() {
+		local mode=${1}
+
+		while IFS= read -r line; do
+			# gpg: depth: 0  valid:   1  signed:   2  trust: 0-, 0q, 0n, 0m, 0f, 1u
+			# gpg: depth: 1  valid:   2  signed:   0  trust: 0-, 0q, 0n, 0m, 2f, 0u
+			if [[ ${line} == *depth* ]] ; then
+				depth=$(echo ${line} | grep -Po "depth: [0-9]")
+				trust=$(echo ${line} | grep -Po "trust:.*")
+
+				trust_uncalculated=$(echo ${trust} | grep -Po "[0-9]-")
+				[[ ${trust_uncalculated} == 0 ]] || ${mode}
+
+				trust_insufficient=$(echo ${trust} | grep -Po "[0-9]q")
+				[[ ${trust_insufficient} == 0 ]] || ${mode}
+
+				trust_never=$(echo ${trust} | grep -Po "[0-9]n")
+				[[ ${trust_never} == 0 ]] || ${mode}
+
+				trust_marginal=$(echo ${trust} | grep -Po "[0-9]m")
+				[[ ${trust_marginal} == 0 ]] || ${mode}
+
+				trust_full=$(echo ${trust} | grep -Po "[0-9]f")
+				[[ ${trust_full} != 0 ]] || ${mode}
+
+				trust_ultimate=$(echo ${trust} | grep -Po "[0-9]u")
+				[[ ${trust_ultimate} == 1 ]] || ${mode}
+
+				echo "${trust_uncalculated}, ${trust_insufficient}"
+			fi
+		done < "${T}"/tests/trustdb.log
+	}
+
+	# First, check with the bad key still in the test keyring.
+	# This is supposed to fail, so we want it to return 1
+	check_trust_levels "return 1" && die "Trustdb passed when it should have failed!"
+
+	# Now check without the bad key in the test keyring.
+	# This one should pass.
+	#
+	# Drop the bad key first (https://superuser.com/questions/174583/how-to-delete-gpg-secret-keys-by-force-without-fingerprint)
+	keys=$(gpg "${mygpgargs[@]}" --fingerprint --with-colons --batch "Larry The Cow <larry@example.com>" \
+		| grep "^fpr" \
+		| sed -n 's/^fpr:::::::::\([[:alnum:]]\+\):/\1/p')
+
+	local key
+	for key in ${keys[@]} ; do
+		nonfatal edo gpg "${mygpgargs[@]}" --batch --yes --delete-secret-keys ${key}
+	done
+
+	edo gpg "${mygpgargs[@]}" --batch --yes --delete-keys "Larry The Cow <larry@example.com>"
+	check_trust_levels "return 0" || die "Trustdb failed when it should have passed!"
+
+	gpgconf --kill gpg-agent || die
+}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins gentoo-developers-sanitised.asc gentoo-developers.asc
+
+	# TODO: install an ownertrust file like sec-keys/openpgp-keys-gentoo-auth?
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 2817e11a09a1..5c83aee5b45f 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index eb346ccb1a2b..562bd19b1f56 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -2,7 +2,9 @@ AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359e
 AUX bmake-20210314-mk-fixes.patch 2054 BLAKE2B 404e99593f04408e3f62d8c6118fc1676ef414b4cc18f5ec8b089182fad8865ad79e40c236e58b084f3194bdcc94c92e1e10e40efbddc142b84053117065e202 SHA512 8c9e823dd158e352021f0905e2a15cb8d7da3020c49a8f824cc5dbd8f33910fc64629d5f400fd8651a16b07e0685a1247a661fd9230a62b7330bd5fc71427dd4
 DIST bmake-20220928.tar.gz 821224 BLAKE2B 9b377a9a8d329d229aae37fd852a68629edb78f7f0f16bf8aeb59df4da886fe89d8b7defd8294fa49fca397d4726e704eb9c95936561fe8a3a0a1fdfe4e5b861 SHA512 13fde6517d79080c5a548b1e47e4fbf00d54752f48b40d10542926b26a3be22da70877ca2b977b43366ec1b632a76a6974c78155c39895910e01e4142e7675a0
 DIST bmake-20230303.tar.gz 831628 BLAKE2B b93153c97713e492dabd827aad9f9089c2d7c133a4f77592039261b56d8efea43286012ade39cc822c53a0daa2f7a44c1f2dbf5e441c3cc052f43c3e0eed1d95 SHA512 d4595f3b19eac828de9a3ba6901ae883b147de441dc2707da24187860136ae4fcd4cfa343dcc9f52be3b96abf54b165f9808ae863b3a70fabec051257525994f
+DIST bmake-20230321.tar.gz 832527 BLAKE2B dc1dbddf11bf3dc0220787882999a559d873d103e2c9ad8c93e74541828a72c70a411608e060e976c974528d2bf420e33f96b57ea9436fb7ad853409cd6b7f40 SHA512 d4c5febcc55040eeb13d3e2562d543eeb3969b188b72628b97ad92c84a4ff461de065cdb4fe838a4b36bb6ed053348f2b54fb3307b88658332ec25c3cccdffde
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
 EBUILD bmake-20220928.ebuild 1280 BLAKE2B 8b0a901f552c84562690e3543e66cb388b9a3415ecc83028748711982651b91e75fca5f6e4fbff17b5db3ec52447e9f03b56589ff991e41be979a1026f221389 SHA512 99320a95fc86b80d9449be59e98acaab416c69209528ed0110b00e1fe18b8739a5e8100c8f4a8bb302c6e1ea4f7930253ea5cf69861f5172b02fa987d3bd2f97
 EBUILD bmake-20230303.ebuild 1281 BLAKE2B 3710d6487c66efa8b203bdcbf49f0cc11fd213083159b91802e57e7ccc5a86bbf4de3df08a60ba18f2c807ab4e25e80116fb4ece95563b5f5cc67be79dc41082 SHA512 8507fcce4e0e397abe856786d8f4693d5b55f8262bfc0015e3978570b22442789ebe1a42fe7f666df05d0c4a3d299901fb29926b0ed7866537568b19879f3176
+EBUILD bmake-20230321.ebuild 1281 BLAKE2B 3710d6487c66efa8b203bdcbf49f0cc11fd213083159b91802e57e7ccc5a86bbf4de3df08a60ba18f2c807ab4e25e80116fb4ece95563b5f5cc67be79dc41082 SHA512 8507fcce4e0e397abe856786d8f4693d5b55f8262bfc0015e3978570b22442789ebe1a42fe7f666df05d0c4a3d299901fb29926b0ed7866537568b19879f3176
 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5
diff --git a/sys-devel/bmake/bmake-20230321.ebuild b/sys-devel/bmake/bmake-20230321.ebuild
new file mode 100644
index 000000000000..7c7d277872cc
--- /dev/null
+++ b/sys-devel/bmake/bmake-20230321.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MK_VER=20210330
+
+DESCRIPTION="NetBSD's portable make"
+HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
+SRC_URI="
+	http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
+	http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~ppc ~ppc64 ~x86"
+
+# Skip failing test (sandbox and csh)
+PATCHES=(
+	"${FILESDIR}"/${PN}-20210206-tests.patch
+)
+
+src_prepare() {
+	default
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${PN}-20210314-mk-fixes.patch
+}
+
+src_configure() {
+	econf \
+		--with-mksrc=../mk \
+		--with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \
+		--with-machine_arch=${ARCH}
+}
+
+src_compile() {
+	sh make-bootstrap.sh || die "bootstrap failed"
+}
+
+src_test() {
+	cd unit-tests || die
+
+	# the 'ternary' test uses ${A} internally, which
+	# conflicts with Gentoo's ${A}, hence unset it for
+	# the tests temporarily.
+	env -u A MAKEFLAGS= \
+		"${S}"/bmake -r -m / TEST_MAKE="${S}"/bmake test || die "tests compilation failed"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	FORCE_BSD_MK=1 SYS_MK_DIR=. \
+		sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \
+		|| die "failed to install mk files"
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 0107455a6d9a..88c924b6052d 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/daemontools/Manifest b/sys-process/daemontools/Manifest
index 17898943fc27..83ad9ed86ae3 100644
--- a/sys-process/daemontools/Manifest
+++ b/sys-process/daemontools/Manifest
@@ -1,8 +1,10 @@
 AUX 0.76-C99-decls.patch 10397 BLAKE2B 3072b01973ebdf4e12d2d25ac70a953028c360a721b2ca6ef9cd05d6803fb3c9e48d9b7b11112d401e16b5e9dc039500cb2d9b5752000dcaabcc905c70643ad8 SHA512 36695347e98d4dc177f685cddcf9e7331da8630f0632d1fb35a2df1898c9e4a73d8908b56dd218d9b6f06cd3f063e6a946567ab256498bf0d425ea2f06719c58
 AUX 0.76-errno.patch 246 BLAKE2B 10fc1da86bb91657dd9f1709f1f58852d93e6baa61ab89ce56911066677975699af1feff69bda5218afb36f2fbb66af6b810d5a9d8b6938054ff0123172c657a SHA512 76664b71e16ba4dbb081604a1a8c9ddc58a603777dccc0a53b0af9442ff8f0cdfce9ef8b05926dac62b81b2c805262df6a7e4df65920c00583132dbf136ba85e
+AUX 0.76-implicit-func-decl-clang16.patch 265 BLAKE2B 711ea0ff926d93964e6333745eb830979f50929892650489367246ab3c93963b28a4cecac5a3f72defa50646550b623687119036ac412930c836569c728cf37b SHA512 209250b752cda3d3b67784e3c906c02ae365de884dec759e21fd14ecaa433f7f6d646afc918d8c0ffd9eab313ccaacf482e1920669b9e2c884b79b7e1cfd6f66
 AUX 0.76-makefile.patch 3630 BLAKE2B 777309c2c8d029927e29b1587c751ce9100dbc258d22b6b45d1375b52a15bb0c369086d762e521b4858eaaed432d06f834c7bee3c0de208fbcab05f7712e9a5d SHA512 8df1923e9b3fa84430941c652bf3462e6ce9d4dfee67ccfce36512124aaa7ad364c2a8f2f2c1e4fef2ffb55a60491fe5208df576965d072a3c5c396da711d030
 AUX svscan.init-0.76-r7 685 BLAKE2B eb6caac65f18fa0c617a8e7d4e3474b562ff9a352a343cb24cf08ac29caaf1eff19652839552cc58bcb18ca4f82b5702dcc2828695647c5ce9af15bc63083dd7 SHA512 ba44f4dacd130a6cef6ac6e4cc3ffbd98ed3bcb75eab3441f7c6ee1899bb87f5e3ca491b83393f381f36460a522faf2f171dd4b74a92e9e222dbc1bbd3ff6b4b
 DIST daemontools-0.76-man-20020131.tar.gz 8005 BLAKE2B 0c8f0ae71754516fda772b3771a9e68499aed17f3035dee3c2bb36012fb4e411cac9146eb5889306f00e03a14ef65194e1b6f76d45890175642405797da2201b SHA512 1767fafb2d92902f903637f08363031971bda007d1b7b53059551c740976d1c643229ccc44171796c1dcb43cbd875a17178edc634e140671817e0ef0ba3ad80b
 DIST daemontools-0.76.tar.gz 36975 BLAKE2B cb45c92fc06169b617befe9f9193377a07d31e9e6ae05526c299ce2a63c8009b599384a87f768fbe9283b229083ef74007b85662976cf7add5c855f5018fafa8 SHA512 e4a7938352b745a03ccc41acdddba1e6782f0ca245e5cae060de62ab6c5a23c841a994c30140298d274405a7f26d53ba7e84e5810a3d185b2c01e4c0feffe6c7
 EBUILD daemontools-0.76-r10.ebuild 1343 BLAKE2B b34581ec22e8be4c29b76995d351aa559c6aa5471b8aa38adf8500493088639724cf66e7c19e1cbc7a06f589b60eefddb58c22fa05e1178b0083e163597c16f0 SHA512 6293cf98ed25b886e80013b07e98117073f03d6f0a4f2a186e74fd4a1fe152ce490ecad31192903681be1ef04182db3d7171236d69b0758a99ca86194eab5f13
+EBUILD daemontools-0.76-r11.ebuild 1404 BLAKE2B 0f29e5c08086d149fd0b2cc3236d5e4c3d5e976edab0ea86b0b56539ff679253f5fd6558babc49a8b1d9b57878e506cecbf8891d2f81660c97fa40cffc7391a1 SHA512 6bc322370657ac8b41a2aba699ffaaead0efc2209701567b6b3577e7aac50db73502841c1cda044ad8487808dcc5a1d818c0ea63e73ff1101150bd1fdcd29539
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-process/daemontools/daemontools-0.76-r11.ebuild b/sys-process/daemontools/daemontools-0.76-r11.ebuild
new file mode 100644
index 000000000000..3390cd179a7d
--- /dev/null
+++ b/sys-process/daemontools/daemontools-0.76-r11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Collection of tools for managing UNIX services"
+HOMEPAGE="https://cr.yp.to/daemontools.html"
+SRC_URI="
+	https://cr.yp.to/daemontools/${P}.tar.gz
+	http://smarden.org/pape/djb/manpages/${P}-man-20020131.tar.gz"
+S="${WORKDIR}/admin/${P}/src"
+
+LICENSE="public-domain GPL-2"	# GPL-2 for init script
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="selinux static"
+
+RDEPEND="selinux? ( sec-policy/selinux-daemontools )"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-errno.patch
+	"${FILESDIR}"/${PV}-C99-decls.patch
+	"${FILESDIR}"/${PV}-makefile.patch
+	"${FILESDIR}"/${PV}-implicit-func-decl-clang16.patch
+)
+
+src_configure() {
+	tc-export AR CC
+	use static && append-ldflags -static
+
+	touch home || die
+}
+
+src_install() {
+	keepdir /service
+
+	dobin $(<../package/commands)
+	dodoc CHANGES ../package/README TODO
+	doman "${WORKDIR}"/${PN}-man/*.8
+
+	newinitd "${FILESDIR}"/svscan.init-0.76-r7 svscan
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You can run daemontools using the svscan init.d script,"
+	einfo "or you could run it through inittab."
+	einfo "To use inittab, emerge supervise-scripts and run:"
+	einfo "svscan-add-to-inittab"
+	einfo "Then you can hup init with the command telinit q"
+	einfo
+}
diff --git a/sys-process/daemontools/files/0.76-implicit-func-decl-clang16.patch b/sys-process/daemontools/files/0.76-implicit-func-decl-clang16.patch
new file mode 100644
index 000000000000..06fe93b5d410
--- /dev/null
+++ b/sys-process/daemontools/files/0.76-implicit-func-decl-clang16.patch
@@ -0,0 +1,13 @@
+diff --git a/sig_pause.c b/sig_pause.c
+index 3d1a793..5280934 100644
+--- a/sig_pause.c
++++ b/sig_pause.c
+@@ -1,5 +1,7 @@
+ /* Public domain. */
+-
++#ifndef _XOPEN_SOURCE
++#define _XOPEN_SOURCE 500
++#endif
+ #include <signal.h>
+ #include "sig.h"
+ #include "hassgprm.h"
author	V3n3RiX <venerix@koprulu.sector>	2023-04-04 11:22:15 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-04-04 11:22:15 +0100
commit	7f6382ebb44b75c53021d4c4ab77d6b34aed21ac (patch)
tree	4d92ef3af5a26ff8a8a5a1ec4f21d18c65f56fe2
parent	41e5b5c1f11820df590e0a245bbddf224bc07823 (diff)