gentoo auto-resync : 21:02:2023 - 20:25:12

285 files changed, 1960 insertions, 4236 deletions

diff --git a/Manifest b/Manifest
index d47aca7ceced..14e9038ccfeb 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29455 BLAKE2B aef10cecaee845729928b74ded3b808691540736f320adc39ec49afe9fa0f5a7321c3f957599c200dfa62d999e6aaf912aea85f142549737b17f18e5a01886c6 SHA512 d87b3828185040d7f8db4322a6d2a8dd3d166d3d90fb6ab14ec0aa2adae1cf63e88627372ac793290e9fd950782cf7f85a64672f16601dab292ee7d5c6b7ddb4
-TIMESTAMP 2023-02-21T13:39:44Z
+MANIFEST Manifest.files.gz 29467 BLAKE2B 07eebb1368dac784ca24cee59e617a8b5f6fc7bf4cb7dfafecd39f0c5c57f9b90c50da0800a5460d5e3426eb681fd67f825e4c27abe7776a61cb52dbac6a0bc3 SHA512 6b867960f201a9b80020e7f3da71540347b39a1e7b2fbb8a95e8015a7f3af0dbda6894a1d3ff3ba32de8aeef53a77622b5bc72010f8cbdb6b416ad7cc10b0983
+TIMESTAMP 2023-02-21T19:39:44Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP0yaBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP1HgBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCwBw/+Ljpu86yhOXjVjrqDQiGJ5T6Xo7ZleFLXEmaOrjJW7/6BWO1YsfuGOStJ
-bmHM9saxFa1QFXmitIFG6oO6kqa1K948kmvUeQ/avt8ufYyh2Ru7Lz1owKWkRUHD
-KPeqfnLA1BTZTpuOxzEWXY1AcqwTa/PO9uXHll3+pu8IOsWFPYMBw/eEWRQQEaOg
-f/VKmetwz8Qt5gBUyCPlt8KGEC1I7qbWfIrcf2O6EUiw7cutH5OdNzPh3Su05RFi
-5y3ELhNzCFNsWlGTKmu6gwlKjBlz4hEO3PVv8Qn1Gu6ueFWGvjc8NuZIVkx3GAKn
-S5B4/Vb3L8KfHVBwjcsG1CsMoek8tcuYMwiTq8bBfejcFaJ9Bc1R0n/0yxM5G2hh
-2ZfgdzPvnLrZhtaCuQsoYplXitubSgf3ps0Io/XRRFS9SJf0xwJgrEX7mQEgo/Xk
-6u2rKTWlNo+3kPDl0iEqap31eZozvugOT7VEiG0Gio7vjCt2iUM9y2KewwP+6TSv
-h2yF91jQOCZxJd/eSCFcmUMu+qJUpgiJ2mHgdtH9G/Dp435+CO6xAX6+boZW3MYF
-qixDo65a6XZPFJOPCZYhqv4Faq5VjYeW9JBUj0gp0QnSbarjtW3T3GqUIB0l+CY6
-7oSvYhC5DtikprbtS0zJXc6H4NsF2+aZtOk15wkzAy/BEtzx5V8=
-=glOA
+klCy4Q/+MRutdZUfCL1/DaKedqxguQEzR7oKf7nrq7fjc+UUTNPuZn4M3ATDUTBs
+AqYzUrrqiR/s2jJOp00BFeapBZe+Fmp8vS8PGQCVzOsoylv1jLK9ky6PP1QS6HtH
+IeWvMpw8PHhIDX9QP5r8guOgLVPOXAhEvxX0SyLP5D1VqQIjqOIK48AuDxm4WkBG
+0TEd/mT4ApqMXCkXJzlT15/rI/202vB3+RbcgjZeF9OR/pWA/xJ2oXyWUhy+IQAj
+ubU26a17faaQCBIycn/iIczATu7FZ61HE6KaBz0ojcDVxcjVkEjJb7B8Zj2awVrs
+6QrlEY6TF/Mf4cenjSVu3VkTXG0gcoOC1WNcCbwtwS+ZC22dGI/TC7RDJkrRrHxs
+JaSBh8xZXTFC6oveKBx4lSikTgvbKvXrEpd/Yf/vS8f84r7shpuijEs8WzVbAeLy
+K36KcRuzNqnQJ6X+weFMIz9aM9TpjOkdnUg7wAgENPb5uNgA8/Nwv8Dw8R5sXBTy
+NVumC8OErQO4SFqFNgeDYyHS3AqWnx6oBQXOZHHq/uBIoprscQzpl+drZARXEaGo
+rtPVVEFOZoBx14ZE1Zr5c9teC37JFCeJ2vpXIwgkSOW9slUvSHW1vRamK2pSsQX6
+MYjkyf3i+pRLh7yXmwQV5qirf+RaZ7kDBY69hpVvdeKlO63NxxA=
+=LvpP
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index afaa3d6a9a75..8c847d7aed85 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 71d88c224131..fc57cc41d7cc 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/cni-plugins/Manifest b/app-containers/cni-plugins/Manifest
index b71d6dcf4c6b..54e6f1671df1 100644
--- a/app-containers/cni-plugins/Manifest
+++ b/app-containers/cni-plugins/Manifest
@@ -1,7 +1,9 @@
 AUX cni-dhcp.initd 376 BLAKE2B 5fe40f28773ffbb12416b40e3813578d28787e9ee26ec4a62b2d3e834920f43fedd0bc985bb412c9576c438367429c835b6099f78f017932b6cdff9341e3f356 SHA512 3475f7c6966b9afac6be52c705286b235a59847748aad5c602162589d4ee1193acffc5965c9130c311e318d06f62a3930d5eb1a70b118a63270f4241f8c4fce8
 DIST cni-plugins-0.9.1.tar.gz 2703099 BLAKE2B 878f476e62f12020b39d33a79723fe246b34d80705d3a336573401743392adca9a57b196d6d191b4a6f281110f47ecbb1525aacd91cd488bea61c7aaed12a6ef SHA512 24e8fcedbff2ae7a83aa96085b546b164de6a0884d593e3b5386e9d2de3c4d9a215db9e9405332020cc45c371709a32b600e263e4f8dee62c51adafdc0180f24
 DIST cni-plugins-1.1.1.tar.gz 3076064 BLAKE2B 2fd70260995e423d2b4ac3a8d2135074baffe5d36177d5e1e5a9ce146f6d2ecfeb3b843de62e43f863085ff965be4160cf5f4cae892d3c59070ef390409ef3c9 SHA512 03da31caee5f9595abf65d4a551984b995bc18c5e97409549f08997c5a6a2b41a8950144f8a5b4f810cb401ddbe312232d2be76ec977acf8108eb490786b1817
+DIST cni-plugins-1.2.0.tar.gz 3365015 BLAKE2B 6b487a9c9b240c73510f2bc6aaa4a6c79055e43cacca8204781dbc65d231164fed9f3f68a2a0cead7a41a67bfc9d9e4480b488be26415d368da007559a721b25 SHA512 fb6fb4f46ac1610b3721f5f3a6ddfb096cbf2e5d5b792306edca5351a3944d2f802170d83e5adec01420395bf64fc8a174ede61ac9b93b5ac6b938a4b48651e6
 EBUILD cni-plugins-0.9.1.ebuild 948 BLAKE2B 340be886eb779358a8a7f6fe7a94bbc45dd53e51b65f729bfc1eb614e2a8e7db1b7b19622b75b8fb382882ce6d4915ab1b9a3282b7cc76de7efbfd07cea40fc6 SHA512 0a25abd6833e459576afdc3174afe57491a86b5eff6aba6d718db439af1acd983ccc769619448683ae42b57a561a785599146a9f6423dbae7395c625819739cd
 EBUILD cni-plugins-1.1.1-r1.ebuild 1119 BLAKE2B cdff1f61f07687a78b846e69766519f53b6f06f1624c13835658d430ce74710959db3a50c6f8d893855d02d91c841c75b7caed6d49b128a5f3ff931fa92cbfa1 SHA512 8e4493e5720ba4726285b7aaf90c55378b163256c7c92bd64e029f8dadd1b2327dfeaa06bb8d44ff9e3c099c82fc867845dfa3050d49a436b47a14f06c27f372
 EBUILD cni-plugins-1.1.1.ebuild 1026 BLAKE2B 43b5cfb19b0f5413ae5a34168c29746cd9994a29f75b062189ce7b21fca28c504509a7778f302355d6ab9feb4717111a78adefd93a5a401fedb439f9c16c29bb SHA512 8a177cfb045ccb108abde16e90f61bda39bec7227e9161e8957f37c8049004cad4628b5dcc82bb98e789f56856d38e9c27628a57d473b4ad843329072470362d
+EBUILD cni-plugins-1.2.0.ebuild 1119 BLAKE2B f5534fbe2d24ffb0b24c860ff713a9dd81d2db48b39561a812f98cce7da45c096d6af879e4f199d64e7c39fe4997bdec6d130c44c6c33b71b7374f7bc2798a02 SHA512 a5c49edd662f1a8fd2b4826bdefe56aa5a1de78e40ac0fd3154b4b014e4b7319b936959b10f41e6ce298340f14cf591f66bb98f105b1d2628c11d91246e950bd
 MISC metadata.xml 351 BLAKE2B 3565fe13764f828aed1288724a2939be57e523e0d0a9ccf3c091715e6f1e102155a7fa28191a3c87d669d51a0fa087a89587d83fe6c4747d5d9b31da11c1578c SHA512 6cfe3058d20387245c2f4823c7629d464115783e3c9ed1e45769d6e13f2f35f94656c66c0b1572f8eb229e6bf43510dbc35d117d6a3379e15b5b6ababc077856
diff --git a/app-containers/cni-plugins/cni-plugins-1.2.0.ebuild b/app-containers/cni-plugins/cni-plugins-1.2.0.ebuild
new file mode 100644
index 000000000000..b21d3a20952c
--- /dev/null
+++ b/app-containers/cni-plugins/cni-plugins-1.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module linux-info systemd
+
+DESCRIPTION="Standard networking plugins for container networking"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="hardened"
+
+RDEPEND="net-firewall/iptables"
+
+CONFIG_CHECK="~BRIDGE_VLAN_FILTERING ~NETFILTER_XT_MATCH_COMMENT
+	~NETFILTER_XT_MATCH_MULTIPORT"
+
+S="${WORKDIR}/plugins-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+	dodoc README.md
+	local i
+	for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+	systemd_dounit plugins/ipam/dhcp/systemd/cni-dhcp.{service,socket}
+	newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp
+}
diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index 15daac0eeb3e..0d1c604b6cac 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -1,5 +1,7 @@
 DIST skopeo-1.10.0.tar.gz 6460856 BLAKE2B b904a161334ef0a3eaaab8c58f0c7e4c507fa68a09f8fa8235e8a9222d48c98874c9ce878a509e2816f210ffb37dbf707ff2653212e1efbd9ad6686efb97e147 SHA512 0d64e7f12a0d10c81074a04b6c74ed6e7213f598013f1ba672c4c696e9dad5827f41f41bb817263bf8606cd051b8e24e7eab65b95d73d8a1c8bbb3eaeb9defdb
+DIST skopeo-1.11.1.tar.gz 8071084 BLAKE2B 2411db318e377cfcfa9a80523c0bd4900201b1c17a4fe0f875dd78033bd4241e6c806816746ef77304e2edbc3737a3b22cfa83b83d65eb3c462cd5437de4e0b8 SHA512 521a2c8ddf629e361340a51d95200ec67bc4fef814e0449b6d679725536ec9448827229d4f993276f084269c2ec73c1b4edf97c0ce29122d950d350ed623a4b9
 DIST skopeo-1.5.1.tar.gz 5636533 BLAKE2B 7f0e86cdee5c3250ec1280d7e71554ac2f8ad96ababe0e81dfabc00e8c128a13fc0c9c561b7a9be389d7386e9f664b95118bd2122612b9c2e8844db49769c03c SHA512 3f8c730eaa739bf2a29b82d3b04aa4eee1c09f957b61964fc8c48e59d1537bcb87b5bdf9c18fa48f9d36cf2b7ede3a1448918a20b5a3167f6ce09881a6cd3dde
 EBUILD skopeo-1.10.0-r1.ebuild 1066 BLAKE2B f55aa099a396fca1f8513786c48929923d7419a08d232ba910d65d325c5f31c2a4fbb43487d3585c36098375687897f07fbd9e7274edeb4e1b7bf5301dba040d SHA512 0109637023cf52163bbdc2a30fbd086f514a5bd77948888ce30a7824cf4472c46f98f6011e9a0302a054578e5bb812d2b495dac041a060bdb26abbbd034c27bc
+EBUILD skopeo-1.11.1.ebuild 1066 BLAKE2B d304dfa99199b32528a24710a716ab757f9670e4b474fd48c5284005a0a01cc457af1d3882572f27aa81eadb058ec495c7dcebf775dec238ae4b44f0d748d0d0 SHA512 14ad618519d078c4f539afdc3595bd80a1fd102e21abd231f71a530de5019557d915a6809ce1cecb7dc1ee6be57ee9a5b12add0fee1fc8d7325fc2f1f567896b
 EBUILD skopeo-1.5.1.ebuild 1403 BLAKE2B a4c236cb6248a1551c90683a45247d19d5634ca7e9ca801761953131f73a7bd0058ab5bcea1d7b2593229eb20c6482e2dae833443227467daccef020b23b5f88 SHA512 b163486639a8831eb20db3a5906378485f0aaf3299e815217b1c8a2f4e27ca35af0bda40e6265a7c58107588cab429c0044717666cd22c43e8e21c73a75277dd
 MISC metadata.xml 425 BLAKE2B 7f6ee6b669ae19cdf0e807a7a88a4e2573e94d36798418a037b78d5e3219a4d45297b841c5ca239e064de564a95ffed69758687adf44e0be0df5ac86c7516412 SHA512 f0954bc3db4e4a0e69149f89af269e70d074cbe7dde6c9161c5ced959f236eed7ce32d777970d5b103a6b880445842f38b680b4c69f12ca512a12f27dd0cd1eb
diff --git a/app-containers/skopeo/skopeo-1.11.1.ebuild b/app-containers/skopeo/skopeo-1.11.1.ebuild
new file mode 100644
index 000000000000..2b81a31ab111
--- /dev/null
+++ b/app-containers/skopeo/skopeo-1.11.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+COMMIT=fb1ade6d9e9b501e35b09538c9533fac5dd604b6
+inherit go-module
+
+DESCRIPTION="Command line utility foroperations on container images and image repositories"
+HOMEPAGE="https://github.com/containers/skopeo"
+SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="btrfs"
+
+COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
+	>=dev-libs/libassuan-2.4.3:=
+	dev-libs/libgpg-error:=
+	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
+	>=sys-fs/lvm2-2.02.145:="
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+	BDEPEND="dev-go/go-md2man"
+
+RESTRICT="test"
+
+src_compile() {
+	local BUILDTAGS
+	BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)"
+	emake PREFIX=/usr BUILDTAGS="${BUILDTAGS}" GIT_COMMIT="${COMMIT}" \
+		all completions
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${ED}" install
+	keepdir /var/lib/containers/sigstore
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index eee9d6930989..5e6d27b31a89 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index d8df0a3fc683..9ec92868014a 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,5 +1,3 @@
-DIST yubikey-manager-qt-1.2.2.tar.gz 17311287 BLAKE2B 115dbf18ce0bfd48a1b172153d9770a3bde754b1dbef55ee1ec9480128305b9fb0d52af23906a6f6040df71cc4d3d4be216615fc3807395f7e7be1615a5568da SHA512 dbac2d51b198ab15051790e080ad92aaef4b0d44596ad136115469e7bf038d6b56d1bfa78a69d1fda3644543f9762051767b8a1fd46a80f2f62ecf836f7df3d8
 DIST yubikey-manager-qt-1.2.5.tar.gz 17360184 BLAKE2B 3b9d41e80fe81fe3f394d66ab3c2c8dc986fae0df5f51f184186ce800177aec5f7708e9b03259b5f9f20530cba66e5a73355135dacb51481e1169f7129fd47bd SHA512 e204f393a939bdc8bdec481b1a401c3f99fc364706dc4efc7460286a9bb4e5aa51496a92015a4b328eb948084135e95bb30f3f043ed742293799b6650915d6a7
-EBUILD yubikey-manager-qt-1.2.2-r1.ebuild 1412 BLAKE2B 44ae3de97b8cdd54420c1820282e9066b833f7198ce7ccae0cfa9fa6df4b8ca3df65d0bb7810ec4546f0f076ba7ce9e51071daeb2358f6cfcbc0d08e6298a096 SHA512 a9a7d5200bd6f32054bb43be081de6e4e63a8593aa0c94ee061591e34585c634fb3efa8549205ac3ce789d55be884865f198c89dc645b51b6951b73145366ac6
 EBUILD yubikey-manager-qt-1.2.5.ebuild 1413 BLAKE2B 1e2cf140f3eff40b6c697633dcf7715a0f05b5caa866dfd51ebb8ee8942bff5b8548a60e22453d183ebc3973724fcc8fc8d7203ef3e3b82e7d2e13c15dbbca1d SHA512 02556c24d276741562776881756b4fbff45dac02021d53a69d61515f5255045ce676d745125fb370c22e270e4f0739215f7a851cdbae61456f1b2a6ee8451409
 MISC metadata.xml 348 BLAKE2B 4f53e607c12f5c201a7e9b6ad7bc8e4ba948dab3b3e0d9cb3aaf7c66537abff638f1873f2723da85587dd3ac79ac88c4b9c679441e3be7dc49e7eed78ddb27f9 SHA512 e8391ad187535f95e8de09b40177858d62612547723aeaec2487da991a79aea4752a223aa225d3a2df810cf1ec4efc7b694277f2e7db954f765067de69ecd83f
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.2.2-r1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.2.2-r1.ebuild
deleted file mode 100644
index a9ec99ba5fcf..000000000000
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit qmake-utils python-single-r1 desktop
-
-DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt/ https://github.com/Yubico/yubikey-manager-qt"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		<app-crypt/yubikey-manager-5.0.0[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-	')
-	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtquickcontrols2:5[widgets]
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/ykman-cli//" ${PN}.pro || die
-	sed -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
-		-i ykman-gui/ykman-gui.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	domenu resources/ykman-gui.desktop
-	doicon -s 128 resources/icons/ykman.png
-	doicon -s scalable resources/icons/ykman.svg
-
-	einstalldocs
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 1af63ea8c5f7..6b2fb7bece96 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/pyvim/Manifest b/app-editors/pyvim/Manifest
index 3f3c2d6ac25c..62b89dff3fce 100644
--- a/app-editors/pyvim/Manifest
+++ b/app-editors/pyvim/Manifest
@@ -1,5 +1,5 @@
 DIST pyvim-3.0.2.tar.gz 35227 BLAKE2B 8edc2218b3a0f2ba922531b75f65a5273ad9a2697f72ecf994cf7d2406c6311c3f28b22b6adb1243150a90db74962256ceaa7cf47ec99c2388299742451d6efb SHA512 da961342ba52e5beca44a607cbb923953388e8674409db9ca2b152017eeedce84f92e42a9f6d0e5019c5c4d88d82f4a987cb378f311cf84a169cefa54dc5efce
 DIST pyvim-3.0.3.gh.tar.gz 492633 BLAKE2B d62f1db2ec4af635841d18c860c5ac571c664116c539bab87b5f00a9c15b1f37f9dd53649d98a3d21d3bec9df0af46d18443eb1b34961d0971a7ed75df6a8c74 SHA512 0af9b772b97c21b8a9fe966497849eb83c6f770a212b98c7f261309f2f70d6cc8bcf2175660bee5c44850d6c805570946a79fbe9db7f1ffa8e20e19ef61a0635
-EBUILD pyvim-3.0.2.ebuild 849 BLAKE2B 8ceb1018d55ad7df8c2a24b0c13dd964565a484152f8076cce2aae2ad29e9a260661665dbdf2aea388aceb704d3ad8c5756d397815e702949631ddd77807b47f SHA512 197082703be2af1feff0d9b09e716e515c854ed0a40285e574f2b43c89e84b6414e1e3fdf1d0f8159b32a536d6c73673073498e6edb46df10413887fbfcaf536
-EBUILD pyvim-3.0.3.ebuild 1013 BLAKE2B def77dcff30f10a74c033839ffa34faaa2a45276d78f7fe8781bee88401e771859c9f3a280ad3512dae0586a84fc0692386e02c87ad51c2e4ad1e1e0bcc207d3 SHA512 59268f099771f7b50f8a186b5a02a9d83a2d4cfd4fbfa9b1808f198f4c6b34f4b047e4ffc2441bdbac7b550af284e19551a3480120eda18aeaa2e8d621e67f7f
+EBUILD pyvim-3.0.2.ebuild 849 BLAKE2B 5c08895d06b830160b61403451d840bdb1d2895a8a8e1f06160459a823d02f490df907d2ee6c165c1b2d023d0479b0acadde751d48aa82dda27731f9137597db SHA512 3210501d06d5170441ccd3dcdb1878d30b352258073daf8b63bb01eba7162acb72b26c95adcbc4b2e0e090b000e2af0c733c5b9cfc750975d574e7b696cba7da
+EBUILD pyvim-3.0.3.ebuild 1013 BLAKE2B aa4a64282705cc8045f42746456c6937dd44e8bde5e615a3588f8d245673d5a02bd9372d15be14b5f8596195948d4cf45970ad0d914ebeea7f722d84e65259fd SHA512 5599ec2aecd3282272fed94776fad491843054aefe00aec0f54b1b199e8ed56a66379aeb7d7c2f1aeee583c4244709d97fdc1fbd73313d1b264a8a1494a2d257
 MISC metadata.xml 490 BLAKE2B a4af1d63730b2d7d6621d0a6fd3f4205016a940cc47d84ac48a692aa2d27c075f146d6a3d2581558af19cbab614fe47d9f9cb3679899387b2dc84b6b0f52c3cf SHA512 5eda2f764c81d21304541fe5d8c8330535d94b382b8bb94e9d15f01c184d4e09a6780dfe3745d4e3661c56e5a5a564147fbd4111fdfdd12b7075e1b9ad06488e
diff --git a/app-editors/pyvim/pyvim-3.0.2.ebuild b/app-editors/pyvim/pyvim-3.0.2.ebuild
index fb3ea34be2cf..3c28440c51e1 100644
--- a/app-editors/pyvim/pyvim-3.0.2.ebuild
+++ b/app-editors/pyvim/pyvim-3.0.2.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~riscv x86"
 RDEPEND="
 	app-eselect/eselect-vi
 	dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/prompt_toolkit[${PYTHON_USEDEP}]
+	dev-python/prompt-toolkit[${PYTHON_USEDEP}]
 	dev-python/pyflakes[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/app-editors/pyvim/pyvim-3.0.3.ebuild b/app-editors/pyvim/pyvim-3.0.3.ebuild
index bb5c22739b27..b7b0ce362859 100644
--- a/app-editors/pyvim/pyvim-3.0.3.ebuild
+++ b/app-editors/pyvim/pyvim-3.0.3.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/prompt_toolkit[${PYTHON_USEDEP}]
+	dev-python/prompt-toolkit[${PYTHON_USEDEP}]
 	dev-python/pyflakes[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 0daa07a7b3e7..e4dd6620957e 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 9080a88496d9..f83fe02a2bc2 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,9 +1,5 @@
-DIST VBoxGuestAdditions_6.1.40.iso 63883264 BLAKE2B b9a22604b7dc135e9944bb46e7fb59e6202e692dd75de89763c6fe432328f65bacf4d893221a5e6f90ed3236fd36af2f6608932402e0ae967eb1ed24f6b1153a SHA512 149311a826c20f9bc8212e7580d3b552b4cd82f7e9dbaf4e44f363807f8132f0a81eb39082fc8876fcd5fb527d7d7c8ae1b3b6d8372b9bb39273d88fbd84a185
 DIST VBoxGuestAdditions_6.1.42.iso 63946752 BLAKE2B 56cb4bcb256e9def35fa0c2ff2b9cc18ec52d8d8d5def2b2619861a0bee18970314b7c26a8413ba8317183612d0f4762d7b20524d4422ccdcf11e82455aed238 SHA512 b2bbe3e3defc1131eec1769b508fd604835ba0e28e4b77ddbaa838ee6d3b0b8a0b89841226750cc8b7dc8b5fa918b613b6c9083449cb1da9b6fe1f410d501315
-DIST VBoxGuestAdditions_7.0.4.iso 52969472 BLAKE2B ac8d724fbbb928bf0ddb10994ec2d4cce31ce0a95f4765f663ade0ab459685e384e86224057705ae9820dede0b69a40018ab481ac6bb1eec3f4bbccbcb395a20 SHA512 cbbc2141a7d98992fa07756fdaadab49c8686d181037db675ceb9b8c3257edb05be1d3183198255259c93b5e01b5eb72a118a64a04051197edfe179fd2ebeac4
 DIST VBoxGuestAdditions_7.0.6.iso 53049344 BLAKE2B df18a10dd6af3b4fd6a7d8e0d14b70d3a93274eb60b41e419c69ffe68bac3e5780782c32ace3a402c7755310f614ab42560d969f016f89d2ef5e32e06a6a260c SHA512 ba948b05209cad10d0772009af7529339faa44c31f75e0e10811887bd280f5fb7ed545dec315380ea99532bcbfc72833740c3c8b55502e8ec883d809c2bce47f
-EBUILD virtualbox-additions-6.1.40.ebuild 616 BLAKE2B a27ef3f2df7299725bd7cc949692f730c14926e3e6c8c2891039c381232e884722f8badcfc01148d23712a1d471cf2c112172e3e036458f04c6edee74ce495fa SHA512 3d4f31e4347d449e0e3713b977086d1f9d9bc1bb547c847a061656689eb07a8d15e89b2586b78146ef23d870cbda1d56158159a878320b1f88199c9ca75ef9e6
 EBUILD virtualbox-additions-6.1.42.ebuild 567 BLAKE2B dc91227571c02c0556289d93bf3d862c6a06493cbeb92938c56f1ba5b47541f99726aa626b383c23d477d915c2d99e01b8014c3d0f807b22929aad8116886dfe SHA512 950099b0c5918477d47e74deeb4c1501e2f110b3cbbd9c132b71e1ea792bd59197d0d23f1dc0d93b87d98998210f77fcefeab620136e17fcfe2d8dd545acb0b4
-EBUILD virtualbox-additions-7.0.4.ebuild 774 BLAKE2B 69545aaf76b1b97dfd2a30c7a4028b02af03798c0c748cc0bc53958d167c6c6cc119c23f36b22dbb98aca6bb45a51d91eadcedaf4959bd4ccc0022c6adef5135 SHA512 86ccab5c240320d66d1fd69fc6566f1eafdfc0a48398372d277918006af6ee9c6d14af986ae74dfbcc2c6cbc6cb683f1ef2765f11bd3d8d0b2f2169172748812
 EBUILD virtualbox-additions-7.0.6.ebuild 555 BLAKE2B 2825d0a87644c02f55a5b0cc1cf70850309ae5e0db3f94dad42f8157a170abb09242bb7336c1a0ec600387141903c4d9fb7fc61c54bddca459931d6c8a9a9dac SHA512 a1c8d1d38d6e27b78019456acdaf3fe47c6863eb03391c1c1670015637d40320d24bc90f9f4d865e7d989a47e6d9b72d9150f716afe4bd2c8ad4c220f174fd3e
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.40.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.40.ebuild
deleted file mode 100644
index 48dd1cb5ae28..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.40.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.4.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.4.ebuild
deleted file mode 100644
index 34d21d9e0b60..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=VBoxGuestAdditions
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
-
-# Reminder 7.0.2:
-# This package contains only the ISO, so the license is taken from COPYING
-# But if we check the source files, some still use MIT or GPL-2+
-# File a bug if the situation does not improve after a few more releases
-LICENSE="GPL-3 CDDL"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index fcd47224199f..3250e0d317cb 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,9 +1,5 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.40.tar.gz 11233264 BLAKE2B c169747b6c0214bd850c5e639d5245e2084701c1ee764e8798a779545d95b8eb8ec0cf4622d5156c0a17126a6a522d041ec126984062b72e71a2283ae9652bd7 SHA512 6d8ff0f7f0c4eaaf9c6fcf965133fddc1d4057cffb98a10ade6cf0065e9f656bc49656bb3ac817694cbf9ca2fb4226f3e9ac9b1383ab07cdcbe05ffe18809ce1
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.42.tar.gz 11233419 BLAKE2B c380b83ae5e5cad91f83ad99805bd8627b3e1101840cc8bfcc352fdb44369ff73f7f9ae2503e3fb4aeeac2ce4182e69273a4758eb6c71dd60c89cfcadcc22cd1 SHA512 9b5643a37319113d7f9e93c49d88d7aef319060a7be4bdfb0f09044916f03a203ddeb6799b7d99c2c0f83faa7f610c72058649ef763af18f662781f8e0c10f83
-DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.4.tar.gz 18515711 BLAKE2B 07e8ef3d638e7985830b78147849ebada0a4f2140458ea76e236dac53efb867135b860d5c2d29545f4127de934d2b059be60849466cbf6763fcc558afaf4786a SHA512 405042ae9aeff48ce86ec6f7dba294a8be1d26e0a4b1c5a85daacc231d64243a30f301ba6a4108546a8a4b702d01b109bc0936abded572f71bdd147c178615a2
 DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.6.tar.gz 18539414 BLAKE2B 5610d3a40a8e2c785821f2d38e498b4330db70700319fef056ced37cffc51492721bb7d796d94e94867f3c7c0680bdd27c2379938dd50f9de372a25b113fb5d1 SHA512 cc1c928bba49c4a851705036b81e7bd7a5e2348311eb80c6c880858d029db4df5e8720227292e1f8a168ca8be6e8479e3f5a02dc4d9800233e9b7623c602fe7c
-EBUILD virtualbox-extpack-oracle-6.1.40.ebuild 1067 BLAKE2B 5506b06258807476a1713cedcc547d79a09387c752d7eb117db7a2745ce3748e035de82b4708bd0d36f80a9262beec76907ddec87493dd4aeab43e0145ca3c74 SHA512 82ce2b700e39495e56698bfec0d3d4725c0f1e4bc59fca8ae0a2cfc6df02956d341016bf8a34c35ea83f4572f144fceca65508e7e1d8c6b2f8185683832489e2
 EBUILD virtualbox-extpack-oracle-6.1.42.ebuild 742 BLAKE2B 9d21636185a31f656ec1ea779b7e5ebf475c39256b94541af1d8d32ecf0b33fc703d461054957441bb9b2e22a403a90fc7555acb06e06a798d4047da66d12ccc SHA512 75928ea546071159bddd68cd585d5821d8ceb179db21b5722cc68b7323181e600825117409e051399b86c2d1b7f471c7246dbbda74dbbc84aef351cf48fa1345
-EBUILD virtualbox-extpack-oracle-7.0.4.ebuild 743 BLAKE2B 83de941643ea5fe124995ca83aff5e0df3033b1a520121387030dfd9b6828df9ff36c5cb3cb65d3db4f335e893c5a0bf5c06aec8682865305503723767e364ee SHA512 e6867d06e4c974a117ec764c068421aec9e2b7b388b15a97522e05a7d6cd5279ed634beced0247fad3c8c361ca75ac8cf796594aef7e5530eb064110a9eba049
 EBUILD virtualbox-extpack-oracle-7.0.6.ebuild 742 BLAKE2B 9d21636185a31f656ec1ea779b7e5ebf475c39256b94541af1d8d32ecf0b33fc703d461054957441bb9b2e22a403a90fc7555acb06e06a798d4047da66d12ccc SHA512 75928ea546071159bddd68cd585d5821d8ceb179db21b5722cc68b7323181e600825117409e051399b86c2d1b7f471c7246dbbda74dbbc84aef351cf48fa1345
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.40.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.40.ebuild
deleted file mode 100644
index 831ab0b169c9..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.40.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-#VBOX_BUILD_ID="$(ver_cut 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}" #-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL-11"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE=""
-RESTRICT="bindist mirror strip"
-
-RDEPEND="=app-emulation/virtualbox-${DEP_PV}*"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.4.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.4.ebuild
deleted file mode 100644
index 7ccc70b0aef8..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="$(ver_cut 1-3)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL-11"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="=app-emulation/virtualbox-${MY_PV}*"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 1019562d9260..34573347b825 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -5,13 +5,9 @@ AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e
 AUX virtualbox-guest-additions-8.initd-r1 547 BLAKE2B 1b26fc26e95baa74d551f8a9cf62f698485d63a0487c4cc4fc9906b8ced191f078e2b794ef9db9488de9e92188c73812c16e37ff542f06e0d52a4dc62b631960 SHA512 81ccc8d3edd965feb55290cf1281a97a485f14fd1de07cd59479bd7746291d41abc45c2e7e209f17f7df057528be83c48f3e270b526e6b86d85c5ec4be2d3944
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
-DIST VirtualBox-6.1.40.tar.bz2 165769795 BLAKE2B 5c216f23422be3fc4f7760881c666c57a516d12726ed8ef040bbdf918f1af53c69d204b22949e25f751cbe788b00c810c49c27b7c51c1837fd1c503a3eff202c SHA512 0dace071fe58500d0912fe4da4751de6840752375039554a56c8c753a0880a419c4a1ed7f1b0ebc51230f7099ca3f5d987dc7b91ad4d98dbd75bf63e3c27e096
 DIST VirtualBox-6.1.42.tar.bz2 165554573 BLAKE2B 8419793d9e4c4d0804baba926443a27259b012ab90d1bb27c8f9d90b018ddbef83d1cc47e9f5b88e6e247f22c186603584a5ddee4b0c04fe842eba56f3fd103a SHA512 a4861b44ee85d6d1d72ba1d19b5598873503feeb6d562cf7d8c770cc9b466741bdfa5abe74dc4e7952ff189d14c6caf60f584731492c38f688a360baba019ab2
-DIST VirtualBox-7.0.4.tar.bz2 199658172 BLAKE2B 51bde109805e8f3e25f179a05fac532de7a428010955c7cc2a7c9e8c072246d69c5f51f8a51e39b6a1b9f246bd945edc38e0f0cc0630c357a5e9641c38dcac21 SHA512 70f2031c4897249177131795281bf6bd5a75166067d1921db70fd1e21f5638285b5a0c3298a7070e272ac2f093a60c35eb3cab4e5f7d16a68d17b211f637b0bc
 DIST VirtualBox-7.0.6.tar.bz2 199512172 BLAKE2B cfe4d7abd57dfdb0294177759e80aa9fda797b9b5433f214771a57764cb23404450169e8c7c30cda13de85b8e02a37024584c7b1f0b5a44b10b100aa66b8d5c5 SHA512 f9db7a154e392f550f50abe774fc6263eb0b6f86dccc069f2c5012fedbe2debbf5b8ba62cca44ea0d5d5475652188176bfb888266f69197677b22854f02b64a0
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
-EBUILD virtualbox-guest-additions-6.1.40.ebuild 7752 BLAKE2B a16fdb2fb381209101aa022521ebf81d91064d87a8b184b6988bd18f1f3f5bc05bd5fdb8865776bfe210be127c74c913e34eff42aaf30192725fdbdf70201b49 SHA512 c813bb0e76300e0ab983dbde2887e2233fca2baeb3f76e97478f12f164ab6f146e5016429820a43a44d7b7d23b16f1f60ff5e1f9dfdfa17426d0fd579a059f42
 EBUILD virtualbox-guest-additions-6.1.42.ebuild 7509 BLAKE2B 9eaf9e6d485c0121ba1ae1179c6d37ec217f8f285e0c6aa5a228feaea7bea0b0b3ee82a155de1a8b3bd4c4dafc1136cf0d064f75a60849fa9ae3981d24cd0237 SHA512 2a5186cb2019ce796f31dc4d2b5e1cf431cb898122e3829ca1b7b94129e664fc818c0c45b4ead109b49bcdfe9b7cfc4318beca9b04d2bbad5e94d31887c12c85
-EBUILD virtualbox-guest-additions-7.0.4.ebuild 7842 BLAKE2B 66cd32709fb09682bf84aea1a4c731170b95b6c160d818febf603724a4b54807168138587105be9c177362bd67f484ed6f36c2ef240b9981070b4a512e7c93fd SHA512 86f01da33cea82c0e00dcf317c18526424e7f5d12daadd6b7a103b3afd674f8d14a2133e1cbb7aeb0e5de66e389e9b703ebee01578c4b0625c2211fba55e3ebd
 EBUILD virtualbox-guest-additions-7.0.6.ebuild 7868 BLAKE2B 5a75a2bda3ccd8640b5c87c2f108a7e330368144cb963920d5de9c8cd2ba6519da23cdf139aa85771636efeaa1507c272d559f8380674823b69ca57d600646ea SHA512 bcf48fe5b3f022d7b3727ed5e66a20263477760cbac8e79b67f985bd62387a6cdbe1ba7367702c01d79392bb4bb0f4979479f1fa0bec72efbc70273ebffe8fff
 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.40.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.40.ebuild
deleted file mode 100644
index 90ed39cc4aaa..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.40.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo linux-mod systemd toolchain-funcs udev
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="${MY_PN}-${MY_PV}"
-[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-RDEPEND="
-	acct-group/vboxguest
-	acct-group/vboxsf
-	acct-user/vboxguest
-	X? ( x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE )
-	sys-apps/dbus
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	x11-base/xorg-proto
-"
-PDEPEND="
-	X? ( x11-drivers/xf86-video-vboxvideo )
-"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
-VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
-MODULESD_VBOXSF_ALIASES=("fs-vboxsf vboxsf") # 485996
-
-pkg_setup() {
-	export DISTCC_DISABLE=1 #674256
-	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
-		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Provide kernel sources
-	pushd src/VBox/Additions &>/dev/null || die
-	ebegin "Extracting guest kernel module sources"
-	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
-	eend $? || die
-	popd &>/dev/null || die
-
-	# PaX fixes (see bug #298988)
-	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	# Respect LDFLAGS (bug #759100)
-	sed -i -e '/TEMPLATE_VBOXR3EXE_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk
-
-	# Do not use hard-coded ld (related to bug #488176)
-	#sed -e '/QUIET)ld /s@ld @$(LD) @' \
-	#	-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	eapply "${WORKDIR}/virtualbox-patches-6.1.36/patches"
-	eapply_user
-}
-
-src_configure() {
-	tc-export AR CC CXX LD RANLIB
-
-	# Build the user-space tools, warnings are harmless
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-
-	# bug #843437
-	# Respect LDFLAGS (bug #759100)
-	# Cannot use LDFLAGS here because they also get passed to $(LD)
-	cat >> LocalConfig.kmk <<-EOF || die
-		CFLAGS=${CFLAGS}
-		CXXFLAGS=${CXXFLAGS}
-		CCLDFLAGS=${LDFLAGS}
-	EOF
-
-	edo ./configure "${myconf[@]}"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_ONLY_ADDITIONS=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		LD="$(tc-getCC)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_CXX="$(tc-getCXX)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-		#TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-		#TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-		TOOL_YASM_AS=yasm
-	)
-
-	MAKE="kmk" emake "${myemakeargs[@]}"
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	# Move this here for bug 836037
-	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-		doins VBoxDRMClient
-		fperms 4755 /usr/bin/VBoxDRMClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	dodoc "${FILESDIR}"/xorg.conf.vbox
-	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	udev_reload
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	udev_reload
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.4.ebuild
deleted file mode 100644
index 80481e7a3575..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.4.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo linux-mod systemd toolchain-funcs udev
-
-MY_PN="VirtualBox"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"
-
-# Reminder: see the LICENSE related comment in app-emulation/virtualbox-additions ebuild
-LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 x86"
-IUSE="+dbus gui"
-
-# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-# TODO: find out what this is, remove comment if obsolete
-
-RDEPEND="
-	acct-group/vboxguest
-	acct-group/vboxsf
-	acct-user/vboxguest
-	sys-libs/pam
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	gui? (
-		x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-	)
-"
-# some libs here are indirect dependencies, and also needed at compile time.
-# keeping them in DEPEND to avoid warnings from qa-vdb.
-DEPEND="
-	${RDEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-base/xorg-proto
-"
-BDEPEND="
-	>=dev-lang/yasm-0.6.2
-	>=dev-util/kbuild-0.1.9998.3127
-	sys-devel/bin86
-	sys-power/iasl
-"
-PDEPEND="
-	gui? ( x11-drivers/xf86-video-vboxvideo )
-"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
-MODULESD_VBOXSF_ALIASES=("fs-vboxsf vboxsf") # 485996
-
-pkg_setup() {
-	export DISTCC_DISABLE=1 #674256
-	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
-		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
-	use gui && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Provide kernel sources
-	pushd src/VBox/Additions &>/dev/null || die
-	ebegin "Extracting guest kernel module sources"
-	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null
-	eend $? || die
-	popd &>/dev/null || die
-
-	# PaX fixes (see bug #298988)
-	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	if ! use gui; then
-		echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die
-	fi
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	# Respect LDFLAGS (bug #759100)
-	sed -i -e '/TEMPLATE_VBOXR3EXE_LDFLAGS.linux[    ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die
-
-	eapply "${WORKDIR}/virtualbox-patches-6.1.36/patches"
-	eapply_user
-}
-
-src_configure() {
-	tc-export AR CC CXX LD RANLIB
-
-	# Build the user-space tools, warnings are harmless
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		$(usex dbus '' --disable-dbus)
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-
-	# bug #843437
-	# Respect LDFLAGS (bug #759100)
-	# Cannot use LDFLAGS here because they also get passed to $(LD)
-	cat >> LocalConfig.kmk <<-EOF || die
-		CFLAGS=${CFLAGS}
-		CXXFLAGS=${CXXFLAGS}
-		CCLDFLAGS=${LDFLAGS}
-	EOF
-
-	edo ./configure "${myconf[@]}"
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_ONLY_ADDITIONS=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		LD="$(tc-getCC)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_CXX="$(tc-getCXX)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-		#TOOL_GCC3_LD_SYSMOD="$(tc-getCC)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-		#TOOL_GXX3_LD_SYSMOD="$(tc-getCXX)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-		TOOL_YASM_AS=yasm
-	)
-
-	MAKE="kmk" emake "${myemakeargs[@]}"
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	# Move this here for bug 836037
-	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	if use dbus; then
-		newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN}
-	else
-		newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN}
-	fi
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use gui ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-		doins VBoxDRMClient
-		fperms 4755 /usr/bin/VBoxDRMClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	dodoc "${FILESDIR}"/xorg.conf.vbox
-	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	udev_reload
-	if ! use gui ; then
-		elog "use flag gui is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	udev_reload
-}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 2eee8ec781ed..c26c50dd2349 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,11 +1,7 @@
 AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1ded8e51315f41292f9fcc0adb294e9b235b0c2f1e91f6f728076ab85f687ea1ba2877dc44b511eaceb24e7d6e71a8bbd4 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771
 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
-DIST vbox-kernel-module-src-6.1.40.tar.xz 680112 BLAKE2B 95bcb598bc3823c8bf4bfeb734a5d812a4830d072b186c999ed8632552550d0d21318bc50419fd18301cd6e8e58d091a4f6363c9ee86725d6bf8e74050b552d2 SHA512 8eec3c960077205d53b3d2a8367ce562edb02a6d90fe0a4bd06e1dfa256760e128b9895fc8005ceeb50a72eda6509533a28c6ee264d10a2cd30601ed5ced2eeb
 DIST vbox-kernel-module-src-6.1.42.tar.xz 679052 BLAKE2B d89324cee9cfc71e2762f5d2b7dfff33297b0d2eab5714ad9ddcfb762b1263ca17acbe5fdffe53170936fe0a0faffbc69989b62cdcc0b979f394fcff35f5b69c SHA512 3bb363c8f163b5958edc11c971122c35977275c0995eab832262277720c7486150939d50a0640170fa7a5cd32c1dc2918c5e3430ec90a836400d0a774b48d886
-DIST vbox-kernel-module-src-7.0.4.tar.xz 719552 BLAKE2B 5db9ef68acb0da28096dbb89b746261dfac830b626fbed669c02eab6399e681b2c5667d0fe547c8cc8c7e1cbf66d4c6696d9badf0faa617ef2cd0d7372ec9cbe SHA512 521994ffcc27766ee5bbf19595c41a292ce266247249e8ed701fca802d0a1bb82883959eb10bc06bc78abfd6b5230605e6620717526ca528f0b2e1d8d62a8dc4
 DIST vbox-kernel-module-src-7.0.6.tar.xz 718156 BLAKE2B 9f855482c77b14e233ed247f7d94df7c23a00e0f9fca27926921f8c18fa6ab2205075f1b9be61429cfbee325d5f22805c850c0c79fd4fa9ccf7668dcb714f345 SHA512 fca794fd36203b296ce14d7d06022360bb9d94a6e06d8d9c77cc0221f63a898b6482b423e7deb6bd7b0355ee98fc3c7bbe11c9a1fa5dcf1d634eebc4fe537dc3
-EBUILD virtualbox-modules-6.1.40.ebuild 1876 BLAKE2B c6f4531dfa093528ca5adc4048b0d1f062df2be4fc01ae3a450b284b1b35352c95b00287d375c29cd51b2bd9b77b1b2bac84d74ccceedf65ac8e50f95366ea30 SHA512 a5850b902d83366c033d8b005615060910b07d8587d22b2ae93c211ae99e44ae5a73fa77aec0dfc8d7947e9b49d0873d93fa084f9b50a52206c0873c2a0f97d7
 EBUILD virtualbox-modules-6.1.42.ebuild 1861 BLAKE2B 2a4bb02e3b4ac8627c1683a728546506b709d68cfa0e3aa8a5f957801ee88c9412639b570a38197727146d1826e322c219a95d94c8bdfedc987c524b25ea6056 SHA512 4f382baa17e4a514fdad4094cfdd8abac5f3891d8cd344c895693d1af97a036daf6102264d0563184d8d72f601f50ca1dcf8ef151a0939da3448f874a6d75ea2
-EBUILD virtualbox-modules-7.0.4.ebuild 1862 BLAKE2B aec870a2a24138e8076ab15d512882d004b66c9dabb1fb282f23192d31a9b80efb28199662c87dedd12d37456c9a94355c4464b7dc4cdaaa7b535398cee76ae9 SHA512 14c6c7cde9fb8d1513f84956567656cffcd1373fa3d9f584771aec7ed5c38ec233b0d6d871328340ac61f22c65ff834cb1d2cf17f522863b42c2a7e1b5962d4f
 EBUILD virtualbox-modules-7.0.6.ebuild 1861 BLAKE2B f85afbdf42f018df9d567b5a6630b9b62745a78a116c7ce43db8b1bceab22bc481f58a5ba77225781eef1d3cf7e8d81c6829142917c3346044a3f59d36fabefa SHA512 a132c018784f1b16fac18257f4e33f68bf919c3d7cf3792aac18173a7cf01cd0efea2ddfba9a292f567ae62a39b4a35d95bd6d8fdb49970f1be74e51e2ad2bfb
-MISC metadata.xml 350 BLAKE2B 73c2e4a95e21ad17dd75df0650f98175056041c5f7446f5aaaf94fbf3c061bdb6fefdbc228ea9b5cbe1b4b0ef32b8a83e28324469189f4f16636e351c33f1bd8 SHA512 450af2c60e6d68a4d861f50ce23150e03ba94fb3a05c6506385c6ce69fd04d51106468538fc32b691b15d6b20933f70586719c4d572a900052581d8216d44f92
+MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f
diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index a0ff2f996d25..498143329fed 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -5,7 +5,4 @@
     <email>ceamac@gentoo.org</email>
     <name>Viorel Munteanu</name>
   </maintainer>
-  <use>
-    <flag name="pax-kernel">Apply patch needed for pax enabled kernels</flag>
-  </use>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.40.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.40.ebuild
deleted file mode 100644
index b5ac55a89c1f..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.40.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from VirtualBox-*.run
-
-EAPI=8
-
-inherit linux-mod toolchain-funcs
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://github.com/ceamac/virtualbox-modules-dist/releases/download/v${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64"
-IUSE="pax-kernel"
-
-S="${WORKDIR}"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
-MODULESD_VBOXDRV_ENABLED="yes"
-MODULESD_VBOXNETADP_ENABLED="no"
-MODULESD_VBOXNETFLT_ENABLED="no"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-	if linux_chkconfig_present CC_IS_CLANG; then
-		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
-
-		BUILD_PARAMS+=' CC=${CHOST}-clang'
-		if linux_chkconfig_present LD_IS_LLD; then
-			BUILD_PARAMS+=' LD=ld.lld'
-			if linux_chkconfig_present LTO_CLANG_THIN; then
-				# kernel enables cache by default leading to sandbox violations
-				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	if use pax-kernel && kernel_is -ge 3 0 0 ; then
-		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
-}
-
-pkg_postinst() {
-	# Remove vboxpci.ko from current running kernel
-	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.4.ebuild
deleted file mode 100644
index e6a5f4eddaab..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from VirtualBox-*.run
-# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb
-
-EAPI=8
-
-inherit linux-mod toolchain-funcs
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-
-S="${WORKDIR}"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
-MODULESD_VBOXDRV_ENABLED="yes"
-MODULESD_VBOXNETADP_ENABLED="no"
-MODULESD_VBOXNETFLT_ENABLED="no"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-	if linux_chkconfig_present CC_IS_CLANG; then
-		ewarn "Warning: building ${PN} with a clang-built kernel is experimental."
-
-		BUILD_PARAMS+=' CC=${CHOST}-clang'
-		if linux_chkconfig_present LD_IS_LLD; then
-			BUILD_PARAMS+=' LD=ld.lld'
-			if linux_chkconfig_present LTO_CLANG_THIN; then
-				# kernel enables cache by default leading to sandbox violations
-				BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir='
-			fi
-		fi
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
-}
-
-pkg_postinst() {
-	# Remove vboxpci.ko from current running kernel
-	# This module is obsolete, removed in december 2019, so it may be missing.  No || die
-	# TODO: consider removing this line in the near future
-	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index c7a092f1db49..09e691741879 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -4,11 +4,9 @@ AUX vboxwebsrv-confd 559 BLAKE2B 979dc91678fac7277c69e482b07f8d46df6b4df92ffb37d
 AUX vboxwebsrv-initd 646 BLAKE2B d71673a3afea56aea69ab1d795d8b265bb5fc62296e35d6d28caaf600ca65da43006b6d69b58f6a05f7ca0301bafce2d983536db1c98ceb03ca880f5e7632023 SHA512 365bd3a9f5d8edeb921330eebf67b43f60b048d9869f8378fa68543ed6005320b06360590187631176c256d8ce49305b856a2e0c1dc20b42890e020a8c729719
 AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d877602156d97a4dcc6260dd8e446509173742988fa40346e62b1fe9368ff3fc9a97e3316cb919962d9a03340d52 SHA512 5455b70b8ac6f25365bae776b78c3ef5710ae2d5a9e939c7013d72c35f65f178268966ebd291a42666913e45f43c7196f8953331be0b0cc88eba66df39205b08
 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b
-AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16
 AUX virtualbox-6.1.26-configure-include-qt5-path.patch 717 BLAKE2B d6d9f1b0d30602e18b245e25bf1c5e2f4a33e308956fa946f913cf054173aa337708923ef92355f171f5b53a1b1ed58089f1a5146d8cd40a049fdfef874c5194 SHA512 bd07544302db16c291c21ef548455590079307fac2e11c3508019a6fb38a47db6a130c4ba265f9f47dead82d1684226542f21ff2da889ece51cba4b0744d109c
 AUX virtualbox-6.1.34-r3-python.patch 343 BLAKE2B 6eb68ba31ab57a1f2065a7d48ef75175f5c3ba45ff9514c1f1ece8f6f54c1d8fe907ca3a10e411bc6b4474cddb39224d54b4bf4cd7b57522b2ca499ce85061c8 SHA512 a22f46e82f163676a5c07b8010160444cc621f9d12ec1226a304ebdf0800f8f24174dec2fb5e8999ba51f574cd2d290af1c7b94b54ca8c2cd6abdad9025e7fea
 AUX virtualbox-6.1.36-fcf-protection.patch 374 BLAKE2B 6c7410ce1fa78aa7476c9b9a6f519c80957b3c7d55569f2ac02d3642d29574b9f8ed4b1c043cf14a899ff3cc67d7f7442bdd1ce27079b987783c36f38b39b49a SHA512 eb1f5d4ef64ea3306ae0489b3c7019a98e6f00c8a62ec8414c78bc8c14ab654ddae57c579557511e4144bf367ad3a2ea58dc5d9ba1a2c796f30fbbec0be7f414
-AUX virtualbox-6.1.36-python3.10.patch 855 BLAKE2B b6df3e3bf9d9c8d6cfc21a1a21373de02b98dc7178542bf7fe43499eaf77c98b95bcf51795e5c878e5433aec6557552407fd063d63a957450a3682cf0f423b77 SHA512 8e16ab0655909fd0301a4ff3fe70cd69787ad9d92d253888f6a05b8dc2172727e176ac3899b2efc4f50038b4f07b82df2252bceb05e2dc7b5a420302d0826e12
 AUX virtualbox-6.1.42-python3_11.patch 2737 BLAKE2B a0dcd9afcdf2e07a55e3fba54e0eedc7e7072a126aa4791e676209f2c060745df9c32eba0378b9fc275591801947636411186aa2a3c8b5b1927fc93375815cd8 SHA512 7dd4101b7c10a3c1f4f4294c65a80cb392bb31a7cb8113bde59ee112d3d5c5e768daf1645d5b9c5b13ce49c08ed23b7a47064127c9e168743aeb66c614ef249f
 AUX virtualbox-7.0.0-fix-compilation-clang.patch 1638 BLAKE2B 2c1c021a5b95ffdbd46982249c3a60e97d79db17994491c3c1774d7fc889d5b5a0da974d05859e21772b6f265bf1009ad3f13d19a5d264c7f8b4b2bacd6a9bdb SHA512 9c83dfb1550463fc9ddce68dd0648b12721ad1f9fa92fac2e7234ac8149fc5a1a5698a759d1352fc8003d737ce987fbc476ed9a9b350490cf52e42e1a08444dd
 AUX virtualbox-7.0.0-python3_11.patch 3258 BLAKE2B 366b799159039caf3d7c41b06780aa80e131fe01b6b0985375a1bcf8de3cf98b611f5c19fdc1762d0de8e052fbe3cf117085c50b4f3e468e9eaf5a5545cf0f92 SHA512 ccc3ba08ec0ebebda9c17fd2a2bb53f2555da9e1c2dee5cf942b300d8c6e745ad46f3d12a5811a9e5c4c582ca796152b9a4fd92e66ab10b421bac0796106f4f9
@@ -16,15 +14,10 @@ AUX virtualbox-7.0.4-fix-compilation.patch 919 BLAKE2B 656a41064773f0d96a3a31287
 AUX virtualbox-7.0.6-gcc-13.patch 579 BLAKE2B 50d629cafe1aff45ed08d712ab730555f2093336f28be38246c54a60ccbefab880b4b5a548b45e151c583749d347a26dc43fc5fef4e8c400c7bad424c9fa366a SHA512 34b5543c62044d530ee5927b367301f39d465d6177cfa2023578ff572d8e62eef2c5a06e1ec8d274fc582c017232b3603f668a1c09ec7774620e83245cdf90ba
 AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
-DIST VirtualBox-6.1.40.tar.bz2 165769795 BLAKE2B 5c216f23422be3fc4f7760881c666c57a516d12726ed8ef040bbdf918f1af53c69d204b22949e25f751cbe788b00c810c49c27b7c51c1837fd1c503a3eff202c SHA512 0dace071fe58500d0912fe4da4751de6840752375039554a56c8c753a0880a419c4a1ed7f1b0ebc51230f7099ca3f5d987dc7b91ad4d98dbd75bf63e3c27e096
 DIST VirtualBox-6.1.42.tar.bz2 165554573 BLAKE2B 8419793d9e4c4d0804baba926443a27259b012ab90d1bb27c8f9d90b018ddbef83d1cc47e9f5b88e6e247f22c186603584a5ddee4b0c04fe842eba56f3fd103a SHA512 a4861b44ee85d6d1d72ba1d19b5598873503feeb6d562cf7d8c770cc9b466741bdfa5abe74dc4e7952ff189d14c6caf60f584731492c38f688a360baba019ab2
-DIST VirtualBox-7.0.4.tar.bz2 199658172 BLAKE2B 51bde109805e8f3e25f179a05fac532de7a428010955c7cc2a7c9e8c072246d69c5f51f8a51e39b6a1b9f246bd945edc38e0f0cc0630c357a5e9641c38dcac21 SHA512 70f2031c4897249177131795281bf6bd5a75166067d1921db70fd1e21f5638285b5a0c3298a7070e272ac2f093a60c35eb3cab4e5f7d16a68d17b211f637b0bc
 DIST VirtualBox-7.0.6.tar.bz2 199512172 BLAKE2B cfe4d7abd57dfdb0294177759e80aa9fda797b9b5433f214771a57764cb23404450169e8c7c30cda13de85b8e02a37024584c7b1f0b5a44b10b100aa66b8d5c5 SHA512 f9db7a154e392f550f50abe774fc6263eb0b6f86dccc069f2c5012fedbe2debbf5b8ba62cca44ea0d5d5475652188176bfb888266f69197677b22854f02b64a0
 DIST virtualbox-help-7.0.6.tar.xz 3939412 BLAKE2B ea1326bccb3c2edc33ab37e122a7bedf79475d335e632ee62f99e0dce4b80de7634cbfe121c8c7ccd6588ff3b81effe7b20efe123cc44bc7b1ff4f6a851302a6 SHA512 ffb59f0c99c91b165a0b83d29317e04eee9097b0d0ac92a0d3e71558e70ec8b2807491a4633562a5e820e5f5a8e1339883031fd03de93d09a188f19b8b4d3a93
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
-EBUILD virtualbox-6.1.40.ebuild 18343 BLAKE2B 02cda507a7265373635fab733457683571de408cb419f676300c50c4474ef0e048b4a57b01e894518eed858d84f39467e7a63c588bbbefd83d79a93cfe1115e5 SHA512 135bd0aa1fad4c666c283b4e60c97374aabeb0d4315f91798cb8ab2185eb708ffb83d1e2b84b2e48390d61109a13528ba896780eea38e654f66efeab69268a20
 EBUILD virtualbox-6.1.42.ebuild 18584 BLAKE2B 82e17733d9388b093e9c39c418bc8f6c4a5a846cda8c8ae5fd112a795f1600a723be52077d612095827f41a80844577ad71e6e8faf126eb4ef5c26fb15265297 SHA512 dd94a3f1b07db5c2b815427b21f1fc6bfd4217f3db1a2a439cd20cbcbee57e3a7a182c7870c43941a737f770c8dac0362137247ac5127bcd309535ce464a381f
-EBUILD virtualbox-7.0.4-r1.ebuild 19650 BLAKE2B 454f2cf8299e6a8613fc70153e5bdcc542776d852e3da4a2cbaa50e29159ddc97a0c145015efec5cbf0db988a21b0e911d2cd755fafb6d7ccaaa39f09b18e07b SHA512 2057e377f27bf928926e7cb0a2df9b03591aab1a20e8c7903853528c61d4b1d0fc2ec29de6efa39381fc2d626fc6001244680a07632df65b2032dea1a96a5d01
-EBUILD virtualbox-7.0.6-r1.ebuild 20262 BLAKE2B c806d069b661256f31389c262891126888a30801eb53874b687f91ec3771f87e2b588471358c6f133f9473a362401dd7ffef608d5aebb916aa392ef35f89c7a4 SHA512 3c8775c1494bd037b397b70208d6f873316c56abec02f717242db373677892d4bccd171f92c4356fbba1315e4b23abd193dcb25b953e8f6e05b6becd9fdcdec2
 EBUILD virtualbox-7.0.6-r2.ebuild 20385 BLAKE2B 033bd2d18bbb9551bb41b0a000ac5284548b4d5f97f3f32098fa1882c9a0d1675f379a326487d6aa6bfb4e7a071ed898b863fc5abd8d1869224a52f8592663ed SHA512 c55c6b577b21c9c8f813d784ed40cf466fed8c98b8e39069c702609e5010217013bcd09d3b7ca99ca8d0f3b07f9304a9234737b5161a6846371b2969a410be7e
 MISC metadata.xml 870 BLAKE2B 26f9370557a12c17465e7ca2d63902a2ce5b2d65fbdf40f3b890bd89aca28a1816424caf579f71b762876e8e91b292c5ecbcbad985e9da1e1472e66a2eaf6965 SHA512 eb2e9114dc343062e9afd3b933a5d355be790febb4a18f741347072d305b7d63ed40a6a3b9d11b91eb8602d5d2d4f5cf6c2ebde278fb0d0df48a5c5647374e33
diff --git a/app-emulation/virtualbox/files/virtualbox-5.2.8-paxmark-bldprogs.patch b/app-emulation/virtualbox/files/virtualbox-5.2.8-paxmark-bldprogs.patch
deleted file mode 100644
index 7eb1e1793a7f..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-5.2.8-paxmark-bldprogs.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-2017-02-20  Quentin Minster <quentin@minster.io>
-
-	#https://bugs.gentoo.org/show_bug.cgi?id=591582
-	* Config.kmk: add paxmark befor VBOX_VBOXTPG get run.
-	* src/VBox/VMM/Makefile.kmk: add paxmark befor VBOX_VBOXCPP get run.
-	* src/VBox/Main/Makefile.kmk: add paxmark befor USBIdDatabaseGenerator_1_TARGET get run.
-
---- a/Config.kmk
-+++ b/Config.kmk	2016-09-21 02:22:28 
-@@ -3719,11 +3719,13 @@
- 		$(if-expr $(intersects $(KBUILD_TARGET_ARCH),$(KBUILD_ARCHES_64)),-64,-32) \
- 		-h --host-$(VBOX_HC_ARCH_BITS)-bit #-vvv
- define TOOL_VBoxTpG_DTRACE_HDR_CMDS
-+	$(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)"
- 	$(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)"
- endef
- TOOL_VBoxTpG_DTRACE_OBJ_NOT_NEEDED :=
- TOOL_VBoxTpG_DTRACE_OBJ_FLAGS      := -G --host-$(VBOX_HC_ARCH_BITS)-bit #-vvv
- define TOOL_VBoxTpG_DTRACE_OBJ_CMDS
-+	$(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)"
- 	$(QUIET)$(VBOX_VBOXTPG) \
- 		$(if-expr $(intersects $(bld_trg_arch),$(KBUILD_ARCHES_64)),-64,-32) \
- 		$(flags) \
-@@ -3738,6 +3740,7 @@
- TOOL_VBoxTpG-Disabled_DTRACE_DEPORD     = $(VBOX_VBOXTPG)
- TOOL_VBoxTpG-Disabled_DTRACE_HDR_FLAGS := -h
- define TOOL_VBoxTpG-Disabled_DTRACE_HDR_CMDS
-+	$(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)"
- 	$(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)"
- endef
- TOOL_VBoxTpG-Disabled_DTRACE_OBJ_NOT_NEEDED := $(KBUILD_OSES)
-@@ -3752,6 +3755,7 @@
- TOOL_DTraceAndVBoxTpG_DTRACE_HDR_CMDS =
- define TOOL_DTraceAndVBoxTpG_DTRACE_HDR_CMDS
- 	$(TOOL_StandardDTrace_DTRACE_HDR_CMDS)
-+	$(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)"
- 	$(QUIET)$(VBOX_VBOXTPG) --generate-wrapper-header --host-$(VBOX_HC_ARCH_BITS)-bit --ring-3-context \
- 		$(filter-out -C, $(filter-out -h,$(flags))) \
- 		-o "$(out).tmp" -s "$(source)"
---- a/src/VBox/VMM/Makefile.kmk	2018-04-10 15:26:24.622867735 +0300
-+++ b/src/VBox/VMM/Makefile.kmk	2018-04-10 15:24:35.901998796 +0300
-@@ -896,6 +896,7 @@
-   $$(VMMLibDTrace_0_OUTDIR)/$1: $2 $$(VBOX_VBOXCPP) | $$$$(dir $$$$@)
- 	$$(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
- 	$$(QUIET)$$(call MSG_GENERATE,VMMLibDTrace,$$@,$2)
-+	$$(QUIET)paxmark.sh -m "$(VBOX_VBOXCPP)"
- 	$$(QUIET)$(VBOX_VBOXCPP) -d \
- 		-D VBOX_FOR_DTRACE_LIB \
- 		-D VBOX_FOR_DTRACE_LIB_$(toupper $(KBUILD_TARGET_ARCH)) \
---- a/src/VBox/Main/Makefile.kmk	2018-04-10 15:26:15.292793067 +0300
-+++ b/src/VBox/Main/Makefile.kmk	2018-04-10 15:25:14.042303341 +0300
-@@ -607,6 +607,7 @@
-  		$(PATH_SUB_CURRENT)/src-server/usb.ids $(PATH_SUB_CURRENT)/src-server/custom.ids | $$(dir $$@)
- 	$(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
- 	$(call MSG_GENERATE,USBIdDatabase,$@,$(USBIdDatabaseGenerator_1_TARGET))
-+	$(QUIET)paxmark.sh -m "$(USBIdDatabaseGenerator_1_TARGET)"
- 	$(QUIET)$(USBIdDatabaseGenerator_1_TARGET) -o "$@" $(filter %.ids,$^)
- 
-  BLDPROGS += USBIdDatabaseGenerator
diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.36-python3.10.patch b/app-emulation/virtualbox/files/virtualbox-6.1.36-python3.10.patch
deleted file mode 100644
index 90157ada7d96..000000000000
--- a/app-emulation/virtualbox/files/virtualbox-6.1.36-python3.10.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://github.com/archlinux/svntogit-community/blob/b103146beee8b7c70d04685033a8536aed2e5aea/trunk/002-python310.patch
-https://github.com/archlinux/svntogit-community/blob/b103146beee8b7c70d04685033a8536aed2e5aea/trunk/003-pyunicode.patch
-
-https://www.virtualbox.org/changeset/90537/vbox
-https://www.virtualbox.org/changeset/86623/vbox
---- a/src/libs/xpcom18a4/python/src/PyXPCOM.h
-+++ b/src/libs/xpcom18a4/python/src/PyXPCOM.h
-@@ -137,7 +137,7 @@
- #  define PyInt_Check(o) PyLong_Check(o)
- #  define PyInt_AsLong(o) PyLong_AsLong(o)
- #  define PyNumber_Int(o) PyNumber_Long(o)
--#  if PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */
-+#  if !defined(Py_LIMITED_API) && PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */
- #   ifndef PyUnicode_AsUTF8
- #    define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o)
- #   endif
diff --git a/app-emulation/virtualbox/virtualbox-6.1.40.ebuild b/app-emulation/virtualbox/virtualbox-6.1.40.ebuild
deleted file mode 100644
index aa6b747fb2a0..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.1.40.ebuild
+++ /dev/null
@@ -1,664 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# To add a new Python here:
-# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
-#    Do NOT skip this part. It'll end up silently not-building the Python extension
-#    or otherwise misbehaving if you do.
-#
-# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
-#
-#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
-#  Python versions as upstream tends to lag. Upstream may have patches on their
-#  trunk branch but not release branch.
-#
-#  See bug #785835, bug #856121.
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}-${MY_PV}
-[[ ${PV} == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="amd64"
-fi
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
-
-unset WATCOM #856769
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-group/vboxusers
-	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib:=
-	!headless? (
-		sdl? ( media-libs/libsdl:0[X,video] )
-		x11-libs/libX11
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? (
-			media-libs/libglvnd[X]
-			virtual/glu
-		)
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	dev-libs/openssl:0=
-	virtual/libcrypt:=
-	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
-# based on *DEPEND doesn't work for BDEPEND at least right now.
-#
-# There's a comment in Config.kmk about it
-# ("With Java 11 wsimport was removed, usually part of a separate install now.")
-# but it needs more investigation.
-#
-# See bug #832166.
-DEPEND="
-	${COMMON_DEPEND}
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? (
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		opengl? ( virtual/opengl )
-	)
-	java? ( virtual/jdk:1.8 )
-	pam? ( sys-libs/pam )
-	pax-kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-apps/which
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( virtual/jdk:1.8 )
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	java? ( virtual/jre:1.8 )
-"
-
-QA_FLAGS_IGNORED="
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/VMMR0.r0
-"
-
-QA_TEXTRELS="
-	usr/lib64/virtualbox/VMMR0.r0
-"
-
-QA_EXECSTACK="
-	usr/lib64/virtualbox/iPxeBaseBin
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-QA_WX_LOAD="
-	usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
-
-	# This patch is needed to avoid automagic detection based on a hardcoded
-	# list of Pythons in configure. It's necessary but not sufficient
-	# (see the rest of the ebuild's logic for the remainder) to handle
-	# proper Python selection.
-	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
-
-	# Patch grabbed from Arch Linux / upstream for Python 3.10 support
-	"${FILESDIR}"/${PN}-6.1.36-python3.10.patch
-
-	# 865361
-	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
-
-	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-6.1.36/patches
-)
-
-pkg_pretend() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-
-	# 749273
-	local d=${ROOT}
-	for i in usr "$(get_libdir)"; do
-		d="${d}/$i"
-		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
-			die "${d} should be owned by root, VirtualBox will not start otherwise"
-		fi
-	done
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie ; then
-		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
-	fi
-
-	# Only add paxmark patch when we're on pax-kernel
-	if use pax-kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-	fi
-
-	# Remove shipped binaries (kBuild, yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something more sensible.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
-		-i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	if ! use pch ; then
-		# bug #753323
-		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-			>> LocalConfig.kmk || die
-	fi
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		einfo "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-}
-
-src_configure() {
-	tc-ld-disable-gold # bug #488176
-
-	#856811 #864274
-	# cannot filter out only one flag, some combinations of these flags produce buggy executables
-	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
-		append-cflags $(test-flags-CC -mno-$i)
-		append-cxxflags $(test-flags-CXX -mno-$i)
-	done
-
-	tc-export AR CC CXX LD RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--disable-dbus
-		--disable-kmods
-
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex opus '' --disable-libopus)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-			$(usex sdl '' --disable-sdl)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-
-	# bug #843437
-	cat >> LocalConfig.kmk <<-EOF || die
-		CXXFLAGS=${CXXFLAGS}
-		CFLAGS=${CFLAGS}
-	EOF
-
-	# not an autoconf script
-	edo ./configure "${myconf[@]}"
-
-	# Force usage of chosen Python implementation
-	# bug #856121, bug #785835
-	sed -i \
-		-e '/VBOX_WITH_PYTHON.*=/d' \
-		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
-		-e '/VBOX_LIB_PYTHON.*=/d' \
-		AutoConfig.kmk || die
-
-	cat >> AutoConfig.kmk <<-EOF || die
-		VBOX_WITH_PYTHON=$(usev python 1)
-		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-		VBOX_LIB_PYTHON=$(python_get_library_path)
-	EOF
-
-	if use python ; then
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/.}"
-
-		# Stub out the script which defines what the Makefile ends up
-		# building for. gen_python_deps.py gets called by the Makefile
-		# with some args and it spits out a bunch of paths for a hardcoded
-		# list of Pythons. We just override it with what we're actually using.
-		# This minimises the amount of patching we have to do for new Pythons.
-		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
-			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
-			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
-			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
-			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
-		EOF
-
-		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
-	fi
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_WITH_VBOXIMGMOUNT=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-
-		TOOL_YASM_AS=yasm
-	)
-
-	if use amd64 && has_multilib_profile ; then
-		myemakeargs+=(
-			CC32="$(tc-getCC) -m32"
-			CXX32="$(tc-getCXX) -m32"
-
-			TOOL_GCC32_CC="$(tc-getCC) -m32"
-			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
-			TOOL_GCC32_LD="$(tc-getCC) -m32"
-			TOOL_GCC32_AS="$(tc-getCC) -m32"
-			TOOL_GCC32_AR="$(tc-getAR)"
-			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
-
-			TOOL_GXX32_CC="$(tc-getCC) -m32"
-			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
-			TOOL_GXX32_LD="$(tc-getCXX) -m32"
-			TOOL_GXX32_AS="$(tc-getCXX) -m32"
-			TOOL_GXX32_AR="$(tc-getAR)"
-			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
-		)
-	fi
-
-	MAKE="kmk" emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst rdesktop-vrdp
-		if use sdl ; then
-			vbox_inst VBoxSDL 4750
-			pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-			for each in vboxsdl VBoxSDL ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-		fi
-
-		if use qt5 ; then
-			vbox_inst VirtualBox
-			vbox_inst VirtualBoxVM 4750
-			for each in VirtualBox{,VM} ; do
-				pax-mark -m "${ED}"${vbox_inst_path}/${each}
-			done
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox{,vm} VirtualBox{,VM} ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-			doins -r UnattendedTemplates
-
-			domenu ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		local udevdir="$(get_udevdir)"
-		local udev_file="VBoxCreateUSBNode.sh"
-		local rules_file="10-virtualbox.rules"
-
-		insinto ${udevdir}
-		doins ${udev_file}
-		fowners root:vboxusers ${udevdir}/${udev_file}
-		fperms 0750 ${udevdir}/${udev_file}
-
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-			> "${T}"/${rules_file} || die
-		doins "${T}"/${rules_file}
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
-		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
-		|| die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	if use python ; then
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/./_}"
-
-		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.so"
-		if [[ ! -x "${python_path_ext}" ]] ; then
-			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
-			eerror "but none were installed. This may happen if support for a Python target"
-			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
-			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
-		fi
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev ; then
-		udev_reload
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "https://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
-	elog ""
-
-	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
-	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
-	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-	if ! use udev ; then
-		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	use udev && udev_reload
-}
diff --git a/app-emulation/virtualbox/virtualbox-7.0.4-r1.ebuild b/app-emulation/virtualbox/virtualbox-7.0.4-r1.ebuild
deleted file mode 100644
index 7f2a9f39143b..000000000000
--- a/app-emulation/virtualbox/virtualbox-7.0.4-r1.ebuild
+++ /dev/null
@@ -1,705 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# To add a new Python here:
-# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
-#    Do NOT skip this part. It'll end up silently not-building the Python extension
-#    or otherwise misbehaving if you do.
-#
-# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
-#
-#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
-#  Python versions as upstream tends to lag. Upstream may have patches on their
-#  trunk branch but not release branch.
-#
-#  See bug #785835, bug #856121.
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
-	python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64"
-IUSE="alsa dbus debug doc dtrace +gui java lvm pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc"
-
-unset WATCOM #856769
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-group/vboxusers
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libxml2
-	dev-libs/openssl:0=
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	net-misc/curl
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		x11-libs/libX11
-		x11-libs/libXt
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	lvm? ( sys-fs/lvm2 )
-	opengl? (
-		media-libs/libglvnd[X]
-		media-libs/vulkan-loader
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	pam? ( sys-libs/pam )
-	sdl? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXt
-	)
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	vde? ( net-misc/vde )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
-# based on *DEPEND doesn't work for BDEPEND at least right now.
-#
-# There's a comment in Config.kmk about it
-# ("With Java 11 wsimport was removed, usually part of a separate install now.")
-# but it needs more investigation.
-#
-# See bug #878299 to track this issue.
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-libs/libxslt-1.1.19
-	virtual/libcrypt:=
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	gui? (
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-		opengl? ( virtual/opengl )
-	)
-	java? ( virtual/jdk:1.8 )
-	opengl? (
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-		virtual/glu
-	)
-	sdl? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	udev? ( >=virtual/udev-171 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	gui? ( x11-libs/libxcb:= )
-	java? ( virtual/jre:1.8 )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-arch/tar
-	>=dev-lang/yasm-0.6.2
-	dev-libs/libIDL
-	dev-qt/linguist-tools:5
-	dev-util/glslang
-	>=dev-util/kbuild-0.1.9998.3127
-	sys-apps/which
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		app-text/docbook-xsl-ns-stylesheets
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-		dev-qt/qthelp:5
-	)
-	java? ( virtual/jdk:1.8 )
-"
-
-QA_FLAGS_IGNORED="
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_TEXTRELS="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-QA_EXECSTACK="
-	usr/lib64/virtualbox/iPxeBaseBin
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_WX_LOAD="
-	usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
-
-	# This patch is needed to avoid automagic detection based on a hardcoded
-	# list of Pythons in configure. It's necessary but not sufficient
-	# (see the rest of the ebuild's logic for the remainder) to handle
-	# proper Python selection.
-	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
-
-	# 865361
-	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
-
-	"${FILESDIR}"/${PN}-7.0.4-fix-compilation.patch
-	"${FILESDIR}"/${PN}-7.0.0-fix-compilation-clang.patch
-	"${FILESDIR}"/${PN}-7.0.0-python3_11.patch
-
-	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-6.1.36/patches
-)
-
-pkg_pretend() {
-	if ! use gui; then
-		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
-	fi
-
-	if ! use opengl; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-
-	# 749273
-	local d=${ROOT}
-	for i in usr "$(get_libdir)"; do
-		d="${d}/$i"
-		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
-			die "${d} should be owned by root, VirtualBox will not start otherwise"
-		fi
-	done
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie; then
-		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
-	fi
-
-	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
-	rm -r kBuild/bin || die
-	# Remove everything in tools except kBuildUnits
-	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	if ! use pch; then
-		# bug #753323
-		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-			>> LocalConfig.kmk || die
-	fi
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam; then
-		einfo "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	#856811 #864274
-	# cannot filter out only one flag, some combinations of these flags produce buggy executables
-	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
-		append-cflags $(test-flags-CC -mno-$i)
-		append-cxxflags $(test-flags-CXX -mno-$i)
-	done
-
-	# bug #843437
-	cat >> LocalConfig.kmk <<-EOF || die
-		CXXFLAGS=${CXXFLAGS}
-		CFLAGS=${CFLAGS}
-	EOF
-
-	if use sdl; then
-		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
-	fi
-
-	#443830
-	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
-
-	# clang assembler chokes on comments starting with /
-	if tc-is-clang; then
-		sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die
-	fi
-
-	# fix doc generation
-	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
-	# replace xhtml names with numeric equivalents
-	find doc/manual -name \*.xml -exec sed -i \
-		-e 's/&nbsp;/\&#160;/g' \
-		-e 's/&ndash;/\&#8211;/g' \
-		-e 's/&larr;/\&#8592;/g' \
-		-e 's/&rarr;/\&#8594;/g' \
-		-e 's/&harr;/\&#8596;/g' {} \+ || die
-
-	# 489208
-	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
-	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
-		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
-	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
-		src/VBox/Frontends/VirtualBox/src/main.cpp \
-		src/VBox/VMM/VMMR3/VM.cpp || die
-
-	# 890561
-	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
-}
-
-src_configure() {
-	tc-ld-disable-gold # bug #488176
-
-	tc-export AR CC CXX LD RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--disable-kmods
-
-		$(usev !alsa --disable-alsa)
-		$(usev !dbus --disable-dbus)
-		$(usev debug --build-debug)
-		$(usev !doc --disable-docs)
-		$(usev !java --disable-java)
-		$(usev !lvm --disable-devmapper)
-		$(usev !pulseaudio --disable-pulse)
-		$(usev !python --disable-python)
-		$(usev vboxwebsrv --enable-webservice)
-		$(usev vde --enable-vde)
-		$(usev vnc --enable-vnc)
-	)
-
-	if use gui || use sdl || use opengl; then
-		myconf+=(
-			$(usev !opengl --disable-opengl)
-			$(usev !gui --disable-qt)
-			$(usev !sdl --disable-sdl)
-		)
-	else
-		myconf+=(
-			--build-headless
-		)
-	fi
-
-	if use amd64 && ! has_multilib_profile; then
-		myconf+=( --disable-vmmraw )
-	fi
-
-	# not an autoconf script
-	edo ./configure "${myconf[@]}"
-
-	# Force usage of chosen Python implementation
-	# bug #856121, bug #785835
-	sed -i \
-		-e '/VBOX_WITH_PYTHON.*=/d' \
-		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
-		-e '/VBOX_LIB_PYTHON.*=/d' \
-		AutoConfig.kmk || die
-
-	cat >> AutoConfig.kmk <<-EOF || die
-		VBOX_WITH_PYTHON=$(usev python 1)
-		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-		VBOX_LIB_PYTHON=$(python_get_library_path)
-	EOF
-
-	if use python; then
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/.}"
-
-		# Stub out the script which defines what the Makefile ends up
-		# building for. gen_python_deps.py gets called by the Makefile
-		# with some args and it spits out a bunch of paths for a hardcoded
-		# list of Pythons. We just override it with what we're actually using.
-		# This minimises the amount of patching we have to do for new Pythons.
-		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
-			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
-			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
-			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
-			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
-		EOF
-
-		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
-	fi
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_WITH_VBOXIMGMOUNT=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-
-		TOOL_YASM_AS=yasm
-	)
-
-	if use amd64 && has_multilib_profile; then
-		myemakeargs+=(
-			CC32="$(tc-getCC) -m32"
-			CXX32="$(tc-getCXX) -m32"
-
-			TOOL_GCC32_CC="$(tc-getCC) -m32"
-			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
-			TOOL_GCC32_LD="$(tc-getCC) -m32"
-			TOOL_GCC32_AS="$(tc-getCC) -m32"
-			TOOL_GCC32_AR="$(tc-getAR)"
-			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
-
-			TOOL_GXX32_CC="$(tc-getCC) -m32"
-			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
-			TOOL_GXX32_LD="$(tc-getCXX) -m32"
-			TOOL_GXX32_AS="$(tc-getCXX) -m32"
-			TOOL_GXX32_AR="$(tc-getAR)"
-			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
-		)
-	fi
-
-	MAKE="kmk" emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \
-		vboximg-mount vbox-img *so *r0; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
-		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
-
-	if use pam; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use sdl; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-	fi
-
-	if use gui; then
-		vbox_inst VirtualBox
-		vbox_inst VirtualBoxVM 4750
-		for each in VirtualBox{,VM} ; do
-			pax-mark -m "${ED}"${vbox_inst_path}/${each}
-		done
-
-		if use opengl; then
-			vbox_inst VBoxTestOGL
-			pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-		fi
-
-		for each in virtualbox{,vm} VirtualBox{,VM} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		insinto /usr/share/${PN}
-		doins -r nls
-		doins -r UnattendedTemplates
-
-		domenu ${PN}.desktop
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]]; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev; then
-		local udevdir="$(get_udevdir)"
-		local udev_file="VBoxCreateUSBNode.sh"
-		local rules_file="10-virtualbox.rules"
-
-		insinto ${udevdir}
-		doins ${udev_file}
-		fowners root:vboxusers ${udevdir}/${udev_file}
-		fperms 0750 ${udevdir}/${udev_file}
-
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-			> "${T}"/${rules_file} || die
-		doins "${T}"/${rules_file}
-	fi
-
-	if use vboxwebsrv; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc; then
-		dodoc UserManual.pdf
-		docompress -x /usr/share/doc/${PF}/qt
-		docinto qt
-		dodoc UserManual.q{ch,hc}
-	fi
-
-	if use python; then
-		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
-		if [[ ! -x "${python_path_ext}" ]]; then
-			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
-			eerror "but none were installed. This may happen if support for a Python target"
-			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
-			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
-		fi
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev; then
-		udev_reload
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process virtualbox-vboxusb.conf
-
-	if use gui; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-
-	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
-	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
-	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-	if ! use udev; then
-		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	use udev && udev_reload
-}
diff --git a/app-emulation/virtualbox/virtualbox-7.0.6-r1.ebuild b/app-emulation/virtualbox/virtualbox-7.0.6-r1.ebuild
deleted file mode 100644
index 2d0c9076e342..000000000000
--- a/app-emulation/virtualbox/virtualbox-7.0.6-r1.ebuild
+++ /dev/null
@@ -1,727 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# To add a new Python here:
-# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
-#    Do NOT skip this part. It'll end up silently not-building the Python extension
-#    or otherwise misbehaving if you do.
-#
-# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
-#
-#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
-#  Python versions as upstream tends to lag. Upstream may have patches on their
-#  trunk branch but not release branch.
-#
-#  See bug #785835, bug #856121.
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
-	python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc"
-
-unset WATCOM #856769
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-group/vboxusers
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libtpms
-	dev-libs/libxml2
-	dev-libs/openssl:0=
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	net-misc/curl
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		x11-libs/libX11
-		x11-libs/libXt
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	lvm? ( sys-fs/lvm2 )
-	opengl? (
-		media-libs/libglvnd[X]
-		media-libs/vulkan-loader
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-	pam? ( sys-libs/pam )
-	sdl? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXt
-	)
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	vde? ( net-misc/vde )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
-# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
-# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
-# based on *DEPEND doesn't work for BDEPEND at least right now.
-#
-# There's a comment in Config.kmk about it
-# ("With Java 11 wsimport was removed, usually part of a separate install now.")
-# but it needs more investigation.
-#
-# See bug #878299 to track this issue.
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-libs/libxslt-1.1.19
-	virtual/libcrypt:=
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	gui? (
-		x11-base/xorg-proto
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-	)
-	java? ( virtual/jdk:1.8 )
-	opengl? (
-		x11-base/xorg-proto
-		x11-libs/libXcursor
-		x11-libs/libXinerama
-		x11-libs/libXmu
-		x11-libs/libXrandr
-		virtual/glu
-	)
-	sdl? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	udev? ( >=virtual/udev-171 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	gui? ( x11-libs/libxcb:= )
-	java? ( virtual/jre:1.8 )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-arch/tar
-	>=dev-lang/yasm-0.6.2
-	dev-libs/libIDL
-	dev-util/glslang
-	>=dev-util/kbuild-0.1.9998.3127
-	sys-apps/which
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		app-text/docbook-xsl-ns-stylesheets
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-		dev-qt/qthelp:5
-	)
-	gui? ( dev-qt/linguist-tools:5 )
-	nls? ( dev-qt/linguist-tools:5 )
-	java? ( virtual/jdk:1.8 )
-"
-
-QA_FLAGS_IGNORED="
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_TEXTRELS="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-QA_EXECSTACK="
-	usr/lib64/virtualbox/iPxeBaseBin
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
-"
-
-QA_WX_LOAD="
-	usr/lib64/virtualbox/iPxeBaseBin
-"
-
-QA_PRESTRIPPED="
-	usr/lib64/virtualbox/VMMR0.r0
-	usr/lib64/virtualbox/VBoxDDR0.r0
-	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
-"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
-
-	# This patch is needed to avoid automagic detection based on a hardcoded
-	# list of Pythons in configure. It's necessary but not sufficient
-	# (see the rest of the ebuild's logic for the remainder) to handle
-	# proper Python selection.
-	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
-
-	# 865361
-	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
-
-	"${FILESDIR}"/${PN}-7.0.4-fix-compilation.patch
-	"${FILESDIR}"/${PN}-7.0.0-fix-compilation-clang.patch
-	"${FILESDIR}"/${PN}-7.0.0-python3_11.patch
-
-	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-6.1.36/patches
-)
-
-pkg_pretend() {
-	if ! use gui; then
-		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
-	fi
-
-	if ! use opengl; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	if ! use nls && use gui; then
-		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
-		einfo "will have NLS support."
-	fi
-
-	if use gui && ! use doc; then
-		einfo "You have disabled the \"doc\" USE flag.  Built-in help"
-		einfo "will not be available."
-	fi
-
-	# 749273
-	local d=${ROOT}
-	for i in usr "$(get_libdir)"; do
-		d="${d}/$i"
-		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
-			die "${d} should be owned by root, VirtualBox will not start otherwise"
-		fi
-	done
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie; then
-		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
-	fi
-
-	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
-	rm -r kBuild/bin || die
-	# Remove everything in tools except kBuildUnits
-	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	if ! use pch; then
-		# bug #753323
-		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
-			>> LocalConfig.kmk || die
-	fi
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam; then
-		einfo "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	#856811 #864274
-	# cannot filter out only one flag, some combinations of these flags produce buggy executables
-	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
-		append-cflags $(test-flags-CC -mno-$i)
-		append-cxxflags $(test-flags-CXX -mno-$i)
-	done
-
-	# bug #843437
-	cat >> LocalConfig.kmk <<-EOF || die
-		CXXFLAGS=${CXXFLAGS}
-		CFLAGS=${CFLAGS}
-	EOF
-
-	if use sdl; then
-		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
-	fi
-
-	#443830
-	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
-
-	# clang assembler chokes on comments starting with /
-	if tc-is-clang; then
-		sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die
-	fi
-
-	# fix doc generation
-	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
-	# replace xhtml names with numeric equivalents
-	find doc/manual -name \*.xml -exec sed -i \
-		-e 's/&nbsp;/\&#160;/g' \
-		-e 's/&ndash;/\&#8211;/g' \
-		-e 's/&larr;/\&#8592;/g' \
-		-e 's/&rarr;/\&#8594;/g' \
-		-e 's/&harr;/\&#8596;/g' {} \+ || die
-
-	# fix help path #891879
-	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
-
-	# 489208
-	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
-	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
-		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
-	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
-		src/VBox/Frontends/VirtualBox/src/main.cpp \
-		src/VBox/VMM/VMMR3/VM.cpp || die
-
-	# 890561
-	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
-
-	if ! use nls && ! use gui; then
-		cat >> LocalConfig.kmk <<-EOF || die
-			VBOX_WITH_NLS :=
-			VBOX_WITH_MAIN_NLS :=
-			VBOX_WITH_PUEL_NLS :=
-			VBOX_WITH_VBOXMANAGE_NLS :=
-		EOF
-	fi
-}
-
-src_configure() {
-	tc-ld-disable-gold # bug #488176
-
-	tc-export AR CC CXX LD RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-
-		--disable-kmods
-
-		$(usev !alsa --disable-alsa)
-		$(usev !dbus --disable-dbus)
-		$(usev debug --build-debug)
-		$(usev !doc --disable-docs)
-		$(usev !java --disable-java)
-		$(usev !lvm --disable-devmapper)
-		$(usev !pulseaudio --disable-pulse)
-		$(usev !python --disable-python)
-		$(usev vboxwebsrv --enable-webservice)
-		$(usev vde --enable-vde)
-		$(usev vnc --enable-vnc)
-	)
-
-	if use gui || use sdl || use opengl; then
-		myconf+=(
-			$(usev !opengl --disable-opengl)
-			$(usev !gui --disable-qt)
-			$(usev !sdl --disable-sdl)
-		)
-	else
-		myconf+=(
-			--build-headless
-		)
-	fi
-
-	if use amd64 && ! has_multilib_profile; then
-		myconf+=( --disable-vmmraw )
-	fi
-
-	# not an autoconf script
-	edo ./configure "${myconf[@]}"
-
-	# Force usage of chosen Python implementation
-	# bug #856121, bug #785835
-	sed -i \
-		-e '/VBOX_WITH_PYTHON.*=/d' \
-		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
-		-e '/VBOX_LIB_PYTHON.*=/d' \
-		AutoConfig.kmk || die
-
-	cat >> AutoConfig.kmk <<-EOF || die
-		VBOX_WITH_PYTHON=$(usev python 1)
-		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
-		VBOX_LIB_PYTHON=$(python_get_library_path)
-	EOF
-
-	if use python; then
-		local mangled_python="${EPYTHON#python}"
-		mangled_python="${mangled_python/.}"
-
-		# Stub out the script which defines what the Makefile ends up
-		# building for. gen_python_deps.py gets called by the Makefile
-		# with some args and it spits out a bunch of paths for a hardcoded
-		# list of Pythons. We just override it with what we're actually using.
-		# This minimises the amount of patching we have to do for new Pythons.
-		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
-			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
-			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
-			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
-			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
-		EOF
-
-		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
-	fi
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-
-	local myemakeargs=(
-		VBOX_BUILD_PUBLISHER=_Gentoo
-		VBOX_WITH_VBOXIMGMOUNT=1
-
-		KBUILD_VERBOSE=2
-
-		AS="$(tc-getCC)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		TOOL_GCC3_CC="$(tc-getCC)"
-		TOOL_GCC3_LD="$(tc-getCC)"
-		TOOL_GCC3_AS="$(tc-getCC)"
-		TOOL_GCC3_AR="$(tc-getAR)"
-		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GXX3_CC="$(tc-getCC)"
-		TOOL_GXX3_CXX="$(tc-getCXX)"
-		TOOL_GXX3_LD="$(tc-getCXX)"
-		TOOL_GXX3_AS="$(tc-getCXX)"
-		TOOL_GXX3_AR="$(tc-getAR)"
-		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
-
-		TOOL_GCC3_CFLAGS="${CFLAGS}"
-		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
-		VBOX_GCC_OPT="${CXXFLAGS}"
-		VBOX_NM="$(tc-getNM)"
-
-		TOOL_YASM_AS=yasm
-	)
-
-	if use amd64 && has_multilib_profile; then
-		myemakeargs+=(
-			CC32="$(tc-getCC) -m32"
-			CXX32="$(tc-getCXX) -m32"
-
-			TOOL_GCC32_CC="$(tc-getCC) -m32"
-			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
-			TOOL_GCC32_LD="$(tc-getCC) -m32"
-			TOOL_GCC32_AS="$(tc-getCC) -m32"
-			TOOL_GCC32_AR="$(tc-getAR)"
-			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
-
-			TOOL_GXX32_CC="$(tc-getCC) -m32"
-			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
-			TOOL_GXX32_LD="$(tc-getCXX) -m32"
-			TOOL_GXX32_AS="$(tc-getCXX) -m32"
-			TOOL_GXX32_AR="$(tc-getAR)"
-			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
-		)
-	fi
-
-	MAKE="kmk" emake "${myemakeargs[@]}" all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \
-		vboximg-mount vbox-img *so *r0; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
-		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
-
-	if use pam; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use sdl; then
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-	fi
-
-	if use gui; then
-		vbox_inst VirtualBox
-		vbox_inst VirtualBoxVM 4750
-		for each in VirtualBox{,VM} ; do
-			pax-mark -m "${ED}"${vbox_inst_path}/${each}
-		done
-
-		if use opengl; then
-			vbox_inst VBoxTestOGL
-			pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-		fi
-
-		for each in virtualbox{,vm} VirtualBox{,VM} ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		insinto /usr/share/${PN}
-		doins -r nls
-		doins -r UnattendedTemplates
-
-		domenu ${PN}.desktop
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]]; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev; then
-		local udevdir="$(get_udevdir)"
-		local udev_file="VBoxCreateUSBNode.sh"
-		local rules_file="10-virtualbox.rules"
-
-		insinto ${udevdir}
-		doins ${udev_file}
-		fowners root:vboxusers ${udevdir}/${udev_file}
-		fperms 0750 ${udevdir}/${udev_file}
-
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
-			> "${T}"/${rules_file} || die
-		doins "${T}"/${rules_file}
-	fi
-
-	if use vboxwebsrv; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc; then
-		dodoc UserManual.pdf UserManual.q{ch,hc}
-		docompress -x /usr/share/doc/${PF}
-	fi
-
-	if use python; then
-		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
-		if [[ ! -x "${python_path_ext}" ]]; then
-			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
-			eerror "but none were installed. This may happen if support for a Python target"
-			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
-			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
-		fi
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev; then
-		udev_reload
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process virtualbox-vboxusb.conf
-
-	if use gui; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-
-	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
-	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
-	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
-
-	if ! use udev; then
-		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-
-	use udev && udev_reload
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 54a76283d79a..8a340b649b3c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/cssmin/Manifest b/app-text/cssmin/Manifest
index 2ede8df09d21..3571a5e146ec 100644
--- a/app-text/cssmin/Manifest
+++ b/app-text/cssmin/Manifest
@@ -1,3 +1,4 @@
 DIST cssmin-0.2.0.tar.gz 3228 BLAKE2B 2322d7c38e334234b11292c24752549404ce8c70068c6c70a1c6e227a9f63a721a923dbb3006199df2e96fc5c0aba44349a6d8ce33791aff2dc1275e186b8961 SHA512 9422152578bf28cf7c3eb063c1f0dd3604a3d8fa73cd81cde09ae297ab27669126c230ef40a2e8c37083c1e781ab977554f9012e60979fe431ceb83d43452a9d
+EBUILD cssmin-0.2.0-r1.ebuild 371 BLAKE2B 29264a355b73f0f1a990f5811115ee2dc10df22e6175bfa8db6b8168d6d12fd776d451614e44fd574b2276bc6a40fed2ad664d9b96ae668ffb806a280c910667 SHA512 24e3884707b1d07f17eef6d57f5d3994040dfa22b4464eb9745c3d739ddd21fe93f37177733289acf9c4214588cec2e3668b03a4015abc0ec7f992cc554d5f39
 EBUILD cssmin-0.2.0.ebuild 416 BLAKE2B e3b3623c5f28e8d9b67daee9bc0be12fa4fa96549a00fafc22a9058853773fdfeac0c2209c5d6bb76e791095e3623b3c4b204a6014bb9ef56f468f557c3f52bf SHA512 4da1cf1054c21120f562dbbb244443929dabb00b4f1c2294c02806f80aeac35f8b4780728ccaa6531f9603b089c78c6d8223939ada8f43ab1ad7c5ac8ed8566b
 MISC metadata.xml 393 BLAKE2B 44094e942e960611713f2b2a7fb46659f57d936afb809eedc372f6d2172b1243c45400829d3ff573654f57b5ab83e1ce76375e9d1c6654c2f162c72949d209c1 SHA512 33d4fa57a51a33bd10074f071387a9eb436fb4c3d4302047fdc1d35fc59c21110060695492ff116badd14f2b5ea8692c60fd132a1ec9aa59390c1376b58aaf37
diff --git a/app-text/cssmin/cssmin-0.2.0-r1.ebuild b/app-text/cssmin/cssmin-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..9d989698550f
--- /dev/null
+++ b/app-text/cssmin/cssmin-0.2.0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python port of the YUI CSS compression algorithm"
+HOMEPAGE="https://pypi.org/project/cssmin/ https://github.com/zacharyvoase/cssmin"
+
+LICENSE="MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index 1a38d37e0602..3b18de66089d 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -3,4 +3,4 @@ DIST JabRef-4.3.1.jar 56868438 BLAKE2B d970599f6bfd4fef7ceda656fafeea77b5c2860ec
 EBUILD jabref-bin-3.8.2.ebuild 943 BLAKE2B 7e77b0fe343961510e8ba8e8d12cfa754691372cec8057a661dd91caca5ada1cccc7ad8b57d53fbd3939e8d4d8e7d6c3a11492df473a0dcaa06a77498eaf629e SHA512 805377397c65cc37449893b62c76972571ce41054a085b7731eb8403ac201ae5a4bf2a90190cb365ec0eefda4170ec565e1b22c6c71f6d52bab4beeef1d46f7d
 EBUILD jabref-bin-4.3.1.ebuild 1178 BLAKE2B 1cd8713abb6946b7f1c1e718aeac78e51d0427c7a010c08d7204ec72eb5d05a4a80206bc0d973fa71a9b30dc9e6e853e1ad1a9ce587f2a2dc4226d46cb541eb6 SHA512 ce9d7eaa56b267df51222e9f135d10a87a2420f4d41766b766639c276116b092b40e8be3c18112efaffc646f1d2769fa75a0b213873199789e9df3ee23892d14
 EBUILD jabref-bin-4.9999.ebuild 1148 BLAKE2B cac3a0cae5cba5e9223f14091c43094d8293947dbad3ee1adeeb2a2e2de6172910129ef41f14b9adebf7f8a124205e2405989cb9fa59321f0286d0070defb072 SHA512 80f9eb48593611de4e17f3c97595e95499ce8daeac883a5d5492ea4d83348672678f20c360632e76c67479a5c1a8c34620bbcde0e3b61b9297ce06de369bb5ef
-MISC metadata.xml 912 BLAKE2B 07e8424d29d7313639b0bb46fb789d3470b2165e564b0277d0f9a435e560da2d92852560ce0162838a67adc012a83aba50ddb40767234d88eae48f0d61fd7123 SHA512 24ba08ff7ab31ad216131958ae1ff073da902960db9a4ba2d3a082e8a5b9bd33ef2e4c6830a2a7d88e9e806b0b5d4b801575c3dd3950327c68603c2d9b6ff532
+MISC metadata.xml 911 BLAKE2B d30b7e97e2d3eb3e136e5bc57664d8f1083214a777f13bd28c69a229b29e8e3f89b5ce23a2ae204b14cb621e2bf88aee4c9e5bf3d4830b41e52d63e6f0b5b220 SHA512 21dd90e022a0e013442fa9f07b9553316b506b38c0475aed71db854fedaf68a9b38640539574ef62445ee8a001c19111146f82802d19de4ee6839936475050f6
diff --git a/app-text/jabref-bin/metadata.xml b/app-text/jabref-bin/metadata.xml
index 75bd03e0389d..b4fbf1e649a4 100644
--- a/app-text/jabref-bin/metadata.xml
+++ b/app-text/jabref-bin/metadata.xml
@@ -20,8 +20,8 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">jabref</remote-id>
-		<changelog>https://github.com/JabRef/jabref/blob/master/CHANGELOG.md</changelog>
-		<doc>http://help.jabref.org/</doc>
+		<changelog>https://github.com/JabRef/jabref/blob/main/CHANGELOG.md</changelog>
+		<doc>https://docs.jabref.org/</doc>
 		<remote-id type="github">JabRef/jabref</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index ca07eac288b9..5f088b7315e7 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 4cd4b262d0df..be5267a95bb2 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,7 +1,7 @@
 AUX mycli-1.21.1-fix-test-install.patch 456 BLAKE2B 3f4eafe405a2151b1b2897ac60347a5fdce45747f927a40367943ad78ef96753ad106bdefe516b76946fa509b17a31d9423cf0b5cf311e79174ce5e4f6320428 SHA512 90c53b12baee1339cdc629615a021ff0290e6350f3358491cd163c4405d49be02340a56a73475623a6b49877cef53e3c5bd9aa93897aa91769a402e8f4c0b88a
 DIST mycli-1.24.1.tar.gz 275983 BLAKE2B cc03ebd0f4de1fabbd1c186139aac04a50d01529190972cac63765a4d3e688e994c112d001489bf1dfb17541370e0c348a368d85a86b7eed335b775b96897765 SHA512 5f8ffb98fd285d2e556bef7cefdc77588983c0028c7c24084710633fb469ae3c5ab2232ca23e87406d44d87e503c113039e6884ec9efd603f45b3ab7ed7c0925
 DIST mycli-1.25.0.tar.gz 277022 BLAKE2B eabb07003741bc041fcfc7be92beade5bdf0c19d0be00b1a98037d38b164043e5280254b9c8446254928253f6059c33ae9395df780a2f30c5d9cbebffe020895 SHA512 e20b1466f0f2bf81f0d65bd23f97eae6b0943029c89d9d45f84368abc5f12c3054c09a45c4daea47831a192417e2e5be7bcd6622ea518e57b68f975a028d3f79
-EBUILD mycli-1.24.1.ebuild 1618 BLAKE2B 73346c2359d19ca908bfa4d46a3bc5a5e819f6099fdac4609caf29e679ad2b7c3563f6d5138713ccba0d32060dee22171c9a373922cb16c35518385112ce6e28 SHA512 f8d5f4fd299c14997ab4faed68708ba626bd798e0ba35d44f175a79f43edc75dd4497449b7ffc6102e0d16e2a8da4f6c659350d93dda86b21fa9b7978aa56158
-EBUILD mycli-1.25.0.ebuild 1618 BLAKE2B 489cc5bdd67256a86004c1d9ab00cad3a5c3954e6d6c39722846fcff88f9471ed95f957a8d7eb752a734d65f927098aeb83e1b0d1c3f0b6df648057a9e35ea55 SHA512 fc50b768b3eeb34ade2c95942d437f463bc0cce7cf15899bb09108cf86c6682c48a078be8bfa34c2969d1b1d712de68109e36e7b684270a015c9003cbbc43844
-EBUILD mycli-9999.ebuild 1521 BLAKE2B d08f4798140993e7528300986421cdb1284bc5cfade27e19ecc518a47cc2a01df0413ab76164d63bbcd1b00f262d59dce608063b25a15f37b9ddd3fa201de5bf SHA512 9b11cc44f4e37c26bff7277fea94f523ba654645abf27a40895b03daeaeabb36d2776dfea08c0f7376e6a84a5dc873f0a84093cbf3daa8e253fa5b4f6ae76bef
+EBUILD mycli-1.24.1.ebuild 1618 BLAKE2B e0ec5443372ea120b6a74b7ccb2577d0131672a16c9200fc1d0a8bb1a6f35ccb31cc78af131253af7a72e31cf9b590d7d03bf7ed78525c22476e02463df3fe20 SHA512 0400144cd4e52b1270f0192950d795dd9b2624599e63e3e9d5f71ec81a71dadd6ea6bd04943d686064c60a897a635f5f447d6eadf024cbf5c14d6fe353fcadcf
+EBUILD mycli-1.25.0.ebuild 1618 BLAKE2B 56f01bdac4cf29aaa6aa0802df6243b2b1393ea734fdc214379bc0addd00cb63f9c802bbf608de96bd0460dec69bebf5a2417eafb13e334ee332f53b1bf91380 SHA512 118160781e3a54bd61c5d48438fba97dfd14a84a98fdde450e9e4f14bb3bb56c952ac99cf397e724e75a7465abed892a59d53e51982847d2c84b010179f560b6
+EBUILD mycli-9999.ebuild 1521 BLAKE2B bdd19af8db8832bf1d17f77cc12333d1c67921d3794ce7c71ecadb700dc8801ba12a4dcbbb4dfe0e734a72e37ed701955e745863220cb75ba8864aa304bf14c8 SHA512 5b7a4671ac5a2f99d8490e9db076b947e8b1474ffe4abff45b4cb9670022d014f54b29f948fce67cc315997f1a899c8d4306271a14aff3db45521537ff534da6
 MISC metadata.xml 407 BLAKE2B dfa0f0bca1f39157b698c2109ed478e36ad966b7af46494cfba11481f9430c4ecd0738b231f66620618fe1ce7debf3e02108af4938aeb587c599493bc8faef60 SHA512 8ff03bb08d6a3d08216ba13e0b8c3d5aaba4ebc71eb6e77a66c154b68426f766124c8f4b5008a21a1a7a4c23587bc07ea91aec3edf98226dc9c8c3303ada0e54
diff --git a/dev-db/mycli/mycli-1.24.1.ebuild b/dev-db/mycli/mycli-1.24.1.ebuild
index ca2b749231bc..43d494e9b859 100644
--- a/dev-db/mycli/mycli-1.24.1.ebuild
+++ b/dev-db/mycli/mycli-1.24.1.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
 		>=dev-python/click-7.0[${PYTHON_USEDEP}]
 		>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/prompt-toolkit-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
 		dev-python/pyaes[${PYTHON_USEDEP}]
 		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
diff --git a/dev-db/mycli/mycli-1.25.0.ebuild b/dev-db/mycli/mycli-1.25.0.ebuild
index 625f13d4bd3d..8d0f0c8fe9b3 100644
--- a/dev-db/mycli/mycli-1.25.0.ebuild
+++ b/dev-db/mycli/mycli-1.25.0.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
 		>=dev-python/click-7.0[${PYTHON_USEDEP}]
 		>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/prompt-toolkit-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
 		dev-python/pyaes[${PYTHON_USEDEP}]
 		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild
index 89a88a2684e8..878ff8604470 100644
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@@ -21,8 +21,8 @@ RDEPEND="
 		>=dev-python/click-7.0[${PYTHON_USEDEP}]
 		>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/prompt-toolkit-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/prompt-toolkit-4.0.0[${PYTHON_USEDEP}]
 		dev-python/pyaes[${PYTHON_USEDEP}]
 		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index efe9a69833a2..47af89f8c985 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1,3 +1,3 @@
 DIST pgcli-3.3.1.tar.gz 446637 BLAKE2B c7c946b905f72e18b06100012c32b332c278fcf6dab2bdd304972b5bd4936a2d3d2c1b2be23a9fd5f986afa14ed8a8f3b6a0a08703ec6142ee3bc3d1a2ece68d SHA512 01286ce62919a8845ca55b40851ad8c3832dba58d523ce2d953d555a60d2785b0129b76361e854574340cb1c0933c7b83eb03d7c2a7df81fbc4231dc42e45357
-EBUILD pgcli-3.3.1-r1.ebuild 970 BLAKE2B fafb4f456b3eac98e6e15a1765b654db7dd62d131504109c871d5d5bb7609778ffa53a6f3559fc9418fa6654b2e0672970154bbcd771dc1a13ed6efc4e3061fc SHA512 30778cc19c86ac11a5971b24c159eb7e2605f473e32714c1e05468007dd74f6ee22bfe7cecd2896387250a9fb94706070e161c8c5ccd13c0382a9185bb7afe82
+EBUILD pgcli-3.3.1-r1.ebuild 970 BLAKE2B c40e4462b005f8a06c28eafc5792fa970520b8aadc74ba9a2a41bc9f12cf8d99bd56d3b0e600c510b0ed7f80f71e638af9a34d15425e7deb98b513ecb58ccf26 SHA512 72aaedff898dc26eee2eec77feb8e4defce6c9389394ee85657541ec159c3119c174bd3510f1ccdf616fde5ddb37b90506253197b571c867f42aae4b13ccec6c
 MISC metadata.xml 359 BLAKE2B c8107f0af400492e5365311f645a91c0a56448f3f2983c470c8e8eb08126202f2b5895978971f5f77eec87bbe29e4f198d954dcd87b14b2cfa019fb98dbfe272 SHA512 bca1ac9cb841c4b17c07b6a581d54f860fe384ce139b9894fcdb442024f75ef7996ea55535be177472dc5149e1dd1cf4859181210bbcd637f6b82b8816334cc4
diff --git a/dev-db/pgcli/pgcli-3.3.1-r1.ebuild b/dev-db/pgcli/pgcli-3.3.1-r1.ebuild
index 04ac95bd5f10..924b39e0aeeb 100644
--- a/dev-db/pgcli/pgcli-3.3.1-r1.ebuild
+++ b/dev-db/pgcli/pgcli-3.3.1-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-python/configobj[${PYTHON_USEDEP}]
 	dev-python/pendulum[${PYTHON_USEDEP}]
 	dev-python/pgspecial[${PYTHON_USEDEP}]
-	dev-python/prompt_toolkit[${PYTHON_USEDEP}]
+	dev-python/prompt-toolkit[${PYTHON_USEDEP}]
 	dev-python/psycopg:2[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/setproctitle[${PYTHON_USEDEP}]
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 0195d4556602..f30b3de0b2a1 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-md2man/Manifest b/dev-go/go-md2man/Manifest
index 359451804561..16b037652550 100644
--- a/dev-go/go-md2man/Manifest
+++ b/dev-go/go-md2man/Manifest
@@ -1,3 +1,5 @@
 DIST go-md2man-2.0.0.tar.gz 52021 BLAKE2B d3df2300a28d972b6b7269172a734dda7a60df5c25d8b4a4d9a45a2c636f08286eea4873c32d22a9533ba4e333660e4ec2deabe8fbdb9af3db96c07884278d04 SHA512 22a6c950ca7e386246fadb15f05d0a60437a249df48a7c5f905bc4bd05034cede6318e1158bd2113e97b4fd2d1e838776680a00c6141ac2b3c8795aeee15a39d
+DIST go-md2man-2.0.2.tar.gz 64353 BLAKE2B cc9ce9d14b61e600cf5179b72e08bc7e6ae5fcf31d3e00d6e5f7e5e77a26dd2b2b8a938e168e0053b2a9f9aab734d9beb02f7d95549fbf073125ad42b03cf478 SHA512 c81edfdc0b6647ef699cc908a1a7038d98da34df6d48b223b83a0699de91a7e322e70d67645acf1fc848918f4c1ea310160c7ccb75e6f97b53af7103c7aa18b3
 EBUILD go-md2man-2.0.0.ebuild 762 BLAKE2B d6ee24b7b007d93e6c28feb661d92dd88370d6a8409f13266edce58b01846cbd046c64e0ba1769ff35b9ac369ae453f8f4985d1562488feb710f95e2871b4915 SHA512 ff5a1d8bccd89e94cefe35436a0d52e8fecddecd2c2f840b856fb40fee4214a3d2dd9fd5b486b142612536350e8cd734b7f12ea2981abddb046b6e5c11481e47
+EBUILD go-md2man-2.0.2.ebuild 765 BLAKE2B 8f466bc18399a8394b3a6bc2a03ca4ce8a8de4714ba446b8d2caaca5065f2e14383cacc05e80a7cac493034a0b9e6a2903bfa3ccc3217fa535d4f1c51d34924b SHA512 2ddb5bfdfda37d9c3f02f9dcc1d14309824f8998f4e46d49a1b08df078d74ecd8f61781d2dc7a2c647ea732f875e5aec10fa08c3323b2e8cb3be5e0bad214cef
 MISC metadata.xml 332 BLAKE2B 42f4eb1e29091b8232cd71a38ba515180ac9287c06c357c042854e678973176760ecc6921cbd486bbd112ac056f18f900c6680ba6e2dc27990520459305f783a SHA512 09f145af286d702f22d73e47f8a25df4b3080c5a986a9a2a51bbe2df7a839082732d5bd5d552c22cda0a67a5c9177cada5c7b79714eabb5d3b28d53751e4a078
diff --git a/dev-go/go-md2man/go-md2man-2.0.2.ebuild b/dev-go/go-md2man/go-md2man-2.0.2.ebuild
new file mode 100644
index 000000000000..a3c4c9e0ebeb
--- /dev/null
+++ b/dev-go/go-md2man/go-md2man-2.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="A utility to convert markdown to man pages"
+	SRC_URI="https://github.com/cpuguy83/go-md2man/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/cpuguy83/go-md2man"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+# restrict tests because they need network-sandbox disabled
+# bug https://bugs.gentoo.org/715028
+RESTRICT+=" test"
+
+src_compile() {
+	emake BUILD_FLAGS="-mod=vendor" build
+}
+
+src_install() {
+	"${S}"/bin/go-md2man -in go-md2man.1.md -out go-md2man.1 ||
+		die "Unable to create man page"
+	dobin bin/go-md2man
+	doman go-md2man.1
+}
+
+src_test() {
+	emake test
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index c08013638b26..44fdccc702b4 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/orc/Manifest b/dev-lang/orc/Manifest
index 9630de44517d..37ef456cb9a3 100644
--- a/dev-lang/orc/Manifest
+++ b/dev-lang/orc/Manifest
@@ -3,5 +3,5 @@ DIST orc-0.4.32.tar.xz 180340 BLAKE2B fca41f0fc46bb6a841eb37f0f403afd0850053f93d
 DIST orc-0.4.33.tar.xz 199024 BLAKE2B 45518ff948f794c5a0eb14ddd462b58760d178267da34fd449a20d1bef4f7d6378b499efe1c7782e83c55be060b6f67023074cf8134e6a5ce129921324562c9b SHA512 ae8adce5dd62f4054879e6f2db76ce8a7959fd32fef0fb99f73f450ff58c5237e15bca764f6780309a163e40afcf400345f12b0aed5b88dc698064e44f8eede0
 EBUILD orc-0.4.31.ebuild 1183 BLAKE2B f417e72dec8e15bdd4ffdef8cf7c8f3bf84ecbb31ba814a1f05535a8b92de410e2e0db25ae2e864beb13b62ded43f547e8ffac2b46f5acc3dc192d44cd32735a SHA512 4b70b2b82d107ef096714971ab9eebbe4c4a6c981bd26c0edf7751580dfba97b7db04cae401d6f7415bc36ee0905b3f7782b5d4e4bd446c20cfdd79d199a3cd2
 EBUILD orc-0.4.32.ebuild 1184 BLAKE2B 1a85ed2dcac98a9740863c45e4bba4fc9d5827b734e2bcdab3b4a37b12e068dee53a10c56e7b63eed451a2ef37091b4f9d25448c4b14bd5dd5abea2b35a1397b SHA512 69b730395708d67934c7c6eefe46bcffc7bdb507b6c4ba403d3ad298a85ff3f00b81a8ac1ae103de17293d0b37ef5756e55d129ed46643cccb24e1c747901311
-EBUILD orc-0.4.33.ebuild 1187 BLAKE2B 867b4ef5f5d0ba4b1e3fa9a91d732603938a88fd58230f1bbe3253514d0f2d3da4b9221d0d00be139d2dc350c87ceff6b2f66d21e3322ec1624d064fa30c15b1 SHA512 408c41b3c67afa11bb3399d08205d33e3f637bcbe207bdee37cbf577e4a35fd31121e930e7383936dd35345a7cf60295734eb7d50aacb48625263de94c8368bc
+EBUILD orc-0.4.33.ebuild 1185 BLAKE2B ee735b385eb2a5e130bfd4d0fb925ddd231cea30425385ecea60d352e780fa2488987c6dd447352dfdaf913df46884783a1ece1215c5d6296c2ca8bbfd3bf043 SHA512 0602e1deadd3ab202e3d561f9ed8b4fb709f8f3b0e78dc2ff63a720e9420da5e8c04fa87fdeba163d616cc367b54c0976785ce650732233dd88bbb822b41af7e
 MISC metadata.xml 265 BLAKE2B 15de31a2337fe8b9175ffe3fd29cb1eb24148d7463f772b18a7fe8b38bd4edb05005df1ce6996cf23dad21db879c18b95d245fa9d096a002b95155c01088f516 SHA512 78a0c7a2a820f7032f384cf68d2affdd92d6f1466778f879909d0acfcc1cdc3bd64eee700ba06979f561583981033aae59b5d61eb4cfd01fc71fc13e4433305f
diff --git a/dev-lang/orc/orc-0.4.33.ebuild b/dev-lang/orc/orc-0.4.33.ebuild
index 51bb1904eade..53383cef9d04 100644
--- a/dev-lang/orc/orc-0.4.33.ebuild
+++ b/dev-lang/orc/orc-0.4.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 RESTRICT="!test? ( test )"
 IUSE="gtk-doc static-libs test"
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index cca7dcac21f5..76ba6258bb2d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index d28b8ab52df2..7cd0a0a11b4d 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -1,3 +1,5 @@
 DIST libpfm-4.11.0.tar.gz 1043686 BLAKE2B 99b4f1a5156316139603cf50cf42c13c548a0b196435bfc92bc26ebd3f8d7ec9584255978d4f3fbff45cddc937269961e9d2b65d065632ae635e9ca45c179a54 SHA512 633035b8a7b35973437572095cdc80d422b2a1a61e74e14f106db95fa8e44e4518e591699cc457f828b8f2fb63f60eef6d0c7535c6b4c9a6c3a70d4550b3c3c7
+DIST libpfm-4.12.0.tar.gz 1109288 BLAKE2B 035133d98305317b8331de9f3d986bf37b290cc80d2b944e9bac1c48a8659984ac190a0af1abe64bd9e0fee465f31ca11e3a35702f8a8da8a8a480a1aa625ac7 SHA512 dc47d862d619241db4a077a98b3f71a68f04be1be41e10c7b7dd2e596e6c79e9e0ff1d1028798dfb280553f98296b4b57339b4e6675749e1497dc1c9de06d9f8
 EBUILD libpfm-4.11.0.ebuild 968 BLAKE2B d4df07416b1416c1aacc7aebc73ef17a623abcc4933f347c066a831e8daa89717793ce894b0c916b32109d5995c1fe8d20f45684249529ed7fb2273e29e4d31a SHA512 019c7684714adc351364a26fdf0d44b2122d74495f53cd265ab6cb2481ab18b160c06ab5b8b9a985fcfaff184e2925d16593f464fe2fc7cf61744b2a7da6fa34
+EBUILD libpfm-4.12.0.ebuild 975 BLAKE2B d71b4359f1dc5f3ad0bc2e65737ac56891acf980514cec29dcd034e8849e132eae224abe47461665befa95088e5a9bdd0a7c9c22ce6053b367979e67d494a3a6 SHA512 b3ead4584a87bd63dbdaa43a09c1fe82bdfccdecc57d532c9bf5b9d54afce516e7e9307c0af34e129133aa312766471679ec8f25b4727f02208a75483acc75c4
 MISC metadata.xml 246 BLAKE2B 08a76e53ab8da2beee24c0920d47104aefd113853da0d9295967f0db8800717ea4486bddfb9ea1dd83039bb8f8deaf99edb834e2ed2bfe0207282130c7878a90 SHA512 7123d176941aa889b85a3fb204987908d69d05cfe577678b8e8bb0a4512b6a274dfb7e0ad1d2f5d93078512b78f89227712fdd3262fed332caafcaa40ffbc735
diff --git a/dev-libs/libpfm/libpfm-4.12.0.ebuild b/dev-libs/libpfm/libpfm-4.12.0.ebuild
new file mode 100644
index 000000000000..78e428370b01
--- /dev/null
+++ b/dev-libs/libpfm/libpfm-4.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Hardware-based performance monitoring interface for Linux"
+HOMEPAGE="http://perfmon2.sourceforge.net"
+SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+
+	sed -e "s:SLDFLAGS=:SLDFLAGS=\$(LDFLAGS) :g" \
+		-i lib/Makefile || die
+	sed -e "s:LIBDIR=\$(PREFIX)/lib:LIBDIR=\$(PREFIX)/$(get_libdir):g" \
+		-i config.mk || die
+}
+
+src_compile() {
+	# 'DBG=' unsets '-Werror' and other optional flags, bug #664294
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)" DBG=
+}
+
+src_install() {
+	emake DESTDIR="${D}" LDCONFIG=true PREFIX="${EPREFIX}/usr" install
+	dodoc README
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 61482a957ebb..a3d0dc3aee60 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -6,6 +6,6 @@ AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.35.tar.gz 1096974 BLAKE2B c80402d7be9e69ab6d1e768a18d271a8d28900f4cae7df2709d1ab26e100d908f508762bb771d4042aa7152934ce83d495e2102e894c56574187be8040d65629 SHA512 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f
-EBUILD nspr-4.35-r1.ebuild 5099 BLAKE2B fb3b4a4fefaae746bb772d50262add8a739816fc2ff2aacc924c5bab73f401e6f9b24707110f50fc5ca88143316e633b3d15ae4eb347c500a6e1a8af1bc354af SHA512 38daf259b6bce66b7a4f1da53e9339b7b9389da794e425cbef23e57c5eec353c994cfe36fb37e4532b3fa0fbf455cff744b8db92279be678967c02deb66991d6
+EBUILD nspr-4.35-r1.ebuild 5091 BLAKE2B 9ebf234ad026e5d47c50ba9abf3b142e0c036d66ae8be08c150595b6d4e39b9d9f190a2c343c5b6a308728cc092b5c631910a239c242c1d5921bf379667c5884 SHA512 3cd86575dd2d2595a5e4e332840ca1ffd7eb639cae8cafcff42a41d7460dea517b24a8dc85b957187fd2db22c6e94decdd93f2fd5d2bb7982f4555db38c3407d
 EBUILD nspr-4.35.ebuild 4822 BLAKE2B 7863462df59006ed06bc41a867178cbe217a36ba029ebbc1441e08e40614c9e7228d24caddeb096d5a679cd150243eba47a1268e06189cc5361c1c0f0799972e SHA512 386e6440fde6ea1607e9a2d6a024f0d8a5fec6160c90de4e7fb5f4db5aa53b9f7750e30aebf0098161b99da31b8ec14e3a2f4d4433d144a3dec6d42b50bf9b3a
 MISC metadata.xml 350 BLAKE2B 0f4d7850a3ca725af4e01a47e4db4219d2465b6d4db8c44e12b8f57d2064fd3c6ddbeec16888a316627f96e1f9415777f3fedecbd7065e4d13516bbed473a6f6 SHA512 2cc7f3e6eefcb5ba16c4b2127e751c47ea7a6822eb71080c96c6850ef741acff8d424c520eb60288ca32ccdbe825568d7aced9f57148e304dddd0afb7f4a8883
diff --git a/dev-libs/nspr/nspr-4.35-r1.ebuild b/dev-libs/nspr/nspr-4.35-r1.ebuild
index 10c3079649f8..878f4793dffd 100644
--- a/dev-libs/nspr/nspr-4.35-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.35-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index e26b1e92d380..d4448ca57dee 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luarocks/Manifest b/dev-lua/luarocks/Manifest
index 8cd81ed41a4f..ef76f3087817 100644
--- a/dev-lua/luarocks/Manifest
+++ b/dev-lua/luarocks/Manifest
@@ -1,5 +1,3 @@
-DIST luarocks-3.9.1.tar.gz 253375 BLAKE2B 6d622e87dc385d0851ef6366e0b6832f1a453d2590c090b06ec6ab81b8a15930c1496bf2ac00ed6b15a44dfbc43b1f235092947389714b72f3442f802236fab3 SHA512 2dfc1326118c2868b05a17acc5fe8d2c07503ef2bb3f2560a3d7ce385b85893d593bacfab7086c57923f042d7e7cfd09a0a9795afc473a73edbba0a44d23ed60
 DIST luarocks-3.9.2.tar.gz 256117 BLAKE2B eebbad38dd71b0318852a177d394df5fd20e807d566893a2338526e76e17daf2436309e512dd50b325914b2d84b90ef857396bfd6d41f22893131ed78931b8ad SHA512 7e93164bdcf35338e993822931a8e59957ab69c6e23236a7a075649c2f7cd173305c4ca6e9d115fc5e282cb76c21754d7adac92b21885006e5ee3bc06a9d0059
-EBUILD luarocks-3.9.1.ebuild 2032 BLAKE2B e45bdc7e716298f0834e042a2693a012483fadc1136feb43a7b6cd1dd1aafffcf9c66fd89bd4b9a5862bae63ce33f3dc92700a65f503b9b4e0fadcae4d8ec5d0 SHA512 66cc22c41de85c3c49defe5b0b031a375c1e9eebcee8779a91fb89784e237d4ce0648a7198daa64b2812f74fba7daedb2fcab84413a7005a891176f80c48b4fd
 EBUILD luarocks-3.9.2.ebuild 2032 BLAKE2B 734eb895b3d1005336cb528b212e2eb2283b5092fee5566c7479b512f5ff3513860163564b13d233c852bef812c5b6410f95ba7739af57ec6f6dcb270e8cea0f SHA512 3ab41e559dbd2fbab1505981eb98eb159de506f16ba6b239b80db9c23caf95fc2d3f59ee283816573335407df99f10a3d9f93cd91ea559c53e179405f16f846f
 MISC metadata.xml 501 BLAKE2B 0a2a3e7358a2ef2a4cbb79853408dfdf6015d49348bbb879a59253a88c73cf3d96c2ce708076844344468136d70962be74e639d24331a007fbd02ce6ccc18cee SHA512 43f147be67209e542e02733b6a57ce7ee05b61a7eb0d15662c0fb137db4f57c9f519cc98cf5dceb0e6f626f0dc6f04dd5b67da96a155b1e3884dca55896722f3
diff --git a/dev-lua/luarocks/luarocks-3.9.1.ebuild b/dev-lua/luarocks/luarocks-3.9.1.ebuild
deleted file mode 100644
index 99740dd51c35..000000000000
--- a/dev-lua/luarocks/luarocks-3.9.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua-single
-
-DESCRIPTION="A package manager for the Lua programming language"
-HOMEPAGE="https://luarocks.org"
-SRC_URI="https://luarocks.org/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="${LUA_DEPS}"
-
-DEPEND="
-	net-misc/curl
-	dev-libs/openssl:0
-	${RDEPEND}
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
-		$(lua_gen_cond_dep 'dev-lua/busted-htest[${LUA_USEDEP}]')
-		${RDEPEND}
-	)
-"
-
-src_prepare() {
-	default
-
-	# If 'dev-lang/lua' is a new, fresh installation, no 'LUA_LIBDIR' exists,
-	# as no compiled modules are installed on a new, fresh installation,
-	# so this check must be disabled, otherwise 'configure' will fail.
-	sed -e '/LUA_LIBDIR is not a valid directory/d' -i configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--prefix=${EPREFIX}/usr"
-		"--rocks-tree=$(lua_get_lmod_dir)"
-		"--with-lua-include=$(lua_get_include_dir)"
-		"--with-lua-interpreter=${ELUA}"
-		"--with-lua-lib=$(lua_get_cmod_dir)"
-	)
-
-	# Since the configure script is handcrafted,
-	# and yells at unknown options, do not use 'econf'.
-	./configure "${myeconfargs[@]}" || die
-}
-
-src_test() {
-	busted --lua=${ELUA} || die
-}
-
-src_install() {
-	default
-
-	{ find "${D}" -type f -exec sed -i -e "s:${D}::g" {} \;; } || die
-}
-
-pkg_postinst() {
-	local lua_abi_ver
-	if use lua_single_target_luajit; then
-		lua_abi_ver="5.1"
-	else
-		lua_abi_ver=${ELUA#lua}
-	fi
-	elog
-	elog "To manage rocks for a Lua version other than the current ${CATEGORY}/${PN} default (${lua_abi_ver})"
-	elog "you can use the command-line option --lua-version, e.g."
-	elog
-	elog "    luarocks --lua-version 5.3 install luasocket"
-	elog
-	elog "(use 5.1 for luajit). Note that the relevant Lua version must already be present in the system."
-	elog
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ac08c82d7a98..b7d27565a954 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest
index 7f9773ffdb0d..725244875684 100644
--- a/dev-python/Nuitka/Manifest
+++ b/dev-python/Nuitka/Manifest
@@ -1,7 +1,9 @@
 DIST Nuitka-1.4.5.tar.gz 4131887 BLAKE2B b4eaea811a98f1ea5618a477841e2fd2ef41eb4c78635576fadae8a645456f9d47741d1b8c0c102e2774e1802d210785f31a10889d87441693215d84d06cabdd SHA512 fc628be6579f2b290d126fc9f16e16a2fcdd5457a28cb2caa1b2d4e23426933e502a3487485e54cf4e0f67d2d5bca97567d5502070e7ad46a03c513a1f6f9c9f
 DIST Nuitka-1.4.6.tar.gz 4131786 BLAKE2B a72d8b8925dfdd7ca6416912d725cd711c1f8cedabbdc4ea1764645d935529c2b1561c561c6fe8b8cd2babdadd0b6cd3c239ff7e844bd745cebc3b2d94cfbd63 SHA512 883806d787bd35c687bd0771a0f3182d1d157c4c0f403c5b60a03536631823fbdfbaf32c3c29f484aa7de3dacf01056183607109036f60c5602ab08072d8e40d
 DIST Nuitka-1.4.7.tar.gz 4132335 BLAKE2B 5c9e653c8ffa7ad9e757a20d4008e4e2a3083cfefcbce826f0904c0281a9be95dbfb78ad1aab2dd0819b9bf3a800a3b35ee422e38672655fdd900162f9c0d090 SHA512 fb219f5a53bc173365d23f4eae0814fa051c1312bc732ac2b717924dd2336bf140af0237834062223294c840f63b6b4766422f8fd189151ab73877eeb9c39ee6
+DIST Nuitka-1.4.8.tar.gz 4132731 BLAKE2B 8e02acdb96596d5e74c486ae069ad4dba2ddff5e5b530d28f67551914eee8dc559fbe25d51454a18977d6e2877cdf9d3626cb5aad8942d0eb17b3e804ca0da21 SHA512 0d5646bf4b7f1de6f3015a59186ef2ff775f45326be6a83ede665e9a10003ed5c481b68016e863f196e5ab5cb2866ad1c6dacbe77edbfdecabab045ae1480b14
 EBUILD Nuitka-1.4.5.ebuild 1165 BLAKE2B 2a084c0bddcc11e5355533e2f03a5477932c304bddbef48a27817f16334db4e42bfc5b95988c4a0092336a5560d79089b00aefb2399a22ba6ceaa0180a53f045 SHA512 65f370ff9c5bfa6b0cd9b89c9e4173c03136652364cd20e4fe2c320af203c14fd317e08e6d16b06ed0db0856189f5374eba309288b33cdee05c9d9530ac18ad4
 EBUILD Nuitka-1.4.6.ebuild 1165 BLAKE2B 2a084c0bddcc11e5355533e2f03a5477932c304bddbef48a27817f16334db4e42bfc5b95988c4a0092336a5560d79089b00aefb2399a22ba6ceaa0180a53f045 SHA512 65f370ff9c5bfa6b0cd9b89c9e4173c03136652364cd20e4fe2c320af203c14fd317e08e6d16b06ed0db0856189f5374eba309288b33cdee05c9d9530ac18ad4
 EBUILD Nuitka-1.4.7.ebuild 1165 BLAKE2B 2a084c0bddcc11e5355533e2f03a5477932c304bddbef48a27817f16334db4e42bfc5b95988c4a0092336a5560d79089b00aefb2399a22ba6ceaa0180a53f045 SHA512 65f370ff9c5bfa6b0cd9b89c9e4173c03136652364cd20e4fe2c320af203c14fd317e08e6d16b06ed0db0856189f5374eba309288b33cdee05c9d9530ac18ad4
+EBUILD Nuitka-1.4.8.ebuild 1165 BLAKE2B 2a084c0bddcc11e5355533e2f03a5477932c304bddbef48a27817f16334db4e42bfc5b95988c4a0092336a5560d79089b00aefb2399a22ba6ceaa0180a53f045 SHA512 65f370ff9c5bfa6b0cd9b89c9e4173c03136652364cd20e4fe2c320af203c14fd317e08e6d16b06ed0db0856189f5374eba309288b33cdee05c9d9530ac18ad4
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/Nuitka/Nuitka-1.4.8.ebuild b/dev-python/Nuitka/Nuitka-1.4.8.ebuild
new file mode 100644
index 000000000000..6f373b0022b9
--- /dev/null
+++ b/dev-python/Nuitka/Nuitka-1.4.8.ebuild
@@ -0,0 +1,54 @@
+# 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 )
+
+inherit distutils-r1 flag-o-matic optfeature pypi
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="
+	https://www.nuitka.net/
+	https://github.com/Nuitka/Nuitka/
+	https://pypi.org/project/Nuitka/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/scons[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index f535e08e70cf..3693791d5603 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,5 +1,7 @@
 DIST aiohttp-socks-0.7.1.gh.tar.gz 19813 BLAKE2B e49ff94a63e3b22f082c892da6b65f71afd768ef98064f062facd382e0146e2fca563f2b7438f37e60a01d640199092c201e7ab2f77152829d8d8a64246ea152 SHA512 0f7a295e3d34d6cac78dcac5d64f76439730bf6bc6d287df9f2ed9b7ad3f1c04d61ebfd1cee75b80788f485b338094a4b02ecef2b3a2be172ffb8e1e65332b59
 DIST aiohttp-socks-0.7.1.tar.gz 19813 BLAKE2B e49ff94a63e3b22f082c892da6b65f71afd768ef98064f062facd382e0146e2fca563f2b7438f37e60a01d640199092c201e7ab2f77152829d8d8a64246ea152 SHA512 0f7a295e3d34d6cac78dcac5d64f76439730bf6bc6d287df9f2ed9b7ad3f1c04d61ebfd1cee75b80788f485b338094a4b02ecef2b3a2be172ffb8e1e65332b59
+DIST aiohttp-socks-0.8.0.gh.tar.gz 13190 BLAKE2B 049655c526b5d7b64af79ef5f885d0f949edf1eeb4f3fb6e8a3cfc97738ebeb4663d68017761808279e938f477f9509123d8d6c6f4133287d1743dc2a8a021ed SHA512 e533be7059ee6914f919f5113596708732f70f4f1093adaccc6a829699c2aea157897c5398d9134acb0b2a11c8118f9d4f453792d8d8d14b10b207ca19ada2e7
 EBUILD aiohttp-socks-0.7.1-r1.ebuild 848 BLAKE2B d070c2b4aaec44e84d4ac1563246016a9e2cfc11b92b626d73f826e87b5dbb1227b695e3f94b0c04ecb18230aa9152df689217cec48e09ae9ee8e3f99e84dc48 SHA512 a63a5b89052a5a58346f06c7c3fcd49781f526251a2b418a7473a490a7c8e86563333ea1c446a8d30edbfccbd2849f18c96eb120c56c9bef77b44aadfc650d49
 EBUILD aiohttp-socks-0.7.1.ebuild 799 BLAKE2B f95e7cb4b90d1c7fc5c5bed52c94128df56f5539d78e96eb68de71c33664e034bbebafa46c0798f098924984b883aa500e17532448a12cb188e0625b02fb816c SHA512 77388760d00accbe8f327a436132b118233a96055d58a795b13b2338816e097ffdeceff16c7c3021d4127c2a967fc4b19e0a2987623d774e7466fef56b132928
+EBUILD aiohttp-socks-0.8.0.ebuild 803 BLAKE2B 4436d8dc8070809c3509c0a851b2c9fb49920438a8d12cf2ab4302bd591b2f68c3040ead94ded2c993926166286b6802a96ce41e0eab5d9514c066cee81cbd96 SHA512 b7fcf67b3335e487800589566de52c390c1f64268d42b14950ab8ba4a14bf936d58ee9165c3bf73bf6ad9b4068120e14a5bb9d7b9a59f5a7b807844267988507
 MISC metadata.xml 417 BLAKE2B d4d70073cac054e8ce04d03c7087377b3b9b420f1f4352da54de0f6f5ca836cb49774307f01df383888bac24a2bcf9a1c2ab6920f8be16ebdb40e80c253c65ff SHA512 79af7d419eb9fe518ca8ea2a6bd4e2e1cfed7b00a032fbfdc4b05d6c59d9d7ecddd789a70a3db890a55335f293b6ebbc35f74dd73968de82e5147c991534cc6a
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.8.0.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.8.0.ebuild
new file mode 100644
index 000000000000..fbc1523f01d8
--- /dev/null
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.8.0.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+DESCRIPTION="SOCKS proxy connector for aiohttp"
+HOMEPAGE="
+	https://pypi.org/project/aiohttp-socks/
+	https://github.com/romis2012/aiohttp-socks/
+"
+SRC_URI="
+	https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]
+	>=dev-python/python-socks-2.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/yarl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index e33b4d0e7cc4..2f3a5588a157 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,3 +1,5 @@
 DIST bottle-0.12.23.tar.gz 73965 BLAKE2B ccd3dc3aad5c4c8b6899f55f03550cf9178e51788c27ece9808e1cff92693cc09dab145be16f814d29dae02ce53374a0470b2c4b032bc66a0ec2b1a11ec5ca44 SHA512 0550aa95680dd79d9c63c5de854845377183c86015893d9ee4e67126eca201582ef79d40ff0d1cbe79fe8a250118a775c63102475e337e18cfc1a65afe18f62a
+DIST bottle-0.12.24.tar.gz 74146 BLAKE2B a6bb638a0cba4d5fadbcb3a1a303b66a04f3c4df84e34b87d4a9bb22178de943123403d2851bd28504cf9d91380af95dd108e3b84825a93a6345cbe39fec0c33 SHA512 a3bc4bdc1376aef6c7b5784de18bfaac83e2c0c279fb2c3c3a8322871c68516e858b8c82cfff9291d41a66b906c13099c9d1037184bc48ff6f4ef0783b048f9b
 EBUILD bottle-0.12.23.ebuild 1219 BLAKE2B 546f0ca5fc2bf5a7dfb0c902b4c29153497b7069811de4f67c7c82f142edf17313a3ba035e57d670f4937256c9fe202e53337118f8f4fa72a0f72286022a4cdc SHA512 1db32bbf79460dfb88afc9c4e8ce82cd7d32fc5f0fe9004b632cc8daa7c9563b12744659d1224f902448ba0c6788e71404085a724a079d22aaad8988b255eb2e
+EBUILD bottle-0.12.24.ebuild 1180 BLAKE2B 5777f6292108d4d5b38db98938eec670032945f079789f3fd429ea0cfb231a4e349fd1c6f1918d886a148817139c18e80682671dfecd540e31f668d1a97f9c68 SHA512 a3fa4ab6beaa32a3238013dbd4e4817e01156be423da6f6e9adfb4fa95af31a2d4522505d5ce3c738cad05b53cb0892264d40436a954a6068a6f71e8cd3b79ef
 MISC metadata.xml 389 BLAKE2B fa960ae3a5dbead30cd7bc7617f87d5f2597716f6edef3a2af4ab15a7f45cfab6db98d77335a24fd792a6161dde7b7ff183d934e19cf69f7e1b2c72485cafd00 SHA512 06b65bd22b74e1e77597e65872d6ecc471e97848b05c02a0e2d35f98499d4c56164a15093ea96b9e55a59ed2624bed2adfb45d58d4a79c426087ca2ddf89f6b4
diff --git a/dev-python/bottle/bottle-0.12.24.ebuild b/dev-python/bottle/bottle-0.12.24.ebuild
new file mode 100644
index 000000000000..e7fcb7168349
--- /dev/null
+++ b/dev-python/bottle/bottle-0.12.24.ebuild
@@ -0,0 +1,45 @@
+# 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 optfeature pypi
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="
+	https://bottlepy.org/
+	https://github.com/bottlepy/bottle/
+	https://pypi.org/project/bottle/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	sed -e '/scripts/d' -i setup.py || die
+
+	# Remove test file requiring connection to network
+	rm test/test_server.py || die
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}
diff --git a/dev-python/cbor/Manifest b/dev-python/cbor/Manifest
index d6157a5606a2..67859c4468e8 100644
--- a/dev-python/cbor/Manifest
+++ b/dev-python/cbor/Manifest
@@ -3,4 +3,5 @@ AUX cbor-1.0.0.Replace-deprecated-logger.warn.patch 4012 BLAKE2B 443f5a7bf3b30b8
 AUX cbor-1.0.0.zero-length-bytes.patch 361 BLAKE2B 5422309b2a1f40e6553107380548396cceaf142f09eaa776d415690e71bbd5c7d6899a2c38e43ee479a539995e4c1a3816467d19a9ecfdf084915a6047f20e4e SHA512 cc1d11a5e8169271d3a35a41f850e62de8ebab0d3e2e23e480c3aef08c2a77a4670173523564c8c3abb3f021565acc088ecc3a0e4957c0ccf4a7e0a41c7aeddf
 DIST cbor-1.0.0.gh.tar.gz 25541 BLAKE2B dc5491235fee79ad15a8b92aafef2a690a407dfb98792e88b2e87fa7c354277b997ac314dc38279168f50c52f922de4bfe330b860126d4c5b836c019b05a1aee SHA512 88471b1c9c9a4128a4098194e17a4322ea2a01624ae1ffa9c33e433da31a089c45f4b64472d36620797488a451c16771c213b2b9a9ab711232c6658da4cd310f
 EBUILD cbor-1.0.0-r1.ebuild 1249 BLAKE2B 99e7838f885bf87d6dc925ebe86411f526d79621b6fbcb5e6bf1bff3ef44176f29bc690f043a5c314b78c49f1dd74dd1fa498548d2fb913bc1aced4aed0f9847 SHA512 afecd0f6e828fbe6f4fdd4489c41a77db0dbd85ea8a5eacadd2d1ecff792338f23ee1836f4b63b31d901a79bb21f4083f54939e85afdd706c840ac6cc8280c96
+EBUILD cbor-1.0.0-r2.ebuild 1291 BLAKE2B 4f164312ea89ff5f22289978720a54cfa2813847c83d5e9133c5309bbc31a9e891d09e9578624cf9120b3bf7bb7b833685756d3690088a9210079aff5249fb4e SHA512 45059d39cfbcd5e1fc1d1bced9d8e657eb2fcefeecc866df4e7c44d307fde39cbafdb32ae1462129da4864876de83598426dc779b9355060eb7596421a6a67a9
 MISC metadata.xml 1000 BLAKE2B f6af9b2fd8f354501011d173d163451a85c9b314aeb9bf0649317cbce451ede698ae753170dfed8d1aab145d9a5d42ed53ef1d1ef7a78e78bd9f139b8749a20a SHA512 f4e4ba5ca5720f19ea9d70d8dd3a397b95308e35770ec0056f070f76b7ecc73ddd592ed9ecba24cefd5b32f7fede650c2515a35b14c3e1ec623aa87913dfb9cd
diff --git a/dev-python/cbor/cbor-1.0.0-r2.ebuild b/dev-python/cbor/cbor-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..af2c125ebd7b
--- /dev/null
+++ b/dev-python/cbor/cbor-1.0.0-r2.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+EGIT_COMMIT="b3af679e7cf3e12d50acb83c3c591fc5db9a658d"
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="
+	https://github.com/brianolson/cbor_py/
+	https://pypi.org/project/cbor/
+"
+SRC_URI="
+	https://github.com/brianolson/cbor_py/archive/${EGIT_COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/cbor_py-${EGIT_COMMIT}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+# upstream PR: https://github.com/brianolson/cbor_py/pull/19
+# upstream PR: https://github.com/brianolson/cbor_py/pull/11
+PATCHES=(
+	"${FILESDIR}/cbor-1.0.0.zero-length-bytes.patch"
+	"${FILESDIR}/cbor-1.0.0.Fix-broken-test_sortkeys.patch"
+	"${FILESDIR}/cbor-1.0.0.Replace-deprecated-logger.warn.patch"
+)
+
+python_test() {
+	"${EPYTHON}" cbor/tests/test_cbor.py    || die "Testsuite failed under ${EPYTHON}"
+	"${EPYTHON}" cbor/tests/test_objects.py || die "Testsuite failed under ${EPYTHON}"
+	"${EPYTHON}" cbor/tests/test_usage.py   || die "Testsuite failed under ${EPYTHON}"
+	"${EPYTHON}" cbor/tests/test_vectors.py || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 15f4880b7119..ae856ddca6ad 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -17,10 +17,8 @@ DIST chrono-0.4.23.crate 187259 BLAKE2B b4a7cfb8d1921d396c9e2bf350e6c61d04480a78
 DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
 DIST cryptography-38.0.4.tar.gz 599786 BLAKE2B cd6ef7e671dfdf36a5b9ee253307bf069e4c87d5a3a0110cff70f50c17cbe99997d7c9e78678b26a59e7f781076c53934be1d37c52605953c06913cbe2faa3cc SHA512 2dcf3cb8208a5905b930482ce87ac56b77fda0eb02387492f0d6be9df67dc5967c93ec9a2127f83dbea1a9a3d39f1adc98497b020ad654d4afdeb67d2323afa9
-DIST cryptography-39.0.0.tar.gz 603406 BLAKE2B bd36fb786a12cee965ac42c2eaec214f7f261d6a8652a4859819577c8c079673730608e3f61c059ab65489e50bbcfb3ba7bbcd2a8f9e4169e844f3c497411b9a SHA512 bac0268ca0b6a12adc2d2a1f4ec047aad0643afa021d43574f189187a6a6802bc79e9329afd77a950b158040c85137da4cdee1973f4bb89815ad2203fa969393
 DIST cryptography-39.0.1.tar.gz 603634 BLAKE2B 20247ec0fd933b8541712169feced6247ad6fd708af78b06c4bb633631a2160473a818a3c5e545243f3dea3b254ae63055b05e226eb8e1348413b5a883236ded SHA512 a7df2cc73309b6902a2743273e41c7bec8e0dd0c8160b24edf6554089ca8d160cde7d9007cf45751cb52823c2a6f4a3c437a447292f6e8c06db547d519e98b94
 DIST cryptography_vectors-38.0.4.tar.gz 35273825 BLAKE2B 8bd39caeaa6c1d90320def07e4855995d15cfcf7a422b7491765efc5e88ddbfcfea5c27ed52a48c1ae10f041d8129ef40720fb7b45b26e576230596fcc23f4e1 SHA512 04972f13ff0217e1d8827381fafeb5071f3009d34378e60805ef1f05fefd850a0904a60caef4fc95ce396de01925a3e42443db174508627ed010ef839e97c644
-DIST cryptography_vectors-39.0.0.tar.gz 35275931 BLAKE2B b0783fd41cf6920dda2715c8f02d49eff6b093f73efc08a6b8f31c0b4cbd64bf262a9407f956df918093d84897a9d221c25ff0c8a568768dc902f052982f86e0 SHA512 3030e9ef1a1b33c8229b9123b71193baec11020da9110cc9adb6e8f069ede5bff5d228bb258be1537399c641f242674d1fabd0c99694936cd36342a61efd0581
 DIST cryptography_vectors-39.0.1.tar.gz 35275870 BLAKE2B 28e064e0f42ebb7b7af6db65bd506d4047d1087b63199eedaadd346c218b0cd24a16c8b97fc39b3325224026bfd4b2214bb53a5564495acab1297067a52e0649 SHA512 b06585c4ed1fc360165a8801509507a0a546da42cbca80703a173aa55d34f1f9790fc2763c7aef274f479248c57a2e86a56bc098ffb49532cb59132c139eb8af
 DIST cxx-1.0.85.crate 589916 BLAKE2B 3be165b6d8c5ccaa7e5ec3d456c1bc2aeb95e2dc7890feb1ebeb2d25b2887b1b023afdccda08862a13928a8f379200c46fcaf88ecc111d9dbb3bbc5dde63f88d SHA512 bf9386f58ea007bcc7171af713e944459a6b219ddbe88813f16df5e274ab85418be23dd7bdaee7964108e9a4a1698365de67362d5504c80bee726f1151166f5c
 DIST cxx-build-1.0.85.crate 84820 BLAKE2B 6dd01e251776f33cbb11b4ef6a9d77db7c476e6184f942d0a5fca5505c5fc2463bc03edcf8f08597238898b92df1c53ba330e9c3b4e63a106136445fcf202584 SHA512 3ef75dc28bed9c1c9cea5dbd7b396f8e88a5fe288e19d1aa1f96add32830236b2414fe33ed7b06566759298cf0130d6b82d2049ba9bf362c95413ce8481f2bf2
@@ -94,6 +92,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cryptography-38.0.4.ebuild 3217 BLAKE2B 5f4a61f98ec7f687620d52af85df469ce1f2391db3432f15efb6e814384a2b2e0b3eeb21fd2aeef75af7bf4a7a47e6f299d6201db15a7123b52abc783d1fd347 SHA512 3ec93390adab6ac6d2c433761d334001a6ab37ff3d86769a35b3864c57fb990b90766984e8ff76bc3b5cb49ec59cdd718e4fab086db26d21506c7a7f85727065
-EBUILD cryptography-39.0.0.ebuild 3475 BLAKE2B 631008b9ee6510ee30d809683718af2ccf3e765fd066ec1e7aaa2d32e173a2b334ee323010c3437f9e767fb512c943d73aa7bc7f565b04b993a899d0ed29b3f7 SHA512 72d5233e7defc97b264d20cd22ef7633d1e4d1a8143eeae1fe437bc59e4c98a7722a4919ee720000955ce3272820bf4f142985a24156f886fe0b81cb03e94036
-EBUILD cryptography-39.0.1.ebuild 3442 BLAKE2B ec928494b712e2ebcbb6e22fa760b08738c0bed9a455325003e58135492fde6c884f644674a164d26596beff99124f89503316e459d8e7fc73ed2bc42e93571f SHA512 0e7d25b7fe8c3444141bc3e457d465e60b62b44bc8a0102605ed3f2c0235454e9f30a65f7010995a67bfb70b447324f6c39cd133b39a8f91ace28d6822552972
+EBUILD cryptography-39.0.1.ebuild 3441 BLAKE2B dd2082951f8413a8310228199faa5e4aab3e6f965ba2219ed42fda8f4f1630999d345c0852d57b3287eaf984d7c73b83fecf6d6629fc5810e87cc1d57a799e96 SHA512 e105a7b450556e3a71ebc92a7ee06725c6496a29a2aa68563fc9a4319aa48afac096c1808470fb1e778fc7c32a6bb09c64a19ccafa7843a2a905a3fefe2ef717
 MISC metadata.xml 464 BLAKE2B 96c0bd97b83c9718910d129260402fdc37e88a96ac6002c8f6dd19fb21d6daf31211b83ff7423036811e27954811ebdc810c8328f18c620682bd9428f42ba1f9 SHA512 2f36a186bb195a8cbafe1d8dd6630fadf0ea56b22906ebaf3c90954adb8b66e1017f599169e2b1ca386e1113c1a6b834fff90f2bec527bed53f62985120732d6
diff --git a/dev-python/cryptography/cryptography-39.0.0.ebuild b/dev-python/cryptography/cryptography-39.0.0.ebuild
deleted file mode 100644
index c1ec3cc64b51..000000000000
--- a/dev-python/cryptography/cryptography-39.0.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-CRATES="
-	Inflector-0.11.4
-	aliasable-0.1.3
-	android_system_properties-0.1.5
-	asn1-0.13.0
-	asn1_derive-0.13.0
-	autocfg-1.1.0
-	base64-0.13.1
-	bitflags-1.3.2
-	bumpalo-3.10.0
-	cc-1.0.78
-	cfg-if-1.0.0
-	chrono-0.4.23
-	codespan-reporting-0.11.1
-	core-foundation-sys-0.8.3
-	cxx-1.0.85
-	cxx-build-1.0.85
-	cxxbridge-flags-1.0.85
-	cxxbridge-macro-1.0.85
-	iana-time-zone-0.1.53
-	iana-time-zone-haiku-0.1.1
-	indoc-0.3.6
-	indoc-impl-0.3.6
-	instant-0.1.12
-	js-sys-0.3.60
-	libc-0.2.139
-	link-cplusplus-1.0.8
-	lock_api-0.4.9
-	log-0.4.17
-	num-integer-0.1.45
-	num-traits-0.2.15
-	once_cell-1.14.0
-	ouroboros-0.15.5
-	ouroboros_macro-0.15.5
-	parking_lot-0.11.2
-	parking_lot_core-0.8.6
-	paste-0.1.18
-	paste-impl-0.1.18
-	pem-1.1.0
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro-hack-0.5.20+deprecated
-	proc-macro2-1.0.49
-	pyo3-0.15.2
-	pyo3-build-config-0.15.2
-	pyo3-macros-0.15.2
-	pyo3-macros-backend-0.15.2
-	quote-1.0.23
-	redox_syscall-0.2.16
-	scopeguard-1.1.0
-	scratch-1.0.3
-	smallvec-1.10.0
-	syn-1.0.107
-	termcolor-1.1.3
-	unicode-ident-1.0.6
-	unicode-width-0.1.10
-	unindent-0.1.11
-	version_check-0.9.4
-	wasm-bindgen-0.2.83
-	wasm-bindgen-backend-0.2.83
-	wasm-bindgen-macro-0.2.83
-	wasm-bindgen-macro-support-0.2.83
-	wasm-bindgen-shared-0.2.83
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo distutils-r1 multiprocessing
-
-VEC_P=cryptography_vectors-$(ver_cut 1-3)
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="
-	https://github.com/pyca/cryptography/
-	https://pypi.org/project/cryptography/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-	test? (
-		mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz
-	)
-"
-
-LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD-2 BSD MIT Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2o-r6:0=
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-# Files built without CFLAGS/LDFLAGS, acceptable for rust
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
-
-	default
-
-	# work around availability macros not supported in GCC (yet)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local darwinok=0
-		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
-			darwinok=1
-		fi
-		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
-			src/_cffi_src/openssl/src/osrandom_engine.c || die
-	fi
-}
-
-python_test() {
-	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
-	local EPYTEST_IGNORE=(
-		tests/bench
-	)
-	epytest -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/cryptography/cryptography-39.0.1.ebuild b/dev-python/cryptography/cryptography-39.0.1.ebuild
index e67ca02568a3..9ce94d41eccf 100644
--- a/dev-python/cryptography/cryptography-39.0.1.ebuild
+++ b/dev-python/cryptography/cryptography-39.0.1.ebuild
@@ -96,7 +96,7 @@ LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD-2 BSD MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 58d22ab42201..ce0d2a90c415 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -6,6 +6,6 @@ DIST dulwich-0.21.3.tar.gz 437815 BLAKE2B 889bb20800bbf45da6ddd688ed1e8ff2ca76fc
 EBUILD dulwich-0.20.50.ebuild 1519 BLAKE2B 8a60db99c5074d493c79d9716f3ff59c3a4a58e705689d8accfa990e3bdeeb7c11ecd2d54d9a9012540c706dd7b13076ef9a339393e2c9c7056f4f43dacc42b7 SHA512 db8f6cab8b4604a2b174dbbfec5e107752aa00da05d0a1f6caba2a6b50cccb3fa0ef66a5239d4f21a04fc574643c003b1d1c99f35c825f53deaffe98986d0159
 EBUILD dulwich-0.21.0.ebuild 1523 BLAKE2B e5f55d7476f1c33a42f28e01e8c7470a46fea52cecbe9f72811db981fd7b9abd402637ca5a68a45bd8429aaaad32eae39737c829a4508b0c5045a726ca7de83b SHA512 5d4c37c0d517827b7cd7685b6d53e6f92d20832272e00e0c019172c09c8cfa8166b8a619c6b42d95f3d5b3d04bfb506e57a79baaa49ba97fd3d6b60be93e1bd5
 EBUILD dulwich-0.21.1.ebuild 1523 BLAKE2B e5f55d7476f1c33a42f28e01e8c7470a46fea52cecbe9f72811db981fd7b9abd402637ca5a68a45bd8429aaaad32eae39737c829a4508b0c5045a726ca7de83b SHA512 5d4c37c0d517827b7cd7685b6d53e6f92d20832272e00e0c019172c09c8cfa8166b8a619c6b42d95f3d5b3d04bfb506e57a79baaa49ba97fd3d6b60be93e1bd5
-EBUILD dulwich-0.21.2.ebuild 1522 BLAKE2B affc5b3bae5eaf71dd9c4064bb77ba0a03832b2d8a3be08e22208fd30c82d9c4e758027d86c1197f6511b88d1409734b88c8b589e837702547c480c80203e7c6 SHA512 7635aaacb1bed8553aa2880205823fdf1458e4c21a8de9fcf768687efeae09d405f0cb8a85f939097e32eb2e2ae54bf3acb2bc21801abab1579860240bf8e3ec
+EBUILD dulwich-0.21.2.ebuild 1520 BLAKE2B 9b414064917d81fc64665478cc5cdfc7c0de5d854e3612f06cfb99e828238275f32e98b37d60dc6c5b4274301c8d4d9c7b73a7b1ab2a4c8c3e4d797cb5bb1ea4 SHA512 7cac81a4a9b0c76f482946c3435d2fe286fb0accecee448379f1c3eb13cf44dbfb48786d26cd3be10cd23769eda5aca152254f6fe3b0dd7acb3c53069a5ef903
 EBUILD dulwich-0.21.3.ebuild 1476 BLAKE2B 6575e4fc74da8f4525c78e5fc88d2e5255a4e073d957a5d8d3336c29338ce2b85ada7feba088f0f6094e4d8a3fc4fb2ab1bea6880211bc66220399a2e55de2b0 SHA512 34a74034f8ce4a3548f7313817eceb576e8772dd961d7ed9bbb0baa09301950461ff4e05f846a83a69ec34ea6eba1f34a58a9874f6bc6fac3091bc0f1eab6a4e
 MISC metadata.xml 556 BLAKE2B 240554ff522160e9508bf6debadafcc44b5ccc4074dd4c9d3ce82358963084c60a1afae9fafee6ab1e6e5d898940ccb4d1b524cebff155e61bf6707c9396b647 SHA512 a7cdca224a01d5bd26bf4a5adb0273977ddff61f75cd02f5642132656fd0c6608114617efcb068d834f107804666cf4fb3725967e804b73d2ddcb67342dc30de
diff --git a/dev-python/dulwich/dulwich-0.21.2.ebuild b/dev-python/dulwich/dulwich-0.21.2.ebuild
index 48394ebf40fa..3860758cfd93 100644
--- a/dev-python/dulwich/dulwich-0.21.2.ebuild
+++ b/dev-python/dulwich/dulwich-0.21.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flask-gravatar/Manifest b/dev-python/flask-gravatar/Manifest
index 4d0e12bdd30e..f39c809c27c8 100644
--- a/dev-python/flask-gravatar/Manifest
+++ b/dev-python/flask-gravatar/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Gravatar-0.5.0.tar.gz 17299 BLAKE2B 7dc16c609cdfbf690a39fbb3bd2810398030bd5c7a54394468902dd131116509da8de448a55907e4738fc984ef422f3c7970b8453b27971eadb106cbb8648562 SHA512 bb4ff064489a030fd763a46fc045109104535474d115aaabdf5c4d1a82a1e3303ee34f590a3f1203a9d009307fc8c45c37af7c30e76a4fb10bc46dd684d37751
-EBUILD flask-gravatar-0.5.0.ebuild 782 BLAKE2B 563b60fb7d7fcd236cde0553b2240ae10b85eea1ddad1e82d914c5bbc38a430ec794a45a122e934a92148d3eb3d358f7eb41c274a38d4c6af2dca228d764812f SHA512 5b7e457db604c361306cc286015229542d65d4f181305e9a7ead23b676e506b5fb2747066621d339048edc6f3647d28cf76b8af475f9a79c8353f055380d36f9
+EBUILD flask-gravatar-0.5.0.ebuild 782 BLAKE2B 9d5bcbca27115f973a305c5afa51ba1fe881fc5e893fd34f95014f95a7988f3a4f83b6a09eb92a84936738e0c5d2d5aaf78de7086de6233655d7d1eb8b192b05 SHA512 ba2db6614554aadc6ef310835a13c35435391af4c45a97a04f6429d1cfe38af70053b438104f65f844e175054e41f9db3fdd6ecf3b7de574642f6f90a7a3b818
 MISC metadata.xml 519 BLAKE2B 789e80f12265b3fa1380ee6be57f9ab8cd76bf92eef8e484845f1c2c855f0795d52bf190a66d68b5105236ca469eee526e6c5d0c76eea59752f8d2b200b3aef9 SHA512 69966562ebc6020fff360d783a9a9da4bf5d6ef1d43e288b3c6541496b3681a3c83736f34072e13f2ca821bcb4d00b20b07b41b1329c1ca139219e3d1aeffed4
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
index 17b1db6f4ad9..32d46840424e 100644
--- a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
+++ b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="Flask-Gravatar"
 MY_P=${MY_PN}-${PV}
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index a3e818155ebf..6d4da12d43aa 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,3 +1,4 @@
 DIST Flask-HTMLmin-2.2.1.gh.tar.gz 17550 BLAKE2B 30393f6739ba8bdcfc17586e0955dff4341707b3c5bc27e30e9f9ddd5d4ff5b5b1b71b512b034b3b09cab3bfbcfb47c1651bc8cedba597de8aca5f2c7cfc0907 SHA512 34d5c9e2393901b32ab43c4333d87d75b489a410af2fdb019c180d0cb7bac01074616125486b49ef577782311a394bde6444ce311d5ab4f2ae2852a3ea92f4cd
+EBUILD flask-htmlmin-2.2.1-r1.ebuild 694 BLAKE2B d2cd7959794ad3943242acca7791f883a639628c07420be4e488b955486659b1956477a906385d8bed5649567530e0c51f516504396a1bc49717980d11051dcf SHA512 9aca138c5852692ee920b1421b50dd677cbaa04fa9dc2cabaad0ff382bd9a38d8c7dc7b12b20622be959f6f233c562fae7cea2029873fba59ebe54ba7e49b259
 EBUILD flask-htmlmin-2.2.1.ebuild 692 BLAKE2B b72ea43b917a1f41e151415e915930c5ab3e5414bde828237b06164eb51a5450d97a618ffd5bbfcd6b06df3357fe8bba1f1db9f994301a4fb81b4c6a67e0e46c SHA512 1422d9c7c0eaafdcc2cd2a8e9589435ccbd5d92559760ebf0ea48c2ffb2a5de186daefe88b8c5339aa8f5e9bb08c00fe033cd41f00b934f413b5758f7eb9f1be
 MISC metadata.xml 517 BLAKE2B e22522b2f2578e000de4127d3c6cd5d6f08b3974aef72644e51ae39e074eed3d42cba247b2dff4090e930cd9ecb5354f7094a763c116989d425672d109fdd408 SHA512 6393c0fb4084501989d12c24f7e56269780423d675761e48da3ed159db639df3639e5a68cfcfaa8a53d1e111474d05656f227137af2ee7950f4ec88f1393216c
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-2.2.1-r1.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..3a9879bfb52d
--- /dev/null
+++ b/dev-python/flask-htmlmin/flask-htmlmin-2.2.1-r1.ebuild
@@ -0,0 +1,33 @@
+# 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
+
+MY_P="Flask-HTMLmin-${PV}"
+DESCRIPTION="Minimize your flask rendered html"
+HOMEPAGE="
+	https://github.com/hamidfzm/Flask-HTMLmin/
+	https://pypi.org/project/Flask-HTMLmin/
+"
+SRC_URI="
+	https://github.com/hamidfzm/Flask-HTMLmin/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/cssmin[${PYTHON_USEDEP}]
+	app-text/htmlmin[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index 4911251a8d58..dd756872b7dc 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1,3 +1,5 @@
+DIST flask-paginate-2022.1.8.gh.tar.gz 120847 BLAKE2B 110d6f7bb6c244378a41ab26c914898b54fb05cc00cfc6c7c3e15ed96e2163f92cc89c4ce93199091d8ed2f52301e997ebc16a71a3d802b8107249f9f832ca25 SHA512 9f2e0e50d73ac15ec2a413671a52e9dbbbb7eac8576494483441ea1287a12e2076cf649ee9df0bf3b3d2c7e13eebe4a835031ab57a2e8b2015f383d53318a0b9
 DIST flask-paginate-2022.1.8.tar.gz 120847 BLAKE2B 110d6f7bb6c244378a41ab26c914898b54fb05cc00cfc6c7c3e15ed96e2163f92cc89c4ce93199091d8ed2f52301e997ebc16a71a3d802b8107249f9f832ca25 SHA512 9f2e0e50d73ac15ec2a413671a52e9dbbbb7eac8576494483441ea1287a12e2076cf649ee9df0bf3b3d2c7e13eebe4a835031ab57a2e8b2015f383d53318a0b9
-EBUILD flask-paginate-2022.1.8.ebuild 521 BLAKE2B 0bbc7f6758e1b9c708693133e1bcd030df60cda6e08108c3d03f7cafba42bf6c05d18e370f5ed3d30fbd3e251241c04cbcec67632b3bd072e6d4a1bdddcb3df5 SHA512 ffeb65da8fe14211e36d4f9960e806c75b61bd911366f13d465d1ef8d50fc14acdb8ccac10a03a47d3e54aac838e9a7daf3e455c9705151ab4432f0b8e0e9e85
+EBUILD flask-paginate-2022.1.8-r1.ebuild 556 BLAKE2B e682bba74151bc990f28d982eeb2c7ba21c11119d171fa797b13c0436e2c31fbbddea870431b7c6014ba3285214e7169b9f4888faf56935fe6090ad7ec4488b8 SHA512 b60d4835990093895da51c7c6b5b127287214c8bc0b68db0349eee421742490f266df5555cb5532ff25add6059196fac1e412cd9951dd986994e05c8291735bd
+EBUILD flask-paginate-2022.1.8.ebuild 521 BLAKE2B 8867e777062b9a61ffb15c9b6ee0cebacc220d3db8c877fe8499eeeaa692e2fe7fbef8cde84a209991e61f6ca435e176110f1aac75b6e8ea422098b3956bbb78 SHA512 9d497424643d3fbab3dd4444c2a85ec8ea60774bbde394ba415326b4827b79306ce0e4d7077aea1b901218545a068ae5d8f6f690e71622844456b672b435fc1c
 MISC metadata.xml 659 BLAKE2B aa9bb930f20057e07df9b82804e8638b99f63e0773c11408617bc1c3c09f0cf8ce1d3383bbf577c42baa0149c271ddc8da113d5a31056e8ad41d4ac8ec4b64eb SHA512 660aba4453bb417b9a54dcf0b190ae16599c00203a19b4c53615b972595e223fb2f6ce8da6f097b34a5408c4cfe09b2a02a2ad19928352acbc8a4ee53b822a41
diff --git a/dev-python/flask-paginate/flask-paginate-2022.1.8-r1.ebuild b/dev-python/flask-paginate/flask-paginate-2022.1.8-r1.ebuild
new file mode 100644
index 000000000000..bf6e520d55d0
--- /dev/null
+++ b/dev-python/flask-paginate/flask-paginate-2022.1.8-r1.ebuild
@@ -0,0 +1,24 @@
+# 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
+
+DESCRIPTION="Pagination support for flask"
+HOMEPAGE="https://flask-paginate.readthedocs.io"
+SRC_URI="https://github.com/lixxu/flask-paginate/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/tests.py
+}
diff --git a/dev-python/flask-paginate/flask-paginate-2022.1.8.ebuild b/dev-python/flask-paginate/flask-paginate-2022.1.8.ebuild
index 5bafd909ea29..a3924d3b1775 100644
--- a/dev-python/flask-paginate/flask-paginate-2022.1.8.ebuild
+++ b/dev-python/flask-paginate/flask-paginate-2022.1.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Pagination support for flask"
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 93666bc15773..495eb2140f82 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -2,8 +2,10 @@ DIST google-api-python-client-2.74.0.gh.tar.gz 38189426 BLAKE2B 927345937faf5742
 DIST google-api-python-client-2.76.0.gh.tar.gz 38245213 BLAKE2B 28d7ea8fb169b08cfc689b2957de84e1f860fb2857f4cf85e40bcdbe8c728e6179194d5dfe65103d1ed17a604d880011b2a82b4e555dc6ed6e9e73737fc5e8bc SHA512 01f1245b8a64cf5adae42b941b88eb05db4a21db4e16b35f98a077c223e795538b654f348f4b0a7bfde8e8928c3c57cd841dca41755a57ee0a6965b89f58cdf9
 DIST google-api-python-client-2.77.0.gh.tar.gz 38300787 BLAKE2B c7d147b9ae78fff5aa70b2ba219888296d414c1f7b498c93bb424d06c437a50d5a1a2284062e58defb29ba3aa89b225e4218d9acd303a0e17f3ec4ab0380a2f6 SHA512 24aa2b3d709de83b76be2d8030a419d0e3f8f447852d7f95c6cf735134270a7af94edd86bcc3d82cd25af2497f30ac6c365ac88494c227b19faecb8e3706c261
 DIST google-api-python-client-2.78.0.gh.tar.gz 38327369 BLAKE2B 291941a44a6fc9da7df2cbb108ba90babac33916f9c36aeae6e8b1575e9851f7c93aaea09340d36acd8f80dbe5ebe63820d60edc0aec14ee4859a47dcf66e344 SHA512 fff05aa981106aaccb689aeeace62734df77fefe7132481a11bc81b249a7793c1743c7c7c21116b3f5d4d59230ec7adac090d478969f8847bc201a2a23dd072d
+DIST google-api-python-client-2.79.0.gh.tar.gz 38537790 BLAKE2B 968a33a92bff0b7bc6e01e69df3b405b189df1560e1100de6bfb987ba5d87f1da9dafa184966f55f1d64b41912790f94a98d5160dd042661a2d5acc02c6d10e3 SHA512 c16e32306eb8660facbaa078fc76ad49692948f26d81d753977d1cfa49f76b4eacf2a5613c4bdb8f463ebd65c955d5edda415355d143ce1dd59ec7443eeb0a13
 EBUILD google-api-python-client-2.74.0.ebuild 1393 BLAKE2B d59f5c92683f668f82e760c1f1221cd87bdc836f3cf69ad70a2f38376b551f66c0fab981f3eabaf29db0695a3b7d3567af1fd996ee0c52a06efc710c3d5a00b9 SHA512 c90bbd23296a5a2127f55d79b7130770d91cd1d3fd69cfedbe92531bcde7b7a98364c3268aadcde813828802fc86c317bf00661382a94d5a57cf0a9ec5686b4b
 EBUILD google-api-python-client-2.76.0.ebuild 1395 BLAKE2B 6a666ce06c23f1a334d4287d52887adf1b5adf1aac257387583dd14fc4f597378b0cc76f19905c1300080963276ffcdc3cbd0c74b7c2efe220a86417a38a10bb SHA512 503fad15193434626ba75dd5ad18f0e144d74875a6e914d231b38ae4f295f8e6da8d9ac94d9d3839c9805014583a464f0230797e62b76ca4e8b85234c5b7fb3c
 EBUILD google-api-python-client-2.77.0.ebuild 1395 BLAKE2B 6a666ce06c23f1a334d4287d52887adf1b5adf1aac257387583dd14fc4f597378b0cc76f19905c1300080963276ffcdc3cbd0c74b7c2efe220a86417a38a10bb SHA512 503fad15193434626ba75dd5ad18f0e144d74875a6e914d231b38ae4f295f8e6da8d9ac94d9d3839c9805014583a464f0230797e62b76ca4e8b85234c5b7fb3c
 EBUILD google-api-python-client-2.78.0.ebuild 1401 BLAKE2B 69835c2562dc0f53faeb4a88a2f4a398734ad747db6676817fe23f952bf0d556433e8e456a3db1479c0da6671c654285a72dbca97b22659a727e0a5b595ad825 SHA512 032c90063955331493b55b4746bfbdbc26bb9de11dbd0aa51585bcadf9b5b656c9569976f03b3f3e2e5765a1f860a6d654aa6f8486ab52b1318c219e6bb791af
+EBUILD google-api-python-client-2.79.0.ebuild 1401 BLAKE2B 69835c2562dc0f53faeb4a88a2f4a398734ad747db6676817fe23f952bf0d556433e8e456a3db1479c0da6671c654285a72dbca97b22659a727e0a5b595ad825 SHA512 032c90063955331493b55b4746bfbdbc26bb9de11dbd0aa51585bcadf9b5b656c9569976f03b3f3e2e5765a1f860a6d654aa6f8486ab52b1318c219e6bb791af
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.79.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.79.0.ebuild
new file mode 100644
index 000000000000..65893f1d07cd
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.79.0.ebuild
@@ -0,0 +1,52 @@
+# 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
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+SRC_URI="
+	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 0d745d352ef3..ab8b3c9f7104 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -2,7 +2,7 @@ AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc
 DIST ipython-8.10.0.tar.gz 5456256 BLAKE2B 8ca8781326396ffa1e8012bab3b539b857a68e212afd5b2b97bc2f0eac6ec1aee45c0743d745554ef24fabd24667c2d6cdb3927350ca61b747e02afa215c1519 SHA512 5cfcdd49120d9ffc11d2f18501826b2f7094a51c439ac23e507f1027989ece4104d739a1905feba41f899d22a66e1345333f46e0f55d18925f166906f4992cfe
 DIST ipython-8.8.0.tar.gz 5341086 BLAKE2B 6cab547c693494aed85c750ae566947c8035018213839c36ec906cf11c80e93269c4b861a5a4d72994bc4e5fc8f2787fd7674fdb836dad22c8c04c33d8f37de3 SHA512 18e8eaa285fe6278a27ffd2edcf4eccf629e05a8718faa721013d0433822ff8b850a2060135f26b5254a96b7ae0139e2ff4338676c08d3271a12c1b91532d7d1
 DIST ipython-8.9.0.tar.gz 5454595 BLAKE2B bb091bf9c2d9571ded5e1007d9fe60d34b9b0010747759ccceee3368822e3e190766439e3dd9b26df2dbb136ed2b81bc0d89d9b8857baae6e4d86a3524c07972 SHA512 2a9df79ff26bb34866dc523e75ba8e8d8de25d510fc273cbbf762b3011e53ff5331869f1d6fc8c44df6c9a8b5745a0545fe301a556b7f20e3a3dfca994316735
-EBUILD ipython-8.10.0.ebuild 4310 BLAKE2B a7cd3d3675d7a3e2f2e5c43d2075beeb80be24d97133cd83c374d1667caeba689b4d2532ef466b7f1610c82cc190b3dc0e2d2e0a82a2dfe2325d5f709b57efde SHA512 24749de79022334893308c8631ef90bc44e5e2c301910ee26a8ef32bfad835775400443953b66ea27ec5756aea02ccbfc93f38a1b198834d0367cdb7f363212d
-EBUILD ipython-8.8.0.ebuild 4297 BLAKE2B 4cb9fa9b75bcc0ab6825f298d44421721e3de3eb208c2f4165df658c2c1870d2fe1fa71e3b4218b8cd53e08ef560cb4966d51c6e5f9a2a9ec8b5bb7260089d06 SHA512 b3d08ed90e106823719a28946422349ee13d1e6eb135c04720591ae45f03aa7d07990496f185b15e66ce50b8a551f31be9cc7640bf0e979e2c3ebd756aea2f72
-EBUILD ipython-8.9.0.ebuild 4310 BLAKE2B b8fd38def531727711e29439ffb3dcfd08ba95371201d6d134fa742195f0645a56148473af7ba39ff4868762c157a9d5fa6e3eb4023b3a5aa24838156706ab8c SHA512 c6c25800d18c8c7d0c65fc09b30db7bac2115d370b092e96165703715af765ca376d8482fd8876d2b66f59f67f47b799ac80675a4098525716148f7829472a14
+EBUILD ipython-8.10.0.ebuild 4310 BLAKE2B 31229f426f00af56849726238810901f850ed9a01f5e7818d56131aa8cc33bbd1ed5936e6f881ef40de73b1e8201c94182e5a2079bc4f4cdd179358e4bf04880 SHA512 247d41e8ee8ccc7dd2e1f7d77f25dc9cb60550bc785a0faaec0bdf9e5dce724f1744db7218f6cf53fc6e19c1cfbb17323bc7a69e2ad17d2cbf6fa6a4303bb7fd
+EBUILD ipython-8.8.0.ebuild 4297 BLAKE2B b5f0310284cc4de1b037c3ded7cfed640a31efd64d5b6ced992d5eeccf9bf25e095c94fa7d1a5ebff592f95f32924b3a20a64056e326e4e813fb74d0b2e1225e SHA512 2a9bc359a256d5961724319c22e8eb2275d3de397ee27ed7e54f5f54acfef7b1260d260786fcdfd8168dcd4b0cafa60449985b8ff7b6771ee615098b98eb87aa
+EBUILD ipython-8.9.0.ebuild 4310 BLAKE2B d13a7979a6c0e171c6fe8e28d55b809d7ac4134c76a21484c4a0b66d24b65a3146b2693dc3320651ba586bff243c563d358116b6172062761ee0338ac427f3b2 SHA512 d46651ff67fad554567adda7379e7c65dd4e393bab5467c5f480a182f25a0ec5c312d82397fec960f1c296acc3da49c134102ac4ee59e870ced1f3d91a7257f5
 MISC metadata.xml 2886 BLAKE2B 88c80f5eef5c89c8939e60c1944be4c63a5a318e55a3490b38bf864e7919debf8e3c3a32f1fa0a43766ceec6462fb20fd4d943194fe2c08208f0839783c20916 SHA512 f4ed7c1898930ade11983fb0666dc25dce7907f017145e1ad903651dcd95ead2734893d55b4548c4ae23425388485a86bffc9d885eae17d12ae1ac2c0058aac2
diff --git a/dev-python/ipython/ipython-8.10.0.ebuild b/dev-python/ipython/ipython-8.10.0.ebuild
index 04e87592c984..888f48814db0 100644
--- a/dev-python/ipython/ipython-8.10.0.ebuild
+++ b/dev-python/ipython/ipython-8.10.0.ebuild
@@ -31,8 +31,8 @@ RDEPEND="
 	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.30[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.30[${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}]
diff --git a/dev-python/ipython/ipython-8.8.0.ebuild b/dev-python/ipython/ipython-8.8.0.ebuild
index 67c1bbb41041..e7b2fb3e54cf 100644
--- a/dev-python/ipython/ipython-8.8.0.ebuild
+++ b/dev-python/ipython/ipython-8.8.0.ebuild
@@ -31,8 +31,8 @@ RDEPEND="
 	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-2[${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}]
diff --git a/dev-python/ipython/ipython-8.9.0.ebuild b/dev-python/ipython/ipython-8.9.0.ebuild
index 9289ab3897d7..08e49d70543f 100644
--- a/dev-python/ipython/ipython-8.9.0.ebuild
+++ b/dev-python/ipython/ipython-8.9.0.ebuild
@@ -31,8 +31,8 @@ RDEPEND="
 	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.30[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.30[${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}]
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 5679476b95d7..f6f6890ff671 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -2,8 +2,10 @@ DIST jupyter_console-6.4.4.tar.gz 35145 BLAKE2B d37190c30eceba79c0d37ad60d88c9e6
 DIST jupyter_console-6.5.0.tar.gz 35609 BLAKE2B 056386eaa1c214b27ff10993d08fc5351ab9f6775fa8f2882bbe8ed6ca4170edb8a8024740f3a9f0f9667c253a1945700da0e9a3bc925d970597b43c830c9e6b SHA512 9c3b44a43d0a18bbcade97fee514859b6c370941e80525630195fb6bf8fb32c3cf048dfabd2c41f7f98365d2fbd87c9e190f9fb8e899c5a29266585766df66af
 DIST jupyter_console-6.5.1.tar.gz 35754 BLAKE2B 1b3e189e8a057b0f57e6a1c1409797aff9b6584edd96975c5b91a7c5d55d8601e44a3f9e0218413351d67d7175a7f6c86c3734e14ba881f6ab25ea9f1748576d SHA512 3fbd97b1ab05596ac56ba8f6038af787698197b5148f7e33a79ad5cdcc9a78c80c2534e3e2c298aeb92ce880686731b9ba206d7d0094ad67d7cd4996c02e2327
 DIST jupyter_console-6.6.0.tar.gz 19523 BLAKE2B 5fd393b2d6abaab68ce9b96632a757f6c1bd43ac192744a9ce58be1e8bcc7accc1bfdf5428c908b270a66c14014177ce559fa97a6d0da93d3bfa34af101c5c98 SHA512 e1c4d0953ffba22660d680250b3b64887ec908e0bc420caedaf9afbe0ceb4b3e8eb5ac9b5b477aadcb773867ea7fce7b7da16bb8b4e403d9cf98484271577c0b
-EBUILD jupyter_console-6.4.4.ebuild 878 BLAKE2B a0284a8bfac8e4f1ec9cb62f6d990507f5ac6e6cdf51c4021b106617516a123f46fa6a7a689c785aceafe65d48447f98dad8a72889c7a9d23f2cf9195ae8ea11 SHA512 2fb8531df7a1f78acca881360291c9fa5e7588bcec5be20a219e9b697bc967a8ccd44ed572fa8a8afff8f7515879357839a317010c400175e660392ce6b4e143
-EBUILD jupyter_console-6.5.0.ebuild 982 BLAKE2B 9a6f164231967f64665c1c37510becc55de47204e3ffc5c43451b135b6277e14ad0449dc04dece50f2a84ac3a4e321f776f9a79bb3a947ea09366e62a9d7fa0d SHA512 060cbcebcc9441f95ff6335350f1d665a19bc512d4c077bfb532fa2ca7248064d3477c2dfd3c65754c3974be1485155abeba30431ab29c349f9beebe2be46a9b
-EBUILD jupyter_console-6.5.1.ebuild 982 BLAKE2B 9a6f164231967f64665c1c37510becc55de47204e3ffc5c43451b135b6277e14ad0449dc04dece50f2a84ac3a4e321f776f9a79bb3a947ea09366e62a9d7fa0d SHA512 060cbcebcc9441f95ff6335350f1d665a19bc512d4c077bfb532fa2ca7248064d3477c2dfd3c65754c3974be1485155abeba30431ab29c349f9beebe2be46a9b
-EBUILD jupyter_console-6.6.0.ebuild 882 BLAKE2B af35cafde924edb24f17dd31705255e8d47530c722b7851a6751b39301da3eca0cc42213f2c46c640006f3e1ac21391fc56dc8d77fcfb8cadbf67c3fac3fe2c6 SHA512 41e4c4cb231137761ac24fc7fd89e58266fb340ab590d46c075adc231188ee3f67e93a025e22c3463eb810230a3cfefbe2824ecbb6cd743c99ef5b955c14f46c
+DIST jupyter_console-6.6.1.tar.gz 34188 BLAKE2B c502fb86152010906d552a8d7141f52d8aab56e5df0389d93c3e4881acf3cc9b73d80c5d0a8193e7b179079a7310c68ae54ce2205b68a5f7538b9de33d54eb66 SHA512 dc30b9f0fd8c121e17fe9f9352c2ff4945795b11db74a13fe943bf4424bc0ddaa7745ad12477c7a37c51bedc6c1ce29b72803cf2e1bf82b5d8d124fed0a2e4c8
+EBUILD jupyter_console-6.4.4.ebuild 878 BLAKE2B ae08f4db6b2bd9ca1019cc781c392daff1649f898c10f795bf7cc6ca26a9f4013f56bd44dfe9ee4d2a9a7d401d49822968282dc67c64c2b0dc5ebb5ad20d15e4 SHA512 b3e37d44039590dc194ec9b26611e727e211876820fde08bf63b570a1dc86e5361c941b0f24d3a1d89989c968faf98ac73766fdf2ecb7d88f9a8ae6f73d89c31
+EBUILD jupyter_console-6.5.0.ebuild 982 BLAKE2B f32665a6d42826e6527320634563337d6c71d10d26064ec20bcc955abeb7de830b43595ede611703a8163da6351ecc43cb487d2fedfc0c028fdefac5c1c00977 SHA512 439504e52c24874e1156efc573c91f756eea128433fe2400e72c823c5d025e757b8cc6067c6e753a8d99ecc80cef33a81e0b1cc548c3e9a36a9219072bdce65d
+EBUILD jupyter_console-6.5.1.ebuild 982 BLAKE2B f32665a6d42826e6527320634563337d6c71d10d26064ec20bcc955abeb7de830b43595ede611703a8163da6351ecc43cb487d2fedfc0c028fdefac5c1c00977 SHA512 439504e52c24874e1156efc573c91f756eea128433fe2400e72c823c5d025e757b8cc6067c6e753a8d99ecc80cef33a81e0b1cc548c3e9a36a9219072bdce65d
+EBUILD jupyter_console-6.6.0.ebuild 882 BLAKE2B feb9662c73666e1b1bc01b85fe17e625ef16293a0ce6a702d19b875dc5b8b4d0ffbac4cce11d584e8989f038fb4e79a6a91395b30f699c5bfc46190e233c61b9 SHA512 80fd6b7b2660b9863ee766fa62d43beaf2f24f4279b9fe7e4a4d7946bf20419e4488e4e40a0509cfd360946cc7e4237c01848533966f2ebcc49c8ff9f9a05ba4
+EBUILD jupyter_console-6.6.1.ebuild 882 BLAKE2B feb9662c73666e1b1bc01b85fe17e625ef16293a0ce6a702d19b875dc5b8b4d0ffbac4cce11d584e8989f038fb4e79a6a91395b30f699c5bfc46190e233c61b9 SHA512 80fd6b7b2660b9863ee766fa62d43beaf2f24f4279b9fe7e4a4d7946bf20419e4488e4e40a0509cfd360946cc7e4237c01848533966f2ebcc49c8ff9f9a05ba4
 MISC metadata.xml 702 BLAKE2B 38bb264e2ab7f1feca67ae6a35d2ee20c04b53188cc7d3a51bd2d1630ba6a9e89ac949013bbd9ac3443331bcf3f115f85537865787daee26949b9773aa9b9197 SHA512 c3f9fb275560a3aef2a5266d2070e3d013f53e2f3f7e1363626b15d290ccd619c65a19d6ee2b849a683a96159c8af29c55c81eff5a333759eae5cd6773736b24
diff --git a/dev-python/jupyter_console/jupyter_console-6.4.4.ebuild b/dev-python/jupyter_console/jupyter_console-6.4.4.ebuild
index f17c04f31a23..0b1510615ab7 100644
--- a/dev-python/jupyter_console/jupyter_console-6.4.4.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.4.4.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1.0[${PYTHON_USEDEP}]
+	<dev-python/prompt-toolkit-3.1.0[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]"
 # util-linux provides script(1)
 BDEPEND="
diff --git a/dev-python/jupyter_console/jupyter_console-6.5.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.5.0.ebuild
index 46dbc8fa4c65..ecde6a0289e2 100644
--- a/dev-python/jupyter_console/jupyter_console-6.5.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.5.0.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.30[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.4[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_console/jupyter_console-6.5.1.ebuild b/dev-python/jupyter_console/jupyter_console-6.5.1.ebuild
index 46dbc8fa4c65..ecde6a0289e2 100644
--- a/dev-python/jupyter_console/jupyter_console-6.5.1.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.5.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.30[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.4[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_console/jupyter_console-6.6.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.6.0.ebuild
index f6c15d4d2afa..df81535d9bc2 100644
--- a/dev-python/jupyter_console/jupyter_console-6.6.0.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.6.0.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.30[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.4[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_console/jupyter_console-6.6.1.ebuild b/dev-python/jupyter_console/jupyter_console-6.6.1.ebuild
new file mode 100644
index 000000000000..df81535d9bc2
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-6.6.1.ebuild
@@ -0,0 +1,36 @@
+# 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="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="https://jupyter.org"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.4[${PYTHON_USEDEP}]
+"
+# util-linux provides script(1)
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		sys-apps/util-linux
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index 5470c949a241..822a72f9cc48 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,5 +1,3 @@
-DIST lazy-object-proxy-1.8.0.tar.gz 41884 BLAKE2B a2869137ccedc2971bd341dea954fecf87ab1829c85fadb3128abc296df000d4015e6a210067327a7f5606b9e4c56c6ff3a1110e2a2ae998951f9d141be1c556 SHA512 a682e7d1ef405939f5f75f598618d6c7de482decf8027abcf4c7c2b684b3442ca3b1a666d1913e9c7f63c086753e0d79b8c1b03c0cafe8cbea3d7c70893be57f
 DIST lazy-object-proxy-1.9.0.tar.gz 42830 BLAKE2B 565315a3e855bc5335af717d1edc947fef57514c06036280d1f4666ab9642cf7e7b4bb145da87cbca14d9efa9f4869d7ad256031983a773580dc398fb7ce25e0 SHA512 2168254a71cf52ef406e5edf4653b9c8ae05392d4ad3c2e5e8e9f8db56152d968a77d14226acdf7d962f66d460c40add335615442f6f176d697c071f9cb137f5
-EBUILD lazy-object-proxy-1.8.0.ebuild 917 BLAKE2B 9ea20c51dca8b0d6e8dc4ba8104b5186515791ddd5a0882deac2f688f115e78bcd1b110e9124532e4bd9122e1caf66340578c9024616a8e1b4e0208c19c6de17 SHA512 76cdca141341828a49be01539db1a188e63f85d36cdc07c43941ce3fcc57ebdf7545f8a9c484f658379f587f2dbec8e34ab41e1a3f3726a05c329234c243858f
-EBUILD lazy-object-proxy-1.9.0.ebuild 920 BLAKE2B efb6d7f3f563796cdfdfc192bf3658a539a598a25c0e021fca74c1a75aee6f4d8607760e7a7b2f4d1ca3d9c0ad5567e4a93035bc1906f5d51a17d6f2a2420a7f SHA512 176cea071ec774de9858a2d4ff5c4e571a86888832e952335488b03b6313e3faf3d30a3c868e101fc74f651549e4ee159b1eec13aecbca12d7c64b27662798da
+EBUILD lazy-object-proxy-1.9.0.ebuild 919 BLAKE2B b56cde69baf8d1d80b65dffcd8aa86f97347d8beb269615f641cf23c89fbbd3d5100b4340018be00f01b1fcfe0eedf2626fbf0614031a46ba2e5d8f72c948fe2 SHA512 2a0cd1165432848244295e522f98d20298bbd1aa704d92dfb032e1b63f8ed8480103b31e41e377dc9402528ba7106af4779065b69f938388bccfc79bddfb0d17
 MISC metadata.xml 540 BLAKE2B daf53065c3af28ec7316bab786a7ebfa6890de83bd6434d39052797a1d08d9e7e05fc437fd9994bc437ba0d38dc6ab1cb2e073c2c053fdf55817302800e97b19 SHA512 e66e27df4757f7d13912934551b7fb346d734789f1b0b17e5c875dd5261babf65188bd31966f502be19e953fd9bfd87a64d49ce8e1849b2122a30905d3639e9d
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.8.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.8.0.ebuild
deleted file mode 100644
index 56a7f4ab0c8e..000000000000
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.8.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A fast and thorough lazy object proxy"
-HOMEPAGE="
-	https://github.com/ionelmc/python-lazy-object-proxy/
-	https://pypi.org/project/lazy-object-proxy/
-	https://python-lazy-object-proxy.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# No need to benchmark
-	sed \
-		-e '/benchmark/s:test_:_&:g' \
-		-e '/pytest.mark.benchmark/d' \
-		-i tests/test_lazy_object_proxy.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
index 7ee6d01b807b..18cc6210f616 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index bd512a3d73ac..acb1871bb313 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -3,5 +3,5 @@ DIST MarkupSafe-2.1.1.tar.gz 18668 BLAKE2B c15bddc89bec9a6558b797b825314d9db3ac0
 DIST MarkupSafe-2.1.2.tar.gz 19080 BLAKE2B 560cc052c105c3d9f2690c3e5a2a597dd36848080e3c7d6f8273dcd03bdb613ed54cfe6e53b9ec8053deb38d0d055123da7204a671c1fff3295596d44a63b317 SHA512 84dbeddaf2df713b3cce94eb64876fea8f80c608e25130c18e4691be2b1dea56df8b772d26c0caca88231ef795125eb9678210c33bf20518c18e3047912ddb4b
 EBUILD markupsafe-1.1.1-r1.ebuild 639 BLAKE2B dce56f5e67ff88af65a4d8a30d915f6e8b9cdf32acb3e3799abe4ae7468d630b880ee5ce67c34793ab92e7331972d54c4cad54d3667cfa4de8fef1928120c443 SHA512 b5470fd672ec70b43a953b9744e8028bfb01c1a1e42cafa78b941b338f55866c9ae2f9acda177ce03ee4da5a9ac68f8114ad905fb49e455e651816ec73eeca1f
 EBUILD markupsafe-2.1.1.ebuild 770 BLAKE2B f653fa25dbcff6b45edff9225ac13a3eaa696466262951c9a2659a0688e0bc77f6b9d446a3a46f97548e5471362f55ca4f357467c3298ed73df544429ab0e4be SHA512 fa625119b976c1082e47bc45fe9d42ef03bf33f18afc1b6605353062418717224033dd80f1002c0eb3a1eccec687607f52a2fd0b5e789b88941aaa6bc2cbfae7
-EBUILD markupsafe-2.1.2.ebuild 771 BLAKE2B 348615e496474597ff8fe21fcb415f76c004f7073270d4c0a09f2866cb84f7a68a8af4e68f9e0f8879b5a7587d3cc97d4c138c055c9e43998c3618363e7bbb7c SHA512 da2926c972a5f38c990679954c4646a543480293ab2b34dded70b7b55e9ce05e1f187d82fa4478f273e7d5f5237e9995bbdb89d9159c03a6354e5f185f65fa85
+EBUILD markupsafe-2.1.2.ebuild 770 BLAKE2B f653fa25dbcff6b45edff9225ac13a3eaa696466262951c9a2659a0688e0bc77f6b9d446a3a46f97548e5471362f55ca4f357467c3298ed73df544429ab0e4be SHA512 fa625119b976c1082e47bc45fe9d42ef03bf33f18afc1b6605353062418717224033dd80f1002c0eb3a1eccec687607f52a2fd0b5e789b88941aaa6bc2cbfae7
 MISC metadata.xml 314 BLAKE2B 88acc343a3395dcf3833ea690d3e5f7992abf67c6ab16a53cb039d253cc17302b24da6751d5706ec3c3495cef37494028de4516a7b3f25c78780d23ace4a0f72 SHA512 f240b32e7c30116769eccc16b6746e29bc28931dfff65bb3020782be3abc7791c7464a3a686ca076ccf371ef6280c2285d97e55b522d88d07babd843a51b4fa9
diff --git a/dev-python/markupsafe/markupsafe-2.1.2.ebuild b/dev-python/markupsafe/markupsafe-2.1.2.ebuild
index 9585d76ea5a7..1453ceee52b2 100644
--- a/dev-python/markupsafe/markupsafe-2.1.2.ebuild
+++ b/dev-python/markupsafe/markupsafe-2.1.2.ebuild
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/neovim-remote/Manifest b/dev-python/neovim-remote/Manifest
index 5bcebef80895..c25b2d5c840a 100644
--- a/dev-python/neovim-remote/Manifest
+++ b/dev-python/neovim-remote/Manifest
@@ -1,4 +1,5 @@
+AUX neovim-remote-2.5.1-neovim-0.8.patch 780 BLAKE2B ab11bba885e5050b02f3f12060b2872bb8d51d22e326714a1bcca885fe408e47c613cc21baff78bf6dfeedbbe18893742231f5535c6d11bc183746d869c3aea2 SHA512 39099469541dd206e70c0ac80958be00e5fbfcc4204397082fa339325b88387b8e1bde9d06675b796d627f0a63f4280663301f45250e6824e49f53b7c8db701f
 DIST neovim-remote-2.5.1.gh.tar.gz 439548 BLAKE2B b57ddc0b8b432b65864bb560412684e6967db08ed09e1e7fe7294ba24d0d0aeb377f0f6fa38f4b0de44d5ea6bcc796ca2b8a491dda26eab870deab37f3608c59 SHA512 2d3c921485b18a9538f82b3a057834bdec5d8568a84528afaf52d73a69b60cf1eb6dee33f50a10d961fc0985c7a7d262a4edfc9f26f3ffd5d945472855fe3121
-EBUILD neovim-remote-2.5.1.ebuild 762 BLAKE2B d0ce9506df0d45f6815902657fc8949069d43d8a0732e11ab4069d5a4beda2732878670d1fd10f492cc5080162edb36ab5de5704798cf559ba447601b2ee95fb SHA512 deb5eeace00ce265eaaa3dc101b7c27f9a88277dd34d3906cdb4386d22eaa0c04eed11225f9ba8fc962cc410c4359b44333090152054d7f156b8fe3f80fe523f
-EBUILD neovim-remote-9999.ebuild 762 BLAKE2B d0ce9506df0d45f6815902657fc8949069d43d8a0732e11ab4069d5a4beda2732878670d1fd10f492cc5080162edb36ab5de5704798cf559ba447601b2ee95fb SHA512 deb5eeace00ce265eaaa3dc101b7c27f9a88277dd34d3906cdb4386d22eaa0c04eed11225f9ba8fc962cc410c4359b44333090152054d7f156b8fe3f80fe523f
-MISC metadata.xml 569 BLAKE2B 65fd5db847539e9169fe09bdd4dc33b79504004bd8b76f01a896cf791032a507698b4d799381826aa613fb64f9dc6224d6ce7af4be258c673477f60a64f466d5 SHA512 0d33ba138f652df7f84e4196e514af5a8d64be9acc6f809f0cc7c18585e10abfa981f1c6dffcc7602626c35913a6f194e99f2cb57217bcedd64e444dae0414cb
+EBUILD neovim-remote-2.5.1.ebuild 819 BLAKE2B bdb35d304d3bbcb2e05de3f7b02a01ec6640bdaf591d4011f06a66152713328ada7e8c229f1f3144273095ecff5ec7708bb70d077378ed275e9024e51f02e54a SHA512 fb9cd92b74546d0acca755d499f470a18a9f9e63abead9388ef1ce23ea19c4f7a6a2159683ea4571d27bb2eac77c3a7755c2d1535768282b66d686c71a9b570d
+EBUILD neovim-remote-9999.ebuild 762 BLAKE2B e1a934c7b372e9ea38a5e314b29ea3d253dffc7aa8184b60a8110979959b360208afd8d49facd43e375c150269dc79d687f78383af81595596b5de83abe3c67e SHA512 663a0312ebd4a8175ef10215928d956cc1c624157bb052cd36b6cd2b69b3a8b312b73852ee5139fbfb02764ea4466c6eba7608e7f67cd2082b307e477c5e7b6e
+MISC metadata.xml 628 BLAKE2B 8324f396d1729b65068b3cf737c5fffa274a097d58454f801223080df59a242063e429cfb4bae7cd6866fb89a9170ead1e87b577416d8144a4c35d836d47ff4a SHA512 7307189d63682f8f5591b49afe33b3378adaeb39d9ab2e4f34f7f0d33b989e8790c15cefa37807795552742700364693fd672f86e7ee05d6419c46bf4bec459d
diff --git a/dev-python/neovim-remote/files/neovim-remote-2.5.1-neovim-0.8.patch b/dev-python/neovim-remote/files/neovim-remote-2.5.1-neovim-0.8.patch
new file mode 100644
index 000000000000..ee0adf8f9211
--- /dev/null
+++ b/dev-python/neovim-remote/files/neovim-remote-2.5.1-neovim-0.8.patch
@@ -0,0 +1,22 @@
+https://github.com/mhinz/neovim-remote/pull/183
+
+From 56d2a4097f4b639a16902390d9bdd8d1350f948c Mon Sep 17 00:00:00 2001
+From: oxalica <oxalicc@pm.me>
+Date: Sun, 2 Oct 2022 08:09:57 +0800
+Subject: [PATCH] Fix tests for neovim 0.8.0
+
+Since neovim/neovim#8519, `NVIM_LISTEN_ADDRESS` is only directly used
+when it contains colons or (back-)slashes. Otherwise it is concatanated
+with a tempdir prefix and suffixes to form the final path.
+--- a/tests/test_nvr.py
++++ b/tests/test_nvr.py
+@@ -18,7 +18,7 @@ def run_nvr(cmdlines, env):
+         nvr.main(cmdline, env)
+ 
+ def setup_env():
+-    env = {'NVIM_LISTEN_ADDRESS': 'pytest_socket_{}'.format(uuid.uuid4())}
++    env = {'NVIM_LISTEN_ADDRESS': './pytest_socket_{}'.format(uuid.uuid4())}
+     env.update(os.environ)
+     return env
+ 
+
diff --git a/dev-python/neovim-remote/metadata.xml b/dev-python/neovim-remote/metadata.xml
index bbf1e5633e11..4f5138e06ceb 100644
--- a/dev-python/neovim-remote/metadata.xml
+++ b/dev-python/neovim-remote/metadata.xml
@@ -14,6 +14,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">mhinz/neovim-remote</remote-id>
 		<remote-id type="pypi">neovim-remote</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/neovim-remote/neovim-remote-2.5.1.ebuild b/dev-python/neovim-remote/neovim-remote-2.5.1.ebuild
index 9eecf4f83161..1f8ea433f9c9 100644
--- a/dev-python/neovim-remote/neovim-remote-2.5.1.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-2.5.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
@@ -39,4 +39,8 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.1-neovim-0.8.patch
+)
+
 distutils_enable_tests pytest
diff --git a/dev-python/neovim-remote/neovim-remote-9999.ebuild b/dev-python/neovim-remote/neovim-remote-9999.ebuild
index 9eecf4f83161..c4c5cdfd52ef 100644
--- a/dev-python/neovim-remote/neovim-remote-9999.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/patch-ng/Manifest b/dev-python/patch-ng/Manifest
index 71cf6dfe9f85..bb84c76ffb77 100644
--- a/dev-python/patch-ng/Manifest
+++ b/dev-python/patch-ng/Manifest
@@ -1,3 +1,5 @@
+DIST patch-ng-1.17.4.gh.tar.gz 168306 BLAKE2B 78067e3c3d296a21f8fd4155fe770245ba4457cb9e37003f5e7667c30827878a8c06d62c77bb1fdaf61b96a813612a7c39800d7040b13a9d18f0baeccbd86ba1 SHA512 919c04c3adfa36672f3db5f1761a12ccbb08ccfb890015bb0d27b1801c8c7dba99c4da01674b269703a7cbf39df5889f5c446551bb4cf7039dc383c23d8a5db3
 DIST patch-ng-1.17.4.tar.gz 168306 BLAKE2B 78067e3c3d296a21f8fd4155fe770245ba4457cb9e37003f5e7667c30827878a8c06d62c77bb1fdaf61b96a813612a7c39800d7040b13a9d18f0baeccbd86ba1 SHA512 919c04c3adfa36672f3db5f1761a12ccbb08ccfb890015bb0d27b1801c8c7dba99c4da01674b269703a7cbf39df5889f5c446551bb4cf7039dc383c23d8a5db3
-EBUILD patch-ng-1.17.4.ebuild 667 BLAKE2B 13bffc614cb7828a4d56aa9ed3e1486c0c6e792e8dd4c923cf7a579ad4d36d1033010db82266b19c934f6919f8e0acfdc0393502215588db581395008dd9ca2f SHA512 af4f4491529f10af0eb5c0d8673a9301802465c5e78a26dd2f73579081b0f8805c708a27c2d4e0efb7aa3f6828db5cde3ceb1ad9e88785c985de047a2c33d07d
+EBUILD patch-ng-1.17.4-r1.ebuild 702 BLAKE2B 202694dd8e2c2fc8fe89e0e860b5156958bafd486240904329649b85c469260b34cdf00d8793348ff1cb2e459b4ffe81ba4ee72cffd9edb902c628efc7c9c705 SHA512 2b9b00ef3b015ebbff1bf46ec2ded907897fd6e1d94dd572bf58d73ca8ce7fd649098e10c175cf665dc09418ef92b322978fe359fc211a36effdd7a4e5de0780
+EBUILD patch-ng-1.17.4.ebuild 667 BLAKE2B 8d4b820d34806f689db43f4fa1d1804e973a6d1c04003cac1824a4146488e4405463aee5039754ac42feeb60c8f122ee4d7c69c8aba346ba5d75f8f974996c02 SHA512 ef945b3f6437dd9c578447f26906ded25913f4edbed8dfbf58852ee02306f2cae6a764430e7c237963e42f72f1cb833672085d488193cdc4b15a14fa3285b455
 MISC metadata.xml 566 BLAKE2B f9ded2a7b10ffeff462e602935fd91ae0ab6221bf4474816ea170407938b13a8df8de19180eac604319de32a5b1c5bc27466589a860be4fd7bb18c24148afef5 SHA512 e7bbd1d0f1aae36571945e62b6e73744d7d64dfe3019b2d1be97b460a4b0fbaa062c868a3a294cc44fa9ebeeaa80d91ba42f6629d4c44c9bf48145edf0412d9f
diff --git a/dev-python/patch-ng/patch-ng-1.17.4-r1.ebuild b/dev-python/patch-ng/patch-ng-1.17.4-r1.ebuild
new file mode 100644
index 000000000000..8c7d3ed6641a
--- /dev/null
+++ b/dev-python/patch-ng/patch-ng-1.17.4-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+DESCRIPTION="Library to parse and apply unified diffs, fork of dev-python/patch"
+HOMEPAGE="https://github.com/conan-io/python-patch-ng https://pypi.org/project/patch-ng/"
+SRC_URI="https://github.com/conan-io/python-patch-ng/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/python-${P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests unittest
+
+python_test() {
+	"${EPYTHON}" -m unittest -v tests/run_tests.py || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/patch-ng/patch-ng-1.17.4.ebuild b/dev-python/patch-ng/patch-ng-1.17.4.ebuild
index 341dc97f17ca..0b7bea93e797 100644
--- a/dev-python/patch-ng/patch-ng-1.17.4.ebuild
+++ b/dev-python/patch-ng/patch-ng-1.17.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="Library to parse and apply unified diffs, fork of dev-python/patch"
diff --git a/dev-python/pelican-minify/Manifest b/dev-python/pelican-minify/Manifest
index 5a0c0418e86c..24d74a06f905 100644
--- a/dev-python/pelican-minify/Manifest
+++ b/dev-python/pelican-minify/Manifest
@@ -1,3 +1,4 @@
 DIST pelican-minify-0.9.tar.gz 223517 BLAKE2B 808601e027af7b3970e3fcac08e9f0f656e48fe016a470b4a5b3892a108264e2fff52a9b036861fb9007da263e59c7fcf68867e789f65e20b29278fb8de445a0 SHA512 de28727ed6b39e89461b2d725139b88010def892f3fd23f822a6e84a585b3f93771fdc9ca8f402adc9bb196a0dde03b9d6417317c7e8141d83f0e6460860cd33
-EBUILD pelican-minify-0.9-r1.ebuild 550 BLAKE2B cd5549f71c7582b33ed0306c80d214353e26d66faea48b92fe17a2b59c6a579da8455be9e67feae075b40e5b5244409abfdf19d2e065e1bcb0ec1417926b467b SHA512 42b03fa77f7380d70a8181b240aebe1728b6ac959ebd2730f11f543f082deadbe9cc88c683cc84dcded6a319776f257f342a4abef15efaa220be3f76608ff321
-MISC metadata.xml 457 BLAKE2B 840c8137747102d1098400c28407f1dbcf26444ac20c0e60d6ea49681a77f154aabd81d6519d1888df486430e9668a6b3b29cfa04a7c967f38501011751bf507 SHA512 129092e5d37556554f709433255cea8c4f8b7f8ad4945911ba98cf4459e131d776eb3595916939f30969ba0cc84c3f1d5824c9134bd96f490a38acd27d34dbc3
+EBUILD pelican-minify-0.9-r1.ebuild 584 BLAKE2B 5488d3c2861e5ee0fe5a4e4ffa93ed013ddccd53df405d3cad737405f1b9dfb664bdcf3180b65422df5ad421ee77e3fc834de43d84ac2b28825eefb3504cdef8 SHA512 e2055cb6ff0db17fa44abe10f4586d76ef733a0da009c2bd849107b607788bb7c30244a385b0af8be7d5ab20714ae2ba700c286f090354e4e72ec691b87e9c24
+EBUILD pelican-minify-0.9-r2.ebuild 589 BLAKE2B 5d34dd039156abc5a0f474c6e9cf79b3d3be05ae22208019c3b5a34115d6f5b844481a9d6f04e8d0fde6f83a1dfcb866c1d260cd865a532fc449e56fb9de3e2f SHA512 ca83be1173f44f211fb7fb82645d7b0f84742022e9f14df635a2e48aca02d3bbaec296a0ce0153c8a6c50147aab6b07d8731742468d8892ddde735e003a131ed
+MISC metadata.xml 519 BLAKE2B ab63cc80f485e260b217f70f7c02ef228656147f304aab80b3ff8471409b817fa7059234228b756fb08cacc46d1e2f811b697c524d0a2a6c297627684ae820b1 SHA512 afe0529e759a3b3f11d31b360020bec447a6fc964d018d0be2ed7632b9b4ae095be370387003e7b7f817a0e4fa7ecc82c320cb3b081fb1de8dbbdfd7428a6779
diff --git a/dev-python/pelican-minify/metadata.xml b/dev-python/pelican-minify/metadata.xml
index 90e73ab55bc1..dd1f5ee146c6 100644
--- a/dev-python/pelican-minify/metadata.xml
+++ b/dev-python/pelican-minify/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="github">rdegges/pelican-minify</remote-id>
 		<remote-id type="pypi">pelican-minify</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pelican-minify/pelican-minify-0.9-r1.ebuild b/dev-python/pelican-minify/pelican-minify-0.9-r1.ebuild
index 0dd6e683df47..fbcc8471d791 100644
--- a/dev-python/pelican-minify/pelican-minify-0.9-r1.ebuild
+++ b/dev-python/pelican-minify/pelican-minify-0.9-r1.ebuild
@@ -17,4 +17,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	>=dev-python/joblib-0.9[${PYTHON_USEDEP}]
 	>=app-text/htmlmin-0.1.5[${PYTHON_USEDEP}]
-	>=app-text/pelican-3.1.1[${PYTHON_USEDEP}]"
+	>=app-text/pelican-3.1.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pelican-minify/pelican-minify-0.9-r2.ebuild b/dev-python/pelican-minify/pelican-minify-0.9-r2.ebuild
new file mode 100644
index 000000000000..8bad83e0ff36
--- /dev/null
+++ b/dev-python/pelican-minify/pelican-minify-0.9-r2.ebuild
@@ -0,0 +1,24 @@
+# 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..10} )
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
+
+DESCRIPTION="An HTML minification plugin for Pelican, the static site generator"
+HOMEPAGE="https://pypi.org/project/pelican-minify/"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/joblib-0.9[${PYTHON_USEDEP}]
+	>=app-text/htmlmin-0.1.5[${PYTHON_USEDEP}]
+	>=app-text/pelican-3.1.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 3857ac8589ec..75bcb7c5a561 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,3 +1,3 @@
 DIST pocketlint-0.24.gh.tar.gz 23875 BLAKE2B b4699d1f0633ed6a3f84b97db972818c00a1d382a48648fd4fe6870f4c54f983fd36366f85a409a99b860f385902a9a05adec63199e35d1264a522a7a3086e31 SHA512 21c4055dd42c244760950b64ec4cd9359fc589014953be6f9296e0265101f098fbe34351e87f92630751fa0055de20281974a04b425f691acc4608cf929d4bf4
-EBUILD pocketlint-0.24.ebuild 658 BLAKE2B cec1715a88bfebfa88d3f643b2474324989f87285aaef4ca34593fd53917860217a472dc7dca347e019b69ee383bc47b11ef679d1917b27ee565a891457106ca SHA512 00ac337dba3a59a389a28a09fc40993e6746a84a66cd4247c541b04b08b903db38358d6c37196f5dfafbb81aef4312b785e1bbca88acfa17a6e2227733f87034
+EBUILD pocketlint-0.24.ebuild 754 BLAKE2B 8f42c06293b9300cc2ab3bc80f3119b2d71a6560f09b1f4e9b6d5a6ef1ba0852ec223671c3017f4f9d0c738a4d0ad1ca7751513f5665116c3dc9a7e320317db7 SHA512 7fb5badb9bf3ba441a8f1142a1a52a891d1e9856df429d49526966f86daf1a43b7073e05f8fa92a6120ace4ceecbd6aba2b1b2e00ce0ee0849c1f5133a69b89c
 MISC metadata.xml 303 BLAKE2B fd0ac0ccb8faa5f3e9b7074f238915f2b7babb9dc3af3b1574dd3f98e2970182d4cc0e579f59388601e43bd8991fa7cbca570c499f48060a25bdf8279a5c0751 SHA512 9f916df92044f8b6c2351e094e0ffdee2cf039e4d2d2d101ecc5a5e10af58dd4bafa19dc6cba47af87aaf73ad22abd64b50803c5e77cb283ae12c1f9e1653f43
diff --git a/dev-python/pocketlint/pocketlint-0.24.ebuild b/dev-python/pocketlint/pocketlint-0.24.ebuild
index c546d6ff289a..6aacc9d7bff0 100644
--- a/dev-python/pocketlint/pocketlint-0.24.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.24.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
@@ -26,3 +26,7 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pylint[${PYTHON_USEDEP}]
 "
+
+python_test() {
+	"${EPYTHON}" tests/pylint/runpylint.py || die "test failed with ${EPYTHON}"
+}
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt-toolkit/Manifest
index 365e583bc182..6a20408ceb87 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt-toolkit/Manifest
@@ -1,3 +1,3 @@
 DIST prompt_toolkit-3.0.36.tar.gz 423863 BLAKE2B 1917ba618e4111f3d2d85f1063e3e34bc47cc1f60e1703be54cf92b98f72eb3cb3062381e16fd324953435ed67ce0711274f6d8faf735bf966283cc2201f1b65 SHA512 db77a3acb8a985b1df3d82eca7ac30fbd5e85bf3bc77f0f6da13af8064a7d4dc9d7fd57be3eabe5eecce610c8220ad493d296f2e425a8f69d62fddd1e419af1e
-EBUILD prompt_toolkit-3.0.36.ebuild 637 BLAKE2B d3fecb288fa51308380d057308adeb78bc23910ec065d563cdeabeb9e957a4344a0ffe6d95e62c2148a1435a97e16d911285da2e2c3322e098fb15793780f746 SHA512 b6595cea70c17d958081c2f0ff942f9209dd28e5c7b4c05e478ac981beb89f2481ec977c0c31bcf0548869d024c15484d6bfed5dd4dca0de2629626c5a75179c
+EBUILD prompt-toolkit-3.0.36.ebuild 591 BLAKE2B f4e92075df9579f2caa04ae4ee4d0e6394d570d364369c0ead7125c218a64bcc7f18eeaf457957f224d354716e7d77db89e2d5978a096f86a1ad1f70503f4e2d SHA512 9baa86bb79931ccd03922044dbd3d3690852f0bd1aa791cb67214395e33d5a5dfb85885ac9e94c0b219c43caec1aaefa51e9a731e58fc375c4da7870da749478
 MISC metadata.xml 431 BLAKE2B 534336484c65b57df5e672729ff722b67445948e0485c3a62c2f7081724cb951b5157c600dc6162a3bb857c2be0f378b18670786279ff8b5cff2858588f8ebc9 SHA512 a9bf68326839069c61e70d4ef3fe304706f2543b9b91eb291566dd66f36d1abec00382ae205549a35f10dfc730f4613c5cc5c0ee4d6858538d50c4145bd3b15e
diff --git a/dev-python/prompt_toolkit/metadata.xml b/dev-python/prompt-toolkit/metadata.xml
index e67522584f55..e67522584f55 100644
--- a/dev-python/prompt_toolkit/metadata.xml
+++ b/dev-python/prompt-toolkit/metadata.xml
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.36.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.36.ebuild
index ccb7eeba880f..40c5d051dccb 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.36.ebuild
+++ b/dev-python/prompt-toolkit/prompt-toolkit-3.0.36.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Building powerful interactive command lines in Python"
 HOMEPAGE="
 	https://pypi.org/project/prompt-toolkit/
-	https://github.com/prompt-toolkit/python-prompt-toolkit
+	https://github.com/prompt-toolkit/python-prompt-toolkit/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index a4d9366b3de0..e6da35101ae9 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -9,5 +9,5 @@ EBUILD psycopg-3.1.4.ebuild 1725 BLAKE2B 307bfbf1da1566c1d31ab70a153485292c8ef50
 EBUILD psycopg-3.1.5-r1.ebuild 1689 BLAKE2B 3f6edd76888c3eaf7a4f81a4480ed7858e5bc6ce6e317de3f959ce15212a71e47a412a6c53ac1cd3e4c0175fe0e548dc9ab04a4147d752bf19d7547df85f8116 SHA512 25be89b45205c765a52d04222c2997d69893dd271c9f0e60bb0c2dfab716a637893d122ce51b104f4da00824c491d30612e7887ac59c07be401488d2fbaf0b4a
 EBUILD psycopg-3.1.6.ebuild 1794 BLAKE2B 7ecfd191b88d9acb11f6c0b95c50863fd728f21e559700d45c86feeb23c847cefd1960ea7ee1b42fd5fb722c943a74a6b4eb2d2c56d9b9a4bfa5761796c64be1 SHA512 a751c9cbccfc953ac5cb520b38e279bc13506a60f5cdfab4cfc4a8a1e06dfdd6f44387f318131a062530bcffb38f41fca6db74468042464c8064c77c9a287b03
 EBUILD psycopg-3.1.7.ebuild 1788 BLAKE2B a7cc967634970cf4979c155fe901622f964f54c2c1da678f13c640dfbb9608bb2d029265b4c7661474d14221cb446732d3629a2574dbc8eb664eada95f60b988 SHA512 fe8826c280129f35c107b3ff94cb0c1774ff7aba80ce1ab7f575a6999b39de68331c932735672acefffbd17f7eff7d3fbd721c2ef2538480662c33f23a486d5e
-EBUILD psycopg-3.1.8.ebuild 1789 BLAKE2B 640e768faefabfb9c3e89fa041809b566dc16de54e3ec86c03af62ec246ea0d56fd96eb607feffd8dcc5190f60f1c33eba4cc1d2c71dfd2def6cd9ed875b5a68 SHA512 777b3ddf2039e54b38aabe0d252a75b43bde8a3489c98e8d4c0fe52d26148a6281cb2232cf6a747a06c6683089da140e95658cb3172c73a9a9c0613a6c1990c5
+EBUILD psycopg-3.1.8.ebuild 1788 BLAKE2B c5b231636d40e3e639cddc7200e1e1dfffaca6564d95ef765da237e6889d1b52f4ea206488e198e56a318c9b2793c353d280b1c36f81df77a839148fe4481c5e SHA512 33dbea8ef5c17db30798b9dcb865b467c3ad9d3d7a404b7f1238b336d7768bf30d94f54987d2d751ca397ecc3a0b7aac91ec2cd089255aacdaa7dbcf6f4fff22
 MISC metadata.xml 426 BLAKE2B a573dbbef89ba2c3c7e7aa11e87005879fa823daa8d7e2080ce82dab7196429769b5e2ed0c4ffb363443469dfa47524d900fae75c4d7c8c9da901389e746838f SHA512 e3059428d8c00113696bfd232b2ad3fd4efccc304a31ff45801f30bb07c03acd58aafcab187fd85e4d89eff4db6c18a1395744eb1fd5cf8f11e43aca0f4e60cc
diff --git a/dev-python/psycopg/psycopg-3.1.8.ebuild b/dev-python/psycopg/psycopg-3.1.8.ebuild
index 04570bffba29..9e2aa643ffa8 100644
--- a/dev-python/psycopg/psycopg-3.1.8.ebuild
+++ b/dev-python/psycopg/psycopg-3.1.8.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${P}/psycopg
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 DEPEND="
 	>=dev-db/postgresql-8.1:*
diff --git a/dev-python/python-ly/Manifest b/dev-python/python-ly/Manifest
index 3f9a8c07a44e..8d716e5022d8 100644
--- a/dev-python/python-ly/Manifest
+++ b/dev-python/python-ly/Manifest
@@ -1,5 +1,3 @@
-DIST python-ly-0.9.6.tar.gz 179345 BLAKE2B 56b4e01b61ebe189f1de942ce848bb652bff857d61e2c410ac8e522cfff99b0e9c14d9619dd6d657a20d5a7abee16950c91bf0b1d5184fd7152c8cd2465360c9 SHA512 76da1c895555c87eb58308db13347feb66e9090bb1f6cdc253a1eaf810439dbe4089e9e0453fa1e6e0e30d19a91e0a9d7d20ea3ceb0062c76ba16cdf3b389e3a
 DIST python-ly-0.9.7.gh.tar.gz 239814 BLAKE2B 322d8e9bb3293aada00834e8e4822b2ace11643ac8bec2d351d38f302c941703c1c47f541c5141097fa0e9e7da59fb93f473891a568a222dc5f6cf212e004af3 SHA512 83b5030e2626146f1309b0cc8a4626d6fac58112c97785ef47672fcb14dcb8fb7e95ed86f3afb09709cdf6c15d4ed21619d94926b02315860b9e151c411f6652
-EBUILD python-ly-0.9.6.ebuild 513 BLAKE2B 223494bbb11938555273594d5fc484a6d53f077ba4825c0ab51da50480ee048e30f2e8bf0517b3e1ba7adeb07cf83af05c438f1bd435fae6a4d996264735ebbd SHA512 dd07246eec073b39244b566fdfac34cd1e251e5283fe3469b285776c7df2a81fd3d14027092f52affb0a97b9c3fbbe243e0178ef646f2e81e27d510a45c88588
-EBUILD python-ly-0.9.7.ebuild 576 BLAKE2B bff7d13e1266c2dc34d25bd1d9f79b3fc7690d318b97296ef74ab3b1d3ee3cd55af5fa4ff28d91d89223c41484ef9228bfedc81667d479fa18b9f1291c14eaf5 SHA512 44f4b57c48ea84f7f9aa5649266932f1f957b91e57311d76ac1b7b33bd78123aa16acaeb671b923ff31de41788856e840cf598cea643cb4623204827663c305c
+EBUILD python-ly-0.9.7.ebuild 620 BLAKE2B e5ddde916ec019932125b632cae54948e91bb46ee992d8986a749444779699f6d1da3583e8a800135f497054aac2686b93d06f0c7c718eca6ea3dadc24b82afb SHA512 9ef1bd714004b1d811b2861e4b8a0a1a4d4484befa9c4e8ac03e716498dee1576731d4f847b7675bbcb1e27c099b4e05d0dafd0d9ebd8c34a28bcaa1de07e4fd
 MISC metadata.xml 308 BLAKE2B 98c8e0b71cb17a542fdca32a5ce319424e03edce2e7f4404a196ec22d1268938a04264cc432f67488b4eb2016e748a98e690206253a3e8305a62469c81e16874 SHA512 3fa5710f000482b5ff321d7fd66a0d3eb62542fd4bf18a424a6248dc0b02250fb7c8552e2b3869f6eaed6959be0ecdf63d82f1a3014e258591156561a80fb2f8
diff --git a/dev-python/python-ly/python-ly-0.9.6.ebuild b/dev-python/python-ly/python-ly-0.9.6.ebuild
deleted file mode 100644
index b262a15e73b8..000000000000
--- a/dev-python/python-ly/python-ly-0.9.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-inherit distutils-r1
-
-DESCRIPTION="Tool and library for manipulating LilyPond files"
-HOMEPAGE="https://github.com/frescobaldi/python-ly https://pypi.org/project/python-ly/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# no tests in pypi tarball and broken apparently:
-# https://github.com/wbsoft/python-ly/issues/70
diff --git a/dev-python/python-ly/python-ly-0.9.7.ebuild b/dev-python/python-ly/python-ly-0.9.7.ebuild
index 7dc8c9f964f1..ea877488ed31 100644
--- a/dev-python/python-ly/python-ly-0.9.7.ebuild
+++ b/dev-python/python-ly/python-ly-0.9.7.ebuild
@@ -4,13 +4,18 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="Tool and library for manipulating LilyPond files"
-HOMEPAGE="https://github.com/frescobaldi/python-ly https://pypi.org/project/python-ly/"
-# No tests in pypi tarball
-SRC_URI="https://github.com/frescobaldi/python-ly/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://github.com/frescobaldi/python-ly/
+	https://pypi.org/project/python-ly/
+"
+SRC_URI="
+	https://github.com/frescobaldi/python-ly/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -18,4 +23,10 @@ KEYWORDS="amd64 x86"
 
 RESTRICT="test"
 
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
 distutils_enable_tests pytest
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 07cfa6b4a9d2..74d6ba82bc12 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-openstackclient-6.0.0.tar.gz 838447 BLAKE2B c6b213b022e8c75d3a94752b29cebda4d9ca1d329dc1cb0b470f6e787dd930b379d16bec6c4a0047e63110e01dbf48bee72ed6ccbf54036fa3d1d5de55487e8b SHA512 20bd8da025ee3c69a5e491089edcb42f961c5109563718198ddd22fab8d6928fa08afd6a7db608c70386bd2b61c571c2fadb1c76f84c3d7f1a60c65d4520dfa6
+DIST python-openstackclient-6.1.0.tar.gz 881389 BLAKE2B 6de827c6b85b412034e9444cef656fd748ed1c338c16c22762d3918291090d6ca289a4f7343ee0708e971a693990707fa8cf7a5db1e7e1bdc040a701988258a6 SHA512 6a5363fdd2da5ba3a6ee31f0f0c060b3d2520149a3c22583d5020bea75f93faeccd62946b88fc4d8cc6b0776bedb54d3c88b61761644ad86de973a8a0a1dcc8c
 EBUILD python-openstackclient-6.0.0.ebuild 1802 BLAKE2B 176b2f88d2d49b527936e4f5327eb37c3f2a84982084693ba9634cb693885ad385f837a851563792a77b1e38dde54e8b9866c1c3863c6eec855654c678d0ee85 SHA512 6fea600ec943b890208f3ff4f31ad469ddadb6e2279b6f6490bc41fda1aae44f7248d3dafb8bd1841fbf6dc1fa3ac8921247c9e2f31361b9746afaa21436f608
+EBUILD python-openstackclient-6.1.0.ebuild 1805 BLAKE2B 9c659a9a5eb806f62301ed3f76d89794d37beecd467834ac3414907053315d0af6f25613d19ed92c7647d7a1dac9e6e7761962f390c32993d46d52b28b42d405 SHA512 a94316cb6cdde9e3934f53273a16ef73387d2b7d958ba98a68956237c7a8ec2ded3af47bf66687d8d641410a7c74e425c383a2842c4fb972ba041938e5909e21
 MISC metadata.xml 562 BLAKE2B e4f7a3fccc9c2c798962efb6dda973ad71c19e5db8efd57869b6a8cd565784d5f4a6c581bf11a28eed826bb8c3451b5938e43974b91291609d177050fc654603 SHA512 3fdb3a9300dcaa310ec02266127a998ac4587fa9fde5e381342a5c18d0435442dfdafd0b326730e1cee26f72b43fccb6a15df7d5d1fd8f5a9bb3783983b0dcca
diff --git a/dev-python/python-openstackclient/python-openstackclient-6.1.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-6.1.0.ebuild
new file mode 100644
index 000000000000..8436120952db
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-6.1.0.ebuild
@@ -0,0 +1,61 @@
+# 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_{9..10} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="
+	https://opendev.org/openstack/python-openstackclient/
+	https://github.com/openstack/python-openstackclient/
+	https://pypi.org/project/python-openstackclient/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.103.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.22.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-18.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Depends on specific runner
+	sed -e 's/test_command_has_logger/_&/' -i openstackclient/tests/unit/common/test_command.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b openstackclient/tests/unit
+}
diff --git a/dev-python/sphinx-prompt/Manifest b/dev-python/sphinx-prompt/Manifest
index 7131d5a80429..47d176e3f751 100644
--- a/dev-python/sphinx-prompt/Manifest
+++ b/dev-python/sphinx-prompt/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-prompt-1.5.0.tar.gz 21537 BLAKE2B a5bc69797ea526bc3d66b52e98b80cbb9958add084ea6a4d70a85cc06c69271bbe9e658eb517b78dd758178b6f3b93d92ea87e9432e5c28a61307706a3c34ee8 SHA512 b3d023388eb024303e9264e621ad379367916f8e3567192fde90b3f0d96c94c53d783c2e14970ad3d85895053b3aab9ece6d9573d3bab1dc894e0e04757f3a40
+DIST sphinx-prompt-1.6.0.gh.tar.gz 38245 BLAKE2B da2ac8564e14a10d5b51ea5ebd2e5578e7c2795ea7f3c5d3f054c621090e4bf634b9a1f578f4c010bbeaa61cc0d18f1a48ce6c0d9a316e34504ada1b4fb61d7b SHA512 a896dad9d333fde843ab90f331be40c533fa32f75f68dfc012a6296d96661e726647250642e1cc4c54125d9acb237add640008671a657a5e47a885450831c21e
 EBUILD sphinx-prompt-1.5.0.ebuild 595 BLAKE2B befcd1520ca177df2d7dcde61f04f249a9f5c48d038252ba14929ed22fab0e7c9bef3e8c3c007d3caab835e7b1b146eded5528d771d666d67624d77591b538ce SHA512 aba3e5f376f198ca3364e3a84b91fba86b1ab644abfe7616ecec947a0787b65cdf728687db2e34dd6145ba6eca21526743f70a6ce523591249461230664ea067
+EBUILD sphinx-prompt-1.6.0.ebuild 816 BLAKE2B 27fa2583e11c2577c2b15962dc89a0ac21e53e4c0515d4dacc9b0880030a9f8a71e29d569222c5fae01e445f26f0e3c3b608f5773cda54006a98e2ac2be69cf2 SHA512 9df5e0188fc8a50fc1f39cd7734d7eb7ef6a38bf8ce731b860aecfa25fe0813bd0c29d1bea1a31cf9829593321ee797992a72f65afbe7cd07c9150807859288e
 MISC metadata.xml 416 BLAKE2B 5c9110bc6a6c0c7acab6e9f10d8d84601a66c7741ba15612eb032272db9517f314eec8f86677e43fd7dfb1b032388b1db3b60c64e0cd9a6943498c4715ebf1e0 SHA512 5d23f08978f7ca0dae7062a4a872f1be37969144c128c4a1f2006798465b5dbf95090e14859eb6c7e1e75649170e40fe156e6b9cd5b1263464e88edffc760a15
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.6.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.6.0.ebuild
new file mode 100644
index 000000000000..68cf7b066edc
--- /dev/null
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.6.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+inherit distutils-r1
+
+DESCRIPTION="Sphinx directive to add unselectable prompt"
+HOMEPAGE="https://github.com/sbrunner/sphinx-prompt/"
+SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# https://github.com/sbrunner/sphinx-prompt/pull/330
+	sed -E -i -e "/^version =/s:([0-9.]+):${PV}:" pyproject.toml || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 0d35218a9d50..c0a1eac01890 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,5 +1,3 @@
-DIST watchdog-2.2.0.gh.tar.gz 101317 BLAKE2B e597b780f26794bfe0462bcb67985d6e38324aac955f8655e657d800039d98473444ff13ea98fbfb6e8a5fd5473c0f3eeda2e542ef030539fc1acc3f86412354 SHA512 95c355da3a97f7eb0ddff02c1801eeafb075aead742d5505254fccef60afd8e5f1ea56760533bb87f520fa60f4f41e4f36c7f02247a170029bace728e83e2780
 DIST watchdog-2.2.1.gh.tar.gz 101485 BLAKE2B 4ec0a2c14d0dcb8d39ed4dea48c1318474768298b4eade4f7c08f811282ffdbf5871c7d55d71681863c38d1f0603c46aaadda73bf38a20ef263fa3b4cf76c354 SHA512 bbd6e3e3fdc7ee5df21b78241922c0050aeb0c01e394fa7d025465f04f3307d190af4cf6e822826975a3b095fb479dfd103be0675f12782e8899f556797baed4
-EBUILD watchdog-2.2.0.ebuild 1094 BLAKE2B c6b0299e9f82284b5baf1319046a21f8887683b97a234897a90424e1c7d5d69676a00b5781d1bc0fb5dd744e223819e8ae5f873b9a92fe6345244e83750ec1cc SHA512 fcd84240f27468fd63fa6f187cf6d45eb5fbd1515b94942073540cc412c25c8382dacfeec8046915ba1fa9ccfd2073ffae809c87e5da07087671812c5655b70c
-EBUILD watchdog-2.2.1.ebuild 1097 BLAKE2B de80a8d25d0a5139944791562c1502f2a4b1cc5b00c340cc698679adf6a1ae5661f8b2cdcd8e1e6402f0b2a9662fbaec15041d4fbd807c099250b1e7f211f9ce SHA512 645d7554bd7cd6defb0380133fde28e0d2aaf5e971305234b3498d2a26a073e32017ae78a0e802ec6360368a3cfd758b053674800aa08530f342854863df66b9
+EBUILD watchdog-2.2.1.ebuild 1094 BLAKE2B c6b0299e9f82284b5baf1319046a21f8887683b97a234897a90424e1c7d5d69676a00b5781d1bc0fb5dd744e223819e8ae5f873b9a92fe6345244e83750ec1cc SHA512 fcd84240f27468fd63fa6f187cf6d45eb5fbd1515b94942073540cc412c25c8382dacfeec8046915ba1fa9ccfd2073ffae809c87e5da07087671812c5655b70c
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/watchdog-2.2.0.ebuild b/dev-python/watchdog/watchdog-2.2.0.ebuild
deleted file mode 100644
index 667e26c7ae30..000000000000
--- a/dev-python/watchdog/watchdog-2.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="
-	https://github.com/gorakhargosh/watchdog/
-	https://pypi.org/project/watchdog/
-"
-SRC_URI="
-	https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires root powers via sudo (yes, seriously)
-		tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem
-	)
-
-	epytest -p no:django
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.2.1.ebuild b/dev-python/watchdog/watchdog-2.2.1.ebuild
index 3c0b6cea1193..667e26c7ae30 100644
--- a/dev-python/watchdog/watchdog-2.2.1.ebuild
+++ b/dev-python/watchdog/watchdog-2.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/ypy-websocket/Manifest b/dev-python/ypy-websocket/Manifest
index 4715d6a393bc..d00e49d71733 100644
--- a/dev-python/ypy-websocket/Manifest
+++ b/dev-python/ypy-websocket/Manifest
@@ -1,5 +1,7 @@
 DIST ypy-websocket-0.8.2.gh.tar.gz 13045 BLAKE2B 44cd1538247b68b54d161800f76f467f67d77d81726b4af01cbeeb045b77aeb7ec8fde7c126c5d54a0792be11bc97d41a624c99a80c2ea8178a358d045e59389 SHA512 6774d646a04afe4dcf72b6ec44bad5092ff40d8647c6650697340ebf6f2a548ba870ac2924de84626f10e88b6603a01c842e5a5d0ef71d3a75fc67a080ca22f6
 DIST ypy-websocket-0.8.3.gh.tar.gz 13237 BLAKE2B 49c60b56b5812620212df5165b022501152c170831aff25bc8ff25901ea5ebdc91db2835a923a874bb62b1f0e6864a9d860b951ebafa9589fa16ce8cba9a197e SHA512 fbc2a795d25ba7f228841545b814c29c018126254fed7c59056e99946da9efaf22eb425acd43c85b31df3fd14e8ce91f34f32a309c9586a78a67c8a30e022a79
+DIST ypy-websocket-0.8.4.gh.tar.gz 13416 BLAKE2B 9dd988d6eceb624bae2385180c408971a776f06324407506886c2ef5b8e713277a4c4fb0a2d328a20695d4db8808997c125bfb48faa60c93fe38bb1a1e899766 SHA512 20794b182bbf3958df9f3097ab8c4657acef1ca294c751e0524bc5a36cd7b7a6a2766ae9295cd5f9fc31070813d5b56e0e1e25e22931f63171f88b4757bb1584
 EBUILD ypy-websocket-0.8.2-r1.ebuild 840 BLAKE2B a5230fd624bed608f3ce144bb24e18205550e7f1a69f51e1511cee6fd99fee032b4fbf92bcfccd3dc9ba03c24ade29d358cb5ae9d6892615248dd1be73cf5e6b SHA512 0785d71a6352504dcfce885b4c3ff755298a9dceab24ea515b7964b670cba4de6c8741ec45639a307d4df97319c12a6917f2e384153ede4ad57e3c0c52e0c417
 EBUILD ypy-websocket-0.8.3.ebuild 874 BLAKE2B 0b6e5033b6dfa0db728f8770cfc8ff8af14ccd435c6f484033b8c3be13fa79e5d94bec4f9080f04c1aafa7a3235aeb3dab3812aaa3e4ae1683e37190dc1090f3 SHA512 07b87293c9373232601e08dd744346f14d489e76f6b1f90278020a2ca65ee215af3bbd47bfff4530940c11fa6906a1ea2251ebb7430cfb5a883d25411a5db604
+EBUILD ypy-websocket-0.8.4.ebuild 874 BLAKE2B 0b6e5033b6dfa0db728f8770cfc8ff8af14ccd435c6f484033b8c3be13fa79e5d94bec4f9080f04c1aafa7a3235aeb3dab3812aaa3e4ae1683e37190dc1090f3 SHA512 07b87293c9373232601e08dd744346f14d489e76f6b1f90278020a2ca65ee215af3bbd47bfff4530940c11fa6906a1ea2251ebb7430cfb5a883d25411a5db604
 MISC metadata.xml 414 BLAKE2B a58b2ac27d2f9e1a1d06c8fd9dcb6f9d1654fd2665d6d676a734ba228b71f6da488b835b7cb5739a6acad7102a669356e8f872bc96ce40b6ab0104699f8a7379 SHA512 533c2d5a8363cc5575d8ee08a3642f8b6fd11311fdef7d6902cc5e19fb33512ca2d9a6ecde76e909a6192a48449d612bb2b6db7b96ad1d99a89d67b06b749d76
diff --git a/dev-python/ypy-websocket/ypy-websocket-0.8.4.ebuild b/dev-python/ypy-websocket/ypy-websocket-0.8.4.ebuild
new file mode 100644
index 000000000000..4394429329a1
--- /dev/null
+++ b/dev-python/ypy-websocket/ypy-websocket-0.8.4.ebuild
@@ -0,0 +1,43 @@
+# 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
+
+DESCRIPTION="Python bindings to y-crdt "
+HOMEPAGE="
+	https://pypi.org/project/ypy-websocket/
+	https://github.com/y-crdt/ypy-websocket/
+"
+SRC_URI="
+	https://github.com/y-crdt/ypy-websocket/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/aiofiles-23[${PYTHON_USEDEP}]
+	dev-python/aiosqlite[${PYTHON_USEDEP}]
+	<dev-python/y-py-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/y-py-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Requires internet and nodejs
+	tests/test_ypy_yjs.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4788d94d7d8e..caae377323d7 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 5c36b092facc..1b06b66bf104 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -5,9 +5,11 @@ AUX pkgcheck-0.10.20-fix-replay-bin.patch 4506 BLAKE2B 68262310538abb220ef3f3109
 DIST pkgcheck-0.10.19.tar.gz 548636 BLAKE2B cc1626c1d5ad9ba6b43f99bcdb668092805eaf9797c9839812d8716ea9f454f631d2e6da4579bbf702da5aadc61adc8064a6b7d32f001aaed9a2e42f8392f24c SHA512 c3af623b5c38325f9afabaa217e29d23dce4355a0aebbed77a5efa469ac135238d0aa04b4973d84c52e68ada0cb3b391a82d58317e75a279f083470c7e69cdf6
 DIST pkgcheck-0.10.20.tar.gz 549746 BLAKE2B 72ed97d93674ffd311978d03ad3738494a752bf1b02bea5eaaaf1b066c48e8c9ec5f82b79baeeabf3e56e618c76614ee6179b7115d1d875364ac6e3fbc3c6028 SHA512 6a8c135ca44ccbfe15548bd396aba9448c29f60147920b18b8be5aa5fcd1200e0b75bc5de50fc7892ad5460ddad1e7d28a7e44025bdc581a518d136eda8b0df2
 DIST pkgcheck-0.10.21.tar.gz 559386 BLAKE2B be30dcfb0021459026059befdd9cbe661b9b2448e6997e23ce6cc28b56793acc72cd490cf07f42ad6e13a48beca52eba5ffc0b40ef981fbc7235dd9ce29bdb27 SHA512 148567658d949e4737da5bcd2329b4647296877b747a216c64a4d0839dd0b869a8ae32644784ff124f7f94e54a58acc5fc349a28c8a096a99b9488ebc04b374e
+DIST pkgcheck-0.10.22.tar.gz 566826 BLAKE2B 714eb92bd43b4c3f2319aecb343fe6580f754ba50ed6fa986faaedcba71d34f2834ca85d17c961d327c90081dc305febccfbe08dbc13a706d972e289271214e3 SHA512 45532faa169d42f3d5a94a17e83089d4789e7c3e26226f2e5441ba8816cd3610a9025cc392bb32d6d78f202354ab11117fbd07ec2550d7e3255c02c6cb96d98e
 EBUILD pkgcheck-0.10.19-r1.ebuild 2362 BLAKE2B d653ee448a74bbf5debee553a67e1e387fc0ac0f3083540b32b014991eeb27dd0b02f33697b95669ebe26fd0c84d528324b2cb5b7b51750e4e6d45309233cc6a SHA512 2da2dcd658b828c907380fb4af4d2fcd2fc7aa007615a8fa1fd36dee9cfe71b6d21ea80fcc25eddce69b54b64046a5ff5c86acd64d8dfb8f0f97d3f72a2da5dc
 EBUILD pkgcheck-0.10.19-r2.ebuild 2417 BLAKE2B 8846153b57eb01b03fdcd0d9b70f303aafc9ebe40dc2a139be4b480153d734da67ff94a42b5a7d3accf2a9cfbb73664668717c56b635d9d88bcb001b5d93b787 SHA512 5529cca4233e5c350209baae3838949954a076fe074b3dc93bab8e34c5716f0d701cb43fc443ccfb1e225ed06f3d61e21b34f566b64e0cf08167d91066016bec
 EBUILD pkgcheck-0.10.20.ebuild 2299 BLAKE2B da8d2f3c4003dece22395a782538718fb5511048dd8a0f193504875b42fbe1c330583e4491b12cc4ef0c4d85caedb7777d3b00bb562a6e5974ebfd35f93fdeb1 SHA512 d97b28760c66445cf6a466a928dd1458ebdec5bec82742609545899e6a451bd46b5ec02913ec56228da44ddba728e0fb9bf76f8e96043d91042015587ed6c419
 EBUILD pkgcheck-0.10.21.ebuild 2208 BLAKE2B 7a591201ab467e2a2c463ab85f71145aa7dced2636d097305f79d59630075e39d6f11d2905362b281fef12ea55020bc274a870f162bdc5a70c24428c8674027d SHA512 337087d18df1524c74217e6373aa02aaacc32cc8fc50fd934e40b38157ca62fd1111e3f1cce0388740daa6b5c67f1d25a38c252f31e5eed7266389e6869262e1
+EBUILD pkgcheck-0.10.22.ebuild 2208 BLAKE2B 611f4a9bc2958e16e58867934ca50f62784217144e207875e30d3844ecb240361e6d20e5b0a216445e9d13b7f5bb0e9293a5e6682a9e5549a83dd14040aeb2f3 SHA512 6197ca12a10db8ef8a8b1c160952fb63751fb771f08c656512a2c11393bb8e241dd6c209bb5a718c66edf0d4448511e426827e40155601b834fea0da5953a3c5
 EBUILD pkgcheck-9999.ebuild 2208 BLAKE2B 9df86718b0572e354aecf6b68f251be51538dca36e4a42e79fdb0ab7a48911b5b79ebe033cbf7814f1c5a1105a4065d5790e3ba388c1d8f77c42e735a4d179ac SHA512 d63bf1d5c01fbd1e8d6a93e7176c0b6aceba20dfda43eff12ad12a91eca4f6f52aeb1d1d0a65c521205bb05244789b1fef563fbc5cff6a7c639d7b0221dec52c
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.22.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.22.ebuild
new file mode 100644
index 000000000000..582d6f268d39
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.10.22.ebuild
@@ -0,0 +1,94 @@
+# 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 elisp-common distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
+		https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="emacs"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.18[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-libs/tree-sitter
+	dev-libs/tree-sitter-bash
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+	emacs? (
+		>=app-editors/emacs-24.1:*
+		app-emacs/ebuild-mode
+		app-emacs/flycheck
+	)
+"
+BDEPEND="${RDEPEND}
+	dev-python/wheel
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+distutils_enable_tests pytest
+
+export USE_SYSTEM_TREE_SITTER_BASH=1
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use emacs ; then
+	   pushd "${S}"/contrib/emacs >/dev/null || die
+	   elisp-compile *.el
+	   popd >/dev/null || die
+	fi
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+
+	if use emacs ; then
+		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 2ff183561870..de2d69fd6e0a 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-delete-merged-branches/Manifest b/dev-vcs/git-delete-merged-branches/Manifest
index bcf725e0d9df..01f4c5f5cd05 100644
--- a/dev-vcs/git-delete-merged-branches/Manifest
+++ b/dev-vcs/git-delete-merged-branches/Manifest
@@ -1,5 +1,5 @@
 DIST git-delete-merged-branches-7.3.1.tar.gz 41031 BLAKE2B d84e2839223e58f359711f62fe276713e47079efca23860ab28fe43e6ba93ef4661bf56a76be56f2f2c7b5a487214af447c8746bf10adc4fe400aa7727bbb863 SHA512 8c23d8835208f28f64bcd390ee26d2e49c6a941c1299263bc5de91a9790fd2ebd80c573331095847946d2feb98aae8ce71815959b04d1368c7f2cead1e63240d
 DIST git-delete-merged-branches-7.4.0.tar.gz 40887 BLAKE2B e267a0d1154d8adc8cb3a8ab0cfbab687b61b5d17bea63ea6946bbfe41b4cbdbbe288f16e120f7823f3bb50c4e6d61d3ca643fa3fe961bce5c26cc2a64287573 SHA512 90459162bb6d7cf9746ca0497a89f998b6a7b0cf165425e74375c55f99fa7ada3b8db66b567b41985e0728785c922c1a7cbdd30b4aab4700acf6a34a3d5056f3
-EBUILD git-delete-merged-branches-7.3.1.ebuild 1028 BLAKE2B cc383e2d21d89af3a13f86d8f4a6df632c4acf045abfe0e728324b846dee54aa0a4ff848d14548e7e1b796502e516f854a3f6da576f85a69a16e80faa45238a9 SHA512 4de97d8e0e3664148b74dcbe6d663f91f1caa930332f987dac33273eb95013ac5ff638653f04e94a898099c13b911b27c3162f9902e947a68d85245470058622
-EBUILD git-delete-merged-branches-7.4.0.ebuild 1028 BLAKE2B cc383e2d21d89af3a13f86d8f4a6df632c4acf045abfe0e728324b846dee54aa0a4ff848d14548e7e1b796502e516f854a3f6da576f85a69a16e80faa45238a9 SHA512 4de97d8e0e3664148b74dcbe6d663f91f1caa930332f987dac33273eb95013ac5ff638653f04e94a898099c13b911b27c3162f9902e947a68d85245470058622
+EBUILD git-delete-merged-branches-7.3.1.ebuild 1028 BLAKE2B 95b45bf076d7ba0ff13312e1ef14a63bb651f87bd05b785a309d34ab59e116b2e01ad0a15a1aad97d355f039ccf4ca3fdd36cce4023136b81ad459c38b56e7af SHA512 5159e7cfd964f28f1d951e1c9a8b9b7624b3c3b8129af39a8ea9fc81dc7bb110480be1a8bdb42675cf25efef889f7672f0e2d8c0ead0ba2c042a4eaf1dc3c7cb
+EBUILD git-delete-merged-branches-7.4.0.ebuild 1028 BLAKE2B 95b45bf076d7ba0ff13312e1ef14a63bb651f87bd05b785a309d34ab59e116b2e01ad0a15a1aad97d355f039ccf4ca3fdd36cce4023136b81ad459c38b56e7af SHA512 5159e7cfd964f28f1d951e1c9a8b9b7624b3c3b8129af39a8ea9fc81dc7bb110480be1a8bdb42675cf25efef889f7672f0e2d8c0ead0ba2c042a4eaf1dc3c7cb
 MISC metadata.xml 582 BLAKE2B 45e782537ad6d6a54a50ae84e5e1ab46ad9d06297397d30c2314bd15b39c4099f755a2884ccb072e4516499bba240814cffa727862db5a5fc1472b45d7ef7cbd SHA512 e99038593f4bdebdd3874e88f50f4f73dca01272024e2e2d998559b53c1c755d33592865ec4706e99202f2d1f4293578dda7c3812e991a3e7b7da9d1d78dc76c
diff --git a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.3.1.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.3.1.ebuild
index 259b80d6a0c6..c45cabbc6d2f 100644
--- a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.3.1.ebuild
+++ b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.3.1.ebuild
@@ -19,7 +19,7 @@ IUSE="full-name-executable test"
 
 COMMON_DEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.18[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.18[${PYTHON_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
 	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
diff --git a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild
index 259b80d6a0c6..c45cabbc6d2f 100644
--- a/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild
+++ b/dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild
@@ -19,7 +19,7 @@ IUSE="full-name-executable test"
 
 COMMON_DEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.18[${PYTHON_USEDEP}]
+	>=dev-python/prompt-toolkit-3.0.18[${PYTHON_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
 	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 01e4329c59f2..99ea6e7adfa4 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/usolitaire/Manifest b/games-misc/usolitaire/Manifest
index 573bef65d858..f86516c2c71c 100644
--- a/games-misc/usolitaire/Manifest
+++ b/games-misc/usolitaire/Manifest
@@ -1,3 +1,3 @@
 DIST usolitaire-0.2.1.tar.gz 118199 BLAKE2B 99b828d8aeb91897f5d070250a20c1a5f9b49b3be889781dcc3f2348e8f4946fde3ad07d915d87cbd309b2fa6b87777ab8ecd1bfaf65d76bc6989e36a0263785 SHA512 5bd7b222643e2decfc6e1f7749b8632bb0b99f5af28d49088f28746b8ffbd07443855b557e969f40f427ca71f8d2ac9386d8d90c2121880eb8bce5e3b5d4f4f4
-EBUILD usolitaire-0.2.1-r1.ebuild 505 BLAKE2B bab528dc9076095f73504328af8a4620e38a5dc1a5f0fb321c574bcb9512b880c00c8fbf773c53c1471731d08e5a760ec4aa09d00623be014c5b96004fdf28ec SHA512 d0bd1f36c68ee576486f25ea5128f880b8a298cbf264c0258b9e32a55e84bf3bc0320d813527b1b21a7953555f267e7a2b24640dff19fbcd02b6b7e1723cb86b
+EBUILD usolitaire-0.2.1-r1.ebuild 505 BLAKE2B 7a12b1a2b3f40990dab148deef04f9f9e6561e7083ac51712261b9c91f90ff25bf9802b35b55d60842bafa2b45a03760b3695d51c3e92411b2251b7614cae62a SHA512 1120c3f546f1e4059281edf13b25f8215aff2159b107d6d97937911615546706fc204adb89760f6cbabe7c15fb0ddcbad129be1ce288cabd6b8c8d0b83df0b2f
 MISC metadata.xml 515 BLAKE2B ce60d48c479d3166188937adb9b40caf93ec55d8112e7e409e0f08edd39656f4af230e20e1d9cc28dc8bcb8dcc9d04ae062601b8f4d6322bd277487c979c2634 SHA512 5d3081dc5e4fb584ba975c292ea2ab659f70eb55e8a79e38318277a316d31703e195dec01acb0d383bc942513352e1dfcacd3c93181ddace3d4577dc3cb85c0c
diff --git a/games-misc/usolitaire/usolitaire-0.2.1-r1.ebuild b/games-misc/usolitaire/usolitaire-0.2.1-r1.ebuild
index 1fb84a0ae10d..b262e0d1fd0b 100644
--- a/games-misc/usolitaire/usolitaire-0.2.1-r1.ebuild
+++ b/games-misc/usolitaire/usolitaire-0.2.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="solitaire in your terminal"
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 5879e30cb379..8de960c00817 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 193c8de2f2b6..d896f1a5928f 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -2,7 +2,7 @@ AUX libkgapi-22.08.3-AccountManager-dont-keep-finished-promises-in-cache.patch 1
 AUX libkgapi-22.08.3-dont-cache-promises-for-AccountManager-findAccount.patch 2937 BLAKE2B 478ff1293905b8af485c2516d5dd6a78f45d8bb2782a3fc852dc46f059480bb4561efabe4fe6578273d5c8331bdc1e8743eaccf63faf6056a4a39cb97924445a SHA512 15a851a436bf7ba7740bb66774361f3a97ae8b8f81728837f42597ae4c8a022d2cd76a8434c956727a407a007ad29eea77fac626314b31aa643da875e422e9f5
 DIST libkgapi-22.08.3.tar.xz 242496 BLAKE2B e38ac44878e5425b4cb6922b13bbca4268795f92a6e50123c3c4ff228f80bec58a0146e4548aa8d5284780f5700236b5f52a96962f2ac8caa3d676847b6ab2db SHA512 b393691240954c2e6262cef32fc04dc2d2137f97256d8bc43d8ed6cb6007122819da43206fca6a5cf3e6c6201fd4b7e43bfc1972733a7b6c25221895eeb91991
 DIST libkgapi-22.12.2.tar.xz 245700 BLAKE2B b3effad1f80a3e7f3ead75b579fe31bf7136ee955fabbf720e38b261b684c5cdf46fd9ccaa4b106f1d7f2ab09b3c464e1f48e4c2b2472e1389a4ae54b8d27b5d SHA512 0dff7708b5d2f9b7275ff6fb8b89dd8f4fcc1f1c7142de313c25597af9b3343f8df2aca546dee316186a7787942d5588af2cd8b56fae70faf4a50b1eb38c9133
-EBUILD libkgapi-22.08.3-r1.ebuild 1539 BLAKE2B 79b88902d43d178b9697b55c85426809da04f5a33752b76da9e692bdfecd1e0d85a08d604ff0e08eaeb165a8c98a08e52376668fe34ba837edbdeb3a13b7ce6f SHA512 823c07b260eb8e7fb9ba96c60b68d10a6719404dd180e176a1e5f66a539213a4da2aa3fc71c80ced3fe7636c0be9326b3e87c7d80cdcaebc0a17e1cf65c6fc95
+EBUILD libkgapi-22.08.3-r1.ebuild 1538 BLAKE2B a55d42709eb9268c14403911b7e0a9ce72f3a3959ce3dd61691183f610d005dbf0aa0eaad4c7575aaab2edf5373a79f4a33f0ea06135dafe41daaa3c7d8bb21f SHA512 fad88a493fca0a5456cb3d2fde482bab5beccf4e9eb571ea52860bd53060c355ff259a73868ef787f6949c1a2f593e0922c405c629ef8f0aa58e6ea7077ed089
 EBUILD libkgapi-22.08.3.ebuild 1368 BLAKE2B 422fd8761ce70740e5ee38cd2d85ca0b45549ff00c5bfcd242d0d315258488e5a81f963bfb3b716fcf3bdefedd4d0ac6512d3fc3f694853362a7d52369e3e31f SHA512 524a3923893e4a1c5e231f9ccc1230e82c523bd1637d5ca7f9f9015abe416e57bc01fc7fc30dac4837ccf7ab2ca87f6579ac4d6de2b50bc2e1c453e94041b258
 EBUILD libkgapi-22.12.2.ebuild 1372 BLAKE2B 900d7f2429b9526075d7999f18659a7fcd259df1da2aeb8a34aa602028c9054e3ca1a80e39e107b024f00557f3613091c5c161f471314275f22adf6ab744127d SHA512 6c37493ef5feb0d79a7dfb02570247ff67cfb8c4457ccdcc73e95b672de012183cdc40d1a9087c9cc1dd492344a32ea1e0334c213d5b675cfea195326eb9cdd7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/libkgapi/libkgapi-22.08.3-r1.ebuild b/kde-apps/libkgapi/libkgapi-22.08.3-r1.ebuild
index a46cb2350c58..0ba982756bcb 100644
--- a/kde-apps/libkgapi/libkgapi-22.08.3-r1.ebuild
+++ b/kde-apps/libkgapi/libkgapi-22.08.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="nls"
 
 DEPEND="
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 72efe56f5471..f7f80bfd5ba2 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 9eff1df572eb..c2cbd30ab449 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -4,6 +4,8 @@ AUX norewrite.patch 488 BLAKE2B 663b52ff5936d5c8aa24ce2a226cd803f09a972a2f358b7f
 AUX password.dist 247 BLAKE2B 1803a6663c32ccc74c4dfb1d591a01d4416f9de9c4bf35c9a7ca277c2007b8c29a8899f4285c78eeb8592766457eef0caf377a344adee7a61be15bbf8b80c7de SHA512 f488b0ab1a909c9b878b9f3f3147641a9ed6d8d2ad44c67cd641934b800b18a62de2a7f5f51fdbecfbbcdd7c39c753734984cc0836c905a3b708858e1b91093d
 DIST courier-1.1.5.tar.bz2 7654159 BLAKE2B 7ad09b4b3c8ec201ea275851aec4efb34861a2881c765228b58063d26f17580fbe8ffe4e882d43b74ed048c3bf711e0eb08cb45eb1ba25ab2073a8c411a6cd4f SHA512 6b7040a73b09a4fc0ad4d93c576d7d7026aa743e5bbfe3ae14d2474dd9cffdb3419eceb14000cc0beeae40886796d9973e9f8611a7ea925cf2e0ab928904038a
 DIST courier-1.1.8.tar.bz2 7655220 BLAKE2B 189c87e416fe8d232e1fab8be47ff8258a54de2a6eccf1b02bd2839c6925018ee5b0ff3172ba791076c979d5c15a9dbcac1e7f515b0683066f3ff55369ea91a9 SHA512 9a0d96a20a75794fba57df11305326eb990091bd503763cd091ad29a4b34d9c1576d40c2e2d6eb81f3705e2d4b0a265c174df6e307a60fbbc1dc26110d931133
+DIST courier-1.2.2.tar.bz2 7841858 BLAKE2B 93ff5cbfe6cc8e51c769718a7933c6f7acc7f910fd3c966c3f0703a8775d360b899f846e34174b48152d397d1c7e89f67b511ec31a63641649f015574149deec SHA512 801893f77b3e18e01f3cec4a9d73abe8fc7aaca34d3c853fd5e6007e30c2b47f9e2f54e50fbff5a5bbb5ddb72ddcb5e4b7f862f17146253e44ad61b97bc556b0
 EBUILD courier-1.1.5-r3.ebuild 9233 BLAKE2B d0c7f609140f624ee3b971f240766b80bc467d5f9ce649b2ff4591096d48eea997e2a9951fd56bbbb5511557609bcc21c7a5e992931597e52d0a584141eb9c90 SHA512 6563cd00e122b641f4b2147b02edcda05dd6bc6e662a2d4a55fa9f4d5327c3c48931bd4c8d6d536eae05726f91f405d20d534e70a50f1d2193d22a53ba5f6d6f
 EBUILD courier-1.1.8-r2.ebuild 9239 BLAKE2B 37bdf7f22ac01545fe89f6a3d63a58ab984c5f27efd0d8a6a5d751b15bd184afb53e92ad04e7fce78cae5557dc960e22ca3135aee5334603804ab00e29a02b47 SHA512 46489020884af61bac01a18dca9704a931ba81ad07f08873511baa15fc401c722c52f882c136eadc36cc46d3f590e48bb7aacff54b129b265384baaf0618da3f
+EBUILD courier-1.2.2.ebuild 9263 BLAKE2B e5656abf60207172da2e27674b32e4a45d6874c20130c13634c0df07e5e4049ce9bb398eb4e2a0397b94839257cf0cf043d63b3cd2f40d18a974079cfa24f367 SHA512 1ac12e88befc9f6f1e7f9a2ee4e72697c47b4f4575b9ed7dc1ef3df67ee4fe7d9976786f993d394da1956b2fa1f59a8d26739788f16b025e29dee6fed7ee66fc
 MISC metadata.xml 756 BLAKE2B e3d128790b1620d9005c9a14cef1c452488fc8e465b235791cc196f431cb2ea8348aba342b0867282878d0c73392694be0db0686dc048d9345b286c3bccf1cab SHA512 c3fcd1ba4b22f91b1acf49faeee41562a7963b51d37e1593156086b79a1eb4172a12e7226b71a9aa55b5a4ef7d734351752451a2300375d061ae20481778b273
diff --git a/mail-mta/courier/courier-1.2.2.ebuild b/mail-mta/courier/courier-1.2.2.ebuild
new file mode 100644
index 000000000000..b2b4f33d26c3
--- /dev/null
+++ b/mail-mta/courier/courier-1.2.2.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.72.0
+	>=net-libs/courier-unicode-2.2.6:=
+	net-dns/libidn2:=
+	gnutls? ( net-libs/gnutls:= )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=sys-libs/gdbm-1.8.0:=
+	dev-libs/libpcre
+	app-misc/mime-types
+	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
+	pam? ( sys-libs/pam )
+	mysql? ( dev-db/mysql-connector-c )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	postgres? ( dev-db/postgresql:= )
+	spell? ( app-text/aspell )
+	fam? ( virtual/fam )
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/sendmail
+	!mail-mta/ssmtp[mta]
+	!mail-mta/opensmtpd
+	!net-mail/dot-forward
+	!sys-apps/ucspi-tcp
+	"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	sys-process/procps"
+
+# get rid of old style virtual/imapd - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd"
+
+PDEPEND="pam? ( net-mail/mailbase )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+src_prepare() {
+	use norewrite && eapply "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	filter-flags '-fomit-frame-pointer'
+
+	local myconf
+	myconf=""
+
+	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+
+	econf ${myconf} \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with spell ispell) \
+		$(use_with ldap ldapaliasd) \
+		$(use_enable ldap maildroldap) \
+		$(use_with gnutls) \
+		--with-notice=unicode \
+		--enable-mimetypes=/etc/mime.types \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--localstatedir=/var/lib/courier \
+		--with-piddir=/var/run/courier \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-paranoid-smtpext \
+		--with-db=gdbm \
+		--disable-autorenamesent \
+		--cache-file="${S}/configuring.cache" \
+		--host="${CHOST}" debug=true || die "./configure"
+}
+
+src_compile() {
+	default
+}
+
+etc_courier() {
+	# Import existing /etc/courier/file if it exists.
+	# Add option only if it was not already set or even commented out
+	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
+	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
+			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
+	grep -q "${word}" "${D}/etc/courier/${file}" || \
+		echo "${2}" >> "${D}/etc/courier/${file}"
+}
+
+etc_courier_chg() {
+	file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
+	[ -z "${section}" ] && section="${2}"
+	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
+	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+}
+
+src_install() {
+	local f
+	diropts -o mail -g mail
+	keepdir /var/lib/courier/tmp
+	keepdir /var/lib/courier/msgs
+	make install DESTDIR="${D}" || die "install"
+	make install-configure DESTDIR="${D}" || die "install-configure"
+
+	# init script takes care of this
+	rm -rf "${D}/var/run"
+
+	# Get rid of files we dont want
+	if ! use webmail ; then
+		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
+			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
+			"${D}/usr/share/courier/sqwebmail/" \
+			"${D}/usr/sbin/webmaild" \
+			"${D}/usr/sbin/webgpg" \
+			"${D}/etc/courier/webmail.authpam" \
+			"${D}/var/lib/courier/webmail-logincache" \
+			"${D}"/etc/courier/sqwebmaild*
+	fi
+
+	if ! use web ; then
+		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
+			"${D}/etc/courier/webadmin"
+	fi
+
+	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
+		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
+	done
+
+	newinitd "${FILESDIR}/courier-init-r4" "courier"
+	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
+
+	cd "${D}/etc/courier"
+	if use webmail ; then
+		insinto /etc/courier
+		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
+	fi
+
+	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
+	if use ldap ; then
+		[ -e ldapaliasrc ] &&  ( chown root:mail ldapaliasrc ; chmod 640 ldapaliasrc )
+	else
+		rm -f ldapaliasrc
+	fi
+
+	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
+		> "${D}/etc/courier/sizelimit"
+	etc_courier maildroprc ""
+	etc_courier esmtproutes ""
+	etc_courier backuprelay ""
+	etc_courier locallowercase ""
+	etc_courier bofh "opt BOFHBADMIME=accept"
+	etc_courier bofh "opt BOFHSPFTRUSTME=1"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
+	etc_courier bofh "opt BOFHSPFFROM=all"
+	etc_courier bofh "opt BOFHSPFMAILFROM=all"
+	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
+	etc_courier esmtpd "BOFHBADMIME=accept"
+	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
+	etc_courier esmtpd-msa "BOFHBADMIME=accept"
+
+	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
+	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
+
+	# Fix for a sandbox violation on subsequential merges
+	# - ticho@gentoo.org, 2005-07-10
+	dosym ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+	cd "${S}"
+	cp imap/README README.imap
+	use nls && cp unicode/README README.unicode
+	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
+	dodoc libs/tcpd/README.couriertls
+	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
+
+	if use webmail ; then
+		insinto /usr/$(get_libdir)/courier/courier
+		insopts -m 755 -o mail -g mail
+		doins "${S}/courier/webmaild"
+	fi
+
+	if use web ; then
+		insinto /etc/courier/webadmin
+		insopts -m 400 -o mail -g mail
+		doins "${FILESDIR}/password.dist"
+	fi
+
+	# avoid name collisions in /usr/sbin, make webadmin match
+	cd "${D}/usr/sbin"
+	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
+	if use web ; then
+		sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
+			-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
+			|| ewarn "failed to fix webadmin"
+		sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
+			-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
+			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
+			|| ewarn "failed to fix webadmin"
+	fi
+
+	# users should be able to send mail. Could be restricted with suictl.
+	chmod u+s "${D}/usr/bin/sendmail"
+
+	dosym ../bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		# Disable valgrind checks
+		echo '#!/bin/sh' > libs/imap/testsuitevalgrind
+		echo '#!/bin/sh' > libs/maildir/testsuitevalgrind
+		sed -i -e 's:VALGRIND=:#VALGRIND=:g' libs/maildrop/Makefile*
+		emake -j1 check
+	else
+		einfo "make check skipped, can't run as root."
+		einfo "You can enable it with FEATURES=\"userpriv\""
+	fi
+}
+
+pkg_postinst() {
+	use fam && elog "fam daemon is needed for courier-imapd" \
+		|| ewarn "courier was built without fam support"
+}
+
+pkg_config() {
+	mailhost="$(hostname)"
+	export mailhost
+
+	domainname="$(domainname)"
+	if [ "x$domainname" = "x(none)" ] ; then
+		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
+	fi
+	export domainname
+
+	if [[ -z "${ROOT}" ]] ; then
+		file="${ROOT}/etc/courier/locals"
+		if [ ! -f "${file}" ] ; then
+			echo "localhost" > "${file}";
+			echo "${domainname}" >> "${file}";
+		fi
+		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
+		if [ ! -f "${file}" ] ; then
+			echo "${domainname}" > "${file}"
+			/usr/sbin/makeacceptmailfor
+		fi
+
+		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
+		if [ ! -f "${file}" ]
+		then
+			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
+			do
+				i=1
+				net=""
+				TIFS="${IFS}"
+				IFS="."
+				for o in "${netmask}"
+				do
+					if [ "${o}" == "255" ]
+					then
+						[ "_${net}" == "_" ] || net="${net}."
+						t="$(echo "${network}" | cut -d " " -f ${i})"
+						net="${net}${t}"
+					fi
+					i="$((${i} + 1))"
+				done
+				IFS="${TIFS}"
+				echo "doing configuration - relay control for the network ${net} !"
+				echo "${net}	allow,RELAYCLIENT" >> ${file}
+			done
+			/usr/sbin/makesmtpaccess
+		fi
+	fi
+
+	echo "creating cert for esmtpd-ssl:"
+	/usr/sbin/mkesmtpdcert
+	echo "creating cert for imapd-ssl:"
+	/usr/sbin/mkpop3dcert
+	echo "creating cert for pop3d-ssl:"
+	/usr/sbin/mkimapdcert
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 08942e5e4e66..c9bb326d8988 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b900943ddcd1..317967afbf60 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Feb 2023 13:39:40 +0000
+Tue, 21 Feb 2023 19:39:40 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 83ccdfcd90a4..ad60e2eac34e 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-02-21T13:39:43Z
+TIMESTAMP 2023-02-21T19:39:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP0yZ9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP1Hf9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBRUQ/+IAO5N97fmN+CZ4L0UHDAula2DvKsB/N8lUFPndyWRtXr+izoK5dHS4SF
-WWsUb54QTSJjwdcibVGEdniy57+9++psL1lvRR3rYszFQYNkfRwGwQlMz6h5mX66
-FgYCzJBxyPHU9sTo7tAaJhppfQL1c8+uUpTfjajHZUOp1MooysdIoEncbXNNcZdt
-maLgvoWO/7iaCi9y3pHWVCs25F/nKC8Gjbb6IxTJ2Ov3K1TW+MixP8OJLmY0YBeM
-2QnzuDEp/7+IPkZmaPIeCSec1qGJ7ecqVWOy4NFOjvCDPI4FlLAFj0zsJ+55KytW
-YHJQerbgahAhqnGZkKv9eGNdtuD3dRvDW/qKMc8FA4Zmx9ZlB5R6cNc3WBBUwdAj
-aYZkIZrqHUonOOEpk+Jr080WDpQQjr4Y9RQ6Ka2t01LU1ffH2pJ6wVqSghn+bRa2
-KTImx4CJNwh7PHKvdpeCjIbLru7aLiTK7Myqo891OBRNPwh/t8CpV/iDUiPXFWnL
-MuW60BdNcFxgocVb34NnDJwodvSq6EVDv0P1BmGniw9lSPSgGG32ZdimOR7fk0Oy
-eEtPmEuL0mt6q/C9GE7JcuuE5RDTqhzHpx9bV2ywHAxByg9k+dcPgAlVhUBwSpBx
-UEfLrATMZInOji7XPOM2wUbqLjgYLE+CLXlVhU2Q3zJMJxy52Hw=
-=rZod
+klDPXw//UV0yH6wFCABwwx+USVdMV7qwDgzUVLnfuvUTNWnu41WKQApaIF/wZDjL
+DMnYAX9QHNSIy6Wy8+JljY5ZJKGI2zzUODQIZ/n5mToSMRf55szCrkzy8ORPISyv
+FNvz3gJtthwOdsekwNhifnkq+Zh4O9METTrBOSvvXd5B4IeR4lfelT0YM1zjtEAG
+GqFpjoNu3Veldnakc0+MJmEiDfHfuG40zrs1BzApzMKyGfHI1B5HopRZ3tP2kqjB
+5yb/Pb+KGNo33+K/Es2ZDSRiyURxbHySmsnTlSYM49Qqbr1HEaKCj8iKPiblCrdb
+VpMrYo1loSNPR0qkiE4Wpl0FwQ2hg+Z9ye5UiXVhMTXihs9MBlkFEdtRNOS8xg+B
+sl1TiyhoBuzo2UrKhVKXZ4y8TvpaUYzKRQf7mlbXfWJJKlVOwnQoIqXa2nYOfeZL
+e4P96cIO/3H0LdxqI/kIcYz3QT0FZPGMNrTPi+YNz7VDzpW2dAzh+NrgPr5bu3Q0
+Gawa9iou8a9iZS/dwDbJ9sY6hYmu583qLl602tOABKRxTVS0/eEIE6/fKGCuSRMD
+lZE1Ji25gr1mBV8tKzrHZVh+/H3ejvTWeHyZ5Xxqxuh/UokchgBLI32ejQhl1Mtd
+Y+fLJEH6RVtuImih1Am3s2TW5vA1dhSJ74f3QDx31gRCVyaO26g=
+=Wl9r
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7324f5647e01..e612d8905e2a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Feb 2023 13:39:41 +0000
+Tue, 21 Feb 2023 19:39:41 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 73fc43e1268b..2cdfd2c3ad94 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 361866bcc00b..b6ded24d3ed5 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/cni-plugins-1.2.0 b/metadata/md5-cache/app-containers/cni-plugins-1.2.0
new file mode 100644
index 000000000000..e0d8a453c0a4
--- /dev/null
+++ b/metadata/md5-cache/app-containers/cni-plugins-1.2.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install setup unpack
+DESCRIPTION=Standard networking plugins for container networking
+EAPI=8
+HOMEPAGE=https://github.com/containernetworking/plugins
+INHERIT=go-module linux-info systemd
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/iptables
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/containernetworking/plugins/archive/v1.2.0.tar.gz -> cni-plugins-1.2.0.tar.gz
+_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=72c3b8d602788d5654e70a322146bab4
diff --git a/metadata/md5-cache/app-containers/skopeo-1.11.1 b/metadata/md5-cache/app-containers/skopeo-1.11.1
new file mode 100644
index 000000000000..15535505b7a2
--- /dev/null
+++ b/metadata/md5-cache/app-containers/skopeo-1.11.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-go/go-md2man >=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-error:= btrfs? ( >=sys-fs/btrfs-progs-4.0.1 ) >=sys-fs/lvm2-2.02.145:=
+DESCRIPTION=Command line utility foroperations on container images and image repositories
+EAPI=8
+HOMEPAGE=https://github.com/containers/skopeo
+INHERIT=go-module
+IUSE=btrfs
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
+RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-error:= btrfs? ( >=sys-fs/btrfs-progs-4.0.1 ) >=sys-fs/lvm2-2.02.145:=
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/containers/skopeo/archive/v1.11.1.tar.gz -> skopeo-1.11.1.tar.gz
+_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=cec4af792d34fe69303566c026291691
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 0adcc9eca4b9..783b11a6e9fe 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.2-r1 b/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.2-r1
deleted file mode 100644
index f10d2b0a8f29..000000000000
--- a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( <app-crypt/yubikey-manager-5.0.0[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <app-crypt/yubikey-manager-5.0.0[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] ) dev-python/pyotherside[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5[widgets] dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qtwidgets:5
-DESCRIPTION=Cross-platform application for configuring any YubiKey over all USB transports
-EAPI=7
-HOMEPAGE=https://developers.yubico.com/yubikey-manager-qt/ https://github.com/Yubico/yubikey-manager-qt
-INHERIT=qmake-utils python-single-r1 desktop
-IUSE=python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~ppc64
-LICENSE=BSD-2
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( <app-crypt/yubikey-manager-5.0.0[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <app-crypt/yubikey-manager-5.0.0[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] ) dev-python/pyotherside[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5[widgets] dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qtwidgets:5
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-1.2.2.tar.gz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=af4b0215dbc60ebf3067a7b3ab43dc84
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index c2fa8bd55711..67452905a62b 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/pyvim-3.0.2 b/metadata/md5-cache/app-editors/pyvim-3.0.2
index 13fb4052fd9a..8808ea2cb3de 100644
--- a/metadata/md5-cache/app-editors/pyvim-3.0.2
+++ b/metadata/md5-cache/app-editors/pyvim-3.0.2
@@ -7,9 +7,9 @@ INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~riscv x86
 LICENSE=BSD
-RDEPEND=app-eselect/eselect-vi dev-python/docopt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prompt_toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyflakes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+RDEPEND=app-eselect/eselect-vi dev-python/docopt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prompt-toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyflakes[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyvim/pyvim-3.0.2.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5952b1a6311778a28777a08a1c3f83a3
+_md5_=4b66d1f460104584512a1491a5427f18
diff --git a/metadata/md5-cache/app-editors/pyvim-3.0.3 b/metadata/md5-cache/app-editors/pyvim-3.0.3
index 418b8c997ba8..5cbbc468648f 100644
--- a/metadata/md5-cache/app-editors/pyvim-3.0.3
+++ b/metadata/md5-cache/app-editors/pyvim-3.0.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/docopt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prompt_toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyflakes[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/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wcwidth[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=test? ( dev-python/docopt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prompt-toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyflakes[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/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wcwidth[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 postrm prepare test
 DESCRIPTION=An implementation of Vim in Python
 EAPI=8
@@ -8,10 +8,10 @@ INHERIT=distutils-r1 edo
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=BSD
-RDEPEND=dev-python/docopt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prompt_toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyflakes[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/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wcwidth[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 )
+RDEPEND=dev-python/docopt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prompt-toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyflakes[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/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wcwidth[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/prompt-toolkit/pyvim/archive/14118ad2e4d0da2e955fd9069b8772408307618b.tar.gz -> pyvim-3.0.3.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9efcc432c891aa8bd177d72ec2e373e9
+_md5_=a957fec3af4baf5772bff746b9a49f47
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 370cc1a29b91..09f0dde4e8f0 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.40 b/metadata/md5-cache/app-emulation/virtualbox-6.1.40
deleted file mode 100644
index 54c716307834..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.40
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) java? ( virtual/jdk:1.8 ) qt5? ( dev-qt/linguist-tools:5 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.40 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( sdl? ( media-libs/libsdl:0[X,video] ) x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] virtual/glu ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= virtual/libcrypt:= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama x11-libs/libXrandr opengl? ( virtual/opengl ) ) java? ( virtual/jdk:1.8 ) pam? ( sys-libs/pam ) pax-kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-IUSE=alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc java python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64
-LICENSE=GPL-2 dtrace? ( CDDL )
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-6.1.40 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( sdl? ( media-libs/libsdl:0[X,video] ) x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( media-libs/libglvnd[X] virtual/glu ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) dev-libs/openssl:0= virtual/libcrypt:= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.40/VirtualBox-6.1.40.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5c952e09ee75cff77292dc6cc8d0a5f3
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.4-r1 b/metadata/md5-cache/app-emulation/virtualbox-7.0.4-r1
deleted file mode 100644
index 86e3b15dc0df..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-7.0.4-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-arch/tar >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-qt/linguist-tools:5 dev-util/glslang >=dev-util/kbuild-0.1.9998.3127 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 app-text/docbook-xsl-ns-stylesheets dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-qt/qthelp:5 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.4 dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-libs/libxslt-1.1.19 virtual/libcrypt:= alsa? ( >=media-libs/alsa-lib-1.0.13 ) gui? ( x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr opengl? ( virtual/opengl ) ) java? ( virtual/jdk:1.8 ) opengl? ( x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr virtual/glu ) sdl? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) udev? ( >=virtual/udev-171 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-IUSE=alsa dbus debug doc dtrace +gui java lvm pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc java python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64
-LICENSE=GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.4 dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) gui? ( x11-libs/libxcb:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0/7.0
-SRC_URI=https://download.virtualbox.org/virtualbox/7.0.4/VirtualBox-7.0.4.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=48fa18f3501a7512a752ff435bfcfb8d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-7.0.6-r1 b/metadata/md5-cache/app-emulation/virtualbox-7.0.6-r1
deleted file mode 100644
index 7bc51422ca29..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-7.0.6-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-arch/tar >=dev-lang/yasm-0.6.2 dev-libs/libIDL dev-util/glslang >=dev-util/kbuild-0.1.9998.3127 sys-apps/which sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig doc? ( app-text/docbook-sgml-dtd:4.4 app-text/docbook-xsl-ns-stylesheets dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra dev-qt/qthelp:5 ) gui? ( dev-qt/linguist-tools:5 ) nls? ( dev-qt/linguist-tools:5 ) java? ( virtual/jdk:1.8 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.6 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-libs/libxslt-1.1.19 virtual/libcrypt:= alsa? ( >=media-libs/alsa-lib-1.0.13 ) gui? ( x11-base/xorg-proto x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr ) java? ( virtual/jdk:1.8 ) opengl? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr virtual/glu ) sdl? ( x11-libs/libXinerama ) pulseaudio? ( media-sound/pulseaudio ) udev? ( >=virtual/udev-171 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-IUSE=alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc java python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64
-LICENSE=GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) acct-group/vboxusers ~app-emulation/virtualbox-modules-7.0.6 dev-libs/libtpms dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= net-misc/curl sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 x11-libs/libX11 x11-libs/libXt opengl? ( dev-qt/qtopengl:5 ) ) lvm? ( sys-fs/lvm2 ) opengl? ( media-libs/libglvnd[X] media-libs/vulkan-loader x11-libs/libX11 x11-libs/libXt ) pam? ( sys-libs/pam ) sdl? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXt ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) vde? ( net-misc/vde ) vnc? ( >=net-libs/libvncserver-0.9.9 ) gui? ( x11-libs/libxcb:= ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0/7.0
-SRC_URI=https://download.virtualbox.org/virtualbox/7.0.6/VirtualBox-7.0.6.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4771ff29f7c3a69737a11b93ffe73529
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.40 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.40
deleted file mode 100644
index 65ec22311a71..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-6.1.40
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
-LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.40/VBoxGuestAdditions_6.1.40.iso
-_md5_=50d096f75f9ccc5ebfb18a593dc38602
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.4 b/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.4
deleted file mode 100644
index a897b7fa2f0d..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-additions-7.0.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CD image containing guest additions for VirtualBox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
-LICENSE=GPL-3 CDDL
-SLOT=0/7.0
-SRC_URI=https://download.virtualbox.org/virtualbox/7.0.4/VBoxGuestAdditions_7.0.4.iso
-_md5_=df40249930a92f87e1f6b8cd5f25dea1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.40 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.40
deleted file mode 100644
index c864b0a0a3cd..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.40
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
-LICENSE=PUEL-11
-RDEPEND==app-emulation/virtualbox-6.1.40*
-RESTRICT=bindist mirror strip
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.40/Oracle_VM_VirtualBox_Extension_Pack-6.1.40.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.1.40.tar.gz
-_md5_=843dc7e5376539882f63d40b7c2bd45e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.4 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.4
deleted file mode 100644
index 61c64e7e0637..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-7.0.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PUEL extensions for VirtualBox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-KEYWORDS=amd64
-LICENSE=PUEL-11
-RDEPEND==app-emulation/virtualbox-7.0.4*
-RESTRICT=bindist mirror strip
-SLOT=0/7.0
-SRC_URI=https://download.virtualbox.org/virtualbox/7.0.4/Oracle_VM_VirtualBox_Extension_Pack-7.0.4.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-7.0.4.tar.gz
-_md5_=e2d690a08b20db0b0f7e0960980e0876
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.40 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.40
deleted file mode 100644
index e2fe58df0b70..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.40
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-INHERIT=edo linux-mod systemd toolchain-funcs udev
-IUSE=X dist-kernel
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/6.1
-SRC_URI=https://download.virtualbox.org/virtualbox/6.1.40/VirtualBox-6.1.40.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=de209b4ba7fa8fc6309c16143476e569
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.4 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.4
deleted file mode 100644
index 5351ceb687d0..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-7.0.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/yasm-0.6.2 >=dev-util/kbuild-0.1.9998.3127 sys-devel/bin86 sys-power/iasl virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-base/xorg-proto kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-INHERIT=edo linux-mod systemd toolchain-funcs udev
-IUSE=+dbus gui dist-kernel
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ GPL-3 LGPL-2.1 MIT
-PDEPEND=gui? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest sys-libs/pam sys-libs/zlib dbus? ( sys-apps/dbus ) gui? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/7.0
-SRC_URI=https://download.virtualbox.org/virtualbox/7.0.4/VirtualBox-7.0.4.tar.bz2 https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-6.1.36.tar.bz2
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=18acd275fd2d7ce606a9678a4404971d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.40 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.40
deleted file mode 100644
index 8a9116e134d0..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.40
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-INHERIT=linux-mod toolchain-funcs
-IUSE=pax-kernel dist-kernel
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/6.1
-SRC_URI=https://github.com/ceamac/virtualbox-modules-dist/releases/download/v6.1.40/vbox-kernel-module-src-6.1.40.tar.xz
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b7dccbab0ef6e1c5a93941cf3e5b6d76
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.4 b/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.4
deleted file mode 100644
index 0a9b7ee6a8df..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-7.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Kernel Modules for Virtualbox
-EAPI=8
-HOMEPAGE=https://www.virtualbox.org/
-INHERIT=linux-mod toolchain-funcs
-IUSE=dist-kernel
-KEYWORDS=amd64
-LICENSE=GPL-3
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0/7.0
-SRC_URI=https://dev.gentoo.org/~ceamac/app-emulation/virtualbox-modules/vbox-kernel-module-src-7.0.4.tar.xz
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=78718027a6b30aebcd9bb9a2fb073271
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index d279e97eb733..f6d44f2aad9e 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/cssmin-0.2.0-r1 b/metadata/md5-cache/app-text/cssmin-0.2.0-r1
new file mode 100644
index 000000000000..fc6b56dad4f2
--- /dev/null
+++ b/metadata/md5-cache/app-text/cssmin-0.2.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=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/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python port of the YUI CSS compression algorithm
+EAPI=8
+HOMEPAGE=https://pypi.org/project/cssmin/ https://github.com/zacharyvoase/cssmin
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT BSD
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cssmin/cssmin-0.2.0.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d5c7e92e30244b410c7f46958c3a9c68
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 38e6e4393b6a..74c7f0ff0361 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/mycli-1.24.1 b/metadata/md5-cache/dev-db/mycli-1.24.1
index 014e77ef9f17..801d215586e8 100644
--- a/metadata/md5-cache/dev-db/mycli-1.24.1
+++ b/metadata/md5-cache/dev-db/mycli-1.24.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] dev-python/paramiko[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt_toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt_toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] )
+BDEPEND=test? ( python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] dev-python/paramiko[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] )
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
 EAPI=7
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=ssh test python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD MIT
-RDEPEND=python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt_toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt_toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/mycli/archive/v1.24.1.tar.gz -> mycli-1.24.1.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c0ae926f315575302c80ca0ce5166ca1
+_md5_=b53248636fc800e832bcbbd514ea413f
diff --git a/metadata/md5-cache/dev-db/mycli-1.25.0 b/metadata/md5-cache/dev-db/mycli-1.25.0
index 564c593a7ea8..5ea083b7dc35 100644
--- a/metadata/md5-cache/dev-db/mycli-1.25.0
+++ b/metadata/md5-cache/dev-db/mycli-1.25.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] dev-python/paramiko[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt_toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt_toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] )
+BDEPEND=test? ( python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] dev-python/paramiko[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] )
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=ssh test python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD MIT
-RDEPEND=python_single_target_python3_9? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt_toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt_toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.2.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/mycli/archive/v1.25.0.tar.gz -> mycli-1.25.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=98db1ca12cfb614b08dfa9c65c49c9c8
+_md5_=8b50f052af4445e687b7f19629adb9f1
diff --git a/metadata/md5-cache/dev-db/mycli-9999 b/metadata/md5-cache/dev-db/mycli-9999
index f1a8135eddca..ffdf7e534a7a 100644
--- a/metadata/md5-cache/dev-db/mycli-9999
+++ b/metadata/md5-cache/dev-db/mycli-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] dev-python/paramiko[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt_toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt_toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( python_single_target_python3_9? ( dev-python/mock[python_targets_python3_9(-)] dev-python/paramiko[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mock[python_targets_python3_10(-)] dev-python/paramiko[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
 EAPI=7
@@ -7,9 +7,9 @@ INHERIT=distutils-r1 git-r3
 IUSE=ssh test python_single_target_python3_9 python_single_target_python3_10
 LICENSE=BSD MIT
 PROPERTIES=live
-RDEPEND=python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt_toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt_toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+RDEPEND=python_single_target_python3_9? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_9(-)] >=dev-python/click-7.0[python_targets_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_9(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_9(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_9(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_9(-)] dev-python/pyaes[python_targets_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_9(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_9(-)] dev-python/pyperclip[python_targets_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_9(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_9(-)] ssh? ( dev-python/paramiko[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/cli_helpers-2.0.1[python_targets_python3_10(-)] >=dev-python/click-7.0[python_targets_python3_10(-)] >=dev-python/configobj-5.0.6[python_targets_python3_10(-)] >=dev-python/cryptography-1.0.0[python_targets_python3_10(-)] >=dev-python/prompt-toolkit-3.0.0[python_targets_python3_10(-)] <dev-python/prompt-toolkit-4.0.0[python_targets_python3_10(-)] dev-python/pyaes[python_targets_python3_10(-)] >=dev-python/pygments-2.0[python_targets_python3_10(-)] >=dev-python/pymysql-0.9.2[python_targets_python3_10(-)] dev-python/pyperclip[python_targets_python3_10(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_10(-)] <dev-python/sqlparse-0.5.0[python_targets_python3_10(-)] ssh? ( dev-python/paramiko[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9aa4795a05daeb52064a8585bda2e7d3
+_md5_=5efaf0707f453845c948e85586979990
diff --git a/metadata/md5-cache/dev-db/pgcli-3.3.1-r1 b/metadata/md5-cache/dev-db/pgcli-3.3.1-r1
index 26e22072536b..75654b0c4c19 100644
--- a/metadata/md5-cache/dev-db/pgcli-3.3.1-r1
+++ b/metadata/md5-cache/dev-db/pgcli-3.3.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-db/postgresql dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pendulum[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pgspecial[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prompt_toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psycopg:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setproctitle[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sqlparse[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-db/postgresql dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pendulum[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pgspecial[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prompt-toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psycopg:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setproctitle[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sqlparse[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=CLI for Postgres with auto-completion and syntax highlighting
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~x86
 LICENSE=BSD MIT
-RDEPEND=dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pendulum[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pgspecial[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prompt_toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psycopg:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setproctitle[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sqlparse[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+RDEPEND=dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cli_helpers-2.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/configobj[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pendulum[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pgspecial[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prompt-toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psycopg:2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setproctitle[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sqlparse[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/pgcli/archive/v3.3.1.tar.gz -> pgcli-3.3.1.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=077d027ceec0e8582e4b4453b3d70a2f
+_md5_=6ea26611abb8ae7c22e66c2829c05d1c
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index 97835bdc6803..5798d84427c6 100644
--- a/metadata/md5-cache/dev-go/Manifest.gz
+++ b/metadata/md5-cache/dev-go/Manifest.gz
diff --git a/metadata/md5-cache/dev-go/go-md2man-2.0.2 b/metadata/md5-cache/dev-go/go-md2man-2.0.2
new file mode 100644
index 000000000000..42ac8567eb4b
--- /dev/null
+++ b/metadata/md5-cache/dev-go/go-md2man-2.0.2
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=A utility to convert markdown to man pages
+EAPI=8
+HOMEPAGE=https://github.com/cpuguy83/go-md2man
+INHERIT=go-module
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=BSD-2 MIT
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/cpuguy83/go-md2man/archive/v2.0.2.tar.gz -> go-md2man-2.0.2.tar.gz
+_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=3a8c7824b5c36da1639be6464921b6e5
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 8fb1e08f65db..de72823005ec 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/orc-0.4.33 b/metadata/md5-cache/dev-lang/orc-0.4.33
index c8ec69217617..69f517496256 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.33
+++ b/metadata/md5-cache/dev-lang/orc-0.4.33
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=meson-multilib
 IUSE=gtk-doc static-libs 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 ~loong ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gstreamer.freedesktop.org/src/orc/orc-0.4.33.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ea696ccf71d5606b5ef86a294acc9181
+_md5_=883bb564820f32d387aefc44e6b7d244
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 525121c51845..e01cd54b2853 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/libpfm-4.12.0 b/metadata/md5-cache/dev-libs/libpfm-4.12.0
new file mode 100644
index 000000000000..21088bb4eea0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpfm-4.12.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Hardware-based performance monitoring interface for Linux
+EAPI=7
+HOMEPAGE=http://perfmon2.sourceforge.net
+INHERIT=toolchain-funcs
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2 MIT
+SLOT=0/4
+SRC_URI=mirror://sourceforge/perfmon2/libpfm4/libpfm-4.12.0.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ed359e238e0ec4ab2c01aeca1b7aa8f9
diff --git a/metadata/md5-cache/dev-libs/nspr-4.35-r1 b/metadata/md5-cache/dev-libs/nspr-4.35-r1
index d4e3ef5019d5..44194ba7c7dd 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.35-r1
+++ b/metadata/md5-cache/dev-libs/nspr-4.35-r1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://www.mozilla.org/projects/nspr/
 INHERIT=autotools flag-o-matic toolchain-funcs multilib-minimal
 IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.35/src/nspr-4.35.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3c0c4c002cf156a31ab57e5da805a9dd
+_md5_=fa723cdd39dcb2276f1ffe1a623df776
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 2151aba955d6..1783826a22c9 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/luarocks-3.9.1 b/metadata/md5-cache/dev-lua/luarocks-3.9.1
deleted file mode 100644
index 25f3830c1551..000000000000
--- a/metadata/md5-cache/dev-lua/luarocks-3.9.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/busted[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/busted[lua_targets_lua5-4(-)] ) lua_single_target_luajit? ( dev-lua/busted-htest[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted-htest[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/busted-htest[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/busted-htest[lua_targets_lua5-4(-)] ) lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) )
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=net-misc/curl dev-libs/openssl:0 lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
-DESCRIPTION=A package manager for the Lua programming language
-EAPI=8
-HOMEPAGE=https://luarocks.org
-INHERIT=lua-single
-IUSE=test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=MIT
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
-REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://luarocks.org/releases/luarocks-3.9.1.tar.gz
-_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=acd498bea69deabb16dd3110c588d182
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 2eebda187d3d..e2ded6a50757 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/Nuitka-1.4.8 b/metadata/md5-cache/dev-python/Nuitka-1.4.8
new file mode 100644
index 000000000000..02963b274135
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Nuitka-1.4.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/scons[python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net/ https://github.com/Nuitka/Nuitka/ https://pypi.org/project/Nuitka/
+INHERIT=distutils-r1 flag-o-matic optfeature pypi
+IUSE=test python_targets_python3_10
+KEYWORDS=~amd64 ~loong ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/N/Nuitka/Nuitka-1.4.8.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=77e052cf6361b0339b54d958125868be
diff --git a/metadata/md5-cache/dev-python/aiohttp-socks-0.8.0 b/metadata/md5-cache/dev-python/aiohttp-socks-0.8.0
new file mode 100644
index 000000000000..533f8a0f18c3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aiohttp-socks-0.8.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/yarl[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/aiohttp-2.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-socks-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/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=SOCKS proxy connector for aiohttp
+EAPI=8
+HOMEPAGE=https://pypi.org/project/aiohttp-socks/ https://github.com/romis2012/aiohttp-socks/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/aiohttp-2.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-socks-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/romis2012/aiohttp-socks/archive/v0.8.0.tar.gz -> aiohttp-socks-0.8.0.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5a607d557265a6bab643ad340b11bb86
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.24 b/metadata/md5-cache/dev-python/bottle-0.12.24
new file mode 100644
index 000000000000..7a18c81b0872
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bottle-0.12.24
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A fast and simple micro-framework for small web-applications
+EAPI=8
+HOMEPAGE=https://bottlepy.org/ https://github.com/bottlepy/bottle/ https://pypi.org/project/bottle/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/b/bottle/bottle-0.12.24.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b759f2a62bea9e611816496a4a19095b
diff --git a/metadata/md5-cache/dev-python/cbor-1.0.0-r2 b/metadata/md5-cache/dev-python/cbor-1.0.0-r2
new file mode 100644
index 000000000000..3ce1ea136de9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cbor-1.0.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=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=RFC 7049 - Concise Binary Object Representation
+EAPI=8
+HOMEPAGE=https://github.com/brianolson/cbor_py/ https://pypi.org/project/cbor/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/brianolson/cbor_py/archive/b3af679e7cf3e12d50acb83c3c591fc5db9a658d.tar.gz -> cbor-1.0.0.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=2133d1022ebae490957d7ee25c42b263
diff --git a/metadata/md5-cache/dev-python/cryptography-39.0.0 b/metadata/md5-cache/dev-python/cryptography-39.0.0
deleted file mode 100644
index 5806f5f826c5..000000000000
--- a/metadata/md5-cache/dev-python/cryptography-39.0.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/hypothesis-1.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/iso8601[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-subtests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) 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_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 unpack
-DEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=Library providing cryptographic recipes and primitives
-EAPI=8
-HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
-INHERIT=cargo distutils-r1 multiprocessing
-IUSE=test debug python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=|| ( Apache-2.0 BSD ) PSF-2 Apache-2.0 BSD-2 BSD MIT Unicode-DFS-2016
-RDEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) 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(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cryptography/cryptography-39.0.0.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/asn1/0.13.0/download -> asn1-0.13.0.crate https://crates.io/api/v1/crates/asn1_derive/0.13.0/download -> asn1_derive-0.13.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.crate https://crates.io/api/v1/crates/cc/1.0.78/download -> cc-1.0.78.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cxx/1.0.85/download -> cxx-1.0.85.crate https://crates.io/api/v1/crates/cxx-build/1.0.85/download -> cxx-build-1.0.85.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.85/download -> cxxbridge-flags-1.0.85.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.85/download -> cxxbridge-macro-1.0.85.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.53/download -> iana-time-zone-0.1.53.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.8/download -> link-cplusplus-1.0.8.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/once_cell/1.14.0/download -> once_cell-1.14.0.crate https://crates.io/api/v1/crates/ouroboros/0.15.5/download -> ouroboros-0.15.5.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.5/download -> ouroboros_macro-0.15.5.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.6/download -> parking_lot_core-0.8.6.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pem/1.1.0/download -> pem-1.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.20+deprecated/download -> proc-macro-hack-0.5.20+deprecated.crate https://crates.io/api/v1/crates/proc-macro2/1.0.49/download -> proc-macro2-1.0.49.crate https://crates.io/api/v1/crates/pyo3/0.15.2/download -> pyo3-0.15.2.crate https://crates.io/api/v1/crates/pyo3-build-config/0.15.2/download -> pyo3-build-config-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.15.2/download -> pyo3-macros-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.15.2/download -> pyo3-macros-backend-0.15.2.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.3/download -> scratch-1.0.3.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate test? ( mirror://pypi/c/cryptography_vectors/cryptography_vectors-39.0.0.tar.gz )
-_eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=88d9fec0454c7174b772bcf64ceb0450
diff --git a/metadata/md5-cache/dev-python/cryptography-39.0.1 b/metadata/md5-cache/dev-python/cryptography-39.0.1
index d6c6d96d72db..593b535ef89f 100644
--- a/metadata/md5-cache/dev-python/cryptography-39.0.1
+++ b/metadata/md5-cache/dev-python/cryptography-39.0.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
 INHERIT=cargo distutils-r1 multiprocessing pypi
 IUSE=test debug python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Apache-2.0 BSD ) PSF-2 Apache-2.0 BSD-2 BSD MIT Unicode-DFS-2016
 RDEPEND=>=dev-libs/openssl-1.0.2o-r6:0= python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) 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(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/c/cryptography/cryptography-39.0.1.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/asn1/0.13.0/download -> asn1-0.13.0.crate https://crates.io/api/v1/crates/asn1_derive/0.13.0/download -> asn1_derive-0.13.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.crate https://crates.io/api/v1/crates/cc/1.0.78/download -> cc-1.0.78.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cxx/1.0.85/download -> cxx-1.0.85.crate https://crates.io/api/v1/crates/cxx-build/1.0.85/download -> cxx-build-1.0.85.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.85/download -> cxxbridge-flags-1.0.85.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.85/download -> cxxbridge-macro-1.0.85.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.53/download -> iana-time-zone-0.1.53.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.8/download -> link-cplusplus-1.0.8.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/once_cell/1.14.0/download -> once_cell-1.14.0.crate https://crates.io/api/v1/crates/ouroboros/0.15.5/download -> ouroboros-0.15.5.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.5/download -> ouroboros_macro-0.15.5.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.6/download -> parking_lot_core-0.8.6.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/pem/1.1.0/download -> pem-1.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.20+deprecated/download -> proc-macro-hack-0.5.20+deprecated.crate https://crates.io/api/v1/crates/proc-macro2/1.0.49/download -> proc-macro2-1.0.49.crate https://crates.io/api/v1/crates/pyo3/0.15.2/download -> pyo3-0.15.2.crate https://crates.io/api/v1/crates/pyo3-build-config/0.15.2/download -> pyo3-build-config-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.15.2/download -> pyo3-macros-0.15.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.15.2/download -> pyo3-macros-backend-0.15.2.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scratch/1.0.3/download -> scratch-1.0.3.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unindent/0.1.11/download -> unindent-0.1.11.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate test? ( https://files.pythonhosted.org/packages/source/c/cryptography_vectors/cryptography_vectors-39.0.1.tar.gz )
 _eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f814ac1403d601f9fb6199c63dd05dc1
+_md5_=d984b431e8b56d0d228e4195369dc200
diff --git a/metadata/md5-cache/dev-python/dulwich-0.21.2 b/metadata/md5-cache/dev-python/dulwich-0.21.2
index a2ef9e6bf7bd..814feb6dbed4 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.21.2
+++ b/metadata/md5-cache/dev-python/dulwich-0.21.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/
 INHERIT=distutils-r1
 IUSE=doc examples test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ Apache-2.0
 RDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/urllib3[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.21.2.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=44e40f16fbc0d5b6e3b3d919d7406f77
+_md5_=538db5d607d26db28072b3a6c1be2fc1
diff --git a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0 b/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
index f16a5091f763..18f305c57c73 100644
--- a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
+++ b/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/flask[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/flask[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/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Small extension for Flask to make usage of Gravatar service easy
 EAPI=7
 HOMEPAGE=https://github.com/zzzsochi/Flask-Gravatar/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/flask[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=mirror://pypi/F/Flask-Gravatar/Flask-Gravatar-0.5.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=436d61f2dd7b358b51fe72ca54592295
+_md5_=fbde679c39dc1f0b57a2c3bf5aaf6efc
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-2.2.1-r1 b/metadata/md5-cache/dev-python/flask-htmlmin-2.2.1-r1
new file mode 100644
index 000000000000..99b3bb97ad23
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-2.2.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-text/cssmin[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-text/htmlmin[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[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=Minimize your flask rendered html
+EAPI=8
+HOMEPAGE=https://github.com/hamidfzm/Flask-HTMLmin/ https://pypi.org/project/Flask-HTMLmin/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-text/cssmin[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-text/htmlmin[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[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/hamidfzm/Flask-HTMLmin/archive/v2.2.1.tar.gz -> Flask-HTMLmin-2.2.1.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6e4905c640509e16528f4079fdff6e49
diff --git a/metadata/md5-cache/dev-python/flask-paginate-2022.1.8 b/metadata/md5-cache/dev-python/flask-paginate-2022.1.8
index 0b9d5fe53f4a..606ebc162540 100644
--- a/metadata/md5-cache/dev-python/flask-paginate-2022.1.8
+++ b/metadata/md5-cache/dev-python/flask-paginate-2022.1.8
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/setuptools-65.7.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/flask[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/setuptools-65.7.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pagination support for flask
 EAPI=8
 HOMEPAGE=https://flask-paginate.readthedocs.io
 INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/flask[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://github.com/lixxu/flask-paginate/archive/v2022.1.8.tar.gz -> flask-paginate-2022.1.8.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a1a16d1aed2d73c74e5f4f7c6ebba530
+_md5_=cae98a0bcc68c7aae9bc84011a179b19
diff --git a/metadata/md5-cache/dev-python/flask-paginate-2022.1.8-r1 b/metadata/md5-cache/dev-python/flask-paginate-2022.1.8-r1
new file mode 100644
index 000000000000..0c020195176a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-paginate-2022.1.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flask[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=Pagination support for flask
+EAPI=8
+HOMEPAGE=https://flask-paginate.readthedocs.io
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/flask[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://github.com/lixxu/flask-paginate/archive/v2022.1.8.tar.gz -> flask-paginate-2022.1.8.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c74ef3fe67dd0955a8655c2a3c076973
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.79.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.79.0
new file mode 100644
index 000000000000..0eb1184c596b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.79.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/uritemplate-5[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=Google API Client for Python
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-api-python-client/ https://pypi.org/project/google-api-python-client/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/uritemplate-5[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/googleapis/google-api-python-client/archive/v2.79.0.tar.gz -> google-api-python-client-2.79.0.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=7bd7358eb2335dc1983776d2b17ea8c2
diff --git a/metadata/md5-cache/dev-python/ipython-8.10.0 b/metadata/md5-cache/dev-python/ipython-8.10.0
index 6f3e1959c641..29178d1f9021 100644
--- a/metadata/md5-cache/dev-python/ipython-8.10.0
+++ b/metadata/md5-cache/dev-python/ipython-8.10.0
@@ -1,4 +1,4 @@
-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.30[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(-)?] >=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 )
+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.30[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(-)?] >=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
@@ -8,10 +8,10 @@ IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_target
 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.30[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(-)?] 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(+)] )
+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.30[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(-)?] 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=mirror://pypi/i/ipython/ipython-8.10.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=89f0531cb5e4b674954d79196756d7ee
+_md5_=02105e703dc3345e8ff90ed6b2c6dd8d
diff --git a/metadata/md5-cache/dev-python/ipython-8.8.0 b/metadata/md5-cache/dev-python/ipython-8.8.0
index e1622eb30fc1..b8d69ebd298f 100644
--- a/metadata/md5-cache/dev-python/ipython-8.8.0
+++ b/metadata/md5-cache/dev-python/ipython-8.8.0
@@ -1,4 +1,4 @@
-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.20[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-2[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(-)?] >=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 )
+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.20[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-2[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(-)?] >=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
@@ -8,10 +8,10 @@ IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_target
 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-2[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(-)?] 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(+)] )
+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-2[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(-)?] 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=mirror://pypi/i/ipython/ipython-8.8.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=8a1421addffc475042f029de21936640
+_md5_=3a15bd953423d8a13659ad48992adcb2
diff --git a/metadata/md5-cache/dev-python/ipython-8.9.0 b/metadata/md5-cache/dev-python/ipython-8.9.0
index 30500a20adcd..a7c7d1a0d887 100644
--- a/metadata/md5-cache/dev-python/ipython-8.9.0
+++ b/metadata/md5-cache/dev-python/ipython-8.9.0
@@ -1,4 +1,4 @@
-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.20[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.30[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(-)?] >=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 )
+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.20[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.30[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(-)?] >=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
@@ -8,10 +8,10 @@ IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_target
 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.30[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(-)?] 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(+)] )
+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.30[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(-)?] 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=mirror://pypi/i/ipython/ipython-8.9.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=81430c91245f840c5dc8d25dd7a4c8fd
+_md5_=0c222f307a400aad9a4d70ee3cde9807
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.4.4 b/metadata/md5-cache/dev-python/jupyter_console-6.4.4
index 5c347cf7319f..cdd89215d359 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-6.4.4
+++ b/metadata/md5-cache/dev-python/jupyter_console-6.4.4
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt_toolkit-3.1.0[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/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=test? ( dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1.0[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/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=A terminal-based console frontend for Jupyter kernels
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt_toolkit-3.1.0[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(-)?] 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 )
+RDEPEND=dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/prompt-toolkit-3.1.0[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(-)?] 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=mirror://pypi/j/jupyter_console/jupyter_console-6.4.4.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ff653892de22744a78d62976b22a1e96
+_md5_=3ed63fa3de2f2ee08506d157d1e037a7
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.5.0 b/metadata/md5-cache/dev-python/jupyter_console-6.5.0
index 9a47cf3236cd..416a56145a0b 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-6.5.0
+++ b/metadata/md5-cache/dev-python/jupyter_console-6.5.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/ipython[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_client-7.0.0[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/prompt_toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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=test? ( dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/ipython[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_client-7.0.0[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/prompt-toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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=A terminal-based console frontend for Jupyter kernels
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/ipython[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_client-7.0.0[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/prompt_toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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 )
+RDEPEND=dev-python/ipython[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_client-7.0.0[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/prompt-toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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/j/jupyter_console/jupyter_console-6.5.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=958ae5e0c1282df10beea378848629ea
+_md5_=399768b7a291ea8c416a015290478187
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.5.1 b/metadata/md5-cache/dev-python/jupyter_console-6.5.1
index 3027a0a26656..fdefc0f0482b 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-6.5.1
+++ b/metadata/md5-cache/dev-python/jupyter_console-6.5.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/ipython[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_client-7.0.0[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/prompt_toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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=test? ( dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-python/ipython[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_client-7.0.0[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/prompt-toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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=A terminal-based console frontend for Jupyter kernels
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/ipython[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_client-7.0.0[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/prompt_toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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 )
+RDEPEND=dev-python/ipython[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_client-7.0.0[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/prompt-toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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/j/jupyter_console/jupyter_console-6.5.1.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=958ae5e0c1282df10beea378848629ea
+_md5_=399768b7a291ea8c416a015290478187
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.6.0 b/metadata/md5-cache/dev-python/jupyter_console-6.6.0
index 7672b94e6db1..2814270aa11b 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-6.6.0
+++ b/metadata/md5-cache/dev-python/jupyter_console-6.6.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux ) test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[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/prompt_toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux ) test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[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/prompt-toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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 terminal-based console frontend for Jupyter kernels
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[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/prompt_toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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 )
+RDEPEND=>=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[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/prompt-toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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/j/jupyter_console/jupyter_console-6.6.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=af2088d8c22ab10fa4647fc0f2f3e4c4
+_md5_=243cb68f3ae4ebfe606950eef345b42e
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.6.1 b/metadata/md5-cache/dev-python/jupyter_console-6.6.1
new file mode 100644
index 000000000000..89c1e4d3244f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_console-6.6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pexpect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/util-linux ) test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[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/prompt-toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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 terminal-based console frontend for Jupyter kernels
+EAPI=8
+HOMEPAGE=https://jupyter.org
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-7.0.0[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/prompt-toolkit-3.0.30[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/pyzmq-17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4[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/j/jupyter_console/jupyter_console-6.6.1.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=243cb68f3ae4ebfe606950eef345b42e
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.8.0 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.8.0
deleted file mode 100644
index b1863a192487..000000000000
--- a/metadata/md5-cache/dev-python/lazy-object-proxy-1.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=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=A fast and thorough lazy object proxy
-EAPI=8
-HOMEPAGE=https://github.com/ionelmc/python-lazy-object-proxy/ https://pypi.org/project/lazy-object-proxy/ https://python-lazy-object-proxy.readthedocs.io/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/l/lazy-object-proxy/lazy-object-proxy-1.8.0.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1609ec2ef41f823871867e9fb882c98b
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.9.0 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.9.0
index 12ffebd797f0..789c0fbd77d6 100644
--- a/metadata/md5-cache/dev-python/lazy-object-proxy-1.9.0
+++ b/metadata/md5-cache/dev-python/lazy-object-proxy-1.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ionelmc/python-lazy-object-proxy/ https://pypi.org/project/lazy-object-proxy/ https://python-lazy-object-proxy.readthedocs.io/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazy-object-proxy/lazy-object-proxy-1.9.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=cb25fd5820923f45dd72de5f6f7a6b04
+_md5_=b98b8ffecc3a440a6adcaf5dbf05f5e8
diff --git a/metadata/md5-cache/dev-python/markupsafe-2.1.2 b/metadata/md5-cache/dev-python/markupsafe-2.1.2
index 6fb045c88502..5761606c0b0d 100644
--- a/metadata/md5-cache/dev-python/markupsafe-2.1.2
+++ b/metadata/md5-cache/dev-python/markupsafe-2.1.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://palletsprojects.com/p/markupsafe/ https://github.com/pallets/markupsafe/ https://pypi.org/project/MarkupSafe/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-2.1.2.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2d2cfc3d97c516ce996909e671c1f65a
+_md5_=0aa84b773e790fe9cd1c60805e86560d
diff --git a/metadata/md5-cache/dev-python/neovim-remote-2.5.1 b/metadata/md5-cache/dev-python/neovim-remote-2.5.1
index f4f00405cc50..3eaae362771f 100644
--- a/metadata/md5-cache/dev-python/neovim-remote-2.5.1
+++ b/metadata/md5-cache/dev-python/neovim-remote-2.5.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( app-editors/neovim ) test? ( dev-python/pynvim[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( app-editors/neovim ) test? ( dev-python/pynvim[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[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=A tool that helps control neovim processes
 EAPI=8
 HOMEPAGE=https://github.com/mhinz/neovim-remote/ https://pypi.org/project/neovim-remote/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-RDEPEND=dev-python/pynvim[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/pynvim[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[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/mhinz/neovim-remote/archive/v2.5.1.tar.gz -> neovim-remote-2.5.1.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=25b758736b317fdbfaba05968a133c89
+_md5_=e9db4e7ca690b6c5650455c98cc2dba1
diff --git a/metadata/md5-cache/dev-python/neovim-remote-9999 b/metadata/md5-cache/dev-python/neovim-remote-9999
index 09e43be975c5..e44dc48a44c5 100644
--- a/metadata/md5-cache/dev-python/neovim-remote-9999
+++ b/metadata/md5-cache/dev-python/neovim-remote-9999
@@ -1,15 +1,15 @@
-BDEPEND=test? ( app-editors/neovim ) test? ( dev-python/pynvim[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( app-editors/neovim ) test? ( dev-python/pynvim[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[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(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A tool that helps control neovim processes
 EAPI=8
 HOMEPAGE=https://github.com/mhinz/neovim-remote/ https://pypi.org/project/neovim-remote/
 INHERIT=distutils-r1 git-r3
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-python/pynvim[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/pynvim[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[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
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=25b758736b317fdbfaba05968a133c89
+_md5_=0464f61c615d956d9adb8762210b8d8f
diff --git a/metadata/md5-cache/dev-python/patch-ng-1.17.4 b/metadata/md5-cache/dev-python/patch-ng-1.17.4
index bee96bbfc1cf..f25e33d7ad51 100644
--- a/metadata/md5-cache/dev-python/patch-ng-1.17.4
+++ b/metadata/md5-cache/dev-python/patch-ng-1.17.4
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/unittest-or-fail[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/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library to parse and apply unified diffs, fork of dev-python/patch
 EAPI=8
 HOMEPAGE=https://github.com/conan-io/python-patch-ng https://pypi.org/project/patch-ng/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=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/conan-io/python-patch-ng/archive/1.17.4.tar.gz -> patch-ng-1.17.4.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5e67a5b98c37003f240a4a0661ffbc0e
+_md5_=ec63d9d1f7449f473b6992829d2b6009
diff --git a/metadata/md5-cache/dev-python/patch-ng-1.17.4-r1 b/metadata/md5-cache/dev-python/patch-ng-1.17.4-r1
new file mode 100644
index 000000000000..34fe1ad3f6eb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/patch-ng-1.17.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[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=Library to parse and apply unified diffs, fork of dev-python/patch
+EAPI=8
+HOMEPAGE=https://github.com/conan-io/python-patch-ng https://pypi.org/project/patch-ng/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=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/conan-io/python-patch-ng/archive/1.17.4.tar.gz -> patch-ng-1.17.4.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ee7e2a94423a07192a5aa75f225fcfcd
diff --git a/metadata/md5-cache/dev-python/pelican-minify-0.9-r1 b/metadata/md5-cache/dev-python/pelican-minify-0.9-r1
index d6b1f51f3daa..fd7589315574 100644
--- a/metadata/md5-cache/dev-python/pelican-minify-0.9-r1
+++ b/metadata/md5-cache/dev-python/pelican-minify-0.9-r1
@@ -1,15 +1,16 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=dev-python/joblib-0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/htmlmin-0.1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/pelican-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=An HTML minification plugin for Pelican, the static site generator
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pelican-minify/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=Unlicense
 RDEPEND=>=dev-python/joblib-0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/htmlmin-0.1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/pelican-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pelican-minify/pelican-minify-0.9.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5f46cefeab36fb54b447c23dfe8f2241
+_md5_=6575f0581ae4993ae58ec942d584e211
diff --git a/metadata/md5-cache/dev-python/pelican-minify-0.9-r2 b/metadata/md5-cache/dev-python/pelican-minify-0.9-r2
new file mode 100644
index 000000000000..4ee9091332be
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pelican-minify-0.9-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/joblib-0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/htmlmin-0.1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/pelican-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An HTML minification plugin for Pelican, the static site generator
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pelican-minify/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Unlicense
+RDEPEND=>=dev-python/joblib-0.9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/htmlmin-0.1.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=app-text/pelican-3.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pelican-minify/pelican-minify-0.9.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0e82f0efefe263a80df0626f9b1f15b7
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.24 b/metadata/md5-cache/dev-python/pocketlint-0.24
index 421106c1131e..8dc2b4c1f2c7 100644
--- a/metadata/md5-cache/dev-python/pocketlint-0.24
+++ b/metadata/md5-cache/dev-python/pocketlint-0.24
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=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=Shared code for running pylint against rhinstaller projects
 EAPI=8
 HOMEPAGE=https://github.com/rhinstaller/pocketlint/ https://pypi.org/project/pocketlint/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pylint[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pylint[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.24.tar.gz -> pocketlint-0.24.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1674a2eb902f1b6fd31379d6ffab17a5
+_md5_=8f7d15f681999a06f3fcd9c4bfe2575f
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.36 b/metadata/md5-cache/dev-python/prompt-toolkit-3.0.36
index c611cbb08346..95ba1d523dfc 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.36
+++ b/metadata/md5-cache/dev-python/prompt-toolkit-3.0.36
@@ -2,8 +2,8 @@ BDEPEND=test? ( dev-python/wcwidth[python_targets_python3_9(-)?,python_targets_p
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Building powerful interactive command lines in Python
 EAPI=8
-HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit
-INHERIT=distutils-r1
+HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit/
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=dev-python/wcwidth[python_targets_python3_9(-)?,python_targets_python3_1
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-3.0.36.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c32d2ba3e819914ea240aa0cdfefd796
+SRC_URI=https://files.pythonhosted.org/packages/source/p/prompt-toolkit/prompt_toolkit-3.0.36.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=053177de21817949583c81ef119fb64f
diff --git a/metadata/md5-cache/dev-python/psycopg-3.1.8 b/metadata/md5-cache/dev-python/psycopg-3.1.8
index f5a77f2c2cb9..8c8ba3fc2c1a 100644
--- a/metadata/md5-cache/dev-python/psycopg-3.1.8
+++ b/metadata/md5-cache/dev-python/psycopg-3.1.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.psycopg.org/psycopg3/ https://github.com/psycopg/psycopg/ https://pypi.org/project/psycopg/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=LGPL-3+
 RDEPEND=>=dev-db/postgresql-8.1:* >=dev-python/typing-extensions-4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psycopg/psycopg/archive/3.1.8.tar.gz -> psycopg-3.1.8.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=796bda443e290922e97c20bd092972d3
+_md5_=9da4f85157e904f64a88d3a2dca52d11
diff --git a/metadata/md5-cache/dev-python/python-ly-0.9.6 b/metadata/md5-cache/dev-python/python-ly-0.9.6
deleted file mode 100644
index acab48e4f7f2..000000000000
--- a/metadata/md5-cache/dev-python/python-ly-0.9.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tool and library for manipulating LilyPond files
-EAPI=7
-HOMEPAGE=https://github.com/frescobaldi/python-ly https://pypi.org/project/python-ly/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-ly/python-ly-0.9.6.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7374ddebd52bcd795e4674fa73eeb436
diff --git a/metadata/md5-cache/dev-python/python-ly-0.9.7 b/metadata/md5-cache/dev-python/python-ly-0.9.7
index 2d2ea8ad95ea..fa2743b5990c 100644
--- a/metadata/md5-cache/dev-python/python-ly-0.9.7
+++ b/metadata/md5-cache/dev-python/python-ly-0.9.7
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=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=Tool and library for manipulating LilyPond files
 EAPI=8
-HOMEPAGE=https://github.com/frescobaldi/python-ly https://pypi.org/project/python-ly/
+HOMEPAGE=https://github.com/frescobaldi/python-ly/ https://pypi.org/project/python-ly/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/frescobaldi/python-ly/archive/refs/tags/v0.9.7.tar.gz -> python-ly-0.9.7.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5c2390ebcf00f2fc8f82efddfef68ad3
+_md5_=13777d4d1c6437ce20ba1d101f87a1c1
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-6.1.0 b/metadata/md5-cache/dev-python/python-openstackclient-6.1.0
new file mode 100644
index 000000000000..0a53a5d1c2b9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-openstackclient-6.1.0
@@ -0,0 +1,16 @@
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tempest-17.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ddt-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cliff-3.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openstacksdk-0.103.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/osc-lib-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-keystoneclient-3.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-novaclient-18.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A client for the OpenStack APIs
+EAPI=8
+HOMEPAGE=https://opendev.org/openstack/python-openstackclient/ https://github.com/openstack/python-openstackclient/ https://pypi.org/project/python-openstackclient/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cliff-3.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openstacksdk-0.103.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/osc-lib-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-keystoneclient-3.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-novaclient-18.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-openstackclient/python-openstackclient-6.1.0.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	bdfe87ebc6059b10a040a892501e6562	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=9ca42d269536d37202603d1ace9db97d
diff --git a/metadata/md5-cache/dev-python/sphinx-prompt-1.6.0 b/metadata/md5-cache/dev-python/sphinx-prompt-1.6.0
new file mode 100644
index 000000000000..9155b5e1187c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-prompt-1.6.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Sphinx directive to add unselectable prompt
+EAPI=8
+HOMEPAGE=https://github.com/sbrunner/sphinx-prompt/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[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://github.com/sbrunner/sphinx-prompt/archive/1.6.0.tar.gz -> sphinx-prompt-1.6.0.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c71b8cb250a02d914a012c918e271130
diff --git a/metadata/md5-cache/dev-python/watchdog-2.2.0 b/metadata/md5-cache/dev-python/watchdog-2.2.0
deleted file mode 100644
index 96c213959210..000000000000
--- a/metadata/md5-cache/dev-python/watchdog-2.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-timeout-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pyyaml[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 postinst prepare test
-DESCRIPTION=Python API and shell utilities to monitor file system events
-EAPI=8
-HOMEPAGE=https://github.com/gorakhargosh/watchdog/ https://pypi.org/project/watchdog/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pyyaml[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://github.com/gorakhargosh/watchdog/archive/v2.2.0.tar.gz -> watchdog-2.2.0.gh.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2e63227a7120806730e4fef09ce06d24
diff --git a/metadata/md5-cache/dev-python/watchdog-2.2.1 b/metadata/md5-cache/dev-python/watchdog-2.2.1
index 01c76f6115ad..f5cfd33f9038 100644
--- a/metadata/md5-cache/dev-python/watchdog-2.2.1
+++ b/metadata/md5-cache/dev-python/watchdog-2.2.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gorakhargosh/watchdog/ https://pypi.org/project/watchdog/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v2.2.1.tar.gz -> watchdog-2.2.1.gh.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7bf005235543a16ea6c79c1ad4e48b78
+_md5_=2e63227a7120806730e4fef09ce06d24
diff --git a/metadata/md5-cache/dev-python/ypy-websocket-0.8.4 b/metadata/md5-cache/dev-python/ypy-websocket-0.8.4
new file mode 100644
index 000000000000..05f149b5262e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ypy-websocket-0.8.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websockets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/aiofiles-23[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/aiosqlite[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/y-py-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/y-py-0.6.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=Python bindings to y-crdt
+EAPI=8
+HOMEPAGE=https://pypi.org/project/ypy-websocket/ https://github.com/y-crdt/ypy-websocket/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=<dev-python/aiofiles-23[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/aiosqlite[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/y-py-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/y-py-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/y-crdt/ypy-websocket/archive/v0.8.4.tar.gz -> ypy-websocket-0.8.4.gh.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=9b1f4a93e838e671aa642494b0ab395e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 7fbaf32cd7c1..85d82aafff60 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.22 b/metadata/md5-cache/dev-util/pkgcheck-0.10.22
new file mode 100644
index 000000000000..7f17c9806a72
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.22
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/snakeoil-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lazy-object-proxy[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/pathspec[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] emacs? ( >=app-editors/emacs-24.1:* app-emacs/ebuild-mode app-emacs/flycheck ) dev-python/wheel test? ( dev-python/pytest[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-vcs/git ) test? ( >=dev-python/snakeoil-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lazy-object-proxy[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/pathspec[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] emacs? ( >=app-editors/emacs-24.1:* app-emacs/ebuild-mode app-emacs/flycheck ) >=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 postrm prepare test
+DESCRIPTION=pkgcore-based QA utility for ebuild repos
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+INHERIT=elisp-common distutils-r1 optfeature
+IUSE=emacs test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/snakeoil-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-apps/pkgcore-0.12.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lazy-object-proxy[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/pathspec[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] emacs? ( >=app-editors/emacs-24.1:* app-emacs/ebuild-mode app-emacs/flycheck ) 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=mirror://pypi/p/pkgcheck/pkgcheck-0.10.22.tar.gz
+_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=06148029dadd688e3d2bf77970e20a0f
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 6ea0833c0763..a5308b2f1b7c 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.3.1 b/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.3.1
index 43f8ded175e4..6f44973d83f7 100644
--- a/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.3.1
+++ b/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.3.1
@@ -1,6 +1,6 @@
-BDEPEND=test? ( >=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt_toolkit-3.0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] full-name-executable? ( !dev-vcs/git-extras ) dev-vcs/git >=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=test? ( >=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] full-name-executable? ( !dev-vcs/git-extras ) dev-vcs/git >=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
-DEPEND=>=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt_toolkit-3.0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/parameterized[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DEPEND=>=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/parameterized[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 DESCRIPTION=Command-line tool to delete merged Git branches
 EAPI=8
 HOMEPAGE=https://github.com/hartwork/git-delete-merged-branches
@@ -8,10 +8,10 @@ INHERIT=distutils-r1
 IUSE=full-name-executable test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=>=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt_toolkit-3.0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] full-name-executable? ( !dev-vcs/git-extras ) dev-vcs/git 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 )
+RDEPEND=>=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] full-name-executable? ( !dev-vcs/git-extras ) dev-vcs/git python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/git-delete-merged-branches/git-delete-merged-branches-7.3.1.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9585d641686805aaf8b9cc9730b3c433
+_md5_=bf92d98c8facab623b75fc59acb9cfc4
diff --git a/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.4.0 b/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.4.0
index 09b9aa181d9c..5889675c0632 100644
--- a/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.4.0
+++ b/metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.4.0
@@ -1,6 +1,6 @@
-BDEPEND=test? ( >=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt_toolkit-3.0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] full-name-executable? ( !dev-vcs/git-extras ) dev-vcs/git >=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=test? ( >=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] full-name-executable? ( !dev-vcs/git-extras ) dev-vcs/git >=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
-DEPEND=>=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt_toolkit-3.0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/parameterized[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DEPEND=>=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/parameterized[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 DESCRIPTION=Command-line tool to delete merged Git branches
 EAPI=8
 HOMEPAGE=https://github.com/hartwork/git-delete-merged-branches
@@ -8,10 +8,10 @@ INHERIT=distutils-r1
 IUSE=full-name-executable test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=>=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt_toolkit-3.0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] full-name-executable? ( !dev-vcs/git-extras ) dev-vcs/git 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 )
+RDEPEND=>=dev-python/colorama-0.4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prompt-toolkit-3.0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] full-name-executable? ( !dev-vcs/git-extras ) dev-vcs/git python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/git-delete-merged-branches/git-delete-merged-branches-7.4.0.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=9585d641686805aaf8b9cc9730b3c433
+_md5_=bf92d98c8facab623b75fc59acb9cfc4
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 0d5767a6018f..fd3f22a2392e 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/usolitaire-0.2.1-r1 b/metadata/md5-cache/games-misc/usolitaire-0.2.1-r1
index fbeb6a301d57..439f35f5c327 100644
--- a/metadata/md5-cache/games-misc/usolitaire-0.2.1-r1
+++ b/metadata/md5-cache/games-misc/usolitaire-0.2.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/urwid[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/urwid[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=solitaire in your terminal
 EAPI=8
 HOMEPAGE=https://github.com/eliasdorneles/usolitaire
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/urwid[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/urwid[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/eliasdorneles/usolitaire/archive/v0.2.1.tar.gz -> usolitaire-0.2.1.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ee541171f8dd8bb3931205d81ec78aa8
+_md5_=84fc4f53f88cae37afb206e52bca5c4e
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 6262b0358e09..68ce399ec615 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/libkgapi-22.08.3-r1 b/metadata/md5-cache/kde-apps/libkgapi-22.08.3-r1
index 97c6f68ffeba..bfd5b04f81b1 100644
--- a/metadata/md5-cache/kde-apps/libkgapi-22.08.3-r1
+++ b/metadata/md5-cache/kde-apps/libkgapi-22.08.3-r1
@@ -7,11 +7,11 @@ HOMEPAGE=https://api.kde.org/kdepim/libkgapi/html/index.html
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm gear.kde.org
 IUSE=nls test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/cyrus-sasl:2 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-frameworks/kcalendarcore-5.96.0:5 >=kde-frameworks/kcontacts-5.96.0:5 >=kde-frameworks/kwallet-5.96.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.08.3/src/libkgapi-22.08.3.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	gear.kde.org	aebcdbce229877667716707f608f9cc3	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=69bfe2599a1db9d67cb46b7a4b7e4497
+_md5_=cc9d61dcbc78cea53733a5be408af269
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index da5e4f9151e8..1e7ad3e2406a 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/courier-1.2.2 b/metadata/md5-cache/mail-mta/courier-1.2.2
new file mode 100644
index 000000000000..72a682ab60cd
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/courier-1.2.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare test
+DEPEND=>=net-libs/courier-authlib-0.72.0 >=net-libs/courier-unicode-2.2.6:= net-dns/libidn2:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=sys-libs/gdbm-1.8.0:= dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( sys-libs/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11:= ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/sendmail !mail-mta/ssmtp[mta] !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp
+DESCRIPTION=An MTA designed specifically for maildirs
+EAPI=8
+HOMEPAGE=https://www.courier-mta.org/
+INHERIT=flag-o-matic
+IUSE=postgres ldap mysql pam nls ipv6 spell fax crypt norewrite fam web webmail gnutls
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3
+PDEPEND=pam? ( net-mail/mailbase ) crypt? ( >=app-crypt/gnupg-1.0.4 )
+RDEPEND=>=net-libs/courier-authlib-0.72.0 >=net-libs/courier-unicode-2.2.6:= net-dns/libidn2:= gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) >=sys-libs/gdbm-1.8.0:= dev-libs/libpcre app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( sys-libs/pam ) mysql? ( dev-db/mysql-connector-c ) ldap? ( >=net-nds/openldap-1.2.11:= ) postgres? ( dev-db/postgresql:= ) spell? ( app-text/aspell ) fam? ( virtual/fam ) !mail-filter/maildrop !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/sendmail !mail-mta/ssmtp[mta] !mail-mta/opensmtpd !net-mail/dot-forward !sys-apps/ucspi-tcp dev-lang/perl sys-process/procps !net-mail/courier-imap !net-mail/cyrus-imapd
+SLOT=0
+SRC_URI=mirror://sourceforge/courier/courier-1.2.2.tar.bz2
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=bd9556a1405b5b344932ec92181df1b4
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 0a7efcbd2ff6..4d8f926fb326 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.72.0 b/metadata/md5-cache/net-libs/courier-authlib-0.72.0
new file mode 100644
index 000000000000..9e221734bfb2
--- /dev/null
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.72.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst setup
+DEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.2.6:= virtual/libcrypt:= gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11:= ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+DESCRIPTION=Courier authentication library
+EAPI=8
+HOMEPAGE=https://www.courier-mta.org/authlib/
+INHERIT=flag-o-matic
+IUSE=berkdb debug gdbm ldap mysql pam postgres sqlite static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=net-mail/mailbase >=net-libs/courier-unicode-2.2.6:= virtual/libcrypt:= gdbm? ( sys-libs/gdbm:= ) !gdbm? ( sys-libs/db:= ) dev-libs/openssl:0= ldap? ( >=net-nds/openldap-1.2.11:= ) mysql? ( dev-db/mysql-connector-c:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
+RESTRICT=!berkdb? ( test )
+SLOT=0
+SRC_URI=mirror://sourceforge/courier/courier-authlib-0.72.0.tar.bz2
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=65bedb642f8bfeff3bea729238c1eb51
diff --git a/metadata/md5-cache/net-libs/courier-unicode-2.2.6 b/metadata/md5-cache/net-libs/courier-unicode-2.2.6
new file mode 100644
index 000000000000..c6600d9bf29e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/courier-unicode-2.2.6
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Unicode library used by the courier mail server
+EAPI=8
+HOMEPAGE=https://www.courier-mta.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3
+SLOT=0/7
+SRC_URI=mirror://sourceforge/courier/courier-unicode-2.2.6.tar.bz2
+_md5_=77de2d76e2cd5effdb39dea597af6b6c
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 77a999e59557..c92994594315 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/nicotine+-3.2.8 b/metadata/md5-cache/net-p2p/nicotine+-3.2.8
index fd3e8736b3ee..4bbe264d51ef 100644
--- a/metadata/md5-cache/net-p2p/nicotine+-3.2.8
+++ b/metadata/md5-cache/net-p2p/nicotine+-3.2.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
 INHERIT=distutils-r1 xdg-utils
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] 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 ) 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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Nicotine-Plus/nicotine-plus/archive/3.2.8.tar.gz -> nicotine+-3.2.8.tar.gz
 _eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f466c0868af956e27e02ffbf69e9197b
+_md5_=93b98d13761e400acd5868bdb3e07ee0
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index e28257a5fc3f..b8b1874399e9 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/kicad-7.0.0-r1 b/metadata/md5-cache/sci-electronics/kicad-7.0.0-r1
index d17bb403e0fb..a34f8124f821 100644
--- a/metadata/md5-cache/sci-electronics/kicad-7.0.0-r1
+++ b/metadata/md5-cache/sci-electronics/kicad-7.0.0-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/7.0.0/kicad-7.0.0.tar.bz2 -> kicad-7.0.0.tar.bz2
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=125cca7af571fd48a715f68ff910ff62
+_md5_=9d4120b09dfd47f7b91465a9965dc051
diff --git a/metadata/md5-cache/sci-electronics/kicad-9999 b/metadata/md5-cache/sci-electronics/kicad-9999
index 4e10b5a84d52..8534956dfc12 100644
--- a/metadata/md5-cache/sci-electronics/kicad-9999
+++ b/metadata/md5-cache/sci-electronics/kicad-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/swig-4.0 doc? ( app-doc/doxygen ) >=x11-misc/util-macros-1.18 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] sys-libs/zlib python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] dev-python/wxpython:4.0[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext )
+DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.2-gtk3[X,opengl] sys-libs/zlib python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext )
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=8
 HOMEPAGE=https://www.kicad.org
@@ -8,8 +8,8 @@ INHERIT=check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets x
 IUSE=doc examples +ngspice nls openmp python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2+ GPL-3+ Boost-1.0 BSD
 PROPERTIES=live
-RDEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] sys-libs/zlib python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] dev-python/wxpython:4.0[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext ) sci-electronics/electronics-menu
+RDEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.2-gtk3[X,opengl] sys-libs/zlib python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext ) sci-electronics/electronics-menu
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4784ce7fdfe913ec86b57ee779047ca8
+_md5_=c21a46106ef912828f2659df77a68c79
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 67eb6ac2233f..812e10902762 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/openrc-0.46 b/metadata/md5-cache/sys-apps/openrc-0.46
index ea9873f4459b..5b65c0219f79 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.46
+++ b/metadata/md5-cache/sys-apps/openrc-0.46
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/openrc/openrc/
 INHERIT=meson pam
 IUSE=audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) bash? ( app-shells/bash ) !prefix? ( sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( || ( >=sys-apps/sysvinit-2.86-r6[selinux?] sys-apps/s6-linux-init[sysv-utils(-)] ) ) virtual/tmpfiles ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
 SLOT=0
 SRC_URI=https://github.com/OpenRC/openrc/archive/0.46.tar.gz -> openrc-0.46.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c0ddfd41680b8dc36d94a1a1b79310bc
+_md5_=0d03286734436e195f3b9ab49765417a
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 93e852ae3015..6369deee1371 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-41.0 b/metadata/md5-cache/sys-cluster/rdma-core-41.0
deleted file mode 100644
index e6908ab82709..000000000000
--- a/metadata/md5-cache/sys-cluster/rdma-core-41.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-lang/perl virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) python? ( python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) )
-DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsystem
-EAPI=8
-HOMEPAGE=https://github.com/linux-rdma/rdma-core
-INHERIT=cmake python-single-r1 udev systemd
-IUSE=neigh python static-libs systemd valgrind python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
-RDEPEND=dev-lang/perl virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=0
-SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v41.0.tar.gz -> rdma-core-41.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fcc7812e43cfb7af33e0e1a890f7f063
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-42.0-r1 b/metadata/md5-cache/sys-cluster/rdma-core-42.0-r1
deleted file mode 100644
index 58c50907ff00..000000000000
--- a/metadata/md5-cache/sys-cluster/rdma-core-42.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-lang/perl virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) python? ( python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) )
-DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsystem
-EAPI=8
-HOMEPAGE=https://github.com/linux-rdma/rdma-core
-INHERIT=cmake perl-functions python-single-r1 udev systemd
-IUSE=neigh python static-libs systemd valgrind python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
-RDEPEND=dev-lang/perl virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=0
-SRC_URI=https://github.com/linux-rdma/rdma-core/releases/download/v42.0/rdma-core-42.0.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	perl-functions	c3fca037246e877693badea0df3b0ef8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6cfdcb3e1700be41693975a94e553906
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 9b7265e7fd7a..5168d38696e3 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/arandr-0.1.10-r3 b/metadata/md5-cache/x11-misc/arandr-0.1.10-r3
deleted file mode 100644
index b681702fdc0a..000000000000
--- a/metadata/md5-cache/x11-misc/arandr-0.1.10-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/docutils[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Another XRandR GUI
-EAPI=8
-HOMEPAGE=https://christian.amsuess.com/tools/arandr/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/pygobject:3=[python_targets_python3_9(-)?,python_targets_python3_10(-)?,cairo] x11-libs/gtk+:3[introspection] x11-apps/xrandr python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://christian.amsuess.com/tools/arandr/files/arandr-0.1.10.tar.gz
-_eclasses_=distutils-r1	a9f2e2ae24bd496873c092a94cae1539	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bb258d0d6aea28bef967e8d329e204cb
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d21a226a4be4..776cfa1ceec9 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15153 BLAKE2B d9489813ffb032a3f6f6eacb6df9ad7819bf186e8ead6915d583a0259dd4ccdda908f27867444b45375911e6c60c83e1069b4a71a2a06470f795f6a9fac5b8e9 SHA512 14e11af3bb1e448bd105f6b59bfdeff65b818fc1e4fad2e98891985fef279f09bf5e599162f137b666332a787df599358edcef202bf7d6ad3e111d3c5ab90cd5
-TIMESTAMP 2023-02-21T13:39:43Z
+TIMESTAMP 2023-02-21T19:39:43Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP0yZ9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmP1HgBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB5cw/+LtWBvkeoztUcCwamuq8urdIkukr7ddR/s7kumzhhcB2MWR/TGVtJcvxA
-Ok5e9cK/m17TLIrWwr9lT6CDmqiFnrXQ8Eqp30zlHXN4atAZOvdQlO87LeetW/R5
-3X0JFB8w83AQFntAlk1Xtstw0a15qS/dk+ptKw+9cuJ7yzVAsOC5onrkRkWfYEZ1
-uh0RnDSz7VCE9WiuTNuH5Y39MzVRtnglWxgmG2EYAdRrS93fdQtggIs+fHe9F8vg
-GI6qEYabkk2pInoGtphBXSjVdSxIToG0VMPhBcpEM5vRT+oZvWGF7TPR8RAWStpk
-uXK8QVjSTjW53dFr30LAeHKEPu5HiSq72XLb+foJuJv7iHkYYZD3LNh1sVXZz5QQ
-dNODO0kJi8uNHQsRBN+GmFSNkWDsJAo4+IlOnEASzOKGDP6yGzSRRZizOVDAcXno
-peYFl4XksfL7muOmfUFhqjjapChzp26aaXZ789Q6y0qGap3rd8HPj9qjGBAaFRiN
-hdweQDm2xPACxRghrO38TjlCFZ6+hD2fhwnyr0vkOfebXa1LGkGMK7BjSV6ioWdA
-ITZa3lt9+DCVie6Do39l9RqRd6LQLhHn/ecovnpHgP5ZFyTrLwL/62gYNpXbgGXy
-LuhqEDVW5e4qig3QJvamCesR+euHmvCqTDgKQpT7Z3wlE7VBjaE=
-=EJQP
+klA1IhAApSfv0WXwsneagseH+MarxTxJW+Ny8TDs2u7MQCdnMz5xyd2O2sJYYXXY
+cGgZOw1I9Qa3wwJExqRbZk07OiRAYVTzKvL56/I1sfIphzFRtBbteoquw0FTiicJ
+GJcFxrwWyHJckPBURdB39csPfEvtdDLLdejspG+tF8gS/7+yQfKpRXeleklIw5h5
+9J31pssZ5hdkhYvv6UO079QO3BayBMAk5M9m9kKiRoKrH2I82gSQD/ZamvzM/uSO
+nVXoCjcfhHsBUdcARWEP/IW4gN0MV1m0ABP2EmHVebV1Yy1RiJs3RaqngrNlIzbB
+LSTKzbIZ+XvOiKUCKonMSnnjhUtnSNp0J/oiDO/6tEKgdoM8xmUzjitcxtESYsO8
+99P8gmSDpYcS6TeYyH61r8XZ4RhxpTUZJoY5N8/ZNq6LhzeQqxEbI+y9SPHnwOXA
+t8d2rhnSKYqMnbeckd3f7l0p/0HuEl4Ks1jPBa4+KQs+myNFasO/xOywBAGNupdi
+Kv5NSbCCyKyGi58EY5S54bk42czTB/IcFVm1kr2jYs0lXJBqZ5r4DHls9f1rN/Za
+Ax4Xc4O5J47Vnyw8ENhfmn2GX4uHhdO5mdW1sQt5WU908gV+/BjL5iKuBk3NnJAn
+zBAdSYIBJoIi3n2pYVfikQxeoCjWgjRZzZL3+DN1CbfsZEj1+ZA=
+=DHZ0
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7324f5647e01..e612d8905e2a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Feb 2023 13:39:41 +0000
+Tue, 21 Feb 2023 19:39:41 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index dc8714744206..9b952dd613a4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Feb 21 01:39:40 PM UTC 2023
+Tue Feb 21 07:39:40 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b6916b659652..422cd0681763 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Feb 2023 13:45:01 +0000
+Tue, 21 Feb 2023 19:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f9a1819b8c06..fc2242ecd95b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8c9e015b00c756c03b7076bf273f166f8f00ca98 1676986276 2023-02-21T13:31:16+00:00
+5c62cec761720df07a5a515137057e4a924f2d5f 1677006245 2023-02-21T19:04:05+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4d0066d12ae9..80fbec10dbff 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1676986801 Tue 21 Feb 2023 01:40:01 PM UTC
+1677008401 Tue 21 Feb 2023 07:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b900943ddcd1..e612d8905e2a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 21 Feb 2023 13:39:40 +0000
+Tue, 21 Feb 2023 19:39:41 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 8b9c0ba48c16..5e763d41ac05 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 7be3e66e7b5f..3ea9d8a04b87 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,6 +1,8 @@
 AUX courier-authlib-r2 978 BLAKE2B e49effed437cc9fd76404054e014a87bf2a207c68c1a440293d73da748d423aca137031a2b043e832f5009f2384f3f7ae352c2d10dfccfeb6082fd42aa1513bb SHA512 8681f041431150027f41058ae8dd5fb2105a74caecb096aef42b1f0e255026c2f8509d9f688f2725ab1e12b792604cb481a95a6eeb177967c16ae5e3390f44d4
 DIST courier-authlib-0.71.0.tar.bz2 2207895 BLAKE2B 8eb92b2c07acfb662b34a2234759a80f3a1b5a96c9e537cd6215bd9a9a607ed8995461dd599e4fe2698e70510f11815ad13a0511446303ae5e26ff616f05d92f SHA512 7a9700c472fd9d6942bd15dfd8db474a738817608bcd8106b6211b24cdc0631fd69f99e7a5c9e9f6088c16b53a9304ec429c031b16621f8ef52581af8a4256ec
 DIST courier-authlib-0.71.3.tar.bz2 2208794 BLAKE2B 4b0f56f066368383d471dd8f46941f7b652a87be939ba6319cf99115991c03dd117d6bc246cc802fa7066ce5c75aaa102c59ae397948dd31ddbbb024059566ef SHA512 02c55ff1a91aac581942f8a4a01edd2bb8e2e1a07faf551d40a97583ce2f6eab12e850e3170df255c1e7680a34e418784ec14bb033825d6bac21192ae37ce55d
+DIST courier-authlib-0.72.0.tar.bz2 2274507 BLAKE2B 238fbc8d046dd3c1f2eb6357f9b1995dd666171dfb8a6ba40ee68446bc6cfb9624b53f4603376119798130d5319f5489690bf1567d9d59db4448a4478aff2dc9 SHA512 1d04c3a10fffddfd2c3cae1c5543a01ec6fcc4ccdf77b13714542ce7189e4924836a64123a9e7231fda698cca9a930be65a4a2382f3cd96364635f754bf40ce3
 EBUILD courier-authlib-0.71.0-r4.ebuild 4446 BLAKE2B 9d0042f3e6c65a735532eb7b0b30223d01d49b7c6197ef88511f734d6b7af9b779c46761eea445420f6ac27ad254b0cf7eff850b99f1c5a69a855341d976a334 SHA512 8f708363dc3519931ae0854543b9060d0209181a5e01c65ea6d2d4f6024043ba7f66bd95815f75f4d9eb6d02e13a32385792461da5ca741553187f4de64ec054
 EBUILD courier-authlib-0.71.3-r2.ebuild 4464 BLAKE2B 1469bbcb3278771bde697bdc752bffe0f54b441d0fc4894dc9892f3ff99c4baa03e56a8a209ab012482723f3c531b64c12569532165caa2c31828fe360fb0718 SHA512 94bcc0daef666993dec1e48cab6cd84bef3e9dab40416e06344084ba76d84872f1c78639ee05db1716f5642bab4ae945b1a812d38a9b7030432e2a4df53d6f14
+EBUILD courier-authlib-0.72.0.ebuild 4469 BLAKE2B 5561264d7f10f81c28508dbe4e3fe5af6e394ad55fb3179598ff9540678db954cbb9aa06c625a52ce7bad09b8172b44069747ab576ff1369676682daf10914b2 SHA512 0258ff1be9753b4c5ec162f30697967c4699d23e731862764d9bf82a2c52be7766c2085832107398c9c82ac76c1cf5e9233274ad41dadb7c4a5165123b290288
 MISC metadata.xml 302 BLAKE2B f4a6bbc1e616a769172499ca1f863a8e43d608e25d2a99a6384fd0a0880e4e23f2c64c97404ad80ae12c3cd23eda5854ded0ed2c9000875c701aa22ff70b9e80 SHA512 3f25d55e6f6169b696d210cfbd7df486337885cd0905b62d307e6b3fd1595ac1471dccb59794ecfe0bbcd009339348ef7bb9debb4752533d1b28043cb5d1f918
diff --git a/net-libs/courier-authlib/courier-authlib-0.72.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.72.0.ebuild
new file mode 100644
index 000000000000..da59ee50df02
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.72.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="https://www.courier-mta.org/authlib/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
+
+RESTRICT="!berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+	>=net-libs/courier-unicode-2.2.6:=
+	virtual/libcrypt:=
+	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( sys-libs/db:= )
+	dev-libs/openssl:0=
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! has_version 'dev-tcltk/expect' ; then
+		ewarn 'The dev-tcltk/expect package is not installed.'
+		ewarn 'Without it, you will not be able to change system login passwords.'
+		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
+		ewarn 'and others) will work just fine.'
+	fi
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	local myconf
+	if use berkdb ; then
+		if use gdbm ; then
+			ewarn "Both gdbm and berkdb selected. Using gdbm."
+		else
+			myconf="--with-db=db"
+		fi
+	fi
+	use gdbm && myconf="--with-db=gdbm"
+	use debug && myconf+=" debug=true"
+	use sqlite && myconf+=" --with-sqlite-libs"
+
+	econf \
+		--sysconfdir=/etc/courier \
+		--datadir=/usr/share/courier \
+		--localstatedir=/var/lib/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-authshadow \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--cache-file="${S}/configuring.cache" \
+		$(use_with pam authpam) \
+		$(use_with ldap authldap) \
+		$(use_with mysql authmysql) \
+		$(use_with postgres authpgsql) \
+		$(use_with sqlite authsqlite) \
+		${myconf}
+}
+
+orderfirst() {
+	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
+	if [[ -e "${file}" ]] ; then
+		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
+		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
+		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
+	fi
+}
+
+finduserdb() {
+	for dir in \
+		/etc/courier/authlib /etc/courier /etc/courier-imap \
+		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
+		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
+		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
+		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
+		if [[ -e "${dir}/userdb" ]] ; then
+			einfo "Found userdb at: ${dir}/userdb"
+			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
+			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
+			continue
+		fi
+	done
+}
+
+src_install() {
+	diropts -o mail -g mail
+	dodir /etc/courier
+	keepdir /var/lib/courier/authdaemon
+	keepdir /etc/courier/authlib
+	emake DESTDIR="${D}" install
+	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+	emake DESTDIR="${D}" install-configure
+	rm -f "${D}"/etc/courier/authlib/*.bak
+	chown mail:mail "${D}"/etc/courier/authlib/* || die
+	for y in "${D}"/etc/courier/authlib/*.dist ; do
+		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
+	done
+	use pam && orderfirst authdaemonrc authmodulelist authpam
+	use ldap && orderfirst authdaemonrc authmodulelist authldap
+	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
+	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
+	use mysql && orderfirst authdaemonrc authmodulelist authmysql
+
+	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
+	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
+	if use mysql ; then
+		DOCS+=( README.authmysql.myownquery )
+		HTML_DOCS+=( README.authmysql.html )
+	fi
+	if use postgres ; then
+		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
+	fi
+	if use ldap ; then
+		DOCS+=( README.ldap )
+		dodir /etc/openldap/schema
+		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
+	fi
+	if use sqlite ; then
+		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
+
+	use static-libs || find "${D}" -name "*.a" -delete
+}
+
+pkg_postinst() {
+	if [[ -e /etc/courier/authlib/userdb ]] ; then
+		einfo "Running makeuserdb ..."
+		chmod go-rwx /etc/courier/authlib/userdb || die
+		makeuserdb
+	fi
+}
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index e5c1c141d4e9..e34813cf357a 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -1,8 +1,10 @@
 DIST courier-unicode-2.1.2.tar.bz2 445242 BLAKE2B 118afeefbb0d957f3a0b7a39e573edbdc3fa1d85c1028f4aca46137402f01a6b4d5df11c48e9d8235483ba277e187863d3f8f7b1cf426a1b5f2d40eb243cca4f SHA512 97d1c12917a1d415b4dfb8155e2573e0e4101112433107e252e393765fa88edd5aa8d349a2c201ea951bf0e9d51ac0f0c6444494c308fbe9909929364661bc24
 DIST courier-unicode-2.1.tar.bz2 447917 BLAKE2B 0d225849322ccaacea9eef49225952ac5219ab2967f30ca1c0412b73790b77682a077c2c08cff7b606cc1fdc6542db7e0895afdf7ba34f73e2a71aba5311df99 SHA512 1ee0bb3a548bfae4ebdc92ff8eeff5d22705c0df55e37e98880a12f1bfb186034e0c1ea2e1f03073b40e1d11147828304be93467d5d51e394fe39fd57bbbb46e
 DIST courier-unicode-2.2.3.tar.bz2 593337 BLAKE2B b384aaac20ae645f4eaf256c90e50dda4e7b7e78f91188fbadae9851c7fb1c994b1b91b942a02cabbea357e15bc3d9e9d64f97d2810a359604303905b3d03fba SHA512 aab25e9b095e11e5744d4148b50d95ded2a5613c48146f90dacb796eba82aaf41b0ea86ec82a0edd702ad2a8c00bb7f784e12c3ddd01777a19edb3da10a168f3
+DIST courier-unicode-2.2.6.tar.bz2 598551 BLAKE2B 870e3add65747354ea8a91d58272a588bec84553ebbbff68ce6fb1ffc36a3d359a7988b696c6af0dcd5e25bf95dac5de6ce4abc999ab7c41edb6f7d8971087e7 SHA512 02db2da4cec2daecbfc953f4bbe6df34d68554668371a740a20c90707b8d6fe7d516e0c8fec83f6cecdd9bab239cbc1f5adef004babd67d642aed81e5b653940
 EBUILD courier-unicode-2.1-r1.ebuild 524 BLAKE2B c1ca8d907f4dd69b3ac761e975d2b27b98a79411e21abb125b566ef43862f96d94f8e43b4e4a72d131d9e8616b98a9bc99f1261af00dbbe012d9b37c9b617924 SHA512 ce98696af03e2b2fb11ba2835238087c8fb2eeef341b21da8e1aca0ae0a7eed1365e3b3cd355f956acfb7198869b8415d6dce8e03533a88f598d0a4a9d159415
 EBUILD courier-unicode-2.1.2.ebuild 531 BLAKE2B 9f1fd38475d02afcf9a161501f54884b3ecaccb6738917630e8a80dfde9d50701bfc432584ddf0adbba7c6c8fea6f1946f5f5d7ff226e2c88eeb8220a75a5e12 SHA512 63658aa656ccdec8a9941c23a422f55bca14ba8977288ec96a8ffacc11880878bf9832780cd55b47c684a36b5b206c762405d710d4f527eefa2de221890c14bc
 EBUILD courier-unicode-2.1.ebuild 479 BLAKE2B 33122e68aa4ac7e91fca265847970781c62e1e52109264da5724282f152bdb755d44a5e8ba2dcc4f5eba236a419ec39e9b6521c8cb05a1c4b685cddce6d5ce4c SHA512 340002a9d23ca729ba60270bb806f474320450450bfcc1b03d71bfb42016ed7e1f91d015635130a1a4387933b0d13d9aadbe46eb5cbe33103fa23751d1ae40d8
 EBUILD courier-unicode-2.2.3-r1.ebuild 535 BLAKE2B fb83970f0e47d4971ab74170aa47d87513daab785732d1a58dfa29baaa59bf38ed12ca3bd678517d3a06bda317e32042478c7be02f61da6b65820b60b5ee6e93 SHA512 4ffc877fd85d215ba8cda2be25a15a04def486a858cf3a4493093d93a10778d9a1fa030deff88fff4fb8a1312d2af97a819e4c06013becc5434fbd5cce19e98b
+EBUILD courier-unicode-2.2.6.ebuild 540 BLAKE2B 25ef1d5701858c1a4365550bfceef095b5ad430f27d7c5765efcc446194120f3dc272bf0dd368c6ed7a70df5b24478f19f5543efe66656a5b7d03eee3e3fb890 SHA512 75846b74f5c48831fd8f7c76ffb0f6c82d8e06b7a506e1b8b6b2d5efa8cd1d3ec15971dbff8ddb0167fcba73e697d824c17e770dddd9e040035a4ddd3cec6019
 MISC metadata.xml 294 BLAKE2B 529ed84dfbb6d03b115e2ed70383004be4908c1164d320822c212a7be40ce17d6dab03fdf76bdc8c4fb2355bf74b3a9d0dbf403556867c34532c7f0d497715bc SHA512 bd738845d02840a3e451e87ccded91513d5d7d23f4a4a0efff9ea7ce24debb1b41c4283be1898bb6b1a354c91a765c4a5e83c0745ec069865e57a0ce77c5f273
diff --git a/net-libs/courier-unicode/courier-unicode-2.2.6.ebuild b/net-libs/courier-unicode/courier-unicode-2.2.6.ebuild
new file mode 100644
index 000000000000..f5d5c280a678
--- /dev/null
+++ b/net-libs/courier-unicode/courier-unicode-2.2.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Unicode library used by the courier mail server"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 43eb2e30f03b..2ca8e72ac483 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index f4eb420670d1..33428a36daf0 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -5,5 +5,5 @@ DIST nicotine+-3.2.8.tar.gz 2984416 BLAKE2B 8ca996e67a296535a158d1929579c4f47963
 EBUILD nicotine+-3.2.2-r1.ebuild 924 BLAKE2B 1d1059c3117d93e4ee3181d5f3af1835c4498cbebe112661b34ea9d4019482a44470e67480c847c75b2d4ab174a76c4ec5fc8c465d339aec78b036dd4cb3c679 SHA512 e4675f63ca95681bc18ccfa293732a5036f91bd54da672ff0de3f4a9670603c329f26426fe324f75c08277df42ea7e3dd96a5b96cdd420583bae9c7cb64a537b
 EBUILD nicotine+-3.2.5.ebuild 844 BLAKE2B 04f85eab370c067b2ba879d568067cd42e84420c7998a58d8b134def531646ad1908fa26b0ac986d73e526404366312ede8769a7e144a0976db89461547a9890 SHA512 0e937a3bfe27f5e022e6b707144dd3a3b02bba784b6b1133ee47dc98ac01de43d0bd5369e7cfdc655b17c6b71425cff0e46135b8f82dbb7b7bff97298b080d1d
 EBUILD nicotine+-3.2.6.ebuild 842 BLAKE2B 6c207c3da6ed04e5b8758ffb1d4a350dc689b04ba83410a7fc395efc403e7dbace519e43c6c38b276804aa96ea48a333108968252a1bac94c040c51f454e08c1 SHA512 b06e5b464e1d8efa1b0f937aa7351ea22c6c7c44564ec7077553bf695967dcffcc0aab8e54b186bc3789030f3887388ca3507a1c4eb5050d4e27614beded51aa
-EBUILD nicotine+-3.2.8.ebuild 843 BLAKE2B cd36ecb546c9c3a3a2d858475162bec3652ebd04d4ca4e16a2e8d55fa66e9df5de767679b21f23d9264b9eabfcf53d55fd683ad2bc94a09bfc263853cef33211 SHA512 c31d460150a12d3f931625f36f44277d13476e46045b46e24192601b1c785adac1107f0e16ad3e586ad21c20a61b2f878d563ee5c16da4aaf49aef5588786195
+EBUILD nicotine+-3.2.8.ebuild 841 BLAKE2B 6446001134ec0c59b8f727bda04f2d093d5b2fdc0dff729740e0fe734f7596d3d8c091d06371f021c8648bc204056550674664764bce6268a0193accc05f9309 SHA512 d7778ebe08dddda4b60b8c07dfc01317f751d096925955973b7214ab4fc9d7a4f44f299f33a5d2a715a0021534aa2f73bc3374df4a7b5ae7f7fcf4a1bfca4866
 MISC metadata.xml 345 BLAKE2B 511ecb1a01b9dd891b37d035ec3a7e7835de48f147fd851e256a3c2cdfb356018f91c14a07f7ca4cf6f96ece8728454917fc02f70081ccaf142c32e8368a6a38 SHA512 a885286829ac4ddf04ccf11a9105d2b5ab5862a8a84eedaa547da4cf0c53b5b1c4957fe40826df87b23fd6de7f514a5dbf374b9f87f761c5f17385769a07dd8d
diff --git a/net-p2p/nicotine+/nicotine+-3.2.8.ebuild b/net-p2p/nicotine+/nicotine+-3.2.8.ebuild
index 51e0b647c9b7..2bd3906ae371 100644
--- a/net-p2p/nicotine+/nicotine+-3.2.8.ebuild
+++ b/net-p2p/nicotine+/nicotine+-3.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz ->
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8e536f5be2d4..6c7fbc189641 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/updates/1Q-2023 b/profiles/updates/1Q-2023
index f04ad9a2bad2..fddae005f9c5 100644
--- a/profiles/updates/1Q-2023
+++ b/profiles/updates/1Q-2023
@@ -12,3 +12,4 @@ move dev-python/jupyter_server_fileid dev-python/jupyter-server-fileid
 move dev-python/python-xmlsec dev-python/xmlsec
 move dev-python/github3 dev-python/github3-py
 move dev-python/python-zstandard dev-python/zstandard
+move dev-python/prompt_toolkit dev-python/prompt-toolkit
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7694cb3c2a50..79637f8f0849 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -661,7 +661,6 @@ app-emulation/virtualbox:sdk - Enable building of SDK
 app-emulation/virtualbox:udev - Controls installation of special USB udev rules.
 app-emulation/virtualbox:vboxwebsrv - Build and install the VirtualBox webservice
 app-emulation/virtualbox:vde - Support for VDE networking via net-misc/vde
-app-emulation/virtualbox-modules:pax-kernel - Apply patch needed for pax enabled kernels
 app-emulation/vkd3d:spirv-tools - Enable SPIRV shader debugging support using dev-util/spirv-tools
 app-emulation/vkd3d-proton:crossdev-mingw - Use sys-devel/crossdev for the toolchain rather than dev-util/mingw64-toolchain (requires manual setting up)
 app-emulation/vkd3d-proton:extras - Install extra tools and demos in /usr/lib/vkd3d-proton
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index ec50c35373be..116be62b16f7 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 7daf5ba30b6a..365843ffaa36 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,10 +1,11 @@
 AUX kicad-6.0.6-unitialized-variable-fix.patch 592 BLAKE2B b26757a1e9d4115616a721fdba7527cb72d489ae75976f9967f24cd12735b6f090a71bdb0c7d632d33ada0b3dc77f0d7f9370d02c34d83bd0afebb608621b85d SHA512 2f1e81132e87858f789833bd05fdda2309fc344c1535295c6308e3058bed85edbfd9900a0529e1489eb6f87bb27146a7dec2893a10d311c43b7117c00beba948
 AUX kicad-6.0.9-gcc-13.patch 1094 BLAKE2B 6b09be7cfcc6895fd6d744c8755959c501ce7dfab1a4759cd1999d2dd172273f36c4091554743109a1a52c8ea98896ee04795070eda943a24669e73e94319177 SHA512 fd2924c8f8faea50da3defaedd3d4b6f89654d18a108c07e5e38277d70397856e493e33601bc632ceca5a62981501f136bbbba0462a68b421db72d0aa9dd55e2
+AUX kicad-7.0.0-werror.patch 682 BLAKE2B 268cf848679ffb5b5aa2389a6392986f908c64861fb6908a864ae41d788f8ac10a21d30b7a20b98409cad7f57191958f9d95d448be7c8070806c585c03d7ce8a SHA512 c30b9a080cc74687b44fb5e547d746c4e3298096e9ffa1bf5a7a2b477efb8d05db8adad7255d6b92eb2c00f739e4fcd79b9c198b3122265d26edc1db5cb4ee5e
 AUX kicad-7.0.0-wxwidgets-version.patch 3627 BLAKE2B 7a0382db010a9ec07069c16d1f87c5763fc8372f2c4be35384d8349cb03e4096d09a9020a2fc2155082ea8a44267f83cdc52d32972cff320e7ec038307ac81d0 SHA512 62a48794fcf609d2a844d23e66715afa4eaae31fe227c965cf368dcad47fbd41557527720218cf3bc25822612ce277a67609b057f5e0dc852cdd5de104bf1b10
 AUX kicad-scripts-install-fix.patch 442 BLAKE2B 321ca8c5e846023696576daea00aa827ad88a4c3e82d120bd07392892b61d0e63892732f5469b1fe1472eac9584175acbc7aa611171f6fb9285017826156b30c SHA512 5abb158ec7e8a5ef8049797886e26febc018499dd7f5c8defdf9104b59371efa05cbec8e19e8fe22295e8e54c30095d347cccfa4c43db62b6ac4eb07bb8a080e
 DIST kicad-6.0.9.tar.gz 45166663 BLAKE2B e4d45c589a8e76d7c121ac4ab7adefc5fd44d4ccbff7140196caec56c309f6e83d47a3ea9cf79f59de57c3bda43b3d32a2bea82c5850c2a7a58a6e1db27a06a7 SHA512 49e6bd3c9f6e0c9839c4fac18dc12dc7ef16183f6fbe8091992e2223c7fb085b3119d46797c0b0cf86fd2813e3c4def9eb1f2adbff1bf072a363f1a501da9354
 DIST kicad-7.0.0.tar.bz2 42583715 BLAKE2B 24fefe73bce6254bb47fdf21e8a82b7752e3f58cb3ea61220f0cf008c6570a4378f15bad54b81cc9257ec223bdb6128ccfd33f356e738b112c7b0e9481257255 SHA512 cb6f4cf6eee9a583d3a622bf8e48e5b604b047df0d742081cff1e5e387cf97cc1cd3f03fb58a17b44c47085634b95eea642bd1a6805e80807dbe0473c8d19d96
 EBUILD kicad-6.0.9.ebuild 4413 BLAKE2B 2662255dad5503f8ec38f76b748ed0427a831520873de5fa7add55c3e58a21bf84eddb6a7b8d57ff3fefd11279cb648d05f75545706542e39e27671be0e44c15 SHA512 716655029680428508e69c67b3edf8904c8a915ea595c91afda1054a51f0d8cbfa173d9b71384ab5518060bc54e51e5fa3f5427adf79b51ecfb63d0cb6c8a0df
-EBUILD kicad-7.0.0-r1.ebuild 4306 BLAKE2B 7bba230649be00254ff34b25487ccc528c053280c13a97a2b762c9c99f2771e3b8b70fb8945de5b9389f49a6f61ddbb739df353caddadd8c673298fe8442aa57 SHA512 6ad32f5853aedf770a4a37ea2edd0f1403623060e4135d2f6741232932c488f53b6cdd1892d1be5a4fdceaf57afad4f59064a535d4cae604511d2f7d380be6b8
-EBUILD kicad-9999.ebuild 4182 BLAKE2B 68b66b2bd5be9dd790bf79c4ac43885d17dc7b9c8c29062700c249f65b77ba05c6b467d8d44d7812335180e91c1435797e5d17f043505e79340b9dbfd0d6d829 SHA512 7e85b31556b2a83b8f6642bbb78169f5494aeff2f316083aa01375d5507443fe1e432585d44728d1087b39c00673ffd273f9ca62b0ef9e720ad48fed5b6400e2
+EBUILD kicad-7.0.0-r1.ebuild 4290 BLAKE2B 13650af670f2d65468abb762c629752c0092d53f390de03302d4c1cf2fc3244f06c41b6573d5c1f611d5c7de4c8379fc41b819e6ae78230e34f666aa1809bb5d SHA512 17ed8e4091350cb33fe5152523cf8fddd051fbc9527c3002dd0c3279eb25117051a41950f01240963ed71c8f7348d0ae967ea15290432aa6c6d4f187079f8566
+EBUILD kicad-9999.ebuild 4204 BLAKE2B 600ae5436ebae56bab432c20c75a0865e65f58b7de9e83301058f67afbbc5eab4660e1758d422a08e822240857aa4cf93f43ef1427948fb21285be6202ac27fd SHA512 77469da750859ba7af444f206d42212683d4f9830355f41743d4ee81d84c3f05662cd588862cd30eabda9377f0d7a918aba9feaca47190947e58bd7474109953
 MISC metadata.xml 922 BLAKE2B bfdb3ce1ee74c7b6f2da1a5fbe7835e2114af83b594edabab7b7674000462ee6963acee3bb1f384bed0b4a36b0529aebdab801fe3a482b23e742d9186e7684b2 SHA512 575659f3c5d0fc74469ff14f8abaf58776f1d0ffdd16b85e9f617d3e956d2d0c1c7f70aeebf02aa5c7afadcea0e0a589e6fb16f160b398482524fa7ce592ba4e
diff --git a/sci-electronics/kicad/files/kicad-7.0.0-werror.patch b/sci-electronics/kicad/files/kicad-7.0.0-werror.patch
new file mode 100644
index 000000000000..b5fa3b1ae15d
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-7.0.0-werror.patch
@@ -0,0 +1,21 @@
+From 04fc6081bd3d6575d00589f71150ab796778a9c9 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Mon, 20 Feb 2023 17:53:50 +0000
+Subject: [PATCH] build: Remove Werror flag from clipper2
+
+Bug: https://bugs.gentoo.org/895014
+
+--- a/thirdparty/clipper2/CMakeLists.txt
++++ b/thirdparty/clipper2/CMakeLists.txt
+@@ -27,7 +27,7 @@ target_compile_definitions(clipper2 PUBLIC USINGZ)
+ if (MSVC)
+   target_compile_options(clipper2 PRIVATE /W4 /WX)
+ else()
+-  target_compile_options(clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror)
++  target_compile_options(clipper2 PRIVATE -Wall -Wextra -Wpedantic)
+   target_link_libraries(clipper2 PUBLIC -lm)
+ endif()
+ 
+-- 
+2.39.2
+
diff --git a/sci-electronics/kicad/kicad-7.0.0-r1.ebuild b/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
index 5371ccfee521..a6db98a4f37a 100644
--- a/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
@@ -77,6 +77,8 @@ CHECKREQS_DISK_BUILD="900M"
 PATCHES=(
 	# https://bugs.gentoo.org/895188
 	"${FILESDIR}"/${PN}-7.0.0-wxwidgets-version.patch
+
+	"${FILESDIR}"/${PN}-7.0.0-werror.patch
 )
 
 pkg_setup() {
@@ -143,10 +145,11 @@ src_install() {
 	cmake_src_install
 	python_optimize
 
+	dodoc doxygen/eagle-plugin-notes.txt
+
 	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
+		cd doxygen || die
+		dodoc -r out/html/.
 	fi
 }
 
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index 96825330a19f..0a613e92f79e 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..10} )
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-gtk3"
 
 inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
 
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+		~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
 	')
 	${PYTHON_DEPS}
 	ngspice? (
@@ -74,6 +74,10 @@ fi
 
 CHECKREQS_DISK_BUILD="900M"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.0-werror.patch
+)
+
 pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
@@ -97,6 +101,7 @@ src_configure() {
 		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
 
 		-DKICAD_SCRIPTING_WXPYTHON=ON
+		-DKICAD_USE_EGL=ON
 
 		-DKICAD_BUILD_I18N="$(usex nls)"
 		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
@@ -137,10 +142,11 @@ src_install() {
 	cmake_src_install
 	python_optimize
 
+	dodoc doxygen/eagle-plugin-notes.txt
+
 	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
+		cd doxygen || die
+		dodoc -r out/html/.
 	fi
 }
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 911aea013ff8..a1828eb78e15 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 6a0994dd76ed..fdcc5a3da30f 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -4,6 +4,6 @@ AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6
 DIST openrc-0.45.2.tar.gz 246515 BLAKE2B bb7d52b183612eb8924a2d0f9ec63eea88253d8d83964d6341a4715a6cdc372b3fd99ad0f972f4f539da9d741548777dabf4ced86fd20be741a89a69ffe2ff01 SHA512 ca2958772240f6e5037e39db1ee62a81091a2efa654da967f68e03a721868c6c0a41d32a2bddf55c8eadbc9bf5837b710cc2e4564844a7fbc0e585366da4fdf9
 DIST openrc-0.46.tar.gz 247679 BLAKE2B 55490afc179e1e56a58408e8a2b7ebd5376ffee25cb61f2838a47cc97ad1e4eadabcc7f74e5cc2a2d9217917eb42517cf01766de2e82b50a3500bdbe263b0d88 SHA512 7c837e4b553511f0621944222ca0d35bd553a9888bd482ca0f8f3d2923d5b51cbd1f1c2f33cccb26d9f13dfb488939b95064673bedb7fcbf78d68664df2678c7
 EBUILD openrc-0.45.2-r2.ebuild 4595 BLAKE2B da0df99c14b6984dc97aee9beaf5cb777bb3d15076d6f6be64459327c4848fecd0957a3e42c2135bbc3dd6e2e9ee17f4004a4750108a4b3e33c4dc22c2e68e2c SHA512 e2a3fd3dc7aab7bcdcc81aaa8f9ac4b889cfaf82229054f0c71e9caeb49a8fa9395fa39eb215b66d73b78b7c18a661a4289ca2844a907a5c92250898b7809e35
-EBUILD openrc-0.46.ebuild 4553 BLAKE2B 34db45754ffdb78bd14c6350685f09ca5ea4ba7c1eff03c58b86737d7be2211a6662c7d50d9cd47e8e91a08f0965dead30689b7c822ef1afb01624a21ea9f1e1 SHA512 e28ca92b5815123deec1b5922bdf189eaa7df692a828493726dd8940c6dbcafca81bea7f5741f9faf3fe556bdd12f2d2ddc8b46df7a596cf8a25bb55613b5e73
+EBUILD openrc-0.46.ebuild 4552 BLAKE2B 951c7dcd2bf5f6e438917c11a4b339bdaf79608d909d34114e9e8722cfa02edfe55d8fe0754194d6a56161c0223c82248420f749b25c94823e6aae5114e188a7 SHA512 6731d090a7118a3257818143841ce15f259ac18ff0e8581c3464d97312756456a94487f415662b502757dd35bf892e4af931599af68a59a9791fb3cf46a493c0
 EBUILD openrc-9999.ebuild 4553 BLAKE2B f806b0547ff994c52c342715043d2f0c7fff2a6dfe61151e58c0bb46a40afae03ce3d5c0e45220b89c89f70018981d97390a181603a134447169d1ade94aea3b SHA512 5215b2129a086deefc099f802329189faf219feab85897ced9b47d4c31405e64ca85d98ca9a1218ddb671204e5678c60a02c9551c7a8ff57d5c4681a4ec7a973
 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/openrc-0.46.ebuild b/sys-apps/openrc/openrc-0.46.ebuild
index 605fcb7487f8..78f0255fffd5 100644
--- a/sys-apps/openrc/openrc-0.46.ebuild
+++ b/sys-apps/openrc/openrc-0.46.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} =~ ^9{4,}$ ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 0dc6bb19ae64..bc1e59155bb3 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 14b89e4d4263..38e29493b712 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -2,11 +2,7 @@ AUX ibacm.init 205 BLAKE2B 3e955dbdb0f5fa24323ebca526a2a381e0aed49ac7a8a65ed1880
 AUX iwpmd.init 205 BLAKE2B a876a969b02c20bdb4f6a3dbf433a7ed3b5dccacf44821c825d8ab5a4fc33d7d60e01e6b265317ce6029b96927448506622c86047dfc1901b2bd1fbf8644735f SHA512 b011797925b89554a90d834a3da2d65ba3b8962f639184bbe72de98f204fe207a76073686178ee8b8456c3a6ee690bb56acfd68e02b090b99c35c55cb44d0cd7
 AUX rdma-core-39.0-RDMA_BuildType.patch 314 BLAKE2B 86a44ca599ad3e02908640d469500899de27fe874c3bb49c87589bb36d0aebff097e941eb8e76f365251fca3344eecc3520fe2005a0bedc4aeeec2f0003b6edf SHA512 fc3594e8160710f12f83279ee03193e8dd03c6318d67054f61c696d2b5946bfb1907481d53200391328cc37ca5a6e80537d4d70ee52a77ac6bbfb8836d39fbb6
 AUX srpd.init 535 BLAKE2B 71b1c00f804ad2d5d5919044eda7dfd5ca273a8bbb2debe31cf7759b6122007f5dca5da521eca882a4c48011a9cf78433c7a0fbda4a9d7d39ab89fb6f72b44f7 SHA512 3fdeb9cf5cddcf9a9fcb516c757eb82aee6eb3651e43b8579ed4a909f9b90863400e1a1bde46bb3a3ce6aeb477c40709c828739c87b3fa80d2bd8d179fcd295d
-DIST rdma-core-41.0.tar.gz 1784540 BLAKE2B 3c153dcc3563427f32fa32d9a31527635c6bb3e63297c201f30de1328a68ac73ecb3af89074dfcc27d92c640d14d8d8ec61c001659d18336a4156cf8ed22996c SHA512 d8c1210ca078ea53879cee42c838cc88bcc98430471ae609d8c4a25218dbfd63a70f5bbd4e9ba6efabdfc467f7d5796ce618ec22013d414f17502d1257601a80
-DIST rdma-core-42.0.tar.gz 1894415 BLAKE2B 953103beffd1410272dc9abf00f7cb0e900c2dd66a97cefc476fee303e4dfcdf00e9a452ec13a3f199bb34662cbdc50675ce54b6af26991cb9e673cb0d55cb3b SHA512 9e497d3a23bcd72828a717b59016fe25c88b4ec389e166936410c53dac0c6d6d2f45a76eaec18383ab3ca1a11d1b978b19247a3b7cfb121047d3891288a8c38e
 DIST rdma-core-43.0.tar.gz 1905196 BLAKE2B 96003e32de43e3f72a28c5d2d9bc670a709b25caba6ff25a36dedc003daa315b0fbfba1a25084160e659a1f0f7aa8fe32b63b0eb29103624a9499c05ebba0a87 SHA512 d5c48cfe10af40bc1caaed48fd6f82acfee5a22e1bfcc6955098ff328c1833e5455140e8f39cd5ceaa03f0aaa2bc627d56b2c1d3af8f2f505dda8a58ea70b597
-EBUILD rdma-core-41.0.ebuild 2586 BLAKE2B a4ba5e0e80a6fe684256380c9b6ae21a86719a2af9f4964438bb9c663f05ac94d870eb6fdbf2b5e80ac62fed98ed3434d1889bfb7828f1f686d800fd38cde939 SHA512 928b6977dd91af61460d780c02593dbd72ebc6c9bb448460548cbe01b2b3022cb9a3dded8c83539353d190cee7d252a164188bffa448eedeb7d5c4505f5ebf82
-EBUILD rdma-core-42.0-r1.ebuild 2661 BLAKE2B dd5696db009074c3b85b4bf2344f56d0b5441ffbda45ff1c83e40948df7fd61b705f31141e0b05d3bc5ce3b874da6c0e629ce302dadd9daf3ad9a675e170cb95 SHA512 5b488d2d02b5f0be9f769b9a04e973c4c851250c691fa5c8cb4a986bf882f901aec15b6cc88871c5ed9174bc5409f18e4fbb46787b67859896a09551b561ae84
 EBUILD rdma-core-43.0.ebuild 2624 BLAKE2B b7bf4df59b08125d0a4b20515d1fd10a85d521b94ceb18efa4add72cb7049063131c9dba8e23c2a4cce18561a962491092577a18cf9a74c895d6d847bf6bf4c9 SHA512 77be25177e9c85fd484d909e32360fdb4b3f930456af6473aeca56fcc60824960ed441a979c094664ef1abd9debdf53307750772c793476b28004add6c4d3c49
 EBUILD rdma-core-9999.ebuild 2630 BLAKE2B f61a7da6c15775ca147847b28ad113edb5fd5f759e9b2928041e70d4e5c816487a6abea417cc095fd6b59ce26c2f4c2b55cb7ddb34e3fab8106c12e3d7964a5f SHA512 9a10481190be4017a609c488302ffe8f8af2463a6c60526996aa5b7e0285bc58114b917ad7e7252952f61947deee4f323fcd9f604b33a9abdb2207dd193958a1
 MISC metadata.xml 516 BLAKE2B 2db35084ef333282bd361a31f9e000a4ced15a1d720ea032c795a870f5bf6105443ffe7c62711a9cbf0af1aa4cf7230637c9550035797b539a482cd930a3a5b5 SHA512 e821196c6340b3c652f123e797bdbc6d93a25559cebdcf6418422a711b080586ef7e546abe2805d449a08944312dd963ee7088a27926e92fa06c28d453a14419
diff --git a/sys-cluster/rdma-core/rdma-core-41.0.ebuild b/sys-cluster/rdma-core/rdma-core-41.0.ebuild
deleted file mode 100644
index 5e80843425fa..000000000000
--- a/sys-cluster/rdma-core/rdma-core-41.0.ebuild
+++ /dev/null
@@ -1,102 +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 cmake python-single-r1 udev systemd
-
-DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
-HOMEPAGE="https://github.com/linux-rdma/rdma-core"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
-else
-	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
-SLOT="0"
-IUSE="neigh python static-libs systemd valgrind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-lang/perl
-	virtual/libudev:=
-	neigh? ( dev-libs/libnl:3 )
-	systemd? ( sys-apps/systemd:= )
-	valgrind? ( dev-util/valgrind )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${COMMON_DEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_USEDEP}]
-		')
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!sys-fabric/infiniband-diags
-	!sys-fabric/libibverbs
-	!sys-fabric/librdmacm
-	!sys-fabric/libibumad
-	!sys-fabric/ibacm
-	!sys-fabric/libibmad
-	!sys-fabric/srptools
-	!sys-fabric/infinipath-psm
-	!sys-fabric/libcxgb3
-	!sys-fabric/libcxgb4
-	!sys-fabric/libmthca
-	!sys-fabric/libmlx4
-	!sys-fabric/libmlx5
-	!sys-fabric/libocrdma
-	!sys-fabric/libnes"
-# python is required unconditionally at build-time
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-39.0-RDMA_BuildType.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_RUNDIR=/run
-		-DCMAKE_INSTALL_SHAREDSTATEDIR="${EPREFIX}"/var/lib
-		-DCMAKE_INSTALL_UDEV_RULESDIR="${EPREFIX}$(get_udevdir)"/rules.d
-		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex !systemd)"
-		-DENABLE_VALGRIND="$(usex valgrind)"
-		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
-		-DENABLE_STATIC="$(usex static-libs)"
-		-DNO_PYVERBS="$(usex !python)"
-		-DNO_MAN_PAGES=1
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	udev_dorules "${ED}"/etc/udev/rules.d/70-persistent-ipoib.rules
-	rm -r "${ED}"/etc/{udev,init.d} || die
-
-	if use neigh; then
-		newinitd "${FILESDIR}"/ibacm.init ibacm
-		newinitd "${FILESDIR}"/iwpmd.init iwpmd
-	fi
-
-	newinitd "${FILESDIR}"/srpd.init srpd
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-cluster/rdma-core/rdma-core-42.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-42.0-r1.ebuild
deleted file mode 100644
index e7bfccedaf62..000000000000
--- a/sys-cluster/rdma-core/rdma-core-42.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake perl-functions python-single-r1 udev systemd
-
-DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
-HOMEPAGE="https://github.com/linux-rdma/rdma-core"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
-else
-	SRC_URI="https://github.com/linux-rdma/rdma-core/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
-SLOT="0"
-IUSE="neigh python static-libs systemd valgrind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-lang/perl
-	virtual/libudev:=
-	neigh? ( dev-libs/libnl:3 )
-	systemd? ( sys-apps/systemd:= )
-	valgrind? ( dev-util/valgrind )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${COMMON_DEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_USEDEP}]
-		')
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!sys-fabric/infiniband-diags
-	!sys-fabric/libibverbs
-	!sys-fabric/librdmacm
-	!sys-fabric/libibumad
-	!sys-fabric/ibacm
-	!sys-fabric/libibmad
-	!sys-fabric/srptools
-	!sys-fabric/infinipath-psm
-	!sys-fabric/libcxgb3
-	!sys-fabric/libcxgb4
-	!sys-fabric/libmthca
-	!sys-fabric/libmlx4
-	!sys-fabric/libmlx5
-	!sys-fabric/libocrdma
-	!sys-fabric/libnes"
-# python is required unconditionally at build-time
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-39.0-RDMA_BuildType.patch )
-
-src_configure() {
-	perl_set_version
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_RUNDIR=/run
-		-DCMAKE_INSTALL_SHAREDSTATEDIR="${EPREFIX}"/var/lib
-		-DCMAKE_INSTALL_PERLDIR="${VENDOR_LIB}"
-		-DCMAKE_INSTALL_UDEV_RULESDIR="${EPREFIX}$(get_udevdir)"/rules.d
-		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex !systemd)"
-		-DENABLE_VALGRIND="$(usex valgrind)"
-		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
-		-DENABLE_STATIC="$(usex static-libs)"
-		-DNO_PYVERBS="$(usex !python)"
-		-DNO_MAN_PAGES=1
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	udev_dorules "${ED}"/etc/udev/rules.d/70-persistent-ipoib.rules
-	rm -r "${ED}"/etc/{udev,init.d} || die
-
-	if use neigh; then
-		newinitd "${FILESDIR}"/ibacm.init ibacm
-		newinitd "${FILESDIR}"/iwpmd.init iwpmd
-	fi
-
-	newinitd "${FILESDIR}"/srpd.init srpd
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 7e5c62bf7ed9..e64bea5b9b79 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest
index c9bf82388adb..a9d52390642e 100644
--- a/x11-misc/arandr/Manifest
+++ b/x11-misc/arandr/Manifest
@@ -1,6 +1,4 @@
 AUX arandr-0.1.10-manpages.patch 1193 BLAKE2B 59816489bc196d73f32e810db5f6b661e38edc5838d925f1866e3ad0786b3db6986623eb617864a39e038829991fee3f7e865dfbc07a868526973ba09d00232f SHA512 926ae7720aec2d4ca35c4ad085e6b8e1b03d3aa87102efd8a122241ed6790a192d30629a576a028d73ac344423019f36f309f42afffb88bdf96adbc2b233e48f
-DIST arandr-0.1.10.tar.gz 100203 BLAKE2B b5754dda4c4f9c5e957a9fc75b7236480417b899c2705bc5aee514899c664d39b5902921c69ac425aff99f3a6ea512bfc0c2c0259519c1a6e0fc553f6e367cc2 SHA512 12c2fe5b36f8d8e688d990e352c1cfa3e8512c0b647b78a8af93f9472704e4867fac4c56c207465fb7b420c9022dc545dea8ad8a29af3037758ab4587dcd38ba
 DIST arandr-0.1.11.tar.gz 100603 BLAKE2B cbceaec815cb0b43731d10004a6fa3829e7ecbb1358b206a1dc2d8a1285884199e677a0e8a155ceaeca10d33515a1942754440569f3e338b79faa1b8351d4807 SHA512 5f3ccabbffac0ea9e05b9d8c229f4f3b05f06ef285fb05a1ce2d7f88fd1723fd680636f5b97764b0aeb3cedac16863c4ccb154d65bf6fe987a1b3cc8a0026584
-EBUILD arandr-0.1.10-r3.ebuild 670 BLAKE2B 051a3d28868b3cbb8d33fbef1ac65fecaf99b880aa287ec29a66af960fde3ced8e8de797708762ff9761a99d7a256942c80d432275212e119ac5ce1a9c55ad32 SHA512 a6fccf2c90337a9dcfeef2fe7a753c4d0d2a20e5646951ab71cc332e500d2a18716a9d9bfc3e8c6e47b9434feb829e5c834d95e89be09c5aeeb264ce5ced6095
 EBUILD arandr-0.1.11.ebuild 639 BLAKE2B 9b6593962e15bbddfb760da60b59adcc9ffbcfdc77180eca24886f09903765e8864a1747a0f90338909ce0b5a9d19d749daa93e5b80bcf727c6355f14b759286 SHA512 4cfb8054c43481cf652b7d78a7f4c31149ac8fde6b0f59cb0f9c8973d7983dd510ab7c3105b8c0ba3c6089c6a4199663714acf85422252050c0a7cbadd2147b0
 MISC metadata.xml 532 BLAKE2B c9c58abd579ff5e6ea71091dc54421fe90d75f14b0c4b31f712188f19fbc9b9216e4d581436f30b06066a7090a85cf2bceb0cbbaff2f1c5d43959833695973a7 SHA512 ee39d9e3a39864becd4e72bd72fc7691735d098d769e0715ae0a097aaaf0812fb06e1589f37166e34d6badb67c9041282270374426f0805f3c88c86bc265a26a
diff --git a/x11-misc/arandr/arandr-0.1.10-r3.ebuild b/x11-misc/arandr/arandr-0.1.10-r3.ebuild
deleted file mode 100644
index 0e702d60d0ba..000000000000
--- a/x11-misc/arandr/arandr-0.1.10-r3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-# Fails w/ py3.11, bug #889986
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Another XRandR GUI"
-HOMEPAGE="https://christian.amsuess.com/tools/arandr/"
-SRC_URI="https://christian.amsuess.com/tools/arandr/files/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
-
-RDEPEND="
-	dev-python/pygobject:3=[${PYTHON_USEDEP},cairo]
-	x11-libs/gtk+:3[introspection]
-	x11-apps/xrandr
-"
-BDEPEND="dev-python/docutils[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${PN}-0.1.10-manpages.patch" )