2023-05-10 15:39:49+00:00

author: mirror@stealer.net <mirror@stealer.net> 2023-05-10 16:00:15 +0000
committer: mirror@stealer.net <mirror@stealer.net> 2023-05-10 16:00:15 +0000
commit: a74cb79e1de66a9ae1a8c8b88470a758e627d494 (patch)
tree: d59d493a364507f744e41d0ad169a37cabe0cd6d
parent: 0ecb6b1b009c2b09284bee3740fdde2cb531b52e (diff)
49 files changed, 121 insertions, 657 deletions
diff --git a/Manifest b/Manifest
index 285b885533860..e1cbc9e490ff7 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29456 BLAKE2B b579eb34fd740576d9a470938caa50c293fb89a910a02fee148392f96de48e5afe7bc3f2a8da6acdaa9bb27ae382ea89b0d4f3756d7ebbb60fcd8ac80f80aa33 SHA512 967c3ae8ccd69216e64befa0f5de9b6b41cd6f75fa2424b6e1814db2887e6562a150979ea30ac2869759f1ed5604c2ee8120e7474d886d70f03610175a57a7a7
-TIMESTAMP 2023-05-10T15:09:47Z
+MANIFEST Manifest.files.gz 29450 BLAKE2B eb8b034dc84e70cd807542275764bb7ad3f16b326a675b59db9d61b77354e7af2b0d31fcfe86cdb708d22d5a1b858b39a4f78af072e118ed4decbee8df66ac0e SHA512 02721b9245bd1c5eeb2d1d39f1793eff836b6bec1a918593c2ded99f790cc81f60751c31a535ff5d2c2af7e76f63b7a449da4a0ee73e549bd4a5211b77349686
+TIMESTAMP 2023-05-10T15:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbs7tfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbushfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDKmg//fgxeDFh6KB/5Q6beg6Tmin5cPCHlmvQr6i9BVCcsykTi5Euly3z72HCe
-cwaf+h733PRdP/NphPXPfoCGndmtW51tMEABQyUlpTIoUELlHHgbN6a3ZbNx9FHi
-i8EgiHPAR3tT9ZGFPkatj5yMrz16ccvZGUb7NQihrH6H/o1+y8iqqIHO6b5zkVQU
-yff5qGo8bgA4x7fYlKqP70poMpPEx8suR0suUF6x038jsk7ysMgztWGGeGiPtGpr
-kaqkSONoixyJTelPLBso/r+/YCJY1fpUSi6Yu7eUeF7Un7o0oCblBIVdyvXcFy5x
-QYA6uIGIkHvk7ncwAJQKK5mnwBDLHD2WJ5V2nCGuEzztcLBnPKMF7jog6R1Cxcjb
-eJy9oOs/gl2BJpjrMTknogJpSHJG6nmJkOh6YfBJpb2WA9NjfXBWjHXW0f5rmpe8
-HTZ5Ce2fFl14wMF/R1WowTx/ZOQoht2y0dusEtHzNRAcFC0cZ499nmWeFlXZqZy2
-32oMb8HDiaCc8+8Ijx5RqVA9AbcTDiOBCXIjdEReCgsLv+YJbcWi+Dp0yZXSN7OW
-ADqB4oMeoBKQnG1Z36khGaivFZa5DbAsPj0T/36Ibv4K/LFKAvHllgc/tZP1paLH
-hHXD6pSsjAmUHsadvsESMOpeLesDpTA7/PVcED6ePiOhVCpUF1U=
-=DZIq
+klD90BAApQqf+CVQqDcVm2PwsnIo3vw5WRKl/C0ETW18n65/XW+CDlrKYJOkNl6+
+U/Iy/Hr/LFQpvFtiq/YXq8n78hutBgU2bdpl25JqC4cMHLG9mO+/clXa/wNV6Fwy
+/YPlscjjoQMTRwEEa4xfnTtuH3RH5kHrSWdVtSJHqufcQ1mJ1nqvHdLbQy/QgvW5
+btHFFqJDvlHWaKkiG03rQ4EHpQjxXGmYQCSzDOXMVS0/6I9mj9lm4yFpHR6NRnsd
+5y5OWXLWPoV7f6iuYIyk4hqq1rwFLXw8KNIMqEVxZOqbMyWzwRNHuKJ3q2uVhGB8
+23v1pyoJ39gutHI53DS8BuHnWdRwrschcGFVoJQrVXZm183eK6r5pnnvnOQSafm5
+Qk2roBWbO7tI3DLM6Gu64rRFd3DAM4ZJ4JeOss7asqknm3vTjXr70z+f0RWAlkqJ
+9hj7hd17oFC+i0e6S1euyaGmkqw3ch189WxAG7a0iNMnpc6+JLZ+fM3uWcfw0iJj
+lKe1AdV1xasjB0D6UuIhlG/wvJrsfMhX4bV0csA9IUxuA2exUfHNKIrM9UuGKtE6
+FxYI/ODSc9zZEXkwKhnE/LSWBbkkCxmuUkC2OEh1fiCaxuvNHwU25pdLHl/u6uGA
+1T9UoamizR3f10/P4by3r6EeW0WhIFswu08985jzS9qC56hC6ec=
+=eLu3
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index fc33162e4c3a5..356b74a1320eb 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7528177dbe8ac..b0d2d634158fa 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index ab106d4bd0ffa..a3963d111c9ad 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,7 +1,3 @@
-DIST libwacom-2.4.0.tar.xz 108812 BLAKE2B 18f41cd052b18c652c61062948355b4738afe57db344749055492cc6853bcbe3048c582a72318891727ec0fb01a7799f4c80c544b37b51c9246f98e5ae3fef1b SHA512 c67b8a81e9f4285a4e6f422b29e9b8b3677e3fc45e5190fd2b95ad361e5ef35e124b7d78bcf2bb9d7b7183525a6be9916b3038714c42c9ef405a1075750465f3
-DIST libwacom-2.5.0.tar.xz 109284 BLAKE2B cb9443aba276694eb64c6073488746ff4aff75ed77f334425d2f391a591f0a6cf222ef2124b6533ca7f2ca8e5eef36cd335026a87afabc12d912918ac1f930ed SHA512 62d181a5f4ce1335cd72623b7e82d5d44b9a11c08ec2ef4a98fd815fe2e1f814f42c909c2977e1b1ce803f04bac43414577830ff3724643fcecaf37113d098cf
 DIST libwacom-2.6.0.tar.xz 110288 BLAKE2B 321bacccab84f287141257b4c7af12822fca976c335027d399765fdbbb2c59eabcc76f40d4fd83c7cf1cdc88e2c57ccd317b1922ea3dddb98cf2a0847e920ff1 SHA512 aacf234e77bd976de2e2a687294c5ab704dca5a70df01fa2485441029e4faa34bec2824c455642115ae79f5cbbac41d064569e4eb2788655c324b37149009d26
-EBUILD libwacom-2.4.0.ebuild 1507 BLAKE2B f470234baaf9cc8fc33f07881b172745c7fe475c41c15f272df89ffad41b095adfc706caadbe7e6d2ee0e8452100e5fbd28cb45544b56916b4439e67267858a8 SHA512 f4cfc95491539e33b89675f6e5c3dc135e7c4269321d140c69e9856c68e27bec99eba91844e0dcc7eff39b70b4b739daa1109b3041aee5493eb569a1d91de7e3
-EBUILD libwacom-2.5.0.ebuild 1507 BLAKE2B f470234baaf9cc8fc33f07881b172745c7fe475c41c15f272df89ffad41b095adfc706caadbe7e6d2ee0e8452100e5fbd28cb45544b56916b4439e67267858a8 SHA512 f4cfc95491539e33b89675f6e5c3dc135e7c4269321d140c69e9856c68e27bec99eba91844e0dcc7eff39b70b4b739daa1109b3041aee5493eb569a1d91de7e3
 EBUILD libwacom-2.6.0.ebuild 1507 BLAKE2B f470234baaf9cc8fc33f07881b172745c7fe475c41c15f272df89ffad41b095adfc706caadbe7e6d2ee0e8452100e5fbd28cb45544b56916b4439e67267858a8 SHA512 f4cfc95491539e33b89675f6e5c3dc135e7c4269321d140c69e9856c68e27bec99eba91844e0dcc7eff39b70b4b739daa1109b3041aee5493eb569a1d91de7e3
 MISC metadata.xml 313 BLAKE2B bee5263fa9309d84996574f86a17a4292e58a7eefc65159ecd0df578ccab24e39f4c050deaaabbcd33e5a86292af6c57c5b2c9eb2c9b6e3caeab86e5633cf3c7 SHA512 b1575775a9f633ffe2124bd5ebef65ab864ae697ed733f50e3028484d2d60ea827e5ac12305d57beedcdbe58d8699bbc7e67cb0c844041c7a56045cb91eae633
diff --git a/dev-libs/libwacom/libwacom-2.4.0.ebuild b/dev-libs/libwacom/libwacom-2.4.0.ebuild
deleted file mode 100644
index 62173377ae279..0000000000000
--- a/dev-libs/libwacom/libwacom-2.4.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit meson python-any-r1 udev
-
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
-HOMEPAGE="https://github.com/linuxwacom/libwacom"
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/9" # libwacom SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgudev:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-libevdev[${PYTHON_USEDEP}]
-			dev-python/pyudev[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pyudev[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Don't call systemd daemon-reload in the test suite
-	sed -i -e '/daemon-reload/d' test/test_udev_rules.py || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-		-Dudev-dir=$(get_udevdir)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/dev-libs/libwacom/libwacom-2.5.0.ebuild b/dev-libs/libwacom/libwacom-2.5.0.ebuild
deleted file mode 100644
index 62173377ae279..0000000000000
--- a/dev-libs/libwacom/libwacom-2.5.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit meson python-any-r1 udev
-
-DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
-HOMEPAGE="https://github.com/linuxwacom/libwacom"
-SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/9" # libwacom SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgudev:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-libevdev[${PYTHON_USEDEP}]
-			dev-python/pyudev[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pyudev[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Don't call systemd daemon-reload in the test suite
-	sed -i -e '/daemon-reload/d' test/test_udev_rules.py || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-		-Dudev-dir=$(get_udevdir)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 9a67c8ac2f148..49c89a060b7ee 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,5 +1,6 @@
 AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692
+AUX spdlog-libfmt-10.0.0.patch 1750 BLAKE2B 2369a5dc8f15a52d61387a0686acdaf8c6ccfa7150f9d237153c036a8e990ed037733358d51c3c4deb136689cd4da7a02aca3efc38abaffcb9a766ff0d95d6a9 SHA512 d713c753a62cd84fdffab96c897105ab5bebe7938f0cb782fcceb7e65758c740c3a4ae849d85617a293b62333cb1633e6f3d86fad939cc9e383de934e5251fd9
 DIST spdlog-1.11.0.tar.gz 373033 BLAKE2B a05a535ba55641ecb3bf484eeff902f266bf3967cfbd619234ab0ca2d0c15bddb27b73ce43c33623d02fb046f621933cd52cf39f377f354182d9cdab33340f28 SHA512 210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412
-EBUILD spdlog-1.11.0.ebuild 991 BLAKE2B 6538e5fb820081f85cc44d28302f66afed3c4e5b45a8ca3df6e7316bedd9f02330b874b5d01099c045a2a09f9253624d7459422006c4578641119c59aa25bd81 SHA512 a7605ada9603e60a2f476c00c3327c7a3aa62b53b3d4fed46ea226fa6dd6c569c94c7ddd0c71132d9d2b9f2c1e2ac4cb985bad8ec8a2b0ffa140b9e095370bf6
+EBUILD spdlog-1.11.0.ebuild 1032 BLAKE2B 52bbcf3ea9fa6e13b84dd6e3b5808823154920c48f0cce19476764cf518433f92f3966a95ca44269f8ba46bf955d040a3dfed25287655c35c7ab1dd7904b075a SHA512 f2fb35e66d4722f7c4feb73f70fbcf16112418c983366aed5ea251092646e814900c1a0708bac90a74c4dd00e8ad789710ba36bb24e9c49806c20a6183cfd5c6
 EBUILD spdlog-9999.ebuild 997 BLAKE2B 63ee00aedfb9a4aa437a72ed2d41dc28e590cb50c76476733ef5ee895ed5e2fe0b16f3ec0dce562a05bdcd5f373df2f657735ad30890a1eb1a4cec5b86422dcc SHA512 2628758065ca9a8bc93ad99c4c0f930b6aa7bb44a75e80a40cd781597124ab81f3e38e24e327401adb2128e5d909c3f46c500f1578bb198f8b47c23a566efd74
 MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c
diff --git a/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
new file mode 100644
index 0000000000000..03ef4e5910484
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-libfmt-10.0.0.patch
@@ -0,0 +1,40 @@
+Bug: https://bugs.gentoo.org/906069
+Upstream: https://github.com/gabime/spdlog/pull/2694
+
+Fixing spdlog-1.11.0 fails compile with libfmt-10.0.0
+
+https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05
+
+From 0ca574ae168820da0268b3ec7607ca7b33024d05 Mon Sep 17 00:00:00 2001
+From: H1X4 <10332146+H1X4Dev@users.noreply.github.com>
+Date: Fri, 31 Mar 2023 20:39:32 +0300
+Subject: [PATCH] fix build for master fmt (non-bundled) (#2694)
+
+* fix build for master fmt (non-bundled)
+
+* update fmt_runtime_string macro
+
+* fix build of updated macro
+--- a/include/spdlog/common.h
++++ b/include/spdlog/common.h
+@@ -173,12 +173,19 @@ using format_string_t = fmt::format_string<Args...>;
+ template<class T>
+ using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+ 
++template <typename Char>
++#if FMT_VERSION >= 90101
++using fmt_runtime_string = fmt::runtime_format_string<Char>;
++#else
++using fmt_runtime_string = fmt::basic_runtime<Char>;
++#endif
++
+ // clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here,
+ // in addition, fmt::basic_runtime<Char> is only convertible to basic_format_string<Char> but not basic_string_view<Char>
+ template<class T, class Char = char>
+ struct is_convertible_to_basic_format_string
+     : std::integral_constant<bool,
+-          std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt::basic_runtime<Char>>::value>
++          std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt_runtime_string<Char>>::value>
+ {};
+ 
+ #    if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
diff --git a/dev-libs/spdlog/spdlog-1.11.0.ebuild b/dev-libs/spdlog/spdlog-1.11.0.ebuild
index ebda7ae2f4a2a..6759c44b79f8d 100644
--- a/dev-libs/spdlog/spdlog-1.11.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.11.0.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-force_external_fmt.patch"
+	"${FILESDIR}/${PN}-libfmt-10.0.0.patch"
 )
 
 src_prepare() {
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5648274a0a1de..136db03dbf786 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 5c365f162727c..8645bb08025fd 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,5 +1,5 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-3.0.0-nih-test-deps.patch 3435 BLAKE2B fbbe2bbd8b05dd215b2ba413e208a96fbd1df9904271980658e1fae100e6fb1d049e15d582a307364d6416090b97741cbfc8d7304e08d7b7bbfbd70e0f1a1522 SHA512 76cca0e404215e505d6ceb650da796862fd87ab460e1a65438c62cb926af4a3ebb8f603bd26acc1a6d1a1a37e6090fc01edc4ae7a7f81f18105d3d9fce03545d
 DIST paramiko-3.1.0.gh.tar.gz 351910 BLAKE2B 7350626f3a8e54d8950085cbd8253f5564355abb4db7c65113c0df22674e3df0081da7299cfad779f1fcf9569b01720b6ab5dc2bde32c4a71500e79910caf4c8 SHA512 1a556a5b7a6ebc72a0c61b59f326a95c9f2784d74fdc1a171455867ba7b4b07a15741e168747b5a3a225685ad069e2d58021f54dadf7feb00f8acf65b0c07d51
-EBUILD paramiko-3.1.0.ebuild 1235 BLAKE2B 36a9f9d10eb7a60962f30ae039ccb6f1b2146f9545cebc901db59544fd3251f1c61d25b4b94c2874151c92852cf2555f84894dea34d529cf43b7de9d3a2ccac7 SHA512 e0573656798999815fbdbdda8938c3b9eda4b17f2de32f5fff9a37465bf1ae220380d6daf0528af2250f71e804efe707ed4b20a99f791a1574cc3c17fb2aff51
+EBUILD paramiko-3.1.0-r1.ebuild 1201 BLAKE2B 83a9d97c92d63e3518f4b0f73d0400119f39491277bbe2a2551c90fe227095ec4645f5df1d6a1200ca03c0463044426a228113a4a2f4d240ed6b94f4a1d2276e SHA512 bbf9e0f03a25c1b32b42c562aeacf423c62f217fa584ad8796fd73a88e52c46926f610ab294877c15a367357605763a2d9153891dbe446bddc5a0d953711989e
 MISC metadata.xml 1222 BLAKE2B 46fb6385f6779cbc13fa54090dd5dfa0b5a7b5a753f728b133fa79a1e1c779a5652d6b38c5ea11cfcb505178b2ba70d9000dabba6228e38f30f426ecb1c49a3f SHA512 bf07a537ed375a3bf58d219c18ccfc29c810554041943e62819a46b63ce3fbcdd2197085dbeeb7ad36e0e601700edec6121ce5cc83dce1c7435d663473df2583
diff --git a/dev-python/paramiko/paramiko-3.1.0.ebuild b/dev-python/paramiko/paramiko-3.1.0-r1.ebuild
index dd2a49a105fcc..380997434a93c 100644
--- a/dev-python/paramiko/paramiko-3.1.0.ebuild
+++ b/dev-python/paramiko/paramiko-3.1.0-r1.ebuild
@@ -30,7 +30,6 @@ RDEPEND="
 	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
 	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 9f38a6756431e..c648254952be0 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,9 +1,5 @@
 DIST urllib3-1.26.15.tar.gz 301444 BLAKE2B 2681f0290a4f8b335dcdf384a0c0692cf51e88ea829f80c8c857be328b00c618978a84957da4e23826e4597fe90764eb36ab9acbbc33f9a6ec8df3e3ff3f4d48 SHA512 b6ddb29c15b2d729605a6acb7c602f18c75a937cdfe9649d35d790a59fbb1d96a8d68975ba0a4c073c9f1750e383c67b7566dbcd81b3e8611501e9f4153e9a2b
-DIST urllib3-2.0.0.tar.gz 276792 BLAKE2B 3f5966ea97f1ddbf73ef4d1d292b426f502a211fef6e2bc354a88dc95766faf99a5dd34cb891147c580a03b8c5fb2dd7fdee22988bd603db046c03245c850904 SHA512 24e1b34d266983cf4e1556cbe026cc62d7fdb14c5ec5dace800e0b40e0a4f898d4df1679de351d14598ab0f72eb1bec74b6d2976df628b786f4bab4cb4380044
-DIST urllib3-2.0.1.tar.gz 277241 BLAKE2B ae4f323bcae505f2e177fd6c4764af78f5b98140366ac6e14f27eb0f5c55870f39bfdab6466628cd2fcf2171cd31ed6c82ae3f42e109834764aa87cfdd13f4ca SHA512 58b784052530f1447c8fca3db3309b127a7db352f8f6800765b92efb02762502ea9e6d50fee5d8c297a9ea0d6861c91f6db7254eb955941f0239d56f30d2dcc5
 DIST urllib3-2.0.2.tar.gz 277703 BLAKE2B 1c7935a6aca8e60ad212eb35ef76009b75a8d080b1a572fe229e94a200e75c352ab41d831dde3d4a4643ecbbe54c2128f9d9ca1850d978fd1730d6d730ce3ab0 SHA512 874674342259f2f9b77b4aac90bd525ea50d4b6134008c22eb0fe7a04e688797564c3ec8e556600f75416df2983c972867e8a569d5d85a8dda748948217af38e
 EBUILD urllib3-1.26.15.ebuild 2315 BLAKE2B f66ea329585eea090f339bd996900c5073918b6efc38fbe1d6d2eaba835c426149ae274a33659d6e5cfeeda87c84048e210456c7013006f59e464dcd9a38ae25 SHA512 21bbd772075249cf7af1b2509374186af3fb37341a89098717dbc91caf407cd65ea700a0d205f30c12277f509bf966123719a014d496dba2175eda95ef26a123
-EBUILD urllib3-2.0.0.ebuild 1891 BLAKE2B bddebc287f54cfe2a335ced1da9f920fbf8a6b74219e108ef928e83fd9e5f20ed02469c447ed5d0293ccffbbeab169476940409464383607ff2472a8a3a9c26e SHA512 45b78c8f82dae41d8e51495faa15bcc4edde0b0eaf53fbd8b42a484958a5bcf28c3f974f2a27ab6b92f33190e7ed6cd5c431becb5b94f885476d214d7e027daa
-EBUILD urllib3-2.0.1.ebuild 1891 BLAKE2B bddebc287f54cfe2a335ced1da9f920fbf8a6b74219e108ef928e83fd9e5f20ed02469c447ed5d0293ccffbbeab169476940409464383607ff2472a8a3a9c26e SHA512 45b78c8f82dae41d8e51495faa15bcc4edde0b0eaf53fbd8b42a484958a5bcf28c3f974f2a27ab6b92f33190e7ed6cd5c431becb5b94f885476d214d7e027daa
-EBUILD urllib3-2.0.2.ebuild 1981 BLAKE2B 012dd8514e86af6e9823b11360ba7382d9f5ec4adaee869f7165f1a55518a1cc31a16f3e1d4c27981ef1008c6a957580fae4684b438715866ee0b6aebe1258c9 SHA512 35a7347127186869f6da9aa14a9f471f918b044041bb84270187768877230931c809bfc0b8b6a1375cdb1207a065a5f885404bebc017253de1224e42924d5548
+EBUILD urllib3-2.0.2-r1.ebuild 1947 BLAKE2B 8de4b4e4e3cb744bf2eb43c9bbcee7bce1feb9bb92a540f4551d28ccfa69654d2ae9f1c6c0dba77725e1757e0e6561d120607f3f4b7eca1ef7cee78f0a1d8663 SHA512 a67410a45745c585c8306f733ddabfb238904426ffd032a1f05bea1dcb1f05ae208aa50a144779f61d503e7413191d704b1f16d0c6e26b186f7649e53feeb6e3
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-2.0.0.ebuild b/dev-python/urllib3/urllib3-2.0.0.ebuild
deleted file mode 100644
index 8ee137c6da4f2..0000000000000
--- a/dev-python/urllib3/urllib3-2.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-python_test() {
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# take forever
-		test/contrib/test_pyopenssl.py::TestSocketSSL::test_requesting_large_resources_via_ssl
-		test/with_dummyserver/test_socketlevel.py::TestSSL::test_requesting_large_resources_via_ssl
-	)
-
-	epytest
-}
diff --git a/dev-python/urllib3/urllib3-2.0.1.ebuild b/dev-python/urllib3/urllib3-2.0.1.ebuild
deleted file mode 100644
index 8ee137c6da4f2..0000000000000
--- a/dev-python/urllib3/urllib3-2.0.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-python_test() {
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# take forever
-		test/contrib/test_pyopenssl.py::TestSocketSSL::test_requesting_large_resources_via_ssl
-		test/with_dummyserver/test_socketlevel.py::TestSSL::test_requesting_large_resources_via_ssl
-	)
-
-	epytest
-}
diff --git a/dev-python/urllib3/urllib3-2.0.2.ebuild b/dev-python/urllib3/urllib3-2.0.2-r1.ebuild
index 3d07423a2d37f..9c46c938c35af 100644
--- a/dev-python/urllib3/urllib3-2.0.2.ebuild
+++ b/dev-python/urllib3/urllib3-2.0.2-r1.ebuild
@@ -28,7 +28,6 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
 	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
 	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index b016f986830b1..1fb4357161466 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,5 +1,5 @@
 DIST xcffib-1.2.0.tar.gz 88972 BLAKE2B a8d9be7c3149f696d06474aab85e9f7605d45e9861151192dbb7b51e48483f75adb721e17531432294d19d8d6498b66ba312702ea011e8470c3ac42ac0cd6e23 SHA512 7012833f2877edea92cdc15030543883e2a848264c034a81222626ad48a69fcdac8a88cec2e07e61a80102640baa7fbdf29bbf25e08e59fc896aada08533bb77
 DIST xcffib-1.3.0.tar.gz 89874 BLAKE2B 5dd8d64b906d92cb987ee4398da668d6034faf4abc24a56c0fca3e5b6d0cd1252ea1459736a9f7fb83ee97d4d6cec5d103eb19aba626a3d646f67e6332e255a5 SHA512 a493f86891158ffa0c36168da5e7ebdeadafe5e9f067e2ad6052cf302c89db612f907b5e9950748fcfd74886b808870986529902bae77fede7e27d5d422d6ec6
 EBUILD xcffib-1.2.0.ebuild 805 BLAKE2B 273fcacfa407eaeddb2a1e05cd46580766fc03307a8224b5cee35f38131aa6d025bbc98dba2cc7c6545284f79b1115e4d40534764629b2ea90e69a1a0b206f2a SHA512 38aa6f5b01ffff693d5bcad5a199ad4eebfbed9508e9038618aa1651365dd9402d49cadae0983315b99947ed5052862067bcc825b873761fd6bcfffd75062de1
-EBUILD xcffib-1.3.0.ebuild 812 BLAKE2B 13ebcf5c25c688088b9b7223826b6738f6762524604695489e583118ea832373c3b340e5ac9888f85e0d546e28b35f7800e12237054a00953cdd3fa62ce939a2 SHA512 9a14a4bb091e24a6a4c8e0bd4d5fabb57d749cae3eb46d47f912d1f971cace347d201f2e77d8857244eff4887a895e5b1c1d77e40310c04263b3d4584713e3e6
+EBUILD xcffib-1.3.0-r1.ebuild 778 BLAKE2B efae7c97b1ec25fef9e5ac7b14d92dd5889e1ee03de3b12ed47c25d73504e534fc23d92b7b90d20f947719ba6cc843f6297c54d2d71a1fdc7b5d6331a1456df9 SHA512 d64f358fcf27c5e57f11db239561e4195ac4f298a60b3d70f02085b384efca0b44730d66a8c1d754b2973cc14c7e88aedc2075a3e808cdc762198bd9978708d1
 MISC metadata.xml 374 BLAKE2B 7f2845d0839dff2568de08f86ce6b8387e76ff450467e14b5c291ad1f55256cb9eff1ff318973e54846ad394b56a3e1e6aa8574fcc0bc39a1c9f7d3b42a1109d SHA512 9403d3d706b5281d6abe2d2fca33b1a70983c7c205f8a5899ad0469fe9a1cd0ceb6c9b27916e1e152467d029d86fc9e6dc28f967bc108499ed901582ad1bbd00
diff --git a/dev-python/xcffib/xcffib-1.3.0.ebuild b/dev-python/xcffib/xcffib-1.3.0-r1.ebuild
index 0d811a0a3f896..827dd135f36b4 100644
--- a/dev-python/xcffib/xcffib-1.3.0.ebuild
+++ b/dev-python/xcffib/xcffib-1.3.0-r1.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
 	' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]
 	${DEPEND}
 "
 BDEPEND="
diff --git a/metadata/.checksum-test-marker b/metadata/.checksum-test-marker
index 9803422c5989c..e3fde7e5d309e 100644
--- a/metadata/.checksum-test-marker
+++ b/metadata/.checksum-test-marker
@@ -1,4 +1,4 @@
-1683731419 Wed May 10 03:10:19 PM UTC 2023
+1683733225 Wed May 10 03:40:25 PM UTC 2023
 # Testcase for mirror network:
 # Watch the value over a day, if unchanging then
 # one or more mirrors is missing --checksum
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 51c34e3f5cf87..cc46ef545d998 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 42dc203f3b440..5cc93264f8b3f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 15:09:43 +0000
+Wed, 10 May 2023 15:39:49 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 527bae9ae471c..cc06f7ef6fea3 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 543888 BLAKE2B da15fb010da91c403608af1847df77a89c9a8a24b2f5c1999256191c31d7755cd7667c19867e75c2bbdd07063f4ce4dd641cf53415eb08b83e35cbb3d2cd35e2 SHA512 ac5e51b2bf8075889870e4eedfe469274eaf28945ed1e974bc76ae0576dc1aa0db2a5fdacfc15e8cfb28486195fad65b487cf50896a207c5fcad4ffae850adbc
-TIMESTAMP 2023-05-10T15:09:47Z
+TIMESTAMP 2023-05-10T15:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbs7tfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbushfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCp6hAAqMkDHBQJP8bhI9A9PhmUKpRxhMUDhlhWRoCy2ZVRYJraqH29TLuzpZZR
-W27N1P3s/dFoAdNYcZfJhXz/kvA4a7vXpFkxdoZMMBm37PmAyIKxmWhi1QGAn+1n
-1yZAjsDmhO6OcqZguNZBPv8N1cZ6/TWBVv0ue17XmPjNAEHimpblTFGafbaYQec4
-W4tiKUhyumpspH8VSEn/CeB3ghRxj6bzHwKmqQRUQkBo6nZaYEaq77qypAmIEwcF
-Ep2iFvOuafxu9qeCY9xFVAap7451yruuojwgVDuLqSqKR4Gf5CSk2Fg8U2hOtpoe
-vlhUrR8TdYtCjrDenVqsMiXEGY4H/H0nBnK7BVktfZVsNpnjLdDNU7f8a6ZqzSAf
-Y5M+ipb3yMG/tS4qYHYPFSG8nyph4c9lA2MJ+SQmJFle1kjJh5w35FRtvpZKaYPv
-bNXz3epzXvXJQVlDmeZoOBVU813mtNZkVaxD2uxJ4bEwRkxI9mQpUKffIoDFtVED
-tBfwLs0kOni3nSlYHGnMqXcy6YlaUmyaxtwl+0hFPDg4u8zzWN151UO4zAhxLX5V
-C4wnrFC+xzPC8jM9DhiIb3CHgru5m5qTldyqRAmrPv3fPzLVVSgSRmOEP0wns7Yd
-K8mS/bVdWCtvNFqLL2kV2ODHmJ1gc9lMpWgBXe6vFJIeCOjPqUc=
-=slQb
+klDpXw/9FyP5CZynMEIRwPsC4Izsk1BXagE4kK3a4oyOQe6luFLs428nC7WQNvkc
+OB6EAHXekVZR8O1TJ3jIHifY6ZAMhqMhK7Gf0PvLVcdmWxmcYh8WiIATJ2514ruT
+QKBSxM9AcGMzzg4Z6QjquzwM00HurA8/1xTrByUVVXhTO9pjuCpYOQy4rhVlN1GP
+5DTHp0p7nDXYgRWWidIpK3Eo9ouCnAfxGQeX6oJvnGBTZ0/WgwRoBS36o7El07Vv
+DroFxbcwQrzwr4HrlRz1S9yKijC0KhBmMSSjVcdWpYMZ6paT4bOuR0gJoEUDthB7
+Csk5EAqkI0LKomXaVIb3J6CyIM921tHZ6lfYyghIPMeD194sHus36kNOitNsdUBE
+tbQUQh71QfAVUVcXV3lK7cnxBX4af04NSWPUk2jQQ3b4EDcshDveZC4msCnhbQL7
+PP9mSL4YkrmaQ+mM9ihOGwaf0k9rmyizMx0tq9s/61lETR46Gv42t6SqptBFIOi0
+v+07GiwuT1zAc/ogDgABVQySpOHwntvDFtHsSV83bSYXZ1X5gbtfylQcJUKIqPvQ
+xa+GgMYHMjyamy8o7ybyyRASLQA49SQDwLRRi1FNCuNmZI1IxSKOHhXGqnYd2FI2
+H1UQOT1O9nljMxG3vHigKmFV9gbj14iU1dB+873RqTpEdy0Q6UY=
+=t3QD
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 42dc203f3b440..5cc93264f8b3f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 15:09:43 +0000
+Wed, 10 May 2023 15:39:49 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 917c4dd03b31c..bb3a5e248df00 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 43d86f7fccacf..cce0282729ed8 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libwacom-2.4.0 b/metadata/md5-cache/dev-libs/libwacom-2.4.0
deleted file mode 100644
index 2f8297e32925b..0000000000000
--- a/metadata/md5-cache/dev-libs/libwacom-2.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/python-libevdev[python_targets_python3_11(-)] dev-python/pyudev[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/python-libevdev[python_targets_python3_10(-)] dev-python/pyudev[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/libgudev:=
-DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
-EAPI=8
-HOMEPAGE=https://github.com/linuxwacom/libwacom
-INHERIT=meson python-any-r1 udev
-IUSE=doc test
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
-RESTRICT=!test? ( test )
-SLOT=0/9
-SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.4.0/libwacom-2.4.0.tar.xz
-_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=6011b7d595de9d2cfef1b3055d2e88b0
diff --git a/metadata/md5-cache/dev-libs/libwacom-2.5.0 b/metadata/md5-cache/dev-libs/libwacom-2.5.0
deleted file mode 100644
index 4f30334fee138..0000000000000
--- a/metadata/md5-cache/dev-libs/libwacom-2.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/python-libevdev[python_targets_python3_11(-)] dev-python/pyudev[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/python-libevdev[python_targets_python3_10(-)] dev-python/pyudev[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/glib:2 dev-libs/libgudev:=
-DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
-EAPI=8
-HOMEPAGE=https://github.com/linuxwacom/libwacom
-INHERIT=meson python-any-r1 udev
-IUSE=doc test
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
-RESTRICT=!test? ( test )
-SLOT=0/9
-SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.5.0/libwacom-2.5.0.tar.xz
-_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=6011b7d595de9d2cfef1b3055d2e88b0
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.11.0 b/metadata/md5-cache/dev-libs/spdlog-1.11.0
index e46a228f26e67..a55db97bb0dc5 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.11.0
+++ b/metadata/md5-cache/dev-libs/spdlog-1.11.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.11.0.tar.gz -> spdlog-1.11.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=700ff44857eb11314faa8551685214df
+_md5_=2f4fb011f3ee8df31c7f4d5566b65bf8
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 2dbb496d46e38..d4e85c9e70663 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/paramiko-3.1.0 b/metadata/md5-cache/dev-python/paramiko-3.1.0-r1
index 7c7145ed5d790..ed587017c5ca8 100644
--- a/metadata/md5-cache/dev-python/paramiko-3.1.0
+++ b/metadata/md5-cache/dev-python/paramiko-3.1.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/bcrypt-3.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pynacl-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[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[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/bcrypt-3.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pynacl-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[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[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=SSH2 protocol library
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=examples server test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/bcrypt-3.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pynacl-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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(+)] )
+RDEPEND=>=dev-python/bcrypt-3.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pynacl-1.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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(+)] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/paramiko/paramiko/archive/3.1.0.tar.gz -> paramiko-3.1.0.gh.tar.gz
 _eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ef1902f105f9b1455e23d63bab423cd1
+_md5_=f2004b474d7d84401f676f285c1211ff
diff --git a/metadata/md5-cache/dev-python/urllib3-2.0.0 b/metadata/md5-cache/dev-python/urllib3-2.0.0
deleted file mode 100644
index 438fa15b21a9c..0000000000000
--- a/metadata/md5-cache/dev-python/urllib3-2.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=8
-HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
-INHERIT=distutils-r1 pypi
-IUSE=brotli test zstd python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-2.0.0.tar.gz
-_eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e200dfc875e2cf512e992b6b21106f28
diff --git a/metadata/md5-cache/dev-python/urllib3-2.0.1 b/metadata/md5-cache/dev-python/urllib3-2.0.1
deleted file mode 100644
index 0bd4337f2f745..0000000000000
--- a/metadata/md5-cache/dev-python/urllib3-2.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=8
-HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
-INHERIT=distutils-r1 pypi
-IUSE=brotli test zstd python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-2.0.1.tar.gz
-_eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e200dfc875e2cf512e992b6b21106f28
diff --git a/metadata/md5-cache/dev-python/urllib3-2.0.2 b/metadata/md5-cache/dev-python/urllib3-2.0.2
deleted file mode 100644
index 3444d3c2cda2e..0000000000000
--- a/metadata/md5-cache/dev-python/urllib3-2.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
-EAPI=8
-HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
-INHERIT=distutils-r1 pypi
-IUSE=brotli test zstd python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-2.0.2.tar.gz
-_eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c174aad10004c9e136c2946ad151eb72
diff --git a/metadata/md5-cache/dev-python/urllib3-2.0.2-r1 b/metadata/md5-cache/dev-python/urllib3-2.0.2-r1
new file mode 100644
index 0000000000000..784174eb1f964
--- /dev/null
+++ b/metadata/md5-cache/dev-python/urllib3-2.0.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and more
+EAPI=8
+HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
+INHERIT=distutils-r1 pypi
+IUSE=brotli test zstd python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( >=dev-python/brotlicffi-0.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zstd? ( >=dev-python/zstandard-0.18.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-2.0.2.tar.gz
+_eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=beb5d6d6d5dd42c0f8d414b2f2b8efb9
diff --git a/metadata/md5-cache/dev-python/xcffib-1.3.0 b/metadata/md5-cache/dev-python/xcffib-1.3.0-r1
index e855892b59b29..d9751b951ae99 100644
--- a/metadata/md5-cache/dev-python/xcffib-1.3.0
+++ b/metadata/md5-cache/dev-python/xcffib-1.3.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xeyes ) test? ( python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/libxcb >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xeyes ) test? ( python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) x11-libs/libxcb >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=x11-libs/libxcb
 DESCRIPTION=A drop in replacement for xpyb, an XCB python binding
@@ -8,10 +8,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/libxcb python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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 )
+RDEPEND=python_targets_python3_10? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.1:=[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) x11-libs/libxcb python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) 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_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/x/xcffib/xcffib-1.3.0.tar.gz
 _eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6d695ced4a478d93cdc2fa7838c4eaf5
+_md5_=94d21ae77fdf8f88202beefba23270ff
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index c8e818854e37f..2edcd3f05bf6c 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.8 b/metadata/md5-cache/x11-base/xwayland-22.1.8
deleted file mode 100644
index b5e07389756db..0000000000000
--- a/metadata/md5-cache/x11-base/xwayland-22.1.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=8
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.8.tar.xz
-_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ec2eaaded64304bb476b2b202a883e89
diff --git a/metadata/md5-cache/x11-base/xwayland-23.1.0 b/metadata/md5-cache/x11-base/xwayland-23.1.0
deleted file mode 100644
index 3ec6573f6a44b..0000000000000
--- a/metadata/md5-cache/x11-base/xwayland-23.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.28 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.109 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-base/xorg-proto-2022.2 >=x11-libs/xtrans-1.3.5
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=8
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.28 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.109 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-23.1.0.tar.xz
-_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1578544880f6f278df95bc9408169424
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 018dc4c7cd194..dadaf98fc9658 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-05-10T15:09:47Z
+TIMESTAMP 2023-05-10T15:39:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbs7tfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRbushfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC6Gw//fgVbysVc2rUQrp6dlEXldKC4HgKzhBNDGsqErTucG9cigEzt0Jk2EZhd
-aFY5nMpLliErYCwJDoWQy0F7IbprQj3nRoDFOS/20SEDn8JzAiE05JhRdYuccfE4
-KBAPWcIsAWjAStFwe7L1cdbkgG4rVl2kqPqcT8VlAf4q18opa7TqT4B3O8noNz+x
-0C20Py45BTYFmpNGuUMSK40OD4uajR8wqRjJxp0kouYAIaGwtUwKTNyqHOIQ5rx3
-gSIYH7VJajX5V5XNJMPTS4yk5a2DaUwOyploKlT/W5eCrpOC9oRO9i4pRAw+cFc0
-SlV2BYF6pOfGENJLpkkju1BLp4mc41zdPWeq2oLwmAmlv+LYXX1NBvqJTkN9Zk83
-dE7OtQmBC8jdL/s44uLa4Y5ZMOKVMfVBSyq3mqFVdjQ7Ibl4Oi2HSiaprwrEaxuo
-i4dgz0lHuf/dO3f1RzYRBVMzNL/mssmYAZF0Xhr2fSbb+6nd/4QVx/cIV5zhNY8j
-gtC7Q6kOKgbWtB4tZFAGxebvtFLtRjWQgnBfilt0SLMVtUjeZR3ukK40cPhwzJtK
-S8MWNk3JXqv3962EnHTlPvwNBLpP4fv7x0KDjsrLD9roFudJA1cqsC5TlCelJy1i
-3vZc+Vp7fG8rjZZAcKH+Q0lPz47KABPSaeikouBzlDj1APyfQ1s=
-=vEUA
+klCqRxAArcBb603qlcTznTTUm+ZiLS0htxcBnx8gFAu3+Q6rOMltTqOTxMJDjmNQ
+lDNF2lq2Mzp6tTbe/1K6Kl6ckpiZz4FwY1qi7L/OKAnCCG37nFHie/bA3WC07RqQ
+Q8GJfQu9md+UEOTx7IrhQ0R44Ldsf98x4l+WsOSFBpZevLVQHOJrc5LT90Pz/aUy
+szs4BrtnR+vHn+VK2r76VeifMYUQqLd4LyykEjMeh9eXMuPHZaNKgcyU92Wo3jCl
+iDtF9hwhCRudf4azuxd1CM4BKsFtjKB7fdE43hY+QYm5iwSxiMqJoMDV5eV0/qPC
+HXV82twSgp5iIgLnqbvxF6rdxCDmKTbXpxeWByG5pllgvjkvUH1ngxtp4/hC8Z8u
+q8k+w1vWDluoi4turjV0d3NcuveIajpOBB54cxDjc9D7YOZJ+yR9pFhXnCU/X4EO
+NbWP1aFK4lkld1izDyCY1g5rxxuIHW8dXH32F6JQA1m17RTTi62hMTVjL2pZ9fSC
+zRWro/P8B6biJY6YnRXmXYQWZoFUxqfegMO/dQkJEwMYBVzumz2Ko5xVZoDcUIEA
+LIxwyhwCYrUPPd6UIrEC5gl+QxufXKJMEukkb3mIHpGZNIjMPO7QjdRwwGP/pfNq
+CKEmJPVZ8RJw9EYKSLyhF+AtxEnZrcUYmZOWaIJCzltbG2EJSSY=
+=2t66
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d305b87985abc..5cc93264f8b3f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 15:09:44 +0000
+Wed, 10 May 2023 15:39:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f64a83ca197a0..16f36a0615703 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed May 10 03:09:43 PM UTC 2023
+Wed May 10 03:39:49 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e938b28505657..7c5b96fe2154e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 15:15:01 +0000
+Wed, 10 May 2023 15:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 206253f7c1de6..ea05de9b3c0fb 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-a1d2dc6ae39983c32c26414075b5bc5afddcdba3 1683730081 2023-05-10T14:48:01+00:00
+8840d4c8be04f2227756d610d4a529c33cdcf538 1683732775 2023-05-10T15:32:55+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6eb7d4fecd7df..1247c0c93a347 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1683731401 Wed 10 May 2023 03:10:01 PM UTC
+1683733201 Wed 10 May 2023 03:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 42dc203f3b440..5cc93264f8b3f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 10 May 2023 15:09:43 +0000
+Wed, 10 May 2023 15:39:49 +0000
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 2927aaae48f4e..4a495fb63189c 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index e162afe66aa10..6ee82125d9f58 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,10 +1,6 @@
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
-DIST xwayland-22.1.8.tar.xz 1273668 BLAKE2B ad1f3e0a6a3782b271653864380d0beb0db60293fb96ab8f218caaeef245967ad46ca505fb516a936115c9d49e6a32bffb725bc6c95dc98a6c4c24521c6022df SHA512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a
-DIST xwayland-23.1.0.tar.xz 1286056 BLAKE2B 19f3cee10f9b86a1ee4529f91de3125c303a771ddb00ab1d76764fec2d8d2639e20585de777741fc3706ec6e2f03a1295024cd9c582c1e4a744fa1a43d8997e6 SHA512 984213a193b903e6023ecb3144a15f483dc3e9ec7cb02c36d8e67c6859b501b8b3e5a6e1ade9cb245450ad93002322f392b81d9286377ac34350cc3ea1f9679f
 DIST xwayland-23.1.1.tar.xz 1286460 BLAKE2B 2f0095510a15eab4096696fcfdbf0cfe6814b48bd5b5666701a61bc942ce2fe00555a7d5a45cbaec2066bbbfd9b863909e0398d3d6aaab1dfc0e78d1ea913080 SHA512 21c386847135c5cb4ac884926b0fbeb6ad21c9ee54752e0cdc8418e31a72872d81032159c1d91b8afb915aaaf65e80454342461d676996b2f3c535a37b0147f0
-EBUILD xwayland-22.1.8.ebuild 2148 BLAKE2B 18cef7685e1060f847a7af995453fbdb2944a3aee5a0f516362cda8abc919c2b4b703781f0caab9cc09ea86cf9454854c349467460a1ec11b35ef03d27039a60 SHA512 0d559bb84d07b6a4d16b35c268174dfd0d4eb5ca15eef5fe0ce64187d17f9842decf40ae61d73ad8983046e66f548c698b4f10f4741d6344727402f49b0c5b7c
-EBUILD xwayland-23.1.0.ebuild 2185 BLAKE2B d3db88021aa4a3347de59b409e3a68f12ac4064ddfd6af941b96d7f7f2d5278581fc59ac2b0cc25d542723c757a0de8588028e50ddfe27b680fe20815f1c3870 SHA512 2788a3592698f906b211d237da3b20acff26050a233600e1e63a4e2c16b4c674b456368164e16af040a5bf88c02e18cbaa48c3cdbd49a78b7748bdbde86820d8
 EBUILD xwayland-23.1.1.ebuild 2179 BLAKE2B 228f4234a40c45b54699176b0165902e968021e75b284bae5afff110a3e7eb4437cd8ef651d5a98d4e47226ba87e49186118eb18a412a68906f28c25f80b60fa SHA512 2d5b47ea010a3cad00e89d914a76004bd14c001e5cdaa324ef1438a47951da51c6aab34dce8eb46dcdbbcb6f08ea1acd799c3d5cfb052d5f112e24be0c620d5a
 EBUILD xwayland-9999.ebuild 2252 BLAKE2B 33c7487e426507767c262dcd0d74aa3384bb63c2cbaf6968a57c7c259a213bbd72d4d4b6f276132f8764fd2dc42f13a9db7eeab4ae78e5e570d19cf4386f0d6b SHA512 2650874f3f640d35b8f93e73c5b3463893d1b718d713fe9c7af3a9c18c8b9025b942d96335b16d88eecdc47885bb2876ffe84726a66765515be6a675237d15cd
 MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6
diff --git a/x11-base/xwayland/xwayland-22.1.8.ebuild b/x11-base/xwayland/xwayland-22.1.8.ebuild
deleted file mode 100644
index 9fd1ecef3f80a..0000000000000
--- a/x11-base/xwayland/xwayland-22.1.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-IUSE="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.20
-	>=dev-libs/wayland-protocols-1.22
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-base/xwayland/xwayland-23.1.0.ebuild b/x11-base/xwayland/xwayland-23.1.0.ebuild
deleted file mode 100644
index d7e53ec8adcfd..0000000000000
--- a/x11-base/xwayland/xwayland-23.1.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-IUSE="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.21.0
-	>=dev-libs/wayland-protocols-1.28
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.109
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	>=x11-base/xorg-proto-2022.2
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Dlibdecor=false
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
author	mirror@stealer.net <mirror@stealer.net>	2023-05-10 16:00:15 +0000
committer	mirror@stealer.net <mirror@stealer.net>	2023-05-10 16:00:15 +0000
commit	a74cb79e1de66a9ae1a8c8b88470a758e627d494 (patch)
tree	d59d493a364507f744e41d0ad169a37cabe0cd6d
parent	0ecb6b1b009c2b09284bee3740fdde2cb531b52e (diff)