gentoo auto-resync : 05:10:2022 - 13:19:37

author: V3n3RiX <venerix@koprulu.sector> 2022-10-05 13:19:37 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-05 13:19:37 +0100
commit: d03ec6c0e9c1683a824ce77667440dcb4a13974e (patch)
tree: a6d1dcba1ebf79b5ab9a81588f2e3dd4ca16cb57
parent: 315f94518df5e89b0990f56d7200f52d67aeec51 (diff)
235 files changed, 2127 insertions, 1705 deletions
diff --git a/Manifest b/Manifest
index 3e74a116a251..512e5846257b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29624 BLAKE2B ed53e9aaf0703bd1152c724211ea944d92642221fa5c4ee77066004c825d394d9542319857947a7280b5298ded7aa508283b3b1c9d508676cc20a571ccd7b6dc SHA512 3354d000992f4e353b8991d9f9385f8e9d05486e061cff74b5849f7eb3bb16138641182c3f0ade8f9b087af642c9d33aa33667de2a3b688092af19f4e1495d99
-TIMESTAMP 2022-10-05T05:39:55Z
+MANIFEST Manifest.files.gz 29611 BLAKE2B 6cf4df400e6f2a68c497cba0d8d7a09034186d43cefe911b03d1b6c65c90d917fc5a27ef0234f20fdb58755e9dddb642c15da148b800435360ec21733910266a SHA512 0e2f0c96b780623ba870368b7797b94edc27b3ff2ade3722e89fc6b043643db87f0b6470919e3f00aea682d5fef6c46d289b4d76fc4bca049adb57e5f5eb4fd0
+TIMESTAMP 2022-10-05T11:39:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM9GKtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM9bQpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA0mg/+KBNynz6rjeAgHDkdlZCblH/6f0r9m3dXQ6VsJuy8l1e7XVdmxEAa5Dv7
-EX1kOx0kgR3i+V0Bp8Y8w7PZ/iDtRWWJnpUzhGJ2isS356I/JRT3thQ0OhqNv3Cn
-tRtahyL0NjLoqP2Sp87UT/QF1TnrbfwyNOse8lqVtPDEEgAagCfqBRGKosu9rtpL
-SgpgdHDor5TpfoqoATQD1jG/m3/111jrnEPcTUAbtCIz4YO084Sq817m6+AuL9hF
-RZOnk8jiDVAnWaX3xCIhoFHRxAyWzKCxquAcgM/yh9r0lpl0VAMnG3iU1OF1dpQO
-E2v8yJ5gmu2nWU3I20bBAKJSHweUMgNBhT6hnrtcCU01yYfypYcEcm+FZ4FgIvbm
-CzkMZtUtNrjZokTBB2ZGuBy5b8LbYGcj7cofHopbQQ+q3ozsnWcc/70ItLAFKdGE
-tNft2IAU3zMVXtYcEiAxCyWxH/98Z7JEH0aVrHp850rkl5HcOPSiwx9v+mXYs0Jg
-5ZYPCHWFLPb+1Nxv5GvjCjp97VyPFFjLt5Ia0r75fmVZHFhdV+DNTjaJ8Fi4niC4
-T9O6wSkrM/tRj03/fbWu78e/woZOTXd49rKikCuv9aHOpzTF+X+u3S6dybdRWtlE
-kpWRUSNqf2tQ/x6W9CWPi3GAFBKfP4zGJXTY+sZ96s3DolLGAlY=
-=uT85
+klCJyA//dt6vhcaZQTRXlSscZjnCoTosKmsov/1ZT63HxRxGhU2hbz21QF9TKW7r
+M35GOLc0lxptGPw4PdsjXV8Ff4jWVRRIm15ivmu6p8kopSu73Ns7QR9q2Ogq36tu
+E7gWg/hGMFAFJp3VGlLwRiXFqYGOQWx+RnW7dt9FH6yYwcfzIl0lxjG/gmVAwieU
+AObcN0LCXx7se7zr0WB1vz3JgdGwhFuk3hKGIcrk/ZSgBjlHHavOm8SGs0UhGsPm
+9ODaZDDhfd99WOOAOiw0OrRtHFwTivrMUwb81do1n+B3EDCQyGMQq6GiLWcop05k
+7RLjG2cHitCWClldbYbHk0oI/4hoRIJyDUdiw5bPIAHt5qVbz3OiWXLUDCqQiIJt
+ioIVl9v2yoNbc6nostO7N4800ZXd4H/i01JuPJUylsD8+06Z3bExvmxqhFSD8RDb
+NwjBIR4a3s0er0grVF+MtXDxpwk21zVhSshtg8Paro7nZdkzPOLI84mlfmDj//er
+q9jzdjpUsNYKX+fcpfhfWSaow2HMp77PIgY/zxGD4n+tWkZID+nP9CPyBArcKtiE
+P+nv8laP0+Sqtp2WFV88EEJwF8cvizPHg49a0Vm7UwpswpyWaZZVHXW13panvyYW
+pcMlhdEMDw/j2cyYYhpcZ2fCNPdsci891vyw+1aLX24Wy6yd9ig=
+=6FGd
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 735399f37457..e02b3b2fee00 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 17a6edbf8a47..f6d18f4d7c2b 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 147726260b47..8cd8d1b8f0a2 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,9 +3,11 @@ DIST aws-cli-1.25.81.gh.tar.gz 2273195 BLAKE2B 3bf3ca742b08c0bf4367ae1bfabcf8c26
 DIST aws-cli-1.25.82.gh.tar.gz 2273453 BLAKE2B 11c307a78df654634a7ae75cc8a7ce7d37697aa9ce792a3ad2b1a250291f2ff3574bea13219c072f223e4f27b7e5df757b49971374a5962f19b57ae00f77cd44 SHA512 90737a8cc9aac60970e705c5637672b74e89278926196c1363252038401e12bcb31672c878d2a3b6f213f5a5aac308e5b170e90342f6d270793aead3c8485eaf
 DIST aws-cli-1.25.83.gh.tar.gz 2273842 BLAKE2B 3b3986f539302830d981478cf485c9a724a0c1bd216b6a3952781eeeb96e58d0f7cf575a899e79e55dc2252d90c15c1cf2cbde755fa4f89ac4fcabbab788896a SHA512 7194d281477bc8f94b91901fdea57a1da44e703a04d28df9bb63a7f17370ec31eb640128f07b902a46892ca77377e706a0d99f6d53699a572c9cb2ef7d0f6c04
 DIST aws-cli-1.25.85.gh.tar.gz 2274915 BLAKE2B 074651fd32ec378c8f574266ff2a2e43ddb3d16fc7cb73dda75895819d948216acefe6e5c0da1ef059e36c4b684a6b360f996e3ff905abfc71a4c68dc78ad64d SHA512 ca6b6012fbe69467adfeade7f4b7c4cf40c50f2c62aee71c1e459bfa6597d3510e8ba087752c23ca77306e49cffbb68dde95167eed0d9313ab1488855b2aa4dd
+DIST aws-cli-1.25.87.gh.tar.gz 2285796 BLAKE2B 47df516ee23e9955ce8798546a2fecdc4b43199aa3daa5195c4dda010c3e4c86d2a4b6aac1dfd1c057cfb2f5ed9ea9a718b34aad09d8ddbb176ab3bfb4a86d25 SHA512 8beb4d70773c890dec4b4914c77d6fd73e4b66a6ee11316d0a851f17d6abc20cc67bf33d7209e8a285f84195d68c9f497eb8471ecb59438bf3b03353d960a8f6
 EBUILD awscli-1.25.75.ebuild 1856 BLAKE2B 0eb3b3a71f69685ea9ac8a58f5aa4016a8c3a07514fe928fbc09607d3aced456b6c7c6a4b0f40ca5efd79bb248f0a12fa8e2944018e859fdb52a2f5a2b50a9f8 SHA512 bddfdc9287ebae7ce226d0c46fc405b509745de6e2359f8b35b05910c731d7f326b7c18d9c4470cdef04f351619d301bce005ae054a6d60df1c0117c7c3a66f9
 EBUILD awscli-1.25.81.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 EBUILD awscli-1.25.82.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 EBUILD awscli-1.25.83.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 EBUILD awscli-1.25.85.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
+EBUILD awscli-1.25.87.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.87.ebuild b/app-admin/awscli/awscli-1.25.87.ebuild
new file mode 100644
index 000000000000..511be374181c
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.87.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# botocore is x.(y+2).(z-1)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 2e807f10c01a..67e37ca9ae84 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/mpg123-el/Manifest b/app-emacs/mpg123-el/Manifest
index 68ef77a2a37d..0127cc03ebf7 100644
--- a/app-emacs/mpg123-el/Manifest
+++ b/app-emacs/mpg123-el/Manifest
@@ -1,4 +1,5 @@
 AUX 50mpg123-el-gentoo.el 121 BLAKE2B db0ee430cca004ac595670289feffb469d121b605696fbacb01dec2422715e557047e29246ebee59b09d5db3b83a8411f70566ce22ee174a4f23296d2958165e SHA512 65b1d2039ce0773a65cf26fc88699ccb6fa26d7db2312ac6a9d0712512c214ba7b5758bd1556365836fdf840bcfc9eedef12f18bcdd1866fde6937777979a032
+AUX mpg123-el-1.61-stdlib.patch 186 BLAKE2B bf50c4d02bd3c77dd930030ffc40b0be353b2582f3792880d79fa29271f2e80d17e8c06dcc6478cd68021d6087769e41b6bc8dff5bdcf05f4048e71240480e78 SHA512 486f8d69f8cbda6eb9aea41b6b140104687f33a18eb795ed3c7bbd53e7a2a9fde5ee1c451029cdfc372f3d467b2af114e07bc1e3d98682ce5bc421451ee7437f
 DIST mpg123-el-1.61.tar.xz 34216 BLAKE2B 3f0f85bbf0f5854b899aefb443f9b2b011dd5dd85c815fc8be723bade93be805b121e952cab3c56a3897bed41fa65988331c004537e565abcb660b6dd402a0c5 SHA512 96b50a8fc945c6811bce7b8cfa28fe235f2d2ddf9cbd1904c94f272f6df13a991761dbb4f186c1bda04720fb50115515361dbff4838e7623261719f2ecc6698e
-EBUILD mpg123-el-1.61.ebuild 788 BLAKE2B cce6e1ee3b948ab4b854ef324d0d6752c27781606ea456ef14c042c9b340c0c0b10d33ab227a667f92d92a9d8712563edabe2fbd017857ccb4e68312edf626ac SHA512 be831915471752efa4be84ea68995f5949a4940acc836a38ed83d7f9786503234a71bea8710fcf22f7ac68e56b905f141561ac150ae9f2a5929bb4019318e8c4
+EBUILD mpg123-el-1.61.ebuild 832 BLAKE2B b05ba1f157a95b4a00e4ac996ab410deeded48c81f4ad78b22cb905c73a6a63fbcf96724f6006ff61a79a4a8a89f526fe235520bb00bc79ccab379d98cc92547 SHA512 24caf5041a7dcbc67bb690014e587b7fd484f89ddb9c1ed7dc2208a7cf1db356aac8379ae4db1bc519e02e3eda446bb4d58b3d2b02c4e887c95da36594ed3f1a
 MISC metadata.xml 260 BLAKE2B a187a6020d68e0ac53c6bb25461b0988c938fb112a8a7e3a906b827269347d70f8366594d404329695b4fa52fff2cde7fbc51d501e674bf8adc821a4141ccfcf SHA512 2ff2d68bb3c552f006474e86ecab8ebbcfcb35588384c045a665d305f79c739c4d80c0ea639a71c39123b8c5c1b3a96977ee8c0c3e973449a732ac3ac8f2c3a3
diff --git a/app-emacs/mpg123-el/files/mpg123-el-1.61-stdlib.patch b/app-emacs/mpg123-el/files/mpg123-el-1.61-stdlib.patch
new file mode 100644
index 000000000000..467cd58f564f
--- /dev/null
+++ b/app-emacs/mpg123-el/files/mpg123-el-1.61-stdlib.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/874954
+
+--- mpg123-el-1.61/id3put.c
++++ mpg123-el-1.61/id3put.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ #define INLEN 30
diff --git a/app-emacs/mpg123-el/mpg123-el-1.61.ebuild b/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
index 5be713b4ad46..77c5fde54e96 100644
--- a/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
+++ b/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,7 @@ KEYWORDS="amd64 ppc x86"
 RDEPEND="media-sound/mpg123
 	media-sound/alsa-utils"
 
+PATCHES=( "${FILESDIR}/${P}-stdlib.patch" )
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 23256ce62284..a5a7840e0e81 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 5e11d52fd034..d019dba986a4 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -11,12 +11,10 @@ AUX mupdf-1.19.0-Makefile.patch 1043 BLAKE2B 7f449713700d57c0bf072661babcb5122d0
 AUX mupdf-1.19.0-cross-fixes.patch 5740 BLAKE2B dcc38e628e1c0ddde9647d06ea8c58124cb7a1fe771e88465c0516ff3d1b50b820d2110107428bd762abe85905bc7b6cc283067ece88471442e76fab2fcaf2a9 SHA512 db4093d330c8ce9c9d1bfee5b708dd423e04eb6f2d5c87f8e5779d28bdd320f15b6847a308e87d183c9b38c5396c0518b70325ea09c9e8f4a733750e4cf5ca13
 AUX mupdf-1.19.0-darwin.patch 1056 BLAKE2B ae532c2d68842c3a1bb424c707a51a5ed56a72e7557e89b3830ac55bc713982065d1ec7055b84b91589c8b98a690d037c0fb6c90480fd89989e0f90cc49f9b97 SHA512 24cb6885c174bbfbe5ddc2e8f9a15c5154aa5699a19b5931d60ebb761a7587d717dbb65fba45070f963c0c3f432f8f58c00537d10b050546173a48f5c729a7c4
 AUX mupdf-1.20.0-lcms2.patch 2512 BLAKE2B b641519f069c43ef2e9efdf0e18418e663e3fa39d1fb2a0a4b759f8af0412e3a63f212961d80430de86a8ea3d8228ece07e2a04cbe08ccbe330afcbad18e3527 SHA512 d25a843286f9376f17cc73dd974835eaa7be7a0a7b26fab338ae5b3cf54588f476538c73e3053edc2367bd5856eb1af0ebbffce426f7da287784dcb0ee3fc684
-DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
-DIST mupdf-1.19.0-source.tar.xz 64077324 BLAKE2B 4c30cfc004b4f354ae349e5460327775a4dbdd689e561888c156e9e69e22b45ea1f260dfed8d2d8c017fe65a1e83cabc8ff29dad8de47a2c541f9e335bf11285 SHA512 421e8e49f83cf00bfb2c86b5425939056fe866a048cf18e4c8f5764cdee9829974eea655c944d0f3f5a9407347cceaef34030f4079aa399e798da3ff849230e7
 DIST mupdf-1.19.1-source.tar.xz 64884172 BLAKE2B a0dc3783c70cee1b7eb48d1658eb48186e35a42513aa9e98f7155bb82ed771ed0c5d5032013d09d93cdca4f49deda65553fe0e1af7645893722dafa855b2c958 SHA512 d6bc5b6adb6a418de50021864f4b3a75da653fa534eeedbfe9875cb202efeb13efdec66b4d108ca8fa6b0dc76733468b214e5fdf331bebc35fc6f722203fa3f7
 DIST mupdf-1.20.0-source.tar.gz 88455853 BLAKE2B 686d8b02972fc6cb7fa4541e4f0561c11e616f800decd20a79f23b577977785633bd3e17e2007f621db97dab6db1fcf500ac8e283984fbe675a25e7a4301b75b SHA512 6837299c589ece9cc443b027433fa3eee545f5155aeb6359b7a43da239d2e99195e9ae3950ddec6cb6ebae77bc877573c6f89a90754c58723d7e87d9739ed1f4
-EBUILD mupdf-1.18.0-r4.ebuild 4358 BLAKE2B 67d3b045314556eb3e81a668015e36115e7729436a91bfebededdf316bce062bac229c64b63f0aebae7553b8a5595fa0d4db53bb7a7a9b452a087967cd04547c SHA512 90dd0ae5d0376dafbce8b19d711d92ab9debceb467578f0e529881b219e8b3166fe5ec1f0b535036300a1e4a60d9969ba21450ca54b6f7e18f8631b035b8a4b8
-EBUILD mupdf-1.19.0.ebuild 4465 BLAKE2B 28283005cf1c4c688cf24544bedc20683d2e043221c74a3922e3f86b6affddbf8a0e62c8d79f8805bc5c5a508e999a57c4d212f6ec3f4b88036b512ea0251017 SHA512 ba83c50f6bca1cfcaabc7410f4fcfc842cdf8e4381ed7763af895cac78861f0f585069fd8b92d50bdc1e22baf30b56533a00b4ebfd8d0cb7515450c5f19eaf5b
+DIST mupdf-1.20.3-source.tar.gz 88457290 BLAKE2B b16abfd4d9ac8123f1be60350d6124b8f36b6e8260f266d4dc7798610819128519944de8179a9e5453bc28da695ef8557fd8d755439113e520a8cad19039e52f SHA512 ed3fe09971223c500fb85558bb3f8c4a605c82fca3cd2217cdf4758e44bdfe3ef4106c95037d7a8ea536117414e5acbfa14aa736bfb7e33e591050c12c07a0ee
 EBUILD mupdf-1.19.1.ebuild 4490 BLAKE2B cf556d6ba654118ccd0316fb75f2f970cb96990f254bf3c51aee44405ad2bab8bd3f5245f5d04fd4d713d8befd8a84b62632a757ae69396e5291ac6c8cb6b57b SHA512 b1ee92e6e10373980739bed7bffb1bd658d9b3830f82fcc2b3153c5296828a50b487164e686a69de31df6ea25aa6e0925b5ff5c997ec91a6cef1851a7bff76af
 EBUILD mupdf-1.20.0.ebuild 4750 BLAKE2B 9675a86e5f8bbf05933f49d422adb3d3d246953c7abe80eab58d75946265b4e5b4b17ed3e64098bc4fa5b1b0537884263ce50a084bf4f9109bd8f217212a2541 SHA512 591df3401dee953bb51499fb754e13127e32737dcbde3d924b02d713b1de8a7736e2c1bc123c24e5fb31a530a49c7a7eab0fc47ae8b9a22aea1206bb8df07989
+EBUILD mupdf-1.20.3.ebuild 4779 BLAKE2B 79af1d376447601328b099486e8d40118d12a981de030de612eae04a0eace1bce4e0e7e3c82a7b5794ab69f48d08393c20c4d5828a891ce3c4d101960b90d33b SHA512 e6a4b624de2a1b5021d4a6879ba480a3c677da4878fbd342b4d161c1e65e02c09fb4f0ad52b8f35c6a2dd5fa102359186b4a5ac783fe44d2dcdc1ecbee6c8a2b
 MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87
diff --git a/app-text/mupdf/mupdf-1.18.0-r4.ebuild b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
deleted file mode 100644
index 85aad834e2c2..000000000000
--- a/app-text/mupdf/mupdf-1.18.0-r4.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please check upstream git regularly for relevant security-related commits
-# to backport.
-
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
-S="${WORKDIR}"/${P}-source
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86"
-IUSE="+javascript opengl ssl X"
-REQUIRED_USE="opengl? ( javascript )"
-
-# Although we use the bundled, patched version of freeglut in mupdf (because of
-# bug #653298), the best way to ensure that its dependencies are present is to
-# install system's freeglut.
-RDEPEND="
-	dev-libs/gumbo
-	media-libs/freetype:2=
-	media-libs/harfbuzz:=[truetype]
-	media-libs/jbig2dec:=
-	media-libs/libpng:0=
-	>=media-libs/openjpeg-2.1:2=
-	virtual/jpeg
-	javascript? ( >=dev-lang/mujs-1.0.7:= )
-	opengl? ( >=media-libs/freeglut-3.0.0 )
-	ssl? ( >=dev-libs/openssl-1.1:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
-	"${FILESDIR}"/${PN}-1.18-Makefile.patch
-	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
-	"${FILESDIR}"/${PN}-1.18.0-darwin.patch
-	# See bugs #662352
-	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
-	# General cross fixes from Debian (refreshed)
-	"${FILESDIR}"/${PN}-1.18.0-cross-fixes.patch
-	# Additional security patches post-1.18.0
-	"${FILESDIR}"/${P}-fix-oob-in-pdf-layer.c
-	"${FILESDIR}"/${P}-fix-oob-in-pixmap.c
-	"${FILESDIR}"/${P}-CVE-2021-3407.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	use hppa && append-cflags -ffunction-sections
-
-	append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iCXX = $(tc-getCXX)" \
-		-e "1iLD = $(tc-getLD)" \
-		-e "1iAR = $(tc-getAR)" \
-		-e "1iverbose = yes" \
-		-e "1ibuild = debug" \
-		-i Makerules || die
-}
-
-_emake() {
-	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
-	#
-	# Bundled libs
-	# * General
-	# Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
-	# recommendations. It does not mean "always use system libs".
-	# See [0] below for what it means in a specific version.
-	#
-	# * freeglut
-	# We don't use system's freeglut because upstream has a special modified
-	# version of it that gives mupdf clipboard support. See bug #653298
-	#
-	# * mujs
-	# As of v1.15.0, mupdf started using symbols in mujs that were not part
-	# of any release. We then went back to using the bundled version of it.
-	# But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
-	# when bumping and check!
-	# See bug #685244
-	#
-	# * lmms2
-	# mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
-	# It is therefore not appropriate for us to unbundle it at this time.
-	#
-	# [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
-	# [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
-	local myemakeargs=(
-		GENTOO_PV=${PV}
-		HAVE_GLUT=$(usex opengl)
-		HAVE_LIBCRYPTO=$(usex ssl)
-		HAVE_X11=$(usex X)
-		USE_SYSTEM_LIBS=yes
-		USE_SYSTEM_MUJS=$(usex javascript)
-		USE_SYSTEM_GLUT=no
-		HAVE_OBJCOPY=no
-		"$@"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_compile() {
-	tc-export PKG_CONFIG
-
-	_emake XCFLAGS="-fPIC"
-}
-
-src_install() {
-	if use opengl || use X ; then
-		domenu platform/debian/${PN}.desktop
-		doicon platform/debian/${PN}.xpm
-	else
-		rm docs/man/${PN}.1 || die
-	fi
-
-	sed -i \
-		-e "1iprefix = ${ED}/usr" \
-		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
-		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
-		-i Makerules || die
-
-	_emake install
-
-	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
-	if use opengl ; then
-		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
-		dosym ${PN}-gl /usr/bin/${PN}
-	elif use X ; then
-		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
-		dosym ${PN}-x11 /usr/bin/${PN}
-	fi
-
-	# Respect libdir (bug #734898)
-	sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/mupdf/mupdf-1.19.0.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild
index 6dfeb8c2ecc4..44f07ffa3073 100644
--- a/app-text/mupdf/mupdf-1.19.0.ebuild
+++ b/app-text/mupdf/mupdf-1.20.3.ebuild
@@ -10,12 +10,12 @@ inherit desktop flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.gz"
 S="${WORKDIR}"/${P}-source
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
 IUSE="+javascript opengl ssl X"
 REQUIRED_USE="opengl? ( javascript )"
 
@@ -24,15 +24,16 @@ REQUIRED_USE="opengl? ( javascript )"
 # install system's freeglut.
 RDEPEND="
 	dev-libs/gumbo
-	media-libs/freetype:2=
+	media-libs/freetype:2
 	media-libs/harfbuzz:=[truetype]
 	media-libs/jbig2dec:=
 	media-libs/libpng:0=
 	>=media-libs/openjpeg-2.1:2=
-	virtual/jpeg
+	>=media-libs/libjpeg-turbo-1.5.3-r2:0=
 	javascript? ( >=dev-lang/mujs-1.0.7:= )
 	opengl? ( >=media-libs/freeglut-3.0.0 )
 	ssl? ( >=dev-libs/openssl-1.1:0= )
+	sys-libs/zlib
 	X? (
 		x11-libs/libX11
 		x11-libs/libXext
@@ -51,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
 	# General cross fixes from Debian (refreshed)
 	"${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
+	"${FILESDIR}"/${PN}-1.20.0-lcms2.patch
 )
 
 src_prepare() {
@@ -68,6 +70,11 @@ src_prepare() {
 		-e "1iverbose = yes" \
 		-e "1ibuild = debug" \
 		-i Makerules || die "Failed adding build variables to Makerules in src_prepare()"
+
+	# Adjust MuPDF version in .pc file created by the
+	# mupdf-1.10a-add-desktop-pc-xpm-files.patch file
+	sed -e "s/Version: \(.*\)/Version: ${PV}/" \
+		-i platform/debian/${PN}.pc || die "Failed substituting version in ${PN}.pc"
 }
 
 _emake() {
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 4fb9a3b2bc59..9aaf2d27d655 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/sqlmap/Manifest b/dev-db/sqlmap/Manifest
index 9c11ef52d7b3..62f7780fd972 100644
--- a/dev-db/sqlmap/Manifest
+++ b/dev-db/sqlmap/Manifest
@@ -1,5 +1,7 @@
 AUX sqlmap.bash-completion 5757 BLAKE2B f602d99b6b0a30cf405b390eaef355f7a4b4fa4260f0a18fe09a0fa7530af131b75ffc25ca161898f2ed4a93ef9251c0c88cb1ad25d78d870fd2ff19225e0609 SHA512 5024cfb2274a2798fcc7d12e59693253732f66c1389aed36cc31fb8e40d03f7e9a713e93e24711185b5d2d82dd2ac91ec2b6cdc4929c5ca3245fcb4f502d327a
 DIST sqlmap-1.6.8.gh.tar.gz 7205751 BLAKE2B 49fddc4b7c62c9baa5d6732bb9150bd2b3e48a671f9a3601ffc0821d5784fa02fbba37bc057ecd43888c2678ae477cca46b279e59b8a672310836218700df241 SHA512 e8849bb727ca84540fa9e44e580470aa6d853f7fcd1bddc2a51a5e4366a7eceedde80b3bd334f16753d5390ee0ac15fbd81551e79ada817bb11b6964dd439c9b
+DIST sqlmap-1.6.9.gh.tar.gz 7205911 BLAKE2B 7da1ae0201d0194c67bfc02b5f2e4e0319eb5820129da7c2708ec8012a7e9474a798767331c541ecea4e078a21d7117a2416ce7e2d135151512019e0ddc543d2 SHA512 ae1b78a75b591162898aaf273d476bd0d4a414820169c463e0694105e774c487bc546c6eb134d8200a51ddb152f5204134032e60f51484ba1a15af7040211d4d
 EBUILD sqlmap-1.6.8.ebuild 1332 BLAKE2B de701fae22dc510d882186d9ccb2b38ffd9159e1ad52408b6bf08994f9a26a83fa335d0a24ca884c3e4f85f54a46f600c7dd39163d63fdba52b14e3a49422431 SHA512 1b6efa626e7c37cfedec7c33bdb48f6c66825c6bf4e41bb61053959753654c6811f424dae6d9750c951bfdbab0f83ae2d798bca731cc771334c781089360184d
+EBUILD sqlmap-1.6.9.ebuild 1334 BLAKE2B 7aaeb296a821b93b5359dcce7639463f636dc6e23e5abfa50f34bb713a10c5975d52f22f92a5f401a8ab31721c52e5df913108d2f514b25d4392d76c6622ba25 SHA512 7cf620ece1b65143b68687f5b73d22cfbf3bae319f52e006501d5158a3b155b8496c361fd79a800ffa66008041991b1e5a10ac7b17d9b3565fe4bc64047f743e
 EBUILD sqlmap-9999.ebuild 1334 BLAKE2B 7aaeb296a821b93b5359dcce7639463f636dc6e23e5abfa50f34bb713a10c5975d52f22f92a5f401a8ab31721c52e5df913108d2f514b25d4392d76c6622ba25 SHA512 7cf620ece1b65143b68687f5b73d22cfbf3bae319f52e006501d5158a3b155b8496c361fd79a800ffa66008041991b1e5a10ac7b17d9b3565fe4bc64047f743e
 MISC metadata.xml 847 BLAKE2B 31fdd4fd94a4b6ad8c775bbbc9cb48b5627f2f5944a7bdaf6c30f3559044dda6cd92be3b50c8baf462b1e2e4ea4aa905bbac88c616cbfbc833a4895a1944b0d6 SHA512 bddfbc5ce988bc1770a2ad1d6952d8ef44010c9e4ef789500f0408c7c5754960804f270bb6e24e4739852cdef07b3f22111ad9da453648730f045d0b2c3deea9
diff --git a/dev-db/sqlmap/sqlmap-1.6.9.ebuild b/dev-db/sqlmap/sqlmap-1.6.9.ebuild
new file mode 100644
index 000000000000..6b74d8864800
--- /dev/null
+++ b/dev-db/sqlmap/sqlmap-1.6.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit bash-completion-r1 python-single-r1 wrapper
+
+DESCRIPTION="An automatic SQL injection and database takeover tool"
+HOMEPAGE="https://sqlmap.org/"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
+else
+	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# sqlmap (GPL-2+)
+# ansitrm (BSD)
+# beautifulsoup (BSD)
+# bottle (MIT)
+# chardet (LGPL-2.1+)
+# clientform (BSD)
+# colorama (BSD)
+# fcrypt (BSD-2)
+# identitywaf (MIT)
+# keepalive (LGPL-2.1+)
+# magic (MIT)
+# multipartpost (LGPL-2.1+)
+# ordereddict (MIT)
+# prettyprint (BSD-2)
+# pydes (public-domain)
+# six (MIT)
+# socks (BSD)
+# termcolor (BSD)
+# wininetpton (public-domain)
+LICENSE="BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain"
+SLOT="0"
+
+RDEPEND="${PYTHON_DEPS}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=( doc/ README.md )
+
+src_install () {
+	einstalldocs
+
+	insinto /usr/share/${PN}/
+	doins -r *
+	python_optimize "${ED}"/usr/share/${PN}
+
+	make_wrapper ${PN} \
+		"${EPYTHON} ${EPREFIX}/usr/share/${PN}/sqlmap.py"
+
+	newbashcomp "${FILESDIR}"/sqlmap.bash-completion sqlmap
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f31df47d5853..d74654c04801 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index 51150fa3a3c0..dc6324f34b79 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -1,4 +1,4 @@
 DIST keystone-0.9.2.tar.gz 4433222 BLAKE2B 5654ae6a66ccf6832fbdbb8c1083a2318e413bb833a0fadc4e1374f0de601e3dad9f354b1dec92d9a944621923458e432510299c1b55579ac9bb6b6e90a818de SHA512 5d4dd30410410bc7848e75a2e31e8ecef6241ad25e21963aa7a07bbea21d95b75e235c80573129014102684c9647710ace3c0776a8401844d7e4b45cab7bd04b
-EBUILD keystone-0.9.2-r1.ebuild 2030 BLAKE2B bb014d629ca37df08d6d8915410be37381156a2653b0b2dcf493b6076cddd0476a0278aaf109abd5ea1ab04fe5ef753d7c05398eedb32bf8b5c4497b8a47099a SHA512 32eea0582795692a727e4c748c03147219e1a2555d1aea8a5ceb332ab18c516c8eb554e2f39435ca6d2932594d354e34e1b7b08aa0425b4eecfc25a117ddb815
-EBUILD keystone-9999.ebuild 2030 BLAKE2B bb014d629ca37df08d6d8915410be37381156a2653b0b2dcf493b6076cddd0476a0278aaf109abd5ea1ab04fe5ef753d7c05398eedb32bf8b5c4497b8a47099a SHA512 32eea0582795692a727e4c748c03147219e1a2555d1aea8a5ceb332ab18c516c8eb554e2f39435ca6d2932594d354e34e1b7b08aa0425b4eecfc25a117ddb815
+EBUILD keystone-0.9.2-r1.ebuild 2095 BLAKE2B b48f0c965e33bcf51249d748f6df27328193ec65cb7b0c3c2ba2f0dbc00b90a2ae39cd17a78943aa6006c57db7ecc724ab682c66113dd30f9b66ed0bee6d133c SHA512 f979113e30dfcabda4d5e2eba06f454a4a04508a544f3aa13585b852c276e9150a868bedb2442005573f1726d14ee4909a4643f2d114c0658375260836b0fac8
+EBUILD keystone-9999.ebuild 2095 BLAKE2B b48f0c965e33bcf51249d748f6df27328193ec65cb7b0c3c2ba2f0dbc00b90a2ae39cd17a78943aa6006c57db7ecc724ab682c66113dd30f9b66ed0bee6d133c SHA512 f979113e30dfcabda4d5e2eba06f454a4a04508a544f3aa13585b852c276e9150a868bedb2442005573f1726d14ee4909a4643f2d114c0658375260836b0fac8
 MISC metadata.xml 500 BLAKE2B 4b4e43ac4694c90c31773bede3c829801ab8ac33709a750bf574b3b4808fdb2ab10c655f16a6b19afbd9981eda154cf2fe40f62c0ade3457bad30fe013b37e38 SHA512 8380f6fbc99e23fbdcc5e820207b63082c903d5b41ff91a899acb1d6a6262eba63a17e4f930b8b56a6be1cb301b0605cc1a4413d62764208416017d520206785
diff --git a/dev-libs/keystone/keystone-0.9.2-r1.ebuild b/dev-libs/keystone/keystone-0.9.2-r1.ebuild
index 68f71673a12f..a6f8dcdd8897 100644
--- a/dev-libs/keystone/keystone-0.9.2-r1.ebuild
+++ b/dev-libs/keystone/keystone-0.9.2-r1.ebuild
@@ -56,6 +56,10 @@ wrap_python() {
 	fi
 }
 
+pkg_setup() {
+	python_setup
+}
+
 src_prepare() {
 	default
 
@@ -73,6 +77,7 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=ON
 		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
 		-DLLVM_HOST_TRIPLE="${CHOST}"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
 
 	cmake_src_configure
diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-9999.ebuild
index 68f71673a12f..a6f8dcdd8897 100644
--- a/dev-libs/keystone/keystone-9999.ebuild
+++ b/dev-libs/keystone/keystone-9999.ebuild
@@ -56,6 +56,10 @@ wrap_python() {
 	fi
 }
 
+pkg_setup() {
+	python_setup
+}
+
 src_prepare() {
 	default
 
@@ -73,6 +77,7 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=ON
 		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
 		-DLLVM_HOST_TRIPLE="${CHOST}"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
 
 	cmake_src_configure
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 536b9e573c04..9208defc36e8 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -7,6 +7,6 @@ AUX protobuf-3.20.1-protoc_input_output_files.patch 10066 BLAKE2B 1a5c045cc1c30d
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
 DIST protobuf-3.20.1.tar.gz 5368262 BLAKE2B 1ce1aef2e4c4f3ea4863629cc75d89fe17d0c7ac0c342ac641c787456fd4a12756c2892a27ddadedc94a7201494ec84566638ce33a03cb0c867b04e9eee0edb3 SHA512 fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0
 EBUILD protobuf-3.19.3.ebuild 4138 BLAKE2B b37b99abbd41acfb2299e1a054d3c36547bdd63542ecc76d03d69344d7e89a03870eda97bba1ae6ae3284c33abdfca6930e74b6ab7109d93cd588c522d6d52f6 SHA512 2eadab6fd0f4b30338a294b69c866ff945e98f05549403484700b2e44314433736a682ab033bc4c2eb0a802934cba92567e6c9bad4d30d79a67d671f88e04591
-EBUILD protobuf-3.20.1-r1.ebuild 3937 BLAKE2B d0212072ae43761d3e3b295867f2c12a36ba83da1d99f9189a2e5f3b6b3a8ba7aa40889da38d51ca0c1c61f0fb0ebb8a4ce1d5e8a563ddba60e32e1f2b25468c SHA512 38dcf75fed5f515b2d38427d478abfa12f315dc7775fea93c5d900dc9bdd337b462917b5af9785e7907440b7aca0fedc4b1af88eb1dbbf546a12c0e117b73c46
+EBUILD protobuf-3.20.1-r1.ebuild 3936 BLAKE2B 70402160b4e1962e186d7de8719ea838db1115b5e97bf84afeb11f69c9be6e4255016b35ba10b6a6f7b431d88092a3b0d0d3c639eee4f272d02c790ee4929718 SHA512 8cbc609c40ce0fc17882b2269ef34fa4bcb71e50d7beeb7073c21830df8d4e68ae5990f99a0d033c95aa31f1a1d5c7fba2e996494e91a33bb7829317b946fea5
 EBUILD protobuf-9999.ebuild 3938 BLAKE2B 35b8a868ae096c0f74b5037051278e79ec8f0cf869b9effb038015ec11ff4775d04d13b6ffa8978066111e86d9387b23d2872ddc5991f3f9f71f11f2aebac064 SHA512 8edbd0f333611fdc9590369339cd68bff7e32a7f193c3cba72ccc3e923a970b205147accc430a4fe0df3e1edc0a0970f2857782728b82a6e78d4a631109e3849
 MISC metadata.xml 595 BLAKE2B ba1b916e26b1e53f68e660f03d2e53fea8d22db04e8241ebec3ec20fbb251c2b164cf25d5fb6118423ce7721a822ae2302aab137b0748730e9a6860bf8e65668 SHA512 785e2550621b79b6350e1a6b52ed9992610769885fb29a9e92ee45a35158cc08707a3590dfcbece9ee9a5e16e1abfb614e8186132da7b942f2761b5e6ecfa827
diff --git a/dev-libs/protobuf/protobuf-3.20.1-r1.ebuild b/dev-libs/protobuf/protobuf-3.20.1-r1.ebuild
index b8655b4c64ea..443543ecd14c 100644
--- a/dev-libs/protobuf/protobuf-3.20.1-r1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.20.1-r1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/31"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ee7b6846855e..1bdf7fe54990 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 6abecba0b193..01c1d8141a17 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,6 +1,8 @@
 AUX aesara-2.6.5-compiledir-tid.patch 1707 BLAKE2B 77f8fa3618f930dddad8e864dee3e73fc0b965018d508be5877d5bcae4430024c4e4f90e905ac912da22a4d4934d6fc71acf4ebd49b7e8efb12c90dfaa072ed2 SHA512 9b6bbd8bc56f61c89dfd85cb18251ff8d73d717d91178efa9309e6b897dbda28937dea84f1d7d1a917c285219d51c0adcee1233112f2dcdb9f8c7b714a6c6c12
 DIST aesara-rel-2.7.9.gh.tar.gz 7919763 BLAKE2B f877edcc824f3d790a56422a0fa660e8e3f653fff7e3d87ef4a95fa76369b1bb5df351a571ea039d66d79c0f564512437672df76c3b82e7d660c865cf908dea3 SHA512 061f7e39343eb081b28dd20b1eb7ffc226b7e4b96695d5beb9e28eb3f5ec9480c02c7889c932290248baa908dc0047c19e4cef3c220eccc4cc617b2050a9614e
 DIST aesara-rel-2.8.6.gh.tar.gz 7941385 BLAKE2B 8e01e8afe7a4a33ad133d2759336dea66223c7f001c963d937bcae903f315b4dffbd0e877fbfe2f1b7f31b7f73acd8b7ac38a716337aa129b9a36b0367715f96 SHA512 abfa9f63f096eb6d8961eaa700a13f41833ba79d684b83fbcd7bf4a9d8f0ab49eae1bc3d1249817cf03f63526127612482cbc79c03bf2596743caca810f1fc56
+DIST aesara-rel-2.8.7.gh.tar.gz 7944368 BLAKE2B e4b9bf0df3d5bc1745645b4034ca8b94e6a8dbf12bc884df2b0c7701634b4b2015d6fdbf77854da88c6fc6ed89b369a561a289522c7790add70ff281c6088b8f SHA512 0b847424a0e91c4e07b8edefb5f8d1ef46e476c4622fade95f2a7a3b459097c82b62b6f215d98d4de8e8511e50a0a82e4c3b7573d45ac0e0c8ec3b80ae9c61f8
 EBUILD aesara-2.7.9.ebuild 2746 BLAKE2B 3ddf8cc5b6315569f61be3d43d8f7d8f1e484657024462ef9466cd6e06e01377a18e015157d799a95b661677a9d165dd445903d305c99dc2c2f8b40a477c226f SHA512 7f37bd5c185747f64a3b77603df2c09113aabd0cd38e04e6df3a107342342f8d9eaaa824cc999db137ec9177ee0e4de5c10dbaa35937ab745145034f941add44
 EBUILD aesara-2.8.6.ebuild 2929 BLAKE2B 6b8a83d3c5353f7442cf8949a589f14e89d2ba76fc0929118df58becf9374d4a76060cf1c3570d80ef28bd0f3c7c0198afd453adabeac71ff074c94c43012224 SHA512 9f9be4b85882008b4acebab068e0d6e386c171196f2e2ae4d41f75f673d522006408a754ea17c2c6f06394dfd497fd33a31be1f74b700c9ad1719d21d3d48948
+EBUILD aesara-2.8.7.ebuild 2929 BLAKE2B 6b8a83d3c5353f7442cf8949a589f14e89d2ba76fc0929118df58becf9374d4a76060cf1c3570d80ef28bd0f3c7c0198afd453adabeac71ff074c94c43012224 SHA512 9f9be4b85882008b4acebab068e0d6e386c171196f2e2ae4d41f75f673d522006408a754ea17c2c6f06394dfd497fd33a31be1f74b700c9ad1719d21d3d48948
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.8.7.ebuild b/dev-python/aesara/aesara-2.8.7.ebuild
new file mode 100644
index 000000000000..00f30feaabf6
--- /dev/null
+++ b/dev-python/aesara/aesara-2.8.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="
+	https://github.com/aesara-devs/aesara/
+	https://pypi.org/project/aesara/
+"
+SRC_URI="
+	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/etuples[${PYTHON_USEDEP}]
+	dev-python/logical-unification[${PYTHON_USEDEP}]
+	dev-python/minikanren[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	<dev-python/numpy-1.23[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-48.0.0[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
+)
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not claim "bin" package (sic!)
+	rm bin/__init__.py || die
+	sed -e 's/find:/find_namespace:/' \
+		-e '/exclude =/a\    doc*' \
+		-i setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+
+		# dunno
+		'tests/tensor/test_elemwise.py::TestDimShuffle::test_memory_leak[False]'
+
+		# TODO
+		tests/link/c/test_op.py::test_ExternalCOp_c_code_cache_version
+		tests/sparse/sandbox/test_sp.py::TestSP::test_multilayer_conv
+		tests/sparse/sandbox/test_sp.py::TestSP::test_maxpool
+	)
+	local EPYTEST_IGNORE=(
+		# we do not package jax or numba
+		tests/link/jax
+		tests/link/numba
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AESARA_FLAGS="cxx=${CXX}"
+	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
+	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
+
+	epytest -p xdist.plugin -n "$(makeopts_jobs)"
+	# clean up the compiledir, as it can grow pretty large
+	rm -r "${HOME}"/.aesara || die
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 27d85844c24e..c35d5b91db60 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,5 +1,3 @@
-DIST arrow-1.2.2.tar.gz 123174 BLAKE2B b8b8d83ede0c61840ffcc75272a0275b6120cc142197c5f95f0fdb7d53981879b431f074db9606caa8d9817761cc4847a525bbc6449c05155410808960a1541e SHA512 f88afa9a0bc967e8731a7bf1712ecf3810f12ade9cc53a94a74efd3ece750f37bea7541a054eb9acd12b99b4a6d32687eab4eae20a6f49b2c2d6f1b499221542
 DIST arrow-1.2.3.tar.gz 127552 BLAKE2B 35f5b694d819d80913b5938e4af71f413fd3944636c1e89a79e868c03cb423f75692c1f0e8d85dba21e640591f8cd0404cdc6d77dd59956490d268fb4c9fdc7b SHA512 e90276f50bf8521570cc2cdbf011ff376e0d5bada0576bbfc76f6c63730c13f7eba1d978cc3a481e7c7356b0dce7c554f19cbf3ef03b280c5515be72d2c7d177
-EBUILD arrow-1.2.2.ebuild 846 BLAKE2B 3fdb796f021cad10329a9176b19fabb1b27a8587a1bf67fa5b3042d1e60eaee5cbdb1222e0bd8ae4e4a62b3cc13323d1c214d0b5832c87d274dcc546f73776e9 SHA512 7e6b587abb10862bcb7c22241bda056f97ca95381b2e6ee4fbe98f0a0c1e09c4296fdd13b35c5987f61508e505e1fd8437a08d57036d52e641a1be105dfa3d24
-EBUILD arrow-1.2.3.ebuild 854 BLAKE2B b9166355a24e6946c0ce79699ec27dce11cc4065ffb498a9272257ae98769cd675a8fd3511571b33531d3af7573aa641b951ae8302763fb9eb9f3f3a23bb7509 SHA512 100b053bb9857aa1102e94b1ccee0c0f458f12abeca56ef5dc6cc911b820ed61cc2889bbcc609ec9ce5546a1c74ecf1b36d6c485b28ebd66a31b256f3c483a8f
+EBUILD arrow-1.2.3.ebuild 846 BLAKE2B 3fdb796f021cad10329a9176b19fabb1b27a8587a1bf67fa5b3042d1e60eaee5cbdb1222e0bd8ae4e4a62b3cc13323d1c214d0b5832c87d274dcc546f73776e9 SHA512 7e6b587abb10862bcb7c22241bda056f97ca95381b2e6ee4fbe98f0a0c1e09c4296fdd13b35c5987f61508e505e1fd8437a08d57036d52e641a1be105dfa3d24
 MISC metadata.xml 387 BLAKE2B e07417bbea7b9b1a8b850dda631d1e626e013a6cac793893deafec648003970a6240833af5ecc3a9b19aff3ea38e26e684a7a151f1138ed9d8597b567d3ca960 SHA512 ea9a24239141a4338c7d3291e2be9dff5d36f33f91ec3fefb62c7fd054b0c7a80ce66b6916f045aa3eaf69cc4f2f3d116a525958fb0f6185b98a10660bc08e50
diff --git a/dev-python/arrow/arrow-1.2.2.ebuild b/dev-python/arrow/arrow-1.2.2.ebuild
deleted file mode 100644
index b71d302be4b1..000000000000
--- a/dev-python/arrow/arrow-1.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Better dates and times for Python"
-HOMEPAGE="
-	https://github.com/arrow-py/arrow/
-	https://pypi.org/project/arrow/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/addopts/d' -i tox.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/arrow/arrow-1.2.3.ebuild b/dev-python/arrow/arrow-1.2.3.ebuild
index edfe817caa50..b71d302be4b1 100644
--- a/dev-python/arrow/arrow-1.2.3.ebuild
+++ b/dev-python/arrow/arrow-1.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-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"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 416cccaa73c1..f05b7c9ab73d 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,13 +1,5 @@
-DIST awxkit-21.1.0.gh.tar.gz 16516204 BLAKE2B 2891244e7dcb0aef7b2053713c4479b94528a69f1225a77c46243cb293ebfa2e86d59939bc906223e598c34a322a726c9b3f5fb9aa7859191385f9c15bae57a0 SHA512 2e2ff1ae5a1893e3ba464ff0ab3c5e98b7d0711c3ba1512b8a8f89e55385ab85df9623b23d6a81b2a800b0b184de1ef82fd23a655173fcbcebb1160e9eef973c
-DIST awxkit-21.2.0.gh.tar.gz 16531568 BLAKE2B aa6677408415b2abd6a8d0f3286e2147f0e5ad3d7650feb98dfe018c89431bf9b4fdc8c6c1c76aa9a26fe0d7c8a438cfa209fbe16b7480c7295c60352e30e21e SHA512 d2be8ffacc5b82600ecac5d909450f9eef3d205075c9783849bc50030abcc84ca6cae3682baf20de8e0efb9f651aa03374941d59cf52f9d4cb4b7892d5c0353c
-DIST awxkit-21.3.0.gh.tar.gz 15808522 BLAKE2B 0c8f563601e8140af763ef88d9c69232b1c5b5de726962c210883af78d400286f7a415971311a7543b150d165c10cadbfbbd11d58ea8b9336efe9db7a7d29493 SHA512 05f2996a51aedc059041d72a50c21b3dd161c958ac869e4c9d36b45ae483e2e4c6a743e8ba336acde8108fa43d9eec0131d76a8ef3cf0dbeec1416dc8317c698
-DIST awxkit-21.4.0.gh.tar.gz 16058858 BLAKE2B 215b18809bd1050c6e93a03711fd8cb1b96299c2f335d01e7c40ea54ee9aaefab652f86826914e908ff4a19a02e79a61fc13edd5533c6b619366f76aa7fcfa46 SHA512 fc4513e7adcbf75aa801dfedb1f92a08e1dbe804a0a8b18809ec5ef98dd42bdf08856c486a9781cc6d34a932a86d587a90eac28099016e956c7468078d44d3ba
-DIST awxkit-21.5.0.gh.tar.gz 16077945 BLAKE2B 06e4b67fd49f9f11d65c4209ef70732e4dc33613c1875f4827421da200d2e7a7eaf8774c14a8f7713ce9227fc477103b114f6d2c170ed180e1cd101c59ca4c4a SHA512 7d90e1cc8133c3e5dca3a73e718c6449fc75e85fe7a1e1e28c971bc4883d249ed2e17124b5d1de06fd0adac358e49a3987620cc5d274bd666a78bc5cd75577fc
 DIST awxkit-21.6.0.gh.tar.gz 16088139 BLAKE2B f23c0fb89380e6d716fe5e36afd6cf9f79ab07aedb6ed7dc081a21f09fa8f8e2ed5fd6199f26759c4fdd08db6459b6cd80affa00d18e06ea5bc897957bb65edc SHA512 87c6ba1343a17faa4e4d70b76b9ec4b04b74a6f1ff02e44b02838a21d5242ebb25daaa379e0e1d3ff8d59782f7ce0d30c17cf3984d34d74ed8fd3f9dac316097
-EBUILD awxkit-21.1.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
-EBUILD awxkit-21.2.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
-EBUILD awxkit-21.3.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
-EBUILD awxkit-21.4.0.ebuild 996 BLAKE2B 7137e273e2cbf2b5c494d94613f4a733844f6e9b71f2756f3d83d05a6678528654cfab2ef4e3b040fc223bc76c4507ce8c812bfd81c37dbacb3c456c129f35ae SHA512 72c18b13604394614e0cc429482448ba03a90737f8a7ffe7e8158fb8156cfc2f037cf40b8fdd4442349008d3c0a87f5cb828bb3bc7521b9d51da1621aa4d15d8
-EBUILD awxkit-21.5.0.ebuild 996 BLAKE2B 7137e273e2cbf2b5c494d94613f4a733844f6e9b71f2756f3d83d05a6678528654cfab2ef4e3b040fc223bc76c4507ce8c812bfd81c37dbacb3c456c129f35ae SHA512 72c18b13604394614e0cc429482448ba03a90737f8a7ffe7e8158fb8156cfc2f037cf40b8fdd4442349008d3c0a87f5cb828bb3bc7521b9d51da1621aa4d15d8
+DIST awxkit-21.7.0.gh.tar.gz 16131338 BLAKE2B 32d29f16071ae75b26d0effaac51c70d773aef6e7ab53b0db9857922da019108439565079e538280bdc0fcc88bab03bdadcc46f32c1d12a41dc3c65d8d3ed6f2 SHA512 7a8212049983c09680de6a76d87a71b4bee735014cee72d8c3f4aa4000812ea701972214585dbc22d0d5ff6ada094d58dbff4001b332a4c0c8ac7ddc2f31fdaa
 EBUILD awxkit-21.6.0.ebuild 1034 BLAKE2B 4dbfd1dec5e7da937077deef63cdc126f2da1c3dea359dd11de4e055cde4db565113cb7346ba1aa08cf62e7ad6afa59a50b26fb52ac37df97df7c4957534358f SHA512 51db9e6d0befd806f5ec9b5889e474661d0d93d71fe6302ef3d68b9ffb75015ee8ccab9ac9089c2ab00f0e0c7b428d5acaa589a1b5843731036f04063a54a191
+EBUILD awxkit-21.7.0.ebuild 1039 BLAKE2B 0ba2e39951cba9166eac0b152e2f66044c60db6767e191e58bcd69b4179cc486f9ea468a6c23bede12ef1c422032c1ab1145f0611c34dfd66bb2588a6ff712d9 SHA512 db97aa7ebe4e8e06917d0888da8d55d7795c88b4c81d1ef3a9931250183945e9c654f77c7507e0e87a6761e1a69b657f847e7bf18da3432fa217049e1c538bbd
 MISC metadata.xml 512 BLAKE2B be7f98bdaff6b814e03c9f6c816a0f1f59dc2e8763298f8a48107ea50b0534eddb314bb6d8b8a0f8c1d7c89c381916031544eea4a06068fb9acab4d2c8c48a57 SHA512 7322d992e1d67ea200df0cbf144d08fd387d7cd6ccb72191fc94dd605c9aeecb4b8083917760e2203296d5514fccd7ca621133aef6622658d1ef2c33171c8b7d
diff --git a/dev-python/awxkit/awxkit-21.1.0.ebuild b/dev-python/awxkit/awxkit-21.1.0.ebuild
deleted file mode 100644
index f63cc6bc217b..000000000000
--- a/dev-python/awxkit/awxkit-21.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="https://github.com/ansible/awx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/awx-${PV}/awxkit"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-e "/'clean'/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/awxkit/awxkit-21.2.0.ebuild b/dev-python/awxkit/awxkit-21.2.0.ebuild
deleted file mode 100644
index f63cc6bc217b..000000000000
--- a/dev-python/awxkit/awxkit-21.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="https://github.com/ansible/awx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/awx-${PV}/awxkit"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-e "/'clean'/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/awxkit/awxkit-21.3.0.ebuild b/dev-python/awxkit/awxkit-21.3.0.ebuild
deleted file mode 100644
index f63cc6bc217b..000000000000
--- a/dev-python/awxkit/awxkit-21.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="https://github.com/ansible/awx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/awx-${PV}/awxkit"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-e "/'clean'/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/awxkit/awxkit-21.4.0.ebuild b/dev-python/awxkit/awxkit-21.4.0.ebuild
deleted file mode 100644
index f68b06f1595c..000000000000
--- a/dev-python/awxkit/awxkit-21.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="https://github.com/ansible/awx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/awx-${PV}/awxkit"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-e "/'clean'/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/awxkit/awxkit-21.5.0.ebuild b/dev-python/awxkit/awxkit-21.7.0.ebuild
index f68b06f1595c..ff1d3d22146c 100644
--- a/dev-python/awxkit/awxkit-21.5.0.ebuild
+++ b/dev-python/awxkit/awxkit-21.7.0.ebuild
@@ -9,8 +9,14 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="https://github.com/ansible/awx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://github.com/ansible/awx/
+	https://pypi.org/project/awxkit/
+"
+SRC_URI="
+	https://github.com/ansible/awx/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 S="${WORKDIR}/awx-${PV}/awxkit"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index d2c57a6676ef..f528e6558dc8 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -50,5 +50,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST zeroize-1.5.7.crate 18861 BLAKE2B 5f203d91aae732b928e2acd02656a486f0f930b8daea96b927552f5790862489d83c7bd48b0c7c62a3273e7a04833a16149ce489847f17fbb037e88922d359a2 SHA512 e0688681bceba324d36ea4dc552791801dc93b5882d106b79dd317af99cb718b711899bfd09917a811d23096693448801e64f0651bd9eeae7895618821d88fa9
 EBUILD bcrypt-3.2.2.ebuild 719 BLAKE2B dd033ccbf20e44b0856982e9194a8a73761c902bb8b71459aeacb89b53e1597fd684508c182a576d16040ad52931ce4d45c6f58a1c9c08874c6c7a04dd498659 SHA512 858ba2dfd8f85dad3eaac81ac2dc0b54dba0839d7c0670e92f7b52eee24003c57c5038ff39b03025048ba7485741255ca62ae008c6c94f1b45d96a3817e16cd6
-EBUILD bcrypt-4.0.0.ebuild 1707 BLAKE2B 1db4ad8f18dbcc2295983668b6d47534b09b8b85c0731d4abfe2eee7801cb93ec2253780b6f3924cfd294a2714d48c18e10543605cb3bdb545eefbde7bf5f787 SHA512 17d4dfde2233e09757bf7af2cb5a3cb09b871e3d69b400ab81c4771772a81b505d7732e62c89a1541fdefcdea09c174f8dfb9169bb57ff8a8e7a2b82638ab991
+EBUILD bcrypt-4.0.0.ebuild 1703 BLAKE2B b347c1a6fe51f69e559c7281d05018bae4ad0a1dd66e8b97e962cac23ffb0f0270cee235953ab3c34135cda1d4305440cc8cae8f6363879c02a8a27a2fbac7c6 SHA512 4b504afc09a843257c20c6b4289dacaa381efc3270490b2f477573e425bafd9fbd9609aec50b7e44190c68f8029326cdc0082c4deeed35a8368fd05410254452
 MISC metadata.xml 486 BLAKE2B 874ef427438f2a2adc0529010628dd40505fd2597e267b8e51641d95b4c3bd8dab28d0fcd86c23f24c3abc866bd049d5e44438b282a5a13b023320491303a5b5 SHA512 de2e0a2a60b83a660a7c51315816a2762d9ebdb031656b8968da641d4e3897e4f5eb7a3432f828182f733ee4ffd17f11e8fb97d9a72f1a7eec56bb2f46978293
diff --git a/dev-python/bcrypt/bcrypt-4.0.0.ebuild b/dev-python/bcrypt/bcrypt-4.0.0.ebuild
index 5af4cea8a9fc..f910b967f0ad 100644
--- a/dev-python/bcrypt/bcrypt-4.0.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-4.0.0.ebuild
@@ -74,7 +74,7 @@ SLOT="0"
 LICENSE="Apache-2.0"
 LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016"
 LICENSE+=" Unlicense"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	dev-python/setuptools-rust[${PYTHON_USEDEP}]
diff --git a/dev-python/boolean-py/Manifest b/dev-python/boolean-py/Manifest
index b54a6536f8f7..b7a1f90421e4 100644
--- a/dev-python/boolean-py/Manifest
+++ b/dev-python/boolean-py/Manifest
@@ -1,3 +1,3 @@
 DIST boolean.py-4.0.gh.tar.gz 33855 BLAKE2B 68e183c670684d2f92ad94f2b88616c932c2a85db40fa1a2552bc60c9bf03999bb456e0a91623afba2af4f2c89ef6cacf0c6f0267ac55aadcf02e67c8324c8f6 SHA512 2c92188645c4949478b40c2879f02a0eb6f3f92c0781a910862fcccebaa3476b9f2668ef40a5faec9d5c3a9c7361043a8e1b92ed98e282d6ce89c56b8ac0c2ad
-EBUILD boolean-py-4.0.ebuild 587 BLAKE2B 3ded460fdd8fb926d6f79ec8b9ffc41e7771fae49cce6c8b68c8e91cf5727e23b57b1bc27e7c395585bbea0e48a6f6c3e5293bc06539dd169df9e5191d54e728 SHA512 b4737b404c4bfa353723d8a3d69829dfa10604f1c94d875e627910a962668e7e91e4369758442f2bc9c94c4405a35a523ee6fbe201c98d14f41e31fc96474b9a
+EBUILD boolean-py-4.0.ebuild 594 BLAKE2B 0b79b86244d8e4d808403483e082e3fa25e43632ea87085f9ed65ea28aced4d7195a269275fa3c5348bc1535733b3f30397ed5bdeffa809c9c6b81d13055df60 SHA512 35326817a44b12785bdd51f36ed73a07f51f95d469ac31c7f03d6fa3be78f96b9a805acf29c19b3b2276e0c86df9c13762f3e0cdf78a06ae734d699b0c183556
 MISC metadata.xml 374 BLAKE2B 4dc485dc736f6d9e3e47ca111cb85e0770d8701bd7a10587f6aaa035723a66f225eecb633f2a127255051637c7f64d17f69d9f449a50f00b00cda766b88503c2 SHA512 940cc16f6dddb68c7154bab0be91f5c5639e4f3563a1efa2d56a4a17ec8dbe70f86f7e53be6cb082283d2c650edbfcddc406419a6acdfe2ebc8035a12b17c35f
diff --git a/dev-python/boolean-py/boolean-py-4.0.ebuild b/dev-python/boolean-py/boolean-py-4.0.ebuild
index 65646778da9a..c58b5873c8e3 100644
--- a/dev-python/boolean-py/boolean-py-4.0.ebuild
+++ b/dev-python/boolean-py/boolean-py-4.0.ebuild
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index de5c39a75545..a23f6bd10da5 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,10 +3,12 @@ DIST boto3-1.24.80.gh.tar.gz 539716 BLAKE2B ccbbfa84e4e2274eb0275b9b2dcc0a4a78b1
 DIST boto3-1.24.81.gh.tar.gz 540005 BLAKE2B 7c0425351aaa4ee854d6cb616880b653250475051f3a295686659f3c85b6c515b6e622af72f6e56f69ff23be4e4218f74cbe48f6377f0d17d321f1521ed1fe8f SHA512 a92a4d90254ecc5dd098d22c9628cf87e5d5341c7aaf8b704fbe6f6e693b7582b65179936a6745da4b14a629fb20d39b501748349e3a8640eb54f9298493f287
 DIST boto3-1.24.82.gh.tar.gz 540506 BLAKE2B 5b9c008309e7bc5ff0b79a2431d1b49c353895e698227a19557ffa56950d51b1743e096a09440d3cae94b55eada1a71e01664b3458991d5665e9678cd97fdd80 SHA512 bd1ab62bd9b4f5f641a0baf6fda8d99e2a60d1fbf1bcb670b76a8171987812feb1067964dae1b633b0e35202330f97525c1ed5bf169289b8bcdde18eb882853d
 DIST boto3-1.24.84.gh.tar.gz 542495 BLAKE2B dc120011d9e7b01beeb86d90a88f69cc232d3ac1147d4764493359aab2a4b8a5344521e29961bd6f1a6bb27a38499c83f70dd2222d324dd1283601d8bc6a26f1 SHA512 bcba6880baccff46d96c76bc596a3dfbf6f595674097604bd3b58ece68ce75448c38677c1625e8615e0eb5796b7bcc2266a78da42d7ccee1be2ee182791ca980
+DIST boto3-1.24.86.gh.tar.gz 543481 BLAKE2B 8b21852f75c4c548dc2389f5d95145b1781a7b19fe5d12fd6a352e298a3e8e4301c9b9b84c2700d8a5b1f58c4343341370c9c88ce2fcae90a3310729cd8bdf19 SHA512 a50bf8601fe479094e2868c6da43f5a6510dca6f99c74920bc7c6629cd083fbabc80e650a3baabe2f749f1dd906bc6aab73042cd269bcbb4bc8072d72707b26a
 EBUILD boto3-1.24.74.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.80.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.81.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.82.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.84.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.86.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.86.ebuild b/dev-python/boto3/boto3-1.24.86.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.86.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 91abed4d1527..1254fc0260e8 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,10 +3,12 @@ DIST botocore-1.27.80.gh.tar.gz 9643079 BLAKE2B feec0b34c39b358eaff7f947fe83fc6d
 DIST botocore-1.27.81.gh.tar.gz 9663876 BLAKE2B 35da266dee35d717c0190378d4e73dbc018b9973a768476c4e675942e6f730901e7bcfbd2f700589877b1eb1fa85a20a29932c62d20a37a957045ea32cada7d1 SHA512 9ba40ddc75f812ce255ff668e9299313eaed44fb86b130a84ac624ace35ffd03bbb95fd88ce0848f8f8f9e0c48547e4433af6746f2063d57dd5d43d32bc7810e
 DIST botocore-1.27.82.gh.tar.gz 9665050 BLAKE2B 2a108b09425dbb853a3ca79a370cff1c5c6e9fafe51c8ea9b3a7b1bf7c7ebdeccc4a5ebfc0d60e26d3bcb35add24d55e9f2df8062a79710a64f1eea4af0f258b SHA512 52335df0e487580bc425d421c39464e4785ee7018ad25c82f83ba07cce0534b4e1ea047997a3a31bc8547f597863998154b0d13b9124342129953640bf2e67c3
 DIST botocore-1.27.84.gh.tar.gz 9689021 BLAKE2B 1f67ab89d0e181b3b4b8d335279efbe531dab8f22e07e1bbf323b50910ae5c4b7827494aa5b35f21474f60ff276c6d1c3554e1266791ac24289ff9c43e397755 SHA512 a80a67313cbbccd1a59a24dae42f412594fb29b4b3731bfd9fcd55b3ab1f4f6f047b38283d1a8f6e75074e3daa1d4730702e46ecc5e6befe0ffb4110344b7312
+DIST botocore-1.27.86.gh.tar.gz 9702116 BLAKE2B 6df00c34c2be77c8719126cef7df3de9c6e9e618d7309a3bf9a02246f28e819d04c7fc0dacb9cbb4c6814fd869728d51e0e349d8b2d9dcce4ac4aefb4f431ad7 SHA512 dd16a3d6593a7a6ef449fd7f3b6725e1843c77d210586f212c604d2c2f49a43c5a32f973161e43abb3ef8111ea544d1b9b45b09bca2daa7be16fa3931ed79899
 EBUILD botocore-1.27.74.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
 EBUILD botocore-1.27.80.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.27.81.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.27.82.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.27.84.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.27.86.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.86.ebuild b/dev-python/botocore/botocore-1.27.86.ebuild
new file mode 100644
index 000000000000..d1a6948e70e5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.86.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/braintree/Manifest b/dev-python/braintree/Manifest
index a8de8ad124c2..e6757513bb5d 100644
--- a/dev-python/braintree/Manifest
+++ b/dev-python/braintree/Manifest
@@ -1,5 +1,7 @@
 DIST braintree-4.15.2.gh.tar.gz 207089 BLAKE2B 5ed62e341c05e254cf3bec47f91704670bb57873be995352ce1e427e8075aee6193e11cbd863074b1ae39ddbf2c1a77f7c0207ffa9c8b7ca9335e2beeed42f29 SHA512 324823a078bc4068577793b169dd6b3d67e05d77850cebfe09602c0f6c3626ef1098f612c0ddfb7cc72b4b734d7319944c30297658f77edaf906334d27393f13
 DIST braintree_python-4.16.0.gh.tar.gz 211927 BLAKE2B 335215a538f00b04bda607887c582c1f55fcf3918f5c662f435791889cfc4f813a1e4362056bd8c5e4d907a77cf2eab11463bf1b5b839ce615350fa1614adad8 SHA512 6eaed1dec96032f3522e59e66c64ab674324518b7086ed9aefd2cdd5ae70e2d3e114a2e422f3edcae47dd95a5f332182dd65800cacb20bcbdf7e01a1e96498bb
+DIST braintree_python-4.17.0.gh.tar.gz 212187 BLAKE2B d35c9713c3a022cd325d0c8d2d16e7906678668230fcf061a2d78800b4e2ecff6e4c9d0894e2686206f81bff3d9f29431656178aea3303ec02ec77a56cbff8e9 SHA512 2f5029040f9f02a8426a939e3d5e19ce2b26c9326a793fcdc841a4aecfe9044fef0f4fd4e81490e83e0cb7f23e0cc0c104b23871367ee1c64272a97ba27fa755
 EBUILD braintree-4.15.2.ebuild 716 BLAKE2B e8d1f98a5cbef751686ab49ca6633c9d79ddf0e930309a4f40df594547dd5d9f47dc58b42a75b78718f3077cf0ef59376effd691f5b12305f9b538868ef18f04 SHA512 f1bafa0905ab067b89e37f42db8f82c6a012cb7855695e4420754838385090631cc4d84f4ce1903e635c00d53f65842654ca0be9cb4620b5c99088b1046900e0
 EBUILD braintree-4.16.0.ebuild 764 BLAKE2B 4c42342a9ec06c38f42eaf8e82e004a32fb9b81e4a9acb0f3520dcc94508f6373bb939a05d6fd7bdb6d6a1ab97f69a92900a57fe90baf28585d843b16f376e9b SHA512 a5fd102d011e159ece22204e7d888be6573f61fadb42301a3cd1f4adda0fc93534fcf81bfa0e9d1057a26b883cf97a8739e77bf9232cf94bf2d778ec6ac90272
+EBUILD braintree-4.17.0.ebuild 764 BLAKE2B 4c42342a9ec06c38f42eaf8e82e004a32fb9b81e4a9acb0f3520dcc94508f6373bb939a05d6fd7bdb6d6a1ab97f69a92900a57fe90baf28585d843b16f376e9b SHA512 a5fd102d011e159ece22204e7d888be6573f61fadb42301a3cd1f4adda0fc93534fcf81bfa0e9d1057a26b883cf97a8739e77bf9232cf94bf2d778ec6ac90272
 MISC metadata.xml 484 BLAKE2B 17a5993a7630126f55e88b92bf917ae068282c36813ea739407b65d91542d2a9977f3057889838bce776b38c5e64e4a17fabc3367ac01ae8512d06897de1a060 SHA512 c0f5406afc289683369998c79009defdd07735e6aaf60d777e524eee6c58dbaff4b936e990490cd15cd53f175accbfb3adbe55896511c79e9655f08bda24ba49
diff --git a/dev-python/braintree/braintree-4.17.0.ebuild b/dev-python/braintree/braintree-4.17.0.ebuild
new file mode 100644
index 000000000000..d7355667355f
--- /dev/null
+++ b/dev-python/braintree/braintree-4.17.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=braintree_python-${PV}
+DESCRIPTION="Braintree Python Library"
+HOMEPAGE="
+	https://developer.paypal.com/braintree/docs/reference/overview/
+	https://github.com/braintree/braintree_python/
+	https://pypi.org/project/braintree/
+"
+SRC_URI="
+	https://github.com/braintree/braintree_python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-0.11.1[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.md )
+
+distutils_enable_tests nose
+
+python_test() {
+	nosetests -v tests/unit || die
+}
diff --git a/dev-python/cerberus/Manifest b/dev-python/cerberus/Manifest
index 70ab147fcbce..446901085370 100644
--- a/dev-python/cerberus/Manifest
+++ b/dev-python/cerberus/Manifest
@@ -3,5 +3,5 @@ AUX cerberus-1.3.4-raw_docstrings.patch 695 BLAKE2B af53c17d8b683e1d88e744330ff9
 DIST cerberus-1.3.2.tar.gz 149344 BLAKE2B ce65f3c4c612f87562c28f913cac95c1c7af9b2dfa72955bce3f0e0459e4ff9024a126ceea4587e2c72cf606be2a249046a090a2e2d5e908bfe4b700ba5e9b92 SHA512 e9cfef5a936783eb0576afd3d23397dab38d8c88b6b43f98de0ad7e20739e5ff983eaf4ac769206adb7fe9692c651583f6a5f2bab263b81b8de96f45707c84fb
 DIST cerberus-1.3.4.tar.gz 926258 BLAKE2B 6fabfcf32e26ee7f4881b64ce9c3098a27949d95fd0998e09b7adcc3b834033f904a07b6e9b2cadea218b952142f6c2bc6051d8c208a14d6e8172a0c3823c38b SHA512 c816b426ed1b32367d1e8f1c26d6ddd4b49c6578540e688baf693e3094a05800f645cfe879be6378c1e9be9899cad7bc2ad1ed9844d6762d2ef6e0cc54a7476a
 EBUILD cerberus-1.3.2.ebuild 555 BLAKE2B a2daf7c5987368b3c9c85ac67137f263200fa99819c204ecd89f7175a91a39a7415d9b567a944be7dc4e71d4adf0efb0c0faa97040eafde1772931c0f684b8fa SHA512 7be0b457e94d62f49d6b24c448ec98c07394a31c8f9f773aa0f8d0090664a23ac7d0b232d26a3b9546bf0d48ef8b7da9078b160026282388c3e8aefa5000afb1
-EBUILD cerberus-1.3.4-r1.ebuild 829 BLAKE2B 2b999e11e120ead67f5ec33eedd71355eb6e5c56964135019ee2cada8af8b4792d437f1f5b0749ca9ebb46a5cb9b797a7987575535589a8bae2a281fa5812c48 SHA512 20cb0196ad4c661c1986f235fbcc05a8a71d070a4c81a2cb33812ac0e4c74dfb93d9e1a71f95caf459e0f788dcdc9635a1b19804d76e65264c7e6a8906755433
+EBUILD cerberus-1.3.4-r1.ebuild 836 BLAKE2B b451bded8982c9b48547ade6e9236906dad652ae6a2fd026f7ee1e5e7a2db99fc495f967fe80338f8577d9df4711b2a834b75432b3082a1a86f27cacce965cb7 SHA512 eab388bb6283f373da5f1399a3402617c12b3df595cf4c2fb371367ef0c5b38af4ca71337054f2fb572a5c24a50a72a386df8c18c4ed88175ed1a0590301cbed
 MISC metadata.xml 395 BLAKE2B c9dc795ac8b1daba3bb10e3aef517b28be2e88b26f5e1192c380bca300ef929608e2b2bcef23adc710e01d41fcbc640c97429d6d8ee61fe4a78014aa181b528d SHA512 c1abc73709d977c4f7a3e989c335f0d1312d07dc843dd88faadc633e2dbfa3371c1cee566a481ebfaabdba60e0a8f00068ce8a83ce9b05ab091c35917b8c146a
diff --git a/dev-python/cerberus/cerberus-1.3.4-r1.ebuild b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
index 58798d203a59..cb6c7e646ebe 100644
--- a/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
+++ b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.2_no-pytest-runner.patch
diff --git a/dev-python/contourpy/Manifest b/dev-python/contourpy/Manifest
index 358f2249b54f..52da172a7051 100644
--- a/dev-python/contourpy/Manifest
+++ b/dev-python/contourpy/Manifest
@@ -1,3 +1,3 @@
 DIST contourpy-1.0.5.gh.tar.gz 12153420 BLAKE2B 1b3899831938c114480606f0c2ef2962248721884cd2be727f2bd11d12d322e7652c7b63860f4c5d8bd039a7e838f3f360dd1af017219caa97dfc63d69ef7e19 SHA512 47dc08f02920cb0ffc081f313dd041fa36e2fd0a81530374ae77adc288af13cf2c526fc1f45d06ef1c256c4c8fe243e0b36b54d3fff7d4f8bd6f9f4938d3c805
-EBUILD contourpy-1.0.5.ebuild 1033 BLAKE2B 3854cc94acd15999fec3b74ad05860adfca2b1673044116224232d715506e4d505bf0f72e50ebd1472ef4983920bc71f0bc363a2dbe7558d3f0c4cd1021e46b2 SHA512 3890dc998d5b606aa982574f00f02187635e02856afbfa9777f8cbaa913e228bfceb11207937ca6b09aa265891285828224959f22cb977ba6571f759d0f2cce6
+EBUILD contourpy-1.0.5.ebuild 1052 BLAKE2B b8f00d41b9713383c304c9b9bfc59cdb94e5a8047ec24f811372c821e7cddbca8656f6b79258b7a33951db8de717a8be34096bd2233a547fc995927e79f1dad3 SHA512 3a7b2e90ad6f82b02c4758e5853823132b7145e8b43a4cce42ef6ce28aa083d24dcb4fe02244c6103d843b8add0e941ffd6320033907fe832f9b09ea7411ae39
 MISC metadata.xml 372 BLAKE2B de3d6cc9d8727bf43be63fdbb8aa2ad375667d189019e189be262e39d028acab98a21e200798c2d5c5c72521aa7d38202e3e235dd44de9b43a7dc9e045d50c47 SHA512 e692f94d805d7f56fc895a4c76dfbacf2f068d687b9191482b946445baa3bd0a685eda7a1b0aec2aaf9a02e6f23d87f0bf22d90f42e3c21d930724c635ff859a
diff --git a/dev-python/contourpy/contourpy-1.0.5.ebuild b/dev-python/contourpy/contourpy-1.0.5.ebuild
index 1dcae6929eee..aacbaf8b47d1 100644
--- a/dev-python/contourpy/contourpy-1.0.5.ebuild
+++ b/dev-python/contourpy/contourpy-1.0.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~riscv"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv"
 
 RDEPEND="
 	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index b19b0b30fcc8..f1f71dedc337 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -3,7 +3,7 @@ DIST dask-2022.9.0.gh.tar.gz 8762083 BLAKE2B 60c7a37124b61b49fc06a754b5842695fd6
 DIST dask-2022.9.1.gh.tar.gz 8766675 BLAKE2B da4735dd860b96d691bbe3782ce04fb4e53a265984dc52593ecd1cbd1a1e536ad2677998e01bcfa99d783255ce053a44c4ed4cb0ce83128520755c20530bca3f SHA512 944d333bbe2f946b85173d289e287737816359a959b61d9bf2b9ef0f75173482a2912355fd71f8a8aa29e58f5b66a91909dc53c1cd269ab2bc569bad62a67f6c
 DIST dask-2022.9.2.gh.tar.gz 8767605 BLAKE2B ad0d9b7f849f984316768f1d1983e13177c3263b6803ce6d861b15b8d88c21c7dce4dae917ca28f8688797573503c6fd518816ca7d993d67c56172ef2adc73ec SHA512 467411933432821413f8440e6434b18c2bf76c616a92ec990bc71c141ea2cab235c1330e888ed77f429b6d00d588042928cd3b06d9b693d51302cf8c114700dd
 EBUILD dask-2022.8.1.ebuild 1583 BLAKE2B 58ac96137b56b190b388ddd0d706603a94ea6c116e2dc96ffa1ee927fd0781fe41af1fea420c6b694c91776201bff9bc83fe7455d10f3d9c11b1c4963a5aa2bb SHA512 2fc67c4256b78aedb42c365631a102cc8c77e40707210f01698dc4378f20c3650d4c0635a73d690c5e5e4624601b304d41d53a33a19dd1468a450f3a103119a6
-EBUILD dask-2022.9.0.ebuild 1780 BLAKE2B 0af473bd7b44c26022591b631cae4f656a861b33cd415b78336658692d589712373058e7e82bf288959df7819ade2b941af7c84bdea97bf40ba20489e4fd78f6 SHA512 de374eabcd08502dde1c0a39819e21cac7903756bfcaff74d83cc75be2341c2e67359f25ad2d255978a3dc71e8fcc519a762c519c6051d6a942343abd7505aab
+EBUILD dask-2022.9.0.ebuild 1779 BLAKE2B 4dea87e8411ff0ecb0aa0f647a0ca84f6b95f3289be3e9cf232bb66108bc1ecfbda8327960712df44cbdf1dcc6713c1a11cc3294ac6d8df7a700de5c058d9fd7 SHA512 4de6ded112a26208ef4c4ac039a2aa55464a47431d48b040c198e0e3fba3dc167af2a8786220cc8b1744ee2ffcaa0869eba90c187f1c481aa89e2fc5604f2f84
 EBUILD dask-2022.9.1.ebuild 1780 BLAKE2B 0af473bd7b44c26022591b631cae4f656a861b33cd415b78336658692d589712373058e7e82bf288959df7819ade2b941af7c84bdea97bf40ba20489e4fd78f6 SHA512 de374eabcd08502dde1c0a39819e21cac7903756bfcaff74d83cc75be2341c2e67359f25ad2d255978a3dc71e8fcc519a762c519c6051d6a942343abd7505aab
 EBUILD dask-2022.9.2.ebuild 1780 BLAKE2B 0af473bd7b44c26022591b631cae4f656a861b33cd415b78336658692d589712373058e7e82bf288959df7819ade2b941af7c84bdea97bf40ba20489e4fd78f6 SHA512 de374eabcd08502dde1c0a39819e21cac7903756bfcaff74d83cc75be2341c2e67359f25ad2d255978a3dc71e8fcc519a762c519c6051d6a942343abd7505aab
 MISC metadata.xml 722 BLAKE2B f5ef083408180a71a3f997ab61bba6770b08018e3d0737a17a99827edd486c2d10fc8bf17c70c8d5a431bc40bdd685d2a6ce6e8e1784a2c1d89152b167f51648 SHA512 1e1a79bf0d919a2a7a0840e77f239b3aa3bcd57666a06f18113c39c9b075d03e380b37c2e9c96dfe8ba864a94e98fe52fc0b6b16e69009364374020729b261ef
diff --git a/dev-python/dask/dask-2022.9.0.ebuild b/dev-python/dask/dask-2022.9.0.ebuild
index 6ad6f0bd45e1..a25e140d6003 100644
--- a/dev-python/dask/dask-2022.9.0.ebuild
+++ b/dev-python/dask/dask-2022.9.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index 165626941b24..e1ab387680e0 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -1,6 +1,8 @@
 DIST python3-discogs-client-2.3.15.tar.gz 35059 BLAKE2B fe2b577b4810480fcad8a76c8f961809baa5b217c0d01c262f4a6a0a2993b2a6d2515edf90f276f7a104f6bdf0a1edb0f439c69e51507e3c0cf1ab927049e7f7 SHA512 8da52cc6c125cc4b3c5fb93626075ba32046798f71f72cc9f685fdf10a92a813fbd74b35625994cd4c6b7e394e36265ce01a33b52b607bf498a5f11f68d82ad9
 DIST python3-discogs-client-2.4.tar.gz 35724 BLAKE2B 98976cb4bd52c459ab63e5d178bc0a7eb2c6ee56ff866d2248b326423a9b7f5187ed348d3cfa67d2aa38b1f4cc107367351e40408b9f577ecec27f28724d9be3 SHA512 96a3f1e653c95751b790f58dae2efd7e33a1af581a945327704a31df96e99dad543ca978c4e42f6f05824f6f74ccfcf7fe5e59e46c82df1634a655581d833442
+DIST python3-discogs-client-2.5.tar.gz 36003 BLAKE2B e2350cc2eed986566be79ce3b529885113739da6b42f77dd405456e0552a68d51d1945f3ba569e05b9afc6304233a8b5ebe7c9f4f8105d62d9d159da7a0ff3ec SHA512 d6c90d6f0b472cdeda2a0d019386e3ab609ff46a82c3eefcd9b69162e1f94b34d58916dfb2364afb8cd9def0bf11e60cbed2e2c2dbb03206ea9a0faf141aa4ec
 EBUILD discogs-client-2.3.15.ebuild 806 BLAKE2B 8dc5825187f3d7b01170b84cc5b08b1b4cbe8cc8132a5c008ad72517008aaeed8f49fb9664d80a38039cf8b059332235a72eab23ba85e710f1af2ffb055daccb SHA512 7b53a0f9862008acccee946f5330fc0c41c73a9d63bc7dfa52ae69afbbea840b7f47107a67507a6378ec811b81becf36a0c5c19f37b9c26acc60444f446668cc
 EBUILD discogs-client-2.4.ebuild 807 BLAKE2B 56bd2663a88bd5e75db49b4f2f95eff171a93e5364cd49a0b8e41ecdc0010222d582eb8888391bc7f9f7509cd7db5ea7876d72a808be0287a530572db99df345 SHA512 6c2287c84b6ad91c585ca472cbc52ef32903e30bb2795924276ae539caaf0387787af0af50516a0e0a2176bb9d089aa5e9e5dd3db41b842ccec9283f2bd5c6bc
+EBUILD discogs-client-2.5.ebuild 807 BLAKE2B 56bd2663a88bd5e75db49b4f2f95eff171a93e5364cd49a0b8e41ecdc0010222d582eb8888391bc7f9f7509cd7db5ea7876d72a808be0287a530572db99df345 SHA512 6c2287c84b6ad91c585ca472cbc52ef32903e30bb2795924276ae539caaf0387787af0af50516a0e0a2176bb9d089aa5e9e5dd3db41b842ccec9283f2bd5c6bc
 EBUILD discogs-client-9999.ebuild 807 BLAKE2B 56bd2663a88bd5e75db49b4f2f95eff171a93e5364cd49a0b8e41ecdc0010222d582eb8888391bc7f9f7509cd7db5ea7876d72a808be0287a530572db99df345 SHA512 6c2287c84b6ad91c585ca472cbc52ef32903e30bb2795924276ae539caaf0387787af0af50516a0e0a2176bb9d089aa5e9e5dd3db41b842ccec9283f2bd5c6bc
 MISC metadata.xml 674 BLAKE2B 5c0dd431ad4633cbc7ddaa97e54e9f5b3eb67ed28e07ac313f218fd055e0042365c270e83153627decd196aca49db12304da87f2c74f20bc454fd8e5b4b8fb46 SHA512 ad582419be3887c5fa3c0d630ad32575f378453dd4f7a8c33df91db31b495caa88707214f7e456d69027532540a474c41ad8336b40e90229f1f31cd3193d7f82
diff --git a/dev-python/discogs-client/discogs-client-2.5.ebuild b/dev-python/discogs-client/discogs-client-2.5.ebuild
new file mode 100644
index 000000000000..c8b04833cbf4
--- /dev/null
+++ b/dev-python/discogs-client/discogs-client-2.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/joalla/discogs_client.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/p/python3-${PN}/python3-${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/python3-${P}"
+fi
+
+DESCRIPTION="Continuation of the official Python API client for Discogs"
+HOMEPAGE="
+	https://github.com/joalla/discogs_client/
+	https://pypi.org/project/python3-discogs-client/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 503e966bc0eb..286bbc14d249 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -4,14 +4,23 @@ AUX django-4.0.5-py311.patch 9279 BLAKE2B 3082f4f9da3f127807402a55655b0590197871
 AUX django-4.1-test.patch 1683 BLAKE2B b332eeea0a5aae5a4b8f3d9baf464928e68ddf63d7ca4375e0f30f4ee1a6b54427826b9d81c9a3533b1cad26d75eabd442855f8fac8fcc6e5eb96a70369c891f SHA512 a73210312f62afa90db63e168b97cf1fad97e085e716dd12b64f4b83ded3c70e684d21aced3c7a8b6274ad3dec576c88dc6678677b43446468401deda4f6f054
 DIST Django-3.2.15.checksum.txt 2560 BLAKE2B 35a4f28005a07cee0b667ec55838d846cb7f1970be41ce08f2191992b1247263f7632bb9dcaa3d20f9df4e050b370416a2a9af6f0e5cc3523484016161a7a47e SHA512 b3d00d18e14be7dec77901ddd8818b41e2b592dbafb2c66b314478f0b2ac0f8486ce41a73a71da9bed4d9ad92a6d6bf21765ede79055c1fb2a9972e3f16cfac7
 DIST Django-3.2.15.tar.gz 9833828 BLAKE2B 4b914b1e3c192340d9a1bbd68b7d3bf3d1c1b3f41da6e4a67149e811a2312f646e2ced83af23ae035cf590e526dad00537aa5b4aee14a657f6952675eca94b30 SHA512 fccdad52d39c8757972d5e987b94b13d8ce5ce08ad480ef79407b0d9b88cff69336770409cbe18ce9529bf10966ad63105a0b0f1ffe39b681a41be3718ec886b
+DIST Django-3.2.16.checksum.txt 2561 BLAKE2B c4fc829977881bbf758652b91c0b64c6432390a44e4047931d7315e67d310db52c0804faf515e1b65435c07391fa2844043c4302d4580003040d54e48f6785b3 SHA512 def47fd84e27d94d0fff90fd0c5e30d563c5faa9b5c12ce8834f5b0f2ff605e74bda8d2283e66177ec5ce4c05c6c4d52ce3a06a86f303b3e66b7f3c609c7d03b
+DIST Django-3.2.16.tar.gz 9847052 BLAKE2B d1b0aeedf2540a570859832b4b4c5c189cd57b05863aa14ac3e00d2e10c7a20f2acc639e29b56409c7be707b28d5f365ab1afa2b70916045fe66adb001b64ea7 SHA512 628263370b4d073d5e88db8607f5b082b03c4e6e6ed6aca059dce18f61725eb4ff69da77f5f98ff7b3e6d9046a701aca5a32687670bf7ea5fdcf92d6d13d7373
 DIST Django-4.0.7.checksum.txt 2551 BLAKE2B 6fa44707d33af485d3c55096dcc650b4e2384421c57c30cedee9f9577488783836a3ad8261dceaf5c718c1a5fcbe5852b081596525b22639c310c9aa6e86c639 SHA512 4b2453be8090c2a9d48bbe34f6e5dd55859b9debc3a116519c69da39d04ecca202e6da62ae9114790a9da8c55cfcfe176a972bb25576305a8e23736e2e063e3e
 DIST Django-4.0.7.tar.gz 10407810 BLAKE2B 77c994d042ace329699aa33e14098cbcd4f24fa4db880dd78ed87828b02c25298a1c1664511547de53eb80ebade7bdfb16412a615027e512ded437ae7de79b54 SHA512 51574ab7423a3948318a5985f74bd781269bf1c95dc77838c11e8f9d5e9233f0a3be5dfa4798d523473b9f1fd3196d4c10284e3a28d9543084b2a63179167731
+DIST Django-4.0.8.checksum.txt 2552 BLAKE2B af7551bddb966e8e6d338b486c3d2aa5139b28571b77765fe3ca77c0a1a9c310c3286a98fea9d7748c00d1ed7f1afaaa98ef8d78f1a314fda4dd6d2f2b83882f SHA512 3838fc2369cd8010f06dcfed113106d6b32de3ab4da25580434efc7690c2f73323d60ad2da1b4992ffe6bab1ee8b334533ff7a5653f5a41430df858abe2e93a2
+DIST Django-4.0.8.tar.gz 10427857 BLAKE2B cbbba3b3044d60fcd6d240e1a181c00d65c1122dc464c86391e39a1eaa866703f41310401f3de291e427eb075dc141fbbc503f414e3627e16715e87f2c10e5c8 SHA512 6357cfc673eb0b993d88b6bed5e43bfea8e0c71d31b141033d06cfe45e91591739ac5c6c57a82cde0216104acb7b21c8c32c1c1bfacad3f62737c8ad10ee175a
 DIST Django-4.1.1.checksum.txt 2548 BLAKE2B aee8b104cf680645aabef0f2a18c029414435093b40eaf8f61dfecda3745b364a64e340136cc35c416708b150074d7fa18d65ab9619ed7e477d94dbfcb3d769c SHA512 62c542e4f6574ef82563ba8b5389d1408506cc4f48eb3781109d00ddaeb92f93d28536e913c120171bdbe979834baf4c28a14bc934b0540a75d1a5b7dba97d5e
 DIST Django-4.1.1.tar.gz 10474304 BLAKE2B 5349e095824db2aadfd8962932916ec2d01fa5f25287cc3b2184d921b9dd6c8d1e52a4648dc8f4cd87da03a261a0406fe7ef521667513a734bd1dae0754ed18f SHA512 49d0003b1a582cb27163df4bb30eda21d4e3bb101eb5ca0dab3ec1d5b4d99b6481b2edb4fd0e89ba8a06d0266d24ca70c92cd51b9e4c4eab818d68098e8ef4d8
+DIST Django-4.1.2.checksum.txt 2552 BLAKE2B 3786a5824ce981fa66e4173b4fe985ccca4084c3bf2a67cce05d527768c54afec69efb2cd79578fff3dfdcf6dcf26536208dc1ae203348e0648a1d2b27373469 SHA512 01bd342832d626efc03f0704b2e7a8287830cf8ccde53b0d8b9d20c10eb10b6d799611e143196f121b43967e72e08a2db032fec81638c3d58e541ccbd598bb1e
+DIST Django-4.1.2.tar.gz 10509111 BLAKE2B a6786e214967a3a789fd42218e3422f6985efa8e0f4be807d6afb1dd293ef37a201850af1728e72ae0bf429da3aac41dbfa95926f426e9bfe4b3f7f77a6e2934 SHA512 734d782777269b714f6648509d010649e7df2790e438ab2439ba1c4fc1cc9d37626b77ea9d60806c215ab666feb4555b1360ebcdc8cb16e85da8c950b262bbd7
 DIST Django-4.1.checksum.txt 2533 BLAKE2B 263c3719c572347cb5d2087b960a47f0e6ac409a94499cd5ee8ec619c3388d29354c10813d4b3d2a0d6bd73ca52f562a6ae89a3d9340d5ea478a80cc30284467 SHA512 96d0a66c40261530d65bdde34ba1fc2e650690821b0f52900d60ab85162debc64e33e089f90e2b106235fc47581a54dc6432968534837c1a71a887b40fdd4f36
 DIST Django-4.1.tar.gz 10484595 BLAKE2B 29a833330862abcf69bf082af6df08986443d34abfe821bd307fba6ddd73dd00be7ae8d3e809fe97db0b22f9062daa760cbe01da8d773e1528f583938959f775 SHA512 f0f7e627b3c474c886cb2476f900222d2623e1ed1da1ac6b23ac618ff49e330edc2efd47b275cb02b8bcb254126bf3c926462c616bb0abee1cd433715f5184da
 EBUILD django-3.2.15.ebuild 3050 BLAKE2B da552703a81abf12dc9f104268237438fcc8b9003a9d4789706ee2c812799aef24e4476039cd64bb65c7821f844138e22220006ea14c1475cf3d1705babc6298 SHA512 59e9aa4a66d7b804578fab30b0db04ad2f07d482c07260bfdec986c921d321e4a79b03c046b877a2ffb7d0bc204f0799d4f2557abdc01560879db2c75d68f536
+EBUILD django-3.2.16.ebuild 3068 BLAKE2B d68e24cbf2ee9498bbdca6e550f0d7221a06bf34231a6e4381673c02dd9477d7b3df3cf0cb1a85949f304ac5a80a624a6e6be5773b69e8ae222bb45c7bbe7ea2 SHA512 8924942d174b51fac5cca5f54864c284b562199058fae69e369aceedd07b9610e6da611becc519af0efbfe22f5af0ac4e0b51def63729a0fd6958307630cc4c4
 EBUILD django-4.0.7.ebuild 3014 BLAKE2B b7cf6af18b777fe0953f5b8d86f973052f91deebb13b4098389501492fa0154a219a92f73f4c7d4f7837f213b3d577dc8019adc45f166c7168d35e7c86d8263b SHA512 4fadb585365955d6d3e9fabbc0657b35435266bb27fd1515712f91844e21fd5adf6a24c42b02ec6e58c031c40fc9909cb4f25f610acdc752b6046cc19d9840ad
+EBUILD django-4.0.8.ebuild 3032 BLAKE2B b3a25832eba675c8a3862ab943d7f94a439d10fbf316b145f96cd89e48b740c57a5257a11e35537ba7820449e1230bcc1185f3b16ffe23dfffbff1da54f9512c SHA512 bee7a26f72978de68031e644ab36001757fc48a161d6aa2b400cab952107c3dd43c1e2daa65e44d034537a6a20b12c3beeed0c1b5565ee0208b54dcd112548f6
 EBUILD django-4.1.1.ebuild 2899 BLAKE2B c84e9f3ba8a7be4ed558618906e052af0e9024e938ac3fa4f9006ec54b2c9e6ca79f6f8f2e2181a5e2c1b94ae96fb3a4cd7b3d71efd802324d456ec958ef0162 SHA512 bce76087cc21969a468794bd19dd84a5150d995c0d264bb0350db4467a1b8e4a7b3f04f70dbcddccef36b90de76ffc7fb7c8546ccc9576d59c110f893ae6693c
+EBUILD django-4.1.2.ebuild 2874 BLAKE2B c61f2a896389eb8d3184d127ecbf3aa9d4aa4e67e006f7f697515ed46adfce56a9c645da74577ccaa78b327583aa9e0aeaed9c5738026648eb1e89cbb4d56532 SHA512 4ab4f6e95294c33f673eeeab0424d0a07eb24987236fcc448bda0125ba43362014df512861a0f7798a3ff037846029ff01138a37a273703b275d7c0adfdf12f2
 EBUILD django-4.1.ebuild 3010 BLAKE2B bb7545536df03e9cfcd587d13f61bbd1904140cfce32644331869b44ddb839e9baecb126719f26922d6d5ec534b2e8dfec2b6f38fdb20f983599e70ef487a234 SHA512 a9c2ac6cfbda9d8735cb157aad5a9cbe7031e6463581dcbc20bec83fc865e188344d27f6b2c95423aa4ed11d6cddf0570166cf8c00b775d60757ecec07922b7f
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-3.2.16.ebuild b/dev-python/django/django-3.2.16.ebuild
new file mode 100644
index 000000000000..62cb33a62bb9
--- /dev/null
+++ b/dev-python/django/django-3.2.16.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
+"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py || die
+	# TODO: this suddenly started failing
+	sed -i -e 's:test_custom_fields:_&:' tests/inspectdb/tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-4.0.8.ebuild b/dev-python/django/django-4.0.8.ebuild
new file mode 100644
index 000000000000..4a5d2cef60a3
--- /dev/null
+++ b/dev-python/django/django-4.0.8.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
+"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
+	"${FILESDIR}"/django-4.0.5-py311.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	# TODO: this suddenly started failing
+	sed -i -e 's:test_custom_fields:_&:' tests/inspectdb/tests.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-4.1.2.ebuild b/dev-python/django/django-4.1.2.ebuild
new file mode 100644
index 000000000000..0401ab625bf4
--- /dev/null
+++ b/dev-python/django/django-4.1.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
+"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/asgiref-4[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index fa3d32ee052e..c12373d51e42 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -2,6 +2,6 @@ DIST executing-0.10.0.gh.tar.gz 507523 BLAKE2B 5ab17adb1d40b83b0cf294aba350faf12
 DIST executing-1.0.0.gh.tar.gz 507720 BLAKE2B 601ddbd4c7dacd6b72317e9f07d8b8566d14b1c805bb7a2768449d51bf75818945f3b61b67dd0402d1d6171bd74165107ef98e835910529d82b8858bd016ac6d SHA512 912cea61ddb2ef12034432d68fa7239daad3c6365dbcbed72f08121b9fdc07e614b5c2233c53f5f7ee3472fca4f690af3db0944a0ed2c83623de8d682cff0a61
 DIST executing-1.1.0.gh.tar.gz 782214 BLAKE2B 56c97b1c0b6617db90a90f562409b406d0838e187fed4e45642506df85ae5e54824a393eb38982902bdb1c67fda2299bac282a5b260f3537cd06145b1c5b992e SHA512 090705c90051fdbf53310293fbb2e06bd2c2144cf83d3d02528768303c70871bd8b3a3d236705e29f8a9fc3132ca94bcb3375fe8834529a684b10b7c879faff0
 EBUILD executing-0.10.0.ebuild 992 BLAKE2B a52d276ea72ec7d34187b09af70d9480c5337927ce4a146ab08e396c0fd25901b2035bab4423ddaed7bcb898d5e43a005821168fbd5ee34f56ed75e4e5a8d000 SHA512 888739c7a6e7f8c656be8ea984bbde47ea8dae2e1469baf8657d2a266e1e34375dc53960da03ab11488f5ab73bc634ec4614770235e88e4f28802498a87d7c10
-EBUILD executing-1.0.0.ebuild 1064 BLAKE2B 81130b95614596d44baaf4a6a90a1d912c93e91283078df043cfe4872991fdd290caa41265beca1cab71eb5ae46a84764ee4c62b47f254cc28b922cb54b410b3 SHA512 5e791557fcef29cd163cafc32f01edc730891036341a1789bbe2547e930aabdea581e0191922d68618d445d674141018a3dc4b5fcac2ac77694a6cc52c333894
+EBUILD executing-1.0.0.ebuild 1062 BLAKE2B 098e9a6b7b41fbef780858a28d281b6701a05777a3e08103ce1b31d26cac09c0a3f916a095b0a1661284178b8e0fa5b2193e5168ccc48e4d21bca5e916f43ce3 SHA512 a398f67e9a23651577880eff68a84e209318f642db728008f5e945427c4cd246fcc08244075ffee65fb8afd0cd860c2e597c26e51386004cfc7d0a1bb5ae4bc6
 EBUILD executing-1.1.0.ebuild 1036 BLAKE2B 10df93fe68048fe963ab102c4940e9dfe94cf4afb816babc829c73ff5d2c5c8c284d90a1d2f256aa956727b5f5a0a58130982703b76e4e47828be570f2880bfc SHA512 2b04201dd014c747221f5167048a1041735ffc95dc8487afd102f354359134f3f84986a7d22e0c6babbaa46296ff874eee85fcb35c1b5ad1dc5cf66cd15ce6e1
 MISC metadata.xml 351 BLAKE2B 3e64042e3da09377bd27bcf09b9984eef77bbbc18e84f1e849571ff628cd15068fa680560cfc6c3650bf545e5869c6e3d6be0b4d2fc00f35c5fc58dcc3194eb1 SHA512 de199443767adf299da6c7d857c182071746b2ccf7b84015e9649675451ff336fdb7ac1df2d15951ae708ddf0529f2f1c9c19a2959f45c0dc30db1f341fb8d0f
diff --git a/dev-python/executing/executing-1.0.0.ebuild b/dev-python/executing/executing-1.0.0.ebuild
index 37defe3e3c3a..8a398995c3c1 100644
--- a/dev-python/executing/executing-1.0.0.ebuild
+++ b/dev-python/executing/executing-1.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 # asttokens is optional runtime dep
 BDEPEND="
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 9fde93b692d0..10271929e032 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,5 +1,5 @@
 DIST Flask-SQLAlchemy-2.5.1.tar.gz 132750 BLAKE2B 6378766e9ae5e697f9a0fe23471f0264e5ac1f4c824657e5197f6c35f9f12eb756528641c1078b1bf470170c557c3201314a80b922b4ab84e4664a0ccaad2a6c SHA512 5d483418204030837e62769d45c16af88c5be6dbafc7c340cc4e67ef1736ea5102f506156119864cd7673cf382b0d3f27050bda64273b93ef4805fce9e1a0f6f
 DIST Flask-SQLAlchemy-3.0.0.tar.gz 127234 BLAKE2B 97737e16e3929b4449b7c004463d5976263bebdeb4d06f93afc531ad10545f7648103ebdaf8792967d504ec4e404e5f0411397216944eff8deebb1a69d01efe7 SHA512 48461453555cc659b1f35ea0d255c080784222a51a90de1cb5761ed08f3fffa83b6647a7346b860f2354484496e6cdbf1420cb9f0405b128174e7e6f1e30cbbe
 EBUILD flask-sqlalchemy-2.5.1.ebuild 770 BLAKE2B d197db5d301949b5ccb7a911fdc40d9a69a993327517cc41c08b0c889b0d0c68865234ef8953557216c7996ad83a73463a87db6f2fc9beed655fa6f26234e089 SHA512 77f2e0076a57ec17ae06a36a3a7304ed6a9cf12c4e74b50589c8be62ea54c4455ea34dfe032bb07d0a47ee39afd5e6260dc6bd4403e2fd49b193aed62a0cde2b
-EBUILD flask-sqlalchemy-3.0.0.ebuild 829 BLAKE2B fd4cf48b16a85968588a420f2cc6ac687a060afab335f0d711c5da6ce57a48fc3347f368d30039985be72334f76c79797a25b062241263563866ea145ec7fbbe SHA512 f51974311f82ce1d1243db4d208c1d23475e8a2190fa25cca10fd3b4da97d83e0430a89dee5173f1f10da1f67f688d86f7ccf777680e1374e6e256c7f513a9b5
+EBUILD flask-sqlalchemy-3.0.0.ebuild 836 BLAKE2B 6049b61a372118e13cf2b86da84d67becb75820568c6a711db250e4b4253b5c7fc31275b102b5aca685b4c173d6ac55445ce2aa5666fa95140149276b9def433 SHA512 3212baad1571bf48f8954e2c2a993d4b0bc97bd477b257e578cd9d0334e557b2ced45e6b0a3ca9fdeebf486a26608fbb086f77fee8af12d606b1e41b39d1f471
 MISC metadata.xml 720 BLAKE2B 0b7ccbc3b323b0cd206c8c461018e901bb1c3386ba1f6ddd6f54c0fb42c485d262edd82c85ea24a07ee4bb40203cab301fc2ae0253326335ed9a80b09ba4c33b SHA512 1702e4420fe8cc018dfdeafeee3e863e8451b0bf7975e18a5632f520a30967f94420ee07c851c11f17a296b962978d5baaef048dd2af5b83ecac8a5a0fe25c01
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.0.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.0.ebuild
index f172c99db0bf..4b4b67f15cc4 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.0.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/flask-2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index d107a3d11dbe..1f5c2ab0412f 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,5 +1,5 @@
 DIST filesystem_spec-2022.8.1.gh.tar.gz 338463 BLAKE2B e155dfecf1d9cae7f436f9387e9c1e822205f74a7b7484089fa1a7567d1293d699ba4a3ef8f9453720a22fbc41dedfed0455da64a46b7458c7b39d2a5d4f8c29 SHA512 ab37ba926ea834fa2938e851e2f273c624400165b097642ba2b103a126b8d8cdc9acf7a5683ad2fa5df24dbe3c1ec2b228683b8c3489af917b13729f8bef0c0b
 DIST filesystem_spec-2022.8.2.gh.tar.gz 338446 BLAKE2B 0f3b78794271b367d8e5d26ff889e7d72df7148baa7ca2e7dca3884cbeff74b41f5ce1a532fa768523f29d230f574e630fb3de43b767ace874f831a4d2a47e1f SHA512 696f726000c413ba78380b5e17e312ecca30b51093ebf8d7c3658fb7b82ace57223d3aac471e3a772d350523142bdf983b547277838cca0b182ecb4e0a4b3924
 EBUILD fsspec-2022.8.1.ebuild 1368 BLAKE2B 2ebce7153de30d870b270b903ca1b837bf437f97c804b0f69d104d920026de5a986ce9e8a62e4c33acc090d632c5da1d0d394c8555cc303bc87d6476d9690571 SHA512 e2f20c7c1eab0e5286f57f16654636b68599e7011caea8ce38a8152617bdcaac20220e9240cde7a266b6f5ee5968beb60998117c785aa97731e013e84a88e869
-EBUILD fsspec-2022.8.2-r1.ebuild 1370 BLAKE2B e0b00d994b41327f60e7a8fb8f89a751f7a699eaa01c9169c23b46b82833e05a3bca1933ccdca18527abedefbcecb4514771416e49f9002f9bb9dc36f9248f6d SHA512 0c26a6736d1598fd4305a82408031b1af5251d10b59c6c87f8464d1af88723537f05af1dac4fb71ca76cfe1710828c360d65642a6ebae5e56ac57b433d08e636
+EBUILD fsspec-2022.8.2-r1.ebuild 1368 BLAKE2B 2ebce7153de30d870b270b903ca1b837bf437f97c804b0f69d104d920026de5a986ce9e8a62e4c33acc090d632c5da1d0d394c8555cc303bc87d6476d9690571 SHA512 e2f20c7c1eab0e5286f57f16654636b68599e7011caea8ce38a8152617bdcaac20220e9240cde7a266b6f5ee5968beb60998117c785aa97731e013e84a88e869
 MISC metadata.xml 374 BLAKE2B 6c0b18a0ad3b85713ae6f618ac0646ed63f08549bd7d1ed5bd94b80d89d79efaf2f97ce913a0a7d6e54e77cc602994416520a22deadcc71e484cf7ca22bc6dde SHA512 5bf051387d6bcffb3022d023f60ee8f76ca277bb8d626dda988a0baaf1d1e3a71e872d8316607ee7e269e579b5a17c23ab93c56fade533150171d3ce44e4bb71
diff --git a/dev-python/fsspec/fsspec-2022.8.2-r1.ebuild b/dev-python/fsspec/fsspec-2022.8.2-r1.ebuild
index dba46d7fc2e2..dfe2219250f2 100644
--- a/dev-python/fsspec/fsspec-2022.8.2-r1.ebuild
+++ b/dev-python/fsspec/fsspec-2022.8.2-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index b6650a0114b8..4e406469241e 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,3 +1,4 @@
+AUX httpx-0.23.0-cgi.patch 2002 BLAKE2B 3f7c7e2a85d812d1a6cbd96a21b5d9716581b59528f651facd1c1b4f4b692aef24c1e8ef8d90315dd34dfbb84914c2cf23dce95499f401ad333632d15a6bfc0b SHA512 26c02d8c7bd6c50c72533e114377950d3f58a1ebe23193d8d6424c03c5f0efafb2f81dc155b5c16572dacd71bb2ad2aaea19816982a61ee19f2b531192796324
 DIST httpx-0.23.0.gh.tar.gz 2160686 BLAKE2B 036c66b2c3f743cd069716297f331f0d75043a98180b9db3e156c5692ae8bf9c68d1db87169953a7f44aaf7ee8554d0166f70b508f77b7ff4b0ebc0500bc02ad SHA512 3cfdf2b3b2f15967a1eec0be05ed947c5e18a46576b68a9cbfd5147dfd4736cb7c389f5431732b93f3a11f3ec6c6f25f7cbb3d96d845f00b58e2b8dae047c1d5
-EBUILD httpx-0.23.0.ebuild 2188 BLAKE2B c7ec73ae670465bdeac0d1b81543aca3d7652f54bd92fe80be7a158bec35a817764c3cee406fa8aab50f98869ff59f8321a19c1141f1eff0512b3579fede6e87 SHA512 9d400fe37329144efee52f6ad9f23317e5290ce0a0489a9cbb8573a88decc9aaf5a1f30233a7f0ffb0d122c59d764070c0b19951ace5473a3bba1b3da9ba666a
+EBUILD httpx-0.23.0-r1.ebuild 2240 BLAKE2B 008a5e77c120facb896e0d0249d07cd98ece5e03b27df435d6f85f510e699d592d19386a6aaf848b5fb7f9b3108fd8a59dea4e8cb914ed9604f7d93254502f69 SHA512 2d7190ff15fb361f7200f09bcabe8fa223b0cd40bfb27a3b19ff43eee2c0fc22a2b7f9ed36819c0f404d5d10fb75c3ba534188ba4d721b0240d78665d1a66766
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/files/httpx-0.23.0-cgi.patch b/dev-python/httpx/files/httpx-0.23.0-cgi.patch
new file mode 100644
index 000000000000..ba9a7aebda2d
--- /dev/null
+++ b/dev-python/httpx/files/httpx-0.23.0-cgi.patch
@@ -0,0 +1,68 @@
+From f13ab4d288d0b790f6f1c515a6c0ea45e9615748 Mon Sep 17 00:00:00 2001
+From: Florimond Manca <florimond.manca@protonmail.com>
+Date: Thu, 25 Aug 2022 12:23:04 +0200
+Subject: [PATCH] Replace cgi which will be deprecated in Python 3.11 (#2309)
+
+* Replace cgi which will be deprecated in Python 3.11
+
+* Update httpx/_utils.py
+---
+ httpx/_models.py | 8 ++------
+ httpx/_utils.py  | 9 +++++++++
+ 2 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/httpx/_models.py b/httpx/_models.py
+index fd1d7fe9a..7a3b5885d 100644
+--- a/httpx/_models.py
++++ b/httpx/_models.py
+@@ -1,4 +1,3 @@
+-import cgi
+ import datetime
+ import email.message
+ import json as jsonlib
+@@ -47,6 +46,7 @@
+     normalize_header_key,
+     normalize_header_value,
+     obfuscate_sensitive_headers,
++    parse_content_type_charset,
+     parse_header_links,
+ )
+ 
+@@ -608,11 +608,7 @@ def charset_encoding(self) -> typing.Optional[str]:
+         if content_type is None:
+             return None
+ 
+-        _, params = cgi.parse_header(content_type)
+-        if "charset" not in params:
+-            return None
+-
+-        return params["charset"].strip("'\"")
++        return parse_content_type_charset(content_type)
+ 
+     def _get_content_decoder(self) -> ContentDecoder:
+         """
+diff --git a/httpx/_utils.py b/httpx/_utils.py
+index e01c050df..ecce4f417 100644
+--- a/httpx/_utils.py
++++ b/httpx/_utils.py
+@@ -1,4 +1,5 @@
+ import codecs
++import email.message
+ import logging
+ import mimetypes
+ import netrc
+@@ -209,6 +210,14 @@ def parse_header_links(value: str) -> typing.List[typing.Dict[str, str]]:
+     return links
+ 
+ 
++def parse_content_type_charset(content_type: str) -> typing.Optional[str]:
++    # We used to use `cgi.parse_header()` here, but `cgi` became a dead battery.
++    # See: https://peps.python.org/pep-0594/#cgi
++    msg = email.message.Message()
++    msg["content-type"] = content_type
++    return msg.get_content_charset(failobj=None)
++
++
+ SENSITIVE_HEADERS = {"authorization", "proxy-authorization"}
+ 
+ 
diff --git a/dev-python/httpx/httpx-0.23.0.ebuild b/dev-python/httpx/httpx-0.23.0-r1.ebuild
index f63c41c27f79..674754d2796c 100644
--- a/dev-python/httpx/httpx-0.23.0.ebuild
+++ b/dev-python/httpx/httpx-0.23.0-r1.ebuild
@@ -57,6 +57,10 @@ BDEPEND="
 distutils_enable_tests pytest
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-cgi.patch
+	)
+
 	# unpin deps
 	sed -i -e 's:==[0-9.*]\+::' -e 's:,<[0-9.]\+::' setup.py || die
 	if ! use cli; then
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 0776002e00e6..530dc75637ab 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,8 +2,10 @@ DIST hypothesis-6.54.5.gh.tar.gz 9325448 BLAKE2B b4cb8a413ad96f11f4dbf4a1a529e38
 DIST hypothesis-6.54.6.gh.tar.gz 9325898 BLAKE2B 01dde1d57192ede0a732ba2a50954fb6b1a1532e584715186f813977b2f22fd3411ec489874da67e687ca470ac58340dc45b821923ab01b03888c44a7882c0c0 SHA512 d678d0936c7906c839c29ad6c08154a067f8be2e18344139051ecc4b5c737f5088d2775a25758da2e29b74574b47c5f817643ccb762db851bc2b25e4fdbb3259
 DIST hypothesis-6.55.0.gh.tar.gz 9330281 BLAKE2B 63f967496ed96e945579390d20eefb4d533caac80a05dc2fb3aa82bcca232d629802a9a37c73eb5ca8685530021794a1d0507e86fda90714be4de863ac20bcdb SHA512 2c013b2c8cd4682e1c6ef61dff63ee14d0f306815e83165cbb25dff2d5f5cf456a1567c8df669497f2e3d981222da9eba4ea94fc9b88519045ac458249ff6e0d
 DIST hypothesis-6.56.0.gh.tar.gz 9330695 BLAKE2B bab11ea2c1e2e2a380557755890803ce0ac92b7a787e79799aec3d08ca802985acc49bbde4e71845f948035686f4ef92e8e6ad13083094b86a0aacf50bfcd424 SHA512 559dcf29252051c65c0729c4e7df1325c73027459cf41fb304a0f1752bd95ebb94cc613154663c02df15f12180066df3ff1b910e33c07fba78c74896984855aa
+DIST hypothesis-6.56.1.gh.tar.gz 9333226 BLAKE2B c0cd31056cfa91632defa6db42fe3e153b2b2cfc21e7ddd93cc97e9298ffe71b516dcb90def11a9bb8fe4a4987a567c7d539a3a81a64553d3a31c775f9c038fe SHA512 73f7236f149b01170609f5010ce055bd0e451b5c1953866dd17de5afcc0b1852f7e80a199b31c5e22b4898e81bb666752f18e5c27af5feff64f23ac1b3e9568d
 EBUILD hypothesis-6.54.5.ebuild 2085 BLAKE2B 7d89dfb7307326147b2f0109fdb92fe86622608c8df2940fedf7c5ca42afcf50c01e15b58ae4d9997c6297aa3ed5f6add8706d4ed27703c060157d301125cdb1 SHA512 04978bb6be8253fa5cd7497164b8f963c7a3f883cc64f99ca25de547ed6c2ef06a8f2eded042322ad3547319c3a53e62227734e535e8d04fd9cb83c6a1112ae0
 EBUILD hypothesis-6.54.6.ebuild 2099 BLAKE2B afc5e4c8ea7bf04b47871167d6cc3be263956e4dc6aeaafd335a46c6ca05f2699218aec9cf36cb16922f9d14a85b19760bc5f1c5b994a06a9cb56901c0d8ef14 SHA512 961d5176428c6d4fb38dddd33f59cdbfeca37b8e1da51bf8af5c6bbed6c20b681d8070a30581a72ae78dc6420fb5b6afaa1b095309dd7cf54cd036a6452854dd
 EBUILD hypothesis-6.55.0.ebuild 2099 BLAKE2B afc5e4c8ea7bf04b47871167d6cc3be263956e4dc6aeaafd335a46c6ca05f2699218aec9cf36cb16922f9d14a85b19760bc5f1c5b994a06a9cb56901c0d8ef14 SHA512 961d5176428c6d4fb38dddd33f59cdbfeca37b8e1da51bf8af5c6bbed6c20b681d8070a30581a72ae78dc6420fb5b6afaa1b095309dd7cf54cd036a6452854dd
 EBUILD hypothesis-6.56.0.ebuild 2099 BLAKE2B afc5e4c8ea7bf04b47871167d6cc3be263956e4dc6aeaafd335a46c6ca05f2699218aec9cf36cb16922f9d14a85b19760bc5f1c5b994a06a9cb56901c0d8ef14 SHA512 961d5176428c6d4fb38dddd33f59cdbfeca37b8e1da51bf8af5c6bbed6c20b681d8070a30581a72ae78dc6420fb5b6afaa1b095309dd7cf54cd036a6452854dd
+EBUILD hypothesis-6.56.1.ebuild 2099 BLAKE2B afc5e4c8ea7bf04b47871167d6cc3be263956e4dc6aeaafd335a46c6ca05f2699218aec9cf36cb16922f9d14a85b19760bc5f1c5b994a06a9cb56901c0d8ef14 SHA512 961d5176428c6d4fb38dddd33f59cdbfeca37b8e1da51bf8af5c6bbed6c20b681d8070a30581a72ae78dc6420fb5b6afaa1b095309dd7cf54cd036a6452854dd
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.56.1.ebuild b/dev-python/hypothesis/hypothesis-6.56.1.ebuild
new file mode 100644
index 000000000000..51ed1bc82c36
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.56.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index fe7a75b55bd2..f383223a0ed8 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,5 +1,3 @@
-DIST ipywidgets-8.0.1.tar.gz 111771 BLAKE2B 78217eaf6386f18a634c016562925213233ed6fc3b35266fede83f66e831f761766be0db3e23ef694edd9bc6089ff987df97f6addf2a17bc5ef1d4b6d59585b7 SHA512 cb443734897f786a86a34ab6177d84e32d00155513c835756dc53a76b7201144e0cb34c3701c06b07df22de78f6d43973f4b9be456c3b4a22db39c16de4a4dc6
 DIST ipywidgets-8.0.2.tar.gz 112516 BLAKE2B 85af0099fbbd3344e7e7985770a3dd60a5acd9dc048a274f3401e0ba6e28ff9f30405d1c32297e9b9dc004e617b26aad3f4f881d25804a9d2178f90ed2eb1c14 SHA512 45726027c68cbb6647813ba5be9e2192e63a9d80dd69246b516fef32fa0822b6cbc76d2a0622211a24fb46082c5aebcc620ece687f593077740913deaa69ceda
-EBUILD ipywidgets-8.0.1.ebuild 1098 BLAKE2B 2285a69b8134fc2a1c8403e988df40b39155ec06af03b2018e5534fcdd382f956f2b88e7966f7ace724d81501407ecc1ee9bca0fb0d9f9f3d2a6d5669cc39b31 SHA512 23a695dea759cb5d8f053955f282b8af4ea3937c0b4f6a3891c6a6c237de0b87ddbb8bc5dfbe2d2e2893024f860f8cbc6768206dbfa352adccf38aad857484a3
-EBUILD ipywidgets-8.0.2.ebuild 1106 BLAKE2B 1dad635808909bd3cbfdf41ff47931e8106db888ef76070fbe55c661e0073d142b8798e104e5cb7b8289b0b2bcac736b5f1a9b611883557faeedd7d7da350342 SHA512 b15cc743ac8254db0ab2a060ebe8cf701a4cb19dc6341d92820c12f2b7ac8b59b58310cee68ce6604a228857a4e3a88683327210118b88581fed085bcb3c8d16
+EBUILD ipywidgets-8.0.2.ebuild 1098 BLAKE2B 2285a69b8134fc2a1c8403e988df40b39155ec06af03b2018e5534fcdd382f956f2b88e7966f7ace724d81501407ecc1ee9bca0fb0d9f9f3d2a6d5669cc39b31 SHA512 23a695dea759cb5d8f053955f282b8af4ea3937c0b4f6a3891c6a6c237de0b87ddbb8bc5dfbe2d2e2893024f860f8cbc6768206dbfa352adccf38aad857484a3
 MISC metadata.xml 537 BLAKE2B 1f3b91be328b958870a72b5ce438c3e5bf67efd072b59dcb5ae77a9b89334e726af4fe8771221a7b728905cef4175cf7e0a49b11c651a7c0520b5cb032085985 SHA512 cb8092ea7a06e309a26abb78f5ddfd4a91f416e15374d2b59fb5086a64cc13f3dd408e18caa6719d12b1f18f762469a72a1027b2a047db626c51d22a5f304e54
diff --git a/dev-python/ipywidgets/ipywidgets-8.0.1.ebuild b/dev-python/ipywidgets/ipywidgets-8.0.1.ebuild
deleted file mode 100644
index ca322c731869..000000000000
--- a/dev-python/ipywidgets/ipywidgets-8.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="
-	https://ipywidgets.readthedocs.io/
-	https://github.com/jupyter-widgets/ipywidgets/
-	https://pypi.org/project/ipywidgets/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-3.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# upstream hack to autoconfigure ipywidgets in jupyter
-	# we don't have jupyterlab_widgets packaged
-	sed -i -e '/jupyterlab_widgets/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ipywidgets/ipywidgets-8.0.2.ebuild b/dev-python/ipywidgets/ipywidgets-8.0.2.ebuild
index 1067cdc66e26..ca322c731869 100644
--- a/dev-python/ipywidgets/ipywidgets-8.0.2.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-8.0.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/license-expression/Manifest b/dev-python/license-expression/Manifest
index 9c6b2e7f7350..16c8b8cb2bed 100644
--- a/dev-python/license-expression/Manifest
+++ b/dev-python/license-expression/Manifest
@@ -1,3 +1,3 @@
 DIST license-expression-30.0.0.gh.tar.gz 153630 BLAKE2B 4231bf14e69705fbf40cc4af5f17a1070c780d595db5ab0098b318eeb7289740b86319c683e61aaf844a1cc5b8598d832f14e4eeac354aff37f7b82e5437df1d SHA512 ce6e3a48c1e035e98c3831180bdafb1d70afe94b1d0148c47941129a8223b8b39e11af9407b255ed7a3d1247873c18848f8236c0a805e9b2333c6d59506aad12
-EBUILD license-expression-30.0.0.ebuild 735 BLAKE2B 8b259b26d7a87227e1c781ee4533bdb886aa095287bddc295f4c73de55a49d8f84dfb80c9cdc4c84f0c45856c4a836b7234dbc06e98e04cea63a0aa3a956d1a8 SHA512 4f23e71e8e6a75d3d1099f47756122a07828ae7c46936d7e4a66115f6b478e788c86cad71b2fb082232b162b3388f0cf99a5ad05edcd992f7b65f066301d5c15
+EBUILD license-expression-30.0.0.ebuild 742 BLAKE2B 85b9b74fcb85105b1cc6ac0515687ff9e7497505a7ae7396dded1924228068b8accd8691c520526f260763acbb5c7065167ad6beae74a4088aae49634e66b60f SHA512 235072b62508d21618e68dc9825756dc7b6c4eca648da3bc5cd3ec2f955423992d001869a2f2d3c829fd5ddda7fb1e7c289afbadd4197ce374b29734cf599a5b
 MISC metadata.xml 387 BLAKE2B 52d862f7ede77b8ab90dbd9ed2949f1c4a2b289458cff0f2e7042bf43be07b7d7e63ff94f0a10aa1db41027b3441be721656def8d59ba54155d3226e4bd30b57 SHA512 7ba89c3d94ef921fad190a85655d032a7e3a0c5794d0957c3a30ff73c75b717e87517f5f2547408426479d646ac3d157f7e659d66a18d4081689b6b41136b268
diff --git a/dev-python/license-expression/license-expression-30.0.0.ebuild b/dev-python/license-expression/license-expression-30.0.0.ebuild
index e4908fea38c8..dfc81de81a8d 100644
--- a/dev-python/license-expression/license-expression-30.0.0.ebuild
+++ b/dev-python/license-expression/license-expression-30.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 8ae1a41cf12d..f3e3203d81fc 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -10,5 +10,5 @@ DIST matplotlib-3.6.0.tar.gz 35749946 BLAKE2B 1e2e80e124ef1a0a1843ba077c3c933b55
 EBUILD matplotlib-3.5.1-r2.ebuild 7230 BLAKE2B 003f7562ce03d398eecf1bc7cb9485b9109e6ab88a8277dcc26e34ecaee2e452f4af6ab34ff5c8de06c3c1548032cda3ecda9bf8bae635cceb4b4d2d8039b1a7 SHA512 7a325460d335521a132eb30594ea36a910c153f19ecac66303402e2821d0ab130f1fa91a69ae90a6a1746378876234f54d8c05c0695c09a827453c83e7d0b345
 EBUILD matplotlib-3.5.2-r3.ebuild 7391 BLAKE2B 59b395f4d3384793dd72c633e98ea71f64656042b398a2af2d25689285534c047e572779f4e966913c912870c747488d6e9d062766d980e7dd53fdad01647188 SHA512 2dc2ca8a5a7cd7fd679800bfef9208e7679b9bcb4bd267993d9369f00a2c09e6ca0f1abd30d9dfd3712e869b205e1945f29f008f41c5c77e7c506c10fd2fdea2
 EBUILD matplotlib-3.5.3.ebuild 7446 BLAKE2B c49d5f0ce2d14d6c621746217415103d06a1cc6d0c0d682c373eec20d0af0167a55b00ba582df7d7f3745de00692e254547e721aa25dc363261ffd6297424274 SHA512 a474eafc8ec34b70535e889b4ce5606a2ad3a682308346bb5b26868f13a84e31291fdd77b3f522883faefafa1f4f0d6ce2cf399bc9bacbc584ced8a3fabf07da
-EBUILD matplotlib-3.6.0-r1.ebuild 7469 BLAKE2B b4ab7c3adeed6690a3e66f784fffcc996ac5bcd4437af1feab7a5e94ecd2c7c9008aad58467e248dd20cb200fd2fead39c29cfcd0413eb28add9b27fe8593f34 SHA512 483c6beb7d91cfbc3c7cfb4198a78a71acc79bfea559c32d2e202586cac54e1fef2b7fec090b81303ae19b0199f5d7a774c7f52b74400c6627ff15cf13465f5d
+EBUILD matplotlib-3.6.0-r1.ebuild 7488 BLAKE2B 83c3401cb7d1bb2d67f2930186ab777bb01f7054677b345ccdaae018fde7637dd492ed447c883f0c020a1cf6eeede3b7b4b09c860413e8236b5278444b3da907 SHA512 27e71506da65ca7bf88bb8b13e276711f3229f9bf8f5b7b2c7e5cd7fe8b420ad9183841b354d0bb89edacfa951eaa1e7085380b176bdd999ed98779334b55f9c
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
index c3d021be8147..b448a4981beb 100644
--- a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~riscv"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 973afb4f07b3..7601504c56cc 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -3,9 +3,11 @@ DIST nbconvert-6.5.0.tar.gz 908377 BLAKE2B a91c6c93e9e33f90c5c7f19743e20aa6cf88e
 DIST nbconvert-6.5.2.tar.gz 910454 BLAKE2B 0c80232697e1ecf31af17f10ae5ad9bcfaec89e06ab5f81c87f231f2abd585c23977d0b154363e72f6066a97d04ec96184b0d8325e5aaa399a1a9335109577bb SHA512 b955bd55bc1f69700652faae12a585230d939877551f792eebee57936a293b9b54caff5eb1bcaf996efa38c737f141069d4af2c2959b8b6318966c9020e8a2f5
 DIST nbconvert-6.5.3.tar.gz 910597 BLAKE2B a6336f2227098caf1d59aafa770fc3dd3466160329d5344dc760425cdde7ca35ad8d1e8839fe3189d1623a682a61ea3feedb7fdfdb2ec349e6ec890d873a936a SHA512 a991d8a66fe7a244d3943974d93eb13769016843d37f6c9dcf4ba84dd16511364f45b5020060bf2c10d35fe52b4df4b678d045eedc883d3156a6cb689a977525
 DIST nbconvert-7.0.0.tar.gz 860724 BLAKE2B f333145df45f7295259e964f50a68ab6c33f195c42f68deddc87d23348761cc816e9bfbe4552b2a0276ca28a9f0820183f118b531cdb1f1f8ca4355dc5486f3d SHA512 3c458a757060f1c9165c5ae7f0b5aad53be29d50ac385a37567007a5ac4fe67987592c66ba048e3659d089e9ac1ef210f14b750b5215bc181197c86257223b85
+DIST nbconvert-7.1.0.tar.gz 816516 BLAKE2B c24766716212247dee90ca91a5dbcc65ae2d47b566029eb04e14e65ef94e16f6d7700ea4cc820584bc3b498553196bb5600151a30378ec82f91bf4dde68a5e77 SHA512 5d6e1c09637765e171336528219669a9279a68f3845cb0503b79129b50550f7b5a08526a30de67da6ca132ee5d911743c5afd46773598d6045f3007167f93d5b
 EBUILD nbconvert-6.5.0-r1.ebuild 2129 BLAKE2B ee8ab38a79cd1275a36980bd510fd19f1597a97bf2e54ef58e098747830a5d24b2b2026f312e5d29cb481667ee4b3850491f53732b558c64174eccd40d856012 SHA512 4e1ccc1b1a6a37c5262fb9990e33dfe5f5e2a5d5ef828f989d9cb6c7984a86603ca66759e7c6c4143cfa06f68d3c6a285328e1f150b9370de673b788b6865fe3
 EBUILD nbconvert-6.5.0-r2.ebuild 2163 BLAKE2B de6c81ff2617bf62ae15d8ba7da027a7c2d2f58595fe44b55de71fe745cc3884f6eeb2c070285212f62b9566a2ad4d5e1ec4b97ca27287bd282fc17d5536de73 SHA512 ace789a8133d2a56b9b8a6d4513d4e5cc1d16abf8b4b47353564f4bbc7f2e181cef22ffad2d6cd80e164560af471e13524215b6a29ae2159709d3f1a490abe22
 EBUILD nbconvert-6.5.2.ebuild 2209 BLAKE2B 89790d82001825a5a148dfb098ef9186e6c1f253ef06d1aa5eb81481fe7b7b40fcdd930a67ec197a20bf45a9ad08e46784648bd8d51bf72040939b3d1f697be5 SHA512 d29f32603ff6cac24aaaa327d5e6162a5040d856c3cd90fcb5d0d47fc4944a3ddedf65654e990ec0a932b568906887e2d9660b922c37ee9fd69d9afd7086bdd0
 EBUILD nbconvert-6.5.3.ebuild 2209 BLAKE2B 89790d82001825a5a148dfb098ef9186e6c1f253ef06d1aa5eb81481fe7b7b40fcdd930a67ec197a20bf45a9ad08e46784648bd8d51bf72040939b3d1f697be5 SHA512 d29f32603ff6cac24aaaa327d5e6162a5040d856c3cd90fcb5d0d47fc4944a3ddedf65654e990ec0a932b568906887e2d9660b922c37ee9fd69d9afd7086bdd0
 EBUILD nbconvert-7.0.0.ebuild 2749 BLAKE2B 98617950e2c60b91d8d9942887f72200ba5e3453e2d9af80e8cf4e1b8ba888bc00e141650826415fa09b0dd3fafecadcdb6cc6640aced93c9e701f7218a8c586 SHA512 4b1d90c5dd6fd3b5b2db1c2256c809fb6b7044f9847b98199b6efe8e6271a4264e811ec3d420cbe371d727e332d30f7806b804197a89838d03b7b95d88097a0d
+EBUILD nbconvert-7.1.0.ebuild 2711 BLAKE2B 03dac7df26c570e3003be9ca7afed4a1b036921683822b35cf289a65729b5e72d6e35fe516105ed926f719617085d7f6db45c671a538c0ea07e6aa30ace423bc SHA512 dd76f96a22a17e5780d0fbef8ae403ddd9b9c4930854f33be3e0a60ea3fb9c313f9a7ab1bbafaf9c01e0bb077309a8efe4e41c52502be96850183895c48fa730
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-7.1.0.ebuild b/dev-python/nbconvert/nbconvert-7.1.0.ebuild
new file mode 100644
index 000000000000..eb24c46391ff
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-7.1.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="
+	https://nbconvert.readthedocs.io/
+	https://github.com/jupyter/nbconvert/
+	https://pypi.org/project/nbconvert/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.7[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
+	>=dev-python/mistune-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.1[${PYTHON_USEDEP}]
+	dev-python/tinycss2[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/notebook[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		>=dev-python/ipywidgets-7[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	mkdir share/templates/classic/static || die
+	# tries to refetch stuff even if it's already present
+	sed -e 's:css = .*:raise PermissionError("You shall not fetch!"):' \
+		-i hatch_build.py || die
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	cp "${BROOT}$(python_get_sitedir)/notebook/static/style/style.min.css" \
+		share/templates/classic/static/style.css || die
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Missing pyppeteer for now
+		# TODO: Doesn't skip?
+		nbconvert/exporters/tests/test_webpdf.py
+		# Needs pyppeteer too
+		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+		# TODO
+		nbconvert/exporters/tests/test_qtpng.py::TestQtPNGExporter::test_export
+		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_convert_full_qualified_name
+		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_post_processor
+	)
+
+	nonfatal epytest --pyargs nbconvert || die
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 601cbfd66157..58e2b1f1d007 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,7 +1,9 @@
 DIST openapi-core-0.14.2.gh.tar.gz 57519 BLAKE2B 06dfd284612ca11a271f075444db9b859ca5416e31594680d6b32abec1fe917105f213209d1bfcb9664b265ea3d62839579134e8e104754075cd692d1ba7a99a SHA512 19a2508d56053214993abed7d173d17b55a80dac6421681d7c64082f910bf9cb03c99d4006a2cd883d51d54f11a18f90188f141a78b9d69a9a031c284a14f8f1
 DIST openapi-core-0.14.5.gh.tar.gz 57645 BLAKE2B c5c9c308b93a37e32708677cc7c7a2ccb9ec3f018390e56a251224b6b8776943ccd0ddfb560cdc3f1182cb32a9b2817878a0d4dda3906c179db9841853caf7ac SHA512 69d9fb2cc21dfdb939beae45b1c681faf9f8e3366b36e5907b00be65ac669ec40e3ae3fe910fb2c4f6c70d1412e6a67e4e4e47e3cf2c424716da4c813223295e
 DIST openapi-core-0.15.0.gh.tar.gz 73274 BLAKE2B 8bae95a3a70438702d6a49c06954dba610766b945076357cc32382b59efbbf2d839a282b41b3d96f75b25e8864c0b9f9bfec1eecd8056e205bda5d62fbc6abc4 SHA512 3e9327fdf7d8b84d29627bfcb9a7c7e471ddf8cb06c5b2ffd3518fadcb872738cdfc5365558c51b8e0526bfbe5a841b9bc9598d630c6c6ddf141dc9c6681c3d6
+DIST openapi-core-0.16.0.gh.tar.gz 79041 BLAKE2B 93745787d39dc2e77e6b268792548069e7637ea7acbf4975224d837b87f301ea5ae36c07aec5b8f44b6e7a5480aab744e9601663f080d63f27b8a49aeb9cd7f5 SHA512 70ed773926c16df9d085e7ce104a0a99ccc52e8e0ba395ead1cf5e9cba1e43723bb7a744cd2b9c27e3a8a48319f8265dc5745c20cc23e825fa28ed3b2fcd3e25
 EBUILD openapi-core-0.14.2.ebuild 1733 BLAKE2B ba75a26c077c9b9ac1c09f321c941d96cfbc4b37404d77481d9d0a03ddf93e931ad4a5b623a7bc3fcf48c4157b4f31989c0fdaa45e0f132d5a1d54a35173e94c SHA512 cbe22ad4328af6634c37a4348edca2ee841db605f4d09a3a4c4a63548d077acad7bea0742a375229a0c777bfb4dff137ea3c40ebc256486c810e6b17e6b3490d
 EBUILD openapi-core-0.14.5.ebuild 1780 BLAKE2B 69e455d8d5e1d10359239a6c5463659fa5a85b43fa1e17ba19cd5bda9a9b6905808847f9ded7e7f2c028961c136697efde9309df9cc5e2509117a51f4c166ebf SHA512 ac6902c71cb38a390776af35c0fb2d460e2862ee3c2ad9ef09ac68c0a7a402f33be8c5fd0dbc18db2ae3c8c4d97a1448d40c349fa8828700e26bd516c8262ea1
 EBUILD openapi-core-0.15.0.ebuild 1509 BLAKE2B cbebd6c7b73dff0acf65a1ac28b2cba6c9485dcc50b0b802bdb0cc3d5672d148923dc78ad600c5b3e0e9d7b62fc0d5d9101ff5642e6eb3c26ade8d894588eeba SHA512 77689ea82e80566ebb6eeadf5c79aeef9dc0a26129a48876106b27abfa15ec7b67ba1dcee26c7aa0bf851a115c50763ea0c00a95884740639166104b61b40621
+EBUILD openapi-core-0.16.0.ebuild 1779 BLAKE2B 9e3d51a06e7b6e4c82fcee096655c1fe3501c202b0e52ccaba6bfd91d5d932b33d96ba9974a97bc942ad22f1760ccf03c281edaf5cf42937c5f732a0cc940002 SHA512 f0042b56e85ccbbf70999a4e861ffc25e5b987d17e5d8a4e0f354dee496232608e9ac739597d920c427efc8e1d84ed1acaeeab31676b3008867ccb606c5f8d9d
 MISC metadata.xml 376 BLAKE2B bf1f9cf9377b172dfb5f916332dbf9d1e485f3ca1f31f754afac41931598c1780c474989edbfcf39bbfd4ceb8e8030280cf0997514dfb8e02bf3294176fc3dfd SHA512 c7fbdc21a2ea86abe5bcf4a3e8ba97634a447926ce999aff761965ff411fb05b09fab5e5338da5f8a8486a6b024cfeb27cfb9d9fbbfc9bad6f9dabaca1c82799
diff --git a/dev-python/openapi-core/openapi-core-0.16.0.ebuild b/dev-python/openapi-core/openapi-core-0.16.0.ebuild
new file mode 100644
index 000000000000..14f8bef1d51b
--- /dev/null
+++ b/dev-python/openapi-core/openapi-core-0.16.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
+HOMEPAGE="
+	https://github.com/p1c2u/openapi-core/
+	https://pypi.org/project/openapi-core/
+"
+SRC_URI="
+	https://github.com/p1c2u/openapi-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pathable-0.4.0[${PYTHON_USEDEP}]
+	dev-python/isodate[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	<dev-python/openapi-schema-validator-0.4[${PYTHON_USEDEP}]
+	>=dev-python/openapi-schema-validator-0.3[${PYTHON_USEDEP}]
+	<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.23.0[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/starlette-0.21.0[${PYTHON_USEDEP}]
+		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# falcon is not packaged
+	tests/integration/contrib/falcon
+
+	# TODO: these tests fail to collect
+	tests/integration/validation/test_security_override.py
+	tests/integration/validation/test_read_only_write_only.py
+
+	# unhappy about modern django
+	tests/integration/contrib/django/test_django_project.py
+	tests/unit/contrib/django/test_django.py
+)
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index 0ab678834dae..e1f0debfd41a 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1,3 +1,3 @@
 DIST pdm-pep517-1.0.4.gh.tar.gz 314677 BLAKE2B dc6fad5bf6bd4aa6d9d490c6fb1df0d1a1543ae93f90ac4d53bbd515de6f6582a4fd032cc5c67aeebf71755fec6aac3b5a462a18eb08087c6a4da279e3c989ad SHA512 4edd016873c054f20efc39b8a044c2ff5dee70509c45ba1227e6982043dabb5ed0353afef4af73c88106ffe5a2c27f569077448fb27a0d58169710d2c6573c2f
-EBUILD pdm-pep517-1.0.4.ebuild 1290 BLAKE2B 7381d250bca6b84e1e8645b319588c34015bba4dbc74bbaa31cd0bf038d00a3cf0d5d6f6034ad19402ec356922afeb03f7df4a1db6bf15b07712077aa74cb1c2 SHA512 09471709e972ba932b1a23a240ebb6dac574c2503383cafd5f3d3187b5abbb7b63ad0ebcac57c9930b4c625bf978c074f97c0676b4772187853bc817a1386da1
+EBUILD pdm-pep517-1.0.4.ebuild 1297 BLAKE2B 07d90523ccc7de6ec6d3531505be29af647170fcbb3fa69e07929106379261059557d9612a46d9878b74e147b9f00a589ce734cbbd0d64fc75072ad0f84ce1ed SHA512 94789448781b2fbae514030a538937cf8ce83c1ac9328bc9233e537f0aac2f6499542a792e7533687daebed77877ea7aa5ca0e3a1e1e4dfe39d043cfa7e3e58c
 MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
index 9c2511ebf46b..3bc621f35cd8 100644
--- a/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
+++ b/dev-python/pdm-pep517/pdm-pep517-1.0.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/proto-plus/Manifest b/dev-python/proto-plus/Manifest
index f9411116037a..2bf650f5ddef 100644
--- a/dev-python/proto-plus/Manifest
+++ b/dev-python/proto-plus/Manifest
@@ -1,5 +1,5 @@
 DIST proto-plus-1.22.0.gh.tar.gz 69248 BLAKE2B f0bcfec696fc732eca291452fac681a38c23baa0d67cbca64a1abb31879775d28c00cff0e67e2f6c9f1fe68c3ee2693cc99599bd29f1eb0f17e2f6b48e1c9731 SHA512 110b5cf7effbcec8ac0c99361d1e0710eeea5949d2cc015e6e41cac4d045bf93560eed72b8d83709a76fa57d522859e162e6cc5e60456f98d32761bd284e0d19
 DIST proto-plus-1.22.1.gh.tar.gz 69507 BLAKE2B b71c263270dde979da0e050a21db258366ca5ddfaed5f8fb78e53444454a123d171019801873d1662ca73a89f079fa1c4cb7c58d34053cabb528015c0d742183 SHA512 2fb5dcb6124d6e2aab010089f4ad138de5cd819d4e67c2b9a6d7044a3d7677ca6e5e37e9aa0ee9edb262c52724dfd2dc05592c489df66d3cafbdf51f13644c7e
 EBUILD proto-plus-1.22.0.ebuild 917 BLAKE2B 7ebb9724e5e0fbfe88b3961912eea64bc61de0c47528fc34a4140b8d52a6891d5973bec31a46683690cefac235498ea55a45163ac5c7152bc479fa387d9913c6 SHA512 71e6499479714996cbb506f120802fc4ac1d437866c96df42a1a3515d9e30905ef25cfbfa2545a05ee015e106cefa962d834a2b76aa7532aa33560cba3e7411e
-EBUILD proto-plus-1.22.1.ebuild 919 BLAKE2B 9d2e638037ab6e048257fb15d6e654d9c1dd4661e3875e1a2354582539311ad01baca958a454072a6c51e003a6bbf5a1bbf27e05b1cf2db78b7d3de9100aebfa SHA512 c306d37b44976b9fd4041c58458cf9cfb0d8c6af06ba456681221c291a4af6b80c9e47ff47203e9659638c7ee422299a82e353aac22d3c90c3e2128687d93ebe
+EBUILD proto-plus-1.22.1.ebuild 917 BLAKE2B 7ebb9724e5e0fbfe88b3961912eea64bc61de0c47528fc34a4140b8d52a6891d5973bec31a46683690cefac235498ea55a45163ac5c7152bc479fa387d9913c6 SHA512 71e6499479714996cbb506f120802fc4ac1d437866c96df42a1a3515d9e30905ef25cfbfa2545a05ee015e106cefa962d834a2b76aa7532aa33560cba3e7411e
 MISC metadata.xml 447 BLAKE2B d440be836b8a2823ab3beb7f76cbe7ff3f027ec512dff3f7d920eefea3f18329e1aa910ca16e006b1424cbd780f3fad80b8ccdc632c08ade651afd815369e9d0 SHA512 d64b8d2eeac9916ec2faab3b038082155e46e8c379ce06d7f554de763318539fa9040d15f90a3a95f337937c90f4b4042f51b1ea1cd11727e5fd971a0af5280c
diff --git a/dev-python/proto-plus/proto-plus-1.22.1.ebuild b/dev-python/proto-plus/proto-plus-1.22.1.ebuild
index 6be65f5713cd..ed6addeaf3ed 100644
--- a/dev-python/proto-plus/proto-plus-1.22.1.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.22.1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 88add02954a6..55b19dcc42c2 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,9 +1,11 @@
 DIST psycopg-3.1.1.gh.tar.gz 464501 BLAKE2B 1796ae830051ee0719e4723036ca672ac005793beb88da21b9775cdc96dd4f58b3d008eb3f3a87c3f7293ea097480bbe72a8591b68371d1f7c7261c37927e40f SHA512 a243626c5e0ee0ef414c193b9168f58ec6fa3bfc5652c25c3c1f355f4cea29bcc993ba631a125c0a0335155c15fc068f6cfa5e8974de0cd32e007ae6d3db23dc
 DIST psycopg-3.1.2.gh.tar.gz 467017 BLAKE2B 5e13156ff05a356bb59ebae77e8ad3d3e35ab669a43102fa7751927e0ecfbebd1b30db7d62bd0865f426c2e6362a98a6d9cad19c9001abf29b6d030b4dd0204b SHA512 3e412ec91a337012086b1260527b2179883f6b44a26c5e8437c92351ca39594c4430f251abdfbc52e4b2c69d5e91ba09883578b177e836691cd295b6e8464fdf
+DIST psycopg-3.1.3.gh.tar.gz 468400 BLAKE2B 5df0414d1afef4a09a319453e2d9cebd6177af507c30e69aac64dc1d476cf7a0d182c72b81e46d95e3167ee503fa9756ba82ad1092419eea0d6fc3c6e9ba972c SHA512 83ca6dc81cff841c9e22ad8ae86500be0012ee0edbc50b8ab97dcdcbe9d17a8b32feb637275bbaef8333f252aeb961fc5f1f9d2c66dcb1e92b0a1b67223624fb
 DIST psycopg-3.1.gh.tar.gz 463892 BLAKE2B 94100bed4807771f6c4d0469737b160955f3f6bfcff84240c9e15dd9b7b88765583952b712642740c97f6ec42223edcf74fb2c5390a185f44ca0eb8858e76100 SHA512 057a14d614ccb9f36a7db7a82c3d48953658a1c6af2a2265a93a3f6c1db421275e51e1be4d59e2ea98b638f3da8c24c9d2a4d9aabf6190c47691dd632c9339f9
 DIST psycopg2-2.9.3.tar.gz 380611 BLAKE2B 78099da7378dcfa8b7f28aae4d533a7e890cdb7ae4c0cc718a9411e630fd07b56f074760fc29de8fe08fe727328cca39414a5f297fb92ed2f7471a24e633d18d SHA512 048184d1d162a371fc0fba711448a6fa8a6aac193421f4484c7f7b91c39065d5b632fa34fc15a901eca055d597302b1f9e38330b248ed0e4653dcdc544b0d660
 EBUILD psycopg-2.9.3.ebuild 1306 BLAKE2B 166f519f6e4694fb2725e0f4e736a9ab907dc398c4fadee579da96e37f29faf6f6fe735e56dc9156eefa74302bc516915499d827b3762655863bda1162716e19 SHA512 ecb1f931618b74393cace6f850b35c7512fe5902bdf97eadf0cc1f54e60797c863fe558cda3117ca8a5cd025bd6a761545d6fc1d837aed8ec095c48e98cd7c1b
 EBUILD psycopg-3.1.1.ebuild 1732 BLAKE2B 346e6e31a3be765833c4a1d75009d3c8e7347aea9a4a38d35d0cc5c7da722d23abfc41c5b4943331a008b19238a7544c0b181eec83a23a68ae1bc68e5748757f SHA512 f808046857d7400d55ebd1e10ab5f090c26f78b181ded703798acd5a9531bff61bbb450350f904533e265f0fcd2c5032db53a9c1503ced826dc26002cc2a844e
 EBUILD psycopg-3.1.2.ebuild 1732 BLAKE2B 346e6e31a3be765833c4a1d75009d3c8e7347aea9a4a38d35d0cc5c7da722d23abfc41c5b4943331a008b19238a7544c0b181eec83a23a68ae1bc68e5748757f SHA512 f808046857d7400d55ebd1e10ab5f090c26f78b181ded703798acd5a9531bff61bbb450350f904533e265f0fcd2c5032db53a9c1503ced826dc26002cc2a844e
+EBUILD psycopg-3.1.3.ebuild 1732 BLAKE2B 346e6e31a3be765833c4a1d75009d3c8e7347aea9a4a38d35d0cc5c7da722d23abfc41c5b4943331a008b19238a7544c0b181eec83a23a68ae1bc68e5748757f SHA512 f808046857d7400d55ebd1e10ab5f090c26f78b181ded703798acd5a9531bff61bbb450350f904533e265f0fcd2c5032db53a9c1503ced826dc26002cc2a844e
 EBUILD psycopg-3.1.ebuild 1725 BLAKE2B c78cc5299f68452a34fedef960e3ad1bab4d2ab350e06717813bb6972bc0b71c138d1b7d8da12fbea9c36d6b107d9be137e278d43e3a31e74a9fb0df09cbb404 SHA512 2efabffff8d9ae101f2207e694f60bb47daa54454274c8c7abfd69e7b21189628c088e9f8b2677a8bb2a9dde4a345abb165a538a35be7c7dc436a0f886b88ed0
 MISC metadata.xml 369 BLAKE2B 042788638a82318248d4e4ea1e12bf1631af6ffc435fc0110e13849dad600854e8b57f5ba3397c4d4e5d103e165b342f8aba869e72e9b63efc500382d3423414 SHA512 5b216575e8cae847f71a09ed6b676a73fccf2070f3bea3b35f1bfbde95fb0154b2fbb356948e112cc9f2298fc9868ac3994a139e72939f80d59c084ec58d80bf
diff --git a/dev-python/psycopg/psycopg-3.1.3.ebuild b/dev-python/psycopg/psycopg-3.1.3.ebuild
new file mode 100644
index 000000000000..8bd1346c397b
--- /dev/null
+++ b/dev-python/psycopg/psycopg-3.1.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="
+	https://www.psycopg.org/psycopg3/
+	https://github.com/psycopg/psycopg/
+	https://pypi.org/project/psycopg/
+"
+SRC_URI="
+	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+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"
+
+DEPEND="
+	>=dev-db/postgresql-8.1:*
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/backports-zoneinfo-0.2.0[${PYTHON_USEDEP}]
+	' 3.8)
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-db/postgresql-8.1[server]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# tests for the psycopg_pool package
+	tests/pool
+	# some broken mypy magic
+	tests/test_module.py::test_version
+	tests/test_module.py::test_version_c
+	tests/test_typing.py
+	tests/crdb/test_typing.py
+	# TODO, relying on undefined ordering in Python?
+	tests/test_dns_srv.py::test_srv
+)
+
+src_test() {
+	# tests are lurking in top-level directory
+	cd .. || die
+
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" test || die
+
+	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index de82044c5d23..299eb4bf54d2 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,5 +1,3 @@
-DIST python-dotenv-0.20.0.tar.gz 32069 BLAKE2B 360c878241fe4df4cee2ef59a2a4967e3b5fff7250297e4adb4b7f2c50deaf66bdc76b97bc9a1998bcf3d7da7c5e40c98f93d3e3cc044a2e73e159a85a2d93fa SHA512 85e3953f296ec59130ea212b794557d479efde0ef519303dd3a8fe8da0be2d445728b9b8fd5a4bc13372a0fa322f49d290038538ddca580841d0df1f3758f0b7
 DIST python-dotenv-0.21.0.tar.gz 34984 BLAKE2B 5b2ac96e2c68afe04ec5e63da44c7109c0d142e1abad64fb9d4c87cfc84f36e62023854f72145f6a7f6b7e05bf58a57ee4b97ac8b84aa1304ddffba0a8795c6c SHA512 618335ad11a1ed8011d7cd0c6a83912b5cc29eddeb967c9594af32c6229ca178b571b08836776661612015ac9cd6753de1935f3f3e0e3b8feb733eccfbb262e7
-EBUILD python-dotenv-0.20.0.ebuild 1170 BLAKE2B 07fedc0168e098bd1774198ac25fae18098b48d5a12c0c892b4e7b8e4beff46bd191fbe12f827d7aadfa6623f4f274d7455dec03573aa17436a844a5fa191e8e SHA512 12453425e8de895966e57c610139b4fb4fd7c7ccd327da82f165f98822be3ee1cb639366313c48c44760d7625e5a59f21ece9107c009c43b1aa5f13920db94e5
-EBUILD python-dotenv-0.21.0.ebuild 892 BLAKE2B ca0fd0c35daaaf0196f688b39c5963826970a6418b905b690467689c8cabad29447f81be80fc6507e1be5e280a139370346d10839132e1a3ca698c4415611d9d SHA512 4b83fc4552d8cecb925d2f1b02cceffd49480bc0e2b55cd6c5c8909a1feb5a0661e6e8f609c07c27e1d5c2afb62a3365e42788c547588d5f4ccd1cd1e4da5300
+EBUILD python-dotenv-0.21.0.ebuild 884 BLAKE2B 8212b4b6dc10eccacfd7f5170f9d57f212c2c78aba0546b816e8ead77d39be84e705aaef30265f48876e49c0f0556ece4c5588a80976a06f8558c29cc1bd35a5 SHA512 bd178cea617132e45de7c6591fdf46ebfbe906e9ad7f168322f2c2ad3565f6b4a4bae8fe77c785886cf7dc05ce6452b92238357af524d44574f92d585b58d3aa
 MISC metadata.xml 466 BLAKE2B 2e6368e01f6c9d9ab8e69a62196a10765ebc30365a3c2fab3e171386c7f26adcb93e7e4d0796696e531db66236c2c7f31b6c948a76682ff385993cc5504eba00 SHA512 45b35de8b5108267b28a1d6975824440d821cfe3e3a1c99dcadbe8d64b4ef78feadb9b0b7434c7292250e7f4615c13f2f37d5b5d41956d136f9bf25d175c356a
diff --git a/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
deleted file mode 100644
index 7a35ef4c30e9..000000000000
--- a/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage .env files"
-HOMEPAGE="https://github.com/theskumar/python-dotenv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="
-	test? (
-		>=dev-python/click-5[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=()
-	# remove when https://github.com/theskumar/python-dotenv/pull/397
-	# is merged
-	if ! has_version "dev-python/ipython[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_ipython.py
-		)
-	fi
-
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-	ln -s dotenv "${D}$(python_get_scriptdir)"/python-dotenv || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid collision with dev-ruby/dotenv (bug #798648)
-	mv "${ED}"/usr/bin/{,python-}dotenv || die
-}
diff --git a/dev-python/python-dotenv/python-dotenv-0.21.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.21.0.ebuild
index 735f6959bea3..5d679a76e2e7 100644
--- a/dev-python/python-dotenv/python-dotenv-0.21.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.21.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/pyupgrade/Manifest b/dev-python/pyupgrade/Manifest
index f23f9c8cc518..d4dca54ee08f 100644
--- a/dev-python/pyupgrade/Manifest
+++ b/dev-python/pyupgrade/Manifest
@@ -1,7 +1,5 @@
-DIST pyupgrade-2.38.0.gh.tar.gz 63620 BLAKE2B 73f551e92a6d68e0e1e2b1f21a3afd0f26ece7889450135fe7c68ad3ce094799cba669547965ff3c5589f1e667568e8dcf60709e8d1b3699fd36680494b79f96 SHA512 c65534c59f1810730cd039375678c648565023e1fbb03df4bd14846be95757b33d712c51197f54009e907da647a04700dd8d8ff1094188ef7ba0dbf2352084cf
-DIST pyupgrade-2.38.1.gh.tar.gz 63637 BLAKE2B 348346d82f85c8df4edfaf2b09e8e519b5ee1d895920a896ae4c0a23f0af0da338ec2c1c2d2c175977da725313b4b5ace6ced65a3a54f5722146f35986485a9c SHA512 056e9886a8bacaf58d74461a7cbce8b7e67392b6758a7e42363404b4822df837067a7a2ec5da6a97411ce8297955ff260901f95b17d1a9e84835bce755071fca
 DIST pyupgrade-2.38.2.gh.tar.gz 64004 BLAKE2B 4d5456173d7202749e87726f5547f8f406ab226e2258d78393f10e1ee8129835a65272ee12c95d3d71139f57982c240c38d67353153af43dfa30a8dc7e4147e0 SHA512 e7184539f9e4c8090be02ba1fef1288564e7f8860457345b3305c06391962491af04497e5fe14297fb9c90a6e7e4de1f07a39235a5358188f5f5fa035ab7eb1b
-EBUILD pyupgrade-2.38.0.ebuild 555 BLAKE2B 46e3ea0d4ddcbee0f27f1754f29eca45cac1cc219f599b5b5eecdf50e924f5ef5fff6425785c046942a1e98185066d6b6b703090dc7b9e917bc6da617751a51a SHA512 79027c18626cca68143da7fa0b88a1f14f5f54cdc5108386a33541eddc49aa891e3483eb354c5c7a94a03c8f36893fde3d55e7b4cf7b54bbbdd5faa28c60037e
-EBUILD pyupgrade-2.38.1.ebuild 560 BLAKE2B c3f69d916c22a42e0142e80e73d026c410db0993b56e93460154c18c6ca3b350b245c32d5638f853e955c63b9b17eaa28827728b7d7fc8178586b22f6bfbf173 SHA512 3a02fe86c170b1495b69db39760ced415cce26f9b871c1e0b5dd4a45b27710a8868d7fc6303c6db0e32fb8f91d13931aac1e48b97804f247cbb08f37e1f64b2d
+DIST pyupgrade-3.0.0.gh.tar.gz 61941 BLAKE2B b1760bfe86dabbb5b93bd2c741c7315ce6463df4fbf477ddc30a830e28044fdfc21328ff32589196c6383396b9550fea3711119ee8cd0c5e4468ec7907066d69 SHA512 ed6b8407e7f39e44d78215e4bb275c3b70426fc087ab9890964cc35133859568147bbdd0ea5731a214f397f58691b0f4c63de55201c38bbfa83cb99db1c6655d
 EBUILD pyupgrade-2.38.2.ebuild 595 BLAKE2B ae660b303683a5adf769998adb543c1626099cbd4220a3e4416ba3e7174b295e6e5714ac50107f364fbb3aa4c086cc9bfd81944463043fe9dabfefe269f60bbc SHA512 0bebd140dbe5c4cfcfafcada1a20a3edfc2d6349143ec4d523184dda0b8483dc2c1e5bb60121c5eeb9754d2a5a70c6988466e70fd78f64473065825a02a969f8
+EBUILD pyupgrade-3.0.0.ebuild 595 BLAKE2B ae660b303683a5adf769998adb543c1626099cbd4220a3e4416ba3e7174b295e6e5714ac50107f364fbb3aa4c086cc9bfd81944463043fe9dabfefe269f60bbc SHA512 0bebd140dbe5c4cfcfafcada1a20a3edfc2d6349143ec4d523184dda0b8483dc2c1e5bb60121c5eeb9754d2a5a70c6988466e70fd78f64473065825a02a969f8
 MISC metadata.xml 603 BLAKE2B a9513a08115930ae37b1a3dc5bd2c0649e646bfdad961f10478b9575c597ffad2847b13642e9433ed7ffa41a2ffae0410616e7eb1cc2a00dfdc181f98639419a SHA512 f9da5ac513c1ee7e1411642119344abf4d409bffc2b1cac997bee625add8ceb5982931d9cddeee082d1943f405a70bea617b06b3bbc6f3787ea987b8e43554b1
diff --git a/dev-python/pyupgrade/pyupgrade-2.38.0.ebuild b/dev-python/pyupgrade/pyupgrade-2.38.0.ebuild
deleted file mode 100644
index eb59646e97ec..000000000000
--- a/dev-python/pyupgrade/pyupgrade-2.38.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="Tool + pre-commit hook to automatically upgrade syntax for newer Pythons"
-HOMEPAGE="https://github.com/asottile/pyupgrade"
-SRC_URI="https://github.com/asottile/pyupgrade/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/tokenize-rt[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyupgrade/pyupgrade-2.38.1.ebuild b/dev-python/pyupgrade/pyupgrade-3.0.0.ebuild
index 06b14263e479..02368726bb1d 100644
--- a/dev-python/pyupgrade/pyupgrade-2.38.1.ebuild
+++ b/dev-python/pyupgrade/pyupgrade-3.0.0.ebuild
@@ -5,12 +5,16 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Tool + pre-commit hook to automatically upgrade syntax for newer Pythons"
-HOMEPAGE="https://github.com/asottile/pyupgrade"
+HOMEPAGE="
+	https://github.com/asottile/pyupgrade/
+	https://pypi.org/project/pyupgrade/
+"
 SRC_URI="
-	https://github.com/asottile/pyupgrade/archive/refs/tags/v${PV}.tar.gz
+	https://github.com/asottile/pyupgrade/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
@@ -18,6 +22,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="dev-python/tokenize-rt[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/tokenize-rt[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index 90ed35610956..be7824527eba 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1,7 +1,5 @@
-DIST rapidfuzz-2.10.2.tar.gz 788167 BLAKE2B 91264d83159ce91cac33138c2589d468ffb079daef06f1917596892b3c5fbb99f2012d79ca05f728e6d49c2241d83f68e0d3a44956cfdfafd38cae428496f507 SHA512 3d7610a2e4b32fbfaa0ac043847829bfc436e61c2d0c76d526fc0827cca4fd10a0b6ae659bd61ed48604695c4782bcb0984d2becaf84494b84a5d8e71c22e97a
-DIST rapidfuzz-2.10.3.tar.gz 788237 BLAKE2B dd6e70bd1059317d98cf96c242e62ba8be2c9bdeac483f0da18b4f46179502ac0f0ae000f5bdfedc44374dceae1c4054bd2a6be7dde5e466497c617c699ceeeb SHA512 9774a203482ab90a4bdc7f9faaa2ea0c0c314e350fb6c957c3eed3f7cb5009d1fd2521c5438b25d8d04aedf96028004136908a3226305bd2cbcf4158d0bc0329
 DIST rapidfuzz-2.11.0.tar.gz 812669 BLAKE2B e7897b2770202d46cb70323d19a79c6f34c379cf43ab211e2ba4d05ef6f1630d49b3cef70ab52bba1ac0a9cc15cd934e86aab829ec84195a6b583a561efc8cb2 SHA512 df5e77248c2a005ff1e0fbd4b4ef15fbdb88a6738d66823ba9bf8c380943c59fe82ac317dab1e6279b33112d2484563d65c33e972d52ab82b083cd8a8aae7ce0
-EBUILD rapidfuzz-2.10.2.ebuild 1051 BLAKE2B 7e05388be109cbfeff7d033a7e09acb9706dab76a0a46db9c1c8b21619e29f00452f658e50b2da8c05338ceed23761698efbc72bffd19a9ad9e1cf5df11c53b7 SHA512 d21721f9424c49870a7fe2f68577b7f068210686ef0cd84d54b3a93c05b3c6d17929e6acae6155d8afa38b02e6e0f21d8c4883705caf677df48f5ca526baa44d
-EBUILD rapidfuzz-2.10.3.ebuild 1051 BLAKE2B 7e05388be109cbfeff7d033a7e09acb9706dab76a0a46db9c1c8b21619e29f00452f658e50b2da8c05338ceed23761698efbc72bffd19a9ad9e1cf5df11c53b7 SHA512 d21721f9424c49870a7fe2f68577b7f068210686ef0cd84d54b3a93c05b3c6d17929e6acae6155d8afa38b02e6e0f21d8c4883705caf677df48f5ca526baa44d
+DIST rapidfuzz-2.11.1.tar.gz 813221 BLAKE2B 1fab9b564396f820c9bd5c240df95a2e864b0e3efffb4239fa2ad719b92d2997d9519ccf906fe04c61a0fc1daf9ed0df734f95d4cdd19529e46716935182030b SHA512 19f6dbff31f11cc16f031f9bf53f7c60051a84f2f81dfc1c17fc83827a7d8551d708420b4116ab91e56b5d6de652b4d571f4055ebcb208e5dd57e8778050ca29
 EBUILD rapidfuzz-2.11.0.ebuild 918 BLAKE2B e0f99f5d8fcc95f2cfd4a29495f0aae2a2e18993a50fc6dfa39110ac0d3cb66cf369de990ed11e78e9104a91e35b12995e892c9140c76c2973fb31fcb4ff20fc SHA512 ed0a3809ffcc7f86b45f2f53c12cb24991ca3f99766381c5d2d08074fdee2928a3daafed49a12469710e8c5bb249c9188f24f910128e99ddac3bd0cd745accdf
+EBUILD rapidfuzz-2.11.1.ebuild 918 BLAKE2B e0f99f5d8fcc95f2cfd4a29495f0aae2a2e18993a50fc6dfa39110ac0d3cb66cf369de990ed11e78e9104a91e35b12995e892c9140c76c2973fb31fcb4ff20fc SHA512 ed0a3809ffcc7f86b45f2f53c12cb24991ca3f99766381c5d2d08074fdee2928a3daafed49a12469710e8c5bb249c9188f24f910128e99ddac3bd0cd745accdf
 MISC metadata.xml 374 BLAKE2B e6ee89a9850276b8c22c9bc851ebea2cde2ea696d122d70c6465e09a9371c59f81d1976b3253e8ee90afae5e3e30e993481b402058bac0c58ec01f71a0b7c3b4 SHA512 9a39c4bcf8e8de0a6d6a356a9aeb415f8f49667caf5716eee50bf251f1fd53bb076e817fac0b15bf64e65c1b9625c78810da61a5d96b273a20b2669a18084d6e
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.10.3.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.10.3.ebuild
deleted file mode 100644
index 3a1dc1af36a6..000000000000
--- a/dev-python/rapidfuzz/rapidfuzz-2.10.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
-HOMEPAGE="
-	https://github.com/maxbachmann/RapidFuzz/
-	https://pypi.org/project/rapidfuzz/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	<dev-python/jarowinkler-2[${PYTHON_USEDEP}]
-	>=dev-python/jarowinkler-1.2.2[${PYTHON_USEDEP}]
-"
-# all these are header-only libraries
-DEPEND="
-	>=dev-cpp/taskflow-3.0.0
-	>=dev-cpp/jarowinkler-cpp-1.0.0
-	>=dev-cpp/rapidfuzz-cpp-1.0.1
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export RAPIDFUZZ_BUILD_EXTENSION=1
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.10.2.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.11.1.ebuild
index 3a1dc1af36a6..208583661aa3 100644
--- a/dev-python/rapidfuzz/rapidfuzz-2.10.2.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-2.11.1.ebuild
@@ -18,17 +18,12 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
-RDEPEND="
-	<dev-python/jarowinkler-2[${PYTHON_USEDEP}]
-	>=dev-python/jarowinkler-1.2.2[${PYTHON_USEDEP}]
-"
 # all these are header-only libraries
 DEPEND="
 	>=dev-cpp/taskflow-3.0.0
-	>=dev-cpp/jarowinkler-cpp-1.0.0
-	>=dev-cpp/rapidfuzz-cpp-1.0.1
+	>=dev-cpp/rapidfuzz-cpp-1.8.0
 	dev-python/numpy[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index 6e01048a5723..7ae96a8c10cd 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,3 +1,5 @@
 DIST tldextract-3.3.1.tar.gz 110819 BLAKE2B 18fda8d78783c3da7949fc9d019921dc4188686d932033dea8f393c0964adb935d104475836df188390c4dc5d0d67b4d5be45baf7f0dda1264fc4b8adf73be7d SHA512 ec1c8f326772cad04caecb65fc4b6c0bd168233ca59c14b4baf0d365420fda6c740febb8399bb8ead747f259bf81b513a7edef3b3e832576703d56ab8fda1bc1
+DIST tldextract-3.4.0.tar.gz 111437 BLAKE2B 94a3a77144fcaddebdf2129cea8fd43e971f0ac9b40029c6c1735ee06f499f4bf48823fc61540d99f71fd62192742c10168ef8f25b534eec9e2a04d3879be63a SHA512 6cd6b079c35af62e4f8da67c687630471d1a57ebfab7d982abe411b03fb6673dd238a1f676de5624d13bd2eb42b91ae0a97708e33579217916d88bca4db218db
 EBUILD tldextract-3.3.1.ebuild 802 BLAKE2B 6d7fa552d193ee908dfd772a52d520f48e321b22598a95e72528a38323807a7e8a843fc41c352ebfff7831fa5a47b89e8d4e93628efef1ce8da47eddff794551 SHA512 a8b488ddd8468259464c428c5468d83eae68dda9590994c494fe0a6ad0a8587d2724c86c937052e62c6df4dc87978f131d7f121c73f11d810d5e3fcaf0cd5466
+EBUILD tldextract-3.4.0.ebuild 853 BLAKE2B e574c8b6cca085420f27ae2ae7c2f959bfeb0f5a4b9a91dd7985c45bbc0020e8a388a69d0f8f5fbc4cd6c38e9533da3469db0307646510260f1870188c0c4a60 SHA512 ced8b36bbd49914f71fa32fe74157482ed5c0e09f89d82473d3f8d4c34bcbe8ef93bbbd73d96d0b793b17f44d1eaa8ba408a0d04323b4646c27145e848f7c90b
 MISC metadata.xml 560 BLAKE2B 4d6e6aa7507ce4734371e8b8442e8d4840db0d2896f7e7430438bc9b700edf6c8546fc3beb1e17d489013b6cc49d1daf805581d6fda29f51109e7a643b0e8965 SHA512 4e7ed8a1876afc62954ee58937557182099ea2289633d2d279a2982bb32a8de261163f0b83ba44c257b8c087c007b1bb462ecad69df1115a024a3a9c8ea1fe9e
diff --git a/dev-python/tldextract/tldextract-3.4.0.ebuild b/dev-python/tldextract/tldextract-3.4.0.ebuild
new file mode 100644
index 000000000000..db32a575a668
--- /dev/null
+++ b/dev-python/tldextract/tldextract-3.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL"
+HOMEPAGE="
+	https://github.com/john-kurkowski/tldextract/
+	https://pypi.org/project/tldextract/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-file[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tokenize-rt/Manifest b/dev-python/tokenize-rt/Manifest
index 7145be36a41e..45404d3a000f 100644
--- a/dev-python/tokenize-rt/Manifest
+++ b/dev-python/tokenize-rt/Manifest
@@ -1,3 +1,5 @@
 DIST tokenize-rt-4.2.1.gh.tar.gz 7712 BLAKE2B b8cee02bbb9bb559a92645d8230abc29a58f100b9d03a496106bf9301ff2fa6b47e472970dc71203c61a7d1d3b95f6bb88ef8da15641c509efd10a7711e85d2b SHA512 e45d0da12962d67ebf6afe165750dbc6ddf41305154b1c01e99c1172aca27ccdd4da7c9338b84c74bb7e30192b6fc496cbda75a652304c7da6e2bfa63a513631
+DIST tokenize-rt-5.0.0.gh.tar.gz 7235 BLAKE2B d5e5dd3637615c451463d85e63b6d48670ed18de58e111625b106cfc0af2616726d2ff510412decd32db2c67dea5807d5f9b64ecfa902f56fd32b739085698c3 SHA512 03e609b1a951e62fed797a10aad1813d324c96019bdf1ad0e413b278d04395d8c4e0d2f10189309338524d928b33441a1c0141cce922f25b9f8c2764415475f3
 EBUILD tokenize-rt-4.2.1.ebuild 490 BLAKE2B c9210237010e515bfc9a4e06e3abf6ee75033bc5324de3f724c0cd13016284f9d17c21bcaad6224fad0898ec41a6fad3ea55133f2271a0f4899d80aefdfbef32 SHA512 0d433cf876be7f904c7f30662f4ed144903ab691f11959f7183b6b6de75f51f4de69da87e48a10909b31419b687096b91bdbbc9633b04f5f1c2e2263bcdc7200
+EBUILD tokenize-rt-5.0.0.ebuild 485 BLAKE2B d4a2cdf3cae24e83b0be4735df9ec7f0f4dea4b44c4904011283b4882dd90bc9b9da66e62de04c74fe83756142de148ccd6def17d5781979d76029c78ac6c7b2 SHA512 70b1385a51cb1c02a9c43f61cf87338eaf49e5203d2e5219a49ee7d2edcaae90f3d8122637484bc94a2144a76856204f6e76a573602ca4eef40ff19232776d17
 MISC metadata.xml 607 BLAKE2B 02d39c8bd53de671b05e0ee930401b6fa9f87a00716cc33e6f171b4275081cb6eb86fb2979c9962a0ae733f3d33a3e93178ddd531c75443cc82ae86d0960fcc4 SHA512 de7f21ed5f4e2849883014fdc2a1711e7b23bf15ed0c7246f53d826ba83eac978b8b92e336beecc3c869598a47c9b89b23803ad7f616aa4d1edf880559bde4d9
diff --git a/dev-python/tokenize-rt/tokenize-rt-5.0.0.ebuild b/dev-python/tokenize-rt/tokenize-rt-5.0.0.ebuild
new file mode 100644
index 000000000000..89d0b71b347f
--- /dev/null
+++ b/dev-python/tokenize-rt/tokenize-rt-5.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around the stdlib 'tokenize' which roundtrips"
+HOMEPAGE="https://github.com/asottile/tokenize-rt"
+SRC_URI="
+	https://github.com/asottile/tokenize-rt/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 6662a59d9c78..2b4eac74ebb2 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,5 +1,3 @@
-DIST tqdm-4.64.0.tar.gz 169499 BLAKE2B a6b9587a366c026716c63af4358ddba693b52be3490a161071bc750fffcd50429bc639255635d96c950a130d9fe994dc2abc98f3fbaf0a0c344140c8ae972596 SHA512 84d243b86ea3665e915e6a79e7887a4d0487b166971d211e34229b7a46429f4e4f5808c03f24420b20fb85d274e1e6b36ed852af99c5c9d177c8ce71f0ce0c17
 DIST tqdm-4.64.1.tar.gz 169599 BLAKE2B 4c48f647beb46f22e3c065e2e9c1dc29755c74a2fd29cb8ad8b0dfeab529499d0fbca9296d06453012b3bbf9f9870f95da5e2f37f4c8ba29a71cbee3bd15116b SHA512 bc7ab34145722229737d25d87895c8760b82271c345e1174c83f5896cc893f92a27901d83575472ad124329acdad69bd21e7d68e79aeeefb0e66c83b11989d18
-EBUILD tqdm-4.64.0.ebuild 1027 BLAKE2B 041bdf83495e00ae3f9f61ffb4bb21b567ee090e65b0fa9fbaf171adb2f84c15bbc1057738e8a0f11fe8e0eb4afafcb9af14603f7f436edf8b0e1681f32ff346 SHA512 25f63eac901dd11d00b40a962c08dbcc44fc793e9bc33d5e5cdf2aaa893412e9dab34c524d1ea099b4ac5f01af16d7335a27edba1c772fb5a5281e39a868a5f6
-EBUILD tqdm-4.64.1.ebuild 1035 BLAKE2B 6c73a23cca261d86c9adb2ee845f83a825e6686a87ed7d062169a84dcb8c07bbab91d310db59724adc3e630e9f981e2c82a0c8f3d46063da90156515007b6c52 SHA512 4f6df9b6119a454edfde033d8cee867d622c5f8b4651c0c2ae6f85cbc95cc4b2331464247f979a8fb869c7cea4c5d8186d43926e033aa8b03884ba74b4dcfa50
+EBUILD tqdm-4.64.1.ebuild 1027 BLAKE2B 041bdf83495e00ae3f9f61ffb4bb21b567ee090e65b0fa9fbaf171adb2f84c15bbc1057738e8a0f11fe8e0eb4afafcb9af14603f7f436edf8b0e1681f32ff346 SHA512 25f63eac901dd11d00b40a962c08dbcc44fc793e9bc33d5e5cdf2aaa893412e9dab34c524d1ea099b4ac5f01af16d7335a27edba1c772fb5a5281e39a868a5f6
 MISC metadata.xml 605 BLAKE2B ed20e6f11f20cdc6525b98d9fd37c0b8f0781dd1c4be85e8aa4a3f5644a20fde3179bd44bb99ef4c14913168113a58963b36281ccf4807a694624a1e2df578f8 SHA512 b5f096a0256312e6ab5098bb6d9965b567bd735813d9c97fa49f08de640f2c5ebb292ba747eb284ff043dc29d4bb1cab1ac947ecaab6b4e94aa51e96a0cac636
diff --git a/dev-python/tqdm/tqdm-4.64.0.ebuild b/dev-python/tqdm/tqdm-4.64.0.ebuild
deleted file mode 100644
index 41de10518a23..000000000000
--- a/dev-python/tqdm/tqdm-4.64.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="
-	https://github.com/tqdm/tqdm/
-	https://pypi.org/project/tqdm/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Skip unpredictable performance tests
-	tests/tests_perf.py
-)
-
-python_install_all() {
-	doman tqdm/tqdm.1
-	newbashcomp tqdm/completion.sh tqdm
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tqdm/tqdm-4.64.1.ebuild b/dev-python/tqdm/tqdm-4.64.1.ebuild
index 79761eab6850..41de10518a23 100644
--- a/dev-python/tqdm/tqdm-4.64.1.ebuild
+++ b/dev-python/tqdm/tqdm-4.64.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index 4a03dd1da31a..6d82ba9a227c 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,5 +1,3 @@
-DIST widgetsnbextension-4.0.2.tar.gz 1021825 BLAKE2B 3fd4ccbb05346723fb039e3eb3d42c6a131f519eca641efc2ea02df9666fd511b380a5b8cc599297ce6d3ffc5eb1fdb3bb1b132d816b9ffd0da1022e5749c0c7 SHA512 5cdcf428ff897ceffd57293810213423e941665e578e770bccf7b4c8703b5adfacece9cdcd2f3cec4f5cea433b289c4015bfa824c7702315566f6c0aca719f04
 DIST widgetsnbextension-4.0.3.tar.gz 1021892 BLAKE2B 739408b0e473d41bed6afd9867c3dc7b2b2202f3c26e1062f8f9b3bd7a76102cf28cd0a6b71d3ba2f9b285e0e7f5be0b0289c1ea133c644589892474b0b31bb2 SHA512 9cf55cccf32e2330bb0825c877479d9e93dd828d6d248fa11b1f44c73a16b2dd1cdb6817f55413ff6463003bc65f0f54a0b354ca653fbd9eab47777fa9d32f76
-EBUILD widgetsnbextension-4.0.2.ebuild 666 BLAKE2B a47485faf7522184f87970b54a4eaa3c24f934019812a4f92dfd881bc98696abf543985f2c5205730bdefb683da3f60a05f054926222463064ca038183cc8932 SHA512 1ec92021f7ec59f87b8bf1ed54d6f90092b4de81dcf38d7a7a7293faff42ee34e7fec59ac7267c18bdf78a515fac709bf6bdbe7282d8b32b06be35f68b9c0b8e
-EBUILD widgetsnbextension-4.0.3.ebuild 674 BLAKE2B 031dc4418ed4b002154be4f8c2df0fb4b381893931f9cf1fe2b3655a09f166f46c624848bf471ee0bb0a2491a4246a4e9bc775d568aabfb4fd194ed84f973e53 SHA512 e3eb55b77f88e4326c4525d8f953fe5f68c205ddb42a2cd4d76c15799e362760468c65b068741af9464410acaf25812664a8b62c5dd6075151ad3090061de85f
+EBUILD widgetsnbextension-4.0.3.ebuild 666 BLAKE2B a47485faf7522184f87970b54a4eaa3c24f934019812a4f92dfd881bc98696abf543985f2c5205730bdefb683da3f60a05f054926222463064ca038183cc8932 SHA512 1ec92021f7ec59f87b8bf1ed54d6f90092b4de81dcf38d7a7a7293faff42ee34e7fec59ac7267c18bdf78a515fac709bf6bdbe7282d8b32b06be35f68b9c0b8e
 MISC metadata.xml 545 BLAKE2B 5127e5910c792643b4594231c8c04ebd2db8bb3f0d12f41d33642126970f8ff36f60503bd0bf7c5863b39a4ea4358f1b0ae786653d2c086a49d5305a879a0f66 SHA512 fa7da731b4f342572c0c284c7e03a521dcf754160223016fa77890e8de0bf05b65fca0bd096ba65e303dc034473654dfe5e9b5d2a556f0e2bdc861e24d462cf1
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.2.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.2.ebuild
deleted file mode 100644
index 1a983732aae8..000000000000
--- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="
-	https://ipython.org/
-	https://pypi.org/project/widgetsnbextension/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/notebook[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	distutils-r1_src_install
-
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.3.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.3.ebuild
index 4131b40345e2..1a983732aae8 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.3.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/notebook[${PYTHON_USEDEP}]
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 25a0b155e3ce..161b4a84fd89 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 44933252e080..a9264b5c57c2 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -7,6 +7,6 @@ DIST patch-5.19.8.xz 695676 BLAKE2B 3b661fec35c883a97f2f2b489e43cb276eb7cfe6818d
 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b
 EBUILD bpftool-5.18.11.ebuild 2837 BLAKE2B e59a2fa0d3e1836487fea2074b65a80e844ba74ec57e9f435f7d801c31e275455a4e03f0163638381a79f431af47dc43b240770fc8733ed68f70f09d4dc4636d SHA512 9088ae2324c68990f0654e8c938379be87da3b3df2750c4db001e7a6d5c8dbf999a16115d27b0ece324d552f144f6bcd72a8ea074bf3cfbfe5404337c326ef3f
 EBUILD bpftool-5.19.12.ebuild 3169 BLAKE2B 60e127ab6fa63d90ed42b237a192eda67866b38afd83f8f22982966367dd95bb780f12e93ee650441d6d0cbc74db1aeaf2c514d84041a0eb8383507f6d1d259d SHA512 c403228451442e14588da6dc73f94fe72afe16ca0dc1bb640bc1e4e46e2fc299025102b3fcbb51e813b96a5a92ff20dc5b6f6450366d77f32f55dbf89e904eb9
-EBUILD bpftool-5.19.2-r1.ebuild 3169 BLAKE2B 60e127ab6fa63d90ed42b237a192eda67866b38afd83f8f22982966367dd95bb780f12e93ee650441d6d0cbc74db1aeaf2c514d84041a0eb8383507f6d1d259d SHA512 c403228451442e14588da6dc73f94fe72afe16ca0dc1bb640bc1e4e46e2fc299025102b3fcbb51e813b96a5a92ff20dc5b6f6450366d77f32f55dbf89e904eb9
+EBUILD bpftool-5.19.2-r1.ebuild 3168 BLAKE2B 0ef2a5fb36ccfdb04d29cfa7e797452565eaf13bbdaaf4d8e5a1c15a1e4e69ea98417fa26c8584ff17d399f790d858b4bb0dca0d556f744bd021fb01b904750e SHA512 75e743abd5ac2cf81d681a82e2f7d493585005297538f4a9e833bff71b7dde55dd384931a7acec905e168a18b21c55ae504bd4c428a60cb37e0f2a0a0d1d8cbf
 EBUILD bpftool-5.19.8.ebuild 3169 BLAKE2B 60e127ab6fa63d90ed42b237a192eda67866b38afd83f8f22982966367dd95bb780f12e93ee650441d6d0cbc74db1aeaf2c514d84041a0eb8383507f6d1d259d SHA512 c403228451442e14588da6dc73f94fe72afe16ca0dc1bb640bc1e4e46e2fc299025102b3fcbb51e813b96a5a92ff20dc5b6f6450366d77f32f55dbf89e904eb9
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-5.19.2-r1.ebuild b/dev-util/bpftool/bpftool-5.19.2-r1.ebuild
index 3b2b5a406a29..43dec802c6e2 100644
--- a/dev-util/bpftool/bpftool-5.19.2-r1.ebuild
+++ b/dev-util/bpftool/bpftool-5.19.2-r1.ebuild
@@ -27,7 +27,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="caps"
 
 RDEPEND="
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 895c414f091e..682e6399936a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index f510d05ad0cd..82777a57d364 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -9,5 +9,5 @@ DIST xv-3.10a-jumbo-patches-20070520.tar.gz 1363802 BLAKE2B 1a9f77b950dfa817aa86
 DIST xv-3.10a.png.bz2 3082 BLAKE2B 05f56053fc0a77bba155db306ae181f5404bced3b2c22a33b3a0a0750b84461ffec98934d3dbabd764fbb6ec95ce2851f4cf3959682a315fe6e6653cbaaa5ae4 SHA512 41e81c34e74a034292c2a8f525d1452614a2b42e980a1a2c93e3fcf990db528853d633496815e5fb2c897a780a2da171af590f436e2c7ef181eea00eb6922e9b
 DIST xv-3.10a.tar.gz 2259124 BLAKE2B 42cea578a879c819be8f42ffb1d247643904d8b462a4d6faa208185e49566798605c89006cbc190725fa6356b87da3375cf04d2ba86b559419cf8f7471c867e5 SHA512 5b8c5890503e2796638921cabae8967e458c73e332acea8561b1025ed13c771bc44c0e309b4592852e33726eeaa9784f933d1312073b0ba2e0b8c0cedabcaa3f
 EBUILD xv-3.10a-r19.ebuild 2453 BLAKE2B 121f3393b4b12c6cd1376eccd78a7acc8cda6c8860258c1b62a869878e4b743df06353cd93a4378f532ff6377e269072de805ebfe69758b7f7dc2b34531f44a3 SHA512 ded1eca8c5fc2774819331db81d605bde931befd79ecf484e3f6acbc838fdd88502356b90fb5ffaf4f707d7c7150c97225b3ffca5a4a797a36c4355715fcec0f
-EBUILD xv-3.10a-r20.ebuild 2541 BLAKE2B 7a18ddd7261f8b21e8a77dfd44739204b16cb04526b701fe99f3cab6e137d916dbae832b78157eda524eefa19a492dabef8db11cc2680c07c87f7d618b559d37 SHA512 ba4175e7503945ff48d86ee979f393ee3995841b79b6e8fc26331df525ad39b7d9650060c005c94dd67d4be4cce10eaf2a4b9360cedd735bcf065e264710e9fd
+EBUILD xv-3.10a-r20.ebuild 2540 BLAKE2B 791c2c62cd721b4b4b3434538a122ec5e2b963bde75f775b949eecdafffb063f1653063bfca3a81c9e361bfa4f27009c18729922ea8ac2aeeb583acf66505c11 SHA512 d436ce6f9fccb62b1e03f3a0f8915ee1590d9925503529a40a65533b865917859e12b5d0a1670f282f81d15916a781ec92637d7f5dfb745d357bafdfcb55c320
 MISC metadata.xml 250 BLAKE2B 699d6b9629cb9e0fac6509f4eec3bd2a175002f57ddadb07c2041b583ac4fd57e8cf78506850997f3a140201cbe4bbbab49a768634a50aba337e0e72630eb4b2 SHA512 efce6490cf2258fec1a8f6c77dc22583376cc0adb5aa1f862b88beccc82a7492d12addd2276a58c0a14810a3b02d9750f8ad3f28ffa74d858a86f204e8c9ab01
diff --git a/media-gfx/xv/xv-3.10a-r20.ebuild b/media-gfx/xv/xv-3.10a-r20.ebuild
index bed88c33c54e..2a93b942a954 100644
--- a/media-gfx/xv/xv-3.10a-r20.ebuild
+++ b/media-gfx/xv/xv-3.10a-r20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="jpeg tiff png"
 
 DEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 26d0ec397144..0e7dde89971a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/amdgpu-pro-vulkan/Manifest b/media-libs/amdgpu-pro-vulkan/Manifest
index 9294f0924794..dfe496c98698 100644
--- a/media-libs/amdgpu-pro-vulkan/Manifest
+++ b/media-libs/amdgpu-pro-vulkan/Manifest
@@ -10,9 +10,12 @@ DIST amdgpu-pro-vulkan-22.10.3.1420322-amd64.deb 9225672 BLAKE2B ea0496d06ef793a
 DIST amdgpu-pro-vulkan-22.10.3.1420322-i386.deb 8985660 BLAKE2B dc55f8b9b22269efdae0be7d7dcd67afe25390dc148fbc25b321ff901d764b988aec6465d2faa75a6d6d29256de33add37d9193b290bb717d63f8915e05ad78e SHA512 0bab89dea9b475efae99320f4836ed2ce132a9e04064cd64c2391fbf1f23a2726d3d255f8fae455ede113060a0aad057d028c24548df9a471c907c5dc6422d37
 DIST amdgpu-pro-vulkan-22.20.0.1438747-amd64.deb 9225180 BLAKE2B 0567f16e7ffe0f7c2a46e54eb93d57001f870e9450d63587f9e1b0b74740a4ed43155b36abb155a0e614da36a4241f1b3b26ae06de5472207f7efd62a0823011 SHA512 0629652977190f61138b25daacb5ab13c27121cf674a43aef6023e0c9c5d5d29ae21f7e20cfdb3ca53e354c6409940d664a18df39cc43093a7929af8a84b8998
 DIST amdgpu-pro-vulkan-22.20.0.1438747-i386.deb 8953448 BLAKE2B 4a004ce7fe93fef484e234ca25c1df7798d82e9ce77dba9c8316baebaa567a0a05564bfdcedb35f557ff72b45bd7bbf102bc2d376fb3c36e57dd831c3d768652 SHA512 8ec2b53a42c7c589a6471fd955cb69a3ad40d91551d60a1583bf7bf37927fd6936064a18392a81e123ab3765a3a6353b1cc1ca51632e5466602e460e2ed98891
+DIST amdgpu-pro-vulkan-22.20.3.1462318-amd64.deb 9222240 BLAKE2B 044b4b819573ff0038a531dc21cb1461313539d26665e9c6be93ccb6c9dfb4273ef24440c4fc077d799662d4be18fee81df0c4f63aa9b0674254229a1adb1633 SHA512 6d08256c67b3d7a1034019c263e7376866ddb5f8a8265b362bdd4f5c410c9e5dafe0e6c00e804357f1a70a3cbddd07826d11e646b5bd792afaa8ad9bdb6fd3fe
+DIST amdgpu-pro-vulkan-22.20.3.1462318-i386.deb 8944468 BLAKE2B af8ef51cd42d28a2202231cabc2c371dcf9c0bc16ef7a056e43abea65acd08fa71d31337de1309a700b6781d6f97e9c27d194a2069238843e82a504d013cfa28 SHA512 61256d5d828e18a44581eda6a40c0e86b42fbc777055b35a02f596ec463b89d47b6642cac8b5ff5d3e33d8b9901f633ffaf8e76d5e5a9434922e2564548dfa21
 EBUILD amdgpu-pro-vulkan-21.50.1.1376756.ebuild 2842 BLAKE2B 22dbb1146620527c2815d33952de07436c9c8982daee2ad216217d853a3f80c5622c67882c448dc6b90b9999147b4f66135c580785b89fdf042dfeed85b1dd09 SHA512 5278c756dd3684d4cc61295d8bff1c1e9a00cdd404a1478c623f85d21fc901c8d2f856149b4fb87d31a3647d17e5f39193501de4f5a7ac5a72eaef65352c9c77
 EBUILD amdgpu-pro-vulkan-21.50.2.1384496.ebuild 2842 BLAKE2B 22dbb1146620527c2815d33952de07436c9c8982daee2ad216217d853a3f80c5622c67882c448dc6b90b9999147b4f66135c580785b89fdf042dfeed85b1dd09 SHA512 5278c756dd3684d4cc61295d8bff1c1e9a00cdd404a1478c623f85d21fc901c8d2f856149b4fb87d31a3647d17e5f39193501de4f5a7ac5a72eaef65352c9c77
 EBUILD amdgpu-pro-vulkan-22.10.0.1395274.ebuild 3792 BLAKE2B 2d09ae3c28e6cec3f648c8e4ea1eee0101e66e79aa82277f84508810437ce239776cf9818bbee8e89333e61f2e94de557c7b2e3d620ec808140088b4f61f73f1 SHA512 28d54066de38baa0466fd295bd11e9e708d96777972136bc492c790bf78558257a663975fcf8f8154e9d03ee9aabf30f5646e0fd99c6c8f6b5ec941ed48adeb8
 EBUILD amdgpu-pro-vulkan-22.10.3.1420322.ebuild 3792 BLAKE2B 2d09ae3c28e6cec3f648c8e4ea1eee0101e66e79aa82277f84508810437ce239776cf9818bbee8e89333e61f2e94de557c7b2e3d620ec808140088b4f61f73f1 SHA512 28d54066de38baa0466fd295bd11e9e708d96777972136bc492c790bf78558257a663975fcf8f8154e9d03ee9aabf30f5646e0fd99c6c8f6b5ec941ed48adeb8
 EBUILD amdgpu-pro-vulkan-22.20.0.1438747.ebuild 3840 BLAKE2B 7b9ddbbffb1b5d0e3217d17ef5fca0dbd2f0a0741aa4704d014589b1a37196805a44b75e6872a5b39a6786145928e6acd3c2a1d2897b8af6c3866a604be4bd6c SHA512 93e6ba64b1c562fb1a5cf53c4df6afc5c06a1b193b7ce370d897f52ffb9c957406c60d9ab26f5e976449a43f367e7b07a5d84718bdcad0660cd19766e236f3c2
+EBUILD amdgpu-pro-vulkan-22.20.3.1462318.ebuild 3842 BLAKE2B b5a5181c15908963a180db20490d6b5e5bf7788ec8bc08901e5146a24c0f080d37a1ae479bcd8786132cc573315dca8f79bacb0150e1ecba8e8065a7953b070b SHA512 50a86b13a2ef2131073e4a06d38408534a9b4081b94a6089c4470d9007e4da49b4a27368e206e37ed61ef9070cd1f0a6e252e22bd7bffd71cea4d9225b1db3ff
 MISC metadata.xml 402 BLAKE2B 45f4e6adffb186b9a9b36b420aaa5727f025206eca039d9f6fbe3eb302f7200cc24c079480d91c9d92ccd932bef86b87401400f17eba2fd8b4baa3fca66cf236 SHA512 dc9e5a699437291c5f768d66bdfd9d2aaa00e931f358e6d0045e764638332a8db14bd19a782aac0918dc4b42b8658a5974bdfec2971690e6718be247fff512b3
diff --git a/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.20.3.1462318.ebuild b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.20.3.1462318.ebuild
new file mode 100644
index 000000000000..7545f1b4d580
--- /dev/null
+++ b/media-libs/amdgpu-pro-vulkan/amdgpu-pro-vulkan-22.20.3.1462318.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+MY_PV_HIGH=$(ver_cut 1)
+MY_PV_MIDDLE=$(ver_cut 2)
+MY_PV_LOW=$(ver_cut 3)
+MY_PV_REV=$(ver_cut 4)
+
+MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}"
+
+MY_PV_LINK="$MY_PV"
+[[ $MY_PV_LOW != "0" ]] && MY_PV_LINK+=".$MY_PV_LOW"
+
+MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
+
+MY_PN="vulkan-amdgpu-pro"
+
+MY_LINK="https://repo.radeon.com/amdgpu/${MY_PV_LINK}/ubuntu/pool/proprietary/v/${MY_PN}"
+
+UBUNTU_VER="22.04"
+
+DESCRIPTION="AMD's closed source vulkan driver, from Radeon Software for Linux"
+HOMEPAGE="https://www.amd.com/en/support"
+SRC_URI="
+	abi_x86_64? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}~${UBUNTU_VER}_amd64.deb -> ${P}-amd64.deb )
+	abi_x86_32? ( ${MY_LINK}/${MY_PN}_${MY_PV_FULL}~${UBUNTU_VER}_i386.deb -> ${P}-i386.deb )
+"
+S="${WORKDIR}"
+
+RESTRICT="bindist mirror"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="abi_x86_32 abi_x86_64 video_cards_amdgpu"
+
+REQUIRED_USE="video_cards_amdgpu"
+
+BDEPEND="dev-util/patchelf"
+
+QA_PREBUILT="
+	usr/lib64/amdvlkpro64.so*
+	usr/lib/amdvlkpro32.so*
+"
+
+src_unpack() {
+	if use abi_x86_64 ; then
+		mkdir "${S}/${PN}-amd64" || die
+		cd "${S}/${PN}-amd64" || die
+		unpack_deb "${DISTDIR}/${P}-amd64.deb"
+	fi
+
+	if use abi_x86_32 ; then
+		mkdir "${S}/${PN}-i386" || die
+		cd "${S}/${PN}-i386" || die
+		unpack_deb "${DISTDIR}/${P}-i386.deb"
+	fi
+}
+
+src_prepare() {
+	if use abi_x86_64 ; then
+		cd "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/" || die
+
+		# Make sure there's only one file in the folder, to prevent unexpected behavior of the next command
+		[[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/x86_64-linux-gnu/"
+
+		# Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk64.so.1"
+		mv amdvlk64.so* amdvlkpro64.so || die
+
+		# same with the SONAME
+		patchelf --set-soname amdvlkpro64.so "${PWD}"/amdvlkpro64.so || die
+
+		cd "${S}/${PN}-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
+		eapply "${FILESDIR}"/icd_amd64.patch
+		mv amd_icd64.json amd_pro_icd64.json || die
+	fi
+
+	if use abi_x86_32 ; then
+		cd "${S}/${PN}-i386/opt/amdgpu-pro/lib/i386-linux-gnu/" || die
+
+		# Make sure there's only one file in the folder, to prevent unexpected behavior of the next command
+		[[ "$(ls | wc -l)" = '1' ]] || die "more than one file in opt/amdgpu-pro/lib/i386-linux-gnu/"
+
+		# Add "pro" in the .so file's name, and remove any numeric extension "e.g. amdvlk32.so.1"
+		mv amdvlk32.so* amdvlkpro32.so || die
+
+		# same with the SONAME
+		patchelf --set-soname amdvlkpro32.so "${PWD}"/amdvlkpro32.so || die
+
+		cd "${S}/${PN}-i386/opt/amdgpu-pro/etc/vulkan/icd.d/" || die
+		eapply "${FILESDIR}"/icd_x86.patch
+		mv amd_icd32.json amd_pro_icd32.json || die
+	fi
+
+	default
+}
+
+src_install() {
+	if use abi_x86_64 ; then
+		# Vulkan driver
+		insinto /usr/lib64
+		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/amdvlkpro64.so
+
+		# ICD loader
+		insinto /usr/share/vulkan/icd.d
+		doins "${S}"/"${PN}"-amd64/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd64.json
+	fi
+
+	if use abi_x86_32 ; then
+		# Vulkan driver
+		insinto /usr/lib
+		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/lib/i386-linux-gnu/amdvlkpro32.so
+
+		# ICD loader
+		insinto /usr/share/vulkan/icd.d
+		doins "${S}"/"${PN}"-i386/opt/amdgpu-pro/etc/vulkan/icd.d/amd_pro_icd32.json
+	fi
+}
+
+pkg_postinst() {
+
+	if use abi_x86_32; then
+		elog "To run a 32bit program using the amdgpu-pro vulkan driver, the environment variable"
+		elog "     VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd32.json"
+		elog "must be set beforehand"
+		elog
+	fi
+
+	if use abi_x86_64; then
+		elog "To run a 64bit program using the amdgpu-pro vulkan driver, the environment variable"
+		elog "     VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/amd_pro_icd64.json"
+		elog "must be set beforehand"
+	fi
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4260fa42965d..8fb2ddd17912 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/amdgpu-pro-amf/Manifest b/media-video/amdgpu-pro-amf/Manifest
index 9899a7b3509b..551932c10952 100644
--- a/media-video/amdgpu-pro-amf/Manifest
+++ b/media-video/amdgpu-pro-amf/Manifest
@@ -3,9 +3,11 @@ DIST amdgpu-pro-amf-1.4.24.1384496.deb 1304672 BLAKE2B a21e7d2cf9dc4fe139f87d5c6
 DIST amdgpu-pro-amf-1.4.24.1395274.deb 1304984 BLAKE2B e1b51c6e9dfafcb677314ac881983372cc1d1f09b0112bbe842da06672da8f48e5bd5db358c8067fa23e8a5b4d110b2ea6d998c06357ed32e29accac8ba86c38 SHA512 e809ccf0b93fa8dc44320166ff549e10e1edc6556bb4bf48112de0f20c7e5dda761029aacfa0fd00def30cc647131eb55cf94f01414222c7891d2dad279d33f1
 DIST amdgpu-pro-amf-1.4.24.1420323.deb 1373976 BLAKE2B 64dbcbc079abf523f78663b01066bb74e12f60d56b4a2e7c6765e7b1755a84b1cf5cbe7fcdcc315b42fbb11cfafbf97b0705bb489bead8f84d07f4e81cd84bb6 SHA512 fbe3b24b65bf993dea5bc7d1f6abcb2d0eb938206183962dce1d4634538826e1f4d80f97ee09829af2e745e5f1f97c3bc1c2c8d7cfe4757009157e6996c4b195
 DIST amdgpu-pro-amf-1.4.26.1438747.deb 1501804 BLAKE2B 7be66469a0051fc4ba932d53a232db0487f94ca072580b0d2cc8b51aff2fd922430c632983cac5b02ccd5a9635c92c20b1fbb1d7b51b0425f107b51c4799e0b9 SHA512 f085b07437783295d60a5c1eb1ec46eeb2b6a912f0b80cfd7ab9f9b0c38d360dececcf18d763658af094697447d6486b37a2608c0913e2fd47d68797c085f634
+DIST amdgpu-pro-amf-1.4.26.1462318.deb 1502840 BLAKE2B 69dd0d0a0442a229081d14c733c5905efc91d88b47d18a5d65f5d131d8e0bfe1ff5dc4415d4932c9b227e26ee1f5f452bd3de97ed2be7773d856b5008e3061cf SHA512 8a789d07fdd3e027b343d2b6681b8eebd9974d3b7be59032b1dc1a4d07db4f8937f103feac404a50439cbf54a95f74ced59e9924e79a69006939085493946949
 EBUILD amdgpu-pro-amf-1.4.24.1376756-r1.ebuild 1283 BLAKE2B d563376c455b3761106c67ae912b7b6ca2047694f104157e98cc802239674676611f4a0bc67ebdeb18c78c26f35af4a75985a4cc8fe4cc8f95d89523c4cd3ae4 SHA512 f810d2cba5bc2d12e0256caeaf03ae94e82b11cf6942b77eb4da6eb34204beebef9f53b4745a6c2bd603507a1549699fc70666e037c10d8020af7076c4e82bec
 EBUILD amdgpu-pro-amf-1.4.24.1384496-r1.ebuild 1283 BLAKE2B f2504aee7dd019b60621e7cfb4586dfc750ab0fced2929a725ec3b291f109c81eb04791df995947f8d94eac45e990182691e896cf240dfa4ece7eed72c7b8340 SHA512 fce600f954c56aec568828875ad815cc2cf34afaff63414cad75db260a5ad244817ae473295ee1c502341e776ab788086204ebfe085c8c6a8a550a02b63a3587
 EBUILD amdgpu-pro-amf-1.4.24.1395274.ebuild 1214 BLAKE2B 7664a37ed9ebaa10343988f9a0ee6ba847279c1ba1066e2e61cf900eee2e508a64770905a8c4fa8673aafca9b185001093ead27dc8ea7e2d5d33ebbc7444f6c9 SHA512 dfd615c64b268387e87178872c850caceb6ebcc9262596c8b20af27c8bc4ff9f640bb1924adee93b908d2269b0e9ca190e4781cb2aa257afe08b6fb73273d4a7
 EBUILD amdgpu-pro-amf-1.4.24.1420323.ebuild 1194 BLAKE2B 767e61d81171971df1de01018a17c66c9c330b79276bcf5943cea00a3b1c84052f7d1b78dec79ef47ccdc41f134e261f524c6ed8190629a001a89ee40c3d03e1 SHA512 b1ef7192ff56cc7692798e52c8d23de2ace76a99908c3431f724dcd9555c6c6bccf66e1be5ab7df7b31864de74256199ffd568c8ac2d2ef7dc132341234aeec2
 EBUILD amdgpu-pro-amf-1.4.26.1438747.ebuild 1225 BLAKE2B 324a75844de66c2801759c489f147881e3abb7c65225e538e01bfe5393e75f7a7e75a923e3a17940e269c876f52ebc3793217080bac1a491183b0138ae7c4a32 SHA512 dc544d8112252c84395ff64e82912a5e28f1e9c388e2765c5e0ddcb2ef2b63a1f3828f38871b113cfd74ecb6768475eb7eedb714ba5078181d3f1695c4859b8d
+EBUILD amdgpu-pro-amf-1.4.26.1462318.ebuild 1227 BLAKE2B 7ff7a60b9228f83f7d70cac46a8612e25c98a65c688f83297ae18dff174d36027ee76d734d42c0fdd11f0b8eb34783d7e2d3430ff2a9d39f71fe74e6cadd130a SHA512 58b32906bb44b8ae38f7d272ac9bfa3c9c296d62614d5c779fea54367e5cc1c29c37b6254859b2b8633e4efefd1486f6e8e0c1d78885f35764cf9e0eeab922b1
 MISC metadata.xml 402 BLAKE2B 45f4e6adffb186b9a9b36b420aaa5727f025206eca039d9f6fbe3eb302f7200cc24c079480d91c9d92ccd932bef86b87401400f17eba2fd8b4baa3fca66cf236 SHA512 dc9e5a699437291c5f768d66bdfd9d2aaa00e931f358e6d0045e764638332a8db14bd19a782aac0918dc4b42b8658a5974bdfec2971690e6718be247fff512b3
diff --git a/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.26.1462318.ebuild b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.26.1462318.ebuild
new file mode 100644
index 000000000000..9fd0217f66f6
--- /dev/null
+++ b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.26.1462318.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+MY_PV_HIGH=$(ver_cut 1)
+MY_PV_MIDDLE=$(ver_cut 2)
+MY_PV_LOW=$(ver_cut 3)
+MY_PV_REV=$(ver_cut 4)
+
+MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}.${MY_PV_LOW}"
+MY_PV_FULL="${MY_PV}-${MY_PV_REV}"
+
+MY_PN="amf-amdgpu-pro"
+
+PRO_VULKAN_PKG_VER="22.20.3"
+UBUNTU_VER="22.04"
+
+DESCRIPTION="AMD's closed source Advanced Media Framework (AMF) driver"
+HOMEPAGE="https://www.amd.com/en/support"
+SRC_URI="https://repo.radeon.com/amdgpu/${PRO_VULKAN_PKG_VER}/ubuntu/pool/proprietary/a/${MY_PN}/${MY_PN}_${MY_PV_FULL}~${UBUNTU_VER}_amd64.deb -> ${P}.deb"
+
+S="${WORKDIR}"
+
+RESTRICT="bindist mirror"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	media-libs/amdgpu-pro-vulkan
+	media-libs/libglvnd
+	x11-libs/libdrm
+	x11-libs/libX11
+"
+
+QA_PREBUILT="
+	usr/lib64/libamfrt64.so*
+"
+
+src_unpack() {
+	mkdir "${S}/${PN}-amd64" || die
+	cd "${S}/${PN}-amd64" || die
+	unpack_deb "${DISTDIR}/${P}.deb"
+}
+
+src_install() {
+	insinto "/usr/$(get_libdir)"
+
+	# AMF
+	doins "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/libamfrt64.so.${MY_PV}"
+	dosym "libamfrt64.so.${MY_PV}" "/usr/$(get_libdir)/libamfrt64.so.1"
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ad84e37a2a32..15013d4862a2 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d80ae7197395..5cc281acd253 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 05 Oct 2022 05:39:51 +0000
+Wed, 05 Oct 2022 11:39:50 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index ef3af440bbd9..92f347d7231c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 529256 BLAKE2B a8ad285bac1cf4317c62825ad52e916f3d77cdd05175694abbde87461cf015178a8cf1dd6c3af6013668089990ee96f6cb9be7de7409b13ba538d09d94cde515 SHA512 3502c0b489efa2b78e07af6e3b1c1c817c21c7435c1db2224f9b91f9d0ce815b1514a1e3062680326c8a33813260f974b3b492221b06b61e7499b2dcad6eaeb1
-TIMESTAMP 2022-10-05T05:39:55Z
+TIMESTAMP 2022-10-05T11:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKRBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM9GKtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM9bQpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCU7w/uIfVzPz9AA4ZkiqmdE2s+r00nBS3LkbrEweT/CSjEnhQmusPetAlm/OT8
-O0k0zXqmdbCpe/jPmD/zNPUkmHOPPeiEpR8NzGnSVYTd/fVbDjE87Dq5OdHcQ/ZS
-sy1n7c6vEW3KOblJ8okLLAUa+zNlqfKriBgZHrirQ9Gqx+LwA62PcXxb5Sf8kYZU
-N9Iw3h6ESBI5LbP++e8/g8r/YMQgrkKhJMlddtKPPF0p9tsq9g9+NbWuLra9IUKD
-h+0iIXybjIDswTnLFcZzYOHis9YLbtn+w66ucASCqp1/VCZojOO0HkSFWJULCLmR
-jnW555wFBqhT8HwrFTXFkBogqEGdk5h6YY2YXpVbV0lKaEHUzyL5RBc2HCUU9Gci
-DiNfRKmtVe7PxXbLEk0ILa35n8gklsgAGgIbDKusoxTLFHzvIBnyZC8Sn4tzhoW/
-GavBH7XNavvKP5vw4couuml3oHA3pRUolthtXa6J36RRFl3CbpICivWijU1AzGRY
-ASl87Y5/KpQ2XZSPLUOzwhsNxa7dE0Z1E+J7TTKLjdLZDT4t1lCzrp96QoaxdIT2
-OE2hySWQDa/DGNLjH0z8C4f4anXzGbrCkXbZEerwHVEEvcbCyjhyHnQxO6e+XN5O
-0/2pCbtQQ/m/4PzOavVYtvAaeNJaRG11jMj1+gTHC8kMcaUT
-=zhN9
+klAj+hAAgF1GGoKGyfDHJtTaC5jlHAISUO/qERZEYU3Hsx3FiE1cazGx1s7HY4xL
+/XMO5tkca26h65sKdohsggH1zwCKIXU5YUzDZSd2l3md2h12YThIKBbWOBUelFI2
+BLaBOSW5qeMurLYbNAUHqlZ5O+dEIk4fXzX38q4DSoka/yMEeVNOxgH9EuQOyqDa
+ajrhMhvSBInC9DyD2DNT4AHi4X8gITSugQ/E590m4nzwNZ1wKDRYueFFuDe01ZPY
+Tuiewxlbm/c9iUI6vaRUe0mhC/WTBrP72IY93pJ5gVm3ygp4gjYXko5tCDfKBP3/
+jmUSigvaUR6a+UjK9fGh6tUZgu/3D+e2bKZbsyodQlY4MijRs1jIT21S+5Fr2csh
+wjMM3YoNr8JSlCk+ln5JG40bCunI7h8GjhuH2GNlw6rxs9vyWuHfw7lA+mi6XjcI
++M1D4wt78EOuV7GrEv6iBcfZQhbmY8pJV4Knn+htUdKPCDRfa/a5S2uJ8OOFgbZz
+sTSSpLuQi+NwMy780hKew94JRzDUOVgW920uuGuNNBMszl1bUILwoIPnzpGL//uo
+/trh2xI8jKBxcv/Pf3Qjwwt4Qs/yvh/jDUpC02JhvMlRZ/PvejvP8qRcY8kofkK1
+r1C0mCqN/bBQk2YuI75HLpmg3Aumz7kAcztI0D48aVGu6jjZAGk=
+=ygzK
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d80ae7197395..134c2c11ccbd 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 05 Oct 2022 05:39:51 +0000
+Wed, 05 Oct 2022 11:39:51 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 4b25d055c891..00695a2341ea 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 3949de1da5f9..4bc948e8fde5 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.87 b/metadata/md5-cache/app-admin/awscli-1.25.87
new file mode 100644
index 000000000000..ecc82913c006
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.87
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.27.86[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.86[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.25.87.tar.gz -> aws-cli-1.25.87.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d3e40343c65019dc8ca8907cf3ccfe5a
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 365c6de1b2d1..7b05ab3c4613 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/mpg123-el-1.61 b/metadata/md5-cache/app-emacs/mpg123-el-1.61
index c20a0341c255..2996b9424e32 100644
--- a/metadata/md5-cache/app-emacs/mpg123-el-1.61
+++ b/metadata/md5-cache/app-emacs/mpg123-el-1.61
@@ -10,4 +10,4 @@ RDEPEND=media-sound/mpg123 media-sound/alsa-utils >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.61.tar.xz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c2df5a5d31240af5a83095b6ff566981
+_md5_=a13c78da71249b574ff1c1d456d87668
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index a865053de293..0acbb720d882 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/mupdf-1.18.0-r4 b/metadata/md5-cache/app-text/mupdf-1.18.0-r4
deleted file mode 100644
index 48fa8a6b4d9b..000000000000
--- a/metadata/md5-cache/app-text/mupdf-1.18.0-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= virtual/jpeg javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( x11-libs/libX11 x11-libs/libXext ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
-EAPI=7
-HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
-INHERIT=desktop flag-o-matic toolchain-funcs xdg
-IUSE=+javascript opengl ssl X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86
-LICENSE=AGPL-3
-RDEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= virtual/jpeg javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( x11-libs/libX11 x11-libs/libXext )
-REQUIRED_USE=opengl? ( javascript )
-SLOT=0/1.18.0
-SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.18.0-source.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=eda681fd36f55da2e1cef9ce29a7ba9a
diff --git a/metadata/md5-cache/app-text/mupdf-1.19.0 b/metadata/md5-cache/app-text/mupdf-1.19.0
deleted file mode 100644
index 163d2afe176e..000000000000
--- a/metadata/md5-cache/app-text/mupdf-1.19.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=X? ( x11-base/xorg-proto ) virtual/pkgconfig
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= virtual/jpeg javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( x11-libs/libX11 x11-libs/libXext )
-DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
-EAPI=8
-HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop flag-o-matic toolchain-funcs xdg
-IUSE=+javascript opengl ssl X
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 x86
-LICENSE=AGPL-3
-RDEPEND=dev-libs/gumbo media-libs/freetype:2= media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= virtual/jpeg javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( x11-libs/libX11 x11-libs/libXext )
-REQUIRED_USE=opengl? ( javascript )
-SLOT=0/1.19.0
-SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.19.0-source.tar.xz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c534060f3ce09896b93d97023fcaa761
diff --git a/metadata/md5-cache/app-text/mupdf-1.20.3 b/metadata/md5-cache/app-text/mupdf-1.20.3
new file mode 100644
index 000000000000..3cbeeed7b10b
--- /dev/null
+++ b/metadata/md5-cache/app-text/mupdf-1.20.3
@@ -0,0 +1,17 @@
+BDEPEND=X? ( x11-base/xorg-proto ) virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=dev-libs/gumbo media-libs/freetype:2 media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext )
+DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
+EAPI=8
+HOMEPAGE=https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop flag-o-matic toolchain-funcs xdg
+IUSE=+javascript opengl ssl X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-libs/gumbo media-libs/freetype:2 media-libs/harfbuzz:=[truetype] media-libs/jbig2dec:= media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= javascript? ( >=dev-lang/mujs-1.0.7:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib X? ( x11-libs/libX11 x11-libs/libXext )
+REQUIRED_USE=opengl? ( javascript )
+SLOT=0/1.20.3
+SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.20.3-source.tar.gz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=bb9419e038790b584ec5c44dac094732
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 6a6be4972f57..c79a66714f53 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/sqlmap-1.6.9 b/metadata/md5-cache/dev-db/sqlmap-1.6.9
new file mode 100644
index 000000000000..6e107e09cc6b
--- /dev/null
+++ b/metadata/md5-cache/dev-db/sqlmap-1.6.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=An automatic SQL injection and database takeover tool
+EAPI=8
+HOMEPAGE=https://sqlmap.org/
+INHERIT=bash-completion-r1 python-single-r1 wrapper
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/sqlmapproject/sqlmap/archive/refs/tags/1.6.9.tar.gz -> sqlmap-1.6.9.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=a30c0eeccc3d53be3be8a623c3c2df58
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 8f771ffb136b..be4dc15739cd 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/keystone-0.9.2-r1 b/metadata/md5-cache/dev-libs/keystone-0.9.2-r1
index aec97bd5eeb4..245dec8a52b7 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.2-r1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.2-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.2.tar.gz -> keystone-0.9.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=88183f2dedac03162251850b79a0b0ab
+_md5_=ac8c311d575186178a27bd7d83ad0853
diff --git a/metadata/md5-cache/dev-libs/keystone-9999 b/metadata/md5-cache/dev-libs/keystone-9999
index 060e6bc6f7ae..77939ed663f9 100644
--- a/metadata/md5-cache/dev-libs/keystone-9999
+++ b/metadata/md5-cache/dev-libs/keystone-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llv
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=88183f2dedac03162251850b79a0b0ab
+_md5_=ac8c311d575186178a27bd7d83ad0853
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.20.1-r1 b/metadata/md5-cache/dev-libs/protobuf-3.20.1-r1
index 31808ef68e1e..996fb8f2e102 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.20.1-r1
+++ b/metadata/md5-cache/dev-libs/protobuf-3.20.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 INHERIT=autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/31
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.20.1.tar.gz -> protobuf-3.20.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=cf2748cc4bd2fdbdfcbc624e29dd9400
+_md5_=17fca34c5fbe8eb843550fad9a84b73e
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 3352dab60519..9924c84e6753 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/aesara-2.8.7 b/metadata/md5-cache/dev-python/aesara-2.8.7
new file mode 100644
index 000000000000..12e56114f43b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aesara-2.8.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/numpy-1.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-48.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
+EAPI=8
+HOMEPAGE=https://github.com/aesara-devs/aesara/ https://pypi.org/project/aesara/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/numpy-1.23[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-48.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aesara-devs/aesara/archive/rel-2.8.7.tar.gz -> aesara-rel-2.8.7.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b9704223c3d5fa841fe24bb35f285b19
diff --git a/metadata/md5-cache/dev-python/arrow-1.2.2 b/metadata/md5-cache/dev-python/arrow-1.2.2
deleted file mode 100644
index 4e20cbee5bb4..000000000000
--- a/metadata/md5-cache/dev-python/arrow-1.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-dateutil-2.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Better dates and times for Python
-EAPI=8
-HOMEPAGE=https://github.com/arrow-py/arrow/ https://pypi.org/project/arrow/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 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=Apache-2.0
-RDEPEND=>=dev-python/python-dateutil-2.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/arrow/arrow-1.2.2.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2c24d1c58ba9f2a7f7549d074f9c2311
diff --git a/metadata/md5-cache/dev-python/arrow-1.2.3 b/metadata/md5-cache/dev-python/arrow-1.2.3
index ae0e0764900e..caf53acc04d9 100644
--- a/metadata/md5-cache/dev-python/arrow-1.2.3
+++ b/metadata/md5-cache/dev-python/arrow-1.2.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/arrow-py/arrow/ https://pypi.org/project/arrow/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-dateutil-2.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/a/arrow/arrow-1.2.3.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2f98f8f54b68993bde6b68d29bbd1762
+_md5_=2c24d1c58ba9f2a7f7549d074f9c2311
diff --git a/metadata/md5-cache/dev-python/awxkit-21.1.0 b/metadata/md5-cache/dev-python/awxkit-21.1.0
deleted file mode 100644
index d6cb7ca5739d..000000000000
--- a/metadata/md5-cache/dev-python/awxkit-21.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line interface for Ansible AWX
-EAPI=8
-HOMEPAGE=https://github.com/ansible/awx
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ansible/awx/archive/21.1.0.tar.gz -> awxkit-21.1.0.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=326f81e477f5ea783e65aa33e2bd7634
diff --git a/metadata/md5-cache/dev-python/awxkit-21.2.0 b/metadata/md5-cache/dev-python/awxkit-21.2.0
deleted file mode 100644
index aa11c297397a..000000000000
--- a/metadata/md5-cache/dev-python/awxkit-21.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line interface for Ansible AWX
-EAPI=8
-HOMEPAGE=https://github.com/ansible/awx
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ansible/awx/archive/21.2.0.tar.gz -> awxkit-21.2.0.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=326f81e477f5ea783e65aa33e2bd7634
diff --git a/metadata/md5-cache/dev-python/awxkit-21.3.0 b/metadata/md5-cache/dev-python/awxkit-21.3.0
deleted file mode 100644
index a1dead50eb83..000000000000
--- a/metadata/md5-cache/dev-python/awxkit-21.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line interface for Ansible AWX
-EAPI=8
-HOMEPAGE=https://github.com/ansible/awx
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ansible/awx/archive/21.3.0.tar.gz -> awxkit-21.3.0.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=326f81e477f5ea783e65aa33e2bd7634
diff --git a/metadata/md5-cache/dev-python/awxkit-21.4.0 b/metadata/md5-cache/dev-python/awxkit-21.4.0
deleted file mode 100644
index ab06251d40b4..000000000000
--- a/metadata/md5-cache/dev-python/awxkit-21.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Command line interface for Ansible AWX
-EAPI=8
-HOMEPAGE=https://github.com/ansible/awx
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ansible/awx/archive/21.4.0.tar.gz -> awxkit-21.4.0.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8b9f3af8167c6011128eb25fa77c820c
diff --git a/metadata/md5-cache/dev-python/awxkit-21.5.0 b/metadata/md5-cache/dev-python/awxkit-21.7.0
index bc614a538b01..4df3cff50c74 100644
--- a/metadata/md5-cache/dev-python/awxkit-21.5.0
+++ b/metadata/md5-cache/dev-python/awxkit-21.7.0
@@ -2,7 +2,7 @@ BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_py
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Command line interface for Ansible AWX
 EAPI=8
-HOMEPAGE=https://github.com/ansible/awx
+HOMEPAGE=https://github.com/ansible/awx/ https://pypi.org/project/awxkit/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
@@ -11,6 +11,6 @@ RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ansible/awx/archive/21.5.0.tar.gz -> awxkit-21.5.0.gh.tar.gz
+SRC_URI=https://github.com/ansible/awx/archive/21.7.0.tar.gz -> awxkit-21.7.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8b9f3af8167c6011128eb25fa77c820c
+_md5_=227d9252a8ae9f4c33fd3dd87f8d8998
diff --git a/metadata/md5-cache/dev-python/bcrypt-4.0.0 b/metadata/md5-cache/dev-python/bcrypt-4.0.0
index ea5b6a0073e2..5e1a8dd94893 100644
--- a/metadata/md5-cache/dev-python/bcrypt-4.0.0
+++ b/metadata/md5-cache/dev-python/bcrypt-4.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/
 INHERIT=cargo distutils-r1
 IUSE=test debug python_targets_pypy3 python_targets_python3_8 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 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016 Unlicense
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/b/bcrypt/bcrypt-4.0.0.tar.gz 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.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bcrypt/0.13.0/download -> bcrypt-0.13.0.crate https://crates.io/api/v1/crates/bcrypt-pbkdf/0.8.1/download -> bcrypt-pbkdf-0.8.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/blowfish/0.9.1/download -> blowfish-0.9.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.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/cipher/0.4.3/download -> cipher-0.4.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.4/download -> cpufeatures-0.2.4.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.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/inout/0.1.3/download -> inout-0.1.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/libc/0.2.132/download -> libc-0.2.132.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/once_cell/1.13.1/download -> once_cell-1.13.1.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.5/download -> parking_lot_core-0.8.5.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/pbkdf2/0.10.1/download -> pbkdf2-0.10.1.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.43/download -> proc-macro2-1.0.43.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.21/download -> quote-1.0.21.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/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/smallvec/1.9.0/download -> smallvec-1.9.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.99/download -> syn-1.0.99.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.3/download -> unicode-ident-1.0.3.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.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/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.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-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/zeroize/1.5.7/download -> zeroize-1.5.7.crate
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9b4c55734edcf2db8669107ac9ace313
+_md5_=7b12aae10fc71a743b60c78964d1b6d7
diff --git a/metadata/md5-cache/dev-python/boolean-py-4.0 b/metadata/md5-cache/dev-python/boolean-py-4.0
index eb2aa3f72629..52ed0d79ef54 100644
--- a/metadata/md5-cache/dev-python/boolean-py-4.0
+++ b/metadata/md5-cache/dev-python/boolean-py-4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/boolean.py/ https://github.com/bastikr/boolean.py/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/bastikr/boolean.py/archive/v4.0.tar.gz -> boolean.py-4.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9bffe4c352bb092c38af5d3c62a173f4
+_md5_=a7ce807d1c6fb80ba6f47986d2fdb0e9
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.86 b/metadata/md5-cache/dev-python/boto3-1.24.86
new file mode 100644
index 000000000000..43febda7c5dc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.86
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.86[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.86[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.24.86.tar.gz -> boto3-1.24.86.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.86 b/metadata/md5-cache/dev-python/botocore-1.27.86
new file mode 100644
index 000000000000..ba3b4c31df3d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.86
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.27.86.tar.gz -> botocore-1.27.86.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=bb152b00283104522fdf392996d7badc
diff --git a/metadata/md5-cache/dev-python/braintree-4.17.0 b/metadata/md5-cache/dev-python/braintree-4.17.0
new file mode 100644
index 000000000000..36e8caf648d2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/braintree-4.17.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/requests-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7_p20211111_p1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Braintree Python Library
+EAPI=8
+HOMEPAGE=https://developer.paypal.com/braintree/docs/reference/overview/ https://github.com/braintree/braintree_python/ https://pypi.org/project/braintree/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-0.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/braintree/braintree_python/archive/4.17.0.tar.gz -> braintree_python-4.17.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=279fbe2badc61f0aae1f7e66ebb18da9
diff --git a/metadata/md5-cache/dev-python/cerberus-1.3.4-r1 b/metadata/md5-cache/dev-python/cerberus-1.3.4-r1
index 9976ac280d5b..04c515ff4ab6 100644
--- a/metadata/md5-cache/dev-python/cerberus-1.3.4-r1
+++ b/metadata/md5-cache/dev-python/cerberus-1.3.4-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://docs.python-cerberus.org/ https://github.com/pyeve/cerberus/ https://pypi.org/project/Cerberus/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=ISC
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/pyeve/cerberus/archive/1.3.4.tar.gz -> cerberus-1.3.4.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5a61becd550e7cb5fddc9e929286baf1
+_md5_=5ff099315ecc6d441656f65a64d0f505
diff --git a/metadata/md5-cache/dev-python/contourpy-1.0.5 b/metadata/md5-cache/dev-python/contourpy-1.0.5
index 126da308c41a..8b0efdb13062 100644
--- a/metadata/md5-cache/dev-python/contourpy-1.0.5
+++ b/metadata/md5-cache/dev-python/contourpy-1.0.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/contourpy/ https://github.com/contourpy/contourpy/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~riscv
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/contourpy/contourpy/archive/v1.0.5.tar.gz -> contourpy-1.0.5.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=19e2eef679d7e50a3b014c04c44f9697
+_md5_=3d8fad582e9b6523da94b7d7688a5a30
diff --git a/metadata/md5-cache/dev-python/dask-2022.9.0 b/metadata/md5-cache/dev-python/dask-2022.9.0
index d5b9a31641d3..7828a041a97a 100644
--- a/metadata/md5-cache/dev-python/dask-2022.9.0
+++ b/metadata/md5-cache/dev-python/dask-2022.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.dask.org/ https://github.com/dask/dask/ https://pypi.org/project/dask/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dask/dask/archive/2022.9.0.tar.gz -> dask-2022.9.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a0b541c333193cb4c2e3eedae08472ce
+_md5_=5bfea60e780bcbb8870241fbc46df644
diff --git a/metadata/md5-cache/dev-python/discogs-client-2.5 b/metadata/md5-cache/dev-python/discogs-client-2.5
new file mode 100644
index 000000000000..5b86c44402cb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/discogs-client-2.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Continuation of the official Python API client for Discogs
+EAPI=8
+HOMEPAGE=https://github.com/joalla/discogs_client/ https://pypi.org/project/python3-discogs-client/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/oauthlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python3-discogs-client/python3-discogs-client-2.5.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c78cbcecb88f86c1015665a8ab52db3b
diff --git a/metadata/md5-cache/dev-python/django-3.2.16 b/metadata/md5-cache/dev-python/django-3.2.16
new file mode 100644
index 000000000000..b6f9d075ce3a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-3.2.16
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext !!<dev-python/ipython-7.21.0-r1 !!=dev-python/ipython-7.22.0-r0 ) verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 ) doc? ( >=dev-python/sphinx-4.5.0-r1 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite?,threads(+)] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=8
+HOMEPAGE=https://www.djangoproject.com/ https://github.com/django/django/ https://pypi.org/project/Django/
+INHERIT=bash-completion-r1 distutils-r1 optfeature verify-sig
+IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=>=dev-python/asgiref-3.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite?,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/3.2/Django-3.2.16.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.2.16.checksum.txt )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=9176b3394c11c1b574d7f241daf18e3c
diff --git a/metadata/md5-cache/dev-python/django-4.0.8 b/metadata/md5-cache/dev-python/django-4.0.8
new file mode 100644
index 000000000000..6157f80928ae
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-4.0.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] ) >=dev-python/asgiref-3.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext !!<dev-python/ipython-7.21.0-r1 !!=dev-python/ipython-7.22.0-r0 ) verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 ) doc? ( >=dev-python/sphinx-4.5.0-r1 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite?,threads(+)] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=8
+HOMEPAGE=https://www.djangoproject.com/ https://github.com/django/django/ https://pypi.org/project/Django/
+INHERIT=bash-completion-r1 distutils-r1 optfeature verify-sig
+IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=>=dev-python/asgiref-3.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite?,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/4.0/Django-4.0.8.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-4.0.8.checksum.txt )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=85256ec24d4e5bea1ae92931b8fcf5cd
diff --git a/metadata/md5-cache/dev-python/django-4.1.2 b/metadata/md5-cache/dev-python/django-4.1.2
new file mode 100644
index 000000000000..f6ae25b3ef55
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-4.1.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] ) <dev-python/asgiref-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/asgiref-3.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext !!<dev-python/ipython-7.21.0-r1 !!=dev-python/ipython-7.22.0-r0 ) verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 ) doc? ( >=dev-python/sphinx-4.5.0-r1 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite?,threads(+)] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=8
+HOMEPAGE=https://www.djangoproject.com/ https://github.com/django/django/ https://pypi.org/project/Django/
+INHERIT=bash-completion-r1 distutils-r1 optfeature verify-sig
+IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=<dev-python/asgiref-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/asgiref-3.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite?,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/4.1/Django-4.1.2.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-4.1.2.checksum.txt )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=bf63acb2287095e2094b5c4ccf5e6097
diff --git a/metadata/md5-cache/dev-python/executing-1.0.0 b/metadata/md5-cache/dev-python/executing-1.0.0
index 466c26327ed6..79c97feb0f3f 100644
--- a/metadata/md5-cache/dev-python/executing-1.0.0
+++ b/metadata/md5-cache/dev-python/executing-1.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/alexmojaki/executing/ https://pypi.org/project/executing/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alexmojaki/executing/archive/v1.0.0.tar.gz -> executing-1.0.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=137c0cfe3d0a112369afae8bc29f414a
+_md5_=0d7a8782f1c65c2ffd97c4ebf9f2682f
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-3.0.0 b/metadata/md5-cache/dev-python/flask-sqlalchemy-3.0.0
index c8ba89dc2dc3..1ebc57c9322c 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-3.0.0
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-3.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/Flask-SQLAlchemy/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-2.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlalchemy-1.4.18[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/F/Flask-SQLAlchemy/Flask-SQLAlchemy-3.0.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=215f8485178ae872ad919b537a6649cd
+_md5_=a2a25f45020d4f0393e3da8d5c97a6e3
diff --git a/metadata/md5-cache/dev-python/fsspec-2022.8.2-r1 b/metadata/md5-cache/dev-python/fsspec-2022.8.2-r1
index 296045abfdd8..115bb6693634 100644
--- a/metadata/md5-cache/dev-python/fsspec-2022.8.2-r1
+++ b/metadata/md5-cache/dev-python/fsspec-2022.8.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fsspec/filesystem_spec/ https://pypi.org/project/fsspec/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/fsspec/filesystem_spec/archive/2022.8.2.tar.gz -> filesystem_spec-2022.8.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6a186866a2ad2d537ebdea50e302994c
+_md5_=2d0e9195b70cffa8935d9a363128c479
diff --git a/metadata/md5-cache/dev-python/httpx-0.23.0 b/metadata/md5-cache/dev-python/httpx-0.23.0-r1
index 5d3b8f14d8dc..7588f2fb760a 100644
--- a/metadata/md5-cache/dev-python/httpx-0.23.0
+++ b/metadata/md5-cache/dev-python/httpx-0.23.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/encode/httpx/archive/0.23.0.tar.gz -> httpx-0.23.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0143b52d81da3b8526a9c0180fe72b7a
+_md5_=a4ff46249e1d716b9bba67bb2e53cf0d
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.56.1 b/metadata/md5-cache/dev-python/hypothesis-6.56.1
new file mode 100644
index 000000000000..7bc3c3f70b95
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.56.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.56.1.tar.gz -> hypothesis-6.56.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=217c242592f666a0ad41967cd90ac09f
diff --git a/metadata/md5-cache/dev-python/ipywidgets-8.0.1 b/metadata/md5-cache/dev-python/ipywidgets-8.0.1
deleted file mode 100644
index 871fa6e32b6a..000000000000
--- a/metadata/md5-cache/dev-python/ipywidgets-8.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/ipykernel-4.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython_genutils-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/widgetsnbextension-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython HTML widgets for Jupyter
-EAPI=8
-HOMEPAGE=https://ipywidgets.readthedocs.io/ https://github.com/jupyter-widgets/ipywidgets/ https://pypi.org/project/ipywidgets/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython_genutils-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/widgetsnbextension-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-8.0.1.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4833ce90c2444945993e7d46e920a865
diff --git a/metadata/md5-cache/dev-python/ipywidgets-8.0.2 b/metadata/md5-cache/dev-python/ipywidgets-8.0.2
index 5146fad11391..974c77120752 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-8.0.2
+++ b/metadata/md5-cache/dev-python/ipywidgets-8.0.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://ipywidgets.readthedocs.io/ https://github.com/jupyter-widgets/ipywidgets/ https://pypi.org/project/ipywidgets/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/ipykernel-4.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython_genutils-0.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/widgetsnbextension-3.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-8.0.2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a0da2bf5f09f5dc3a3a703a40e9ada19
+_md5_=4833ce90c2444945993e7d46e920a865
diff --git a/metadata/md5-cache/dev-python/license-expression-30.0.0 b/metadata/md5-cache/dev-python/license-expression-30.0.0
index 08c14ce908ac..26499a3451f5 100644
--- a/metadata/md5-cache/dev-python/license-expression-30.0.0
+++ b/metadata/md5-cache/dev-python/license-expression-30.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/license-expression/ https://github.com/nexB/license-expression/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/boolean-py-4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/nexB/license-expression/archive/v30.0.0.tar.gz -> license-expression-30.0.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=036340f80837d606655fd9fa3a644f35
+_md5_=647a31d9e32a7c30701f2b54289414d4
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1 b/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1
index 0e181138580c..fb331bd26330 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-3.6.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://matplotlib.org/ https://github.com/matplotlib/matplotlib/ https://pypi.org/project/matplotlib/
 INHERIT=distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs virtualx
 IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~riscv
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
 RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] cairo? ( dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_8? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[tk?,threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.6.0.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=fd9efd77ab10bf28577471f2f15dab2a
+_md5_=7a079f2f7f1ccb7cabba680be99aa92a
diff --git a/metadata/md5-cache/dev-python/nbconvert-7.1.0 b/metadata/md5-cache/dev-python/nbconvert-7.1.0
new file mode 100644
index 000000000000..f1fe3bf5a874
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nbconvert-7.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipywidgets-7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bleach[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab_pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbformat-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Converting Jupyter Notebooks
+EAPI=8
+HOMEPAGE=https://nbconvert.readthedocs.io/ https://github.com/jupyter/nbconvert/ https://pypi.org/project/nbconvert/
+INHERIT=distutils-r1 virtualx
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bleach[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyterlab_pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbformat-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tinycss2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/nbconvert/nbconvert-7.1.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=354dd82aa992357b6e839efcf90a0660
diff --git a/metadata/md5-cache/dev-python/openapi-core-0.16.0 b/metadata/md5-cache/dev-python/openapi-core-0.16.0
new file mode 100644
index 000000000000..f093fc0bf3fe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openapi-core-0.16.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.23.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/starlette-0.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/webob[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pathable-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-spec-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Client-side and server-side support for the OpenAPI Specification v3
+EAPI=8
+HOMEPAGE=https://github.com/p1c2u/openapi-core/ https://pypi.org/project/openapi-core/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/pathable-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-spec-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/p1c2u/openapi-core/archive/0.16.0.tar.gz -> openapi-core-0.16.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=7eee255ca39431099610c49945ff5a36
diff --git a/metadata/md5-cache/dev-python/pdm-pep517-1.0.4 b/metadata/md5-cache/dev-python/pdm-pep517-1.0.4
index 6c23dc7e408e..2f2a30dbad17 100644
--- a/metadata/md5-cache/dev-python/pdm-pep517-1.0.4
+++ b/metadata/md5-cache/dev-python/pdm-pep517-1.0.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pdm-pep517/ https://github.com/pdm-project/pdm-pep517/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/cerberus-1.3.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomli-w[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/pdm-project/pdm-pep517/archive/1.0.4.tar.gz -> pdm-pep517-1.0.4.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b46dc76ce492f02b6ea18fc4957da229
+_md5_=43a18032616d00275affa7f7df89261f
diff --git a/metadata/md5-cache/dev-python/proto-plus-1.22.1 b/metadata/md5-cache/dev-python/proto-plus-1.22.1
index 33211980a6ce..0aa285311926 100644
--- a/metadata/md5-cache/dev-python/proto-plus-1.22.1
+++ b/metadata/md5-cache/dev-python/proto-plus-1.22.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/googleapis/proto-plus-python/ https://pypi.org/project/proto-plus/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/protobuf-python-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/proto-plus-python/archive/v1.22.1.tar.gz -> proto-plus-1.22.1.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e28ede09fc6a9ef63907c50d0599b5b1
+_md5_=b676992bb0d522e008fb52b2daef1057
diff --git a/metadata/md5-cache/dev-python/psycopg-3.1.3 b/metadata/md5-cache/dev-python/psycopg-3.1.3
new file mode 100644
index 000000000000..7e0b7c08d1dd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/psycopg-3.1.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-db/postgresql-8.1[server] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-db/postgresql-8.1:* python_targets_python3_8? ( >=dev-python/backports-zoneinfo-0.2.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-db/postgresql-8.1:*
+DESCRIPTION=PostgreSQL database adapter for Python
+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_8 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
+LICENSE=LGPL-3+
+RDEPEND=>=dev-db/postgresql-8.1:* python_targets_python3_8? ( >=dev-python/backports-zoneinfo-0.2.0[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/psycopg/psycopg/archive/3.1.3.tar.gz -> psycopg-3.1.3.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d9d0340be7988805111d25000d7c7bce
diff --git a/metadata/md5-cache/dev-python/python-dotenv-0.20.0 b/metadata/md5-cache/dev-python/python-dotenv-0.20.0
deleted file mode 100644
index 70d7ea8543b7..000000000000
--- a/metadata/md5-cache/dev-python/python-dotenv-0.20.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/click-5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sh-1.09[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=Manage .env files
-EAPI=8
-HOMEPAGE=https://github.com/theskumar/python-dotenv
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-dotenv/python-dotenv-0.20.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f32de0e4836500d5888d8af952e5ecdb
diff --git a/metadata/md5-cache/dev-python/python-dotenv-0.21.0 b/metadata/md5-cache/dev-python/python-dotenv-0.21.0
index d8fb7631543a..0c633fb510b0 100644
--- a/metadata/md5-cache/dev-python/python-dotenv-0.21.0
+++ b/metadata/md5-cache/dev-python/python-dotenv-0.21.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/theskumar/python-dotenv
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dotenv/python-dotenv-0.21.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1f0c5dbe310a282626e9664e6e940443
+_md5_=56c23448ec33fcaa28661d5d4f3ec4d4
diff --git a/metadata/md5-cache/dev-python/pyupgrade-2.38.1 b/metadata/md5-cache/dev-python/pyupgrade-2.38.1
deleted file mode 100644
index 68de22199498..000000000000
--- a/metadata/md5-cache/dev-python/pyupgrade-2.38.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/tokenize-rt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tool + pre-commit hook to automatically upgrade syntax for newer Pythons
-EAPI=8
-HOMEPAGE=https://github.com/asottile/pyupgrade
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/tokenize-rt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/asottile/pyupgrade/archive/refs/tags/v2.38.1.tar.gz -> pyupgrade-2.38.1.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=dceda065676725ef88f847df47ae7ba3
diff --git a/metadata/md5-cache/dev-python/pyupgrade-2.38.0 b/metadata/md5-cache/dev-python/pyupgrade-3.0.0
index 7d64689997ad..44e2a749a28f 100644
--- a/metadata/md5-cache/dev-python/pyupgrade-2.38.0
+++ b/metadata/md5-cache/dev-python/pyupgrade-3.0.0
@@ -2,7 +2,7 @@ BDEPEND=test? ( dev-python/tokenize-rt[python_targets_python3_8(-)?,python_targe
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Tool + pre-commit hook to automatically upgrade syntax for newer Pythons
 EAPI=8
-HOMEPAGE=https://github.com/asottile/pyupgrade
+HOMEPAGE=https://github.com/asottile/pyupgrade/ https://pypi.org/project/pyupgrade/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
@@ -11,6 +11,6 @@ RDEPEND=dev-python/tokenize-rt[python_targets_python3_8(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/asottile/pyupgrade/archive/refs/tags/v2.38.0.tar.gz -> pyupgrade-2.38.0.gh.tar.gz
+SRC_URI=https://github.com/asottile/pyupgrade/archive/v3.0.0.tar.gz -> pyupgrade-3.0.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=12844e66cdccf3b6f62b240c43f895f5
+_md5_=dc8e7c7a9e8f8c64e4fd050da8b6b383
diff --git a/metadata/md5-cache/dev-python/rapidfuzz-2.10.2 b/metadata/md5-cache/dev-python/rapidfuzz-2.10.2
deleted file mode 100644
index 15eea915a04e..000000000000
--- a/metadata/md5-cache/dev-python/rapidfuzz-2.10.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/rapidfuzz_capi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/jarowinkler-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jarowinkler-1.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-cpp/taskflow-3.0.0 >=dev-cpp/jarowinkler-cpp-1.0.0 >=dev-cpp/rapidfuzz-cpp-1.0.1 dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DESCRIPTION=Rapid fuzzy string matching in Python using various string metrics
-EAPI=8
-HOMEPAGE=https://github.com/maxbachmann/RapidFuzz/ https://pypi.org/project/rapidfuzz/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=<dev-python/jarowinkler-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jarowinkler-1.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/rapidfuzz/rapidfuzz-2.10.2.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d6928ebc1b3c07c173221598208dbf4e
diff --git a/metadata/md5-cache/dev-python/rapidfuzz-2.10.3 b/metadata/md5-cache/dev-python/rapidfuzz-2.10.3
deleted file mode 100644
index 5cd6ddd7f983..000000000000
--- a/metadata/md5-cache/dev-python/rapidfuzz-2.10.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/rapidfuzz_capi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/jarowinkler-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jarowinkler-1.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-cpp/taskflow-3.0.0 >=dev-cpp/jarowinkler-cpp-1.0.0 >=dev-cpp/rapidfuzz-cpp-1.0.1 dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DESCRIPTION=Rapid fuzzy string matching in Python using various string metrics
-EAPI=8
-HOMEPAGE=https://github.com/maxbachmann/RapidFuzz/ https://pypi.org/project/rapidfuzz/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=<dev-python/jarowinkler-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jarowinkler-1.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/rapidfuzz/rapidfuzz-2.10.3.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d6928ebc1b3c07c173221598208dbf4e
diff --git a/metadata/md5-cache/dev-python/rapidfuzz-2.11.1 b/metadata/md5-cache/dev-python/rapidfuzz-2.11.1
new file mode 100644
index 000000000000..1416dda028ae
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rapidfuzz-2.11.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/rapidfuzz_capi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-cpp/taskflow-3.0.0 >=dev-cpp/rapidfuzz-cpp-1.8.0 dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Rapid fuzzy string matching in Python using various string metrics
+EAPI=8
+HOMEPAGE=https://github.com/maxbachmann/RapidFuzz/ https://pypi.org/project/rapidfuzz/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/rapidfuzz/rapidfuzz-2.11.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=61ebcc90f497c15795b4879a27e2df4b
diff --git a/metadata/md5-cache/dev-python/tldextract-3.4.0 b/metadata/md5-cache/dev-python/tldextract-3.4.0
new file mode 100644
index 000000000000..91ba5b522ae6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tldextract-3.4.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-file[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Accurately separate the TLD from the registered domain and subdomains of a URL
+EAPI=8
+HOMEPAGE=https://github.com/john-kurkowski/tldextract/ https://pypi.org/project/tldextract/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-file[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tldextract/tldextract-3.4.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d6ad7f6b71ac0078919f7f73e54f5a16
diff --git a/metadata/md5-cache/dev-python/tokenize-rt-5.0.0 b/metadata/md5-cache/dev-python/tokenize-rt-5.0.0
new file mode 100644
index 000000000000..45d95f249ca6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tokenize-rt-5.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A wrapper around the stdlib 'tokenize' which roundtrips
+EAPI=8
+HOMEPAGE=https://github.com/asottile/tokenize-rt
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/asottile/tokenize-rt/archive/v5.0.0.tar.gz -> tokenize-rt-5.0.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e2c2a435167e9bcb6e3d6fea912fed12
diff --git a/metadata/md5-cache/dev-python/tqdm-4.64.0 b/metadata/md5-cache/dev-python/tqdm-4.64.0
deleted file mode 100644
index e8de9b9369bc..000000000000
--- a/metadata/md5-cache/dev-python/tqdm-4.64.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Add a progress meter to your loops in a second
-EAPI=8
-HOMEPAGE=https://github.com/tqdm/tqdm/ https://pypi.org/project/tqdm/
-INHERIT=bash-completion-r1 distutils-r1
-IUSE=examples test python_targets_pypy3 python_targets_python3_8 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 ~x64-macos
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/tqdm/tqdm-4.64.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d5756d1651eb4de6a09292da59c90e86
diff --git a/metadata/md5-cache/dev-python/tqdm-4.64.1 b/metadata/md5-cache/dev-python/tqdm-4.64.1
index 767b17cfdb6c..004f78ce46c8 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.64.1
+++ b/metadata/md5-cache/dev-python/tqdm-4.64.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tqdm/tqdm/ https://pypi.org/project/tqdm/
 INHERIT=bash-completion-r1 distutils-r1
 IUSE=examples test python_targets_pypy3 python_targets_python3_8 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 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/t/tqdm/tqdm-4.64.1.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bf2dfb5d75ff10294adc65305f7c6b77
+_md5_=d5756d1651eb4de6a09292da59c90e86
diff --git a/metadata/md5-cache/dev-python/widgetsnbextension-4.0.2 b/metadata/md5-cache/dev-python/widgetsnbextension-4.0.2
deleted file mode 100644
index 0e9acb46df49..000000000000
--- a/metadata/md5-cache/dev-python/widgetsnbextension-4.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython HTML widgets for Jupyter
-EAPI=8
-HOMEPAGE=https://ipython.org/ https://pypi.org/project/widgetsnbextension/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/w/widgetsnbextension/widgetsnbextension-4.0.2.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=366ff5d65a3c8e2fbd15d4fccba8477e
diff --git a/metadata/md5-cache/dev-python/widgetsnbextension-4.0.3 b/metadata/md5-cache/dev-python/widgetsnbextension-4.0.3
index 955d945c1f0b..9589653f48da 100644
--- a/metadata/md5-cache/dev-python/widgetsnbextension-4.0.3
+++ b/metadata/md5-cache/dev-python/widgetsnbextension-4.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://ipython.org/ https://pypi.org/project/widgetsnbextension/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/w/widgetsnbextension/widgetsnbextension-4.0.3.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ef10329836cd65d49084127257de7db3
+_md5_=366ff5d65a3c8e2fbd15d4fccba8477e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 3318715a18fa..1290a4398181 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/bpftool-5.19.2-r1 b/metadata/md5-cache/dev-util/bpftool-5.19.2-r1
index ce171a384739..bfd5fdbdc4ea 100644
--- a/metadata/md5-cache/dev-util/bpftool-5.19.2-r1
+++ b/metadata/md5-cache/dev-util/bpftool-5.19.2-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kernel.org/
 INHERIT=estack linux-info optfeature python-any-r1 toolchain-funcs
 IUSE=caps
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/binutils-libs:= sys-libs/zlib:= virtual/libelf:= caps? ( sys-libs/libcap:= )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.19.2.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2273fceee795784ae5cd84d64afcff66
+_md5_=9e38ff024453d9f42218ec7f6fe2fd8a
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index cea5367fbaf8..6cdce2870e71 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/xv-3.10a-r20 b/metadata/md5-cache/media-gfx/xv-3.10a-r20
index 81400f93f091..ecace687578e 100644
--- a/metadata/md5-cache/media-gfx/xv-3.10a-r20
+++ b/metadata/md5-cache/media-gfx/xv-3.10a-r20
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html
 INHERIT=desktop flag-o-matic toolchain-funcs
 IUSE=jpeg tiff png
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=xv
 RDEPEND=x11-libs/libXt jpeg? ( media-libs/libjpeg-turbo:= ) tiff? ( media-libs/tiff ) png? ( >=media-libs/libpng-1.2:= sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/png-mng/xv-3.10a-jumbo-patches-20070520.tar.gz ftp://ftp.cis.upenn.edu/pub/xv/xv-3.10a.tar.gz mirror://gentoo/xv-3.10a.png.bz2
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e9960c95e3327c4fea0dda25214ab24b
+_md5_=d160d52f57f7523ca4673e4c29118890
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index b9328436c5c7..882a732b7ca2 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/amdgpu-pro-vulkan-22.20.3.1462318 b/metadata/md5-cache/media-libs/amdgpu-pro-vulkan-22.20.3.1462318
new file mode 100644
index 000000000000..5af353166d30
--- /dev/null
+++ b/metadata/md5-cache/media-libs/amdgpu-pro-vulkan-22.20.3.1462318
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install postinst prepare unpack
+DESCRIPTION=AMD's closed source vulkan driver, from Radeon Software for Linux
+EAPI=8
+HOMEPAGE=https://www.amd.com/en/support
+INHERIT=unpacker
+IUSE=abi_x86_32 abi_x86_64 video_cards_amdgpu
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=AMD-GPU-PRO-EULA
+REQUIRED_USE=video_cards_amdgpu
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=abi_x86_64? ( https://repo.radeon.com/amdgpu/22.20.3/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_22.20-1462318~22.04_amd64.deb -> amdgpu-pro-vulkan-22.20.3.1462318-amd64.deb ) abi_x86_32? ( https://repo.radeon.com/amdgpu/22.20.3/ubuntu/pool/proprietary/v/vulkan-amdgpu-pro/vulkan-amdgpu-pro_22.20-1462318~22.04_i386.deb -> amdgpu-pro-vulkan-22.20.3.1462318-i386.deb )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063
+_md5_=4a8b8ba056e4403373294262872fd8e1
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 62c69c0bf5a3..9c06c096a065 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/amdgpu-pro-amf-1.4.26.1462318 b/metadata/md5-cache/media-video/amdgpu-pro-amf-1.4.26.1462318
new file mode 100644
index 000000000000..1ddd7b07d00b
--- /dev/null
+++ b/metadata/md5-cache/media-video/amdgpu-pro-amf-1.4.26.1462318
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=AMD's closed source Advanced Media Framework (AMF) driver
+EAPI=8
+HOMEPAGE=https://www.amd.com/en/support
+INHERIT=unpacker
+KEYWORDS=-* ~amd64
+LICENSE=AMD-GPU-PRO-EULA
+RDEPEND=media-libs/amdgpu-pro-vulkan media-libs/libglvnd x11-libs/libdrm x11-libs/libX11
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://repo.radeon.com/amdgpu/22.20.3/ubuntu/pool/proprietary/a/amf-amdgpu-pro/amf-amdgpu-pro_1.4.26-1462318~22.04_amd64.deb -> amdgpu-pro-amf-1.4.26.1462318.deb
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	bc57272a0491765c71d973c8cfd35063
+_md5_=6a51da43fba8e601eaa0a2ec122bd612
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 1cdfb89128a1..895c129f7357 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/libaxc-0.3.7-r1 b/metadata/md5-cache/net-libs/libaxc-0.3.7-r1
new file mode 100644
index 000000000000..785ef1e0495d
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libaxc-0.3.7-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-db/sqlite dev-libs/glib dev-libs/libgcrypt net-libs/libsignal-protocol-c test? ( dev-util/cmocka )
+DESCRIPTION=Client library for libsignal-protocol-c
+EAPI=7
+HOMEPAGE=https://github.com/gkdr/axc
+INHERIT=toolchain-funcs
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite dev-libs/glib dev-libs/libgcrypt net-libs/libsignal-protocol-c
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gkdr/axc/archive/v0.3.7.tar.gz -> libaxc-0.3.7.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6de81fbebf9bc13a927fd064dff0a2c9
diff --git a/metadata/md5-cache/net-libs/libwebsockets-4.3.2-r1 b/metadata/md5-cache/net-libs/libwebsockets-4.3.2-r1
index 02362bf947d8..f3a5f2ab547c 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-4.3.2-r1
+++ b/metadata/md5-cache/net-libs/libwebsockets-4.3.2-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://libwebsockets.org/
 INHERIT=cmake
 IUSE=access-log caps cgi client dbus extensions generic-sessions http-proxy http2 ipv6 +lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5 sqlite3 ssl threads zip
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) http-proxy? ( net-libs/libhubbub ) libev? ( dev-libs/libev ) libevent? ( dev-libs/libevent:= ) libuv? ( dev-libs/libuv:= ) sqlite3? ( dev-db/sqlite:= ) ssl? ( !mbedtls? ( dev-libs/openssl:0= ) mbedtls? ( net-libs/mbedtls:= ) )
 REQUIRED_USE=access-log? ( http2 ) generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) mbedtls? ( ssl ) smtp? ( libuv ) socks5? ( client http-proxy ) ?? ( libev libevent )
 SLOT=0/19
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v4.3.2.tar.gz -> libwebsockets-4.3.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ffc381dd550185c8ff1d3fc9800314fa
+_md5_=abb95e1be90a44944fca314de7e7f8c6
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 2382f3a34abe..c50d926846c7 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.41.0 b/metadata/md5-cache/net-vpn/i2pd-2.43.0
index 13868d399a8d..caa94477a3d5 100644
--- a/metadata/md5-cache/net-vpn/i2pd-2.41.0
+++ b/metadata/md5-cache/net-vpn/i2pd-2.43.0
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=acct-user/i2pd acct-group/i2pd dev-libs/boost:= dev-libs/openssl:0=[-bindist(-)] sys-libs/zlib upnp? ( net-libs/miniupnpc:= )
 SLOT=0
-SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.41.0.tar.gz -> i2pd-2.41.0.tar.gz
+SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.43.0.tar.gz -> i2pd-2.43.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=f4009fb98fcebc977001f8608bbc3c16
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.2-r3 b/metadata/md5-cache/net-vpn/strongswan-5.9.2-r3
deleted file mode 100644
index c84032df7e61..000000000000
--- a/metadata/md5-cache/net-vpn/strongswan-5.9.2-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] <dev-libs/openssl-3:= ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/linux-sources sys-kernel/linux-headers
-DESCRIPTION=IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE
-EAPI=7
-HOMEPAGE=https://www.strongswan.org/
-INHERIT=linux-info systemd
-IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_forecast strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2 RSA DES
-RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] <dev-libs/openssl-3:= ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
-SLOT=0
-SRC_URI=https://download.strongswan.org/strongswan-5.9.2.tar.bz2
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3b030a198baed7021bc1f13f7ab1f9c5
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.4-r2 b/metadata/md5-cache/net-vpn/strongswan-5.9.4-r2
deleted file mode 100644
index aec4a241a6f5..000000000000
--- a/metadata/md5-cache/net-vpn/strongswan-5.9.4-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/linux-sources sys-kernel/linux-headers
-DESCRIPTION=IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE
-EAPI=8
-HOMEPAGE=https://www.strongswan.org/
-INHERIT=linux-info systemd
-IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_forecast strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist strongswan_plugins_xauth-noauth
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 RSA DES
-RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
-SLOT=0
-SRC_URI=https://download.strongswan.org/strongswan-5.9.4.tar.bz2
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5d134dcbd52fecab4a44f1333b7dd152
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.5-r1 b/metadata/md5-cache/net-vpn/strongswan-5.9.5-r1
deleted file mode 100644
index 0a6cacc66521..000000000000
--- a/metadata/md5-cache/net-vpn/strongswan-5.9.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/linux-sources sys-kernel/linux-headers
-DESCRIPTION=IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE
-EAPI=8
-HOMEPAGE=https://www.strongswan.org/
-INHERIT=linux-info systemd
-IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_forecast strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist strongswan_plugins_xauth-noauth
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2 RSA DES
-RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
-SLOT=0
-SRC_URI=https://download.strongswan.org/strongswan-5.9.5.tar.bz2
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=97ebb59c3780ebc592cab2257d2afc5b
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.7 b/metadata/md5-cache/net-vpn/strongswan-5.9.7
index 49408cc22a73..f06753e1083e 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.9.7
+++ b/metadata/md5-cache/net-vpn/strongswan-5.9.7
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.strongswan.org/
 INHERIT=linux-info systemd
 IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_kdf strongswan_plugins_addrblock strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_error-notify strongswan_plugins_forecast strongswan_plugins_gcm strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist strongswan_plugins_xauth-noauth
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 RSA DES
 RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) dev-libs/glib:2 gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1:3 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=https://download.strongswan.org/strongswan-5.9.7.tar.bz2
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8ae0bedfc1f99f534816b4374c47aa3a
+_md5_=5d6203d3fe3a8394b29fa3c8160b0f21
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.8 b/metadata/md5-cache/net-vpn/strongswan-5.9.8
new file mode 100644
index 000000000000..92d026ffeacd
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/strongswan-5.9.8
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) dev-libs/glib:2 gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1:3 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= ) virtual/linux-sources sys-kernel/linux-headers
+DESCRIPTION=IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE
+EAPI=8
+HOMEPAGE=https://www.strongswan.org/
+INHERIT=linux-info systemd
+IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_gcm +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_kdf strongswan_plugins_addrblock strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_error-notify strongswan_plugins_forecast strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist strongswan_plugins_xauth-noauth
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 RSA DES
+RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) dev-libs/glib:2 gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1:3 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
+SLOT=0
+SRC_URI=https://download.strongswan.org/strongswan-5.9.8.tar.bz2
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4faf6941b543b712e297ac3b8fba1982
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index a9d02dcae64e..918e62cd3214 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/bmake-20220901 b/metadata/md5-cache/sys-devel/bmake-20220901
index b284b55cc1e8..ddcee38bf495 100644
--- a/metadata/md5-cache/sys-devel/bmake-20220901
+++ b/metadata/md5-cache/sys-devel/bmake-20220901
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=NetBSD's portable make
 EAPI=8
 HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20220901.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
-_md5_=0d951e60ed0101e1e5e69d89d00fc0af
+_md5_=99eb07fb2fd25cc17cdbe0675924da69
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 1a15094544d3..ae61bb28b1d4 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/mtd-utils-2.1.4-r1 b/metadata/md5-cache/sys-fs/mtd-utils-2.1.4-r1
index a50763b826b8..0afb0534b871 100644
--- a/metadata/md5-cache/sys-fs/mtd-utils-2.1.4-r1
+++ b/metadata/md5-cache/sys-fs/mtd-utils-2.1.4-r1
@@ -4,9 +4,9 @@ DESCRIPTION=MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)
 EAPI=8
 HOMEPAGE=https://git.infradead.org/?p=mtd-utils.git;a=summary
 IUSE=+lzo xattr +zstd
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux:= sys-libs/zlib:= lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/acl ) zstd? ( app-arch/zstd:= )
 SLOT=0
 SRC_URI=https://infraroot.at/pub/mtd/mtd-utils-2.1.4.tar.bz2
-_md5_=8a77c8ad9d89f1c5fed2c4ff82be1f18
+_md5_=49e80d6b47b4ea6b3790c376f4ddd060
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 2bd8883be230..0c2aea72b140 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-05T05:39:55Z
+TIMESTAMP 2022-10-05T11:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM9GKtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmM9bQpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAirhAAnfDS0FtBf48HrbX2ADOI5UkAvLbLOVabhc9eIjxzBBpQFQnZstNMMz/K
-4Ol9khvkOwUOieD7K+A4XBSsFVwV9ooGEclqjUvP1Am+nP2I37fflv7z4oVLAqvx
-iznpLzY2MbY3Dl6lI+JLoIN0iY9xVYOb7Po4L9KSN6hRlJPgHW4lrT+rIT1ghMRB
-xIo+hzVA6KNBfSd1FxDRnkgTPvH5Aruv04BSXnX2pODig/0QJh+HjvLffYcvE3yk
-BbuyyYxSQpN8MPGhsvWL3DhVwkwytFPRjQ8s8/NeLK/C6PKTtrrTRjEhkkvU4ZYz
-vdTGPP+SBqgKJ824znE18dDUc0+UmMvMFnc5Cza3WtWYcKNYtqlhXXu+zgcTAPJO
-bosME5ROB3tR1Sy/IAmhsRETNN/t8M2WAolQ6cXXPnXgihn7zAuV2C5lXpFewxOR
-CysLNMJwCyQ5vn6nPxaHaSEOkGrUIGcOpozqM/yyeUQtyO5Or8MnMkU1roeeDLKs
-uhpgP+RO/NKokaM4HabCOPxMo5RxIcykwQTxkDamNsrnukewv3poHiz5E7fj19Lo
-kWX2MOZ4jcnK7hB22pC5szNNDxR0WtqQNy2JlcEg64fLmE/nptjT7nErzgiPd6Yr
-4GIisYx6avBLIKGydJEjS1fdBuaFLu+2kT4fssT2g+J6PcQgJyk=
-=EUPv
+klAAlw//TPJ8tJ1icbUqGRB09eEvGyTxQf/Cr/z8/AgGo3H23w9zpO75OkekCTY8
+NIbJcw5V0s1S/DbVvB8NMAnmNqfzWL6P9keQifGBhCywrgjfPBRzR5exrgqkxv7W
+CBsu5oloj71NgJknk+ZlyPvXtYufE4ivA8D4rgVJaUTAYXK/hXlliKkGIsXzZ7/L
+hgV9GDIMxuVjpqyBJwFWxlxjLwvEhxMVvEL5sy6lbwlRU8eOVdkCkQSuNYOVrBng
+aysOGpd3Oscb0f3v9q/p6ZS++tNXPcUKLsroI1B/AsUW0A2uuNme1lBu0r1X1ZVO
+KU6v5bdHlAkLwx7QPtH4HJRNo82cXPUBXIuvsbo/p5CtBhNriNVwN+rggJga6hgP
++/8Ptx4IvIQFXEKGP+ROcjO6v99GZrDR8UTAF8rcDCqMiJMqZHKu6Tb9Fw3gP49I
+H2+34rbgV17hThGDWa114+LRQlEdoXPoxpQJsv2mDWmSPhULEn/WDylhV/GVdizs
+QaRqJTAtWaxfjw2tHttO1KWsYYohcclgs8BcBzhpnziOBQnQn2v6c1peH0hLrEb4
+WX1nQp0RTSvMepFkDkk9NY5O9JBNkJEqH9+Ye0bPECVtj+bqXMV1JZGmwezFSPCt
+aaLHNjsa/kuYWbTEmDkX/i28q1zHdG3Q9BuAUM4zkNlcqlxcMKs=
+=oS9/
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d80ae7197395..134c2c11ccbd 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 05 Oct 2022 05:39:51 +0000
+Wed, 05 Oct 2022 11:39:51 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a5246ec15dd0..347a7a3ce5d5 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Oct  5 05:39:51 AM UTC 2022
+Wed Oct  5 11:39:50 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index bbee7a92b6d6..9dc3c3a21538 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 05 Oct 2022 05:45:01 +0000
+Wed, 05 Oct 2022 11:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 17dc38ecaa59..e7009248c68c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-b98f5c4cc7d9e2e9e258de1bffc2d065f8c525e9 1664948065 2022-10-05T05:34:25+00:00
+9816992e5e8f1bad2a301de72150bc10ae7afa50 1664969703 2022-10-05T11:35:03+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 58dcce47a992..197ca66bcd1a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1664948401 Wed 05 Oct 2022 05:40:01 AM UTC
+1664970001 Wed 05 Oct 2022 11:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d80ae7197395..134c2c11ccbd 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 05 Oct 2022 05:39:51 +0000
+Wed, 05 Oct 2022 11:39:51 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index b942720025df..901f627f8a56 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libaxc/Manifest b/net-libs/libaxc/Manifest
index 1f39f28752e6..87c8759c42cf 100644
--- a/net-libs/libaxc/Manifest
+++ b/net-libs/libaxc/Manifest
@@ -6,5 +6,6 @@ DIST libaxc-0.3.7.tar.gz 41742 BLAKE2B e43220745cbf1e3f375c69218cc0c5bc944e2fbfd
 EBUILD libaxc-0.3.4-r2.ebuild 1253 BLAKE2B cfd715172d69015bafbd4ae41104a749fbfd0fede1c222beb4e3ad60770e6c394beff7af2d0e32edad3a88b5ae31c9fe00cccc892d655dd5f2600fbe98e88bdd SHA512 2c244b826eb7a25cd16040b1347561f973fb3cf0c7208f6d7312ef4c4f87d8cb44cfa9faca442e296bc70cac6bda0a35862f577df1ae8d96ab36c9e937c39b60
 EBUILD libaxc-0.3.5.ebuild 1204 BLAKE2B 3c3e6e7455583ed2a383a3e0415de5437e8fb3180db49b2db769bae4d10953adbdddb8a18db6fc56be7d5399cc5a1654a6216accef7bd67dc3f5206d997a1ed4 SHA512 06c75949deb1b84ba27224849d867021e8831aeab2bf6d8054ea70c1820f633c060da6d450c0d00b715c357c13b5753a974449ea9ec1750d391bcc53684a64b1
 EBUILD libaxc-0.3.6.ebuild 1498 BLAKE2B 895c99d15610ceaebfd12ea57b776e52a41dbd487615d5683eef5da36a7f40a15c44b40ad1b72dcd3de87f3aefcde5c45fafa92e985f2b4a1383f1332537212c SHA512 17ba494678d9a7f4f590c62f1dadfa67f6b46b3c1115fdb326afa5812c81da1dc7591a0354e15675bc77289b7d2d53f0a8bf923163601209703495a93dc4432e
+EBUILD libaxc-0.3.7-r1.ebuild 1515 BLAKE2B 7754597346961209142decbd22fa4527d8a0b30f058fae77ab871a6ec17b9ef613ed247146354383e4a51652373a79e4686d5667d52e65d7e9a84f034d2d7d99 SHA512 e44b6d4642368a5a051667796f12e257047c05e919cb9bfc05984b86a23fc4f89429b4880f1129382238c94fc04dc9b12dd12c6aefc301478cb3d32e257967bf
 EBUILD libaxc-0.3.7.ebuild 1500 BLAKE2B 23a7dfeee0cc5647d98502906703e88f8ea1ef271e24dc26e74f4adc31a631f810ca7357682e074863b47b0fb2ad80dc7cf08ab51d2bd1d6a7ed3a08964add53 SHA512 bc701aa1347bbcb19020a604f4f33bcad2b0df6f1d4ac30bf19b30517c91ea4543596d6311fcd738673e7b9a009172d2d0e0ed069516081387e4858b7df5b786
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/net-libs/libaxc/libaxc-0.3.7-r1.ebuild b/net-libs/libaxc/libaxc-0.3.7-r1.ebuild
new file mode 100644
index 000000000000..e217a88d83cf
--- /dev/null
+++ b/net-libs/libaxc/libaxc-0.3.7-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="axc-${PV}"
+DESCRIPTION="Client library for libsignal-protocol-c"
+HOMEPAGE="https://github.com/gkdr/axc"
+SRC_URI="https://github.com/gkdr/axc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"  # not GPL-3+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib
+	dev-libs/libgcrypt
+	net-libs/libsignal-protocol-c
+	"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+	"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+RESTRICT="!test? ( test )"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rm -R lib || die  # unbundle libsignal-protocol-c
+	default
+}
+
+src_compile() {
+	local make_args=(
+		PREFIX=/usr
+
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+
+		ARCH=
+	)
+	emake "${make_args[@]}"
+}
+
+src_test() {
+	# TODO: Test failures seem to be ignored in the upstream Makefile?
+	# e.g. https://github.com/gkdr/axc/blob/master/Makefile#L153
+	emake CC="$(tc-getCC)" test
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr ARCH= install
+
+	# Respect libdir other than /usr/lib, e.g. /usr/lib64
+	local libdir="$(get_libdir)"
+	if [[ ${libdir} != lib ]]; then
+		mv "${ED}"/usr/{lib,${libdir}} || die
+		sed "s|^libdir=.*|libdir=\${prefix}/${libdir}|" \
+				-i "${ED}/usr/${libdir}/pkgconfig/libaxc.pc" || die
+	fi
+
+	einstalldocs
+
+	if ! use static-libs ; then
+		rm "${ED}/usr/${libdir}/libaxc.a" || die
+	fi
+}
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 73a03d5b1106..ac581f70234e 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,4 +1,4 @@
 DIST libwebsockets-4.3.2.tar.gz 15616264 BLAKE2B 3b8657b79828102cbfba71ea789acd3b7aec7faaa6317974d182b3cb4b5091d8efcf1f184278f71674624a0f1968450ab056e1d91f9faf2c35c67c6c6f4cb695 SHA512 68d18574dea0563fa4f080c5d0d1cfe21a115bffdb17c6190f6741998f1e5db0739e252ef344ffe6fa4bd6781372456b240539471dd2aa900e43759e0f2d42ad
-EBUILD libwebsockets-4.3.2-r1.ebuild 2372 BLAKE2B 1ff7d0933aa0e364ab516efe16461807e8851e5b400b578bf1a05b86523a580e3b97e426f80d9a96608f3a6d04f5b8d48148d3600894e7d88f37d3d0fe1e01bf SHA512 b88f63cff137cd5c9d737dbf44a6cb91bf459a347bfb6eb64cd95b4886515de7106ce30a61256947f7bd239f892d9e188d21975c7a3a91b5b44f2ffa7429b9f5
+EBUILD libwebsockets-4.3.2-r1.ebuild 2370 BLAKE2B ef70e8c96849d2d560274aa9b88ed358f2f37dc85c41175ae5754aec4dc7af8293218410eafe9fa3e3514c28ea7cc177cf745de8d00cc5a23d78f46d36bdbeb1 SHA512 d4b0a02355676de53a95866d4420956f8cc20edf1878652981604991aef192176cb70244fad873b6dc445c3336302346efa6a7416209a6c2b29ae659112590fa
 EBUILD libwebsockets-4.3.2.ebuild 2302 BLAKE2B 76dc737c442788280cb2c8f8ab87658cc9dd004fa1ef1832967f26ae1adb17a768ea1d5b862074a237b4ba218adcca5144867c6b40acc8b1ad40c9b2a02ec241 SHA512 cf34a2c3f050e1a6ac1c3d9ce71091bdf137038759f64ed907d38b152fe1c7266ca36b4bc74c9f06d95650d221dc26f58b99b9b0791a7ad9522f2e33d1319c9f
 MISC metadata.xml 1699 BLAKE2B 0436e4a694a6b0d99599d39502d3e92b52b31ff6926c68d7307efeee73f71a9b5ef3b7cbfa6197e0b65d301baa02f91ae88cee6c259b5b12129011cca237c3f1 SHA512 53c0951ddbf202ccde33f851ea7fb801e1ea4340afbe586ab937c17b7d36406dcdd777f091fc79a1767f826d19e836534ed8d020e562779867286bf6c0ea4a30
diff --git a/net-libs/libwebsockets/libwebsockets-4.3.2-r1.ebuild b/net-libs/libwebsockets/libwebsockets-4.3.2-r1.ebuild
index e17a0a8a8c1d..78ec74b89335 100644
--- a/net-libs/libwebsockets/libwebsockets-4.3.2-r1.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-4.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0/19" # libwebsockets.so.19
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="access-log caps cgi client dbus extensions generic-sessions http-proxy http2 ipv6
 	+lejp libev libevent libuv mbedtls peer-limits server-status smtp socks5
 	sqlite3 ssl threads zip"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index bb00dd331578..7d2395745d80 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 744f352ff542..d40670d9b07b 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -2,4 +2,4 @@ AUX olsrd 491 BLAKE2B 31844255d3aac5d427ab821a7655201ede53a3ab57ac8da3562e9db473
 AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625eb05e62338efce126fe06e7c59f021848ba12247d35196864496cab3ac9414bdd9cddda54ea6fb5deb2360e2 SHA512 191bb1cb0da122a9b44a9297e78998f9b1ecc70948dd9ee216b5d4fb56b41072c53249b39a6c0584366c7518ee2d4b161833be2e5289d707693dd0d87f2e6791
 DIST olsrd-0.9.8_p20210612.tar.gz 14446761 BLAKE2B ef841fcf81ae25acb3c47d70f15e34c614b17c28688e0f718aa45ebabea68844f825a4187bbf5468daa4763c8a2b8c87f5f5a502ce0c5fde1b940f9aa3c6ca5e SHA512 466b762ea1f9ecc4ded3298700d1786b893d87fbcc2e457c75f5adfaaf543e6cea5ab2e63d34814a7c2f65cab895fb19c4cb5a7ec5347b13d0e18703a641126e
 EBUILD olsrd-0.9.8_p20210612.ebuild 2655 BLAKE2B 46420f18ff26eb00d8b29f18a71a8d21e12ff6d5bf6b50da4a1e17c4b2a91d74dff7ad9400f77d4367c855395163d65a0dfcdd01048eea737ba99ec33e06bb08 SHA512 086b206676f785066746108cdc713f72e2eb9e7c783f1abb38433589b7c34a82baa9d5d911f2c158b9d24d5ea1b230292ec5551ed684244c0605c7db61da6e31
-MISC metadata.xml 244 BLAKE2B c96f92863f59c5672e9fd06a833d19ac4884039c1a6b4550b167f4e228b663963c2f98534e9865cd039561345d1097edb52b4c5614417b46accc48c2acbab668 SHA512 c044670830d2077e8075125980c7502a96fc956fcdb24ac01d390afebe4780cf6b7f79b4a8749e57ae436fc5e8f7af976c02765ab5f6575de01a5f0881008c4c
+MISC metadata.xml 324 BLAKE2B 0e3d7a0154ecc4a0ae6c8f48bc9b28aad1289e1635783f3a74cf753f6392d530823cb1c1e0034f04c50fae65a2ec67892702737d9052a889353f1c0e63fd2f1f SHA512 d43e748039672d6b51690be28db0f6a19e8e41a7a930721cb3c51e0620f19a3ae603a9a35eb9994118a662a312678f38d5a80c6cf7ecd2d676148366ddcae41b
diff --git a/net-misc/olsrd/metadata.xml b/net-misc/olsrd/metadata.xml
index 6a2f7727d58f..421eb74f58cb 100644
--- a/net-misc/olsrd/metadata.xml
+++ b/net-misc/olsrd/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="pud">Install the Node Position Update plugin</flag>
-</use>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="pud">Install the Node Position Update plugin</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">OLSR/olsrd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 53a5f93bb44b..9371c0517d41 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index f8b5e41a9115..f86b96ec8601 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -3,8 +3,8 @@ AUX i2pd-2.38.0-r1.logrotate 294 BLAKE2B 183e9d0a88a3ff4b1116d4f8475862ed110cf2b
 AUX i2pd-2.38.0.service 906 BLAKE2B 583c1856ceada5e60b7f595452afbe3e254616185d641e63f7931ccc972a52123745f72f1fffaf122be6fd3d4dadb311d58f4d639e0d2ba2187bde21f5340d2d SHA512 233722990f5e9934558b05a0aee5e0ef6af9bcd0b5f9c38cb9d1e61ffa37a4d80f403047dc15ec706bc03185d2e1ca27015210b6757a71786ad0bb4b75662981
 AUX i2pd-2.39.0.initd 1437 BLAKE2B 6f4e7b585e2acbabdb58999387954cac0ac5edd8bc7c3cec686f3ecb6e3b7b04a13c1de57ba081da7dee4c35b72bc65f2a1ac3c4dccf3a57c22b24eba248664f SHA512 58f28b38a39e3e7a1bf378e17dad1c0879c641d6c479db887f33e2689dde29f4f2fa1b9d3dc9a6ab03eb35d2e834b5691de2bc7d9c97c9a8523ebea1e9cd637e
 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9
-DIST i2pd-2.41.0.tar.gz 594453 BLAKE2B 36298133f057152445d3f7c83c9983d1e16476066f0139019faf0168142cb8dbed150eccee1e006c0a9f1b67670855fdb38513e8d7992e05122b581890b036a5 SHA512 10ba77d714e4b02f9640c64b16b597550f71bfacf02242bd17cfdc7fc416e0e9bc62a2f1da486161baea397dae3d260fa88359325062b1c587f509058d418d85
 DIST i2pd-2.42.1.tar.gz 615872 BLAKE2B b3e2e070e616d6908f8024dd83ca2fe77aa76ba233a62575ac0b36767448a4741fb227c3b326179355ff9c11acf887600e70697226baef6ade2d945c5e4c34bb SHA512 85df4d8d0a18bf7f3095191a5181a1fa864bfad7b84d2fc18a089b964d80166727f010dcd55a0c8fb1c4e385e1b35b3a1d975f0c0c2efa70999f3c19aba08d97
-EBUILD i2pd-2.41.0.ebuild 1969 BLAKE2B b951608f377f72c7425cf63904823d55445b3c1cb8820083852be59cb6cb6d4b1b0e9d7ff283ec3b741a8911feabbc9a219297f6e75ccbfb4f37808a418a456c SHA512 0e3a09e091140c086a64b9a91f178b342d7aa934dadbe0b7516f5d6ba53966841f42cc3cd1fd7bc960e5d8f196d6c39873fcc22019ea581db924eb0f5e3a05b4
+DIST i2pd-2.43.0.tar.gz 638031 BLAKE2B 5e954fb62198a229fc8de9ca48655a67e8e9a0eabfa7f31dcaaaf42149239565968f16825eb25b202b6a5754938ce82d28cd2631e085dfa358bcd27ced089bd5 SHA512 7247850cd47cccc540346b4a1becc6dba5f40bcb333cd722e9fc59fd8b0beddee700376829d29add05cea6b84bb34303ed37e01914a1a41cf8cd94fe5c826e4a
 EBUILD i2pd-2.42.1.ebuild 1969 BLAKE2B b951608f377f72c7425cf63904823d55445b3c1cb8820083852be59cb6cb6d4b1b0e9d7ff283ec3b741a8911feabbc9a219297f6e75ccbfb4f37808a418a456c SHA512 0e3a09e091140c086a64b9a91f178b342d7aa934dadbe0b7516f5d6ba53966841f42cc3cd1fd7bc960e5d8f196d6c39873fcc22019ea581db924eb0f5e3a05b4
+EBUILD i2pd-2.43.0.ebuild 1969 BLAKE2B b951608f377f72c7425cf63904823d55445b3c1cb8820083852be59cb6cb6d4b1b0e9d7ff283ec3b741a8911feabbc9a219297f6e75ccbfb4f37808a418a456c SHA512 0e3a09e091140c086a64b9a91f178b342d7aa934dadbe0b7516f5d6ba53966841f42cc3cd1fd7bc960e5d8f196d6c39873fcc22019ea581db924eb0f5e3a05b4
 MISC metadata.xml 728 BLAKE2B 37fbc9a6966478aa61c9c67e20835bd759dc46ec88e4a575974acb872e3f73d093ec354399441b64b283d16ebbd9b6d23bdbd40e38c483a184f0700d01e1f179 SHA512 927d1fb8cafb87bf199e7e67bbc6edffd08eb7e7b50c8b7a7bf16cf5cbe3dfef32fca387b5c861c8e4aa3336687022a6978a7084e730d1dc6308c3db6152d309
diff --git a/net-vpn/i2pd/i2pd-2.41.0.ebuild b/net-vpn/i2pd/i2pd-2.43.0.ebuild
index c60616e944bc..c60616e944bc 100644
--- a/net-vpn/i2pd/i2pd-2.41.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.43.0.ebuild
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index 5fa7c5e8321a..ff37be8ffe1d 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -1,13 +1,9 @@
 AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf3bc0629fe99cf9936b9cdb464627c1a8c121b8485f164166efda428825a55aab557d18 SHA512 d11ccc36ee89df5974547441fdb6c539dd3a7a5e235e318c1beddca7d4f5cace857f2dc75752e6fa913177eec9c3afcbed52de5bc08e8c314096d439cbc3bc6c
 AUX strongswan-5.9.6-werror-security.patch 617 BLAKE2B c421689ea7f3c7c2d9b69c46f2081d3eddbfd1db924dd6bb4fe8e227c013d12b9893a093abdf8b3bc048e2595fd3b72dba31f99e15f49885a5da34b9873274c1 SHA512 a5469d2ed60f448d97911ccf1f4d799e60906d364d31edc31e2007f557477d010a746cd27e4159d1fdf8f8a08ce51db8c215ea7d1bb2cf2745fea7d3f9630b0e
-DIST strongswan-5.9.2.tar.bz2 4607281 BLAKE2B 84f5457bc970f49c9bc99d0ef41182d815e39b8a88be349ad0a78b531a983d3b3919d5c9f3b97793b0b2569f2c6b151cc3b5d9b145a8bfd663db6f79d8ff3dd6 SHA512 dca30b9be7847e0af59d1526c2e38d440b6729055cb3f0f0637d50d7381df465c7b59e79662efe63870a7a5a44eef696c02231274d2764f9e3c430ce2fd694f6
-DIST strongswan-5.9.4.tar.bz2 4651000 BLAKE2B 071a0a0a144b369a7e4069d92340cecca9eef0c004949d91993c8f1cc0f39f7868749020d6e135fa59d5899d146f39172f87eb32a26ad788cb8a4c160597e328 SHA512 796356c1d5c1ad410f0ed944ab4a131076d26f120ec6fa57796fe4060b0741201199625883ddc9ebd8a7ad299495f073cec76a6780ebd8f375605aae16750cf3
-DIST strongswan-5.9.5.tar.bz2 4722123 BLAKE2B 8b3adc44d5f5eb3824845ce9eda75e7b75f0f7394fbe84f827f4a8177e5299ca7170103ee6cd76e1e18aef85d7f124a43a505ceaf41ec4ed575eb214ebb6af21 SHA512 3b11c4edb1ffccf0ea5b8b843acfe2eb18dcd3857fc2818b8481c4febe7959261e1b2804c3af29068319df469fa0b784682d3ba4d49a3eb580841ff3c34e33a1
 DIST strongswan-5.9.6.tar.bz2 4750894 BLAKE2B 4021a10611e66f9e2e4e432bdfb9de0f94d27ba1be1b7d4e4b8bf3cd797c123658993e60eb3d49c424b479558e9581bb069a345a70f55850d1faf5abaa401246 SHA512 8efb7a55b074485b874e941e42462e97a404b4f84e2f90ed18ef66274731b22d167a571f6fd028dccc1f199f2e591c82616d0a832a5084e1981c6b867fe5bb6a
 DIST strongswan-5.9.7.tar.bz2 4741967 BLAKE2B 062f80431aefabfa4ba03454c3ab80e278772ebbd2bdeb69de98796f6e1bd7fc17d161e23b74bb238378eedc005079ff14e64e9a8967e2bf4f159a076e9f6384 SHA512 6e28a8ae0e4606a55661ae63a61d7bca445e8f62e91b37d32c957f03300d27ba05e099891c1160aae477b1f93ef844b66bb46da6cce5553eb03206c87e5e0d9a
-EBUILD strongswan-5.9.2-r3.ebuild 9206 BLAKE2B 95f105fcce29680c9d8dfcdf645bc00ee84747c83eeb13106b54b216963fc8c8f442f4a45e02507b521db3b1fea54c1020186c6a555f0dfc29173d6d13f25409 SHA512 f34d860ce53c62225ba6c1868f368a920c5164a2fdfb8554ba6e3611ca02b1356bc68f121f9c126131c0381f59c2f1d9d1203c029b1c1513ef0d88257be654e5
-EBUILD strongswan-5.9.4-r2.ebuild 9264 BLAKE2B 7ccb1b346acbbc88f80f0a1b96b28e28955773af78ddc946e72eda3097df2e45f5067e40406520cbbe41360209f406a0ef4ec7acd49edb2591b97effec739183 SHA512 29548972e0463c8dcab82c27e48c43519ddd813a5bf4e05211a83fb2f27ad9ee0a03226d777199972cb02f417263e647eee4561568807ffa9f91d19dfc90f7c4
-EBUILD strongswan-5.9.5-r1.ebuild 9244 BLAKE2B cd9406736089a9fb075974418655203120964a0030a4e761a603100dcc23cb66482d4832e631f2910369021618042d2dc1b9e79960a2d612168aa462f351f8b7 SHA512 d30ef479396196dce01c074f2e23d2f4b50c48f67a6d7c02f61edaa118ef9666ba9959400a38ef93c88b0c918829cc898bfc048ad9c115b2e72ef57006bbe9cf
+DIST strongswan-5.9.8.tar.bz2 4747096 BLAKE2B 2a7e346931f909aefa17a7e2f4a2d5b491979dd21519eaffa5d14ac0e54d86207009526aed903bfadbec2d4d449a23077f391106ed9ac02851a081b563c72eb0 SHA512 16d3afc80704f896f3f97addf452b4bb29fc1911c54e980f76ac48bdbe2340ce3bd4e79024848cb7961bbe9ad5458d93389343878ca042af658d51b11219666b
 EBUILD strongswan-5.9.6-r1.ebuild 9607 BLAKE2B ed1cb96767c1346f4e3f845ef57fe72aa0682b84a4f854afc3f4587e2a9be251b12b48da9cc8e726eb4003708af08f27443b82eeed109f63afbddd8c44d0da73 SHA512 aea8184e77cdff7e9047f1e44238e1e6e03f57db3ba09071e78502fa9a5b494138f40ac5e399b52fe2d40a5b7edf9bbed8efb8c3a3f1df031ae639f8ee7de9f0
-EBUILD strongswan-5.9.7.ebuild 9557 BLAKE2B 25bfda7f859b6b37bafb5a54f82e03e270cb659daa28bb0ec23fece44ba9de03358d93a491b8244f13c4970df9c72c736e7547b75b15f2ee19eb9b8ab8399b82 SHA512 0be4ea58a6725ec9a5440e24e1732c86624c3923e69555bbf9cdfa1a77eeb2a52f3d4786235f6ad20640af68552ce38e01bf47705eb8fffb82621ebbf3244e89
+EBUILD strongswan-5.9.7.ebuild 9554 BLAKE2B fe1e8cd92adfb8eec4f041c98cad3d9071973cee60e56e6a5a4a14e8408486b01c0137161cebb214c1e65edf27e930369a30ce27f15f2a05cc85a12511f7845a SHA512 0a194ff7799484896f4218b3cecb7fc3565eeb02dc2a42a7412aa4cc478572f0427ea80921aa169b7a18e11791f8f89ff639595a18316a8018b2461a6480f940
+EBUILD strongswan-5.9.8.ebuild 9557 BLAKE2B 850502f5d21560364d86897e6022ef6d1e52b3878eabaed324b0452cdec0ad79e2126dc13b0e8adcc08d10bd64dfbc7b47064eb27cda33dc4c346ff0af3708a1 SHA512 e2106235da9d4f16eb29774c2129f971de3353a6764823a59bc46225e0ad9c990f09469398c84759bb609dcbcf96645468b65a0ce1fb8182f1e01c874095f4b4
 MISC metadata.xml 4888 BLAKE2B ffb26d9fec8ad8c5fbb68ae92a92efbf32c40b4a0a4b829d8fd287ebc80d135e3ca95ca50663acb6fc7d629570ed7f4264921a8838e2ff0a8e5dbbadb3f0fc50 SHA512 84491cbd33b325b1d960c32eafb479927d5651244fb13ee9ec8b2abddfff71f1b90b18524e044dd0cc63ccd49ef9bb0c2437ab6cf504994b8ad0a9137cd04fb4
diff --git a/net-vpn/strongswan/strongswan-5.9.2-r3.ebuild b/net-vpn/strongswan/strongswan-5.9.2-r3.ebuild
deleted file mode 100644
index 095a964f45a7..000000000000
--- a/net-vpn/strongswan/strongswan-5.9.2-r3.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit linux-info systemd
-
-DESCRIPTION="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE"
-HOMEPAGE="https://www.strongswan.org/"
-SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA DES"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
-
-STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
-STRONGSWAN_PLUGINS_OPT="aesni blowfish bypass-lan ccm chapoly ctr forecast gcm ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist"
-for mod in $STRONGSWAN_PLUGINS_STD; do
-	IUSE="${IUSE} +strongswan_plugins_${mod}"
-done
-
-for mod in $STRONGSWAN_PLUGINS_OPT; do
-	IUSE="${IUSE} strongswan_plugins_${mod}"
-done
-
-COMMON_DEPEND="non-root? (
-		acct-user/ipsec
-		acct-group/ipsec
-	)
-	gmp? ( >=dev-libs/gmp-4.1.5:= )
-	gcrypt? ( dev-libs/libgcrypt:= )
-	caps? ( sys-libs/libcap )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap:= )
-	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] <dev-libs/openssl-3:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	sqlite? ( >=dev-db/sqlite-3.3.1 )
-	systemd? ( sys-apps/systemd )
-	networkmanager? ( net-misc/networkmanager )
-	pam? ( sys-libs/pam )
-	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	sys-kernel/linux-headers"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2
-	!net-vpn/libreswan
-	selinux? ( sec-policy/selinux-ipsec )"
-
-UGID="ipsec"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	elog "Linux kernel version: ${KV_FULL}"
-
-	if ! kernel_is -ge 2 6 16; then
-		eerror
-		eerror "This ebuild currently only supports ${PN} with the"
-		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
-		eerror
-	fi
-
-	if kernel_is -lt 2 6 34; then
-		ewarn
-		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
-		ewarn
-
-		if kernel_is -lt 2 6 29; then
-			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
-			ewarn "include all required IPv6 modules even if you just intend"
-			ewarn "to run on IPv4 only."
-			ewarn
-			ewarn "This has been fixed with kernels >= 2.6.29."
-			ewarn
-		fi
-
-		if kernel_is -lt 2 6 33; then
-			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
-			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
-			ewarn "miss SHA384 and SHA512 HMAC support altogether."
-			ewarn
-			ewarn "If you need any of those features, please use kernel >= 2.6.33."
-			ewarn
-		fi
-
-		if kernel_is -lt 2 6 34; then
-			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
-			ewarn "ESP cipher is only included in kernels >= 2.6.34."
-			ewarn
-			ewarn "If you need it, please use kernel >= 2.6.34."
-			ewarn
-		fi
-	fi
-}
-
-src_configure() {
-	local myconf=""
-
-	if use non-root; then
-		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
-	fi
-
-	# If a user has already enabled db support, those plugins will
-	# most likely be desired as well. Besides they don't impose new
-	# dependencies and come at no cost (except for space).
-	if use mysql || use sqlite; then
-		myconf="${myconf} --enable-attr-sql --enable-sql"
-	fi
-
-	# strongSwan builds and installs static libs by default which are
-	# useless to the user (and to strongSwan for that matter) because no
-	# header files or alike get installed... so disabling them is safe.
-	if use pam && use eap; then
-		myconf="${myconf} --enable-eap-gtc"
-	else
-		myconf="${myconf} --disable-eap-gtc"
-	fi
-
-	for mod in $STRONGSWAN_PLUGINS_STD; do
-		if use strongswan_plugins_${mod}; then
-			myconf+=" --enable-${mod}"
-		fi
-	done
-
-	for mod in $STRONGSWAN_PLUGINS_OPT; do
-		if use strongswan_plugins_${mod}; then
-			myconf+=" --enable-${mod}"
-		fi
-	done
-
-	econf \
-		--disable-static \
-		--enable-ikev1 \
-		--enable-ikev2 \
-		--enable-swanctl \
-		--enable-socket-dynamic \
-		$(use_enable curl) \
-		$(use_enable constraints) \
-		$(use_enable ldap) \
-		$(use_enable debug leak-detective) \
-		$(use_enable dhcp) \
-		$(use_enable eap eap-sim) \
-		$(use_enable eap eap-sim-file) \
-		$(use_enable eap eap-simaka-sql) \
-		$(use_enable eap eap-simaka-pseudonym) \
-		$(use_enable eap eap-simaka-reauth) \
-		$(use_enable eap eap-identity) \
-		$(use_enable eap eap-md5) \
-		$(use_enable eap eap-aka) \
-		$(use_enable eap eap-aka-3gpp2) \
-		$(use_enable eap md4) \
-		$(use_enable eap eap-mschapv2) \
-		$(use_enable eap eap-radius) \
-		$(use_enable eap eap-tls) \
-		$(use_enable eap eap-ttls) \
-		$(use_enable eap xauth-eap) \
-		$(use_enable eap eap-dynamic) \
-		$(use_enable farp) \
-		$(use_enable gmp) \
-		$(use_enable gcrypt) \
-		$(use_enable mysql) \
-		$(use_enable networkmanager nm) \
-		$(use_enable openssl) \
-		$(use_enable pam xauth-pam) \
-		$(use_enable pkcs11) \
-		$(use_enable sqlite) \
-		$(use_enable systemd) \
-		$(use_with caps capabilities libcap) \
-		--with-piddir=/run \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if ! use systemd; then
-		rm -rf "${ED}"/lib/systemd || die
-	fi
-
-	doinitd "${FILESDIR}"/ipsec
-
-	local dir_ugid
-	if use non-root; then
-		fowners ${UGID}:${UGID} \
-			/etc/ipsec.conf \
-			/etc/strongswan.conf
-
-		dir_ugid="${UGID}"
-	else
-		dir_ugid="root"
-	fi
-
-	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
-	dodir /etc/ipsec.d \
-		/etc/ipsec.d/aacerts \
-		/etc/ipsec.d/acerts \
-		/etc/ipsec.d/cacerts \
-		/etc/ipsec.d/certs \
-		/etc/ipsec.d/crls \
-		/etc/ipsec.d/ocspcerts \
-		/etc/ipsec.d/private \
-		/etc/ipsec.d/reqs
-
-	dodoc NEWS README TODO
-
-	# shared libs are used only internally and there are no static libs,
-	# so it's safe to get rid of the .la files
-	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
-}
-
-pkg_preinst() {
-	has_version "<net-vpn/strongswan-4.3.6-r1"
-	upgrade_from_leq_4_3_6=$(( !$? ))
-
-	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
-	previous_4_3_6_with_caps=$(( !$? ))
-}
-
-pkg_postinst() {
-	if ! use openssl && ! use gcrypt; then
-		elog
-		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
-		elog "Please note that this might effect availability and speed of some"
-		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
-	elif ! use openssl; then
-		elog
-		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
-		elog "availability and speed of some cryptographic features. There will be"
-		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
-		elog "25, 26) and ECDSA."
-	fi
-
-	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
-		chmod 0750 "${ROOT}"/etc/ipsec.d \
-			"${ROOT}"/etc/ipsec.d/aacerts \
-			"${ROOT}"/etc/ipsec.d/acerts \
-			"${ROOT}"/etc/ipsec.d/cacerts \
-			"${ROOT}"/etc/ipsec.d/certs \
-			"${ROOT}"/etc/ipsec.d/crls \
-			"${ROOT}"/etc/ipsec.d/ocspcerts \
-			"${ROOT}"/etc/ipsec.d/private \
-			"${ROOT}"/etc/ipsec.d/reqs
-
-		ewarn
-		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
-		ewarn "security reasons. Your system installed directories have been"
-		ewarn "updated accordingly. Please check if necessary."
-		ewarn
-
-		if [[ $previous_4_3_6_with_caps == 1 ]]; then
-			if ! use non-root; then
-				ewarn
-				ewarn "IMPORTANT: You previously had ${PN} installed without root"
-				ewarn "privileges because it was implied by the 'caps' USE flag."
-				ewarn "This has been changed. If you want ${PN} with user privileges,"
-				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
-				ewarn
-			fi
-		fi
-	fi
-	if ! use caps && ! use non-root; then
-		ewarn
-		ewarn "You have decided to run ${PN} with root privileges and built it"
-		ewarn "without support for POSIX capability dropping. It is generally"
-		ewarn "strongly suggested that you reconsider- especially if you intend"
-		ewarn "to run ${PN} as server with a public ip address."
-		ewarn
-		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
-		ewarn
-	fi
-	if use non-root; then
-		elog
-		elog "${PN} has been installed without superuser privileges (USE=non-root)."
-		elog "This imposes a few limitations mainly to the daemon 'charon' in"
-		elog "regards of the use of iptables."
-		elog
-		elog "Please carefully read: https://wiki.strongswan.org/projects/strongswan/wiki/ReducedPrivileges"
-		elog
-		elog "Thus if you require to specify a custom updown"
-		elog "script to charon which requires superuser privileges, you"
-		elog "can work around this limitation by using sudo to grant the"
-		elog "user \"ipsec\" the appropriate rights."
-		elog "For example (the default case):"
-		elog "/etc/sudoers:"
-		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
-		elog "Under the specific connection block in /etc/ipsec.conf:"
-		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
-		elog
-	fi
-	elog
-	elog "Make sure you have _all_ required kernel modules available including"
-	elog "the appropriate cryptographic algorithms. A list is available at:"
-	elog "  https://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
-	elog
-	elog "The up-to-date manual is available online at:"
-	elog "  https://wiki.strongswan.org/"
-	elog
-}
diff --git a/net-vpn/strongswan/strongswan-5.9.4-r2.ebuild b/net-vpn/strongswan/strongswan-5.9.4-r2.ebuild
deleted file mode 100644
index 49d955fb8c2f..000000000000
--- a/net-vpn/strongswan/strongswan-5.9.4-r2.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-inherit linux-info systemd
-
-DESCRIPTION="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE"
-HOMEPAGE="https://www.strongswan.org/"
-SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA DES"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
-
-STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
-STRONGSWAN_PLUGINS_OPT="aesni blowfish bypass-lan ccm chapoly ctr forecast gcm
-ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist
-xauth-noauth"
-for mod in $STRONGSWAN_PLUGINS_STD; do
-	IUSE="${IUSE} +strongswan_plugins_${mod}"
-done
-
-for mod in $STRONGSWAN_PLUGINS_OPT; do
-	IUSE="${IUSE} strongswan_plugins_${mod}"
-done
-
-COMMON_DEPEND="non-root? (
-		acct-user/ipsec
-		acct-group/ipsec
-	)
-	gmp? ( >=dev-libs/gmp-4.1.5:= )
-	gcrypt? ( dev-libs/libgcrypt:= )
-	caps? ( sys-libs/libcap )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap:= )
-	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] )
-	mysql? ( dev-db/mysql-connector-c:= )
-	sqlite? ( >=dev-db/sqlite-3.3.1 )
-	systemd? ( sys-apps/systemd )
-	networkmanager? ( net-misc/networkmanager )
-	pam? ( sys-libs/pam )
-	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	sys-kernel/linux-headers"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2
-	!net-vpn/libreswan
-	selinux? ( sec-policy/selinux-ipsec )"
-
-UGID="ipsec"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	elog "Linux kernel version: ${KV_FULL}"
-
-	if ! kernel_is -ge 2 6 16; then
-		eerror
-		eerror "This ebuild currently only supports ${PN} with the"
-		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
-		eerror
-	fi
-
-	if kernel_is -lt 2 6 34; then
-		ewarn
-		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
-		ewarn
-
-		if kernel_is -lt 2 6 29; then
-			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
-			ewarn "include all required IPv6 modules even if you just intend"
-			ewarn "to run on IPv4 only."
-			ewarn
-			ewarn "This has been fixed with kernels >= 2.6.29."
-			ewarn
-		fi
-
-		if kernel_is -lt 2 6 33; then
-			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
-			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
-			ewarn "miss SHA384 and SHA512 HMAC support altogether."
-			ewarn
-			ewarn "If you need any of those features, please use kernel >= 2.6.33."
-			ewarn
-		fi
-
-		if kernel_is -lt 2 6 34; then
-			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
-			ewarn "ESP cipher is only included in kernels >= 2.6.34."
-			ewarn
-			ewarn "If you need it, please use kernel >= 2.6.34."
-			ewarn
-		fi
-	fi
-}
-
-src_configure() {
-	local myconf=""
-
-	if use non-root; then
-		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
-	fi
-
-	# If a user has already enabled db support, those plugins will
-	# most likely be desired as well. Besides they don't impose new
-	# dependencies and come at no cost (except for space).
-	if use mysql || use sqlite; then
-		myconf="${myconf} --enable-attr-sql --enable-sql"
-	fi
-
-	# strongSwan builds and installs static libs by default which are
-	# useless to the user (and to strongSwan for that matter) because no
-	# header files or alike get installed... so disabling them is safe.
-	if use pam && use eap; then
-		myconf="${myconf} --enable-eap-gtc"
-	else
-		myconf="${myconf} --disable-eap-gtc"
-	fi
-
-	for mod in $STRONGSWAN_PLUGINS_STD; do
-		if use strongswan_plugins_${mod}; then
-			myconf+=" --enable-${mod}"
-		fi
-	done
-
-	for mod in $STRONGSWAN_PLUGINS_OPT; do
-		if use strongswan_plugins_${mod}; then
-			myconf+=" --enable-${mod}"
-		fi
-	done
-
-	econf \
-		--disable-static \
-		--enable-ikev1 \
-		--enable-ikev2 \
-		--enable-swanctl \
-		--enable-socket-dynamic \
-		--enable-cmd \
-		$(use_enable curl) \
-		$(use_enable constraints) \
-		$(use_enable ldap) \
-		$(use_enable debug leak-detective) \
-		$(use_enable dhcp) \
-		$(use_enable eap eap-sim) \
-		$(use_enable eap eap-sim-file) \
-		$(use_enable eap eap-simaka-sql) \
-		$(use_enable eap eap-simaka-pseudonym) \
-		$(use_enable eap eap-simaka-reauth) \
-		$(use_enable eap eap-identity) \
-		$(use_enable eap eap-md5) \
-		$(use_enable eap eap-aka) \
-		$(use_enable eap eap-aka-3gpp2) \
-		$(use_enable eap md4) \
-		$(use_enable eap eap-mschapv2) \
-		$(use_enable eap eap-radius) \
-		$(use_enable eap eap-tls) \
-		$(use_enable eap eap-ttls) \
-		$(use_enable eap xauth-eap) \
-		$(use_enable eap eap-dynamic) \
-		$(use_enable farp) \
-		$(use_enable gmp) \
-		$(use_enable gcrypt) \
-		$(use_enable mysql) \
-		$(use_enable networkmanager nm) \
-		$(use_enable openssl) \
-		$(use_enable pam xauth-pam) \
-		$(use_enable pkcs11) \
-		$(use_enable sqlite) \
-		$(use_enable systemd) \
-		$(use_with caps capabilities libcap) \
-		--with-piddir=/run \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if ! use systemd; then
-		rm -rf "${ED}"/lib/systemd || die "Failed removing systemd lib."
-	fi
-
-	doinitd "${FILESDIR}"/ipsec
-
-	local dir_ugid
-	if use non-root; then
-		fowners ${UGID}:${UGID} \
-			/etc/ipsec.conf \
-			/etc/strongswan.conf
-
-		dir_ugid="${UGID}"
-	else
-		dir_ugid="root"
-	fi
-
-	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
-	dodir /etc/ipsec.d \
-		/etc/ipsec.d/aacerts \
-		/etc/ipsec.d/acerts \
-		/etc/ipsec.d/cacerts \
-		/etc/ipsec.d/certs \
-		/etc/ipsec.d/crls \
-		/etc/ipsec.d/ocspcerts \
-		/etc/ipsec.d/private \
-		/etc/ipsec.d/reqs
-
-	dodoc NEWS README TODO
-
-	# shared libs are used only internally and there are no static libs,
-	# so it's safe to get rid of the .la files
-	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
-}
-
-pkg_preinst() {
-	has_version "<net-vpn/strongswan-4.3.6-r1"
-	upgrade_from_leq_4_3_6=$(( !$? ))
-
-	has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
-	previous_4_3_6_with_caps=$(( !$? ))
-}
-
-pkg_postinst() {
-	if ! use openssl && ! use gcrypt; then
-		elog
-		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
-		elog "Please note that this might effect availability and speed of some"
-		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
-	elif ! use openssl; then
-		elog
-		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
-		elog "availability and speed of some cryptographic features. There will be"
-		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
-		elog "25, 26) and ECDSA."
-	fi
-
-	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
-		chmod 0750 "${ROOT}"/etc/ipsec.d \
-			"${ROOT}"/etc/ipsec.d/aacerts \
-			"${ROOT}"/etc/ipsec.d/acerts \
-			"${ROOT}"/etc/ipsec.d/cacerts \
-			"${ROOT}"/etc/ipsec.d/certs \
-			"${ROOT}"/etc/ipsec.d/crls \
-			"${ROOT}"/etc/ipsec.d/ocspcerts \
-			"${ROOT}"/etc/ipsec.d/private \
-			"${ROOT}"/etc/ipsec.d/reqs
-
-		ewarn
-		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
-		ewarn "security reasons. Your system installed directories have been"
-		ewarn "updated accordingly. Please check if necessary."
-		ewarn
-
-		if [[ $previous_4_3_6_with_caps == 1 ]]; then
-			if ! use non-root; then
-				ewarn
-				ewarn "IMPORTANT: You previously had ${PN} installed without root"
-				ewarn "privileges because it was implied by the 'caps' USE flag."
-				ewarn "This has been changed. If you want ${PN} with user privileges,"
-				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
-				ewarn
-			fi
-		fi
-	fi
-	if ! use caps && ! use non-root; then
-		ewarn
-		ewarn "You have decided to run ${PN} with root privileges and built it"
-		ewarn "without support for POSIX capability dropping. It is generally"
-		ewarn "strongly suggested that you reconsider- especially if you intend"
-		ewarn "to run ${PN} as server with a public ip address."
-		ewarn
-		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
-		ewarn
-	fi
-	if use non-root; then
-		elog
-		elog "${PN} has been installed without superuser privileges (USE=non-root)."
-		elog "This imposes several limitations mainly to the IKEv1 daemon 'pluto'"
-		elog "but also a few to the IKEv2 daemon 'charon'."
-		elog
-		elog "Please carefully read: http://wiki.strongswan.org/projects/strongswan/wiki/ReducedPrivileges"
-		elog
-		elog "Thus if you require to specify a custom updown"
-		elog "script to charon which requires superuser privileges, you"
-		elog "can work around this limitation by using sudo to grant the"
-		elog "user \"ipsec\" the appropriate rights."
-		elog "For example (the default case):"
-		elog "/etc/sudoers:"
-		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
-		elog "Under the specific connection block in /etc/ipsec.conf:"
-		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
-		elog
-	fi
-	elog
-	elog "Make sure you have _all_ required kernel modules available including"
-	elog "the appropriate cryptographic algorithms. A list is available at:"
-	elog "  https://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
-	elog
-	elog "The up-to-date manual is available online at:"
-	elog "  https://wiki.strongswan.org/"
-	elog
-}
diff --git a/net-vpn/strongswan/strongswan-5.9.7.ebuild b/net-vpn/strongswan/strongswan-5.9.7.ebuild
index d5b5767e6d03..cb8107a77572 100644
--- a/net-vpn/strongswan/strongswan-5.9.7.ebuild
+++ b/net-vpn/strongswan/strongswan-5.9.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
diff --git a/net-vpn/strongswan/strongswan-5.9.5-r1.ebuild b/net-vpn/strongswan/strongswan-5.9.8.ebuild
index 6750a94b8675..208d30671dab 100644
--- a/net-vpn/strongswan/strongswan-5.9.5-r1.ebuild
+++ b/net-vpn/strongswan/strongswan-5.9.8.ebuild
@@ -10,17 +10,22 @@ SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
 
-STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
-STRONGSWAN_PLUGINS_OPT="aesni blowfish bypass-lan ccm chapoly ctr forecast gcm
+STRONGSWAN_PLUGINS_STD="gcm led lookip systime-fix unity vici"
+STRONGSWAN_PLUGINS_OPT_DISABLE="kdf"
+STRONGSWAN_PLUGINS_OPT="addrblock aesni blowfish bypass-lan ccm chapoly ctr error-notify forecast
 ha ipseckey newhope ntru padlock rdrand save-keys unbound whitelist
 xauth-noauth"
 for mod in $STRONGSWAN_PLUGINS_STD; do
 	IUSE="${IUSE} +strongswan_plugins_${mod}"
 done
 
+for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
 for mod in $STRONGSWAN_PLUGINS_OPT; do
 	IUSE="${IUSE} strongswan_plugins_${mod}"
 done
@@ -29,6 +34,7 @@ COMMON_DEPEND="non-root? (
 		acct-user/ipsec
 		acct-group/ipsec
 	)
+	dev-libs/glib:2
 	gmp? ( >=dev-libs/gmp-4.1.5:= )
 	gcrypt? ( dev-libs/libgcrypt:= )
 	caps? ( sys-libs/libcap )
@@ -36,11 +42,11 @@ COMMON_DEPEND="non-root? (
 	ldap? ( net-nds/openldap:= )
 	openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] )
 	mysql? ( dev-db/mysql-connector-c:= )
-	sqlite? ( >=dev-db/sqlite-3.3.1 )
+	sqlite? ( >=dev-db/sqlite-3.3.1:3 )
 	systemd? ( sys-apps/systemd )
 	networkmanager? ( net-misc/networkmanager )
 	pam? ( sys-libs/pam )
-	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns )"
+	strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= )"
 
 DEPEND="${COMMON_DEPEND}
 	virtual/linux-sources
@@ -128,6 +134,12 @@ src_configure() {
 		fi
 	done
 
+	for mod in $STRONGSWAN_PLUGINS_OPT_DISABLE; do
+		if ! use strongswan_plugins_${mod}; then
+			myconf+=" --disable-${mod}"
+		fi
+	done
+
 	for mod in $STRONGSWAN_PLUGINS_OPT; do
 		if use strongswan_plugins_${mod}; then
 			myconf+=" --enable-${mod}"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 35a5444129b4..f3104d94ae7d 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 8bb74cc68dcd..fe66ae5a119e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2022-10-05)
+# Originally added for dev-python/rapidfuzz.  Now the algorithm has been
+# inlined into rapidfuzz, and the package is semi-deprecated.
+# No revdeps left in ::gentoo.
+# Removal on 2022-11-04.  Bug #875350.
+dev-cpp/jarowinkler-cpp
+dev-python/jarowinkler
+
 # Sam James <sam@gentoo.org> (2022-10-04)
 # Regression for some Intel LCDs which may cause physical damage
 # Please upgrade to 5.19.13 if affected!
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index a9ac9750878f..8b66e016bc4e 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index bf442b94673c..be6ef71a3521 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -6,6 +6,6 @@ DIST bmake-20220901.tar.gz 816362 BLAKE2B f2faf7ee44a83ba340a9682756e8ba3371ce2c
 DIST bmake-20220924.tar.gz 820164 BLAKE2B 5f74403ec68d9512ed74972b74219aa647b4c0ea855bd80fbf251f40a785c02f807c5cac0c7704469d343e43c5b84c395d3c1aab8ea3c8695314f016f1fa57c7 SHA512 85fa9e05a6020e7b41ef6af4b5a8f87f1f98651e264ba8cedacacf3b7d1dfbed3f66bb9934c252f71299aea6ac1190b03a9de0c60a833e8ac91ec854cd819f7b
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
 EBUILD bmake-20220726.ebuild 1311 BLAKE2B 13a2cf3f6fcee46da66355e45a95f37bca25e6b50dbff3d9e9d6c519645f2b79b6a337eb7b637b484131d41e65f85043a7f0742bb0e9d15bc3e8710f4e147843 SHA512 03c1a7df80c9dc2162fd4ad16c543ab5d96e4aa6bb19d7df3b6a75c9dbd518e35b3c209d21bc6eb7b37356f8b888a82f1fd610d694c11f55deeda5b6a30c3b76
-EBUILD bmake-20220901.ebuild 1312 BLAKE2B a51d77327b89fa4526245c8949883c79ed3091b0c62aaa45be1e266d363178948cd3d46c3e94ef6cdbec8231480561dbfdd166d6434d95c98e6e87f2061bd616 SHA512 3c24aeb474b64a3b28093ba26b21ca6b2e9f34ec012c9bc87b6e40048d268ddb48e1feab0ce7f3a640da514aa47899fc8560aac09deacda9b88c7ec93d6b0554
+EBUILD bmake-20220901.ebuild 1311 BLAKE2B 13a2cf3f6fcee46da66355e45a95f37bca25e6b50dbff3d9e9d6c519645f2b79b6a337eb7b637b484131d41e65f85043a7f0742bb0e9d15bc3e8710f4e147843 SHA512 03c1a7df80c9dc2162fd4ad16c543ab5d96e4aa6bb19d7df3b6a75c9dbd518e35b3c209d21bc6eb7b37356f8b888a82f1fd610d694c11f55deeda5b6a30c3b76
 EBUILD bmake-20220924.ebuild 1312 BLAKE2B a51d77327b89fa4526245c8949883c79ed3091b0c62aaa45be1e266d363178948cd3d46c3e94ef6cdbec8231480561dbfdd166d6434d95c98e6e87f2061bd616 SHA512 3c24aeb474b64a3b28093ba26b21ca6b2e9f34ec012c9bc87b6e40048d268ddb48e1feab0ce7f3a640da514aa47899fc8560aac09deacda9b88c7ec93d6b0554
 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5
diff --git a/sys-devel/bmake/bmake-20220901.ebuild b/sys-devel/bmake/bmake-20220901.ebuild
index 5505e007c65a..7e0fdf7ced79 100644
--- a/sys-devel/bmake/bmake-20220901.ebuild
+++ b/sys-devel/bmake/bmake-20220901.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 # Skip failing test (sandbox and csh)
 PATCHES=(
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index f9f055f75344..0fe48ffb6d14 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 62ed47c10139..429167416bf8 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -1,5 +1,5 @@
 AUX mtd-utils-2.1.4-glibc-2.36.patch 537 BLAKE2B 14788f3b435c2e4bbb01afed7ce412277a1f72f627fe90b6859e6ed859bb18860312393804e0da868072898684571dc4a6b5398193346025fe0a3878eb4a4c53 SHA512 ce1d72b7edd21d21e3a6a3add78cf146efa39adc34621facb000022bdc2bfbad40e36824d5eeecfca1347f59fa01706f3c4e73ab7ed00f6834235ebe167fa6c8
 DIST mtd-utils-2.1.4.tar.bz2 630365 BLAKE2B 0538ecb90cd1215662cc8493d07e743e067218c1ae1ce09f40343a1ab13f5318d5e198d622a0d69acb2d677cdd3415880689c42afa41877730ff6a546c2b318f SHA512 4010a7b25cf32df2de02b8efbbe91c49789e3963618df7461e4bf64a8c588440c55f17c750a7d2df34367a732b0fefc487ee052129a5aa6a44a0023b714dface
-EBUILD mtd-utils-2.1.4-r1.ebuild 958 BLAKE2B 666e220f55ff40881751ac113c54df42bb086c4c8de6fe7e34b54e387736bb2ede0c7d16011a1d2ceb910f378f743dae3ee484aad3ae49707945953fce13bf7d SHA512 def6030cc81b4761a26e3b468844b1d57216980ceee2855a93db59fcdb82da7f353543fb367004f08873ab4e12a4546b43a8eec486761b5315eeb3eaa3b54288
+EBUILD mtd-utils-2.1.4-r1.ebuild 953 BLAKE2B bd933e84dc0b998ef4abd6d0ad54da723f8b9fca998bf3f33c61735c68ddfe4fbedaa80e109d402c713311fa9d247602284e04e14a94e618fb8b5270fbb6ef43 SHA512 35d2232ea88d140f3867a8c31ed700a7e384f5fd8ac3a58d72cbf692a2173c6e1285470c784e044c780865f2266ebeaca1c5b4adbe0afc279f5c48aa6eaccff3
 EBUILD mtd-utils-2.1.4.ebuild 902 BLAKE2B fafe00e40c455f268dba717eacb8163a2313fe197908a76ceb69c4cc7a21087c820e188cea550ab06533888d78506153799067bfb3cf5d46e38684102f7d21f2 SHA512 332e96fba618f1064ff242da582666d53f2ce68d29e4dd324755367ff1d38a9a28ec0a4f0bbddff96ac8a0f73895276e6f7a7aabe2a6bb435d10d0e59b8ca4c4
 MISC metadata.xml 589 BLAKE2B 4991d24ee29697e60dd1672008647d8b7ef2f6cf60a64ccf3b1174eecdaf842b81783ecd9995a7b050f98b744546550074b6c2ea509e45f3f42106badbc3deeb SHA512 a3a46acfa94eb80e4220d2e143a929f4a02e1d6708378a4e429b7de4e82bfe1d04aee5868c889c98354b566b58f0512d50f36357f16fa6997afffd0c2177b696
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.4-r1.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.4-r1.ebuild
index 615da14e7db2..2baa426644f5 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.1.4-r1.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://infraroot.at/pub/mtd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="+lzo xattr +zstd"
 
 DEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2022-10-05 13:19:37 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-05 13:19:37 +0100
commit	d03ec6c0e9c1683a824ce77667440dcb4a13974e (patch)
tree	a6d1dcba1ebf79b5ab9a81588f2e3dd4ca16cb57
parent	315f94518df5e89b0990f56d7200f52d67aeec51 (diff)