gentoo auto-resync : 31:03:2023 - 10:04:50

author: V3n3RiX <venerix@koprulu.sector> 2023-03-31 10:04:50 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-03-31 10:04:50 +0100
commit: f8b05ca448cdc580f580ff86eb8bef367d67c9ae (patch)
tree: b11f11ae6a7fee98b05350f8cc542402aeb23d95
parent: 15d97fe857a00a52fd4efb0a31ed0560f9de3a24 (diff)
189 files changed, 2947 insertions, 672 deletions
diff --git a/Manifest b/Manifest
index 218a2b6b10e6..dd4f85033d0b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29471 BLAKE2B 4af421dd7b7c502541995c25ef09ecdb5ba9b18bf1d9776f0e442f8728aca2dd760cc2e3eaa40a2b48ade5765b77565acf950516233c0abeea8e0064b6512783 SHA512 b0eba57fa7a8f94aefe543dc98f283a88502847148b5269a0364423828831c3c4636ff30ff8fa8eed2ed0f9027e59dd791775ec59be8ff694b0a926d25119f01
-TIMESTAMP 2023-03-31T02:39:37Z
+MANIFEST Manifest.files.gz 29480 BLAKE2B 354a5f025b96be9f50b78bce041259c404d104f43f21083a6322bcb134404556560603060ba1fdf4acd897709d5f5198262268125218d7260d1bf094dd27f588 SHA512 9dafdb6322bf8c0466080a5738d1a936787d382c1b674eecf052a6c987ad2c338c9403b3a37762e317a96e8f486b7e1b88347285af7d17b0908f669875bb84a3
+TIMESTAMP 2023-03-31T08:39:32Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQmR+lfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQmnERfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAdqhAAjoPc/wSCd7phNOB9tfOQ5wTdnbO4PxiiMaJL48fLHt3FIgHkiYoQCzDN
-2A8heak+WwBmxlR3id15pXtGBvxIaO+goAQESuEZFFrFVovo3ZEAFj0X+NLMelt/
-f3DwNx1n5B1yuTa5fY/AUdC29ox/yVVslhhx2aA1BQ3luBLP1Ew0p6m39p/2qQda
-H/xwb87YhkY5sO4K9Iy+O4uIkrCbYmL4jTKOb3ZlKuC5LRay4ZGalCLp1RtKocQV
-Ctvu7SF44u5WPKrjywlCL/DEqo2v+QU5qw4Dc79Cz+DwkMQ5sDJLDoVWKy4iR6yR
-vjnJXLz6HZUHbRD90IF0dpacQIoqQtGmoGm7WT6Ra+IkOUf/cOhmLdl5La+BCgS7
-ZhrLSGXoIj6ll4BVsnwTOSSUwffj8njebEpsrGBCOvHv1y7DtKJ9OuEVqUoWGOm5
-N6V2E1SRfm48vgs8i2AxY5mYDLxMAAFtmAep+deNbr+xJhuBnYqB9imiMWqLEBFp
-s4p68QR3ohuifcvbEaUuE8y9j009mpxM8Cz6acAvn5mM6s8+ncO7V2Pq/Zri7n0N
-3hYyU3ye9th2vMSu0iu33jwYEbUah6cDEiyY8UYvJZiPOoXl0+O2BC2wnhyAIPCH
-NqgRW9mbEzyB0VaxgMSAk8GLPDVV7YOXSTrYZdPEvN0ntkVFeK8=
-=vc/d
+klBgZw//XunjF1HwGWIASufBhvYYFYVMtMd37PD89oQd4sq3h5RcfjcyAAGjmLOn
+FiXirXzcICKdevrkj+3qke7ytzWrFBFyZtlGOdhfu8F/4NHWkWWymibqtt7Pk84H
+EmlvHUAEHhzV8DKVLRWbGqsFZmY3WB1I73/4sTsgeHAa4MdPju7tYHvfNrSdbT4E
+4J3hGSiQZUj9uRqipTm0VGtoooZLq4ZfY7PZmBQxkdWEeT9OQfIW5CcK7LVfj62U
+P/vdnes9CYSsNXoZR1wrBop2Xvqw5x7RK4Dp1McvKZi4FtJl5zTDt69vCa8mr/i5
+lWPPzrjFgyqtH4mzBBjTKKrZgEuasdMtUyh8cFcJDBOR3h8OndY+7c6XDgq6nPtz
+llYXVc1Sb73Fc9OyXsye1p5ODsEB3rftFuaQkN4nccV7JMpKSa8XvfbQdMI0y1QO
+DtqiTKMCLpGwFqra98lprp6ufd4ciEhrVqMwyYAC1ggd8hiN3USXBZLExPCKsHtC
+7moJTVIM0ry/Yhdm4FlrGZ0MCcd6WtLOwpp9h3n/ptvtTo5MDMzjaAeem1o4xzAM
+2G0aMgIHLsPaToCYeNv46yzTgJkvCXToZdbTtTxkV4D/uthYLRC+yK2qWRLXb9vc
+YbZ+4sqKIrj/GVv9cw85OcNEIQYLMViHKJJUQlPl8v2rjS88r0Q=
+=Ibrz
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a72201d4a7ba..ef901f71b4b8 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 20bc59fd5d46..d265c0420a17 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index a4384a9b52d6..ac6ec3347786 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,12 +1,14 @@
 DIST aws-cli-1.27.100.gh.tar.gz 2389951 BLAKE2B 02fac88ec2451c7c0f8b96c17c08e767ab629ab4480abf195023298aaf8b3f98f2fe5805da0051cbcc2fad0a93e5277dfaa38ffdf979d991f3873268ee530ffd SHA512 2a6f0be41d0d20edef0d5d2b75d455e928d82e373cdfc921f1fed5a189b42c11c5f08eb516d312caa5de13fd4a6139240233a7b0d4784640bb3b6dbfe5485895
 DIST aws-cli-1.27.101.gh.tar.gz 2390624 BLAKE2B ccb01bf7d3349c709b095b7a1fe3b0e39f6fbc0e7239d39f7fd0ff4c6f716fe0df0190518cbf9765d04e38111bbca934c74970f5e1f55d5f69ceee1eb3f49160 SHA512 9184326d067c59517aeb5178fc308cf753c6b6a3b2e3489b040c1053a24b63d637e9b775e7de52e0e501f4ec69bb410bff4e4e8f8ec294d089b7aaa7f604e514
 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.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
 EBUILD awscli-1.27.100.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.101.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 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.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.103.ebuild b/app-admin/awscli/awscli-1.27.103.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.103.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/clustershell/Manifest b/app-admin/clustershell/Manifest
index 6ddf5060848f..c2a078020a5d 100644
--- a/app-admin/clustershell/Manifest
+++ b/app-admin/clustershell/Manifest
@@ -1,5 +1,5 @@
 DIST clustershell-1.9.1.gh.tar.gz 383917 BLAKE2B 90d8c8390453a2c843bbb909a741d24d5f8e4b8eb03631bbe81b98973fce95d96dd3e68d0b951bc23d067057222c858e5041a3bafde200e0e2d14a0be995689f SHA512 32ee8b43d92e7ada8c81facc6a0609c39beee9189fa6fb9c2237387a58134f99fb2e6ab6e5de35c8e6fc8d3cef57f74f4c08b14968484546859071dff2594eb1
 DIST clustershell-1.9.gh.tar.gz 382574 BLAKE2B 031eb9683db330f3b90ac06fa9a0409ea72c1be3d83c8d0519e0080ead715386043c925a6dbaeafdb38351c54f1508c050279603cd81bc2de60ba2df5733f636 SHA512 9eb4e9663a6381fa27311d1d70002ba64066ee6e2e08aaf772974d8097c6ca2d020563fc8478064e76bc6e56d37ed7eefc2919db99a2f5b26bd878fa7b764a15
-EBUILD clustershell-1.9.1.ebuild 1134 BLAKE2B a382459c7be182f5b215aa6775a4f05098d4d513423fb40f314d014a7f126c6d626e75777f0757e3411cf2cf5dfab87ba815afa34ff3542ca27a995dcee006c4 SHA512 52118a47e4edd4010e814ea82ff0245140a6daa3799e440cde1b8591065dfb6bb37fdaf24a75c44a3894849db50d30258aaef2ca6e335cd0cf97e5e06712d301
+EBUILD clustershell-1.9.1.ebuild 1133 BLAKE2B f33c5fde46ef7a8a6f962c40147f1b7ae020365185a5dffb87415e3613e8ff8d1617253851f4cfb3b622c791f7c71f0a346400d3f38fce7d9f4f2ef074b19d81 SHA512 8195776d408ee32391fcecd4550f07dd94d37cfb52539ec8b54a36158bf6889378d44592f1526b5b3188f4aba0d0c20b9df5e9913093ef297886ea7a00fd462e
 EBUILD clustershell-1.9.ebuild 1156 BLAKE2B c2aa3e12edaf2a17208373c440617d7dceebbe018c7364ba3e6f50ab954f3274e9b3236a8e1b1843bcc7eb579f8230e9d1f783d7ba0ce3c11e8ec9a0f27401be SHA512 0bb4cddc8fafee1e860474b822b82bc29f5ad7d0bb63f7062c0dd98ac4955a2f6f61e169a9882d534ac555959f5f1366b9185a81c00bb4768e6c50d3fa81e72e
 MISC metadata.xml 610 BLAKE2B 1baa68f298ccc1117524968f3ddef220f068e876cfe8d6e5243a5f3144bfa8db21aa93bdb92efd3e7082c0e32b2747d2b544687114b09b78f823636d9b9be5b7 SHA512 0e4a89c4ea24577e065ed6b1a5714cfabea0a3452d546a16824608d2fdbc97ac39fb43d49c7adb279342a774b6719d52707b54091fc30326cbef14755fc04e0f
diff --git a/app-admin/clustershell/clustershell-1.9.1.ebuild b/app-admin/clustershell/clustershell-1.9.1.ebuild
index a630103853a9..c76aac7a51c5 100644
--- a/app-admin/clustershell/clustershell-1.9.1.ebuild
+++ b/app-admin/clustershell/clustershell-1.9.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index fbe46cd78316..bd95a77ddae6 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 8950e154d566..1c9a2ffd1384 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -22,7 +22,7 @@ DIST redis-7.0.5.tar.gz 2968205 BLAKE2B c319a2f656e4bd26637735ef73e58eecc306e202
 DIST redis-7.0.9.tar.gz 2984823 BLAKE2B 9c2e79f40ad14f6412ec4bc79507a32f8780bf4b3a311b87dd309e74b6367536f1c91b8026efc6acb3d750ca7c49687a74660c66d104caa439ef385db3eab230 SHA512 e984a19583e4aae0a5dce85a434d3255f4f13725eba0f11a1fe1a1189b17035152a26b65f1a3a8834f0dd8218f4a65986c918f96386120ea9419bd02366c8293
 EBUILD redis-6.2.11.ebuild 5477 BLAKE2B 14f386f89b2d762bb0dcc7ce6ea2b248e30c673e6945d32f1f8d029f41f1c58d1e1a37638141975c9f931b2afe6ec91778e95fc33d7f2dd2e2b8656146214477 SHA512 ce2b530d307b191ac0abd651e236e0ed6d2aa60f9297fc629006116f1ef86536a5ba413e29966771d415178693ae44654a42b98789c2c75455707e24cc3b50fe
 EBUILD redis-6.2.7-r2.ebuild 5541 BLAKE2B ee1a308081b8e6ed74e01d69ab9c4b23d6010a6eaf52a7e64f0ed185fc6595e36f1fec5ecb379af8df28269a9f248ed1f15771e41e959f40d1dfc6b0a8310234 SHA512 575b3dbd3059f9e88a3eb64fbbea92e05bd869eb6e2c49c0a6f6b6d667411d810e1414b3ae8ed43acab025d7a0b4249d357adce5784345605b042d5a225256d2
-EBUILD redis-7.0.10.ebuild 4939 BLAKE2B e0ccc9a28abe811494f99a07979e6d0df692cb2b0f37b4e8d0b409dd87094bb572052361e077ef5d954c328ffad928dc863fa2bf35191c27f200b6c3ecf188ac SHA512 5f31cb19f67d0d3867a1d5c15bfda32be40e962b18c571d4e24da895f6160a3b96ceabfcc72a430df5b75fe270b3a741dd76856f9e4589fa69d61a002633a537
+EBUILD redis-7.0.10.ebuild 4938 BLAKE2B c275c04f11a84337eb1bad31ea1b520314f387391b88d9f46f7597f8b876868caae9c4ade9ba94050d8164e30fd6da810b6e415b567b87b0c1d08889d91422d8 SHA512 67180a9b0066e2f88236efc5b9640a64bba126c90274bc98af213021ed29c51e7bf8a1f2b1896856ca81b7ddffb1d89661690ca855b15d12719967b23236e750
 EBUILD redis-7.0.5-r1.ebuild 5052 BLAKE2B 2104f1b8adbfbc8200fcca092653ecfa73115a0cb275e5ceb37575b11e5c154c58476fdc310f9033f656b2322cb587b5a6b57a39cbafdc4a34d9167389365837 SHA512 78e69a11dbe46d5d8cab70059b9fe0e403bb6f963de06e1c0e707462de38f3fd35a9d32d31f643463829c8d2c273d099980a4b552eb59657e2b1bae7512bdabb
 EBUILD redis-7.0.9.ebuild 4937 BLAKE2B 765a5112d9aa60227dced3884d5cfa7d3a38a4b82741ea6dd9e4465f33731be241e8b5ac05eadbd4103e4f427aaf01c79c2001fbda8cf519e854212160c14c6a SHA512 5b3b89eda61bcc7e39c81f18e0e11260ea6a8365db63b5a4e104ed2e3f3f3a7bf36d1df14bb3643b0ab81e5e05573e1268a2eae82ea1c37d57969909488a4846
 MISC metadata.xml 692 BLAKE2B 884fa6be2c816c04a9a24db6d1e47f5e84da00a47cf7cf8a757b3a6d7a1d769597107db2c32904e9d1306cf5450fedc04bbcfb75a14a89c0d6bcdf4dbe85636e SHA512 48a675be7e6a294dea1cdde0a6988793150b8ad36fc0e9402476221012292d549916d8186e2ea97ca1be660f9d60a9c889cb8cb6e30fecaeed1525bf9003de88
diff --git a/dev-db/redis/redis-7.0.10.ebuild b/dev-db/redis/redis-7.0.10.ebuild
index 63934f9289ed..2c34789783e6 100644
--- a/dev-db/redis/redis-7.0.10.ebuild
+++ b/dev-db/redis/redis-7.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+jemalloc selinux ssl systemd tcmalloc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 281d46402079..1ed6a955593d 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 2f66b50e5ff9..170415546e79 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,5 +1,8 @@
 AUX batik-1.14-modules 461 BLAKE2B a22123561682c3990ad289ca888453b876bb1a4de03b435445758386297cb8e1058db777d4c79941a407c4b95ad8623a6450dc8ba0acf71f66b25a666ab7695c SHA512 19ec52318a76f16122e0740bb8f744e6b669537ad75f44931c1cf64c407a1d11b6eba4ea4b0e0e37ec5402e9ff99b76e8ae0e5b65f529f6ad56e30625cb7b77e
 AUX batik-squiggle.desktop 177 BLAKE2B 7f4fbc31f31f6ddbdb7802ad4ea6b87c21b39b83cec2caf5f8b68634693b05c66e3f7da6d2cf69f5da6defa2d44fa4c5a0eba4af13308b8f18fb666be86b1d40 SHA512 7e7be90a0a779752cf04bbb1e702f5f3ca773129f7dfebcc3352e55f81cad2d65f6067e07c075f730b7f11235529804856fc226703b5e213216bc110dd978d8e
 DIST batik-src-1.14.tar.gz 17647867 BLAKE2B 9385e77e739ece921012310a53953a6e258a5d748987e85dd20783ca248ae55619db6472b7590a45fe40a1b51c693478a37a7dbe1a958b42392c525e5f228815 SHA512 689c52f58f8f0456c89bd18745d2d92e7590b9054bea71b96be87d44977057d583e78504cbf14afc3e0c585d2383dac3009c7c421de868c847db045e921da8fb
+DIST batik-src-1.16.tar.gz 13495722 BLAKE2B 041442b5485588a23b6e335cc46630b3c73fb8a36157e8bc77baa7b399bf7986549039f27e89727ebc98b8492095b957c8c6deb12b232a39784844e4c5edf6ab SHA512 024ab7a204d00b6c855e26c62a326dfcde5fb486a7635890c6fcb37d421c7195ae04b3d292daabc0fcb6564f55bfa93d6fef15cf4c2dad77e569ca17d1eeb250
+DIST batik-src-1.16.tar.gz.asc 833 BLAKE2B fdcfb26b9cc0d4fb0c37ce42d65628629ab0c27257ebe07715d5b2786500515125a240957c9ba76333aa54320905273031354cf09ee29e3a79fc7529640ebf03 SHA512 7fc3450d2b4d19e03528707fc20d6e18af926938ad24ad7460cc1c423c6c40507059fff2e2921d82fc582a4b486a75141fb407d450b043e2cc5007e0c2d486ea
 EBUILD batik-1.14-r1.ebuild 5212 BLAKE2B 3d4b50a16f0e0e940fa0a7074abbce4824f703d50d3099af157ebdeb3d8147fb7f016b105837e044a836a79fbe96a0e48d8948c1669d0e46d8a64065eed69835 SHA512 39bddd9d287ed85594924148da66586dd9d42e91bce2a18337826494e16846080524b7845266a32675cd8a5891b41c6f1540beb958d1fb3eb07533fcbfb9a6f1
+EBUILD batik-1.16.ebuild 6228 BLAKE2B 271da700349b4d8e27317dc62c30a3cb2d62517e4d02a8f9a74c1eb59de23ed38e0ec0f0f8fc318333f5c58d0f1b26208d7139b30f0142741f9f9c512a49cf32 SHA512 eaab9e535e0dc7fcbba27386848dd11f25b62b4f433e3d3a925de331e125632e3c40662f38405374ea6e46626667d57f276a2c4a431f5d0c79f3f852850a8ba7
 MISC metadata.xml 610 BLAKE2B c589c175b595deb71eae6b8fccd46f4d6b82331f636cff28b6074300b6495efb780d157bb1b5b1359070cca7405138fcff719d72f1038023357fc7ab05c52b87 SHA512 73a6bb61c87645d1600ab90ca954599208c8599e967f6e999d973fa80e9693435db8a75ace95c8881486c8e2929d5a201a51e821e5f58763c273b21b5a32c229
diff --git a/dev-java/batik/batik-1.16.ebuild b/dev-java/batik/batik-1.16.ebuild
new file mode 100644
index 000000000000..aef311523b6a
--- /dev/null
+++ b/dev-java/batik/batik-1.16.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.xmlgraphics:batik:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit desktop java-pkg-2 java-pkg-simple xdg-utils verify-sig
+
+DESCRIPTION="XML Graphics Batik"
+HOMEPAGE="https://xmlgraphics.apache.org/batik/"
+SRC_URI="mirror://apache/xmlgraphics/batik/source/batik-src-${PV}.tar.gz
+	verify-sig? ( https://downloads.apache.org/xmlgraphics/batik/source/batik-src-${PV}.tar.gz.asc )"
+S="${WORKDIR}/batik-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="1.16"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="
+	dev-java/jacl:0
+	dev-java/rhino:1.6
+	dev-java/xalan:0
+	dev-java/xml-commons-external:1.4
+	dev-java/xmlgraphics-commons:2
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/xmlgraphics-batik.apache.org.asc"
+
+DOCS=( CHANGES NOTICE README )
+
+# Modules batik-rasterizer-ext and batik-squiggle-ext, upstream puts their jar files in the extensions
+# directory, see batik-extension/src/main/resources/org/apache/batik/extensions/README.txt
+# We comment them out but keep them in the mudules list for later.
+# The same for batik-test-old which depends on fop-transcoder-allinone which itself depends on batik.
+# We also don't build batik-shared-resources since we install those resources on global scope.
+# And we don't build batik-all. Instead we install the modules.
+# BATIK_MODULES is the "Reactor Build Order" extracted from the output of "mvn dependency:tree":
+#	mvn -DskipTests dependency:tree \
+#		| sed -n '/Reactor Build Order:/,/Building org/p' \
+#		| cut -d':' -f2 | cut -d' ' -f1 | grep 'batik-' || die
+BATIK_MODULES=(
+#	batik-shared-resources
+	batik-constants
+	batik-i18n
+	batik-test
+	batik-util
+	batik-awt-util
+	batik-css
+	batik-ext
+	batik-xml
+	batik-dom
+	batik-parser
+	batik-svg-dom
+	batik-anim
+	batik-gvt
+	batik-script
+	batik-bridge
+	batik-svggen
+	batik-transcoder
+	batik-codec
+	batik-extension
+	batik-gui-util
+	batik-svgrasterizer
+#	batik-rasterizer-ext
+	batik-rasterizer
+	batik-slideshow
+	batik-swing
+	batik-svgbrowser
+#	batik-squiggle-ext
+	batik-squiggle
+	batik-svgpp
+	batik-ttf2svg
+#	batik-all
+	batik-test-swing
+	batik-test-svg
+#	batik-test-old
+)
+
+src_prepare() {
+	java-pkg_clean
+	java-pkg-2_src_prepare
+	# We drop support for jython due to bug #825486.
+	rm batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreter.java || die
+	rm batik-script/src/main/java/org/apache/batik/script/jpython/JPythonInterpreterFactory.java || die
+}
+
+src_compile() {
+	# We loop over the modules list and compile the jar files.
+	local module
+	for module in "${BATIK_MODULES[@]}"; do
+		einfo "Compiling ${module}"
+
+		JAVA_JAR_FILENAME="${module}.jar"
+		JAVA_MAIN_CLASS=""
+		JAVA_RESOURCE_DIRS=""
+		JAVA_SRC_DIR=""
+
+		# Not all of the modules have resources.
+		if [[ -d "${module}/src/main/resources" ]]; then
+			JAVA_RESOURCE_DIRS="${module}/src/main/resources"
+		fi
+
+		# Get Main-Class from the module's pom.xml
+		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' "${module}/pom.xml" )
+
+		# Some modules don't have source code.
+		if [[ -d "${module}/src/main/java/org" ]]; then
+			JAVA_SRC_DIR="${module}/src/main/java"
+			java-pkg-simple_src_compile
+		else
+			# This case applies to batik-rasterizer.
+			if [[ -d "${module}/src/main/resources/org" ]]; then
+				jar -cfe "${module}.jar" "${JAVA_MAIN_CLASS}" -C "${module}/src/main/resources" . || die
+			# Else for batik-squiggle (also batik-rasterizer-ext, batik-squiggle-ext)
+			else
+				# Create the JAR file (not possible without adding at least one file).
+				jar -cfe "${module}.jar" "${JAVA_MAIN_CLASS}" -C . README || die
+				zip -d "${module}.jar" "README"
+			fi
+		fi
+
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
+
+		rm -fr target || die
+	done
+
+	if use doc; then
+		JAVA_SRC_DIR=""
+		JAVA_JAR_FILENAME="ignoreme.jar"
+
+		for module in "${BATIK_MODULES[@]}"; do
+			# Some modules don't have source code
+			if [[ -d "${module}/src/main/java/org" ]]; then
+				JAVA_SRC_DIR+=( "${module}/src/main/java" )
+			fi
+		done
+
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_test() {
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+	for module in "${BATIK_MODULES[@]}"; do
+		einfo "Testing ${module}"
+
+		JAVA_TEST_SRC_DIR=""
+		JAVA_TEST_RESOURCE_DIRS=""
+		JAVA_TEST_RUN_ONLY=""
+
+		if [[ -d "${module}/src/test/resources" ]]; then
+			JAVA_TEST_RESOURCE_DIRS="${module}/src/test/resources"
+		fi
+
+		# https://github.com/apache/xmlgraphics-batik/blob/refs/tags/batik-1_14/batik-util/pom.xml#L74-L75
+		if [[ "${module}" == batik-util ]]; then
+			JAVA_TEST_RUN_ONLY="org.apache.batik.util.Base64TestCases"
+		fi
+
+		if [[ -d "${module}/src/test/java/org" ]]; then
+			JAVA_TEST_SRC_DIR="${module}/src/test/java"
+			java-pkg-simple_src_test
+		fi
+	done
+}
+
+src_install() {
+	einstalldocs
+	domenu "${FILESDIR}"/batik-squiggle.desktop
+	doicon batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/init.svg
+
+	for module in "${BATIK_MODULES[@]}"; do
+		JAVA_MAIN_CLASS=$( sed -n 's:.*<mainClass>\(.*\)</mainClass>:\1:p' "${module}/pom.xml" )
+
+		java-pkg_dojar "${module}.jar"
+
+		# Add a launcher if the module has a MainClass.
+		if [[ -n "${JAVA_MAIN_CLASS}" ]]; then
+			java-pkg_dolauncher "${module}-${SLOT}" --main "${JAVA_MAIN_CLASS}"
+		fi
+
+		# Some modules don't have source code
+		if [[ -d "${module}/src/main/java/org" ]]; then
+			if use source; then
+				java-pkg_dosrc "${module}/src/main/java/*"
+			fi
+		fi
+	done
+
+	local java_policy_file="${JAVA_PKG_SHAREPATH}/etc/${PN}.policy"
+	insinto "$(dirname "${java_policy_file}")"
+	newins - "$(basename "${java_policy_file}")" <<- _EOF_
+		grant codeBase "file:${EPREFIX}${JAVA_PKG_JARDEST}/-" {
+			permission java.security.AllPermission;
+		};
+	_EOF_
+	java-pkg_register-environment-variable \
+		gjl_java_args \
+		"-Djava.security.policy=file:${EPREFIX}${java_policy_file}"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-java/javahelp/Manifest b/dev-java/javahelp/Manifest
index 6959a7a86e3f..f7825464b1a5 100644
--- a/dev-java/javahelp/Manifest
+++ b/dev-java/javahelp/Manifest
@@ -1,4 +1,3 @@
 DIST javahelp-2.0.05_p20170719.tar.gz 6045243 BLAKE2B 3cea100e6087f7f8884a04cc1b046f2611e4c516be0086faec685a85311f2cfd9ca49ee9f3fdff37d7e9a496685dc288601521047a3d4c2ae6b31faee2ad7390 SHA512 6d98c33f831052133176cf50419aae6dc1f5715485bcfd33f7e346cb694f5483b1f7a159f47799a72933db8ca42d83cb73b23946179aa6ccaee946d524b3bd36
-EBUILD javahelp-2.0.05_p20170719-r2.ebuild 1671 BLAKE2B b888661cec8fb5809bad3659fd3350ffc915b27aa3d9291eed88f0a0194aa702358639c7546840a56b20664565bc9442748b25164bf8418b92cab82e2322dab7 SHA512 f5182e636d07e823fc4314fe077a539e86af3d7e265884b62b42dc176dc13d48924d9491a80dd0bcfcbee7f951f3db770880a14099c11f9fb52135fe515b9fe1
 EBUILD javahelp-2.0.05_p20170719-r3.ebuild 1612 BLAKE2B 200c30695215557ec36930715715a0dd758b7b49d09b670a7c705b53c6ddf69e9a28b4f865fa1c341c1815d26d9fd9337c8ed61ce3a904a5b7aba05aeff93a2c SHA512 cd34ea7328258e5d9a36aaff43b17e5734bbcaca80c8bb9bd9a12b114be8713f1883faf4ddda209d0d85afe28c655ead198ed5a267a164d0b14be5f31bc2ca31
 MISC metadata.xml 705 BLAKE2B 99d50e7e4960fd92f1b9f34d830ee22246f88c5224beb09eb581fa10b128753985c991b22a002eb8cc6ecb599475d0d88a50cfeb76734a4d687fc3c34d88686b SHA512 c20f79d6b27ea89d68d8f9655804986827e4bb5fff86b525047d8b34cb1c30c051af76d732da63a38ee9b311e78fdaaa4e3e2fa1232cde0230b7e75f6af37b6f
diff --git a/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild b/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild
deleted file mode 100644
index 19a57920dc55..000000000000
--- a/dev-java/javahelp/javahelp-2.0.05_p20170719-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COMMIT="3ca862d8626096770598a3a256886d205246f4a4"
-JAVA_PKG_IUSE="examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The JavaHelp system online help system"
-HOMEPAGE="https://javaee.github.io/javahelp/"
-SRC_URI="https://github.com/javaee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-CDEPEND="dev-java/tomcat-servlet-api:2.4"
-
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-DEPEND="virtual/jdk:1.8
-	${CDEPEND}"
-
-JAVA_PKG_NV_DEPEND="virtual/jdk:1.8"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-_eant() {
-	local \
-		servlet_jar=$(java-pkg_getjar tomcat-servlet-api-2.4 servlet-api.jar) \
-		jsp_jar=$(java-pkg_getjar tomcat-servlet-api-2.4 jsp-api.jar)
-
-	eant \
-		-f javahelp_nbproject/build.xml \
-		-Dfile.reference.servlet-api.jar="${servlet_jar}" \
-		-Dfile.reference.jsp-api.jar="${jsp_jar}" \
-		-Dservlet-jar="${servlet_jar}" \
-		-Djsp-jar="${jsp_jar}" \
-		-Dservlet-jar-present=true \
-		-Djsp-jar-present=true \
-		-Dtomcat-zip-present=true \
-		${@}
-}
-
-src_compile() {
-	_eant release
-}
-
-#Does not actually run anything
-#src_test() {
-#	_eant test
-#}
-
-src_install() {
-	java-pkg_dojar javahelp_nbproject/dist/lib/*.jar
-
-	java-pkg_dolauncher jhsearch \
-		--main com.sun.java.help.search.QueryEngine
-	java-pkg_dolauncher jhindexer \
-		--main com.sun.java.help.search.Indexer
-
-	use source && java-pkg_dosrc \
-		jhMaster/JSearch/*/com \
-		jhMaster/JavaHelp/src/*/{javax,com}
-
-	use examples && java-pkg_doexamples jhMaster/JavaHelp/demos
-}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 5902ab176077..aff1965160f9 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -2,9 +2,7 @@ AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfd
 AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
-DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
-EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
deleted file mode 100644
index 45eff8f89957..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.36.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-MY_P="apache-${P/-servlet-api/}-src"
-DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-5/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.4"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc source"
-
-DEPEND=">=virtual/jdk-1.8
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${MY_P}/servletapi"
-
-src_compile() {
-	local antflags="jar $(use_doc javadoc examples)"
-	eant ${antflags} -f jsr154/build.xml
-	eant ${antflags} -f jsr152/build.xml
-}
-
-src_install() {
-	mv jsr{154,152}/dist/lib/*.jar "${S}"
-
-	if use doc ; then
-		mkdir docs
-		cd "${S}/jsr154/build"
-		mv docs "${S}/docs/servlet"
-		mv examples "${S}/docs/servlet/examples"
-
-		cd "${S}/jsr152/build"
-		mv docs "${S}/docs/jsp"
-		mv examples "${S}/docs/jsp/examples"
-	fi
-
-	cd "${S}"
-	java-osgi_dojar-fromfile --no-auto-version "jsp-api.jar" "${FILESDIR}/jsp-api-2.0-manifest" "Java Server Pages API Bundle"
-	java-osgi_dojar-fromfile --no-auto-version "servlet-api.jar" "${FILESDIR}/servlet-api-2.4-manifest" "Servlet API Bundle"
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 0612d89ce970..8b2964cf3f83 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index d97e110f822f..bfd1542185b4 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -18,11 +18,19 @@ AUX 3.1/901-musl-stacksize.patch 945 BLAKE2B 7187ee4c73fb4a9ec00b32a02a176863d88
 AUX 3.2/010-default-gem-location.patch 356 BLAKE2B f44459799fff80c7f14e5e7d674ee9ed22863cdb84838e0fad55a66f615fa91e3e4de30377c04a385927feea67c6046c837eb7a647fbe162685309ea3f9ea420 SHA512 894075663d409a117ad94abd63d6562c90b87a725ef56d02ad7c187532b99a56128be2f5f64d0e72763d1c14213707de84c920415107df875218489796bc4a5a
 AUX 3.2/901-musl-stacksize.patch 749 BLAKE2B 422d53ef7fc1e76bd7466ff67da7cefd3665282ce0e29d16e2455e8f2bcbe081c0b9d31119eed6d6b53f6200fa72d623e9c04e0ebd6594397cf1dad344e8049a SHA512 f9ad0a50a0672a88b89cba9c452c090e0fe47fe41c640951b1b14970e1219a27c9ef3a1b53650b135d607830ae7a09b6a8916e45263415b58122c07262e90b1b
 DIST ruby-2.7.7.tar.xz 12101804 BLAKE2B 35f53835259217e344bde7fa3e2fe18e24c3e56eed2ca6dffb7385f38def401e6115944189138b280df5bbb0f5ff2e98f88260165f6e1802c60bd24cc6366397 SHA512 a19be3f0dfce040fe79f439e606f179d6750d2cc6e7b64fd65933edd487f5995573f7d0730beec9d3edadf942f8e9216f01ab3fff189d6cbe9d46a9add3e2683
+DIST ruby-2.7.8.tar.xz 12105320 BLAKE2B dde5dc368b0e23b19c2f52ec16f233a90f26aa42739882b5222a9112e42d424e16eb781ba0b5351c89c8845724f4e53073f6c60a6e29814c346f824ade5dfab0 SHA512 4b49dff3e1c2e79d914e10418e4c03026f5d4c137dc337f5c720fe26cb9fcdcf4afc6b7c967356cf5fbe04cc5ef431174c48a035becf3e2322c2c45d3c9b2f59
 DIST ruby-3.0.5.tar.xz 15880196 BLAKE2B 581aa202f6b1b5c72bb18d486c4f74ec87a6c2dd38166c4841b75dba891aabd72c3889b158134b04763cddb22c0f60015f4d21c5130077053e1fcb13e28a8024 SHA512 1c69d18210a2156f7696c678a8d54bf05c4dc49a1401c1ecc5760b1c23fb6ac14053873a225564664d6a327cda274ce72f47d112a6ad8d378f978de4e507e9a0
+DIST ruby-3.0.6.tar.xz 15864560 BLAKE2B e1fca86cdf267fc2289ef4d605fdf0023265c3a291ca4088361c0acd64310a7c41bf0750b4ac762157c20ceaa5df8bdc0a67374bcad9654bca5c3fc8630ff89c SHA512 abbf883cd9f3ddbd171df8f8c3cd35d930623c4c01a5e01387de0aee9811cca7604b82163e18e04f809773bf1ca5a450f13f62f3db14f191f610e116ae4fa6f8
 DIST ruby-3.1.3.tar.xz 15300224 BLAKE2B f3ef9031c2902bf5d624dce0a4584724e7a9099fb8b33b86a99026c37f4b91f23ff35c23a3cd7715bf739e6c539cc3612b5a750d00cbacf8e4ebcc70bbc85f41 SHA512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69
+DIST ruby-3.1.4.tar.xz 15316604 BLAKE2B 5d771c267451c05ae192991976957d43d1131e652ac5a90a8dfff9deba97cf6b139d0113f5d2ed44225a545aa79a1c732555de1efc83d1010d097ec35f7e92dd SHA512 a627bb629a10750b8b2081ad451a41faea0fc85d95aa1e267e3d2a0f56a35bb58195d4a8d13bbdbd82f4197a96dae22b1cee1dfc83861ec33a67ece07aef5633
 DIST ruby-3.2.1.tar.xz 15094384 BLAKE2B 2dce2201c2c44910fdfe3e58013df9432e6b242baa9cb1f2c0ea3b010a18f9508d9c7802932cca0a05e6b35a2fcd17195a076f6c6741684959065878c31fc2bf SHA512 69caadab9be6b56905ea4fc92fa0e36704f9fa6a0e7e7f4c6bdb79e9cbe8dc57c524f96d9c18802d61aa1ca578fed2e9758692f9d701bf0dba938f0206b721b3
+DIST ruby-3.2.2.tar.xz 15118856 BLAKE2B 8e09fb0f6808d4572f86ea190db4f4b950ff3a13391bf7bc3e515b6d14f356d3f7c1eb5bbbe2de460ef78edee54462fdf9be56722cd9e27a613febfe45f8c40a SHA512 a29f24cd80f563f6368952d06d6273f7241a409fa9ab2f60e03dde2ac58ca06bee1750715b6134caebf4c061d3503446dc37a6059e19860bb0010eef34951935
 EBUILD ruby-2.7.7.ebuild 7919 BLAKE2B 1e6c1c39b7213fac6b657a059b9648e46bb3535e142335aba846ee323a39d4c1ec55dbab65e418670fe6207f33b8e0f1db72ceac56468acc27664aafa092de34 SHA512 7050b5d05734f0b588877c33b1b531d8d50d060234f12c29d5a209ab8dbd440bfc223f038002aac30837dc2f76d8774e18b661dbef53efb3ee8b0b4dc8e8fcb5
+EBUILD ruby-2.7.8.ebuild 7927 BLAKE2B 92a17d083f6138f23f4b8b46fc72fe07e3871c3eec481f22ae3996b65ca488955c43328c2fbda9a0ed49ba80b785315aa9e5280f228cf3a06941b36ae2664738 SHA512 7ec9e13dbc94f24ac688403515e5d22f09818e248bdbaa07a55011b5e7d5bef451d7765fc7f04a89c15503987921277fed30e838a9aed6ff4263e40ee2f29c61
 EBUILD ruby-3.0.5.ebuild 7766 BLAKE2B ac667961e1ffd320e538ba8faacc9777ca1d0b8d7c9ee2961bfa92280f67a8ab80f45a3e43008d89dd8424d12c061bdd870e616d5c614567bac74cbc8bd5c5e7 SHA512 5ddf1bdf0a4b5c5b1db85800dd2acac3658ab3717293f7a405d0b7a1531dde904da233193766e3f47dd5e1b6029931327d61803bdda3db2699057cf34a1cbf1c
+EBUILD ruby-3.0.6.ebuild 7774 BLAKE2B 561ffd59751e5ac8d588fbcf5a0e3469f2d79fa5adbbbaa5a9909dfb1c537347a62a17632cd3fb9f9757d8394408a243a47d87ab004a9c7c956515b4d2016fac SHA512 e13f6f677c1976c7364864fbecaa23679c78c4ceaf8f20907569b320a76caa3b1fa88bf2bbd2451f5f104eeb9d5a7a1bda2f38df87b5718d2b0a9c3fe0ef649c
 EBUILD ruby-3.1.3.ebuild 7518 BLAKE2B b2ed93e5681dad89f143af813c75e515d96c0c698f21a6a19a7ed959d5eb165352f6d87dc7a76395f9bbd43f8d17995c4f3511a37b8afa397a7b67f051a66d6e SHA512 b45cd6530aebf890663d1481fb0354363de0e7ca8a04b575d14e643b40b68eaf4d47d9c372165860ec49382d3ea9b6b078567c92b29042d75c69679e35615c0d
+EBUILD ruby-3.1.4.ebuild 7518 BLAKE2B 7f5f6468db2683b80ef85df0f0671ccc7c07fb76ecaa5dd9fcdf2b11f8c5ba6449c60937e171e59cd3bf6de795b67d9c431d89007aa97d307e786ba6ab782062 SHA512 4f128d82636dacb35f6f3d269e06eb5d9664f4bac915dbcc70fab3677272fb0ff73928676c2210f43b6864cf1680e801805953ba0ddc6a4eba303529f28e53d8
 EBUILD ruby-3.2.1.ebuild 8480 BLAKE2B 5abef4176a0494aff896d584e225d1f1fe944fa7bda7927cbd685e64e3bcaf112a67c6c5e32e77814b51fa56f3ac8676be2dfc25f4791c722999965cd4b2bf5e SHA512 e7a02abee0053c409a76b099cbab7af39d2e31c47660e81f1cbc79202567e67471bfb6f0ad628d0dda0bac45f9e27e83b5ea9427372dbb6becd72bc6a8d6d403
+EBUILD ruby-3.2.2.ebuild 8480 BLAKE2B 5abef4176a0494aff896d584e225d1f1fe944fa7bda7927cbd685e64e3bcaf112a67c6c5e32e77814b51fa56f3ac8676be2dfc25f4791c722999965cd4b2bf5e SHA512 e7a02abee0053c409a76b099cbab7af39d2e31c47660e81f1cbc79202567e67471bfb6f0ad628d0dda0bac45f9e27e83b5ea9427372dbb6becd72bc6a8d6d403
 MISC metadata.xml 602 BLAKE2B a6e6786b21d135c4a952d48d7430a1ad545d1ae45687e83eae3164818a20b7322aac330a8b125247f1772411564a799451a3a94f5375986277dbaf824970992d SHA512 3af744c835dfeefe931af01c2b50e721ac2ba82f65ab06160aa4b63a5c2eb6543c0954902f9eee80e86cbcd727d496c2de9a9a8ebfd1cd0af9e995c6f6ab8cd8
diff --git a/dev-lang/ruby/ruby-2.7.8.ebuild b/dev-lang/ruby/ruby-2.7.8.ebuild
new file mode 100644
index 000000000000..9028750f7069
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.7.8.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
+	ssl? (
+		=dev-libs/openssl-1.1*:0=
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	systemtap? ( dev-util/systemtap )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	dev-libs/libffi:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	>=app-eselect/eselect-ruby-20191222
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/minitest-5.13.0[ruby_targets_ruby27]
+	>=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27]
+	>=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27]
+	>=dev-ruby/rake-13.0.1[ruby_targets_ruby27]
+	>=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27]
+	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby27]
+	>=dev-ruby/bundler-2.1.4[ruby_targets_ruby27]
+	>=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27]
+	>=dev-ruby/json-2.0.2[ruby_targets_ruby27]
+	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.7/{003,010}*.patch
+
+	if use elibc_musl ; then
+		eapply "${FILESDIR}"/2.7/{900,901}-musl-*.patch
+	fi
+
+	# Reset time on patched gem_prelude.rb to avoid the need for a base
+	# ruby during bootstrapping, bug 787137
+	touch -t 202001010000 gem_prelude.rb || die
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+	# Don't install CLI tools since they will clash with the gem
+	rm -f bin/{racc,racc2y,y2racc} || die
+	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	if use prefix ; then
+		# Fix hardcoded SHELL var in mkmf library
+		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+
+		if [[ ${CHOST} == *darwin* ]] ; then
+			# avoid symlink loop on Darwin (?!)
+			sed -i \
+				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
+				configure.ac || die
+
+			# make ar/libtool hack for Darwin work
+			sed -i \
+				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
+				configure.ac || die
+
+			# disable using security framework (GCC barfs on those headers)
+			sed -i \
+				-e 's/MAC_OS_X_VERSION_MIN_REQUIRED/_DISABLED_/' \
+				random.c || die
+		fi
+	fi
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--with-readline-dir="${EPREFIX}"/usr \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable jit jit-support ) \
+		$(use_enable socks5 socks) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+	emake -j1 V=1 test
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	einfo "Removing default gems before installation"
+	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
+		export DYLD_LIBRARY_PATH
+	fi
+
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	# Create directory for the default gems
+	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+	fi
+
+	if use examples; then
+		dodoc -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README*
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-3.0.6.ebuild b/dev-lang/ruby/ruby-3.0.6.ebuild
new file mode 100644
index 000000000000..c1e673f8322d
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.0.6.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
+	ssl? (
+		=dev-libs/openssl-1.1*:0=
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	systemtap? ( dev-util/systemtap )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	dev-libs/libffi:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	>=app-eselect/eselect-ruby-20201225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/minitest-5.14.2[ruby_targets_ruby30]
+	>=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30]
+	>=dev-ruby/rake-13.0.3[ruby_targets_ruby30]
+	>=dev-ruby/rbs-1.0.0[ruby_targets_ruby30]
+	>=dev-ruby/rexml-3.2.4[ruby_targets_ruby30]
+	>=dev-ruby/rss-0.2.9[ruby_targets_ruby30]
+	>=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30]
+	>=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby30]
+	>=dev-ruby/bundler-2.2.15[ruby_targets_ruby30]
+	>=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30]
+	>=dev-ruby/json-2.5.1[ruby_targets_ruby30]
+	rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
+
+	if use elibc_musl ; then
+		eapply "${FILESDIR}"/3.0/900-musl-*.patch
+		eapply "${FILESDIR}"/3.0/901-musl-*.patch
+	fi
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+	touch gems/bundled_gems || die
+	# Don't install CLI tools since they will clash with the gem
+	rm -f bin/{racc,racc2y,y2racc} || die
+	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	if use prefix ; then
+		# Fix hardcoded SHELL var in mkmf library
+		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+
+		if [[ ${CHOST} == *darwin* ]] ; then
+			# avoid symlink loop on Darwin (?!)
+			sed -i \
+				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
+				configure.ac || die
+
+			# make ar/libtool hack for Darwin work
+			sed -i \
+				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
+				configure.ac || die
+		fi
+	fi
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules= myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--with-readline-dir="${EPREFIX}"/usr \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable jit jit-support ) \
+		$(use_enable socks5 socks) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+	emake -j1 V=1 test
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	einfo "Removing default gems before installation"
+	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
+		export DYLD_LIBRARY_PATH
+	fi
+
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	# Create directory for the default gems
+	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+	fi
+
+	if use examples; then
+		dodoc -r sample
+	fi
+
+	dodoc ChangeLog NEWS.md doc/NEWS* README*
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-3.1.4.ebuild b/dev-lang/ruby/ruby-3.1.4.ebuild
new file mode 100644
index 000000000000..3fe017c98527
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.1.4.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl static-libs systemtap tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	systemtap? ( dev-util/systemtap )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	dev-libs/libffi:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	>=app-eselect/eselect-ruby-20201225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/minitest-5.15.0[ruby_targets_ruby31]
+	>=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31]
+	>=dev-ruby/rake-13.0.6[ruby_targets_ruby31]
+	>=dev-ruby/rbs-2.1.0[ruby_targets_ruby31]
+	>=dev-ruby/rexml-3.2.5[ruby_targets_ruby31]
+	>=dev-ruby/rss-0.2.9[ruby_targets_ruby31]
+	>=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31]
+	>=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby31]
+	>=dev-ruby/bundler-2.3.3[ruby_targets_ruby31]
+	>=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31]
+	>=dev-ruby/json-2.6.1[ruby_targets_ruby31]
+	rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
+
+	if use elibc_musl ; then
+		eapply "${FILESDIR}"/3.1/901-musl-*.patch
+	fi
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+	touch gems/bundled_gems || die
+	# Don't install CLI tools since they will clash with the gem
+	rm -f bin/{racc,racc2y,y2racc} || die
+	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
+
+	einfo "Removing bundled libraries..."
+	rm -fr ext/fiddle/libffi-3.2.1 || die
+
+	# Remove tests that are known to fail or require a network connection
+	rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
+	rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb test/resolv/test_addr.rb \
+	   spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
+	sed -i -e '/def test_test/askip "Depends on system setup"' test/ruby/test_file_exhaustive.rb || die
+
+	if use prefix ; then
+		# Fix hardcoded SHELL var in mkmf library
+		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+
+		if [[ ${CHOST} == *darwin* ]] ; then
+			# avoid symlink loop on Darwin (?!)
+			sed -i \
+				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
+				configure.ac || die
+
+			# make ar/libtool hack for Darwin work
+			sed -i \
+				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
+				configure.ac || die
+		fi
+	fi
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules="win32,win32ole" myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--with-readline-dir="${EPREFIX}"/usr \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable jit jit-support ) \
+		$(use_enable socks5 socks) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+	emake V=1 check
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	einfo "Removing default gems before installation"
+	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
+		export DYLD_LIBRARY_PATH
+	fi
+
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	# Create directory for the default gems
+	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+	fi
+
+	if use examples; then
+		dodoc -r sample
+	fi
+
+	dodoc ChangeLog NEWS.md doc/NEWS* README*
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-3.2.2.ebuild b/dev-lang/ruby/ruby-3.2.2.ebuild
new file mode 100644
index 000000000000..d98ad3ab2a5a
--- /dev/null
+++ b/dev-lang/ruby/ruby-3.2.2.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl static-libs systemtap tk xemacs"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( sys-libs/gdbm:= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jit? ( >=virtual/rust-1.58.1 )
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	systemtap? ( dev-util/systemtap )
+	tk? (
+		dev-lang/tcl:0=[threads]
+		dev-lang/tk:0=[threads]
+	)
+	dev-libs/libyaml
+	dev-libs/libffi:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	>=app-eselect/eselect-ruby-20221225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/debug-1.7.1[ruby_targets_ruby32]
+	>=dev-ruby/matrix-0.4.2[ruby_targets_ruby32]
+	>=dev-ruby/minitest-5.16.3[ruby_targets_ruby32]
+	>=dev-ruby/net-ftp-0.2.0[ruby_targets_ruby32]
+	>=dev-ruby/net-imap-0.3.4[ruby_targets_ruby32]
+	>=dev-ruby/net-pop-0.1.2[ruby_targets_ruby32]
+	>=dev-ruby/net-smtp-0.3.3[ruby_targets_ruby32]
+	>=dev-ruby/power_assert-2.0.3[ruby_targets_ruby32]
+	>=dev-ruby/prime-0.1.2[ruby_targets_ruby32]
+	>=dev-ruby/rake-13.0.6[ruby_targets_ruby32]
+	>=dev-ruby/rbs-2.8.2[ruby_targets_ruby32]
+	>=dev-ruby/rexml-3.2.5[ruby_targets_ruby32]
+	>=dev-ruby/rss-0.2.9[ruby_targets_ruby32]
+	>=dev-ruby/test-unit-3.5.7[ruby_targets_ruby32]
+	>=dev-ruby/typeprof-0.21.3[ruby_targets_ruby32]
+"
+
+PDEPEND="
+	${BUNDLED_GEMS}
+	virtual/rubygems[ruby_targets_ruby32]
+	>=dev-ruby/bundler-2.3.3[ruby_targets_ruby32]
+	>=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby32]
+	>=dev-ruby/json-2.6.1[ruby_targets_ruby32]
+	rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby32] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
+
+	if use elibc_musl ; then
+		eapply "${FILESDIR}"/${SLOT}/901-musl-*.patch
+	fi
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700.
+	rm -fr gems/* || die
+	touch gems/bundled_gems || die
+	# Don't install CLI tools since they will clash with the gem
+	rm -f bin/{racc,racc2y,y2racc} || die
+	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
+
+	# Remove tests that are known to fail or require a network connection
+	rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
+	rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
+
+	# Remove webrick tests because setting LD_LIBRARY_PATH does not work for them.
+	rm -rf tool/test/webrick || die
+
+	# Avoid test using the system ruby
+	sed -i -e '/test_dumb_terminal/aomit "Uses system ruby"' test/reline/test_reline.rb || die
+
+	# Avoid testing against hard-coded blockdev devices that most likely are not available
+	sed -i -e '/def blockdev/a@blockdev = nil' test/ruby/test_file_exhaustive.rb || die
+
+	# Avoid tests that require gem downloads
+	sed -i -e '/^test-syntax-suggest/ s/\$(TEST_RUNNABLE)/no/' common.mk || die
+	sed -i -e '/^check:/ s/\$(TEST_RUNNABLE)-\$(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest//' common.mk || die
+
+	if use prefix ; then
+		# Fix hardcoded SHELL var in mkmf library
+		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
+
+		if [[ ${CHOST} == *darwin* ]] ; then
+			# avoid symlink loop on Darwin (?!)
+			sed -i \
+				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
+				configure.ac || die
+
+			# make ar/libtool hack for Darwin work
+			sed -i \
+				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
+				configure.ac || die
+		fi
+	fi
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	local modules="win32,win32ole" myconf=
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use tk ; then
+		modules="${modules},tk"
+	fi
+
+	# Provide an empty LIBPATHENV because we disable rpath but we do not
+	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+	# #564272
+	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--with-readline-dir="${EPREFIX}"/usr \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_with jemalloc jemalloc) \
+		$(use_enable jit jit-support) \
+		$(use_enable jit yjit) \
+		$(use_enable socks5 socks) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs install-static-library) \
+		$(use_with static-libs static-linked-ext) \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no
+
+	# Makefile is broken because it lacks -ldl
+	rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+	export LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+	export LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake V=1 check
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	einfo "Removing default gems before installation"
+	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
+		export DYLD_LIBRARY_PATH
+	fi
+
+	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	# Create directory for the default gems
+	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+	# Remove installed rubygems and rdoc copy
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+	fi
+
+	if use examples; then
+		dodoc -r sample
+	fi
+
+	dodoc ChangeLog NEWS.md README*
+	dodoc -r doc
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(23|24|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 199279a81263..cf7ee54d14ce 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 6af172b9f882..4bf58e9bb1b0 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,12 +1,14 @@
 DIST boto3-1.26.100.gh.tar.gz 627269 BLAKE2B 1481e456b73794a4f371e5ac935d3d777c5315c1da39f8565631f62e05bd218e85409d5e5e095057af2c05c4bbcd9c1c5a56b4d1b8d2ef8e97ec567bfdd959a3 SHA512 45fdbb31c7e39ac1775e89755f88d426bdd17be002a13c1c517f2ec4b7ce1fcf0df7d1ff6c6d678fab5a7a1d656f9f609a6d4b3ab779464ea14a3e52eb7e4771
 DIST boto3-1.26.101.gh.tar.gz 627662 BLAKE2B 322a6e723851464409512e9d8dd17b5f2aa9717d97b8fc349c22e95db09bd8b8554631cd3afe52d31e34f4972ae0e5642762bf2ba13e8e5c5d56a05c3013c218 SHA512 7a1b9a089946dcb609a8c446b4c40f4f8861770b6592b6a11992573f7281a8fec0e3ae9d77abee542a88c588dfa23102110312d969f8aa63b3b0ffaf968a8e86
 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.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
 EBUILD boto3-1.26.100.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.101.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 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.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.103.ebuild b/dev-python/boto3/boto3-1.26.103.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.103.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 f381af62b32c..5237a41f6e23 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,12 +1,14 @@
 DIST botocore-1.29.100.gh.tar.gz 11306804 BLAKE2B 8ac9d592d2ea86bd600ca29c51999577e9c223fe951753052fd8d4c9a7d9f537f663491b2f31267e3ab0f082cc3b8ad49064017b268821e6d8c990e88046e144 SHA512 436b2cd40e3f7414b025463e2322fea834c1eae1243070f500dff7682a0dd049123b047a5d8183c58b001e4a793bbc81fa4a96afffff42b2d9f06c554fd261c0
 DIST botocore-1.29.101.gh.tar.gz 11311820 BLAKE2B 51be1b936b407a8d29912f6891c786826fc5a6be9caf386da56b697961613f4fe6506356f3c0b00da07386960abbde7e84c49e22142d1d401e481c8d4747d569 SHA512 1fb519861042b662d1d624223027f7a898d1975a07c6f2ad035547211bb7dad63cb07fcd6061cce75ab641801a7693313aafae7257067358d85fd43abbb82891
 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.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
 EBUILD botocore-1.29.100.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.101.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 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.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.103.ebuild b/dev-python/botocore/botocore-1.29.103.ebuild
new file mode 100644
index 000000000000..491b6bbc21f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.103.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/google-auth/Manifest b/dev-python/google-auth/Manifest
index bb11529eb9cc..b0ad9041faa3 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,7 +1,9 @@
 DIST google-auth-2.16.2.tar.gz 221392 BLAKE2B 858ec2d01b7c8e573ddc310a17d634bd63032f469eb47b0fe5fd3c4bcdb5e3388380fba671958734e1b406ff19c9f8d5b70d8e25587e2e813e1300b27329dab4 SHA512 5686846fbd299e8d331a2132a1f2847febb68f06e460aed987ff12efa3a629c274f6b9dcae53b8b3d9075bb590e5e265eb11b9d6eb3861d4230f91f0bfea84f1
 DIST google-auth-2.16.3.tar.gz 221824 BLAKE2B 759b450936e7675b1c50ef574b8e9877d4b086a9e77b47958d56743fe140790359a79de026bc634752aa0eb631abc8a50da4804151071217af34fba588b72c01 SHA512 4010e19cb079baa32ad93f3ee6e9bc142b6edd331247251a14ee8ef9be166d81032cf10a6e000edc32d59e619021c4c9e500658288e4941a886d1d99e86ab68c
 DIST google-auth-2.17.0.tar.gz 222518 BLAKE2B 3f639cb000303c44508599e453385363ae70d01c5c359eb9c82d0882cb1669ab4b02b6acf5cb2bacaae5fdcebfe8244bd537836d58eb5f34ef66a933b50b7ff6 SHA512 2942f385febf8d2a3f3827e048646e01c06ac3c2880ebb06d5a6eaeeb3d258cbd5ba7d969c7aee00a74332b5ce9b43a9474daa9e2e1de72bfb5f97dfb8065b96
+DIST google-auth-2.17.1.tar.gz 222594 BLAKE2B edc7ee29741418ab0e37a7b24591942ef4a973f67308d41e8715ab809dc3549e3ea307863ec2667d57223b3cb88802d535291845fcef48271b0cbc086aef839a SHA512 ddb4c9a5f9d01e4218666e632cd1eb2e9e8c852f833015c6e6e736a713cabf7ede0b1314526428fd3edd8b71565fee6cd8199252ee8fa011ef54aa543d3764ce
 EBUILD google-auth-2.16.2.ebuild 1499 BLAKE2B cee30a1d99552267a90dd4a65f98ef50b7eabbb2cf0b9ededdbf1699d6ad5cd2a1ed4f7cfd3ce0fe9b07ed21313c79ce31b64882ecfe6d8617e6d2cdd379836d SHA512 7615ac631b13b2fac5ac41fa99aaea5a7bb3929994f0d1823c7753e02b90997c02696ea0a271b3979c4f181fe0671c38f3b39de0b676f145d62d1295cbbe9f30
 EBUILD google-auth-2.16.3.ebuild 1501 BLAKE2B 46f8dffe0cca47cd3ee6d1fa1a3820581bafe73e49f1657eb4aece8dbe864e816f90ce441ce6c2280b1a10642d331601228e03fa98d3964a5188145809574d58 SHA512 7f2bc0d018beeb51147ecaf324c53f923a84a416eb3dd8df9c05bdd654b8ea96360ece5f3048d4aa6280f8ae2786d884817fc38dc3cfd4d8e603277c81147d61
 EBUILD google-auth-2.17.0.ebuild 1501 BLAKE2B 46f8dffe0cca47cd3ee6d1fa1a3820581bafe73e49f1657eb4aece8dbe864e816f90ce441ce6c2280b1a10642d331601228e03fa98d3964a5188145809574d58 SHA512 7f2bc0d018beeb51147ecaf324c53f923a84a416eb3dd8df9c05bdd654b8ea96360ece5f3048d4aa6280f8ae2786d884817fc38dc3cfd4d8e603277c81147d61
+EBUILD google-auth-2.17.1.ebuild 1501 BLAKE2B 46f8dffe0cca47cd3ee6d1fa1a3820581bafe73e49f1657eb4aece8dbe864e816f90ce441ce6c2280b1a10642d331601228e03fa98d3964a5188145809574d58 SHA512 7f2bc0d018beeb51147ecaf324c53f923a84a416eb3dd8df9c05bdd654b8ea96360ece5f3048d4aa6280f8ae2786d884817fc38dc3cfd4d8e603277c81147d61
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.17.1.ebuild b/dev-python/google-auth/google-auth-2.17.1.ebuild
new file mode 100644
index 000000000000..5faba10d7363
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.17.1.ebuild
@@ -0,0 +1,58 @@
+# 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="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 3d549878587d..e6a2286cb4ef 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,6 +1,8 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-8.10.0.tar.gz 5456256 BLAKE2B 8ca8781326396ffa1e8012bab3b539b857a68e212afd5b2b97bc2f0eac6ec1aee45c0743d745554ef24fabd24667c2d6cdb3927350ca61b747e02afa215c1519 SHA512 5cfcdd49120d9ffc11d2f18501826b2f7094a51c439ac23e507f1027989ece4104d739a1905feba41f899d22a66e1345333f46e0f55d18925f166906f4992cfe
 DIST ipython-8.11.0.tar.gz 5462176 BLAKE2B 6024c191f327d04f7a26f2f371b200e2e3f26029d84a3a53fc7421cb4751f0e29fb8741a2aa0447026b43cc1d9a7674a07e06c30578812cc33220c55df72c497 SHA512 9b07da3fed304f6739396883d0219386bb08d4860853b30f308c2e9b9017f48d1228dedb511c872b706881ee80dc7bf03f541720ffb816c35b66f6f53ac289a3
+DIST ipython-8.12.0.tar.gz 5465154 BLAKE2B 946d3e649dcf8eea3518ed68499cfcaa6caa7eac99aa21c05fcbb81338037151253ba84d8d942746600dad3883f6d0e8ba1e82e9932cdddc8e1e77a270573ebf SHA512 3e9a42a6fb34a46d32d1236eac99182a756db2ec7b57c77dbedff1e4b25bcf2ef37effe4e5575cda450a1cde77e3c0d24172dcf19d102110a1ac75b9cfe9272c
 EBUILD ipython-8.10.0.ebuild 4302 BLAKE2B 56977f20d28b41ff6a3deae19eccf31c2f6cde75cb384dc7ed31bd969cf074278b8bc34fb1b5569be893715c11195754733efd00e492e1518dd6abc8c4a8f6e4 SHA512 428e96f2aa0593a08a82e2cfff989424ba0cef8f78270d1e497161c0ede8d9a88fa659d585033fb7d87b4d9be0fb2a74abf2c219a16213c0c9ee5ea81dfc4e67
 EBUILD ipython-8.11.0.ebuild 4341 BLAKE2B c657404f0bf7fa6c9bed0772292859fa45456c702e3825651531efc1eaff7a2fb740c9ea52a2ad1fee18584670112b3cbe2e760d83bbd87b575062334c323375 SHA512 179cf02ed16f0f8a760bd1d53a92a60c3001813c89f84e78f7cc1ab4fd93a11d7997257166ec4804378d2b611cc0ba3902a9d5ad4f9fc0b3b17ec7f0fb17ec4b
+EBUILD ipython-8.12.0.ebuild 4423 BLAKE2B 82ea5dabe4579dec38cddc9e54e9ea3b403f60f5f803e2cb84c6ecd35775201a109f79481cf1863aef8bf49e3c93eb03481bacb3f15154c6d03e035467114bdf SHA512 31240e79ed752a85efec0341ebcb83f3eff0442a9b995592d6e5dd327c51861d24025bf5a990923e5f9edd2be64f8e38d3643b9dfaebf596e4bc60fc443b6da3
 MISC metadata.xml 2886 BLAKE2B 88c80f5eef5c89c8939e60c1944be4c63a5a318e55a3490b38bf864e7919debf8e3c3a32f1fa0a43766ceec6462fb20fd4d943194fe2c08208f0839783c20916 SHA512 f4ed7c1898930ade11983fb0666dc25dce7907f017145e1ad903651dcd95ead2734893d55b4548c4ae23425388485a86bffc9d885eae17d12ae1ac2c0058aac2
diff --git a/dev-python/ipython/ipython-8.12.0.ebuild b/dev-python/ipython/ipython-8.12.0.ebuild
new file mode 100644
index 000000000000..1a16373c26a0
--- /dev/null
+++ b/dev-python/ipython/ipython-8.12.0.ebuild
@@ -0,0 +1,159 @@
+# 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} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature pypi virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="
+	https://ipython.org/
+	https://github.com/ipython/ipython/
+	https://pypi.org/project/ipython/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.38[${PYTHON_USEDEP}]
+	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/stack_data[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.9)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? (
+		dev-python/nbconvert[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+python_prepare_all() {
+	# Remove out of date insource files
+	#rm IPython/extensions/cythonmagic.py || die
+	#rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
+	local EPYTEST_DESELECT=(
+		# TODO: looks to be a regression due to a newer dep
+		IPython/core/tests/test_oinspect.py::test_class_signature
+		IPython/core/tests/test_oinspect.py::test_render_signature_long
+		IPython/terminal/tests/test_shortcuts.py::test_modify_shortcut_with_filters
+	)
+	# nonfatal implied by virtx
+	nonfatal epytest || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "code formatting" dev-python/black
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/jupyter-server-fileid/Manifest b/dev-python/jupyter-server-fileid/Manifest
index 6546872654bb..a55210c7baf9 100644
--- a/dev-python/jupyter-server-fileid/Manifest
+++ b/dev-python/jupyter-server-fileid/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_fileid-0.8.0.tar.gz 51420 BLAKE2B 0f927734c45d36f67f61b0f7f32f3e5b42b0d9b9107cc8dc762f6d7e34014c976a5036058170bfb2d95188f0d3994524e3198a721f3cec75eff3b1e031c2a133 SHA512 780c4aaedbf979630792c04fdae1d79f6aab6b11e9cacf06003d4801c64701d64e0417d90a64c544f0dd05461032605812ffabb183396a2bdb8fc6563efff796
-EBUILD jupyter-server-fileid-0.8.0.ebuild 793 BLAKE2B f42fb34860c28ac1b3a074c5c476485305c12d4072fd1e4ca3fb038ff33ea3748ac7d73ce356ef6396834231e2e89f4a551382c544e0148f57a2ccdae6d1dfef SHA512 72ef37b9315aadd585dd01cbad137fd127e0b35d0447f7f1fc98e6bed90a85d18d9156f1e482e9d2fbd52495fc8cb6d918fa5c11c85bca214fca5ebdc27a9a3d
+EBUILD jupyter-server-fileid-0.8.0.ebuild 793 BLAKE2B 9d5ebd66260e8856200ecaea8c3be4c19e16a1bd33098f2ed1482dea825a49710bec5ef44a3d20f0e2f55a5acd2e9d9f871904bfb05e5024c48df4e89ccf2840 SHA512 3b23dea376acb04d8cbb6a1dc1a1b3146e921e39b76e5fc81c61b29e4c5cc737f64ceeca8b8aa31ffa5abbed6e47177f1c548ce3c76921cd3fb0b3e4411a690c
 MISC metadata.xml 451 BLAKE2B 501da442ec086270995b029cd90bb3bcdecfe6a0dc7ba0f60d6cf505930d34a56da918e593702bd8597b8ea14f91fb5c23f18a2cf0a6987d8320bfd1391be763 SHA512 379e0af3faff9baa29d49cb8069d87b7024695aa3c6bb4c8f7f063b8046ad806ff775a3deb0d31ba910f57240403f6881f703f2935bb2c63c23d2275d7179208
diff --git a/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild
index 8655bfad84b2..60a0e77514b8 100644
--- a/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild
+++ b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.8.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 
 BDEPEND="
 	test? (
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/jupyter-server-terminals/Manifest b/dev-python/jupyter-server-terminals/Manifest
index e7743f60a9e8..a2f48a4e7d17 100644
--- a/dev-python/jupyter-server-terminals/Manifest
+++ b/dev-python/jupyter-server-terminals/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_terminals-0.4.4.tar.gz 29850 BLAKE2B 064876d7a10e7ff66da83e07d562abe53d609caeb27bcd7b7181d10c06af4406ee048b45b73092c8f3b0c10df40494eca1edb5234030154c63ea6a330f85a115 SHA512 5b1a6a9cfd550108be7f6664eac5ab7581d75e78a7dfc9825af2346b0d9b19f05543dcce010dafb9554c0782bf8e7929bf0ef96bdf2db392ab9b9ec1a3633fdd
-EBUILD jupyter-server-terminals-0.4.4.ebuild 1033 BLAKE2B dd49c3616d40a30f99627fd5561bec312ff2931b62094bac7293d3ef44753d592af77f5321bde143e1f0276e6c20f8ec3c2dfc8e760e6d23146055aa911a6681 SHA512 079746158c32a76cfbfcf134c242118f98dddb5c7df434e08c05258c236c44ef81e559a328494189c07f0ecb34deeae527022ba7d83079fc1555c69c7417dc04
+EBUILD jupyter-server-terminals-0.4.4.ebuild 1033 BLAKE2B 7909b92c95c4a89cac95ec9e70a13e0f6424b0af6043a1f559c4527560921bde708a6539de105cba0479879370aae373b9a410f5c080d9d2dde798f961e67bea SHA512 2dbe1fb675c4ec7cf6e33a0d18c0ed43bf3ffb1295372e0f2a6c8157f363cd9979ba2e6e0120e0dfbdc141db2276576e50e8d58097dbcb9212b22d7200adf9f0
 MISC metadata.xml 457 BLAKE2B 6667133607998f468774a24e818962e037f937805af2578f0b759be79421abdd389cba957d79c8d7d4039f1dc6698ca1d1e08bcada91d4aa503bac21c041df9e SHA512 9ae0f7f3ab2bba3aeab9eecaac56995cba07f4c55551351a290b25550d6a4516432a73616a850ac7e7bede45a458ed8bec7dccbde7322015239062efee4b4e40
diff --git a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
index 0ffaf8a0fa56..0dc2cdfcc1fe 100644
--- a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
+++ b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.4.4.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/jupyter-server[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/jupyter-server-ydoc/Manifest b/dev-python/jupyter-server-ydoc/Manifest
index 7edf441bb354..a23f9a338762 100644
--- a/dev-python/jupyter-server-ydoc/Manifest
+++ b/dev-python/jupyter-server-ydoc/Manifest
@@ -1,5 +1,5 @@
 DIST jupyter_server_ydoc-0.6.1.tar.gz 25122 BLAKE2B c8543bc620ff8cefa5b7f1f1bd3d889301a96997607122184cf514ab6d02c50cada7c81844c6d4d2919caaaea9de8a4b5863c024b151d45b1450f1b6c351ccdf SHA512 7c0c79de866d6a794f24ac7dbbfaecaf2a0d447c9f81690d2de82bf86372337669389397672d737b441f37b34364fee16df0bb680d23980f7da931d13c3a0c85
 DIST jupyter_server_ydoc-0.8.0.tar.gz 25769 BLAKE2B 72f9082b4c459474910e795ab94da0482f073923f89610a1ecea2663ecc94adec3979bd353bba45388a31ca1bf5918e061a7b660f37cefa34a4e09217c2e9443 SHA512 a09b099257943e30187c9b66d53a922b4b197f62af648d7177abca2c60f0538f4ef8a6dc330b2019f79848b0c8bd93645b8cf9eb657334282f4317cee93ab571
-EBUILD jupyter-server-ydoc-0.6.1.ebuild 910 BLAKE2B 52e417e7ef986f6fb0669257233ff55ac648a04902d64f33a98bd515951f6584a5fd83e61d63cdee1b57bf5d5388a0e3833ee9a56a6bc83cdb33649cae5705c9 SHA512 6b85a090865dc54c48847e95d740d4d51e6f4bd79d4bdfd2db97db05c94b774eef131729e8dcd10ccc9568025516500b3be2684db00fea15c9e8a42e2e1d0cb4
-EBUILD jupyter-server-ydoc-0.8.0.ebuild 895 BLAKE2B b5e853fa70d2ea9c9bd95511b8325c11116b3602d98a05555e8964af75c07b3d1cb2e5772093ce3e05b8837ab3c82b74756222639457e2430582f6f0ab75feab SHA512 c528062881a1be3d41dd126998a7cdfc2595425f6752957d3c08c9421007da83a39cde84285b7fd04af680dfd84151875de36c8d46afd79b5944a5127f4927a2
+EBUILD jupyter-server-ydoc-0.6.1.ebuild 910 BLAKE2B 444eaa6baef87ab622b0f51f05788b370481f076526afcbeba1d19692b7851173596a6871caa53136b6a797e5cb097b8d5c7829138817587980780ef36dd45e7 SHA512 ea2b8fc05ccb57781609baa871093b9c24fe13ce49aa8d41c1303e6588861f8092b2c7283ee3e70d2fa1caf5b6f5e5c6b40dad4f30ded0b4e2edf5563577c0e6
+EBUILD jupyter-server-ydoc-0.8.0.ebuild 895 BLAKE2B ebb1e36581527983bec0471761738e87126cd14ae9250106ca2d2f3a9a5464beafdae5721bba68430dbc4fd5c4bd29afc0efdd437eb07702850fa8da8330130f SHA512 1b28f45105585a829b441fb674fa67cd4c44e9af03e8de6b5aa819f879993f690cfd06a13f76895bcddadd908988e3f9cbb328d589e98cbd4fcd28d3cdc6bae3
 MISC metadata.xml 447 BLAKE2B 66cfd1d1a59608e62bc7837cf0dbe48ca5a1e192f76db8e315b15e1cdea7b71d10dd8ae85181b1264e5f18bc5e58287c750009a7fa28de66ff2a748439459a6e SHA512 f558b5729e381952bbe9ef983221be36a9bfc79667921f63df978e6a3d65b57810e2cdddfc193ea6c789515b803ddd366bd56d70cee42c2b191b1cac85ca6cb5
diff --git a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.6.1.ebuild b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.6.1.ebuild
index d767a50638f0..a46a067866b2 100644
--- a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.6.1.ebuild
+++ b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.6.1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
index b38fa54ab6da..0885cc0da76e 100644
--- a/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
+++ b/dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest
index 98637ecec963..05dbd45f1f79 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,6 +1,6 @@
 AUX jupyter-server-2.0.1-skip-npm.patch 698 BLAKE2B f037094e4ba041f112e6b2b08693186c9414fee1dbb9a25be94bc7ec75be09888c2b147329ef9c4b2bdcefd54c44cbadfb658983f97537e5b277eb0fc9ae4cc4 SHA512 d20cfdc71c1c58a7c3126db80d30d34ec8f188f6b5da82accd9e02c91cb14ce750123be443d0c85b18357ae1d22117912c4605e0ee74d9dbf226c739faa17297
 DIST jupyter_server-2.4.0.tar.gz 693740 BLAKE2B c50a06f1ebe1479c126c2a10ac7f58f012f97f8d565f1705b5d8080ff854a387a6bbcba65785652988a1adc3575009ea0b68e48b7cda8bbd89b5208e1a6d0612 SHA512 c5ceb6caa37c6d8bb5b3026f450bdfc92c37cb5a350541fa35764eeb33007918b2aa55b41108703477efe68f7d5e4f4ba3fea51cd203f3f3c0b74ba3bed6e1c5
 DIST jupyter_server-2.5.0.tar.gz 694029 BLAKE2B bea1082709653617c812124378e1e2a639e90b1e0d7fedacd98628c415adad2daa5343b57a19a776c41820e6665c8591c8d2a652f8c791b605bc3a4b65400ef3 SHA512 7145f60a73bf3d9aceff37aaf56b3b3a54c94fd9f13f06659387909cb1727759a082d11e983df4e687cc508461d5afb6e552f3ac09e30bebb1eb5e863992ad14
-EBUILD jupyter-server-2.4.0.ebuild 2174 BLAKE2B 9cbcaf2add99a7aca330a9137c5942bdc260f4b8f969f5da9be8fcc5bc071e2e3d50a0637b844ea6914b2092cb6489d6b2118f42a251fd2ad26e4f652422a6fe SHA512 e3763fb6fc8c5dc5c3e9786400950ea9260c2caf584f38abbf9c09b70d49bbdde4036660a6db12bbc6e5b559e780eb1621fe498fb5378a8605c4f0b72efeaa77
-EBUILD jupyter-server-2.5.0.ebuild 2182 BLAKE2B 077128e551399e753f16c9c89132c04f47936b3bfd61de8004df46415758a269cb797b664acac3b5b7fa11a426c4644e354eb34166e1cf29f3a16ff0fb182991 SHA512 050d5ecab0b55d5b1d3187bc251c25235faa05d0d1e5ac779d95635804764495f710f855425bb2547c2551820120b8e95e2144fb0ed73b35d822267e8ec0caf7
+EBUILD jupyter-server-2.4.0.ebuild 2174 BLAKE2B 3d8e78204ccc5fc93819792d4a2a981ee582bbfa244b7ef1d8415e2ba747e939175e5081ce62e21d885caf8971420bc44fd39a90e85e4718490eb6917093a025 SHA512 3fd8a7d2c30997482bbd6fba87cc691ca1dba6007faefc916557056cab59b3b30bf237e83d6410f84cf4a85ca21531a03d00a4d1bf7e10e658f0364c32771a44
+EBUILD jupyter-server-2.5.0.ebuild 2182 BLAKE2B 570b49a4b87d6ac4e5129f729746ba6a9ab5b9caf1ff0cb82e4cf4d93f2f23e0935906853bf0058fa911a00d574bc28e3f63a6bc360427234418cb36aee1624a SHA512 2f308b5cd5d37ff5f5e53f1b9c573ed676d619679440bbf9086d92ed27a848246b7e5ae2b86d1ba438c0157212e52c13a847222405ba2c9a9f0972bdf1618371
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
index 933e62cbd6cb..a7ad86a14eec 100644
--- a/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 	test? (
 		dev-python/ipykernel[${PYTHON_USEDEP}]
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
index 8fc88aa38a99..69610eaf853e 100644
--- a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 	test? (
 		dev-python/ipykernel[${PYTHON_USEDEP}]
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index c0a8bddc1ae8..2bdafd935e67 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -3,6 +3,6 @@ DIST jupyter_client-7.4.9.tar.gz 329115 BLAKE2B 8b43b237ac79bc51e40e403cf4a3ada1
 DIST jupyter_client-8.0.3.tar.gz 334366 BLAKE2B 04ea6e8206fe0b741da1ba0d17cb559657824c20f4fcff48fd0ce4287dce7da9a151000e7a0f08cbf3fa6b1868d8d7e424d49d70a258283466350946f4ce5220 SHA512 27eca49e44c13d819624c6ab596b24b9b469f82a788920eb4db02cee43c2efdf22ea68bf282f5f4ca28d38c9238d51d70d7aa214f2c3b8f6c2a7ebcaf12d567c
 DIST jupyter_client-8.1.0.tar.gz 335241 BLAKE2B d9491f958b21ba09494bf42ff5a3bae786388a16c007f5756df8900fc53c6fdb4d67bff09b16290338d07fc3c3466483f20ab82482fb235e0e55481294eaeef1 SHA512 21317e5ca61b72408e94116f0be545753088d891742579fcf7a451be179a7783dc153d2898e0ff50ce06017f90cb48f907a5bb056090b13ec0da2af7287f6dcd
 EBUILD jupyter_client-7.4.9.ebuild 1209 BLAKE2B 8889fec0b7f86f01bae55a528e69c7b04804cf11c7b9782c9ef334c291b0c2adf2750193b47dbdd4fe0295e7ffb78e36825e06411a0f9c2a197e3d33967c7588 SHA512 de28921c90362a4109b783a16dd4a82f965c9e4debd2c6b22b39185e75833c44b15854b32b278de3b6c316458019732dbe0a462d38706061fdc87e75d07137d6
-EBUILD jupyter_client-8.0.3.ebuild 1295 BLAKE2B e6348120c955ee10b8270eab4a1c0c6de46a8e537e9e6a2eb0a2e88f1f69a5d3398e34e14096af2d7c29a67e78e1679fd5fcc5911f8f67cb33758b03bb3ecb55 SHA512 0d24f21aaee1963054ad7295edb6bca55c8b8c4b934a6a78fc636d21a2f0714cc497cbbdb27a8e4d90534751df2872e100cd77b5a38f391ff4fd7657ea71a832
-EBUILD jupyter_client-8.1.0.ebuild 1303 BLAKE2B 98902b9a6793fc934fe47f8f068b8253bd84d1da78d853a5ce40c596a6066eb2eabde6e3505c4b8a6b8f3b49aa955345b6a118cae189f92dbea591fcbb88fb12 SHA512 2d998e0189294de3d7958fb9ba6b488b01687910453c33f7f14ccc02ff4e565bb7c4ad8cfcc07371540c8e7e7755cb75944118d7c6471147076d94a1026c8f46
+EBUILD jupyter_client-8.0.3.ebuild 1295 BLAKE2B 5e31e0f03be81db1ce714a8029740f678d712fbaff655a420deb1d86a4700fa9e0af2363513fab7f35a3c55c81d7209378b46e759bae583cd6084d3b5da4fb73 SHA512 7267ed82cd9ec2b9b140ea6845070553bc4d83a38adfada5411518a5e3162290bcbc167e044380e551b2ecafbf423e715c1c64b4fb86b3b617e8c409857d993a
+EBUILD jupyter_client-8.1.0.ebuild 1303 BLAKE2B e46df34af22f085081469b22ce7fd33e058cf821190c7b4f51938bd6cd983ad9e716ab4e3a2561c327be0b9da36e87ebddfc96cbfe5e329f58305a6105f34dab SHA512 25d573f63bc5e14b0f35d8496555e6b7d5ee7e4e679ca66abe0b358133c3584049b317d4661e071678c13777a6071b54d1b2cc7d002a7bbff23c441a34dd57f5
 MISC metadata.xml 844 BLAKE2B 8beea01f144f8e28b58b1bd4d0d2a32eda4b5e50e479c83ed940cd6894d581aa22418bc2733910465cb6980134c3a29b63a6e31f595d037b9492337285837ac6 SHA512 73f427cc561e728c6f941052a4b6f9c6ec5c9d6ba3bb601bc58313687dfc8d6ed3602e1fb2f7f0ea00aec4360c8c1200334675917d22092ed79585b117865ebd
diff --git a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
index b79a6877a9eb..5542e8af9bf2 100644
--- a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 	test? (
 		>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
 		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
-		>=dev-python/pytest_jupyter-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-jupyter-0.4.1[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild b/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild
index 70aa93d089d3..60df683d39a2 100644
--- a/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 	test? (
 		>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
 		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
-		>=dev-python/pytest_jupyter-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-jupyter-0.4.1[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/jupyter_server_mathjax/Manifest b/dev-python/jupyter_server_mathjax/Manifest
index e03f4cac2482..6d5b8b26376d 100644
--- a/dev-python/jupyter_server_mathjax/Manifest
+++ b/dev-python/jupyter_server_mathjax/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_mathjax-0.2.6.tar.gz 2648665 BLAKE2B 079108842d1c62b58c12e5466736508a4002fcc977acdbb1ea0c35205f685f53b985038af7df1d58ab188eadf6be85c59cc3eed4012a92d4353d5b77424935ea SHA512 a87a73471c470a60fae67d3a2dc7e163c39fc2ce62b357fd6eaa030ffcf63b44106ef35377795e58c5f89a847648c7fedfcace68ad9aef8efa45e71a2fd1a79c
-EBUILD jupyter_server_mathjax-0.2.6.ebuild 1032 BLAKE2B 08e4666f8ae74026c017fbc83af4a844aea1350089753c3770a0ce748d07730f57cc7e2151b3c4a335c035dda737fe2a11d37b8e4478a5e6708d27e7f74772ce SHA512 8af1a071dd7cc5551adcbf1b02f97fad4551f61c14fbe871b8804a8f78a81f3c68cb2098d49cd412c786ab18a2234834ffb56872c39c643b46f9b76ecca743f4
+EBUILD jupyter_server_mathjax-0.2.6.ebuild 1032 BLAKE2B 73d2e7cf5048a10bcb67b9334c6572bd6969b1195ab7105b22a4d612473fa29a109756c53dbd313305fa1f4233b134e8489aee3fb025bfea99e27c91cf3d02a1 SHA512 2e14b033e3ecb6bdb536203a134ff30c8976fb374c605603ee65e3a0531bdbafdab83b3260360bd5ddd61de946836685d92cb3aaf1b4476b2af15cc7a11a63cf
 MISC metadata.xml 453 BLAKE2B 7a4ebaf263ff85d75f9ceac762692040bac146e147e7d01f5464132f3c518f2141c884cc0c447388e863651929727fe1524971925bcee7fad92aa5d33febf90e SHA512 399c94bc19b4144701f44638ea0fde80c366750131c8952a9c8c5f8554275e8ff0be72c3ad08335facb3719c0f8b9c9027ab2f60b3897e5e9791eb3ab95daa17
diff --git a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
index 8104b01ca469..75bb299985a6 100644
--- a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
+++ b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
@@ -26,7 +26,7 @@ BDEPEND="
 	dev-python/jupyter_packaging[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/jupyterlab-server/Manifest b/dev-python/jupyterlab-server/Manifest
index 7c0127fbba6b..774aec768dea 100644
--- a/dev-python/jupyterlab-server/Manifest
+++ b/dev-python/jupyterlab-server/Manifest
@@ -1,5 +1,5 @@
 DIST jupyterlab_server-2.20.0.tar.gz 70481 BLAKE2B 188b8a9bd2bfc5a27ce6f8488d7768484fd71ae8bb93f28c8a49f63b1aef13551c55d7e18531830df26617883f6b780a491d3522a0dcb3ecddcc433cfb35f97b SHA512 7d9a86f56686344ffc1ad11a9fc7c736a2ac0e6b8c31f8b6d8e35e5fd982454b2362073038dfc2ed3a4f03ef53e2afcaa33fc2c956b63e44c3d1ae6efa1f9251
 DIST jupyterlab_server-2.21.0.tar.gz 70965 BLAKE2B bb959d2c5a507ac6ad2ed719e86a68590c51df51a126f8a44195c48ccb9a295ca0930d0c106cc9f753b3032aca4002d4edadf31f24602d22bf9d3be3eabe2fdb SHA512 c3180983e6db932a4f243e977aaa0d7e7daed34788ba3a51d1414c5b625008ec524e0bf96a559bd85279146f9bd02c31eb2ac3451c40edba1751ed695c7c0791
-EBUILD jupyterlab-server-2.20.0.ebuild 1966 BLAKE2B 3296c95a2c01a9c2b140b5d5df7cf866f0b6f4fd65bdcdce75aee8bd6e9cb29f1742f40bb44e194bb70cf6940ca3eff42fa4f64ccb47126d79c4be251326d8e8 SHA512 ff0e2342db875c67fcfc248c0d5522c23f6ea005f814d96378a6abd9304806bfaa217267f25345add25f6eec5c3c7a56231b92e300705c1da9fa2bde95640204
-EBUILD jupyterlab-server-2.21.0.ebuild 1966 BLAKE2B 3296c95a2c01a9c2b140b5d5df7cf866f0b6f4fd65bdcdce75aee8bd6e9cb29f1742f40bb44e194bb70cf6940ca3eff42fa4f64ccb47126d79c4be251326d8e8 SHA512 ff0e2342db875c67fcfc248c0d5522c23f6ea005f814d96378a6abd9304806bfaa217267f25345add25f6eec5c3c7a56231b92e300705c1da9fa2bde95640204
+EBUILD jupyterlab-server-2.20.0.ebuild 1966 BLAKE2B d19b0f250b30fb4da82ac55e84f20efd81fb73383a733026d1879c677da4df1836754090f437ad841d85ac7fa4ae4fe3080477e5043634aaa79ddd7bf0c0f984 SHA512 f09e029432d35bc556a0761ae00d9e3de7228892b72b9483ff35bcc49d83ed9d4d6bbec46b2c9bd5001755680ac3a27409d06ea6966cab7207968a6697ff2b5e
+EBUILD jupyterlab-server-2.21.0.ebuild 1966 BLAKE2B d19b0f250b30fb4da82ac55e84f20efd81fb73383a733026d1879c677da4df1836754090f437ad841d85ac7fa4ae4fe3080477e5043634aaa79ddd7bf0c0f984 SHA512 f09e029432d35bc556a0761ae00d9e3de7228892b72b9483ff35bcc49d83ed9d4d6bbec46b2c9bd5001755680ac3a27409d06ea6966cab7207968a6697ff2b5e
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild
index c3e034e2e133..680acd032366 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.20.0.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 		>=dev-python/openapi-core-0.16.1[${PYTHON_USEDEP}]
 		<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
 		>=dev-python/openapi-spec-validator-0.5.1[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild
index c3e034e2e133..680acd032366 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.21.0.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 		>=dev-python/openapi-core-0.16.1[${PYTHON_USEDEP}]
 		<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
 		>=dev-python/openapi-spec-validator-0.5.1[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index a8df01b37492..176376e63c9f 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,7 +1,7 @@
 DIST jupyterlab-3.5.3.tar.gz 17114007 BLAKE2B 70d32721a2579331dd4e3481f7241f5e2c5aad6dac851f213de0ac1fc3b76667bea496bca5ea13ee562e9678d51ac45df91c5901d8d3b7dc839977d3d842e67d SHA512 fdacd34ab629da2b5c2eb23f11ba4d44d5b27872e1736850319bcabbe635d31cfa2891c1c5991b152a5c1d94221e3766a20fc91033f556d8e508374bc46d5fe2
 DIST jupyterlab-3.6.1.tar.gz 16845937 BLAKE2B 41c50a9ddefc0ec97c70843e15107d3e3cebfadea2ec148e4536407b0f1b202c2aeace794b02c7cb666c316434da614c1bfebab5e5fc7e654f62677bac6e1eb3 SHA512 9dc63162955c13721c97d620a60116cd75bf10eca9c8eab08ae35749bf2dfec84c55759a361ca1abab34c44d63eded95748cfea589aff98907045b483d778413
 DIST jupyterlab-3.6.2.tar.gz 16846937 BLAKE2B 1b443ace53a68903728aa781a0a0aa95a13193b63ce3101144945e41245dd7c00554abc6c75a48feafc677d83580705393cde1a4bffab0e09d2d5bf0d67e72e0 SHA512 8ca7956f6c78413a7aecb55cd60b3dfa8491afbe3b02d9ae5b038ba4dcc762daf78768349cb586775483e8dee39d5a062650d0fd156e12a85383543f836cfb38
-EBUILD jupyterlab-3.5.3.ebuild 2574 BLAKE2B eb478fdb0b5180dbb7efe3572bc2287fbb1b68ee2bf22380be4b7de88086f56aeeea7a9f8d5a2d62d52c45a7259bf495bdd69ef9a5184f65b05995d52838c772 SHA512 563417179f88b2bd8a27a715ed0da7dc3b8c5bbbd7bfad7279c26b57f10e8e2082de58f73d1b312b69f05c3e55846fad4f3f14ab589105189533871c327e298b
-EBUILD jupyterlab-3.6.1-r1.ebuild 2747 BLAKE2B 813c9c866a457d54f51928b156f0cbb42b9529062683642af4005d7bb07909d163e3f7c9eb335a7e036fe2cd17218d73c68b93266545dfdc5f35d0cc0617fe8e SHA512 83a2a4912f292162e6cddbd6e095af0ddd88d91daf7f38cd669f197817d0972da469d7d3d27c89d64fae724c847b26b25c5b74e816e211ae261106a460a54ca2
-EBUILD jupyterlab-3.6.2.ebuild 2739 BLAKE2B 731fb108d8b61449b73300d8a7434c97b48ab32a87fe9998ac6286005f6ce2f3496df8e9df4c744a71811cbf294234d064665aa3da3e3c8336791eebff53fb73 SHA512 a24bcd5ea6e2286918f8e100bf12a9d12cf9ba1d659638fa111eef203d7964a5bf19a430f840861d18d2aabc2666429673e40bd07e0058ff4cf1b2c23da72c9d
+EBUILD jupyterlab-3.5.3.ebuild 2574 BLAKE2B c38ec4a4f0a472c59f7c01196bc189a7b68a23178af3b14beb61245d2d60dbe498888c0f7ac69946af5c97e257f0bb1040631ed1db15fda1049b87ab7d3dd599 SHA512 d00a29c17c12db753e5b03283b2262eed5bbcb0cb54d0faacb11c5a730efedcf7bf9021be56a50c9d6c65a25f9705293bb39af6f7576be86144dec48c3ecaedc
+EBUILD jupyterlab-3.6.1-r1.ebuild 2747 BLAKE2B 95de9bf426a62ed9601204733a28e62fb55c252f13b0a166bffa1c00d25089e171f6b03122b844066e5f78b095ea8c026778fcee381e49d42acee906fddcf897 SHA512 0a740978f5bde3edec5fd02bba04a8a160a80fdbf5f8de30d3d50d2c807fc366e42795a049af0aef3da2bcfe3e21b45533257d6eba5efdc32ee3047366f550d1
+EBUILD jupyterlab-3.6.2.ebuild 2739 BLAKE2B 2ad64f9476f16c591be51d2f3fc23eb7622ac4d1c7e871349c5b0cf8c1c486b2f97de9c80c3bb324001fc6724d7c10e431267cb6c35a5c301ef5d1779cd942cf SHA512 8eed80fadf79be66e38a72943fa7adb92f737e45b000002f4fa374ecabbdee783ee71237973878fdfe8f51fb66f7a80a3f74d0883be041420e18900df93432e3
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild b/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
index fa0cb6278dbd..8da9dabc90cb 100644
--- a/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 		dev-python/openapi-core[${PYTHON_USEDEP}]
 		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild b/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
index 5e59bd01e1ac..2d11d085076c 100644
--- a/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 		dev-python/openapi-core[${PYTHON_USEDEP}]
 		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild b/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild
index 7f9e59dbde57..5d072404adab 100644
--- a/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild
@@ -43,7 +43,7 @@ BDEPEND="
 		dev-python/openapi-core[${PYTHON_USEDEP}]
 		dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index d187c031bd5f..210152dc8807 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,5 +1,5 @@
 DIST nbclassic-0.5.1.tar.gz 20178622 BLAKE2B 1ff79c9af218011c697016ecef149f42e683607eebb8e199ef75957d9d3127858ce8f443aeedb60844e3277b4c8cd4959d123658a5103ab2112fec469ef01a96 SHA512 1dabc27ad115d1961e7881e7a51653449cae291c74aea222bbf92d49cb7bc9657ae1f1d9a81eafbd70bc0cafd57b75cd2c76bebf91aabc5fdd9eede534f1cec9
 DIST nbclassic-0.5.3.tar.gz 20199979 BLAKE2B aa509bbd2bab51b94f475e81b7e1c5661370e850680df8f64c86d76ff2aed7a84a0e6c00f36a695ef7f84cdc731fb7613107abc96fb13a3127ded6689d6e81a1 SHA512 07e26d4cb30e3388420ced182a31a050419f4a872256efca6684e4af0e08ec8bf7f6f14f127fe1391457ad5fc792377a1a7bafc0fa1a92eec455454c6321a9ec
-EBUILD nbclassic-0.5.1.ebuild 2340 BLAKE2B ca95be529e3827effd5b02d7d91f12a8aec6c794e9b115b021949aa4c11dfc7b605e43665ee29153001a96358402824eafcba3dc41da8a3d9e0e5b1757b2fdb2 SHA512 1e81fdba2be812e76dd892eb197bda5b95a5983e9b33a17ed3403bc61d97647b1e8c9de5cb03da4ef6bc574d814726b5e71b3667f344a51f2491125486a85b59
-EBUILD nbclassic-0.5.3-r1.ebuild 2159 BLAKE2B 9386b8b882de40e2f0376f6cbf6775054687a2c8df613032e7962990f4712f290087916ae9b4ddab0001e869bd30f969868731ad3ed19a5fb64eb30cf770f558 SHA512 7c27d128bb96700b54ba175f0d17e3b0bdfa31fac699bdccb0ca2ce0c44b5838598c54dbb53cbeb61df079c64d46a64662f9b112d3db41e62d922a3f355020d3
+EBUILD nbclassic-0.5.1.ebuild 2340 BLAKE2B c255b1211422b66ca539c8387ad2b17608b36d125ba974f2e8dba44e5b925197d44498d4fa7e41ab3b303f8f5c5c35b59bafd8b9e78f74bc700bd73210f475b7 SHA512 8a1c4f60fc19ba1ad88ce4ab1e01d6589345d001e33bb393c6db7d096ae3ddab7bb9d36a3e4cfdaa37db7b68db10f3bddebf494e436ce263d8386cc7bd90e05e
+EBUILD nbclassic-0.5.3-r1.ebuild 2159 BLAKE2B 8fe65d7ec27f3da27fa081d858578495bb93cd4e7a29b55ed64f47b7c89309aef1e4fc1123c5471b1dc9bddfd4a94d1f0f1a50eedfd91b81b7e65f0be76ef2c2 SHA512 0a8c67e1b42fb607d65a5101102fa435b2d0feaf975686cf61a517d83b4eed163bb45f44c2d0125997e94c07f1239572464cc6f0b8f59e531ac4e90fc8a4e25b
 MISC metadata.xml 407 BLAKE2B 8be751d3f2e0e1e2952c39cd1846285ebb994d833022767dde609294ee9f98044b1189934e7d27c3134b1f06c95705687491dbf52739bdd0bc17f06cfdff53cf SHA512 6cc07376da4e55e5df153fdb0f43371ed415bed6db1bce2f67dd113d1e0f1994974dd6bee746021efb2d8c36ca2ca534109227c541d38b37b652a68b9642f2cb
diff --git a/dev-python/nbclassic/nbclassic-0.5.1.ebuild b/dev-python/nbclassic/nbclassic-0.5.1.ebuild
index a4185a8bd357..9a1aef1269a2 100644
--- a/dev-python/nbclassic/nbclassic-0.5.1.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.1.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 # dev-python/nbval is missing impls
 BDEPEND="
 	test? (
-		dev-python/pytest_jupyter[${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}]
diff --git a/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild b/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild
index 9092a3f22fdd..2c573ec51c4e 100644
--- a/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild
@@ -44,7 +44,7 @@ PDEPEND="
 BDEPEND="
 	test? (
 		dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${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}]
diff --git a/dev-python/notebook_shim/Manifest b/dev-python/notebook_shim/Manifest
index 088a0c860a49..9f92dede15cf 100644
--- a/dev-python/notebook_shim/Manifest
+++ b/dev-python/notebook_shim/Manifest
@@ -1,3 +1,3 @@
 DIST notebook_shim-0.2.2.tar.gz 12947 BLAKE2B 5a04944be3f8de7bd7b1c10f59d73869b7aed670c3afebf79e7780d5992f9af2929529498604c1a5c0d164467681ffa0e8924e1c9a7945e52ae353bdb710c7bc SHA512 42cf9153495e4ab8230ef560d36381a5aa1d9bbd583ed140e04e9850f4a82bab06ecf36e45b88595e8686d8122c9a52eee8133a7f1b622d75d326ebf36519d30
-EBUILD notebook_shim-0.2.2-r1.ebuild 891 BLAKE2B a6957b41b6db0e2e503c8b290d37804d484ee75ba24083f85426c3fa3801a620227ccb6a54bbe26d693e2313304ed7efe4d3b83156d3a38064b178a7f86895e6 SHA512 b74de9d69b1e2e52c405fd5ec2235b933c7859d8e157f5a44302ddbcd8ea7bcacfc6e9398b77910bca38f0108d97a223e30b3c34449052fb6d545ce5d89f0386
+EBUILD notebook_shim-0.2.2-r1.ebuild 891 BLAKE2B 6bed5d797b75394a6551d2745f993a5cca593365853118638e35693b31f2a4fca28c07427989ea4ce9bbc3a82cd1b32845272348ba03fea1428c17358cbf8568 SHA512 f26c8fefbac39c41acf5ba921c7205688079f49e88e923232a098bd8132d9756a5b88c2b071eadd09d05b4f5481aa60a1bca97b59162296fae262a5459eda4e2
 MISC metadata.xml 535 BLAKE2B 074e2bbcdd15078aaba2c65641a16ca7ce27e0c412d48f2a48a4cd80459a948abc478baa28b3e7417dde2bf13717040dc083711b114d61dfd2a7f7aaac1295ca SHA512 9ff7408848878f74eb9f10ec5aded639a749635851385b6679a72112c253a7427f65ac3e3c41f21f9e8551a439a7c00c4e28a5d70b3529ab9e687a5d0e7abeb9
diff --git a/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild b/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
index 295e344b23a2..f1861e022fbf 100644
--- a/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
+++ b/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest_jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index 48c59002e1c3..1a12a5e5e49f 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,9 +1,12 @@
 DIST pydata-sphinx-theme-0.13.1.gh.tar.gz 3391663 BLAKE2B 411b3dfb81b84189da86b0d11bf983348ecc6cef25142616f997f6301bc7873360835ba87309c055df46800ba34c30cf0d82bc3fb2c1984214d0c3e02556d17b SHA512 c88db817891800ee3483f724770354ab8c02abb0e430537ecd29b2e4b566fbdccb0a461926858a20da2da98dff37c6f09fa3f29dc538ecc30abd87597a9c08c2
 DIST pydata-sphinx-theme-0.13.2.gh.tar.gz 3367549 BLAKE2B 29a219b865c3c8f9c7ab8acba50ded75585c240cb120d8cb21234fdb6c1126f6ddadc1582de5aeaf253a7ec7126a9395cc12dbead5f7b0c54a5727634d965aa2 SHA512 e26a8ed2791489f23df774e024bc04e2600b70228bf0db1cc69edd1fb4f615425e8e1f06ea849516fd7601bea23caecad3641a4547c78cd9b7e808a61aa79008
+DIST pydata-sphinx-theme-0.13.3.gh.tar.gz 3370023 BLAKE2B 3d5e05222cce5c92e0ffadbf91d3bfa575a809b06c23da800e845e5b4ec622a3bfba0f5a72cc0c969b1a074e765e611c2aeb3cef77842d51529537959a952cd5 SHA512 312308838a78bf66430660ee0d7484cf20004926446111e1e8bf89fc96b38f4b8345b96856705aaa56371b31c369066a043c53d263731ccb411e7e263fc3a96a
 DIST pydata-sphinx-theme-0.7.2.gh.tar.gz 2632129 BLAKE2B 2beb9fac60b5f6c863ee4c570b88c4331135d2c8a10d84599f97944002576424caae06d062104a58c7f329f85e046eaa820d03a4117396009084707d563608d7 SHA512 2f6cac080807eab04f1c4de2fdd1563de17f1214f79c094f69b5ff116bcc47f1b0e159d6c87412c8cbe7691b19eebb3b228ca8243d05c81bba94d0aacbdb3e5e
 DIST pydata_sphinx_theme-0.13.1-py3-none-any.whl 1624783 BLAKE2B 9ff997244b12320dccbec56866af4cf780a5341a5d75b7040de3623d15a2593561a6506f31be769b63bb72905e1e428e9fe0955988b2919732bdfe1dfba68062 SHA512 1f31d59b0041aa6302ea3d6a03d089adb7108e334813f2ceb576b04b5767a96ef4b3d6d3d3f4bc40c399932b193575a21f418dba2a1737a14ba90deead951457
 DIST pydata_sphinx_theme-0.13.2-py3-none-any.whl 1976897 BLAKE2B 3934bdee8210e3c384a284f402627a9d6716c3664a613a7de8ba3e05d143551d2fadbbce3929b837ce1af96019887fbc56d84129b75bb01922562f011dccee04 SHA512 9daed721a90411453cc150e80472fae592a477ce58dc815e60475c579ab62453953c300587cbd1fb8c830ad986cc49f3278f2d781c44a8c35463c1cd2e09bd0e
+DIST pydata_sphinx_theme-0.13.3-py3-none-any.whl 1979378 BLAKE2B 49f871167a73ee088aca87c49f728821a8df4b79015e543e84eee7ac85e2e8a81b3419cca0c8ad14197e44c2bb2b2533a9c7e9e29384d37956c5d814904cc2b7 SHA512 59ec688677cb6d150e4741e84bfd32914f139533118a297c6691b27ea56e2e85577593951a5b3daaf9d41c7de3cb8276c479b72b12c4e8921d7418c75dfe90ff
 EBUILD pydata-sphinx-theme-0.13.1.ebuild 1158 BLAKE2B 2d034e9bd72bd803c992729feddd3803101644a257ffff4e3b215c62cab30395e85863d523e0fb104d178c14095e3e667ef3b310fc301c2837c0719bf43f1d88 SHA512 582e74859f355746bbb1bb6e38720e902ff88625fc8ef8c7b1815d3f833cb785970449473d1abb9111bf813e206c2708ce56bfd555eeb37710ee2d7f6d5f9cc5
 EBUILD pydata-sphinx-theme-0.13.2.ebuild 1158 BLAKE2B 2d034e9bd72bd803c992729feddd3803101644a257ffff4e3b215c62cab30395e85863d523e0fb104d178c14095e3e667ef3b310fc301c2837c0719bf43f1d88 SHA512 582e74859f355746bbb1bb6e38720e902ff88625fc8ef8c7b1815d3f833cb785970449473d1abb9111bf813e206c2708ce56bfd555eeb37710ee2d7f6d5f9cc5
+EBUILD pydata-sphinx-theme-0.13.3.ebuild 1206 BLAKE2B 6e856d87fc771c0708da47e6d2f9bd1f69d7c9399011119e8b766bc9354b043b33b7b57f2ac7e5c544e086c589ec20f968e8e0c7b72fa4d8ec54913ee27a85c0 SHA512 c427d03651b577863c137044d925e547cad4909d4f916bb03cb77ab9b729165b8bbecfa91e0fda9460f288b792a7f790271c45575460367124b4c02c8baf7eb9
 EBUILD pydata-sphinx-theme-0.7.2-r1.ebuild 1044 BLAKE2B a024f2013538da03bdaae92aecdfaff967784c56c10f760c1354efff596465a45d5453fc9bd9312075dd6b18cea6a16fd7c4e2157f12be86f9c91c6559309c34 SHA512 b156267d00caa08cbd26cfc661345dd141fe0a37cc4409f3b80edf28e4469844cd2c2d4be101872f86f00af32c723d3801ca5180b27804c5974051434b5c3c1e
 MISC metadata.xml 532 BLAKE2B 397b44fab769346cc170d5627dc663adbe29b780cbabc3d7643d5bda6ff89d6fbe6e6f55da69e93b8b20ddee16856612063b442125a16e035803e50f5aae924f SHA512 9de912fb51a153d508f3a12a3eb7ef3cd926089452bd6bfb822ae4a797d8aeb9ac68973ea7bebf3095f546dd288fdf651710ca8536f19907ac69f622ca3b0550
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.3.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.3.ebuild
new file mode 100644
index 000000000000..da1d522f7e83
--- /dev/null
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
+HOMEPAGE="
+	https://github.com/pydata/pydata-sphinx-theme/
+	https://pypi.org/project/pydata-sphinx-theme/
+"
+SRC_URI="
+	https://github.com/pydata/pydata-sphinx-theme/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	$(pypi_wheel_url)
+"
+
+LICENSE="BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/accessible-pygments[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-4.2[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	distutils_wheel_install "${BUILD_DIR}/install" \
+		"${DISTDIR}/$(pypi_wheel_name)"
+}
diff --git a/dev-python/pytest_jupyter/Manifest b/dev-python/pytest-jupyter/Manifest
index 4eaa0ef31e01..ef5befe10a13 100644
--- a/dev-python/pytest_jupyter/Manifest
+++ b/dev-python/pytest-jupyter/Manifest
@@ -1,3 +1,5 @@
 DIST pytest_jupyter-0.6.2.tar.gz 15174 BLAKE2B b6c536383ab1b8e375e4250b4922ac6372f850ee4993643122896092109d3f711f91ccc7b159b7330de18f7876df818dc01d31c05e3c18d97488255e063db4d4 SHA512 396f7a7c978097e6dee37ead92bb3c8cef2a8100a7cc85b0b1eab19e20bdaed3332391c17568a6a279ab6ddeea1fbb2fa8dafe24ba4500982ba52cfcda2b1052
-EBUILD pytest_jupyter-0.6.2.ebuild 723 BLAKE2B f2404d1548ecfd860f3aa56fb375ed5bdcbef6896e892ff92f56284dcb1550b5e29faba02b26ccfa1cf893acc643eede70532290bb5911cc6b67d6f235918135 SHA512 68edc9e745c4af900b0cb76847f01d8f68f255b5e0f1ac89c381a3b4aee8329d2c120a8f85813f5e17a2d35e79bb9a4c52c3f7a4f5cb4f4f56f0049bfafd9222
+DIST pytest_jupyter-0.7.0.tar.gz 15507 BLAKE2B b4b580668083e46830d06908f484f221e511a9dc5b32285de25e8e83268a1cb4a110ab5bc92c4652033bd658332c6aef8560313e041d39ceeec6d7339c67b24d SHA512 5bd44d1cc927281823ab92f5e1dbb4fa66e917fb9ba098c63001bb9edf60d4eb7842d4178c1dce1772e156d871def2319d511187185fbfd81ee9128c7c23ea2a
+EBUILD pytest-jupyter-0.6.2.ebuild 723 BLAKE2B f2404d1548ecfd860f3aa56fb375ed5bdcbef6896e892ff92f56284dcb1550b5e29faba02b26ccfa1cf893acc643eede70532290bb5911cc6b67d6f235918135 SHA512 68edc9e745c4af900b0cb76847f01d8f68f255b5e0f1ac89c381a3b4aee8329d2c120a8f85813f5e17a2d35e79bb9a4c52c3f7a4f5cb4f4f56f0049bfafd9222
+EBUILD pytest-jupyter-0.7.0.ebuild 828 BLAKE2B d582a142366cdd9ab51062c75ce3bfbad4104390819f93d0c5458d7b599a3e587ea8a6a843b267cea320db86eb1eb9f276b30248f4233c5c6afe9024ac5cdc05 SHA512 22ee60d3711858445837f726dac2a070d51a4956891e9ccbd6540724b6e8e6b976db8eab37129a98abcc7327947e6106d51473df00b1bc127d634f7ed7316e3b
 MISC metadata.xml 544 BLAKE2B 2774989bbb5ea75c4254ec2c9f3daf04a48bdec28698d62afd2471abb4031273bea581c09151efa643fc691a3fda2e1a4211dca66882fe2c5a24d7a6bef7c1a1 SHA512 e3751515a8baf2b422cb680870adbe9393d37ecf2e8b01212bcfa7d0b62ca368c34a9140945e1af4d7c7f0c5443b996ac7cbd4394833aa13b4e937b05bfe0e6b
diff --git a/dev-python/pytest_jupyter/metadata.xml b/dev-python/pytest-jupyter/metadata.xml
index 8d9f695ec9a1..8d9f695ec9a1 100644
--- a/dev-python/pytest_jupyter/metadata.xml
+++ b/dev-python/pytest-jupyter/metadata.xml
diff --git a/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.6.2.ebuild
index d19d19f131bd..d19d19f131bd 100644
--- a/dev-python/pytest_jupyter/pytest_jupyter-0.6.2.ebuild
+++ b/dev-python/pytest-jupyter/pytest-jupyter-0.6.2.ebuild
diff --git a/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
new file mode 100644
index 000000000000..6ba7fd839d96
--- /dev/null
+++ b/dev-python/pytest-jupyter/pytest-jupyter-0.7.0.ebuild
@@ -0,0 +1,34 @@
+# 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 pypi
+
+DESCRIPTION="Pytest plugin for testing Jupyter libraries and extensions"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter-server/pytest-jupyter/
+	https://pypi.org/project/pytest-jupyter/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jupyter_client-7.4.0[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 76c1366e7fee..95a1a0f7eb63 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,5 +1,7 @@
 DIST stripe-5.2.0.tar.gz 267950 BLAKE2B b7312e4c7e56803fdd64507602df3527efcc964aa7bb6deae59d00df75c72c47cf179382ce6b90ffab5089e7fce9b2e03de0748a091b36dd25d93d8cf6b1d119 SHA512 e928487b690a2c7bce9013ba988ff5a1d9b0ef4b0be56852385925fd5fa4a1b9e655e05b7fa2728d38ed7834eebe621b883851e6a6db625f388866f32c9f8a15
 DIST stripe-5.3.0.tar.gz 268634 BLAKE2B b6b6ac44f64b2b7f02729840409ed7f432abd6924838445deaa010a98056175bc47504cb110d27f93c1c1a590d759903f6af2189da43076fd3b1242c8f4f2503 SHA512 2ae99b315f0d1059551b86106cd3eb46dfb60dcc31f65f4e3cbda8817461b0071add2ab68eeb885b4faa080043708ac9e673d8a1248bf1c6461c62e1adcafc80
+DIST stripe-5.4.0.tar.gz 268711 BLAKE2B 2417174ceed571a7b8483992ac15ef9d19a037e5745118c2eec3094f8e848ec49b384f62bd4a136ed046b695bd753efc6064109c30a50aca539a1085b1e056fe SHA512 55351171184672ab55f38ed483078dbbb85216bf80d07726d1bb8848d24ff829a3d464d543182afafedfcaabdb516a5868bc4ac7d16f64f2dc2dc7c1ab2e152a
 EBUILD stripe-5.2.0.ebuild 1777 BLAKE2B 7d52e724895d47f77fa83ed1c81b77070c1453f9e7aa6464975dcf8384ef559567c618b4c056da8d701c33cdc15fe953623e2d1cae20147e8d0e3b8f01c9cc8d SHA512 9bc618c6f3bda2b506c49f87950981607eb5bba6eea89c6362c6b3da83a14da65d8c9d9aee741a97fa98d42314dbf2d3f1c268a94b0c45f850f3911ef023041c
 EBUILD stripe-5.3.0.ebuild 1779 BLAKE2B 86e73471b21fcdda355e14c9540ed07712b18cd40c298de791fa7392dfe96ed20803460f6f953c05c8d88618a26a1e24a476dc62b5a24ef0f2173cc75d10d96b SHA512 32f702eb44fd58d38cec9e79c6db3bfa19b23c44a6f750317e0860954fe7497fb8f12dbce33c4522cc24a93179adfe4e52738139c6471a37a641a70df6197e5f
+EBUILD stripe-5.4.0.ebuild 1856 BLAKE2B 2bcd8207e26a87efc0672a3616113a1a6d68467c237ed68a752af685ec78348b3eda429eb115b20db37fd18120ae36eba9aaa6c0b5e51df2cb5bae4bbd57321a SHA512 6bea3bc03c3e38d305587975f98699be34655b790fd003197b8518f42f41b7349161b8f814681820e7a102e0bcd67813fee7d97764c98cb7cbcdaaff82ca0a71
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-5.4.0.ebuild b/dev-python/stripe/stripe-5.4.0.ebuild
new file mode 100644
index 000000000000..90ecda2ccf22
--- /dev/null
+++ b/dev-python/stripe/stripe-5.4.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="
+	https://github.com/stripe/stripe-python/
+	https://pypi.org/project/stripe/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+# please bump dev-util/stripe-mock dep to the latest version on every bump
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.159.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
+
+python_test() {
+	epytest tests
+}
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=${!}
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
+		eend ${?} "Port ${stripe_mock_port} unavailable"
+		if [[ ${?} -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 6c7d770d50e3..297219bbc958 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -3,9 +3,11 @@ DIST trimesh-3.20.2.gh.tar.gz 12683352 BLAKE2B 3ed73e426fd72723d19b668aae790f44a
 DIST trimesh-3.21.0.gh.tar.gz 12688064 BLAKE2B 5ac8c4cd3f087b63ad6e224a693380a7f5cad5d1e09e2d21d91410f462d51833baf09ac7015c52fa85e475832122c0aa61e8bfa340d42fb08c9e9fb0e5d8dbdb SHA512 1805213b8fe19fa5716ad8da1c23d7e23d06e96de13a18f59907a62fdf5b67ad9fb7842a7f19b4a315444261f210bbb312f6b0bbf728ee015f9d489e2dce4f0a
 DIST trimesh-3.21.1.gh.tar.gz 12689151 BLAKE2B e0d04a6003656f096404ec8972907381f5950f7a6ac3864963fc9a52dc015ad42d39e88ced8d125f725333ddde722358ebac9f263fda0cd21d663af42318bd50 SHA512 08716a310db8cae86a725072a6626b3703ffac3532182ce22389cf85fcdf5853ad8f17cfd8c34afde0e6dc0f2125d910d130810c3cce8e8dcb1605737074a3e0
 DIST trimesh-3.21.2.gh.tar.gz 12691646 BLAKE2B 0ec2c1e9afb607984b92d339fa07dd8b92bf0ac50c56704c98ce3f6c35449794b595640d68c67dc2ce59f236545f5df72238aef21103fbc1f432bbe285332a46 SHA512 e9e692c6dd20c787c9262e148aaaffb81c8ef3decbeb16e3c008a585701e9e71c73487e8226b159e86d550019f297bb2163b3be3006dd08c2df932d3dcd0b403
+DIST trimesh-3.21.3.gh.tar.gz 12692861 BLAKE2B 8e3f9cc28b26371bc46b31c48c1e79345cb6f27755999bf99cc793f83706ab559cffb3788101995550e112b77617c0d112c06f636f0f4c3047b966f669b419b3 SHA512 ab72b8b61643152d5fdcf5326b1c8a6f8e54c4bbc0653fe8c1dd379ecfa8510ae542c85adde8200abcb863ec80dbeb9046d6d7d4ec5f1f9aadead8871841b948
 EBUILD trimesh-3.19.4.ebuild 1908 BLAKE2B fca44800b00390609a488c1d6ed4167a162c5e0f8b03d37d06c327f1f3516f2cbdcc51c5954df0dba0a8f99493bcd3ea5b8b404e6152d38105139a4c8935bfdb SHA512 5db0b712d9c1cd0bfa309c0018c0a0bb4a8b28f970e76a18308640b0a237b5e68fb8c23320ad2f0674eae050da0913942081da0ba00c18dc9f7596655abe1460
 EBUILD trimesh-3.20.2.ebuild 1909 BLAKE2B 34fe461b88e583ac9981b590db715562151e7faa2a31bd6596c0455f329f3e7f81c06ca9e994c6a20d1ca75c88003901beca7c77578aa60ef3880a35bb20183e SHA512 253b8d5652d031951198bd51f657984d7c65c8f0e7f9a2a7628905d8c88a761411f04824cd6f09014b3cdc7ba40581f2f100aec3e5dad6fc1fdcabc8c907c7cd
 EBUILD trimesh-3.21.0.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
 EBUILD trimesh-3.21.1.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
 EBUILD trimesh-3.21.2.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
+EBUILD trimesh-3.21.3.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.21.3.ebuild b/dev-python/trimesh/trimesh-3.21.3.ebuild
new file mode 100644
index 000000000000..c876396fccaa
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.21.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/yamlpath/Manifest b/dev-python/yamlpath/Manifest
index 41098f42537b..a9f4cf98e9f1 100644
--- a/dev-python/yamlpath/Manifest
+++ b/dev-python/yamlpath/Manifest
@@ -1,3 +1,5 @@
 DIST yamlpath-3.7.0.gh.tar.gz 224352 BLAKE2B 9a5483847fa765c3f06a4746b6c364ba66657f739383f0eeaac4f639bf44762bf1d3b7c468ec376d2d8d8bc6669daa60512f2202de6ec3407a5dd674d022f50e SHA512 d0ca007065f5efdc7c876d9596b37028881c4b3782f478f4dd87525cc6e316005bf23b930ea723bf524bc455c492c9eb07c50ccfc9333d9d794f110fa63dd268
+DIST yamlpath-3.8.0.gh.tar.gz 227377 BLAKE2B 9a722a6f637144a8085c7b71c8ac0c966d2ff7eda7b7136614db06406024c21cdbf6b30d3a5cc7b78ba8e268d406c0db15f15130098b680a1ce36a6eb8d31b9c SHA512 8a91c1519a7a93b099c77d2f850dc775c0ca8147d3ea4eb96408bb3f53a102301c6a9b6d1c5c47580a59f701e8316ff49e27d4643c21c8bc87fb337e6982e91f
 EBUILD yamlpath-3.7.0.ebuild 1120 BLAKE2B 135fc3c69e2bae9de6765cbe95459d80dc3f47863802c57a0190e7138613f9fd45f73a3994678cfae9c2a9338008d6a815c2fafb1c7cb9c2edc01449c7a1f2f7 SHA512 5ac6f83b72c71088f2baf503b595fdf13c6e460cbc0a020ab50279ae3205b1e165b581601002c0204e9d84cc3f682f05d45037d3afd225efedd58e6541f61bc7
+EBUILD yamlpath-3.8.0.ebuild 1120 BLAKE2B 135fc3c69e2bae9de6765cbe95459d80dc3f47863802c57a0190e7138613f9fd45f73a3994678cfae9c2a9338008d6a815c2fafb1c7cb9c2edc01449c7a1f2f7 SHA512 5ac6f83b72c71088f2baf503b595fdf13c6e460cbc0a020ab50279ae3205b1e165b581601002c0204e9d84cc3f682f05d45037d3afd225efedd58e6541f61bc7
 MISC metadata.xml 664 BLAKE2B cdf919f6a46dbc7ed8f2546509a623e0e784da711afaade20ec79b2861e8c83f54f755ce68ec2944bd0edb92f2e05b18a9c0ff93430c185574c41de2d789e03d SHA512 8020ca58f464e2aed71c01c29375b95dda238be6cdb94468a0abe50c7ce0270a42d723318f34cb4eb8728184cbe6769c7e666f43cffde37e6e9f42cab4d7292e
diff --git a/dev-python/yamlpath/yamlpath-3.8.0.ebuild b/dev-python/yamlpath/yamlpath-3.8.0.ebuild
new file mode 100644
index 000000000000..ad955b668138
--- /dev/null
+++ b/dev-python/yamlpath/yamlpath-3.8.0.ebuild
@@ -0,0 +1,54 @@
+# 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..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line processors for YAML/JSON/Compatible data"
+HOMEPAGE="
+	https://github.com/wwkimball/yamlpath/
+	https://github.com/wwkimball/yamlpath/wiki
+"
+SRC_URI="
+	https://github.com/wwkimball/yamlpath/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/ruamel\.yaml/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	if ! has_version "dev-ruby/hiera-eyaml"; then
+		EPYTEST_DESELECT+=(
+			tests/test_commands_eyaml_rotate_keys.py
+			tests/test_commands_yaml_merge.py::Test_commands_yaml_merge::test_yaml_syntax_error
+			tests/test_commands_yaml_paths.py::Test_yaml_paths::test_search_encrypted_values
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 630bf3f17481..ea1cf26a1959 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/shoulda-context/Manifest b/dev-ruby/shoulda-context/Manifest
index 5ee25b1dee26..ce1388fae521 100644
--- a/dev-ruby/shoulda-context/Manifest
+++ b/dev-ruby/shoulda-context/Manifest
@@ -1,3 +1,3 @@
 DIST shoulda-context-1.2.2.gem 24064 BLAKE2B a6068da369c00a36e6056a8ebba96eca90efddf94613dfc90c9f2a47bec2c054a41fa61b861b2f3ec1195e417bdc54ab60d53f91bc5e0f167eac07b84880892b SHA512 b09f5ce2db59bbb26d5678b17b6641b79df7983d25e81a31bc10c42b702bdba09795b692d711d59c103beb2f691b503567e37c46668f77e600416551ef2c5e05
-EBUILD shoulda-context-1.2.2-r1.ebuild 859 BLAKE2B e2c0ecb860be7ea490f41dda1f39bfd9b16285fb864d0c1c2697710073df6f3200a2ba3c4b3bde77db6194cab96bc82999f2f48c75d27daed2eeec1ee3fd07bf SHA512 ff6f5a3fc08c7a6c64cd9a75d7f3c03406bb60244b1dd688ec0b2533071a7c80d34d3c46dc8985aff0909c40c43ea1c05a2e7959ffc60a4baa64d21c08ac2823
-MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
+EBUILD shoulda-context-1.2.2-r1.ebuild 852 BLAKE2B 6addba448dde56887773831bc27f2d30e5876dc431c613b24f64e23864dfbe1d662409e505c02ed57a03e4527cdd395fad105a45da512233195c297a8a2f0311 SHA512 f42ba27eb91f5bfa955b03b257a327bce3fa0e3feadae1a6a4a84a7fe2352a16da038cb1537bfe1669046cfed92674b7ce10a7074b6a529b50436d6c36a0db3b
+MISC metadata.xml 412 BLAKE2B cdab2c06a1407db99bd231afebddc4fd87361378cec2767b0b58c0da4fe7d3ceaa522b0a0dbede8ca496ca1840d37ac257de62f12135ffb6ea2922eac9160d84 SHA512 16fbc3b54f33c73173d09e5af860fb1e46c8498574b2f2b727e164052c8e813f25a6a75b541442469d961b515a52d5562157404136a8c00125e5c122f91a3003
diff --git a/dev-ruby/shoulda-context/metadata.xml b/dev-ruby/shoulda-context/metadata.xml
index 658c72b1920d..5bd462be9980 100644
--- a/dev-ruby/shoulda-context/metadata.xml
+++ b/dev-ruby/shoulda-context/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">thoughtbot/shoulda-context</remote-id>
+    <remote-id type="rubygems">shoulda-context</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild b/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild
index 027669796650..d2eb1c59cad9 100644
--- a/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild
+++ b/dev-ruby/shoulda-context/shoulda-context-1.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
 
diff --git a/dev-ruby/time/Manifest b/dev-ruby/time/Manifest
index 4e22289cdd1b..622bbdf7f9c2 100644
--- a/dev-ruby/time/Manifest
+++ b/dev-ruby/time/Manifest
@@ -1,3 +1,5 @@
 DIST time-0.2.1.tar.gz 25363 BLAKE2B 8f9a3dae104a03cc012b156fe696890a655b8a81627e23c3cc3c811b15d1a195d5e7ca1da1b9ab8ee81895e291962be2f64bdf021a376e77a3195695a0a876c1 SHA512 695ea9907338fc13fd8b7ab98ed57d811c05e0609c99585eff80acd172d38408c705857dc25ff78b310a6945e768e5403d9c4453b357676f39d40418982c97e6
+DIST time-0.2.2.tar.gz 26129 BLAKE2B 9d7c507c06fca17c9a2734f1116524344518635562b0ba924cdf5e0b0b52cb31f6dffa7aa3c8c06e0d2f5f2c1ffdcef2a92756cd915822be6a1510f08fa91c56 SHA512 4866cd7df233222ed76cf3b35c842b6e1652b429aa15609bfe40f89683ad5df2ce7f37f41dfb0e85f610f2ebf4e431ea8046d67c3aed7aa345d928fe33ba1ae3
 EBUILD time-0.2.1.ebuild 1018 BLAKE2B b3a8aa3d73bb8023162151d14f64d41a35342bdc621389379877998c18a76ead9813d6321d8a67ff603cfe0e89573caac00bfd5a659e3d7ba6d0421fecd2fec7 SHA512 8abb76652502d9a54677d5aa863729a406f1dbfd9399daff715b7a08161a9de3ca65786e19368ee98b12fe3c76fa5bd3976b74ef6c4a229a3fd7344e076ba251
+EBUILD time-0.2.2.ebuild 1025 BLAKE2B a5e32af2f19421735c07f43914f9b29f6bf874c5b18a6429b2b4e7c77da900df50d9eabbc2555a5bf54d0b3786ad0f46b5a69a3a3f17f43c24fd4df0b21ae772 SHA512 6678e39a1eb2f142b8195e5c5fbb0dd55c9e0b13d15692bcf8fdb09b2905940775917afc64d0ba826d4c561fc8908b086b06889c0e4384343e554eb767441dc6
 MISC metadata.xml 336 BLAKE2B 319e2c60fbca7c2a86ddd03dc6b837e5f596e12fa5b9dbf002a955c23e8eeeb26bb91a4526a6a67604b6eded037f99f8e95334899fea2d1b3d1715457eb7dc6c SHA512 8ab5bc044b940fea3297ab6cb12a4fd3204602558812dc059d59e8a7f72ebe137ae637127270c40e8fdec3a8c00c9778d109f499b4828ac4d03f38ed7b0fa292
diff --git a/dev-ruby/time/time-0.2.2.ebuild b/dev-ruby/time/time-0.2.2.ebuild
new file mode 100644
index 000000000000..3a2b095d7815
--- /dev/null
+++ b/dev-ruby/time/time-0.2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="time.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extends the Time class with methods for parsing and conversion"
+HOMEPAGE="https://github.com/ruby/time"
+SRC_URI="https://github.com/ruby/time/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/date"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 7e1f3fbcb953..2c8abffe7b38 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
index 98f4637acd64..e3f390dcc892 100644
--- a/games-emulation/snes9x/Manifest
+++ b/games-emulation/snes9x/Manifest
@@ -9,8 +9,10 @@ DIST snes9x-1.61-glslang.tar.gz 3188787 BLAKE2B 36ed327fbb2aec3657fe300b98f2e45c
 DIST snes9x-1.61-spirv.tar.gz 676662 BLAKE2B ab18406c99e4e04c6c497b5f447dcaccb7d5a60f42bf1cea31afee04ee664e74916b32736c1aea1e7106494154e48e5cbe9b5d6a0652667c4d0e2020814cd9bd SHA512 bfa3cc944450db59a57a685eea12b0ed0b5059d55a092ac5cdf6f4dc03c1e2d2e62fa5a576156c772340e12136b10d7ed790bb35b4aece2ee8405e64f826e31b
 DIST snes9x-1.61.tar.gz 3016890 BLAKE2B 3e94dee5172bf48d2461a3a1403fc7e7fc8069df6dddf5b5e1da59ee140297bd0b7cee6948b5eb154c1eec38aebe3ab29a9fae3dfb4abdce41769d2ace43dee1 SHA512 8b644f5b7136e89fd222bcb430fc736c74a3e383d7e6c7f0880235f6fa4c0f77abbf02493f8d654a12e87701111643e33877bc21bb3dfcc9b82a056fa1b1d880
 DIST snes9x-1.62.2.tar.gz 3423557 BLAKE2B 8db25f47dd58816eab2bdaf56fc9f83636b8677d9dd37f97fcedd5ef8af12428f1cdd3c4b017569c4930e2616d60c9387e09c0fbe4427860ed1517e1de447458 SHA512 575ce2f46130dcec1eb0168008e64b9f664a694c60b12c4d5d416bde122e2861ca9d10a7597246cbeafe27c4122f24dc82612d585e7f2164fce8b9670100591e
+DIST snes9x-1.62.3.tar.gz 3423799 BLAKE2B 0eaea11d4f0fa03b01d7ae86a559ad76df31d6e5a485ee09f75ec81824296a2f3182da6180dd60eb4bb9722cd3d8ce6ac3e0c1ae7c7740f2828fde1231c19a2a SHA512 005222bc054fbdfef92acc3ce5ad1f4b18eaff4382ab352d61e5c9c3fbe952ca085e964535e628730976f795c568e9e8751e6ef997f864c719c421d67d9e04db
 DIST spirv-cross-4e2fdb25671c742a9fbe93a6034eb1542244c7e1.tar.gz 1714902 BLAKE2B ae2b9816755679552c21b7f4446cda5b0626ba56143767445014b011234183afe55b4abbdf2a5849cad3d9e17871362bbac4da6b7969b578f564a8cbb3f3b269 SHA512 ec47b1d966006c6e654e84e7fa16124c774de3ca6fd508d3cfe0568e3df79eee3f5aeedfae1d744b99e162beeee23afe498249b2291091bc14c0357db304bebe
 DIST vulkan-headers-a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2.tar.gz 1832285 BLAKE2B 9278a17ede62f1a839ed230d2eefe3eb7ed46d3e25d4a44504f8d247c7b1c83d38166bec143f3b8e068d5c112585299d90ec16e9c41be6096c61f2eb5e127287 SHA512 b35541413efb5124691e0d13403acc00a85af51e3165828e892e90f059a7d7dc83f9bde43c6a7a1f471ae6eb8ec0155ee873adcc7afb537d5adbaccafcd7d849
 EBUILD snes9x-1.61.ebuild 3519 BLAKE2B aed7717315000d6ca7fbb25336b859b54a45a9af51ce7a5948dd28251ee98f6ea540d3390b75e2bed6e180fa80334e3fef757f37d61054252fc1cacabfb48bbb SHA512 eba8d739a0a7c2ad84714a0b5bc6f596fe676789d4d1447ceaf8121316a6b96b09a46f748f8b0a051c454479cce524f751615bf1776bcd4daf28168abb86a07f
 EBUILD snes9x-1.62.2.ebuild 4477 BLAKE2B ae2112b4fec31fea02b2ec16ce25a5c2640177491eaf8d874533e12eff936eac81b15f81fb09c9bfefe8cefc4868c3793f2113f211f1e65425360e059d27628d SHA512 d75067757b3085a39bd854faf63690eb10ddcb624c27d34f896be2b91c50e23515cdb7cc6f44b52bb13ba935f65296ab76fe29f26acea2b3875e2876c0120a9a
+EBUILD snes9x-1.62.3.ebuild 4477 BLAKE2B ae2112b4fec31fea02b2ec16ce25a5c2640177491eaf8d874533e12eff936eac81b15f81fb09c9bfefe8cefc4868c3793f2113f211f1e65425360e059d27628d SHA512 d75067757b3085a39bd854faf63690eb10ddcb624c27d34f896be2b91c50e23515cdb7cc6f44b52bb13ba935f65296ab76fe29f26acea2b3875e2876c0120a9a
 MISC metadata.xml 608 BLAKE2B 9e770ccbcf8a5c12fccf33febd962f5f64f3378d9eabacaea208c28bed78fd909004a822e221bb6155bef1e2fd8908544075e57d3f48232fff2fb7c2c93cb7e4 SHA512 21718e0e03cad23eabd7e360ba347e77fef1e4af97945e3436b6d494cf5c1f8c7336d5987eda79c4b8359057ebe3d56fc41c0de66d227183470a19c34e393ff9
diff --git a/games-emulation/snes9x/snes9x-1.62.3.ebuild b/games-emulation/snes9x/snes9x-1.62.3.ebuild
new file mode 100644
index 000000000000..53678735c21a
--- /dev/null
+++ b/games-emulation/snes9x/snes9x-1.62.3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools cmake flag-o-matic python-any-r1 toolchain-funcs xdg
+
+# TODO: try unbundling, albeit compatibility with (and between) these
+# tend to be volatile and it may not be the best idea "yet"
+HASH_GLSLANG=6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7
+HASH_SPIRV=4e2fdb25671c742a9fbe93a6034eb1542244c7e1
+HASH_VULKAN=a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2
+
+DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
+HOMEPAGE="https://github.com/snes9xgit/snes9x/"
+SRC_URI="
+	https://github.com/snes9xgit/snes9x/archive/${PV}.tar.gz -> ${P}.tar.gz
+	gui? (
+		https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz
+			-> glslang-${HASH_GLSLANG}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Cross/archive/${HASH_SPIRV}.tar.gz
+			-> spirv-cross-${HASH_SPIRV}.tar.gz
+		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
+			-> vulkan-headers-${HASH_VULKAN}.tar.gz
+	)"
+
+LICENSE="
+	Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB
+	gui? ( Apache-2.0 CC0-1.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="alsa debug gui libretro netplay oss portaudio pulseaudio wayland xinerama +xv"
+RESTRICT="bindist"
+
+RDEPEND="
+	media-libs/libpng:=
+	sys-libs/zlib:=[minizip]
+	x11-libs/libX11
+	x11-libs/libXext
+	alsa? ( media-libs/alsa-lib )
+	gui? (
+		dev-cpp/cairomm:0
+		dev-cpp/glibmm:2
+		dev-cpp/gtkmm:3.0[wayland?]
+		dev-libs/glib:2
+		dev-libs/libsigc++:2
+		media-libs/libepoxy
+		media-libs/libsdl2[joystick]
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[wayland?]
+		x11-libs/libXrandr
+		portaudio? ( media-libs/portaudio )
+		pulseaudio? ( media-libs/libpulse )
+		wayland? ( dev-libs/wayland )
+	)
+	libretro? ( !games-emulation/libretro-snes9x )
+	xinerama? ( x11-libs/libXinerama )
+	xv? ( x11-libs/libXv )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	virtual/pkgconfig
+	gui? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.62.1-flags.patch
+	"${FILESDIR}"/${PN}-1.62.1-gcc13.patch
+	"${FILESDIR}"/${PN}-1.62.1-optional-wayland.patch
+)
+
+pkg_setup() {
+	# used by bundled glslang
+	use gui && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use gui; then
+		rmdir external/{glslang,SPIRV-Cross,vulkan-headers} || die
+		mv ../glslang-${HASH_GLSLANG} external/glslang || die
+		mv ../SPIRV-Cross-${HASH_SPIRV} external/SPIRV-Cross || die
+		mv ../Vulkan-Headers-${HASH_VULKAN} external/vulkan-headers || die
+	fi
+
+	if use gui; then
+		CMAKE_USE_DIR=${S}/gtk
+		cmake_src_prepare
+	else
+		default
+	fi
+
+	pushd unix >/dev/null || die
+	eautoreconf
+	popd >/dev/null || die
+
+	rm -r unzip || die
+}
+
+src_configure() {
+	tc-export CC CXX # for libretro
+
+	local econfargs=(
+		$(use_enable alsa sound-alsa)
+		$(use_enable debug debugger)
+		$(use_enable netplay)
+		$(use_enable xinerama)
+		$(use_enable xv xvideo)
+		--enable-gamepad
+		--enable-gzip
+		--enable-screenshot
+		--enable-zip
+		--disable-libyuv # unpackaged
+		--with-system-zip
+	)
+
+	pushd unix >/dev/null || die
+	econf "${econfargs[@]}"
+	popd >/dev/null || die
+
+	if use gui; then
+		# bundled SPIRV-Cross fails with -Werror=odr
+		filter-lto
+
+		local mycmakeargs=(
+			-DBUILD_SHARED_LIBS=no
+			-DDEBUGGER=$(usex debug)
+			-DUSE_ALSA=$(usex alsa)
+			-DUSE_OSS=$(usex oss)
+			-DUSE_PORTAUDIO=$(usex portaudio)
+			-DUSE_PULSEAUDIO=$(usex pulseaudio)
+			-DUSE_SYSTEMZIP=yes
+			-DUSE_WAYLAND=$(usex wayland)
+			-DUSE_XV=$(usex xv)
+
+			# this controls both vulkan output and shader support, could be
+			# behind a USE but it currently fails to build if disabled and
+			# adds no dependencies given they are bundled (for now)
+			-DUSE_SLANG=yes
+
+			# gets used for LOCALE/DATADIR too early (installs to /usr//locale)
+			-DCMAKE_INSTALL_DATAROOTDIR=share
+		)
+
+		cmake_src_configure
+	fi
+}
+
+src_compile() {
+	if use libretro; then
+		emake -C libretro LTO=
+		# rebuild objects given libretro uses different defines (bug #791475)
+		rm *.o || die
+	fi
+
+	emake -C unix
+
+	use gui && cmake_src_compile
+}
+
+src_test() {
+	# currently no tests, but don't run the cmake phase while unconfigured
+	use gui && cmake_src_test
+}
+
+src_install() {
+	if use libretro; then
+		exeinto /usr/$(get_libdir)/libretro
+		doexe libretro/snes9x_libretro.so
+	fi
+
+	dobin unix/snes9x
+
+	local DOCS=(
+		README.md
+		docs/{changes,control-inputs,controls,snapshots}.txt
+		unix/snes9x.conf.default
+	)
+	einstalldocs
+
+	if use gui; then
+		DOCS=( AUTHORS )
+		cmake_src_install
+	fi
+}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index a69961458f44..cd014d84323d 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index e5023e146d9a..ea2793023dfa 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -3,5 +3,5 @@ AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec
 AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae8e0ba15838a2a9ddc677f54f5d5fe191591b2bd5c7f20067fc00b6679f448e25371e27f231589d SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258
 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2
 DIST opensmtpd-6.8.0p2.tar.gz 860189 BLAKE2B 603e8516860eddefb1694ea4cb5631cec2df2a19fa3193b25388caf73c41e82d44e57847fc95b5187488cae629542e72ff2d5a17badc15cef1647bdb173d7827 SHA512 48f152b75575146fdd09bdf47123041ea62fefb6e5de33a69826bf91a2126a918f8db1caffadb2f142a1a21de8126d492de88cb65bdf169e61c0b22d3e78d290
-EBUILD opensmtpd-6.8.0_p2-r2.ebuild 1962 BLAKE2B 571a5cd83312ac6584a4e883c9ace89da623b4be6343175c245f648aa935bf80c83cda7cdb306750bd0aea5456cae6e9975408c283317914573cae5517621ec0 SHA512 5cef740ab249461196aa479d39124bde5f24d5363548b439c24924491925b180e8be2c13cb874452d8c568f88489baa211005df4767e74a46becac8241474b2f
+EBUILD opensmtpd-6.8.0_p2-r2.ebuild 1994 BLAKE2B 07e446b197182c4701e64528daaf0a61e5411eadba9fec22c43b636c97a9ce715e0ab66777f7f492bc12aab57b8b8495f3646f3450de0301d9953d776f1002eb SHA512 18cbc2e958088f35c56be34eb24b68f720097462357363451b03b53e6efc19ce44e36a2ad0964f5c9f4b17286c5d9a74e45c63e8aac40ddf93c60c21705eca23
 MISC metadata.xml 694 BLAKE2B b72e021afca63807b8139e3e69f8ec8acbc37f2e0abaae0bef0a5afc5fa1b7978dc7e64ecb8aae85251c66d697ad7ef8df214884e60ceb9ed5519a64d551e6e2 SHA512 d5b86e34dcdf22a313869dcae3a1e7a05a05a9e67e701642281e4e174974c3edb7007dc5ac45f666c8bdf0d35014f6f58e72eed527e8dab2c80aa87c09cc3d18
diff --git a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r2.ebuild
index d580b7c929b3..a8e71de77b1b 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r2.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,7 @@ DEPEND="
 	!mail-mta/ssmtp[mta]
 "
 RDEPEND="${DEPEND}"
+BDEPEND="app-alternatives/yacc"
 
 S=${WORKDIR}/${P/_}
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index b2353c295082..c4bf813e9e27 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 9c319f0ecd9e..ed93dc861565 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -7,5 +7,5 @@ AUX canvas-fix-an-integer-overflow-in-caca_resize.patch 5265 BLAKE2B e75b3366a8e
 AUX fix-css-path.patch 502 BLAKE2B c494c458524f98017dceb41266ed051cb3bc9f00c57185715d2ec7846ea5ea3990419d5b8a99062ace0f63ca06e68a45eb4c85210aacc2a6f29255b1088683ac SHA512 de6c43fb73d86dd8e8ee1e22e329ee2201bf09947568382c4637145b297edfae206c269edd05e08000d5670734f8e2c3373c5095682ac850cce588c4cd0cb636
 AUX libcaca-0.99_beta18-fix-tests.patch 1886 BLAKE2B 8961c617ae568ab19b0404a8ddb1e4da743f7792b36fd32ace460071c04754f8e5845200333f96e4b9602f547d3249da301c3df62cee7bb20235da6a3242789f SHA512 583b440f93d2d468b14a707946eda928811b8c6573b1a48a1f6010d2f3713399689434531b0068ebbc1999dc82867c7ae6da0bdea9fb754277eda484fe39b1f6
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
-EBUILD libcaca-0.99_beta19-r11.ebuild 3324 BLAKE2B 366747948592383dcbe1d498e0c271e03d7e9efb3014b870f4ac9fc4435820eacd57620408538307e6f999fbc9e70616d3323d3457d9d49884792e691d7e1c43 SHA512 d0457bf2e039f5a2babc7db5e4f087dafd168abbd6a4f0eb193db653d7bb838c0263d22242347907e26efd8250a74fb73abdc0b6d1125fe81135ed6c97c771ca
+EBUILD libcaca-0.99_beta19-r11.ebuild 3320 BLAKE2B 2f609f0c3012b9874ae7addcfd32444679b34a9ef369e01782dd0f7b12745397e2a9876cb4530dd6e2c23fb61f4a916e718c0e413ed73594c7aac060fd15c274 SHA512 485f93a3619e70b19049c93751b1120c33429ff46f59a1728443e2bbd78b93078f47f5c5ea6b358871b66bd1956e81f11ddac123a13d28045688586e0bee564a
 MISC metadata.xml 305 BLAKE2B 09d0fd38e248eee6d78d5cfc6d04cd454ba1b9c9b3474e1f94de41d0dff53e67f425875a9b27f9247ace85580025197e12c379ccec928474954bc3bd2ef0307d SHA512 6b8addbc26d79c54322fe838afaaf08ee7c73a8d1c7ecf529778e63490117e20ad744277506fea52b8ed6ba7652c7d75c7344642ad6521ad17b85c68d0a69713
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
index 25ffa5d82c40..16b2b1278595 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
@@ -9,7 +9,7 @@ MY_P=${P/_/.}
 DESCRIPTION="A library that creates colored ASCII-art graphics"
 HOMEPAGE="http://libcaca.zoy.org/"
 SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/all/${MY_P}"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7bc4034137d6..e3338e99017b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 9373a7d8ed1a..2f8934b1975f 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,5 +1,5 @@
 DIST qtractor-0.9.31.tar.gz 2009829 BLAKE2B a7c3da14e8b77bd6ebc61514fa8f4c1aee59a113758526b58d0e861f628bd2b0710c9990855e69264ffa05003ea22abe84c4ce29820f8436b4f2d9806fa6901a SHA512 bd86b0c0568b2f318aafb09b33bfd6e1956c622b3a6d743455baa4cbcd5c496f6849159b88bfc27fa726966fd76114a0211418486da937e356eeac248f7c4d47
-DIST qtractor-0.9.32.tar.gz 2015021 BLAKE2B de2b6967431d908863189600a3a59eca82bb6c2f683be082f8ea35578af36cc1d3884c6d6e0abd5eae03f5cceac02fd1186e6ed0b87a7c8d5085bcd897c89f8d SHA512 3dd26df167ffd91efeadd1d8532fd720b848dfe37789b0492f313e6aac0917dda341618cc5ca6262135ee7f9795990f2ceb6c089c4d7c65d29948de1a480f687
+DIST qtractor-0.9.33.tar.gz 2014555 BLAKE2B b2de591c8be935403f8c54682758a891bd9ead07626aede7d1015915941a0558e9f9aeeed3cda5b2b60c52637a80d72e10edc6d29c5d05d87bcfaca31df58e7a SHA512 cb5f26e124a3b43afeaa7f175338ea54ffdd907ee95935c9188ed890afbfea7706fcd45cf6f3c208abfd93ddfbc1ec6fbd1ee2c11a5505f45c97d98950944811
 EBUILD qtractor-0.9.31.ebuild 2504 BLAKE2B 38434a737c64dfe61dca5992d7464be1fdf913e8aa9d1683caa0cdba18f44db432b3103c590fb2667dc43762c6aee1da9feb65a110d815f040e8c31387e3c1fe SHA512 44ab440cce00e1eb5447880649ab292391ec9a737c2e3444ef15e26c744afed70449bca8ccceb022238c6e421bd7418dbd5fa8d0ac5fa530013e094d7bf896af
-EBUILD qtractor-0.9.32.ebuild 2506 BLAKE2B 46d09c6cd1d134e986c05c9b33315df426683c25e589c8a15463d7b3e0ab732819eebccc0f078beb64f6669786b4bfe34b8d6dfc86a5709fbf925a727a8f219f SHA512 930cd1fa23ebdc64148530c4abe214f5c06dae1e3651ca065be9a6fa51843dff03ee1ff2df599e946112bd61b5f7f02ab6f5d4d76e9b8f1ce21aa0b400dc3496
+EBUILD qtractor-0.9.33.ebuild 2506 BLAKE2B 46d09c6cd1d134e986c05c9b33315df426683c25e589c8a15463d7b3e0ab732819eebccc0f078beb64f6669786b4bfe34b8d6dfc86a5709fbf925a727a8f219f SHA512 930cd1fa23ebdc64148530c4abe214f5c06dae1e3651ca065be9a6fa51843dff03ee1ff2df599e946112bd61b5f7f02ab6f5d4d76e9b8f1ce21aa0b400dc3496
 MISC metadata.xml 891 BLAKE2B c85e76d86b5e559e2de880a440e8bdddfb8d67de2b7216a42ebb1ec7cce7b9a4dc8ccf20732e4b4ea489a14fcf5584aecef193e9fe3ac2bb0159011002607a60 SHA512 fcc0f8b61f0b9d9fd3d49c5f00f46b739012a6e8e4f7664bf08ae277b279d282d11056f9ca986788a7e444da53a17aeab46c2ee30fa945eb54dd271b11cf4a55
diff --git a/media-sound/qtractor/qtractor-0.9.32.ebuild b/media-sound/qtractor/qtractor-0.9.33.ebuild
index 0a0f707f34eb..0a0f707f34eb 100644
--- a/media-sound/qtractor/qtractor-0.9.32.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.33.ebuild
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 43ac51f41259..dca8e48f1f30 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a5b3f2a92a26..3fd564062090 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 31 Mar 2023 02:39:34 +0000
+Fri, 31 Mar 2023 08:39:28 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index accd449798e4..9b6509ec9bcc 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-03-31T02:39:37Z
+TIMESTAMP 2023-03-31T08:39:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQmR+lfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQmnENfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCXRBAAh0ckft+BIDo4LdqQF7TMnFfD4jThqy1JDiNTCNscL6FvNnxaEf67wP0M
-D5bJx1R/WtoU/lkVDfD49wfPrZbNQHt0oPAi3CVeMkFm1OHWBQGJGS5U6+Oz2vr0
-dSwX1iezyWwgdxLaLBrHNU1/PSRIFpILjnQQHPmsPPgkUc33I802cFy7FfYBfnuc
-n58ooTq2PV6fvqmUmo8Spr8JPXJoM5AeFoYmSueoSRwqu2lek1OWycO6Y9FWXICV
-zkULwXCP7ReGGhGxK8GuYw/7nBsnEQUEXUlmnAU3isB3FoMPcP+YXwog9BIO5KZ5
-0mphKWDjK93j0o2vrqJqSIOPKbBcG8CrRSFTp2vo5ip7GVtREAj9RtrqDNQ4z6b5
-6GnfqS2PHn8YzbXYnfgkSTqDU2O+ygSBm1DFU5RciUdr8k+l9IMa9avclULlcFLJ
-wGMXNAXzje6QHZ7JYdesDkhVSRL/vC34g7WILSZfKPGVftnlUHr4hd97Zk5RWDtu
-EJwZkN7gvefm/44LhqwIXXxwQtgqgoTG0t7WcISKaPSfcfR3s386+Z8IP6a43ozQ
-1zt137PYpvesThlnUctp4OqWfFEKbEbMz2MMxXNCW+45JzmGhVZ9dJhD2+Hwjhae
-qbFgFOyvrzfHYs+LzcQDPMjQEZD7rMAqlRjcq6O9sI6ce+5yxe0=
-=OfRy
+klClpg//cvLRprQF3bvFJ2PL1+7iybo2MEZa9RYZRUGfir0LrMKCR+AuQDLajL5d
+H8nwp72z+447RLoaxbNUnfjshIXxMjLUi+hlfN8nxFCRqWE5cst6SSLC8FMhCQq7
+aoXLGI8JTnEYWoKq/YRIjNW0QeDvogR1l2UEZw7N5tVYsBjMJhk98Iuyxi8CsUbM
+6E+jE2HZWwmqqwUq1yyLtnp3BlTB5XWtvrgfFLW35BCijUyZsZ5a3PXJlPqqGzJJ
+7+ZQcgpvB9cTY4qhXVsaDPq8T2pe65BwcBW6nwUBJXIRtAtZ9pvdzQNNEuiYWCK8
+cSAMCyHcbeTckC4qBZz6/9zXvKhIUoi1McXZwg18fDqVILX/1/8fkEnNdxLxOWqd
+obpZ4WNJMl866zhXRWOkDNALicDhAry00K6e2Z9ncdLCLUeibgdExLbF8JXQzztf
+EW+BUBOvnI62GUuMwKyaNnk0c6uXhZ28KKa6gdx+TmkWDvYZj6LfvMTCFclWI1Kp
+tesNjiprQkPr8SfCwSantnViYkZJmUYtEr4VDMaeYYR7tutBaQZbldr4zHe9ZM7m
+iCIwjRns1Ef0LKsYdbO3MbnAISZDliG6wYd1id2pvGCYDCq89F3lsmyfuZgnVKbl
+ZYWUnLwgXSal0P1/Z6/u8selp3Ar/ik5YRmRNt85uLOl/395UUE=
+=1G8d
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a5b3f2a92a26..3fd564062090 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 31 Mar 2023 02:39:34 +0000
+Fri, 31 Mar 2023 08:39:28 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 9f518bb9d9c1..2d633fdbb6b0 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 d5fc3879ac18..bddbce22ab3a 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.103 b/metadata/md5-cache/app-admin/awscli-1.27.103
new file mode 100644
index 000000000000..c14cb56df2f6
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.103
@@ -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.103[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.103[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.103.tar.gz -> aws-cli-1.27.103.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-admin/clustershell-1.9.1 b/metadata/md5-cache/app-admin/clustershell-1.9.1
index 2fc1a42d0274..ff7cd98b0129 100644
--- a/metadata/md5-cache/app-admin/clustershell-1.9.1
+++ b/metadata/md5-cache/app-admin/clustershell-1.9.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/cea-hpc/clustershell/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-python/pyyaml[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[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.9.1.tar.gz -> clustershell-1.9.1.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_=c683531ff3a45ecd4b90b2f9562d3984
+_md5_=40fa7e34aa537187d7c6a095eb8e47e7
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index f8c025cc1aed..403219729893 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/redis-7.0.10 b/metadata/md5-cache/dev-db/redis-7.0.10
index 69a4b192cab1..f55cfe0ee93f 100644
--- a/metadata/md5-cache/dev-db/redis-7.0.10
+++ b/metadata/md5-cache/dev-db/redis-7.0.10
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://redis.io
 INHERIT=autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs
 IUSE=+jemalloc selinux ssl systemd tcmalloc test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD
 RDEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis selinux? ( sec-policy/selinux-redis ) virtual/tmpfiles
 REQUIRED_USE=?? ( jemalloc tcmalloc )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.redis.io/releases/redis-7.0.10.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ed0cf4eddc438f08e5fc3a8e06b4c402
+_md5_=a25c4549ae9fa27c1d54e5b3d96baaa7
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index f302668727e5..999f9f381d56 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/batik-1.16 b/metadata/md5-cache/dev-java/batik-1.16
new file mode 100644
index 000000000000..f4a5a23cc4ca
--- /dev/null
+++ b/metadata/md5-cache/dev-java/batik-1.16
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-xmlgraphics-batik ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-java/jacl:0 dev-java/rhino:1.6 dev-java/xalan:0 dev-java/xml-commons-external:1.4 dev-java/xmlgraphics-commons:2 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=XML Graphics Batik
+EAPI=8
+HOMEPAGE=https://xmlgraphics.apache.org/batik/
+INHERIT=desktop java-pkg-2 java-pkg-simple xdg-utils verify-sig
+IUSE=doc source test verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/jacl:0 dev-java/rhino:1.6 dev-java/xalan:0 dev-java/xml-commons-external:1.4 dev-java/xmlgraphics-commons:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=1.16
+SRC_URI=mirror://apache/xmlgraphics/batik/source/batik-src-1.16.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/batik/source/batik-src-1.16.tar.gz.asc )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6ed6e93fe990f2742d16ecda7bfff509
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r2 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r2
deleted file mode 100644
index 5c7224a29f68..000000000000
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=virtual/jdk:1.8 dev-java/tomcat-servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=The JavaHelp system online help system
-EAPI=8
-HOMEPAGE=https://javaee.github.io/javahelp/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=examples source
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=GPL-2-with-linking-exception
-RDEPEND=>=virtual/jre-1.4 dev-java/tomcat-servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/javaee/javahelp/archive/3ca862d8626096770598a3a256886d205246f4a4.tar.gz -> javahelp-2.0.05_p20170719.tar.gz
-_eclasses_=java-ant-2	5a1b508f2544b7cac8ec27c170676de0	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4f1b469f4907b26166c31faf1da1151c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36
deleted file mode 100644
index 7899d0d56420..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.36
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Tomcat's Servlet API 2.4/JSP API 2.0 implementation
-EAPI=7
-HOMEPAGE=https://tomcat.apache.org/
-INHERIT=java-pkg-2 java-ant-2 java-osgi
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
-SLOT=2.4
-SRC_URI=https://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz
-_eclasses_=java-ant-2	5a1b508f2544b7cac8ec27c170676de0	java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3037ebb67bccfb6c7b14f5f21f34e929
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 8ba0d00fc835..c498a8918cc5 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/ruby-2.7.8 b/metadata/md5-cache/dev-lang/ruby-2.7.8
new file mode 100644
index 000000000000..60e2af646a32
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-2.7.8
@@ -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
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( =dev-libs/openssl-1.1*:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20191222
+DESCRIPTION=An object-oriented scripting language
+EAPI=7
+HOMEPAGE=https://www.ruby-lang.org/
+INHERIT=autotools flag-o-matic
+IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby-BSD BSD-2 )
+PDEPEND=>=dev-ruby/minitest-5.13.0[ruby_targets_ruby27] >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27] >=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27] >=dev-ruby/rake-13.0.1[ruby_targets_ruby27] >=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27] virtual/rubygems[ruby_targets_ruby27] >=dev-ruby/bundler-2.1.4[ruby_targets_ruby27] >=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27] >=dev-ruby/json-2.0.2[ruby_targets_ruby27] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] ) xemacs? ( app-xemacs/ruby-modes )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( =dev-libs/openssl-1.1*:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20191222
+SLOT=2.7
+SRC_URI=https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.8.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=c03340f2396704f7e1da21ca50983f23
diff --git a/metadata/md5-cache/dev-lang/ruby-3.0.6 b/metadata/md5-cache/dev-lang/ruby-3.0.6
new file mode 100644
index 000000000000..2bc1fcb368a4
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-3.0.6
@@ -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
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( =dev-libs/openssl-1.1*:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20201225
+DESCRIPTION=An object-oriented scripting language
+EAPI=7
+HOMEPAGE=https://www.ruby-lang.org/
+INHERIT=autotools flag-o-matic
+IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby-BSD BSD-2 )
+PDEPEND=>=dev-ruby/minitest-5.14.2[ruby_targets_ruby30] >=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30] >=dev-ruby/rake-13.0.3[ruby_targets_ruby30] >=dev-ruby/rbs-1.0.0[ruby_targets_ruby30] >=dev-ruby/rexml-3.2.4[ruby_targets_ruby30] >=dev-ruby/rss-0.2.9[ruby_targets_ruby30] >=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30] >=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30] virtual/rubygems[ruby_targets_ruby30] >=dev-ruby/bundler-2.2.15[ruby_targets_ruby30] >=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30] >=dev-ruby/json-2.5.1[ruby_targets_ruby30] rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] ) xemacs? ( app-xemacs/ruby-modes )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( =dev-libs/openssl-1.1*:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20201225
+SLOT=3.0
+SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.6.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=0ae06db04aae1a5d4d9830b9f7bb8f78
diff --git a/metadata/md5-cache/dev-lang/ruby-3.1.4 b/metadata/md5-cache/dev-lang/ruby-3.1.4
new file mode 100644
index 000000000000..831192e01da7
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-3.1.4
@@ -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
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20201225
+DESCRIPTION=An object-oriented scripting language
+EAPI=8
+HOMEPAGE=https://www.ruby-lang.org/
+INHERIT=autotools flag-o-matic
+IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl static-libs systemtap tk xemacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby-BSD BSD-2 )
+PDEPEND=>=dev-ruby/minitest-5.15.0[ruby_targets_ruby31] >=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31] >=dev-ruby/rake-13.0.6[ruby_targets_ruby31] >=dev-ruby/rbs-2.1.0[ruby_targets_ruby31] >=dev-ruby/rexml-3.2.5[ruby_targets_ruby31] >=dev-ruby/rss-0.2.9[ruby_targets_ruby31] >=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31] >=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31] virtual/rubygems[ruby_targets_ruby31] >=dev-ruby/bundler-2.3.3[ruby_targets_ruby31] >=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31] >=dev-ruby/json-2.6.1[ruby_targets_ruby31] rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31] ) xemacs? ( app-xemacs/ruby-modes )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20201225
+SLOT=3.1
+SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.4.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=5134a515b8a4829c319a57adf0ed8449
diff --git a/metadata/md5-cache/dev-lang/ruby-3.2.2 b/metadata/md5-cache/dev-lang/ruby-3.2.2
new file mode 100644
index 000000000000..725323bba256
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ruby-3.2.2
@@ -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
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( >=virtual/rust-1.58.1 ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20221225
+DESCRIPTION=An object-oriented scripting language
+EAPI=8
+HOMEPAGE=https://www.ruby-lang.org/
+INHERIT=autotools flag-o-matic
+IUSE=berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl static-libs systemtap tk xemacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby-BSD BSD-2 )
+PDEPEND=>=dev-ruby/debug-1.7.1[ruby_targets_ruby32] >=dev-ruby/matrix-0.4.2[ruby_targets_ruby32] >=dev-ruby/minitest-5.16.3[ruby_targets_ruby32] >=dev-ruby/net-ftp-0.2.0[ruby_targets_ruby32] >=dev-ruby/net-imap-0.3.4[ruby_targets_ruby32] >=dev-ruby/net-pop-0.1.2[ruby_targets_ruby32] >=dev-ruby/net-smtp-0.3.3[ruby_targets_ruby32] >=dev-ruby/power_assert-2.0.3[ruby_targets_ruby32] >=dev-ruby/prime-0.1.2[ruby_targets_ruby32] >=dev-ruby/rake-13.0.6[ruby_targets_ruby32] >=dev-ruby/rbs-2.8.2[ruby_targets_ruby32] >=dev-ruby/rexml-3.2.5[ruby_targets_ruby32] >=dev-ruby/rss-0.2.9[ruby_targets_ruby32] >=dev-ruby/test-unit-3.5.7[ruby_targets_ruby32] >=dev-ruby/typeprof-0.21.3[ruby_targets_ruby32] virtual/rubygems[ruby_targets_ruby32] >=dev-ruby/bundler-2.3.3[ruby_targets_ruby32] >=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby32] >=dev-ruby/json-2.6.1[ruby_targets_ruby32] rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby32] ) xemacs? ( app-xemacs/ruby-modes )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc:= ) jit? ( >=virtual/rust-1.58.1 ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) systemtap? ( dev-util/systemtap ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml dev-libs/libffi:= sys-libs/readline:0= sys-libs/zlib virtual/libcrypt:= >=app-eselect/eselect-ruby-20221225
+SLOT=3.2
+SRC_URI=https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.2.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=a57f7a50e6eddc20ee6c4fc61cf86341
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 079d69a8b487..3b5abfc24844 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/boto3-1.26.103 b/metadata/md5-cache/dev-python/boto3-1.26.103
new file mode 100644
index 000000000000..b09d71f7a57c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.103
@@ -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.103[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.103[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.103.tar.gz -> boto3-1.26.103.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.103 b/metadata/md5-cache/dev-python/botocore-1.29.103
new file mode 100644
index 000000000000..84cbb64eebbd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.103
@@ -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.103.tar.gz -> botocore-1.29.103.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/google-auth-2.17.1 b/metadata/md5-cache/dev-python/google-auth-2.17.1
new file mode 100644
index 000000000000..4b281f46071a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-2.17.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/grpcio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyu2f[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/cachetools-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-google >=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=Google Authentication Library
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-google 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/g/google-auth/google-auth-2.17.1.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_=27ebe2524ec8c1fced64c7bfe162bfe5
diff --git a/metadata/md5-cache/dev-python/ipython-8.12.0 b/metadata/md5-cache/dev-python/ipython-8.12.0
new file mode 100644
index 000000000000..278e75ef65ff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipython-8.12.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[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/numpy-1.21[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/testpath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/backcall[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jedi-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pickleshare[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.38[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stack_data[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_9(-)?] ) >=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[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[readline,sqlite,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[readline,sqlite,threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Advanced interactive shell for Python
+EAPI=8
+HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/ https://pypi.org/project/ipython/
+INHERIT=distutils-r1 optfeature pypi virtualx
+IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+PDEPEND=notebook? ( dev-python/notebook[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/widgetsnbextension[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+RDEPEND=dev-python/backcall[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/decorator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jedi-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib-inline[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pexpect-4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pickleshare[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.38[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stack_data[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_9(-)?] ) nbconvert? ( dev-python/nbconvert[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[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[readline,sqlite,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[readline,sqlite,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/i/ipython/ipython-8.12.0.tar.gz
+_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
+_md5_=ac2233f0f05e6c41bcde59325a3c9afe
diff --git a/metadata/md5-cache/dev-python/jupyter-server-2.4.0 b/metadata/md5-cache/dev-python/jupyter-server-2.4.0
index 264afa24a92a..15bd1592c784 100644
--- a/metadata/md5-cache/dev-python/jupyter-server-2.4.0
+++ b/metadata/md5-cache/dev-python/jupyter-server-2.4.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-console-scripts[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-timeout[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(-)?] ) test? ( >=dev-python/anyio-3.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/argon2-cffi[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-7.4.4[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/jupyter-server-terminals[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_events-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.3.0[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/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-24[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/send2trash[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.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-console-scripts[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-timeout[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(-)?] ) test? ( >=dev-python/anyio-3.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/argon2-cffi[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-7.4.4[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/jupyter-server-terminals[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_events-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.3.0[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/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-24[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/send2trash[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.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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=Core services, APIs, and REST endpoints to Jupyter web applications
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-server/jupyter_server-2.4.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_=85f959cf05f4cbce63061a644bba1a9f
+_md5_=02bd896b880c79bd778c3154a7d17d6d
diff --git a/metadata/md5-cache/dev-python/jupyter-server-2.5.0 b/metadata/md5-cache/dev-python/jupyter-server-2.5.0
index 0796f4499f58..c837f541616b 100644
--- a/metadata/md5-cache/dev-python/jupyter-server-2.5.0
+++ b/metadata/md5-cache/dev-python/jupyter-server-2.5.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-console-scripts[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-timeout[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(-)?] ) test? ( >=dev-python/anyio-3.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/argon2-cffi[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-7.4.4[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/jupyter-server-terminals[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_events-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.3.0[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/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-24[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/send2trash[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.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-console-scripts[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-timeout[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(-)?] ) test? ( >=dev-python/anyio-3.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/argon2-cffi[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-7.4.4[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/jupyter-server-terminals[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_events-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.3.0[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/prometheus_client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-24[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/send2trash[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.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) 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=Core services, APIs, and REST endpoints to Jupyter web applications
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-server/jupyter_server-2.5.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_=b4fda7082b918db810045a1ba3b5c8dc
+_md5_=fe90c2e05af4fffd3f25f60f02efaa78
diff --git a/metadata/md5-cache/dev-python/jupyter-server-fileid-0.8.0 b/metadata/md5-cache/dev-python/jupyter-server-fileid-0.8.0
index a40c78dd2309..75f2ec5d7d3d 100644
--- a/metadata/md5-cache/dev-python/jupyter-server-fileid-0.8.0
+++ b/metadata/md5-cache/dev-python/jupyter-server-fileid-0.8.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest_jupyter[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/jupyter_events-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest-jupyter[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/jupyter_events-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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=An extension that maintains file IDs for documents in a running Jupyter Server
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-server-fileid/jupyter_server_fileid-0.8.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_=a527c984093ffad956b4222dd461c504
+_md5_=cc4f676fc02afd5f2adad484b836c5de
diff --git a/metadata/md5-cache/dev-python/jupyter-server-terminals-0.4.4 b/metadata/md5-cache/dev-python/jupyter-server-terminals-0.4.4
index fb71164f70ed..e1f88615f64e 100644
--- a/metadata/md5-cache/dev-python/jupyter-server-terminals-0.4.4
+++ b/metadata/md5-cache/dev-python/jupyter-server-terminals-0.4.4
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/jupyter-server[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-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/terminado[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/jupyter-server[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-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/terminado[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 Jupyter Server Extension Providing Terminals
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-server-terminals/jupyter_server_terminals-0.4.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
-_md5_=0683a56833629d0708b7aed8cca01c06
+_md5_=5cb0045e570451cf57c07521d5fc3a31
diff --git a/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.6.1 b/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.6.1
index 756df8275f70..718880d9ff90 100644
--- a/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.6.1
+++ b/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.6.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( 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/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/jupyter_ydoc-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/ypy-websocket-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-fileid-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(-)?]
+BDEPEND=test? ( 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/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/jupyter_ydoc-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/ypy-websocket-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-fileid-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(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Jupyter Server Extension Providing Y Documents
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-server-ydoc/jupyter_server_ydoc-0.6.1.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_=92703bf1f197d4eebcb22d1fcff50a9b
+_md5_=8edf20beb90b4507b785668908349f7d
diff --git a/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.8.0 b/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.8.0
index eb069a1e07ce..b64fe1b510ce 100644
--- a/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.8.0
+++ b/metadata/md5-cache/dev-python/jupyter-server-ydoc-0.8.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( 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/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/jupyter_ydoc[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ypy-websocket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server-fileid[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/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/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/jupyter_ydoc[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ypy-websocket[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server-fileid[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 Jupyter Server Extension Providing Y Documents
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-server-ydoc/jupyter_server_ydoc-0.8.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_=6b5b2601903b06e7f11ac705b2e7b661
+_md5_=11553d51cd9fa1ee813392b065705e9b
diff --git a/metadata/md5-cache/dev-python/jupyter_client-8.0.3 b/metadata/md5-cache/dev-python/jupyter_client-8.0.3
index f00495438db7..85596de24028 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-8.0.3
+++ b/metadata/md5-cache/dev-python/jupyter_client-8.0.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest_jupyter-0.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter_core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=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[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=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/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-jupyter-0.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter_core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=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[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=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=Jupyter protocol implementation and client libraries
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter_client/jupyter_client-8.0.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_=fce4a3e3c1d213bd4bcb57e89e9adcd8
+_md5_=9617bf30485afb17ed5da6ee56c86bec
diff --git a/metadata/md5-cache/dev-python/jupyter_client-8.1.0 b/metadata/md5-cache/dev-python/jupyter_client-8.1.0
index f55b89cba092..a84fc89071ca 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-8.1.0
+++ b/metadata/md5-cache/dev-python/jupyter_client-8.1.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest_jupyter-0.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter_core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=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[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=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/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-jupyter-0.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter_core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=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[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=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=Jupyter protocol implementation and client libraries
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter_client/jupyter_client-8.1.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_=d1150a05450845eaada458e716d49163
+_md5_=e4433a495656acd980cd2b0e12b7a2c2
diff --git a/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6 b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
index 4e8fa4ec0c8f..fbdedcfc1206 100644
--- a/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
+++ b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/jupyter_packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-tornasync[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(-)?] ) test? ( >=dev-python/jupyter-server-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/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=dev-python/jupyter_packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-tornasync[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(-)?] ) test? ( >=dev-python/jupyter-server-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/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=MathJax resources as a Jupyter Server Extension
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.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_=5fa660f50adf47b362f4f1ec37222def
+_md5_=1791bc74dcc9f53eb518f0ae08265151
diff --git a/metadata/md5-cache/dev-python/jupyterlab-3.5.3 b/metadata/md5-cache/dev-python/jupyterlab-3.5.3
index aaa1d495e53f..22cb325d7bae 100644
--- a/metadata/md5-cache/dev-python/jupyterlab-3.5.3
+++ b/metadata/md5-cache/dev-python/jupyterlab-3.5.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/check-manifest[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/openapi-core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openapi-spec-validator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-console-scripts[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/pytest-timeout[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/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-cache[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ipython[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/jupyter_core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs >=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/jupyter_packaging-0.12.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/check-manifest[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/openapi-core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openapi-spec-validator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-console-scripts[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/pytest-timeout[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/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-cache[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ipython[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/jupyter_core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs >=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/jupyter_packaging-0.12.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JupyterLab computational environment
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyterlab/jupyterlab-3.5.3.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_=cc896376caf91688ab55b0bca39d36f8
+_md5_=2c34bf6476a92f13c1598a3f754a8d25
diff --git a/metadata/md5-cache/dev-python/jupyterlab-3.6.1-r1 b/metadata/md5-cache/dev-python/jupyterlab-3.6.1-r1
index f6fa5efbeb92..4709f7ab690c 100644
--- a/metadata/md5-cache/dev-python/jupyterlab-3.6.1-r1
+++ b/metadata/md5-cache/dev-python/jupyterlab-3.6.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/check-manifest[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/openapi-core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openapi-spec-validator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-console-scripts[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/pytest-timeout[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/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-cache[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ipython[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/jupyter_core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/jupyter_ydoc-0.2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-ydoc-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-ydoc-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs >=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/jupyter_packaging-0.12.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/check-manifest[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/openapi-core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openapi-spec-validator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-console-scripts[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/pytest-timeout[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/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-cache[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ipython[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/jupyter_core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/jupyter_ydoc-0.2.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-ydoc-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-ydoc-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs >=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/jupyter_packaging-0.12.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JupyterLab computational environment
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab/jupyterlab-3.6.1.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_=4f8666c68c5bff0727b46a63f6febe36
+_md5_=820220d287be51c1e1d17a44baf820db
diff --git a/metadata/md5-cache/dev-python/jupyterlab-3.6.2 b/metadata/md5-cache/dev-python/jupyterlab-3.6.2
index 9ff64b0521a9..7f0b2209b9e1 100644
--- a/metadata/md5-cache/dev-python/jupyterlab-3.6.2
+++ b/metadata/md5-cache/dev-python/jupyterlab-3.6.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/check-manifest[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/openapi-core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openapi-spec-validator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-console-scripts[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/pytest-timeout[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/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-cache[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ipython[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/jupyter_core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_ydoc-0.2.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-ydoc-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs >=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/jupyter_packaging-0.12.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/check-manifest[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/openapi-core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openapi-spec-validator[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-console-scripts[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/pytest-timeout[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/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-cache[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ipython[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/jupyter_core[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyterlab-server-2.19[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_ydoc-0.2.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-ydoc-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-libs/nodejs >=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/jupyter_packaging-0.12.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JupyterLab computational environment
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab/jupyterlab-3.6.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_=7b40aaea979f9801a34f2c3a2a81b8d4
+_md5_=a4f3e4d97b39a17e501e750fd82525e1
diff --git a/metadata/md5-cache/dev-python/jupyterlab-server-2.20.0 b/metadata/md5-cache/dev-python/jupyterlab-server-2.20.0
index 804c5d05af72..92bd064b96a6 100644
--- a/metadata/md5-cache/dev-python/jupyterlab-server-2.20.0
+++ b/metadata/md5-cache/dev-python/jupyterlab-server-2.20.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-core-0.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-core-0.16.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5.1[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/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=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/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-core-0.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-core-0.16.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5.1[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/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=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=Server components for JupyterLab and JupyterLab like applications
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab-server/jupyterlab_server-2.20.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_=87da5d0474a0378ebf71b9e0ec0f9993
+_md5_=c54aa689f2b2b8aadbbe2d6e9779624b
diff --git a/metadata/md5-cache/dev-python/jupyterlab-server-2.21.0 b/metadata/md5-cache/dev-python/jupyterlab-server-2.21.0
index 757ba0728af3..542bb9eda0ba 100644
--- a/metadata/md5-cache/dev-python/jupyterlab-server-2.21.0
+++ b/metadata/md5-cache/dev-python/jupyterlab-server-2.21.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-core-0.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-core-0.16.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5.1[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/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=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/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-core-0.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-core-0.16.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5.1[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/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=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=Server components for JupyterLab and JupyterLab like applications
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab-server/jupyterlab_server-2.21.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_=87da5d0474a0378ebf71b9e0ec0f9993
+_md5_=c54aa689f2b2b8aadbbe2d6e9779624b
diff --git a/metadata/md5-cache/dev-python/nbclassic-0.5.1 b/metadata/md5-cache/dev-python/nbclassic-0.5.1
index 215ad76fc90f..15f4b556697e 100644
--- a/metadata/md5-cache/dev-python/nbclassic-0.5.1
+++ b/metadata/md5-cache/dev-python/nbclassic-0.5.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( 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/jupyter-server-1.17.0[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/notebook-7[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(-)?]
+BDEPEND=test? ( 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/jupyter-server-1.17.0[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/notebook-7[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
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbclassic/nbclassic-0.5.1.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	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=80be08a5e1cbab34b6c0d121f91a657a
+_md5_=b4dd601b36d580a8ffe2600544831d8d
diff --git a/metadata/md5-cache/dev-python/nbclassic-0.5.3-r1 b/metadata/md5-cache/dev-python/nbclassic-0.5.3-r1
index c0ee5fb456cc..a68a3f26da7f 100644
--- a/metadata/md5-cache/dev-python/nbclassic-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/nbclassic-0.5.3-r1
@@ -1,4 +1,4 @@
-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(-)?]
+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
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/nbclassic/nbclassic-0.5.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	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=12b89932f04104340efbfb0e75ef1be8
+_md5_=ee9e901e737ca94bdd578b6b79035b49
diff --git a/metadata/md5-cache/dev-python/notebook_shim-0.2.2-r1 b/metadata/md5-cache/dev-python/notebook_shim-0.2.2-r1
index bc98316eb634..c8fc26187884 100644
--- a/metadata/md5-cache/dev-python/notebook_shim-0.2.2-r1
+++ b/metadata/md5-cache/dev-python/notebook_shim-0.2.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest-tornasync[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(-)?] ) test? ( <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.8[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/pytest-tornasync[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(-)?] ) test? ( <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.8[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 shim layer for notebook traits and config
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/notebook_shim/notebook_shim-0.2.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_=cfe1da6de00bb88a44a91fba5aec7623
+_md5_=aaf5a2df5f0254862860e529734c1bca
diff --git a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.13.3 b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.13.3
new file mode 100644
index 000000000000..b99bf19aa06a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.13.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-regressions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/accessible-pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/Babel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[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/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Bootstrap-based Sphinx theme from the PyData community
+EAPI=8
+HOMEPAGE=https://github.com/pydata/pydata-sphinx-theme/ https://pypi.org/project/pydata-sphinx-theme/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD-with-disclosure
+RDEPEND=dev-python/accessible-pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/Babel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[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/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pydata/pydata-sphinx-theme/archive/v0.13.3.tar.gz -> pydata-sphinx-theme-0.13.3.gh.tar.gz https://files.pythonhosted.org/packages/py3/p/pydata-sphinx-theme/pydata_sphinx_theme-0.13.3-py3-none-any.whl
+_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_=fb6f00e251f77ef7289faeef3da6a4a9
diff --git a/metadata/md5-cache/dev-python/pytest_jupyter-0.6.2 b/metadata/md5-cache/dev-python/pytest-jupyter-0.6.2
index 7a98eef758c9..f00e0127c657 100644
--- a/metadata/md5-cache/dev-python/pytest_jupyter-0.6.2
+++ b/metadata/md5-cache/dev-python/pytest-jupyter-0.6.2
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/jupyter_client-7.4.0[python_targets_python3_9(-)?,python_ta
 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/p/pytest_jupyter/pytest_jupyter-0.6.2.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pytest-jupyter/pytest_jupyter-0.6.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_=4e81efc0e5e76c64d651690f680226d8
diff --git a/metadata/md5-cache/dev-python/pytest-jupyter-0.7.0 b/metadata/md5-cache/dev-python/pytest-jupyter-0.7.0
new file mode 100644
index 000000000000..a26fcbc54d14
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-jupyter-0.7.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter_client-7.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-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=Pytest plugin for testing Jupyter libraries and extensions
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/pytest-jupyter/ https://pypi.org/project/pytest-jupyter/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/jupyter_client-7.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.3[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/p/pytest-jupyter/pytest_jupyter-0.7.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_=40e83f7237403d616701c013fa78ef93
diff --git a/metadata/md5-cache/dev-python/stripe-5.4.0 b/metadata/md5-cache/dev-python/stripe-5.4.0
new file mode 100644
index 000000000000..8c103a7067e3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stripe-5.4.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-util/stripe-mock-0.159.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/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
+DESCRIPTION=Stripe python bindings
+EAPI=8
+HOMEPAGE=https://github.com/stripe/stripe-python/ https://pypi.org/project/stripe/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-2.20[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/s/stripe/stripe-5.4.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_=fa4591c830972f5af582e957eec31c2d
diff --git a/metadata/md5-cache/dev-python/trimesh-3.21.3 b/metadata/md5-cache/dev-python/trimesh-3.21.3
new file mode 100644
index 000000000000..f2be59b21bad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/trimesh-3.21.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mapbox_earcut[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[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/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[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/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python library for loading and using triangular meshes
+EAPI=8
+HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycollada[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyglet[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/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/svg-path[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sympy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xxhash[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sci-libs/rtree[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mikedh/trimesh/archive/3.21.3.tar.gz -> trimesh-3.21.3.gh.tar.gz
+_eclasses_=distutils-r1	761304ceeb845986696f9a65cf4b6f01	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=dc0c4c45554c3f6d26a4a5f033bd6bfb
diff --git a/metadata/md5-cache/dev-python/yamlpath-3.8.0 b/metadata/md5-cache/dev-python/yamlpath-3.8.0
new file mode 100644
index 000000000000..0e57ab2c4d76
--- /dev/null
+++ b/metadata/md5-cache/dev-python/yamlpath-3.8.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-console-scripts[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ruamel-yaml[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/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Command-line processors for YAML/JSON/Compatible data
+EAPI=8
+HOMEPAGE=https://github.com/wwkimball/yamlpath/ https://github.com/wwkimball/yamlpath/wiki
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=ISC
+RDEPEND=dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/wwkimball/yamlpath/archive/v3.8.0.tar.gz -> yamlpath-3.8.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_=ff3aa30320f6a5f1c914cb611f64700c
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index d712e5d590e3..a6c1fcd21b85 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/shoulda-context-1.2.2-r1 b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
index f8d96ad78f65..1dcb9e480558 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.2-r1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby27(-)] <dev-ruby/mocha-1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby30(-)] <dev-ruby/mocha-1[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/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby27(-)] <dev-ruby/mocha-1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby30(-)] <dev-ruby/mocha-1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby31(-)] <dev-ruby/mocha-1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Context framework extracted from Shoulda
 EAPI=7
 HOMEPAGE=https://github.com/thoughtbot/shoulda-context
 INHERIT=ruby-fakegem
-IUSE=doc test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=doc test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~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 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/shoulda-context-1.2.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b13e429f9c1245f921ab8f34a4f3a485
+_md5_=4536ca1490e8154bea6e106b3fa4f65a
diff --git a/metadata/md5-cache/dev-ruby/time-0.2.2 b/metadata/md5-cache/dev-ruby/time-0.2.2
new file mode 100644
index 000000000000..7f2588f008ca
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/time-0.2.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/date[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/date[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/date[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/date[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+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_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Extends the Time class with methods for parsing and conversion
+EAPI=8
+HOMEPAGE=https://github.com/ruby/time
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/date[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/date[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/date[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( dev-ruby/date[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/time/archive/v0.2.2.tar.gz -> time-0.2.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	b3d68f90713fe925c1833722c17f6ef8	ruby-ng	e68c3e575d599044297cb3253a2566d7	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=2ba0ba0375f82f53f09cfdf91f2ea25a
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index e0876942c06f..805999831480 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/snes9x-1.62.3 b/metadata/md5-cache/games-emulation/snes9x-1.62.3
new file mode 100644
index 000000000000..5485d03bc7e8
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/snes9x-1.62.3
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig gui? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/libpng:= sys-libs/zlib:=[minizip] x11-libs/libX11 x11-libs/libXext alsa? ( media-libs/alsa-lib ) gui? ( dev-cpp/cairomm:0 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0[wayland?] dev-libs/glib:2 dev-libs/libsigc++:2 media-libs/libepoxy media-libs/libsdl2[joystick] x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/libXrandr portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) wayland? ( dev-libs/wayland ) ) libretro? ( !games-emulation/libretro-snes9x ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) x11-base/xorg-proto
+DESCRIPTION=Super Nintendo Entertainment System (SNES) emulator
+EAPI=8
+HOMEPAGE=https://github.com/snes9xgit/snes9x/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools cmake flag-o-matic python-any-r1 toolchain-funcs xdg
+IUSE=alsa debug gui libretro netplay oss portaudio pulseaudio wayland xinerama +xv
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB gui? ( Apache-2.0 CC0-1.0 BSD )
+RDEPEND=media-libs/libpng:= sys-libs/zlib:=[minizip] x11-libs/libX11 x11-libs/libXext alsa? ( media-libs/alsa-lib ) gui? ( dev-cpp/cairomm:0 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0[wayland?] dev-libs/glib:2 dev-libs/libsigc++:2 media-libs/libepoxy media-libs/libsdl2[joystick] x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/libXrandr portaudio? ( media-libs/portaudio ) pulseaudio? ( media-libs/libpulse ) wayland? ( dev-libs/wayland ) ) libretro? ( !games-emulation/libretro-snes9x ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv )
+RESTRICT=bindist
+SLOT=0
+SRC_URI=https://github.com/snes9xgit/snes9x/archive/1.62.3.tar.gz -> snes9x-1.62.3.tar.gz gui? ( https://github.com/KhronosGroup/glslang/archive/6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7.tar.gz -> glslang-6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/4e2fdb25671c742a9fbe93a6034eb1542244c7e1.tar.gz -> spirv-cross-4e2fdb25671c742a9fbe93a6034eb1542244c7e1.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2.tar.gz -> vulkan-headers-a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2.tar.gz )
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e9ae0dd7e0e072817a628a4972e94bba
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index c18fc3c8d8bc..8fea7451c18b 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/opensmtpd-6.8.0_p2-r2 b/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r2
index f01491bdf310..b361e3187428 100644
--- a/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r2
+++ b/metadata/md5-cache/mail-mta/opensmtpd-6.8.0_p2-r2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=app-alternatives/yacc virtual/pkgconfig
 DEFINED_PHASES=configure install
 DEPEND=acct-user/smtpd acct-user/smtpq <dev-libs/openssl-3:= elibc_musl? ( sys-libs/fts-standalone ) sys-libs/zlib pam? ( sys-libs/pam ) berkdb? ( sys-libs/db:= ) dev-libs/libevent:= app-misc/ca-certificates net-mail/mailbase net-libs/libasr virtual/libcrypt:= !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
 DESCRIPTION=Lightweight but featured SMTP daemon from OpenBSD
@@ -12,4 +12,4 @@ RDEPEND=acct-user/smtpd acct-user/smtpq <dev-libs/openssl-3:= elibc_musl? ( sys-
 SLOT=0
 SRC_URI=https://www.opensmtpd.org/archives/opensmtpd-6.8.0p2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	pam	4efe951aa8ce2c16288d7c915196fe29	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5aac3d7d6c2124c3b516decec4fb75f1
+_md5_=cfe5dfd136804e8c9208478fb6181517
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index fb37ac615d86..aa207358729d 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r11 b/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r11
index 2d1fd109e82f..93e6ecc17318 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r11
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r11
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0ae67cc60a05308e5e9db2632e425c94
+_md5_=6c365255c48a3b28fb19d5ccc1dcda78
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index c69ea082f5d9..958171c3750f 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/qtractor-0.9.32 b/metadata/md5-cache/media-sound/qtractor-0.9.33
index f09104ab857a..5a185192b76d 100644
--- a/metadata/md5-cache/media-sound/qtractor-0.9.32
+++ b/metadata/md5-cache/media-sound/qtractor-0.9.33
@@ -12,6 +12,6 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/libsndfile media-libs/lilv media-libs/lv2 media-libs/suil virtual/jack x11-libs/libxcb:= aubio? ( media-libs/aubio:= ) dssi? ( media-libs/dssi ) ladspa? ( media-libs/ladspa-sdk ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=dssi? ( ladspa )
 SLOT=0
-SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.32.tar.gz
+SRC_URI=mirror://sourceforge/qtractor/qtractor-0.9.33.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9329b8c4755299cf223de9f9218515f8
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 984d580d09d7..baa3c4a10539 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/tigervnc-1.12.0-r7 b/metadata/md5-cache/net-misc/tigervnc-1.12.0-r7
deleted file mode 100644
index abbe5615611b..000000000000
--- a/metadata/md5-cache/net-misc/tigervnc-1.12.0-r7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) 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 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/fltk:1 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) ) drm? ( x11-libs/libdrm ) server? ( media-fonts/font-util x11-base/xorg-proto x11-libs/libxcvt x11-libs/libxkbfile x11-misc/util-macros opengl? ( media-libs/mesa ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Remote desktop viewer display system
-EAPI=7
-HOMEPAGE=https://tigervnc.org
-INHERIT=autotools cmake eapi8-dosym flag-o-matic java-pkg-opt-2 optfeature systemd xdg
-IUSE=dri3 +drm gnutls java nls +opengl +server xinerama java
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/fltk:1 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) ) java? ( virtual/jre:1.8 ) server? ( dev-lang/perl sys-process/psmisc ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=dri3? ( drm ) opengl? ( server )
-SLOT=0
-SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.12.0.tar.gz -> tigervnc-1.12.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.1.tar.xz https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch -> tigervnc-1.12.0-xserver-21.patch )
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	cmake	7fb5980de96325cbab639f5b2187357c	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4ef459ebd20b0b45ce7d01d45968e964
diff --git a/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.0 b/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.0
deleted file mode 100644
index f818ff1f5a86..000000000000
--- a/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Metapackage for the xorg module provided by tigervnc
-EAPI=8
-HOMEPAGE=https://tigervnc.org/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
-LICENSE=metapackage
-RDEPEND=~net-misc/tigervnc-1.12.0[server] =x11-base/xorg-server-21.1*
-SLOT=0
-_md5_=69e14a97ed148c710a66b4acdf1eb58c
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index dbe73d7c1ad3..6b7bb0a2f300 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-apache-xmlgraphics-batik-20170410 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-xmlgraphics-batik-20170410
new file mode 100644
index 000000000000..98acaa16f8e7
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-xmlgraphics-batik-20170410
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by xmlgraphics.apache.org/batik
+EAPI=8
+HOMEPAGE=https://xmlgraphics.apache.org/batik/download.html
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://downloads.apache.org/xmlgraphics/batik/KEYS -> openpgp-keys-apache-xmlgraphics-batik-20170410-KEYS.asc
+_md5_=64d9f42df290b7b7dd039fc646c9a366
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 3b69e5d7d494..d73c17c9f861 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/libeatmydata-131 b/metadata/md5-cache/sys-fs/libeatmydata-131
index 1f154f382ce9..4d373710691f 100644
--- a/metadata/md5-cache/sys-fs/libeatmydata-131
+++ b/metadata/md5-cache/sys-fs/libeatmydata-131
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.flamingspork.com/projects/libeatmydata/
 INHERIT=multilib-minimal
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~hppa ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ~x86
 LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stewartsmith/libeatmydata/releases/download/v131/libeatmydata-131.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=99d9872f6f66cbe01dcece09eba61d97
+_md5_=f1a69084db7b1a748863c17b8655bc61
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 7aa306c4bdcc..fb5dfd8dfc14 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.38.6 b/metadata/md5-cache/www-apps/mediawiki-1.38.6
new file mode 100644
index 000000000000..450061111ca1
--- /dev/null
+++ b/metadata/md5-cache/www-apps/mediawiki-1.38.6
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install postinst prerm setup unpack
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=The MediaWiki wiki web application (as used on wikipedia.org)
+EAPI=8
+HOMEPAGE=http://www.mediawiki.org
+INHERIT=webapp
+IUSE=imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/php-7.3.19[calendar,ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) mysql? ( dev-lang/php[mysql,mysqli] ) sqlite? ( dev-db/sqlite[fts3(+)] dev-lang/php[pdo,sqlite] ) virtual/httpd-php app-admin/webapp-config
+REQUIRED_USE=|| ( mysql postgres sqlite )
+RESTRICT=test
+SLOT=1.38.6
+SRC_URI=http://releases.wikimedia.org/mediawiki/1.38/mediawiki-1.38.6.tar.gz
+_eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=923b84e3f9c1a3644367439ecf855235
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.39.3 b/metadata/md5-cache/www-apps/mediawiki-1.39.3
new file mode 100644
index 000000000000..ec91c4270b55
--- /dev/null
+++ b/metadata/md5-cache/www-apps/mediawiki-1.39.3
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install postinst prerm setup unpack
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=The MediaWiki wiki web application (as used on wikipedia.org)
+EAPI=8
+HOMEPAGE=http://www.mediawiki.org
+INHERIT=webapp
+IUSE=imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[calendar,ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) mysql? ( dev-lang/php[mysql,mysqli] ) sqlite? ( dev-db/sqlite[fts3(+)] dev-lang/php[pdo,sqlite] ) virtual/httpd-php app-admin/webapp-config
+REQUIRED_USE=|| ( mysql postgres sqlite )
+RESTRICT=test
+SLOT=1.39.3
+SRC_URI=http://releases.wikimedia.org/mediawiki/1.39/mediawiki-1.39.3.tar.gz
+_eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=9791e692802a8aa56fbd189a21b3d017
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index a7c637b54ad4..406cd8026220 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/firefox-111.0 b/metadata/md5-cache/www-client/firefox-111.0
index 5046197652ea..d148be2eff7e 100644
--- a/metadata/md5-cache/www-client/firefox-111.0
+++ b/metadata/md5-cache/www-client/firefox-111.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.mozilla.com/firefox
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
 IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi +X geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_fur l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=!www-client/firefox:0 !www-client/firefox:esr screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.88 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-72.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] )
 REQUIRED_USE=|| ( X wayland ) debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus )
 SLOT=rapid
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/111.0/source/firefox-111.0.source.tar.xz -> firefox-111.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-111-patches-01j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-111-patches-01j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-111-patches-01j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/af.xpi -> firefox-111.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ar.xpi -> firefox-111.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ast.xpi -> firefox-111.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/be.xpi -> firefox-111.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/bg.xpi -> firefox-111.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/br.xpi -> firefox-111.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ca.xpi -> firefox-111.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/cak.xpi -> firefox-111.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/cs.xpi -> firefox-111.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/cy.xpi -> firefox-111.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/da.xpi -> firefox-111.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/de.xpi -> firefox-111.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/dsb.xpi -> firefox-111.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/el.xpi -> firefox-111.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/en-CA.xpi -> firefox-111.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/en-GB.xpi -> firefox-111.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/es-AR.xpi -> firefox-111.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/es-ES.xpi -> firefox-111.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/et.xpi -> firefox-111.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/eu.xpi -> firefox-111.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/fi.xpi -> firefox-111.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/fr.xpi -> firefox-111.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-111.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-111.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/gd.xpi -> firefox-111.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/gl.xpi -> firefox-111.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/he.xpi -> firefox-111.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/hr.xpi -> firefox-111.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/hsb.xpi -> firefox-111.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/hu.xpi -> firefox-111.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/id.xpi -> firefox-111.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/is.xpi -> firefox-111.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/it.xpi -> firefox-111.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ja.xpi -> firefox-111.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ka.xpi -> firefox-111.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/kab.xpi -> firefox-111.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/kk.xpi -> firefox-111.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ko.xpi -> firefox-111.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/lt.xpi -> firefox-111.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/lv.xpi -> firefox-111.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ms.xpi -> firefox-111.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-111.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/nl.xpi -> firefox-111.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-111.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-111.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/pl.xpi -> firefox-111.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-111.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-111.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/rm.xpi -> firefox-111.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ro.xpi -> firefox-111.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ru.xpi -> firefox-111.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/sk.xpi -> firefox-111.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/sl.xpi -> firefox-111.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/sq.xpi -> firefox-111.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/sr.xpi -> firefox-111.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-111.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/th.xpi -> firefox-111.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/tr.xpi -> firefox-111.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/uk.xpi -> firefox-111.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/uz.xpi -> firefox-111.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/vi.xpi -> firefox-111.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-111.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-111.0-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ach.xpi -> firefox-111.0-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/an.xpi -> firefox-111.0-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/az.xpi -> firefox-111.0-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/bn.xpi -> firefox-111.0-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/bs.xpi -> firefox-111.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-111.0-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/eo.xpi -> firefox-111.0-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/es-CL.xpi -> firefox-111.0-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/es-MX.xpi -> firefox-111.0-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/fa.xpi -> firefox-111.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ff.xpi -> firefox-111.0-ff.xpi ) l10n_fur? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/fur.xpi -> firefox-111.0-fur.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/gn.xpi -> firefox-111.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-111.0-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-111.0-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-111.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ia.xpi -> firefox-111.0-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/km.xpi -> firefox-111.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/kn.xpi -> firefox-111.0-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/lij.xpi -> firefox-111.0-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/mk.xpi -> firefox-111.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/mr.xpi -> firefox-111.0-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/my.xpi -> firefox-111.0-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-111.0-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/oc.xpi -> firefox-111.0-oc.xpi ) l10n_sc? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/sc.xpi -> firefox-111.0-sc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/sco.xpi -> firefox-111.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/si.xpi -> firefox-111.0-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/son.xpi -> firefox-111.0-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/szl.xpi -> firefox-111.0-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ta.xpi -> firefox-111.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/te.xpi -> firefox-111.0-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/tl.xpi -> firefox-111.0-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/trs.xpi -> firefox-111.0-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/ur.xpi -> firefox-111.0-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/111.0/linux-x86_64/xpi/xh.xpi -> firefox-111.0-xh.xpi )
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bc15bba40410c32c3d8ceba0124c04c9
+_md5_=7cda7480e13ab6b6b9ac93250d2b6874
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index ef386fb8ca98..97845ccd4ec7 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15147 BLAKE2B 2c4c571707fdb227917c89e9b9afd066ef57a4c4a5733f9e0bd312bde898ad2c787e5fdd95390bbe65e3042ef30a31dc1ffc0259d39d9264056c7ee69c430e1b SHA512 f7881b725be5eaf311afb8ce8a9e58e914a0a5ecccd11d1711d85d5764d380c44bf0c932faab0700ad330cc79871007b2877ef7a19ddc143a6e3db99bde6afaf
-TIMESTAMP 2023-03-31T02:39:37Z
+TIMESTAMP 2023-03-31T08:39:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQmR+lfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQmnENfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCvRA//deC6w4lcR7ZJInlEQcGXBJZb34AtnwMD/hb63UXwvx71iTebcvEkDZMD
-5pwq85ANaC3z8/ieAAkK7LjFun93FIibO3lF5hOaUfZAYVk6opI9QaQFxRB5AQQW
-eLJs0xzx6uWscH32IUqCFrK3d4t7VppWSJykICqFOETmMQH+0CHqV2JPeZfzHZ1H
-exr8KiHDZ84R2BpovvTSx0QLOw5ZZKqjsVl0xaK0PYOskF5pCkzu/8cxlE2TP7eq
-B3iq5HaEL/lNliuq43Nva38cqwdLCfQUe8F2ikg8qElrO5Gcct3wDToLTUx/ifVy
-SozVbkAirt7PwBgEvlBSTvc0YXkjEF/Iq4EVKCd8zZA2yqFpPMwWADDltNdHcYYv
-2Rvxb2w+cEocsnFtRFX9/koS6gNlNix50Fn63anl6TLg030FYmmAufRXmzYnQCeQ
-M31Mm4t4j4AKVLtXWZ8h+xd74D3esX1gjt5kxJ3vE9ZCdnIn8vIvnhrXYY5ybejw
-ASq7C1g14F0xFUSbVIXb3NhR+knNUOCDjAXK8tRlfoMfqlhW8KoLxhPldPNXCl+k
-iZ0YHtj/x1CkShjt7A5xa3mN5kjWbh+P+VrwWsXDtiytbblItBmCNZ0Ow1EeI9F7
-YcM1xNcFisgKRYuGhxI4FKt6fjKGflBgwANLBQRxf7ih7eO7488=
-=fLsn
+klB2YRAAklZusf6yBGGPn75ltcTCT2QGaBSYZXkQ4BuwIIc+tDXjo2maOR9tqP6f
+aIJdHemHZqfP4YCeOrLPxebbW7APq9xl8pHyaMTG4wf+jphkyuL7AoglrMXBYfCD
+u/U5O1fl46120vcnS78VrIxKG52T3LJE/fQfwIp5SNN0uugi8sxPh0/rS98zupKE
+sF4cBEZAKes+L8TfaFtZh9+/9AIZneNugZ3CXVeGgoh6qBGVqU1EBGsptO+2Uzie
+BdXHzfRHIrhcF2eVuniz+Mm6uK9MDxss3BjT3rUx+uECbSExLSD3zBzf1z1amRe0
+5tbPUil+vDrYP7j6NIu7t74zOBXiXI/ulh7hessT1XaYWo9L2Zq92zq8WALXPG2l
+KSC4TAkzWawFd+iElYInljMMtuWRqI4ZMPvK/rj4hJRSMUVtiXcwk3s9hM9MbDvA
+n24CzkbtlvfnUdNd2yzzd6ZyZ7xml/1beH65AzXjMKmbnVcmTAp9x/+wDlHCEOlT
+TA0o1eCtQl1roq+R/BGY2lY6HASGCoY0knsFI8QN3TK55p2NJCZeypmP2hc53lxO
+PlDQN+Z55SlAL4MKLQ+pOhGBGNReOJLLHNEoxLUCpP+WxNT2KeuEOn6ayemNttNM
+uQZTg2yHRFrRiZPr+8E1x7os9WI2TEI3PZ5XbxPeKBA16IVoyaQ=
+=LQSe
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a5b3f2a92a26..3fd564062090 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 31 Mar 2023 02:39:34 +0000
+Fri, 31 Mar 2023 08:39:28 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 905b52cb7f67..21eeb8894a8d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Mar 31 02:39:34 AM UTC 2023
+Fri Mar 31 08:39:28 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 15acb52d4d07..3a8b79ce230b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 31 Mar 2023 02:45:01 +0000
+Fri, 31 Mar 2023 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2c86901d09b7..3d5be45a228d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f56ef7fb9885a65550a3dacee0f4649e699a1cc1 1680226359 2023-03-31T01:32:39+00:00
+0af85dead3893c7007f9b80b63fd3f570d778d94 1680248999 2023-03-31T07:49:59+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e7c540c79a1b..6b612a13d1fb 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1680230402 Fri 31 Mar 2023 02:40:02 AM UTC
+1680252002 Fri 31 Mar 2023 08:40:02 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a5b3f2a92a26..3fd564062090 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 31 Mar 2023 02:39:34 +0000
+Fri, 31 Mar 2023 08:39:28 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e147d4914a63..511cde6d4649 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
index 13b9db79727d..9e362c252a4f 100644
--- a/net-misc/tigervnc-xorg-module/Manifest
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -1,4 +1,3 @@
-EBUILD tigervnc-xorg-module-1.12.0.ebuild 452 BLAKE2B 97f1a04d5c7610ca254d4aed5270a4996267ff538f2f8205da49a407eefab3ac44c970b34e970918709c10dcd06b1b1abb1459d6dd00a02450470bef51228922 SHA512 1ce2c3fcadba4316bfab72882eed619576ea38a404499c4506e61a0952b2dc786cf9dcdfa4739e283724bc3f9595cd1ecc318de9d52d0824348f645d904892c2
 EBUILD tigervnc-xorg-module-1.13.0.ebuild 452 BLAKE2B 97f1a04d5c7610ca254d4aed5270a4996267ff538f2f8205da49a407eefab3ac44c970b34e970918709c10dcd06b1b1abb1459d6dd00a02450470bef51228922 SHA512 1ce2c3fcadba4316bfab72882eed619576ea38a404499c4506e61a0952b2dc786cf9dcdfa4739e283724bc3f9595cd1ecc318de9d52d0824348f645d904892c2
 EBUILD tigervnc-xorg-module-1.13.1.ebuild 457 BLAKE2B d140db31d7fc14436d0577b9d6c5dc76f944cc085e546f6ab241d30292bf90e43715c5c8c0a9257ecb642957d60076384b93495d9a3042e693351364ff29c398 SHA512 89d7c67336ba9aef161d18a5a5210ad67dead62257b2de1f295455120fd15de472e62593fa005954cad38123ab3c91ac1337f77d96379cdbf9c7eb94a4721ddc
 MISC metadata.xml 331 BLAKE2B a429af641beadf65a9af48b70d47442530df38a6653daa75a67bae2f86dafe206ee745086336ef10af5e1d11ed6df08c017a99e2f434c0d8015549e78c8825f2 SHA512 dca884d6e2edf72771b5062195aa3d379ded3d0b9c74f9f7bd4c6f5ae432128e93d53c8b24bcfe76963b9705be325668edab703cd2f8724123b1c70fda59c786
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
deleted file mode 100644
index 48f881ebf961..000000000000
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XSERVER_VERSION="21.1.1"
-
-DESCRIPTION="Metapackage for the xorg module provided by tigervnc"
-HOMEPAGE="https://tigervnc.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	~net-misc/tigervnc-${PV}[server]
-	=x11-base/xorg-server-${XSERVER_VERSION%.*}*
-"
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index de000c3dbc52..e398b9037691 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,17 +1,12 @@
 AUX tigervnc-1.11.0-install-java-viewer.patch 788 BLAKE2B b3da744d21030bf988dc21bca66a17811b1180ad89fcbc6e3ca8b70b8803c284456cc14393dddf5f2f395d9044d90e8ac8ee50d155be7779b08c14d7bbcb270b SHA512 5f9650a6f8589ab952506cbf6a67f603fc720a70dd76a505da69812c039fb9a0a4137c9667ce11e253a35bade056a18d2fa584ac23cda8111ff1fe17e90f025a
-AUX tigervnc-1.12.0-disable-server-and-pam.patch 1430 BLAKE2B 9b079911be8f70239df32432d8c4d9b9e88329585ef4fe5c4f847697d9cecf7fa9c7dd9fa6251bb02794e3bfcbfaf7c3f963875b519a07e824e72bbfeb7a61ec SHA512 f0546476060673bd65138c4c95f0fd2b72e64175c461c0bbe07dfc03a1c1d343b8d628fd8f9bfa1329bd7585d8aa18b8b6a9d4d519d4f3faaf284f3a914f98ca
-AUX tigervnc-1.12.0-xorg-1.21.patch 1756 BLAKE2B c872216f03b595f61e91d876546c573ed572b20e9ead1e4ded7d830c739dc172a016784902d447dbe8aa78bb5a2e69c4ef6a4357f446af53f7bc569d56108dac SHA512 533ff06e9619cd63ee83dcb3e6a5a35f02f092b32b194f89e2c06f2f17aaf59a3c2adab27d3e87c4a0773f3f82cfec82492d6b031b3a9050d5f0ad4fcf0a0da0
 AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d5b4a013af8bd4f9bbf9de4afbf21482fc62cbe1d57cc0274c5810588177db17b6cf1c69f5336e40cd3ccdefe0fa21bb1f736 SHA512 916e4f114834bcd4ccb2375ce35f7b36ad13496599e1a8aa736edf31627cd95eaab8b29e0fb9cfb07aa56856b2defbf916c23218debe1d62522d8dbac8674f38
 AUX tigervnc-1.12.0.confd 665 BLAKE2B 1525706e3e60727ed0f3eeb0dcfc849ea2b92463d9c4bff09eb9e644e51aa7665ff96d0f0c5ec321014145f8227d7c7b94578a97d948bfc94cacbc4087ebc184 SHA512 bced660d691f559ab9392aef7ea0040ea5f435d7f1cfef9b82983395c10103b8607e90a03de67d330371d641bf249ec61200b9d28d48600f7548978b7ee367c6
 AUX tigervnc-1.12.0.initd 2149 BLAKE2B 7d7389128816ad07ba0890d57c113834fc325b00729a5e3979dca5c25e9940690aab9e10d7e6a94a8645002cc15dcbd54137636b373c99f86454a5873870ed72 SHA512 c1047acf1211c4073a4581d5bfe78dec00320e0749b44608224cc478ac335233cd7beacbd161f61330fe28c2a6fa8de137b2c80e9ebda9d92f90b062f489eecb
 AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a189e3b3aba7e88e41d2325e79147de7a5e0a414aff2583ac0bda1de7e372b907527177612eaeb2462294dbf578f5342701e9d274f09e4f78 SHA512 ec1fa15f70ff508636c02cf3b945b7e372fb391c674e47c6c0cbfc871400a3fc6f0847dae62cf7eb5d56afae121b9aec8d19359319ca0e7e04df03b3bec3cc5e
 AUX tigervnc-1.13.80-depend-po-files.patch 1590 BLAKE2B d1dea3c951cd636124927a1735482b94cfbc41ffc570c7a1dd82ec953fb02f7e593c542a761177d4714903e3b55d69877475b76548cd7e7b61065485e874dc19 SHA512 35d54da0c95f6c42c6a241f49988439dee2b754ac7d1d79c7616032a854d6197acc04c7857d4559c6947f14b2f0703735294146b002a36f49c4acb171511cb75
-DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
-DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
 DIST tigervnc-1.13.0.tar.gz 1986759 BLAKE2B 675284b854e9ce4c328ed5dcc0d22a57f380a3abe1837451bae09d6c03e91fa9e4b0d06f49ade1ba6924bffdc3cc85c5c9b28c594dbc0d0ffeb0aa23e5299f6d SHA512 55936f075ec64880f4b3e9a803f17761abd4c111392ff0fd5289161cd981acae0b57adf26f768db50162e8d7bfd9666686b8d4ac5fc3389c6f9319df16b90be8
 DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
-EBUILD tigervnc-1.12.0-r7.ebuild 4722 BLAKE2B a311bc7e557bf9576c34ec1f5da32f414bfd270105f086e5917bcb126fbbd77f29681a42010713628a2b611155f40ddcb48db377130c7c989144fb48598f9b51 SHA512 1182eed80fcd13c01ffc7a267f0dc91858a730ac9f57e3edd94d78db15638ace8ddc98af239292d8384c86e29849681251341f07d5fc90d7ecb1308ae1d7f1dc
 EBUILD tigervnc-1.13.0.ebuild 5283 BLAKE2B 1e019a6ed98be9dfcbba682d9e86277a6f0a2c65ae01b40f530e487723ff353a58a9d96c86c97a6f091617c0bd1317bf4f98b8659910d4e103dd22d45d8504d1 SHA512 a2985fed7f368b90c513fe6a9f53e1317d0c6820644982c64ebced4ddd711166229794fed5a93b391c80eb6487c9584bffe01c5d69bc75d58ca6f100bced2030
 EBUILD tigervnc-1.13.1.ebuild 5288 BLAKE2B 4ce90fc20c2e9f93f30e369f315b65fb5b750c3818bf9cd9cea32276f869d0a303a00087f55dcba5d340bbdb6e99bac4ef563a3958f156970e6638190ae17a9f SHA512 c72a5f56201d1f60f47652e5557bd6317529f41702bcf02b201687905f7e5331240c3b434450031ce338f345d9e8c109c26ca677c02aebbd51e8c5cd8c2f25ac
 EBUILD tigervnc-9999.ebuild 5288 BLAKE2B 4ce90fc20c2e9f93f30e369f315b65fb5b750c3818bf9cd9cea32276f869d0a303a00087f55dcba5d340bbdb6e99bac4ef563a3958f156970e6638190ae17a9f SHA512 c72a5f56201d1f60f47652e5557bd6317529f41702bcf02b201687905f7e5331240c3b434450031ce338f345d9e8c109c26ca677c02aebbd51e8c5cd8c2f25ac
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
deleted file mode 100644
index 5ae07007d467..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-See https://bugs.gentoo.org/852830
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -234,6 +234,7 @@
-   add_subdirectory(java)
- endif()
- 
-+option(BUILD_SERVER "Build TigerVNC server" ON)
- option(BUILD_VIEWER "Build TigerVNC viewer" ON)
- if(BUILD_VIEWER)
-   # Check for FLTK
-@@ -276,7 +277,7 @@
- endif()
- 
- # Check for PAM library
--if(UNIX AND NOT APPLE)
-+if(BUILD_SERVER AND UNIX AND NOT APPLE)
-   check_include_files(security/pam_appl.h HAVE_PAM_H)
-   set(CMAKE_REQUIRED_LIBRARIES -lpam)
-   check_function_exists(pam_start HAVE_PAM_START)
-@@ -315,9 +316,6 @@
-   add_subdirectory(media)
- endif()
- 
--add_subdirectory(tests)
--
--
- if(BUILD_VIEWER)
-   add_subdirectory(release)
- endif()
---- a/common/rfb/CMakeLists.txt
-+++ b/common/rfb/CMakeLists.txt
-@@ -75,7 +75,7 @@
- 
- set(RFB_LIBRARIES ${JPEG_LIBRARIES} ${PIXMAN_LIBRARY} os rdr)
- 
--if(UNIX AND NOT APPLE)
-+if(BUILD_SERVER AND UNIX AND NOT APPLE)
-   set(RFB_SOURCES ${RFB_SOURCES} UnixPasswordValidator.cxx
-     UnixPasswordValidator.h pam.c pam.h)
-   set(RFB_LIBRARIES ${RFB_LIBRARIES} ${PAM_LIBS})
---- a/unix/CMakeLists.txt
-+++ b/unix/CMakeLists.txt
-@@ -1,6 +1,8 @@
- add_subdirectory(tx)
- add_subdirectory(common)
--add_subdirectory(vncconfig)
--add_subdirectory(vncpasswd)
--add_subdirectory(vncserver)
--add_subdirectory(x0vncserver)
-+if(BUILD_SERVER)
-+	add_subdirectory(vncconfig)
-+	add_subdirectory(vncpasswd)
-+	add_subdirectory(vncserver)
-+	add_subdirectory(x0vncserver)
-+endif()
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch
deleted file mode 100644
index c3e003d328a6..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://github.com/TigerVNC/tigervnc/commit/736b50d04e1ba965696cd15d456dc2b7fc123150.patch
-https://github.com/TigerVNC/tigervnc/commit/f2577107f7f55382c524d8c738a777e5cdd80f60.patch
-
-From: Joakim Tjernlund <joakim.tjernlund@infinera.com>
-Date: Wed, 24 Nov 2021 21:09:36 +0100
-Subject: [PATCH] xorg-version.h: Increase supported Xorg version to 1.21
-
---- a/unix/xserver/hw/vnc/xorg-version.h
-+++ b/unix/xserver/hw/vnc/xorg-version.h
-@@ -33,8 +33,8 @@
- #error "X.Org older than 1.16 is not supported"
- #endif
- 
--#if XORG_AT_LEAST(1, 21, 0)
--#error "X.Org newer than 1.20 is not supported"
-+#if XORG_AT_LEAST(1, 22, 0)
-+#error "X.Org newer than 1.21 is not supported"
- #endif
- 
- #endif
-
-From: Joakim Tjernlund <joakim.tjernlund@infinera.com>
-Date: Wed, 24 Nov 2021 21:10:56 +0100
-Subject: [PATCH] xvnc: adapt for 1.21
-
-VENDOR_STRING is gone as is DEFAULT_LOG_VERBOSITY
-site.h has been removed and is not needed.
---- a/unix/xserver/hw/vnc/xvnc.c
-+++ b/unix/xserver/hw/vnc/xvnc.c
-@@ -69,7 +69,6 @@ extern char buildtime[];
- #undef VENDOR_RELEASE
- #undef VENDOR_STRING
- #include "version-config.h"
--#include "site.h"
- 
- #define XVNCVERSION "TigerVNC 1.12.80"
- #define XVNCCOPYRIGHT ("Copyright (C) 1999-2021 TigerVNC Team and many others (see README.rst)\n" \
-@@ -111,14 +110,13 @@ static Bool Render = TRUE;
- static Bool displaySpecified = FALSE;
- static char displayNumStr[16];
- 
--static int vncVerbose = DEFAULT_LOG_VERBOSITY;
-+static int vncVerbose = 0;
- 
- static void
- vncPrintBanner(void)
- {
-     ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT);
--    ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE,
--           VENDOR_STRING);
-+    ErrorF("Underlying X server release %d\n\n", VENDOR_RELEASE);
- }
- 
- static void
-
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
deleted file mode 100644
index 4f68a5bed85a..000000000000
--- a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake eapi8-dosym flag-o-matic java-pkg-opt-2 optfeature systemd xdg
-
-XSERVER_VERSION="21.1.1"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="https://tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	server? (
-		ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz
-		https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch -> ${P}-xserver-21.patch
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
-REQUIRED_USE="
-	dri3? ( drm )
-	opengl? ( server )
-"
-
-CDEPEND="
-	media-libs/libjpeg-turbo:=
-	sys-libs/zlib:=
-	x11-libs/fltk:1
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/pixman
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	server? (
-		dev-libs/libbsd
-		dev-libs/openssl:0=
-		sys-libs/pam
-		x11-libs/libXau
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXfixes
-		x11-libs/libXfont2
-		x11-libs/libXtst
-		x11-libs/pixman
-		x11-libs/xtrans
-		x11-apps/xauth
-		x11-apps/xinit
-		x11-apps/xkbcomp
-		x11-apps/xsetroot
-		x11-misc/xkeyboard-config
-		opengl? ( media-libs/libglvnd[X] )
-	)
-	"
-
-RDEPEND="${CDEPEND}
-	java? ( virtual/jre:1.8 )
-	server? (
-		dev-lang/perl
-		sys-process/psmisc
-	)"
-
-DEPEND="${CDEPEND}
-	drm? ( x11-libs/libdrm )
-	server? (
-		media-fonts/font-util
-		x11-base/xorg-proto
-		x11-libs/libxcvt
-		x11-libs/libxkbfile
-		x11-misc/util-macros
-		opengl? ( media-libs/mesa )
-	)"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	"
-
-PATCHES=(
-	# Restore Java viewer
-	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
-	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
-	"${FILESDIR}"/${PN}-1.12.0-disable-server-and-pam.patch
-)
-
-src_prepare() {
-	if use server; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-		eapply "${FILESDIR}"/${P}-xorg-1.21.patch
-		eapply "${DISTDIR}"/${P}-xserver-21.patch
-	fi
-
-	cmake_src_prepare
-
-	if use server; then
-		cd unix/xserver || die
-		eapply ../xserver${XSERVER_VERSION}.patch
-		eautoreconf
-		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
-		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
-	fi
-}
-
-src_configure() {
-	if use arm || use hppa; then
-		append-flags "-fPIC"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DBUILD_JAVA=$(usex java)
-		-DBUILD_SERVER=$(usex server)
-	)
-
-	cmake_src_configure
-
-	if use server; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dri \
-			$(use_enable dri3) \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			$(use_enable xinerama) \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--with-sha1=libcrypto
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use server; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
-			damageext miext Xi xkb composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use server; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-
-		newconfd "${FILESDIR}"/${PN}-${PV}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}-${PV}.initd ${PN}
-
-		systemd_douserunit unix/vncserver/vncserver@.service
-
-		# comment out pam_selinux.so, the server does not start if missing
-		# part of bug #746227
-		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
-
-		# install vncserver to /usr/bin too, see bug #836620
-		dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
-	use server && \
-		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
-		optfeature_header "Install any additional display manager package:" && \
-		optfeature "proper session support" ${OPTIONAL_DM}
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 9f4642282641..0a32dc3d896c 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/updates/1Q-2023 b/profiles/updates/1Q-2023
index b0348250ceef..b884eee31fa1 100644
--- a/profiles/updates/1Q-2023
+++ b/profiles/updates/1Q-2023
@@ -21,3 +21,4 @@ move dev-python/jupyterlab_server dev-python/jupyterlab-server
 move dev-python/jupyter_server_ydoc dev-python/jupyter-server-ydoc
 move app-text/pytextile dev-python/textile
 move dev-python/jupyter_server dev-python/jupyter-server
+move dev-python/pytest_jupyter dev-python/pytest-jupyter
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index b09e7e4ec7f6..6c5c5408a6bc 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-xmlgraphics-batik/Manifest b/sec-keys/openpgp-keys-apache-xmlgraphics-batik/Manifest
new file mode 100644
index 000000000000..d3ad482d91d6
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-xmlgraphics-batik/Manifest
@@ -0,0 +1,3 @@
+DIST openpgp-keys-apache-xmlgraphics-batik-20170410-KEYS.asc 18450 BLAKE2B 160f9fb04c0b349b59b50c5fcc811ac087407be682f114b2f32c7747f7b1c46d0def6fe27aa3b79ef1b8e35cdcece8cc3761a89ec00b8575b8919944173c79d5 SHA512 98c2d7e51c76c64c9c0040bd18851d08cb55f383d7850a01bcd7df3e0b5eb123e23bf064e10d58d72d627edfa118f1c12bb814e71be5255834274179b90fdc6b
+EBUILD openpgp-keys-apache-xmlgraphics-batik-20170410.ebuild 567 BLAKE2B a45ccace7d55942fcdf3d715917214f54f1505ad3d9e413f6f62ec05483abdc51342cb0885a90e7102193a715c0fee7853f53b616efb146d195300d546946164 SHA512 40f46d964e5c849686b7ded779bcd01a79f35ea7a95dacbc44e1bd5726201a123e788ef88d546e522f9c43c1f1b2996a3b868ec201cee3db017bf9b57e1ea648
+MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/sec-keys/openpgp-keys-apache-xmlgraphics-batik/metadata.xml b/sec-keys/openpgp-keys-apache-xmlgraphics-batik/metadata.xml
new file mode 100644
index 000000000000..6ef2d50cf07e
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-xmlgraphics-batik/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-apache-xmlgraphics-batik/openpgp-keys-apache-xmlgraphics-batik-20170410.ebuild b/sec-keys/openpgp-keys-apache-xmlgraphics-batik/openpgp-keys-apache-xmlgraphics-batik-20170410.ebuild
new file mode 100644
index 000000000000..bc986dd43e67
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-xmlgraphics-batik/openpgp-keys-apache-xmlgraphics-batik-20170410.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by xmlgraphics.apache.org/batik"
+HOMEPAGE="https://xmlgraphics.apache.org/batik/download.html"
+SRC_URI="https://downloads.apache.org/xmlgraphics/batik/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - xmlgraphics-batik.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 36f3b6367738..7708ba567ba1 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index cac687909442..13049e67ebba 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -3,5 +3,5 @@ AUX libeatmydata-131-gnu_source.patch 1941 BLAKE2B abf46ff6eb4dc0547e1dc758384df
 DIST libeatmydata-130.tar.gz 375627 BLAKE2B a1f65050572e8a7fc8345082a12e2831a8fb1e68e1d198ae507752375b2081a79fa6e5e589028104cd9d767d86b4d453c0eac0ad7f366c90d6734f5868f8e0cd SHA512 80edeee1b39e14d10e7d04d7fff63a233119c6e13216e92ec786cc41ecd79eb58937da0e621aaef697490e9fb285f3e1109b786ee6967fa1736bb4879e100f18
 DIST libeatmydata-131.tar.gz 368469 BLAKE2B 1b59f80ba72caeafa40272c5996e0fb03774c69c35d7a2194d312e53c48212caca84abed56ec63a9fba2b4142efbee4aa371c3869a76f8c5674936ffe0daea5d SHA512 064417dc085cb82e4baf1d160fcde2c6e0d9fed60e5c595799630b030053c373d888853055894c127c5b384be9204e8bbb251877651811b5fc5cdca8ffd9cf42
 EBUILD libeatmydata-130.ebuild 943 BLAKE2B ad8fe9386fe35838aba815f8b24d22e631612750d0f9b14ec0bfbabe9dce4a027b28ae38a817f33810687f731f4bb12e3128a85efbdeced97e2156e4e0634386 SHA512 46f166d40c734e48c09f87f2126ad9d9d4afa74b999785b4e3f6512f2bb494fbff6a8ecbea01db8d29067b88e1546e0505c359e90b9b08300281d2c7b96093a2
-EBUILD libeatmydata-131.ebuild 926 BLAKE2B 4c4e92861dae8bb6f9aaeb5e766dc3ab54c57534d8a4b6ac33d97e22aff0a86e585a934e628de8b70be18f5a22e454cf74cd4d1d631df0c94ad088d64b90fa90 SHA512 02f61453065f0301f1b35e59ba269229dd57d65cffebe955cdf2b5be56dd14879c1379c01a230569c79cb654101a3dcf468fdf06ce2e3e2f503fcf0765bbc369
+EBUILD libeatmydata-131.ebuild 933 BLAKE2B 4ecccff6b55f43deafa62c4632a9d918298e548bd0ea6f9eef8a77a76a29022987c67f3d47dac4974cbd8ff2625e919c7290a8aa4130ccba95cc9243fedee340 SHA512 dc5891b9831a6d7df9e598d71fe6168a7a000a1db97ca642f16ddbe2f958db35c501b89d99485546559c8c3f4f39719b7c0da7f3ae8d2391887a1a768fd67a0d
 MISC metadata.xml 511 BLAKE2B 34fcc6f9c449e64c078f8e77d41afed2d5acc2ef4f7eb298f1dd35241520c28452d610b216a5811de0dc6bdc79efef7d8ee31d680547674b5e8fd9f2eb47bb17 SHA512 c58ddfef161abdf2775d9e2f8f7eb4850088bd1a8ddbc2cc6a43c26154b48bb571695f6c439275e66b84af8bff7922aecfeabd8a55839260633de530c4a9205c
diff --git a/sys-fs/libeatmydata/libeatmydata-131.ebuild b/sys-fs/libeatmydata/libeatmydata-131.ebuild
index 503a1de35721..869abe911d8e 100644
--- a/sys-fs/libeatmydata/libeatmydata-131.ebuild
+++ b/sys-fs/libeatmydata/libeatmydata-131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index fccf7449ab7b..dfef65e654cf 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index dc039088799e..c6348713c51a 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,7 +1,11 @@
 AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca4595692ac146c2e4cd1c3647e7399d44249059496960ae94490c5b188c986dab64d4b90901bd7fc44203493532a0 SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b
 AUX postupgrade-1.16-en.txt 1519 BLAKE2B 39cf00073c5d12e04dd69126c7671acb5876bcdd592526d6aca475b98f9ed7abcb6d2691cef8642be04d8041fcbdaee0555937f1480f71a82c3f367f2a3d99b6 SHA512 495a2ea3074e96e570ed83e557691786524aea878fa6ee489080245a9bb1669d93e318c3871ce44918225d0e64d09e1e644538627bfb35a4a2a12d27365dc89d
 DIST mediawiki-1.38.5.tar.gz 55608920 BLAKE2B 4af95e2ca7d0680ff978a320df6430b107db18f0e367d5505d6fc42fecbd7ffa4fc536dc3c9e1dc640345906812046c82e34d44fd6a3461cd2614bde5cf76069 SHA512 74c05628dcee49d0749d839da325bc494c9717db79fc90d6386062f29c2da06ed7c38deb4e6fb46863a37f6dc80b64fff9b1857c959d3b4030ac6a7504f077de
+DIST mediawiki-1.38.6.tar.gz 55889352 BLAKE2B 0f3422244ae481f9855ecf1f38cf13ef5e5fc945e389c06c1a49684d6392812c0d2a9c64b8ac9a5856ec91e3880ec6b2ef3807f2ccb0927e7d74e36e93c7cf43 SHA512 b42c8253bb6d7d038a443007297693851326f0b12e1c16148e39157e5d57ce3b6e71e39eb28d981458799b548a83c052a3f01cd03bcc69180eecfe7300471bc1
 DIST mediawiki-1.39.2.tar.gz 55820627 BLAKE2B acbd224d49db80e9888b1b56d3b27d960581284f96a2359555be369ab55aa49b5d12b014bf29e5fec3e8281d961cc5e61b78601e265e84eadbb1d3e0806d34a7 SHA512 630a3b4b18e9df5346c620255e9dee6f7c45b08ca13bb39b6ef4f73893b69a2b22216de3fbd8cff6c2989b3f2bbedc4ab53365389cd7c3c7fbcbd3b2c9bba43f
+DIST mediawiki-1.39.3.tar.gz 55889372 BLAKE2B b7f8e67841e64744d1b670e2bbe3dda972124c418b3325b31c385ff4021f3710c03dfe7cfea27027f7bc71b1c961a1dc359f3e9f802f6d9bdf93bc590934c37e SHA512 393ae204bd556f13b73838748ce8f41f674645348d2c72cb13e340596313327ed317b93aa72dca207129f91d11d28966c5d805fff1d8dcaffd820281bdf2b71b
 EBUILD mediawiki-1.38.5.ebuild 2576 BLAKE2B 9ee21af68bf0af942fb9b7948be718a20a7e8a5bdc3ea3419da30e8f2737f9c8b7464cf8d30d19e9294aaf50b91200b1177c81a7372770728bfb65fdf9017067 SHA512 27b1922549fc23af3fc7a3ff0a378a300b32b988225f8f78f3141c04c7d2629e0db354d7c322de7db44629e6474cd7fdbaf7c60622501b6544e55fcef2e0f091
+EBUILD mediawiki-1.38.6.ebuild 2579 BLAKE2B c3b928a7125bafb869518442a99a6dbc2df9884ef6eda5f57cbfbf009cf2ee96fb6a712bef2c0babd70ee7c235612b11cc8138c66079b183fea2a23138dc25a5 SHA512 927cd2d681547dc6115cbd84ae2d6f5babd7ed98e603d40289d3b221fab5448d73c6febc29429b725d40a69b45faddd6b1d9340354c4cd2451e23b364f649d74
 EBUILD mediawiki-1.39.2.ebuild 2567 BLAKE2B b192769242e08503728fe67d179f8fffa683b7b198876aaf68e397526309931f0b6aff000470006efca10e74d61b6826956dc42c547324b06a6b9d3596fa254c SHA512 ccaaf108ed039bfeca2880c2380a269fe0b46021588cc3d6326b971a004ccc8eea50ee9c068aa039ed84308f34d2f90244e15ce0e6ec8c4fc829ffc9206d9eb1
+EBUILD mediawiki-1.39.3.ebuild 2570 BLAKE2B ab1b8df85b826d392ec66b69727452ff14ed6444c2bf5e314f1653008287ec5d97b668007b002f80978d7c5df312a3d0b91780a24af2923602413171af1062a9 SHA512 04aa7a1de8e63550a670e6c9b7598417b48aaccfc00d3a0a5ba3328ad1e05870c4019a8c9944b10fa022d592b2368e773c2381ee634f8e41051fbf9c4e9c7441
 MISC metadata.xml 359 BLAKE2B 79703ba1428aafa7d5ab14386601405a4ec03015fe7920b9c8f9bc3e1fbaefce4345a77410acc429689f42610c7526fd501667230d4aa786c3d02b9241f3fd50 SHA512 6d35f7bd19d1af197137a66ac215e25e2e3b551f2b1be1b234fce56f09c3b62c3056810b154a332ce018597d759434c54148e93cc4d6013698bce8cf1d370561
diff --git a/www-apps/mediawiki/mediawiki-1.38.6.ebuild b/www-apps/mediawiki/mediawiki-1.38.6.ebuild
new file mode 100644
index 000000000000..80568bc8dc57
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.38.6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit webapp
+
+MY_BRANCH=$(ver_cut 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND=">=dev-lang/php-7.3.19[calendar,ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	mysql? ( dev-lang/php[mysql,mysqli] )
+	sqlite? (
+		dev-db/sqlite[fts3(+)]
+		dev-lang/php[pdo,sqlite]
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_unpack() {
+	default
+
+	# remove lua binaries (bug #631554)
+	rm -fr "${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die "Failed to remove lua binaries"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README.md RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto databases
+	dodoc docs/databases/*
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs || die
+	find . -name Makefile -delete || die
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		echo
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		echo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		echo
+	fi
+}
diff --git a/www-apps/mediawiki/mediawiki-1.39.3.ebuild b/www-apps/mediawiki/mediawiki-1.39.3.ebuild
new file mode 100644
index 000000000000..8793331d96b1
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.39.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit webapp
+
+MY_BRANCH=$(ver_cut 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="dev-lang/php[calendar,ctype,fileinfo,iconv,intl,json(+),postgres?,session,ssl,unicode,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	mysql? ( dev-lang/php[mysql,mysqli] )
+	sqlite? (
+		dev-db/sqlite[fts3(+)]
+		dev-lang/php[pdo,sqlite]
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_unpack() {
+	default
+
+	# remove lua binaries (bug #631554)
+	rm -fr "${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die "Failed to remove lua binaries"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README.md RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto databases
+	dodoc docs/databases/*
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs || die
+	find . -name Makefile -delete || die
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		echo
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		echo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		echo
+	fi
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index edf8b0dc5bb8..aa0bf9c64ad6 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 42a7f89704ae..9bc3bf43ad1a 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -308,5 +308,5 @@ DIST firefox-111.0-zh-TW.xpi 604910 BLAKE2B f5a04e08f87f5432994f2765b86616331d51
 DIST firefox-111.0.source.tar.xz 495743080 BLAKE2B 5262557c7e3460c5d4013040b653b5ed357a6ee3fa196a8b862ac4e884a8be64bb06896a6ef468fe702f6ab09fc2af7088de4e4c14cf832d2a3d47a18ac68f0e SHA512 cdb300fdbb2b60068b0fc10a18df587b417e484901d36f52dd174d320d3440a42b02ea000f325c5781fd8853a5171b1a5184562fb535ece90619e4c64d46bb82
 EBUILD firefox-102.9.0.ebuild 36784 BLAKE2B 1989a4c9234c49e13d1aeaf2907c9bb89fe73def5de60ab63d33a1e250a1ec1ca1f35faa84bd4684176dac672e41f9cbc952b52adb9994eb0fb3a07195e7cd10 SHA512 a8c74b62467954a3962cc9f6603e4b92473864057c2900d70dcd2198ed887b3ed11ed19cb33130ba5444217e319f4c294b9c197a13eefc4a1b8a7c1ce31ee685
 EBUILD firefox-110.0.1.ebuild 39952 BLAKE2B 290edae219dda47fca8bb197b2732c682ad7b2128d25f2f8ce627fa3abf38b2049184fbc41ba3ee221875d63a0b1af283b92a06642798da74994f2a03a0385b5 SHA512 dbf0acb8ee4f0471b90f6a14e0639929f30b17b452ebcf553ae503cf82963c4515a85d174d20a6bc0a65fedf336aefd0067677a8f39b8768a20f385d64e9ca36
-EBUILD firefox-111.0.ebuild 39933 BLAKE2B 0a38cdb0692b6f7948cbf215a7a084f5b526fe68ae8bf6d3f6952f12bd9da19167b02c374947c2d48535fb2be5d20c01686d44a4a341f78e9e67f81b820aa27c SHA512 2c78065eecc696a309a189f380014fdd70276b499516a18bebe3ecede2c461f7ce22767771f6f6d58625b712521f6f53ab8059ba4071e5c045b739b4b50495af
+EBUILD firefox-111.0.ebuild 40166 BLAKE2B 2dcd9ed69ccb87c517b3ac0b463509e10759014c2c64a4611b60779d68c03e516f4be0b569f50abee2d951f16a8ee6b1435e02c7d74c7dcc3aee162533447401 SHA512 1c9836804e2938a8beef3b364d721b24d681214f49b2ef0122471554c749a07eebaa9e62319d02911cd12465c1986a63f8d1da39026181f7f2f132cf6c036eb5
 MISC metadata.xml 2219 BLAKE2B 064f486eecd2a66ef4c9cccef46803f877039bf16bc40b699a48e28e04e816d0ad434ce65ae2e056e1a4126a67a7dd7eff16040276159c1f5aa8966b1c0d7b6c SHA512 522b09ffc2857553e240b1e7c82c11ccc281dd87c720c6292ec9314b91319e0a55ca2838f17e878f5c1e58e4f22caa1b0c3b90506b65b350beff06f3f397d897
diff --git a/www-client/firefox/firefox-111.0.ebuild b/www-client/firefox/firefox-111.0.ebuild
index 60aba92748a4..f6cac626ceea 100644
--- a/www-client/firefox/firefox-111.0.ebuild
+++ b/www-client/firefox/firefox-111.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="https://www.mozilla.com/firefox"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 SLOT="rapid"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
@@ -790,12 +790,17 @@ src_configure() {
 	# For future keywording: This is currently (97.0) only supported on:
 	# amd64, arm, arm64 & x86.
 	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
+	# bug 833001, bug 903411#c8
+	if use ppc64 || use riscv; then
 		mozconfig_add_options_ac '' --disable-sandbox
 	else
 		mozconfig_add_options_ac '' --enable-sandbox
 	fi
 
+	# Enable JIT on riscv64 explicitly
+	# Can be removed once upstream enable it by default in the future.
+	use riscv && mozconfig_add_options_ac 'Enable JIT for RISC-V 64' --enable-jit
+
 	if [[ -s "${S}/api-google.key" ]] ; then
 		local key_origin="Gentoo default"
 		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
author	V3n3RiX <venerix@koprulu.sector>	2023-03-31 10:04:50 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-03-31 10:04:50 +0100
commit	f8b05ca448cdc580f580ff86eb8bef367d67c9ae (patch)
tree	b11f11ae6a7fee98b05350f8cc542402aeb23d95
parent	15d97fe857a00a52fd4efb0a31ed0560f9de3a24 (diff)