gentoo auto-resync : 29:07:2022 - 21:08:17

345 files changed, 2763 insertions, 2524 deletions

diff --git a/Manifest b/Manifest
index 6b7526248780..0ea8ea6cda95 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29640 BLAKE2B 7f2080f679aff0ccb09da85c24e90bab1c3bccf80c005243ad9d99c6668d767b8cf3497e02da98a5f382c6a4d07c840313aefafd6de4d079ae0fd719b8c656af SHA512 dde6d32179ec567281002f1b46dc894d4c5dafb90c7b223017c83cba8a045f1dcade390e934bb6aee7169894ebec1a2c7f0b57aa4328b4ace79c211a0a95cdd8
-TIMESTAMP 2022-07-29T12:39:36Z
+MANIFEST Manifest.files.gz 29622 BLAKE2B c64a5083ae95f1a4ddf9e86b17753ee569635689ea1aed613c4d7114148238e82790149c6a3799999972542e30e7f8d991d2521889832244a874ce46e35f635c SHA512 230f0d7901f98d90dd8927a549063d24f517fb9f80891ad3b722cfe3f53dff9c3ea80cbb46133f8c8031cd2abb87e109c961221a9c7288a21b86031d04b57ad9
+TIMESTAMP 2022-07-29T18:39:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLj1QhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLkKWxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCHNA/7BsSdT2pyklBZhuPC02fMTVo9phzUBq4n7aP+IpfD8w2OqVNMBetz+60R
-oWLSKVrNfnML+g5DpeROs6URxcwXglYS7aOROM0mzDrNHlPmNX7P7+ClHwbbyENt
-ZKuv8WTHRUpzDwMLQ9LC0N/QufK8/hWaZFh+3YQFcJwmVCU0iddEBMJH6ju7Im25
-m58g0HkzQCuWvk89PaMQKxdx/sw5fMM2TUa0dfhf7w/HnJmTJCHEgq08/8g2IERI
-vaqyOqMFWoWfAp8UFGDD+DX8zhGwDrRKSf8HnpvON3XsaMcB8xPCTqJ3oNCRR8Cc
-dxoBTSJVwf4nSNpX1feStqzARucYGpboih1gmnpexeRV9I4HcllNF6KQoZi4Bc1D
-8Pa50Xio+bIef+IuAWFHrzeCApfwUFGGocmRi7f9RBjoTmovl1tfHmA94VjwCpgN
-D3EugZFuRVkvsp34Z3qyrL7oI9tJSA9m2PoxJ4oHIonJQapPaxFo2/7lHub4q3y6
-d1G/kxvvPC/Q95UVHzq23NU0WASojHm3xGzU6AviHbKi6UJaHDKb7bb1qwmTT214
-Gjn7SMch4hP4LJKP2ah0TvKdTDqx4YoC5GqqUAqCUYz/+qh4ER8+2PkHAtrDPdSH
-critLVhVrbwmh5NW6k+3Bqeyu5E+pwWqhEkOdo/q5NO6Ay0bKCw=
-=l95T
+klBa2Q//W6cQW36u1Gw4aTmvIiXqueKq/I2Dm1m73hJ3OY5w9MttiIvhBi3PjK0K
+NoHeda34bvs97VMpRFe1ZyybPqhw7lCy0O14Y5Yyfmj4gk/wF8BOHSpDysLEvSbN
+hPfsOsETKcbaWcONJH6BqdWHtMo3YGK+ib7vfCsFACCkOGEvuPN8o5qzyrNM7jFT
+vRS/uSxNkNRA6MWFuUQoazVNfydkMDLZFT1B3isGdESz1/N8FtsfGqh4edcSmW8q
+2Y77APltXKwhj0eLa8RSlfhoMuwtTlj4fJxrwpHqRr3Fi9gWqRk9pcld3Hpgp6e8
+h83Kv/FMERGmKYoeEwwOzAhwqUTNbICn0i8amoY9DROAs2dxdA6RbtK0UQpVUpes
+2YVLH5unJ9Na1tGMADUHa2JdGWen5zQ2RBwzie0BVZ0w3iPxN/g3dPyywXOJuQ4F
+oBjkKChIlvB3pibutzNFbBTvD7KGFzXuMnuvVaHwnWxUiFgSt/XIYucSzARW2tHz
+cFpZ8Iqvv/9mo2seuD0XntYr0SCBahTrQcy/yHU8MmOGXa7+Qo+RhVx7fqoQ2rLs
+zvrQCJP69ELNSO9iCHt/UNWHCpfjPn1jMUwROvmKkssxKyBvG0Ja0JvxGeep0XlD
+YEh4QB8taAu7n5dn9Gb5PSjxKu5u+73Qvd2C/tU5VwAUXNZ7KOo=
+=tGpV
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 045efadfec64..c149ac6baa4b 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 4b77258d4f85..559808187b84 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest
index 761cd1e95546..422dc49e7517 100644
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@@ -1,3 +1,5 @@
 DIST accerciser-3.38.0.tar.xz 2006380 BLAKE2B 8a073e3a933386c9ae46d71535a3a49930bf8100d1458ac1875e1bcb69acc13e2331ac568c566ec6b8fe8ff9836155cc2ff20558de0e21942a29a568ff916fa5 SHA512 5740e4acfb00f5842dac8045ca9f10c85cf2ae164f3e0caf63ec303ff104002ace6de591a9b6516c4052ec0da8e48b394647f018b6c8b68a6c5ff77c4fff2904
+DIST accerciser-3.40.0.tar.xz 1991256 BLAKE2B adcaa37b64d91cf4348fdd1b15d22aa977585c2c9d3ad81b41c7711f82ce010c7b75a44de6ec780fbbdadacad856a1f15b4f492971f5a7acfcea0568f0edc2df SHA512 78a7ce4a69de9a237c75b8df25665c8e9e8173969fb146cb608f4b51ff042c3abdcd49225f8f420c1c1bfab3736a8607eb6b555106c8a1e6e3399c83bad8f198
 EBUILD accerciser-3.38.0.ebuild 1158 BLAKE2B cb28c08e7fe5bf3c0e4ac4581213b514b95b94a84afa009f1d90f2f6e292b90e2957d5c39a9a067482b61f6ca35097ced5aec955a89b50d944e6b5bcbe4d1313 SHA512 401f708586e5c577dc88feb483df3ae32dd082dda794707ca7f97ca8b9b42688b29d2cf5711323424a1f1c60aa330b565abd6edbdd5bdfcf399730250e420259
+EBUILD accerciser-3.40.0.ebuild 1197 BLAKE2B 3ae387b47d295830765c641f057c2405fad81b0d66019697559706f67d407eff8c39751ebc03f00b55e427b7007f63770ad3eaabce912a328994b6ba1e45c695 SHA512 6f2c083de65696ec1311e1546ea1383699865338f2dfc6126788b1be70dab714ef04dadec7346ba2490276b7cdc70bbf9c9032ef999fb66897b2c04155133979
 MISC metadata.xml 739 BLAKE2B 53c924112bba4cb103ab71fe76132876ae0da30ec1fca8606f065166f7cd4d12b3f752bdaad19414d5dd8ba9896ca2e82d5103b0708fb3a825286eb8c97632aa SHA512 b9d7907c03c3688cdf61f6ddbe887a2507bfc0eb19dfd47a8d07130c77d76d694122bb3ad84e24894fab2b3412c80320d8ffad86be830bda0021f0a3440b906c
diff --git a/app-accessibility/accerciser/accerciser-3.40.0.ebuild b/app-accessibility/accerciser/accerciser-3.40.0.ebuild
new file mode 100644
index 000000000000..cfedba6402c8
--- /dev/null
+++ b/app-accessibility/accerciser/accerciser-3.40.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Interactive Python accessibility explorer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser https://gitlab.gnome.org/GNOME/accerciser"
+
+LICENSE="BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.5.2:2
+	>=x11-libs/gtk+-3.1.13:3[introspection]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+		>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
+		>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+	')
+
+	dev-libs/atk[introspection]
+	>=dev-libs/glib-2.28:2
+	dev-libs/gobject-introspection:=
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+	gnome-base/librsvg[introspection]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_install() {
+	gnome2_src_install
+	python_optimize
+}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f08f25bcda63..f2ee2af4ae05 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index f2212020cd8c..1cb150a2b147 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -6,5 +6,5 @@ DIST logrotate-3.19.0.tar.xz 166276 BLAKE2B bb19690ca092905e527f6a0a7915373a65b2
 DIST logrotate-3.20.1.tar.xz 166712 BLAKE2B 8481e0d746c6bcbe10f2686a921334c6f957c8d92520927de7bc8fb0b7631a444fedaa80f35bc2de7961b3d5833ce4ab885b1298b235b7f8b33cc3ae05438da6 SHA512 a9ed5796ab254f511d0029a8f29ef7557f62e12e3ea9af24e30b5b9f348b1c1a16df26d44314b78299916fb3b5000b9cd9eed7cee2cee8df11cfd8e40c79b092
 DIST logrotate-3.20.1.tar.xz.asc 833 BLAKE2B afc02177335bcd580e0617af8c50846b371c2d00ecd8fe329c2e298dc8c48823137625f455cea3d983a0d9971733297fa2c4d98ba3c6f72d2c07f8f21108cfe4 SHA512 2dd207feec431b223ff12f09f6cce14409d45e5bb3abaf2275dd773c7ee7c59ed7d32395e5869bfed70c970be4158fd299e6e269838378843dcb63ca5ebfa029
 EBUILD logrotate-3.19.0.ebuild 2257 BLAKE2B 0a66afed01ac2efcefccbb3abc5309ae27fcde5429368e13a17dc4672d06c6c67bd5546cf5e80da69eaa3f1cf36149409db004682e27d4e9995056deb0fe06df SHA512 f3d7b346b50e086bb50fa7d1b5d854d4c5fdf9a9700d9212eeb992da8a0dbf6c4a8b21ee0bf5a26d917ed2a581980952121d2c0c88f6fe1d3ca474db30a96d3f
-EBUILD logrotate-3.20.1-r1.ebuild 2514 BLAKE2B 9bde96f05bc35e00fe1e789a1911fd2c17b9384486fe7fe653c5d3f6ce03aa53eb2611f32a22c5cfed8ed3b7ca1ed5d94f966ebe07bb0c20b80c8f69bb66470c SHA512 ef471cb8eec135d25fcdb4edba0db12806eff8114ca39f11dbcf97871a43ec8f17361c621fb4427ecac49f4d0ed19c3242ca5706742792d8cedb11526607917e
+EBUILD logrotate-3.20.1-r1.ebuild 2513 BLAKE2B c94c72483cb4c065b63cb313db67a8d28f534c7f204c852f79c05d363d2ee29f766136c98ff324b92d085f0b083093e4c73d7aea099f05b8c3ef85adad5811b0 SHA512 d6e9474b5de6a6ce945f9e7b1b0863e309956989064ab28ba14565f1b88cb434a12e1e2ee8cc6240dd64b49dd3a9b299c366d6b9b359eb410769b198750ae788
 MISC metadata.xml 1203 BLAKE2B 434c8f014678fca0829df99c4af0a965721dd5023baee7e0684b66993db4895152c879a71bb7c73a434834d648392d96985260a61d98209c14238dc18884576a SHA512 785c3c4c45ce53caab03bfa43be4240b9e0514885c2e195729cba576b2f26c17744be9f5767342626e1052475a3f1f2a089a698b541730b8a94e04bfc5d9d837
diff --git a/app-admin/logrotate/logrotate-3.20.1-r1.ebuild b/app-admin/logrotate/logrotate-3.20.1-r1.ebuild
index 65640690466c..868b758df65f 100644
--- a/app-admin/logrotate/logrotate-3.20.1-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.20.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl +cron selinux"
 
 DEPEND=">=dev-libs/popt-1.5
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index a1c58b03c78a..24797757dd9c 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/grype/Manifest b/app-containers/grype/Manifest
index cd6aa875d57b..525bd33978df 100644
--- a/app-containers/grype/Manifest
+++ b/app-containers/grype/Manifest
@@ -1,4 +1,5 @@
 DIST grype-0.44.0-deps.tar.xz 641743984 BLAKE2B f30557d75628f84dff70ca4272555c7c3577bfe572c9ba16b0e78bc472732d5e82e734ed1ba4dfed59dbb86dc6a788d1379824e7b31bcdd148c5dff43f87e011 SHA512 de46c03f35f70353f0250b77364252316c48f70c1c4549f5d2a680062faee0305c7190906087e94d927333c4fae76de3c3b16046e3f3dc089013b66e132a2ff9
 DIST grype-0.44.0.tar.gz 1071804 BLAKE2B 2334ec9b9c04dfc03dbd280725a55bb6cdcd4569431eeb94abe799c75be08ff5164446cba7e97e3dc0ed8dcc10ba4bc8f70edecf9766cdc63e91b3dd420de391 SHA512 7573d03c2e0cbabb6ae3a91ebaa65848a7b43fc3624416f6c52a001acf6cfc839bce806e8e914c29bc2d0fc1aadd9b568ffc21d5a60bd9c05905e0185d7bdcd3
+EBUILD grype-0.44.0-r1.ebuild 1018 BLAKE2B 6642d3ab6abee69d6b6467469a4a3a8a9a625db99509c318fed928a223dc75bd012699f0189818603499ea39ff159d5ff273b344f0960471f6fe391bbc66919e SHA512 8f7965f641e810a222dc3962da5f0da8e6730258093f3df6add5a4dbd93c642cf78e05a31435fda0460a6ab8bcc3d878d6522fed8b161485a0882e391b59e8d5
 EBUILD grype-0.44.0.ebuild 511 BLAKE2B c1cf14d31e5d8bf842ce01048f0f3e9813e19e16d39222b3ae485134418587dbef88eaa5122ab37e693b635e0336835449aeea430df8fda7dac8b116e72b5c4c SHA512 b5f79ba354cc9db9dccff1c3e5b87be41924d5fc07df36b85a4fa20e65b04f9b473d0742620ba9238fe92644a8ff2a67c16e62708e6fbf11d690f205e8319dec
 MISC metadata.xml 243 BLAKE2B 63665ae2020bc799fa6ebd6e1fca6755be6498803fdbc17cc630f9f4ffa03fbd46a9ad396e70adc3bc1c32b0a746fe4bab1c6291f32e68e636251207bca9e95c SHA512 78eab20831018fcf4957171a83aaaca9ced53380e01f083c07450c30fa1adfc02dd50ff2fa9f491dd62802f6e779264add1c47a09ade0a35cda558c1d5529ad0
diff --git a/app-containers/grype/grype-0.44.0-r1.ebuild b/app-containers/grype/grype-0.44.0-r1.ebuild
new file mode 100644
index 000000000000..868972a69ab6
--- /dev/null
+++ b/app-containers/grype/grype-0.44.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=a6ec8f11be5fdc116dc7bbfebdc03bfc13cd2005
+SYFT_VERSION=0.52.0
+
+DESCRIPTION="A vulnerability scanner for container images and filesystems"
+HOMEPAGE="https://www.anchore.com"
+SRC_URI="https://github.com/anchore/grype/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# tests require a running docker
+RESTRICT="test"
+
+src_compile() {
+	ego build -o bin/grype -ldflags "
+		-extldflags '-static'
+		-X github.com/anchore/grype/internal/version.version=${PV}
+		-X github.com/anchore/grype/internal/version.syftVersion=${SYFT_VERSION}
+		-X github.com/anchore/grype/internal/version.gitCommit=${GIT_COMMIT}
+			-X github.com/anchore/grype/internal/version.buildDate=${BUILD_DATE}
+			-X github.com/anchore/grype/internal/version.gitDescription=v${PV}"
+}
+
+src_install() {
+	dobin bin/grype
+}
diff --git a/app-containers/syft/Manifest b/app-containers/syft/Manifest
index 8d08c74df108..7fb3be61838b 100644
--- a/app-containers/syft/Manifest
+++ b/app-containers/syft/Manifest
@@ -1,4 +1,5 @@
 DIST syft-0.52.0-deps.tar.xz 962322444 BLAKE2B 696dd14adf54c8ab51cc91d22028ce0ace3b6a5835fb8c3ce6d26080f0ce75d2a9ca332f2275a71706a2152519b01a71577827ac63c12ffb87ad1605ffd18b28 SHA512 b6897a12b8a15c8c2b4672e93ca03fe26a182ee87e48ac4bdd26057f544a6a45aa5ce6317a38e157b99a70830d4a0241f8b4cb15f8fffccaf195ac4c4ff64cd8
 DIST syft-0.52.0.tar.gz 3726656 BLAKE2B de8492adde3bef944a9b853990ba5909aa14ccc223f42833fa2a49d1bd5772455bd3ab9ac3a8886b353dc79c6e93338e43e9c448623bd31c422155e0adb1f276 SHA512 2ffaaa154546061d1d61bf8f0b3d5cf10282dbbb08876cc9e87777a23efdba1fd462c395ee4cf14d334f49ae4575e2db5fe8b5fbe7439dd24ff22ec8efeb6501
+EBUILD syft-0.52.0-r1.ebuild 1017 BLAKE2B a4b66cc02469d967489b9f61af5712ba7475e11e8109256af241b4606a6762a9680d29b0d206bd4398851fa9ae61a99a1fa7f93b5947fc6a9fb7f293dd96adb8 SHA512 d79f5db1f6d39a494545defe4ddd386de74f53234ad2dadbfd7ad0e2cf3faadb93cd0fea2b3aca18ae703fead219b57be3b89baf1e90e92e55992b5eb94f314f
 EBUILD syft-0.52.0.ebuild 531 BLAKE2B cc3863fc3db089b85095646c7de8eb1b8a74cbdd72e7e7eedd57e3082443ee2ac685a87094336530e23d9097fbb7ade8699fc54e98f0910c6a33bb1d935ef166 SHA512 c248c0cda550e2479736a22dd25777ce6cd11d97c4468db14a2b43f57e78c6780c957a0502e461af41b941c5056c947bc5026e7f2aa50420a7bffe82302c3356
 MISC metadata.xml 243 BLAKE2B 63665ae2020bc799fa6ebd6e1fca6755be6498803fdbc17cc630f9f4ffa03fbd46a9ad396e70adc3bc1c32b0a746fe4bab1c6291f32e68e636251207bca9e95c SHA512 78eab20831018fcf4957171a83aaaca9ced53380e01f083c07450c30fa1adfc02dd50ff2fa9f491dd62802f6e779264add1c47a09ade0a35cda558c1d5529ad0
diff --git a/app-containers/syft/syft-0.52.0-r1.ebuild b/app-containers/syft/syft-0.52.0-r1.ebuild
new file mode 100644
index 000000000000..78e4ff1e79aa
--- /dev/null
+++ b/app-containers/syft/syft-0.52.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+GIT_COMMIT=ba9adb17ebb510a2a3bd2b641738b1d9235e1f3e
+
+DESCRIPTION="Generate a Software Bill of Materials from container images and filesystems"
+HOMEPAGE="https://www.anchore.com"
+SRC_URI="https://github.com/anchore/syft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+# tests require a running docker daemon
+RESTRICT="test"
+
+src_compile() {
+	local BUILD_DATE
+	BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+	ego build -o bin/syft -ldflags "
+		-extldflags '-static'
+		-X github.com/anchore/syft/internal/version.version=${PV}
+		-X github.com/anchore/syft/internal/version.gitCommit=${GIT_COMMIT}
+			-X github.com/anchore/syft/internal/version.buildDate=${BUILD_DATE}
+			-X github.com/anchore/syft/internal/version.gitDescription=v${PV}
+		" ./cmd/syft
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 19bda578c488..1a46ff42a4e7 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 26a3ba1a626a..0eb036ae4cf2 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -4,9 +4,11 @@ DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7
 DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9
 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
 DIST vim-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8
+DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
 DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
 EBUILD gvim-8.2.4586.ebuild 10692 BLAKE2B 6cfe421fbb3cd2ea0132f8d1b2f6bcccdf575eb6527dc056c8a35549ed4bcdb06056188c383186d0a41bf375dab44cc35f9ee97f156b1ac4fa245a54c892a60f SHA512 6e134cdca1e03729cfc4400850ce8c74ad3bc9ccb08f8afaf48f7998fe238098993c6f18fe26e553d0930c4507e5ad6f3c52df1b17e580f24a7c59df698ca767
 EBUILD gvim-8.2.5066.ebuild 10752 BLAKE2B 03bffa111a79f704377ca932f852a887244f2d0177a159cafc03d77fc0c687e513555d0d88b041f27a8fafb612bdf54bdf7730b84f93d0f3e12f7b4a94091e8e SHA512 1b5185359767eb6a792fd68ebe3ab37ba7a9a681a19811259f0058078fd81e44a056ab23b1768d48a2a43ebd3438fa223e8505a682480ee98842824b1f60ba99
 EBUILD gvim-9.0.0049.ebuild 10603 BLAKE2B d49a0bf661f62bb0748bdcdca8491e93dfa0f5e860279109a693cad52c4e58145cf20d1156adfe975d45778a36bbbf9dc3cf636437ee662345efe835ee155742 SHA512 770deaed448b51e6c4a19cdfd9c07f2514fbaa23254cdcb3fbbb9d2c2eb5466ac117579f21d2cc362036c51af41e61ad28c93f962ecb3ef1c8c037f49ca0f6c2
-EBUILD gvim-9999.ebuild 9867 BLAKE2B b3f9c267d14a618e885ab4faeae537d5eacd8efc9a028d8d014456c2627b331782c19817602551d7955c519839526f055a1dc1055a095d99981828ba2ac3c69d SHA512 1279376e97d0cc36fb59c9ae2fc3a91f6a86d846772dc62ad5a9e7f4ac550854fadd5347098c32be8164f91eb5fdcd0bfe736b3543b9f5708d425a1848c9975d
+EBUILD gvim-9.0.0099.ebuild 9879 BLAKE2B 3458c0050993bdcc8f45161b51e09607da93fe58977f508608e94a050f9f5f32abaaf0ae9d678cea8828ca53e38df802a1feb0ab0bba66494c9cffa957969606 SHA512 b75b0b4c62cf08055e88e545f611ef0853d95fc0976ac951155bd1d8c61915ccf27e62f39ab3007e054960e5eb72a4c308cf8603d9894dde8a619fc658feb163
+EBUILD gvim-9999.ebuild 9879 BLAKE2B 3458c0050993bdcc8f45161b51e09607da93fe58977f508608e94a050f9f5f32abaaf0ae9d678cea8828ca53e38df802a1feb0ab0bba66494c9cffa957969606 SHA512 b75b0b4c62cf08055e88e545f611ef0853d95fc0976ac951155bd1d8c61915ccf27e62f39ab3007e054960e5eb72a4c308cf8603d9894dde8a619fc658feb163
 MISC metadata.xml 717 BLAKE2B dd4eae2fc90d0a00452dd91391acb2e15538a956af6a2a423427dd4835292fb17c43d805bb32d119d3743a00a524e2216befdc32831339241d7285871798e7f7 SHA512 b0cc1bae40d3cfb51bcab00ea245688d68410c17220a3f3c80793b6fb62abb007251c2ee2abd7612ed507462a3c77de48f3ceaf622a75c54436298fd43b7df10
diff --git a/app-editors/gvim/gvim-9.0.0099.ebuild b/app-editors/gvim/gvim-9.0.0099.ebuild
new file mode 100644
index 000000000000..bc764c8a6675
--- /dev/null
+++ b/app-editors/gvim/gvim-9.0.0099.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-editors/vim-core and app-editors/vim
+
+VIM_VERSION="9.0"
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+fi
+S="${WORKDIR}"/vim-${PV}
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="acl aqua crypt cscope debug lua motif netbeans nls perl python racket ruby selinux session sound tcl"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	aqua? ( !motif )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		motif? ( >=x11-libs/motif-2.3:0 )
+		!motif? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+	)
+	crypt? ( dev-libs/libsodium:= )
+	cscope? ( dev-util/cscope )
+	lua? (
+		${LUA_DEPS}
+		$(lua_gen_impl_dep 'deprecated' lua5-1)
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}"
+# configure runs the Lua interpreter
+BDEPEND="
+	sys-devel/autoconf
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	nls? ( sys-devel/gettext )
+"
+
+# various failures (bugs #630042 and #682320)
+RESTRICT="test"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches"
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	local myconf=(
+		--with-features=huge
+		--disable-gpm
+		--with-gnome=no
+		$(use_enable sound canberra)
+		$(use_enable acl)
+		$(use_enable crypt libsodium)
+		$(use_enable cscope)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python python3interp)
+		$(use_with python python3-command "${PYTHON}")
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	if use lua; then
+		myconf+=(
+			--enable-luainterp
+			$(use_with lua_single_target_luajit luajit)
+			--with-lua-prefix="${EPREFIX}/usr"
+		)
+	fi
+
+	# Default is gtk unless aqua or motif are enabled
+	echo ; echo
+	if use aqua; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use motif; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	else
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	ebegin "Calling eselect vi update"
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index aaab6e09d27d..bc764c8a6675 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 # Please bump with app-editors/vim-core and app-editors/vim
 
 VIM_VERSION="9.0"
-LUA_COMPAT=( lua5-1 luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
 
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index af44122e240f..3c08bfa4ef5c 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -2,6 +2,6 @@ AUX gentoo.nanorc 4206 BLAKE2B eacba1d5db1475aa53f177d9c04819ff2b81c5fa196365f65
 DIST nano-6.2.tar.gz 3146876 BLAKE2B be6dbc1f53890764184a701e97e792762600c892933830bfcb5c2c4eab19d659583fe797d7197c9045ea8912215aa5885a05f02c66194df17253d6788e0ba599 SHA512 5a59906664a88a03f215d8dba8f7e481fbaffc7bdf93c89ca997df7a8aba2cbb4d45ac84d11f03a796488b82b01ca75161a5ab49fd9115661575451b6ab018c4
 DIST nano-6.3.tar.xz 1581772 BLAKE2B 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92 SHA512 42279bee54f4d83a0dc06e93c2f385798c304a41e995461b018f5724010213761455563cb53e2411e12bc43c7245e289f4254c359717ca1b89a34d5af8b8c3f3
 EBUILD nano-6.2.ebuild 2349 BLAKE2B 53dc3860dd5366d797e3cae3943de67c960ebb626c932d91743897c67ba1bfd99280f9bf5ceb707cdc452b29cf15c2ec84dba2b38ee42297e655bd02d85954c4 SHA512 ab0772726974a97039bdd42bfc6d94b1b1e57f70b082e6bd8a37f88659d2382c031fc7cb8df7187ecbbb8a9129c0cf5f7aa5574c08bf6f16695ec49918eb5641
-EBUILD nano-6.3.ebuild 2637 BLAKE2B 203dfce89ffff6633fb50ff5e3eae1b733a77980b1234611c38c3639883162d47f9c5234b4b46df36d1ea5368345b5b9df3fd8bc4e048a569cc3adb7c28f9c74 SHA512 a697b3ba1a45331e6a4eef0caa3256a941bb604cd3aea7571b652f8bda45c6e320a3c602d3eb75ff1683a5e8727d0393a2826101e9d8f580d55393eea52a3855
+EBUILD nano-6.3.ebuild 2636 BLAKE2B 79f9097ec7bb0052b66c476767c7d1e5ccfdd96f4c8b5ff539b7a1d65f7f171b88c124c88e31ed99ce1f39742ec1cec34e1e254d2541faec5fbef6ed8a173c39 SHA512 8ab371ea08c4afce84d74962a61bdb62e30cb5a1a1db049e6a9493b9b8fde6dce6d67424938f335654af7b997f0c239a61b69aa93fa55382599d6c9eac4915f7
 EBUILD nano-9999.ebuild 2637 BLAKE2B b9f2db1e3fc8556067f5bf400fa25cbb590346a82522f62e885a0828b3829cc81be2ab8267cce53c9cbd046b092be31bfbb5840bcc0566ecfed8e12231b50eca SHA512 9787aca7f721fd1e08addf7ce8105217433346912e195009e9fabfdb958206e785de7705675df7cd3b4b959c697c22162b390f535e2e86591547138faaf4b9b6
 MISC metadata.xml 1666 BLAKE2B ee53e5f23c192741ff6d59594105a9365fa8fddff9547dc7bbc14fe967d49c0d294bb56fa2e6d0c40d53dc64e8a031fea3294e62ca6ea2fc31dd028b00a423ee SHA512 58691db7bb106774da8b59db6afb199e2c61444a6feedbef09a22d6fef184512102f1fa4d7cfe7edf9171f3e7a542fac294eacc5eb1a3cb7de724b986b6884a0
diff --git a/app-editors/nano/nano-6.3.ebuild b/app-editors/nano/nano-6.3.ebuild
index 7be16d4c4e5f..2c97dc70df95 100644
--- a/app-editors/nano/nano-6.3.ebuild
+++ b/app-editors/nano/nano-6.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 9cc4940b2027..815e33903e1a 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -6,9 +6,11 @@ DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294
 DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623d3440a4f65d851830cab8b5d938feab79fb37ec31ef6609931c44cc7245cdccb11e45c3e8536afd23ac43ed4af08f33f248ad SHA512 7ed4fe7e8e1236e6b37543797205817266f5c9c482e25b877a522910ec8e2e6a5235502d062c32b6fa95e508ef84f127af7831d4ed2b1544453f2cf7b560da18
 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
 DIST vim-core-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8
+DIST vim-core-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
 DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
 EBUILD vim-core-8.2.4586-r1.ebuild 6932 BLAKE2B c68dabf5622f757054b43501f5f01610a237736fb29d26c65f79e2e2edbb45e08651114c2f1563ac91e80d26edded1d33e139dfb9b31dca5a5550d8b14bb391b SHA512 ec8ec83e16c023db06a0f8e33e4cda656c10da8c475fc316f175c18dc26d70066e74e1e9dc9ed7ca68112ee6e82c7c3acdccbe50e7287cbcf23aa1ad1c410d67
 EBUILD vim-core-8.2.5066-r3.ebuild 7002 BLAKE2B 853cfa96f312cbabb2513f4dece34987af22d6ddcea6a41f47aa5ee37798dfd6c00dc97d26dc5729ee546dff2b287081ee885cfa6aa556f6c20962dfb4196210 SHA512 f21c04836f1664602c529c84507d24776b833baff0c224abf237b7a1505424a2ebf2d23dcd7cf56a4534204df85dd058271f0c2d0e89d6f3be0e83cb1c3a5b52
 EBUILD vim-core-9.0.0049-r2.ebuild 6925 BLAKE2B 9ee6fba158dae1b52f3bd7a2194bb94b857efb0b88f60e95a96befcb294f2da0349a6719329373e6228dd4617f9cd2ec72ede6e58e567cda47f0b58ecc5f4125 SHA512 75168e6af0527045d763db29df0b034c6abe1006f7f2a1ceb6242c531eca467870ee416a84d9c72d492ee8249a6ed19633d6a893d153e1b99c59df2f24062562
+EBUILD vim-core-9.0.0099.ebuild 6925 BLAKE2B 9ee6fba158dae1b52f3bd7a2194bb94b857efb0b88f60e95a96befcb294f2da0349a6719329373e6228dd4617f9cd2ec72ede6e58e567cda47f0b58ecc5f4125 SHA512 75168e6af0527045d763db29df0b034c6abe1006f7f2a1ceb6242c531eca467870ee416a84d9c72d492ee8249a6ed19633d6a893d153e1b99c59df2f24062562
 EBUILD vim-core-9999.ebuild 6925 BLAKE2B 9ee6fba158dae1b52f3bd7a2194bb94b857efb0b88f60e95a96befcb294f2da0349a6719329373e6228dd4617f9cd2ec72ede6e58e567cda47f0b58ecc5f4125 SHA512 75168e6af0527045d763db29df0b034c6abe1006f7f2a1ceb6242c531eca467870ee416a84d9c72d492ee8249a6ed19633d6a893d153e1b99c59df2f24062562
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7
diff --git a/app-editors/vim-core/vim-core-9.0.0099.ebuild b/app-editors/vim-core/vim-core-9.0.0099.ebuild
new file mode 100644
index 000000000000..17a02fa52a3c
--- /dev/null
+++ b/app-editors/vim-core/vim-core-9.0.0099.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-editors/vim and app-editors/gvim
+
+VIM_VERSION="9.0"
+inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+S="${WORKDIR}/vim-${PV}"
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="nls acl minimal"
+
+# ncurses is only needed by ./configure, so no subslot operator required
+DEPEND=">=sys-libs/ncurses-5.2-r2:0"
+BDEPEND="sys-devel/autoconf"
+# Avoid icon file collision, bug #673880
+RDEPEND="!<app-editors/vim-8.2.4328-r1"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug #82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches"
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i \
+		-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "sed failed"
+
+	# See bug #77841. We remove this file after the tarball extraction.
+	rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug #29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug #43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+		echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	# Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug #18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+
+	# Remove src/auto/configure file.
+	rm -v src/auto/configure || die "rm configure failed"
+
+	eapply_user
+}
+
+src_configure() {
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite ${file}
+		fi
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	local myconf=(
+		--with-modified-by=Gentoo-${PVR}
+		--enable-gui=no
+		--without-x
+		--disable-darwin
+		--disable-perlinterp
+		--disable-pythoninterp
+		--disable-rubyinterp
+		--disable-gpm
+		--disable-selinux
+		$(use_enable nls)
+		$(use_enable acl)
+	)
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -j1 -C src auto/osdef.h objects
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	emake -C src \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r6 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die
+		rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die
+		rm -v "${ED}"/usr/bin/vimtutor || die
+
+		for f in "${ED}${vimfiles}"/colors/*.vim; do
+			if [[ ${f} != */@(default).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+
+		for f in "${ED}${vimfiles}"/syntax/*.vim; do
+			if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then
+				printf '%s\0' "${f}"
+			fi
+		done | xargs -0 rm -f || die
+	fi
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# install gvim icon since both vim/gvim desktop files reference it
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update icon cache
+	xdg_icon_cache_update
+}
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index d1fa5bc5644c..967605992dad 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -4,9 +4,11 @@ DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294
 DIST vim-8.2.5066-gentoo-patches.tar.xz 2628 BLAKE2B 637a4076f82b858ce61cbb46623d3440a4f65d851830cab8b5d938feab79fb37ec31ef6609931c44cc7245cdccb11e45c3e8536afd23ac43ed4af08f33f248ad SHA512 7ed4fe7e8e1236e6b37543797205817266f5c9c482e25b877a522910ec8e2e6a5235502d062c32b6fa95e508ef84f127af7831d4ed2b1544453f2cf7b560da18
 DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e
 DIST vim-9.0.0049.tar.gz 16703106 BLAKE2B 728bbb0091a4cc13bad4109b92b0a468b707fd3279c3050834b3a0bc933fee5b906ee4ec03a082ea1eb043d399c22a9017c71c787200dc87c3d350296e0d6f67 SHA512 e3c86e49da482d9e9e5eb84102d5b3fed0354b1b03f46128a51d66d0889652b87036dcd32a9a348e8937091bd77c899b568003624299b91a621614e06c082ee8
+DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498
 DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942
 EBUILD vim-8.2.4586.ebuild 10091 BLAKE2B 9073b2cdbd5e910154e4f5ecf845d46b10407e1b363a05d98dd0e688071abfe5d67209efece7997f48197de5951f8a1369ca3b424cb44d69a1d532ff7167ee2b SHA512 3907db9b383f43378ce0c87c8abcbf64aa64212462be5873595a796a562af34e8875a5f38b9bc55363c94d0a9eae9ed9f58f386062ab2a73e1fa7dcee5479478
 EBUILD vim-8.2.5066-r1.ebuild 10420 BLAKE2B 04e5471f93e5883fb3d6a4177b1a09937ce247bf227c71f0056d912554aa64676e66e86aee044cd2f31c90b0544b1033988e159811b3188a41a05537084878f3 SHA512 78aaecc2b156e8fbe304a3d3af5bcbf4b5d8806b199d12221bf2203035cfbdb0d2c497f9c28ea7d2f5100c58f2d5e205c1bd2990aa4aeee955ba662d6c80f07e
 EBUILD vim-9.0.0049.ebuild 10353 BLAKE2B 2a17dd40451b1da566d846146f870e4890d031127dac21778a808fe5767f47e5dcbe3c2262125aeb31e88347f214e1d5f695bc76fa94a6863d3d6bd3ae385626 SHA512 e5941d993cb16375b2f5a4879fe3019345922b14a53ad3ae6b27b000eb5f03113a5c538c3c61a31e88fae1bfbc2e8f97fb5c197ae176607364c13c9ead092bf8
-EBUILD vim-9999.ebuild 10353 BLAKE2B 2a17dd40451b1da566d846146f870e4890d031127dac21778a808fe5767f47e5dcbe3c2262125aeb31e88347f214e1d5f695bc76fa94a6863d3d6bd3ae385626 SHA512 e5941d993cb16375b2f5a4879fe3019345922b14a53ad3ae6b27b000eb5f03113a5c538c3c61a31e88fae1bfbc2e8f97fb5c197ae176607364c13c9ead092bf8
+EBUILD vim-9.0.0099.ebuild 10365 BLAKE2B 350338f1399c303991a8f38acebb576a949cac4b75df99cc4a94e9045dc09778cdc5aa241c3e95f826604bc27f03c86f643e75db118d4164af302bd19cb8b618 SHA512 795464190b0e861877f92a93e44fbf649279c96a261330293a0569dbaf544bf1ff03054369c89612529223497d381cf84cdec00bb15bb4f33adf8159ee3b879f
+EBUILD vim-9999.ebuild 10365 BLAKE2B 350338f1399c303991a8f38acebb576a949cac4b75df99cc4a94e9045dc09778cdc5aa241c3e95f826604bc27f03c86f643e75db118d4164af302bd19cb8b618 SHA512 795464190b0e861877f92a93e44fbf649279c96a261330293a0569dbaf544bf1ff03054369c89612529223497d381cf84cdec00bb15bb4f33adf8159ee3b879f
 MISC metadata.xml 891 BLAKE2B 00a55660fecbeca3df9b50e7400510fb92bbcdd42ba588725580c153d74a4731b31dd0ebaade4f60a4db88c695a7f60663773d63046c1b38aab0363520b8858d SHA512 76eebfe4d34eb609b29946b724ae450916eeab2573edf0f5aa87325f1e9abc8a2ca45d7abe3bfa9d996670d90e7cde17cb84662f69502a4b4a5b44b14b4c8890
diff --git a/app-editors/vim/vim-9.0.0099.ebuild b/app-editors/vim/vim-9.0.0099.ebuild
new file mode 100644
index 000000000000..8ed0739b5988
--- /dev/null
+++ b/app-editors/vim/vim-9.0.0099.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with app-editors/vim-core and app-editors/gvim
+
+VIM_VERSION="9.0"
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+LICENSE="vim"
+SLOT="0"
+IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	vim-pager? ( !minimal )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	crypt? ( dev-libs/libsodium:= )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? ( ${LUA_DEPS}
+		$(lua_gen_impl_dep 'deprecated' lua5-1)
+	)
+	~app-editors/vim-core-${PV}
+	!<app-editors/vim-core-8.2.4328-r1
+	vim-pager? ( app-editors/vim-core[-minimal] )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}"
+# configure runs the Lua interpreter
+BDEPEND="
+	sys-devel/autoconf
+	lua? ( ${LUA_DEPS} )
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug #82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches"
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+		>> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug #29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug #43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+		echo >> "$c" || die "echo failed"
+	done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager; then
+		cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			_EOF_
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die "sed failed"
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm src/auto/configure || die "rm failed"
+
+	eapply_user
+}
+
+src_configure() {
+
+	# Fix bug #37354: Disallow -funroll-all-loops on amd64
+	# Bug #57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug #24447). The hvc
+	# things are for ppc64, see bug #86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e "${file}" ]]; then
+			addwrite ${file}
+		fi
+	done
+
+	local myconf=()
+	if use minimal; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-canberra
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			$(use_enable sound canberra)
+			$(use_enable acl)
+			$(use_enable crypt libsodium)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python python3interp)
+			$(use_with python python3-command "${PYTHON}")
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope; then
+			sed -i -e \
+				'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
+		fi
+
+		if use lua; then
+			myconf+=(
+				--enable-luainterp
+				$(use_with lua_single_target_luajit luajit)
+				--with-lua-prefix="${EPREFIX}/usr"
+			)
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Arch and opensuse seem to do this and at this point, I'm willing
+	# to try anything to avoid random test hangs!
+	export TERM=xterm
+
+	# See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
+	# for more information on test variables we can use.
+	# Note that certain variables need vim-compatible regex (not PCRE), see e.g.
+	# http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
+	#
+	# Skipped tests:
+	# - Test_expand_star_star
+	# Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
+	# - Test_exrc
+	# Looks in wrong location? (bug #742710)
+	# - Test_job_tty_in_out
+	# Fragile and depends on TERM(?)
+	# - Test_spelldump_bang
+	# Hangs.
+	# - Test_fuzzy_completion_env
+	# Too sensitive to leaked environment variables.
+	# - Test_term_mouse_multiple_clicks_to_select_mode
+	# Hangs.
+	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\)'
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug #187449)
+eselect_vi_update() {
+	ebegin "Calling eselect vi update"
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	if ! use minimal ; then
+		dosym vim /usr/bin/vimdiff
+	fi
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	domenu runtime/vim.desktop
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Call eselect vi update
+	eselect_vi_update
+
+	# update desktop file mime cache
+	xdg_desktop_database_update
+}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 38aa4796d06e..8ed0739b5988 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 # Please bump with app-editors/vim-core and app-editors/gvim
 
 VIM_VERSION="9.0"
-LUA_COMPAT=( lua5-1 luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 0acba23351f4..19524c895b53 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 5fc48541de9a..ed986a5f22b9 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,3 +1,3 @@
 DIST vice-3.6.1.tar.gz 11454300 BLAKE2B 129171380f3bd23d579dc29a96419446169cf9a98d2fec82951fa192914846053d213a19b395c9ca30596859cce35bcfea0de0c0a7461c45cb38511a546ca4b2 SHA512 9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7
-EBUILD vice-3.6.1-r1.ebuild 4598 BLAKE2B b06b16df840034a03f4984c9b28611bc05efc035869ececa2aa0a53feeda5f23f37521137f0b966f31ccb295ac9dd2d208d7c98627f8f5d63902fb1654da4552 SHA512 3504dfa08454f2b8853406c84ff8af4b822bbb692551ce3b6dee1f5290f503407288f2977ee2629d9cc852fe371672e00292716fa8c79b17b721dd02da80577b
+EBUILD vice-3.6.1-r1.ebuild 4605 BLAKE2B fd8fe6d165d54ea2fc204c0b0129daaad0c9a5caa110ecf872ffc75743f00f866a6c088eefb62448585c8bf321dc4c8ff8d5292aeaa4d0662dd60b2b3ac5a247 SHA512 0623c65e1aa13fb0f6608dc683f4c4ced83e9e43db64ce344d3f8bac9111424038d8fc14569de6b14abe05763b56aba8014affb7c46e09325ddfb4123bfd71b7
 MISC metadata.xml 785 BLAKE2B 1dc59c7b40fda968680e97b1ad83e741faf223143bbc1ab2d523e37312badd3a3aaedc3bbffbd158531c74ae73dab1bb1ee03666a081eb17d819dc9e0b783ee2 SHA512 b483d325702723d1395bca771d215709fc68b6ca8309c4297c6a668d5940502c9c8d5d4149e1f52b8fd6d5062cf04b2e3d7046ecfc0555d2703b064e329af283
diff --git a/app-emulation/vice/vice-3.6.1-r1.ebuild b/app-emulation/vice/vice-3.6.1-r1.ebuild
index 3c1ee81f612c..062c915c58a2 100644
--- a/app-emulation/vice/vice-3.6.1-r1.ebuild
+++ b/app-emulation/vice/vice-3.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="
 	alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg
 	lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl zlib"
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 40cccb7c7313..d7b270386127 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/xa/Manifest b/dev-embedded/xa/Manifest
index 2c8dc94a23b9..ccf464990535 100644
--- a/dev-embedded/xa/Manifest
+++ b/dev-embedded/xa/Manifest
@@ -1,4 +1,4 @@
 AUX xa-2.3.10-Makefile.patch 1840 BLAKE2B 1d8b4d7ed1ed97991dd611f77ff8daf6bb404e2892e271404d9b4b02e475b863e8ad3c45c79d07f5bbb9e69c19fd64f4b895a1868444729137ae97837e698b73 SHA512 b16462153b12604c6e3d8fba54e3d1fe19b5d907bed4141319d863d497582fe46fddfa15b0ab1c697ea4536e6fa3e5f86b68266a3b8da2c7d43f9577a10036e7
 DIST xa-2.3.13.tar.gz 155606 BLAKE2B 8196f8f88bee29dbab9ad026c0d4e3519159c4ed7579dc7db391c0bdd7b1bfe31e2884644258d863e299ac3b5fcc43718b3d95b9b7d7802541a9d58366728ffe SHA512 b8a4c1856e51bbe212b98be06895987d6fb926a229511a67ea90a934da1fcc84daf29bd289c3c4c2254d2bce345333bb92747947f3286376761613b2e181e99b
-EBUILD xa-2.3.13.ebuild 558 BLAKE2B 0d744811be2358e430b40ec04ee766c8a531b417bd7691026286d05f6cec9f715baea2aa60056e73d10a88cabc567136a204540ebf97482a44b933e0ce93b720 SHA512 5f499f12b24f67baf9db24f19ff2fdac2e0c4bd3455974530c1438f1a96c05ace39a82d08eab8ca43d887ac1d2b4b5baf4c607e6b992cf68f1879a54d6706bca
+EBUILD xa-2.3.13.ebuild 565 BLAKE2B 696b9b1a0b3db25f556735a01fd7a4e8c8da3dce11e8e73b735f7b1131ec97cd7f06fff5f9bbebf8551c80986195319e6d00f9e5211ff6e82a1870a508fff9b1 SHA512 5b6ddac46427087ff233ff9512909e720a589ded5762609ffd03ef119f493b8a246ae17679a8143f8638c370620c1ebf3a6a41320649e45858321c1196e37b54
 MISC metadata.xml 548 BLAKE2B 3acb4c1e9192f25578d0e57f4527c1fd9af3738f48978cd5af39e9728336a23576f19e48568028c47b9db1394539280553590bcd29c206d11ab4acba50c5dbda SHA512 6b1274a1ee5456a5e2cdee2e1bfd34777b66d5178034b11f314549640c3085d069d96e71da9d476c03977540b6a08f8acb034b8df938b8caac1005eee4d2066d
diff --git a/dev-embedded/xa/xa-2.3.13.ebuild b/dev-embedded/xa/xa-2.3.13.ebuild
index 9c13b9dcae29..8ae78aaa630a 100644
--- a/dev-embedded/xa/xa-2.3.13.ebuild
+++ b/dev-embedded/xa/xa-2.3.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.floodgap.com/retrotech/xa/dists/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.10-Makefile.patch
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 7ca82c8ccba8..c536b4122720 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-licenses/Manifest b/dev-go/go-licenses/Manifest
index d81c6833f8f4..5df49bcf3971 100644
--- a/dev-go/go-licenses/Manifest
+++ b/dev-go/go-licenses/Manifest
@@ -1,4 +1,4 @@
 DIST go-licenses-1.2.1-deps.tar.xz 189083960 BLAKE2B 1cc2389ff0387ac0a27f186ee23d5b07b70caf532cb0ca1146200208ccd2d939c82a2067580580838922fd4e7c98f44b2eb073265668f4058d7517e3f2b003fc SHA512 139d79942e6a51afc0733bec916bae8119847652c2bdbae10e8680d1d06d3e031a1c9ad0480d3300b62c077579b60d0006739c40957ba8471fd58833f635f59d
 DIST go-licenses-1.2.1.tar.gz 163397 BLAKE2B bd254635e58a9734112cc8939b58d2cc7f5c085ef1bc12200e706c8bf0708b6c512ce0d883254b074b7956c3a317e7010e8ae76a08cc5fea878c3fc43fbdb8cc SHA512 af0040002bbb0e84c78f7454b49795e472d64aba9501baa5f9ad7b9e00e39003c8b7617ba81a660ef734acfed2244516fc20d2165ea340d8782c440f256401fe
 EBUILD go-licenses-1.2.1.ebuild 955 BLAKE2B 89fba3ba65c5df08301046191f2b6ab5ecf3924c22a1d927c8eefeebf3bb6be98387c0801a4d94f0683422d2861507eac0106261a2210ad0fea3e7c1f82283e0 SHA512 1061dbb777bd1b92f65b2dcc84ac88e9176da14c99b4ee2f125d1efda1233a8212674e9568ca4b59417754805a2088785c1d25ad4cb5e7565a80bca8a71644f8
-MISC metadata.xml 622 BLAKE2B 914943e38c9b27d7f0ae4f0bd8449e061e0459c72aceeb7f8c267c84ef2e351a34b1ebd8b523fba405e7760be139d4745010edb2d702eff09a131b83ef064fbb SHA512 158a5705dca714a06710bd6b0fac7a279576c8309a893ebc5bdca7b5bbdfd30311bd419e78aad2648621365b44e9e40618e278a818cad8d073b8c1d91c0b58e4
+MISC metadata.xml 708 BLAKE2B 070eb2cce158edccc2446fb084b569b543d68eaaf3ee54b3b4e1693db4147b1003f64783104f8907faa18f87d9a17bab8c046e41a614aa1eb59ae7038ae0490a SHA512 337220d503cdf276acc7547fab38876a7606336e88e2b8b52fe4b03a1b06d2547b6dfd11706581a4d5f46a2dc65119596b380e915888d4d47375973444c98843
diff --git a/dev-go/go-licenses/metadata.xml b/dev-go/go-licenses/metadata.xml
index 3c3482cc57a7..52a2c32fceba 100644
--- a/dev-go/go-licenses/metadata.xml
+++ b/dev-go/go-licenses/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>williamh@gentoo.org</email>
+    <name>William Hubbs</name>
+  </maintainer>
   <longdescription>
     go-licenses analyzes the dependency tree of a Go package/binary.
     It can output a report on the libraries used and under what license they can be used.
diff --git a/dev-go/licenseclassifier/Manifest b/dev-go/licenseclassifier/Manifest
index e453670773c4..6873a6e894ad 100644
--- a/dev-go/licenseclassifier/Manifest
+++ b/dev-go/licenseclassifier/Manifest
@@ -12,4 +12,4 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e
 DIST licenseclassifier-0_pre20200402.tar.gz 6703094 BLAKE2B c68dc92e593aeb71b1a3ae0a938d659ecb72a870025ac900587e62b1f9923e6e6b9356efc3ff7bd7b085ce01fc0c65f51ee7d0aec683cc2605d56a5da075021e SHA512 e376be738bbbc9e6d3df495c9967ab198836c6ac80d1c658a4ff44a261e495b0bc0aca0b559477f80b6f433a6867c7ec6b1937d76133bd1fef0a3e9b15c8173b
 EBUILD licenseclassifier-0_pre20200402.ebuild 2067 BLAKE2B 7c4a626b69ca45d9e304ea703fcdfb8ae15fe8f6ab9c501496278dce93574b2f2b0486dd5c85db261725c628fa255a43d224f570e85fa9ee7dd4c3affc2357bc SHA512 90dfc54d14dc1fc57cdda058b1f74251bdf5929a79c55b85274c5ea920ac08eb660d893e3d49ed25a9799e9409c35a9872c9f71b52bb1fecf7085f2bf922da49
 EBUILD licenseclassifier-9999.ebuild 2068 BLAKE2B 7de81cfc8973b91137d9444c741713b0c405b173e4ba4669da5f3cc8ac606d5d007e0138730b4c9b2c0290fb6e94dcf667090b31adba9bbc7ce386635d65a660 SHA512 7f2aa68df63203402553d9bf91b4206b1ccdf80be392daa7b88019bcf92eae87e154aecd98f456ff6e097542e6600c2994c1dfd229d6c9fabfceb6eb452ac1c1
-MISC metadata.xml 677 BLAKE2B 84d5fe5a43cc84bb97a211a00ebf3e90ec4b11e0baf9a491c519f3395949814b58c480bcb7f271d078e0dc407fa41217907c28dcd46f22dc1a5dbca1e2837e9a SHA512 524b265d33145c978ee6c4c62474ec56b80a216d16ea3c54dff4b82a9a48dc2821d90a0f914af0e040be15644802d03871fc57ba65ca2dd4a21bf6edeeb13a5c
+MISC metadata.xml 763 BLAKE2B 391b1514b71ddc924e94973ab8606d00d3d409f2e12fd9fb135146987c174df0e600d78c6d27513fac2e998ba11ab0be7065592561748072cdb1fbdc58305233 SHA512 c1ce0add80b4b5b4a2bb7eff10cd1ef5219cfe4076be3cbc8161025483ea0b140a54fdbde1c0fd26f2add2a6dfe7a067fe570dbc2182d1ad5b4efbca761c332a
diff --git a/dev-go/licenseclassifier/metadata.xml b/dev-go/licenseclassifier/metadata.xml
index 3ecd94373bce..20353e0ab93d 100644
--- a/dev-go/licenseclassifier/metadata.xml
+++ b/dev-go/licenseclassifier/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>williamh@gentoo.org</email>
+    <name>William Hubbs</name>
+  </maintainer>
   <longdescription>
     The license classifier is a library and set of tools that can analyze text
     to determine what type of license it contains. It searches for license texts
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index db61702bfc64..719cbb796f8f 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 7a12c42ca10b..be638da14562 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -142,9 +142,9 @@ DIST rustc-1.62.0-src.tar.xz 135644992 BLAKE2B f9133310dc951361588bdc0b631c7fc9e
 DIST rustc-1.62.0-src.tar.xz.asc 801 BLAKE2B 1d9a6fcafdfc2f46b098403e36e401cc6b3834d4f7fffaa82f20a332f8843a0af10c814c3f585c6e062fd5e9fab3d231ab03cc0caa449acd1c8a9eea077c1932 SHA512 646a895d19847ab0cc1d2f85ce1643625a1785acda31d37ed9776257f8e4625b65e16e4b9f3210e816d4516633d963a0d7b520e35582366ee75059dcb2f1313f
 DIST rustc-1.62.1-src.tar.xz 135644156 BLAKE2B ff8428362153770c57d53cb7eef07b75944d47ec747d9c337cc7ba9f38dfd749415c9a00acf9d9d8743874ba1c51da7915315bd25e011eeb8a2aaa8812773850 SHA512 6f7fa855acdf20525e907a6fc8c7aa8b206603e3bcbd532d3bdce165380f0019f45dba2b2b06d20b541381accf67ca0d256fbddfcb1642a2e60e1237807d5410
 DIST rustc-1.62.1-src.tar.xz.asc 801 BLAKE2B dd0e917f8b587eb8318a9c820df5ee9a052f14e7dea05d8afcb3cf687fa2e362e6d2f4d20fa94a19bdf97227c9ef29548a6e267ffd9113bfdc36cc42f341d8b8 SHA512 698bfd419c218a6cccce04869279708cf6084adc464a64d7dd1c981c0577249cd06b4de132634085c792c838aa1e1beaa11a5a06ea0e5f4c1a6f4e28afe65a3c
-EBUILD rust-1.59.0.ebuild 21153 BLAKE2B 0c8da01c7b944faf9bda62d5033421284c0e3c58fe04d55a2f815cd11bf820c8a72e201c9f49f0e373e94f2e406d31cfd83208b8bdc5f194605e53bb0e5f8eac SHA512 d0ef5b70612856a9b8eb4baccbb90cd242d8892b26133a680ff5a1d700fa1a352ac244e27224334fe597dfe2bd821a26d5143372f796e9a1a07460e9b8352729
-EBUILD rust-1.60.0.ebuild 21376 BLAKE2B 406bac0d9acf6ffe0666fa319d0cfd9238c0f09400853e88b8ce9ba609962ea48e2c3f93174886b1b03786db25d122edd488c0f898c9304e4e85acecf4d6674c SHA512 8e2dcbb727399e6298c007c0a31d636fb27c8afce01ee1e9191bb0ed7e29d73646eea3b6e7a994f71891fa4bae32c0d6b509bfba6dfb818f11697101d2dce21d
-EBUILD rust-1.61.0-r2.ebuild 22299 BLAKE2B 28fb0eda506e8a0c92c0e111ac92c0b70d1cf6cc632457f80618f07b803f00bdfc2b63d74f08113e3f70fbf3f9929c3e887662585f78c733549a49e4f5656621 SHA512 4bcb94dd2e7094762d087f02b765664d5b086f1425c3140a92bc698e0cc335636748836397c7ee35f0366544a83b52c66460979ec727534c0d853f98a1c24c61
-EBUILD rust-1.62.0.ebuild 22169 BLAKE2B 1312a6c142db66a6813ab74ae7dce0eae8d6c70b4addc8de7277f7164122a002dae94ea6e7ba8d4f4ce1de6e158081b4773382e1f426b6f6f65917093c43399e SHA512 c0fbd201cea468da83d63f6d8d72b38ad11d1428269ebf1913a487d096497ce38bdc781077549d4f48afa4f8ea18410b7a2f4d78640c76e2502936b8fce79bc1
-EBUILD rust-1.62.1.ebuild 22164 BLAKE2B 7325a3527f63691d5ef164abb962d0e2b59c342063f1b1ee6b09d007d590089c90a4344ba19e3e86234917e07aa9a338b03da99126737574b4ce66a2581e66ab SHA512 ab9ed3d9f7679c996513c9923ce98bebcf818575461138bb03bd60ac5eaf124ed1a20535b6a2ea398e8234c3a2b1679b999abd985c774e18d131253916c7c64a
+EBUILD rust-1.59.0.ebuild 21229 BLAKE2B 3815eb3dc1c30d776b1a5715759d44f62c92a5d1bc1f37772c5061b99b882ef13962805d2b7685e828b106bd6027dadf5fe03d81b70469c5ecf87217fed6086f SHA512 1e8e14d9d9352b5b4a84ef1622903786265f185a0664d8906b6174561f2113799436882e152adc4dc6e3507c8d68952f1381affa0a71559cc7e571c5cfd2a0ce
+EBUILD rust-1.60.0.ebuild 21452 BLAKE2B 82752fda269d87718a5c51f22b2dd6be41665152d07da8ae4c4ae5663ede1646ce90c836dbe2bde17f8981ecb6a0ad56d71cfe986a6e460e8c889d0aca7b6d3f SHA512 c94037ab2e4d2ff396b1676d1ac63f2038ff3ee8849339cffd9d2c24586761c717e2148fce769e4006a29f8c57b8dbf6c9f021acffadae02361af3fe10305ed3
+EBUILD rust-1.61.0-r2.ebuild 22375 BLAKE2B 6662f32074219bff329268ce638d622bb982f9c04558180fd1fcaf97f6a9bf1bc526b64fbf3ed85c803fe10dc7e642b4a558c5f4f962b854bffd4018eba6f031 SHA512 510ffc53ad8d5d5fd41377cc0d66459a267537d9402d4a8747d80168a49550db66039170582f1f91a8a3b02a09b11d6cd6e814d21bc82dd139a13a78254378ab
+EBUILD rust-1.62.0.ebuild 22245 BLAKE2B 569dfa03db6a73f66162ced3171af6a49a36c56fbf3100fd1c42825a565275c69fba473f831daf293061bf9b7a10723d4f94e2b8a5800ff683154e37e221faa3 SHA512 7d9e9847594e8da16cac61a6129782c37e6362ecb0ee7886728ddb33318ce6afb32575fdd3c0ef201d90c577d46ed2ba3dd5ce1003cd20ff744e33a05167b826
+EBUILD rust-1.62.1.ebuild 22240 BLAKE2B ec15f9caa82ab7217b2dbd89a4cd5a296e6ac8b5ef029b0832e095d351dd9e5c98930d6bc03fd468846c224e4503ff980fda48deaa39a29f4e95613415fc6380 SHA512 6380cb43cd71256da9b0a2728fc2c212d1fe2ea75eee10f8ef495815476b21c8a0ba5cf65da43ef5a19684b3ffef4e3340b1f978662b4ee3dc5c640452e5c1a0
 MISC metadata.xml 1665 BLAKE2B 190ef3c0b543d0d865c63c6c9776fa456c7a2d27a6f9072be9f3be7f127c955df6c7542e1d7a4c4504c582130f6001dc8cbe3e613769bf150fe30c706ea90a6c SHA512 2fc6289f8eb882e24bfeac71ec7a29d567c814703cc20366393791ab5123b6460be0855f7351b2c28738d3724e47137ec80597738a1a8e86a20a979cc46f1baf
diff --git a/dev-lang/rust/rust-1.59.0.ebuild b/dev-lang/rust/rust-1.59.0.ebuild
index b4e6eebe900f..c3dfac4c574d 100644
--- a/dev-lang/rust/rust-1.59.0.ebuild
+++ b/dev-lang/rust/rust-1.59.0.ebuild
@@ -258,6 +258,8 @@ src_prepare() {
 }
 
 src_configure() {
+	use system-llvm && filter-flags '-flto*' # https://bugs.gentoo.org/862109
+
 	local rust_target="" rust_targets="" arch_cflags
 
 	# Collect rust target names to compile standard libs for all ABIs.
diff --git a/dev-lang/rust/rust-1.60.0.ebuild b/dev-lang/rust/rust-1.60.0.ebuild
index 0b2ab02a8e65..1dda442d1071 100644
--- a/dev-lang/rust/rust-1.60.0.ebuild
+++ b/dev-lang/rust/rust-1.60.0.ebuild
@@ -256,6 +256,8 @@ src_prepare() {
 }
 
 src_configure() {
+	use system-llvm && filter-flags '-flto*' # https://bugs.gentoo.org/862109
+
 	local rust_target="" rust_targets="" arch_cflags
 
 	# Collect rust target names to compile standard libs for all ABIs.
diff --git a/dev-lang/rust/rust-1.61.0-r2.ebuild b/dev-lang/rust/rust-1.61.0-r2.ebuild
index 57d88e14bea0..263edc8ca004 100644
--- a/dev-lang/rust/rust-1.61.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.61.0-r2.ebuild
@@ -259,6 +259,8 @@ src_prepare() {
 }
 
 src_configure() {
+	use system-llvm && filter-flags '-flto*' # https://bugs.gentoo.org/862109
+
 	local rust_target="" rust_targets="" arch_cflags use_libcxx="false"
 
 	# Collect rust target names to compile standard libs for all ABIs.
diff --git a/dev-lang/rust/rust-1.62.0.ebuild b/dev-lang/rust/rust-1.62.0.ebuild
index 4b8fdf357c6e..8da92fd3854b 100644
--- a/dev-lang/rust/rust-1.62.0.ebuild
+++ b/dev-lang/rust/rust-1.62.0.ebuild
@@ -256,6 +256,8 @@ src_prepare() {
 }
 
 src_configure() {
+	use system-llvm && filter-flags '-flto*' # https://bugs.gentoo.org/862109
+
 	local rust_target="" rust_targets="" arch_cflags use_libcxx="false"
 
 	# Collect rust target names to compile standard libs for all ABIs.
diff --git a/dev-lang/rust/rust-1.62.1.ebuild b/dev-lang/rust/rust-1.62.1.ebuild
index 5775cd6e8835..35015cb50b61 100644
--- a/dev-lang/rust/rust-1.62.1.ebuild
+++ b/dev-lang/rust/rust-1.62.1.ebuild
@@ -256,6 +256,8 @@ src_prepare() {
 }
 
 src_configure() {
+	use system-llvm && filter-flags '-flto*' # https://bugs.gentoo.org/862109
+
 	local rust_target="" rust_targets="" arch_cflags use_libcxx="false"
 
 	# Collect rust target names to compile standard libs for all ABIs.
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2f92ccf49bce..1ce0a83e416d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index e5da2f0f7d5c..95aae3b228d0 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -1,7 +1,6 @@
 AUX newt-0.52.13-gold.patch 362 BLAKE2B 2f40cfe7e4b2b01b755c787d22d2006c2c55ca055c02f6ff2d807dc36fb15c15e67c2aa5d3ac4ae11288e710e6e0e4830dced12a0817e395fcc2331547228eb8 SHA512 6f3a68b75fae6693ddbb47b88f8ede4a6994daa4476b3ca472b3ec62db26e36785e3bb7fe7375a9e78ffd0761a4d82351f5d02c30f8ddd55fa5648257526e98f
 AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a701038c1086715b7de899f4b987c87069be8fd3a57f1f4c3fe8292d298876cf01f34e9d1f66f59ab7c08134d50 SHA512 6074f53b4070f4d8c7e1f4dfc4de7c549ac63a4af4bae70a3ebc3ebb03bd588923e8a952ffd93139041f5454318958a50a8ca8b0ecd98fb5d2ebde74b42aa313
 AUX newt-0.52.21-fix-non-POSIX-backticks.patch 794 BLAKE2B ffeba1923f7ce7d9f8349e6880b1439c3376f47cfa742e2b236b2072e3420120e1c6858437e1921295b752d63389aeea27eb5b22d39967d88f4894d153e22d42 SHA512 2e4c4c68add4a6ac107efa08fcff20d4a557252ebf246d38875d2f428432ba739469ab4200d94d3dfaf7ddec28e0b029e628e3b18678fad0cc2af731e7477032
-AUX newt-0.52.21-makefile-LDFLAGS-ordering.patch 1201 BLAKE2B 58d895ba0da3a1ce139a7257035ff41279c3432d002e57261e0d9051b6c6baf8044e774329bb24ed6807f42099817a4ca7cb2138ee3dbc37e3c3dafbf1d7d816 SHA512 e1f9e54238e2e6c700d301cb3017797b7dd396691528a7007bf4b316684269d6e4daf1f6973389e0403341bc650ffbed4b01ffa890e8d53af5a761941e93a03f
 AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4
 AUX newt-0.52.21_p20210816-makefile-LDFLAGS-ordering.patch 1221 BLAKE2B 410dfe5140867bc3ac2a6f5d1718ee3b63fd7a5ae8870c008015eb88303452099a40e5488739572172bdc9b52b5f1dec2f05cc11de2fc32d1aeea7776143eb94 SHA512 0700ea717cbe380d0facea31f22c637e837fb050a115273c147629d945eb87780a3b10f05aa8b7ca52c31c80dc6f9f356b154041b7f5a80b51d438934d1c8ad8
 DIST newt-0.52.21_p20210816.tar.gz 128555 BLAKE2B 97c791d7301b657bec68045f2cd9bbe16eef0b099a6304e2336414837b36492bd794be04d0bbcd9eadc6fcd000ba2563a5ab90be5d61249390a6ea5435091f97 SHA512 06c1d5634d88a6126de5eddd1c4d436639a4d739b100f391638b0429a3941eabcaa0ff7398f498d735ec0af5e88deb14178110ab11bf5301ef661f7953692bc4
diff --git a/dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch b/dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch
deleted file mode 100644
index f05075adb371..000000000000
--- a/dev-libs/newt/files/newt-0.52.21-makefile-LDFLAGS-ordering.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 22d44d2cbfcbec216d0028ebdf274247139a8045 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 14 Jul 2021 05:12:32 +0100
-Subject: [PATCH] Swap order of LDFLAGS and P*FLAGS
-
-Needed to respect as-needed.
-
-Bug: https://bugs.gentoo.org/798945
----
- Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 1047efc..f0bc417 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -97,8 +97,8 @@ _snack.$(SOEXT):   snack.c $(LIBNEWTSH)
- 		PLFLAGS=`$$pyconfig --libs`; \
- 		echo $(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
- 		$(CC) $(SHCFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
--		echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
--		$(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
-+		echo $(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
-+		$(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
- 	done || :
- 	touch $@
- 
--- 
-2.32.0
-
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 5cc0a8ff14d3..3cd27bc5b09b 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,6 +1,6 @@
 DIST onig-6.9.7.1.tar.gz 935705 BLAKE2B 1042d5b211f53ad8983eb6b4e53beb165bc948bbef9a85ad12578a9237a804e3dcd0a8105914156230ec30e11f2c8a0372c37919cdde7b2be104c66a8b22fb52 SHA512 17711e0d451c41e74cb3f8ab4e78b0181578ef42cb35dc64e87871c82a41909334cb4eeb03eccdccf6904f699e6e82b0dbb54077138225b9b95471fcdeb8c486
 DIST onig-6.9.8.tar.gz 944148 BLAKE2B ee7d91f2d3a7a41d675bcbb9d18490aa3e5a9edb8f3c6e880d27f2218c476499bba21088def41fbb5d500bfb2916af85c2489fca5bd846594fab53ac492531af SHA512 5a3d220961c22cda981bbae06dc383401771362cdf67e4f0b5d2fa8951a03907362edae498f63226287e70715c0abe4acdd22ec3ceb74bbb226234a52c36a4d7
 EBUILD oniguruma-6.9.7.1.ebuild 1299 BLAKE2B 4d455f968ac9867a3eff80c3ada734c2a405339ec3533a7436c150a2dbd1e4c348f22e3b6293a1d04bc4b07696f4842e42349af4d51bd7ce0318dcdd6781ba83 SHA512 ea0c3b009438e3e77eb45dc49525d493e10e81fcff495adbb05d09e3783697b08f03568eaf87a1ae394c3a338ea9bf6461105381293d7ec6185a5a594ca776d7
-EBUILD oniguruma-6.9.8.ebuild 1291 BLAKE2B 3af3ad5510f17e54d99a0f5b297492c5c1db8d1b224092b6ef1720b5bbfd003cee3f1bfe88904c0d7cad57173115f40c543eaaa4db4c96795dbd9a2a8d6272da SHA512 b535fec7d00c4eda8dc5460f0fb2cfe35b107b9ab97353b3b47d2c862a5fe77afddad34c26650f4ae27ca19e29bde03996e70a986f9da2738b2d6ce88614b672
+EBUILD oniguruma-6.9.8.ebuild 1290 BLAKE2B 8a77197456e357aa7aadc747b287d4291e917d8f6051bdb9165aca0fab95dc9796f0358b7820bc8ea6d4822f6f6d2be8767d630acb84772c3a5a997afd276a09 SHA512 0fe1c01d7e365123c4efa797be84931640db9542b815ab524d2b912d1bea90a229f2ff3aeabcde269a27f4eadbd567769718df2d534a9448fdd1aeabd05af6a0
 EBUILD oniguruma-9999.ebuild 1152 BLAKE2B c2910ecee5175e00896f5e91c712c9d1c284a37e44673f3609e45cf1fb935c46189daaba27792f468f1aa60c80c7a9cadef881abbad026cebc56cb8733317046 SHA512 0c49cf1fc620e9e8b1ef78193abc4cf6f9d92c5aea38f2a6914241c6f7bc074c7acec0e79183c996973eec80f2bccb70be7492af05bd999558813e60621e2166
 MISC metadata.xml 914 BLAKE2B c3ffcecee4f392fdaa44339db589f018967dc8dd2322e08ace06d4ffed958563ef51366a0cf09126e04f78673f7a621efb3eec85bd4e2322ed3c3b74cc0f7b4c SHA512 13a7f0fdc4ddeabe2bb163fc1421766f9dbb7730284aa9b732720d49d39ae91c4dce9283a17d36fb10bbfe832187655f1cbedfe2ab2e9a89bb664f8bf978dc7c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.8.ebuild b/dev-libs/oniguruma/oniguruma-6.9.8.ebuild
index da77b005961b..69b696574379 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.8.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.8.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 BDEPEND=""
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index 58d37c1f570a..963e74049a59 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,4 +1,6 @@
+AUX redland-1.0.17-ldflags-pc-leak.patch 716 BLAKE2B 1f8b458270dba77a0ef87355dcaea697ed1c34ce2a23ec7306c5e9d5fe88163570c607bb22710e3ead38999acf629c4f0958db74077e1c3c3f4717477d73b798 SHA512 7aad38f953e4d8744f4804038f972a9520f61c28e57f8b92e5c44f554f8017eae22a2d5b07b65caf0908407ccfeab5835190376a3c9ef125517fd6f9e75805f6
 AUX redland-1.0.17-mysql-8-my_bool.patch 462 BLAKE2B f1a34d640698149b45a6a23c961690c79c02760b16c1087a79c27e8443cb956e953b02f9d435176c890500e4942cd37fe2c0105295490a3f4a629a651146fe33 SHA512 c796f5b6a3231a150310a889890137a7dd510cc75c8b80fead9db3c8fa4de27a132c58ad261188a6c6359f1debcd9b5ba273b7af4af3242035d4f6bc12364643
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
 EBUILD redland-1.0.17-r2.ebuild 2538 BLAKE2B b319b82ab865d47ca3217177ec3ec82d86d8d4f98f36b495ca607015f3ba4aadcefc8502a50b490f472cf420c096683fc9ad353ad846845c811ab632c0d135f7 SHA512 9391a54cbee61d1ee54f2a04f2dc1604e0b837d247c9b629b71ac35f4225156cec9bed62236c1cdf407fb0ac1951a7fc534ab167c231f780b676cbfb439e16aa
+EBUILD redland-1.0.17-r3.ebuild 2066 BLAKE2B 832df593c604319eed0c0ce975bb4c86f5bb3a017a2f4e801295c6c73b11d73376a101e526d8b07519ded684767024798ea1dedc25c9c563a87d50f4fe5640ce SHA512 0b8024ec807bf0e91e671735f8f92178c56c84b8ab221b096ca75d52af52754179f263a94fe2bf54092fb561ccb9984bc10dea2a63cb2947e9f3f3afa6aa1daa
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/dev-libs/redland/files/redland-1.0.17-ldflags-pc-leak.patch b/dev-libs/redland/files/redland-1.0.17-ldflags-pc-leak.patch
new file mode 100644
index 000000000000..6fbb121c29a7
--- /dev/null
+++ b/dev-libs/redland/files/redland-1.0.17-ldflags-pc-leak.patch
@@ -0,0 +1,24 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu May  2 14:25:04 UTC 2013
+Subject: ldflags have no place in pkgconfig files
+
+--- a/redland.pc.in
++++ b/redland.pc.in
+@@ -14,5 +14,5 @@
+ Requires.private: raptor2 >= @RAPTOR_MIN_VERSION@, rasqal >= @RASQAL_MIN_VERSION@, rasqal <= @RASQAL_MAX_VERSION@
+ Version: @VERSION@
+ Libs: -L${libdir} -lrdf
+-Libs.private: @LIBRDF_LDFLAGS@ @LIBRDF_PKGCONFIG_PRIVATE_LIBS@
++Libs.private: @LIBRDF_PKGCONFIG_PRIVATE_LIBS@
+ Cflags: -I${includedir}
+--- a/configure.ac
++++ b/configure.ac
+@@ -366,7 +366,7 @@
+   AC_MSG_RESULT($bdb_include_dir)
+ 
+   if test "$bdb_prefix" != no; then
+-    nLDFLAGS=$LDFLAGS
++    nLDFLAGS=
+     nCPPFLAGS=
+ 
+     if test "$bdb_lib_dir" != /usr/lib; then
diff --git a/dev-libs/redland/redland-1.0.17-r3.ebuild b/dev-libs/redland/redland-1.0.17-r3.ebuild
new file mode 100644
index 000000000000..ad254761c6cd
--- /dev/null
+++ b/dev-libs/redland/redland-1.0.17-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit db-use libtool
+
+DESCRIPTION="High-level interface for the Resource Description Framework"
+HOMEPAGE="http://librdf.org/"
+SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+IUSE="berkdb iodbc mysql odbc postgres sqlite"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	mysql? ( dev-db/mysql-connector-c:0= )
+	sqlite? ( =dev-db/sqlite-3* )
+	berkdb? ( sys-libs/db:* )
+	>=media-libs/raptor-2.0.14
+	>=dev-libs/rasqal-0.9.32
+	postgres? ( dev-db/postgresql:* )
+	iodbc? ( dev-db/libiodbc )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-mysql-8-my_bool.patch
+	# bug 468298
+	"${FILESDIR}"/${P}-ldflags-pc-leak.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize # NOTE: this is for fbsd .so version
+}
+
+src_configure() {
+	local myconf=( --without-virtuoso )
+	if use iodbc; then
+		myconf=( --with-virtuoso --with-iodbc --without-unixodbc )
+	elif use odbc; then
+		myconf=( --with-virtuoso --with-unixodbc --without-iodbc )
+	fi
+
+	if use berkdb; then
+		myconf+=(
+			--with-bdb-include="$(db_includedir)"
+			--with-bdb-lib="${ESYSROOT}"/usr/$(get_libdir)
+			--with-bdb-dbname="$(db_libname)"
+		)
+	fi
+
+	# FIXME: upstream doesn't test with --with-threads and testsuite fails
+	econf \
+		$(use_with berkdb bdb) \
+		$(use_with mysql) \
+		$(use_with sqlite) \
+		$(use_with postgres postgresql) \
+		--without-threads \
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html/ \
+		"${myconf[@]}"
+}
+
+src_test() {
+	if ! use berkdb; then
+		export REDLAND_TEST_CLONING_STORAGE_TYPE=hashes
+		export REDLAND_TEST_CLONING_STORAGE_NAME=test
+		export REDLAND_TEST_CLONING_STORAGE_OPTIONS="hash-type='memory',dir='.',write='yes',new='yes',contexts='yes'"
+	fi
+
+	default
+}
+
+src_install() {
+	HTML_DOCS=( {FAQS,NEWS,README,RELEASE,TODO}.html )
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b71971ad8cee..3415596920c6 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiodns/Manifest b/dev-python/aiodns/Manifest
index eab8fe813e44..173709b11403 100644
--- a/dev-python/aiodns/Manifest
+++ b/dev-python/aiodns/Manifest
@@ -1,4 +1,5 @@
 AUX aiodns-3.0.0-py3.10-tests.patch 757 BLAKE2B 1b5040841b3ced3b83b330e0033f54ee6ee97a8d025f22d87674f5fca9858e48febbf25c6b3441ba5b27ef9cb15f841e65f25ed999b9f536559ec50e1f010bbc SHA512 85219c885ee70871fb43f53e2ec52c164b08b63e120ee5ca5bc4531ea71155b6d81f5a813f056eabf7f4da2b425b12df6b5649cc7a9ba98d0ca9473043ee1829
 DIST aiodns-3.0.0.tar.gz 6743 BLAKE2B 2a3c61156069fa598df58191b35383da3e054396cdeb1bc8916cc0414bb6efc89d45789883a5b4f33e3a08a6ee544356b02d6c697c096deae3398f0ff4d3c316 SHA512 8c1016f3b0cb461e70e9a55034f9ad3b3db705a845bf20bb6503c7a5d592b4c5d2e8ddc60b375c5fafdc559dc4566736f4c93f26710be2dcbd181284ef039825
+EBUILD aiodns-3.0.0-r1.ebuild 762 BLAKE2B 6859d0c7e611679135f461e4e8d1ca3d2f7b809f9a14fb25f6c03e4dafd5c7ff8d9eabc5ac12590bc491ec44f36008c5f0176ccf7657cbce961a6016a552a071 SHA512 55ea509800684fb7d38c0e9387c82020b064a3149e4d4583772b7833a07408e3096798dffe61c340e09c53a33bb9c3b41205e4e490f40757fe437f1cd4d9a551
 EBUILD aiodns-3.0.0.ebuild 754 BLAKE2B 033e9b64c372f9de617da381d0fd005f5d5074dba184c0d1a20a293ba8972639c2501968411ed80aed6c4c48e07c67fdcc43ccab3bfaa0a02f3317e83aefa487 SHA512 38b21e170aa27d72b54f9ab84a91185231016d02bfab6f1b270c3f6cbe92eedaddc9ce3ff5d8b63adf64e84d942556b98d7cb2d21e038ae18c53dae739131fa5
-MISC metadata.xml 442 BLAKE2B 077b8bbddaed2aefc1b3f94e2339a9b226c5c5e7c61bf3fafe890eb0432b87556312833236908c1dd1da1cc8344db63d5a8764f4487df4179a94d23bf9a34287 SHA512 0228d78702c35d00f1ffdfdab987492e2cf1be67c0eee92b62c62a483623d7a2e8580a6e3714a5cd581722bf297c3ee9c53843565090b1a138c55dd3afda081c
+MISC metadata.xml 466 BLAKE2B 6f6f9859ea69490be57bf7c6581e3b51b8b0f3563cc013e072bcc221a81eaf7ade938e935a730c125452c0c6c8ac45d8c91ce1748cfa3ea1df3db55fa4c59d31 SHA512 101ea2c67fcd9b0c9496892422f7eac07d1c381f1fead1706c96fafdf5c2bb48f3c3b6912a166ee20a8b54be12e2989367674813c98aba0fd896f63110c8ee1c
diff --git a/dev-python/aiodns/aiodns-3.0.0-r1.ebuild b/dev-python/aiodns/aiodns-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..3b55866582f3
--- /dev/null
+++ b/dev-python/aiodns/aiodns-3.0.0-r1.ebuild
@@ -0,0 +1,31 @@
+# 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="Simple DNS resolver for asyncio"
+HOMEPAGE="https://github.com/saghul/aiodns/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# Tests fail with network-sandbox, since they try to resolve google.com
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND=">=dev-python/pycares-3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	# https://github.com/saghul/aiodns/commit/146286601fe80eb4ede8126769e79b5d5e63f64e
+	"${FILESDIR}/${P}-py3.10-tests.patch"
+)
diff --git a/dev-python/aiodns/metadata.xml b/dev-python/aiodns/metadata.xml
index 038171b90df8..96a9f345bdbc 100644
--- a/dev-python/aiodns/metadata.xml
+++ b/dev-python/aiodns/metadata.xml
@@ -8,6 +8,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">aiodns</remote-id>
 		<remote-id type="github">saghul/aiodns</remote-id>
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 8b241183bcb8..66cd3ebd5daa 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,4 +1,3 @@
 DIST aiohttp-3.8.1.tar.gz 7324180 BLAKE2B 99f85b8510782a31de2d2f6c8efa65ef5c5cde600a5c5f49d6362d5833a0443b9adcaed9beb27c5d8502aca37af154b06017f48836b73d4c61d78204b62b7f05 SHA512 3611549393e50c8d30426aee9ddd23794a71ddefe4384eb549049b93e452fafb38de7ad900737213b61fbe717bd85035a780c1622593eae250328f17d484a0a7
-EBUILD aiohttp-3.8.1-r1.ebuild 3648 BLAKE2B b40888b9b3f7474a6854ec7df5e1f8eab454f75441a0fb29da0e2b13c7c529b3784869c8d0d84043d2384cc740e092e49eb8cb4e0a3d90a84c472947c09636ee SHA512 409129c145af53135e72d8421b7deb4a622901078b1509cb8314cf4a36a2cc70e7010544c0a990792ce9391f1b86727cdd85c406eb7087c41d9f036abdf5a9c2
-EBUILD aiohttp-3.8.1.ebuild 2650 BLAKE2B 59267e4e988f46b73e4d0d4318721f55c2b25a42c9987f9e3e43db9cacfa9ac4fcd55f2bff1c67696247d3e185298162dcd4cea7695d87dbae9216b469775892 SHA512 1ffa222b52861e48a85f9164e38d6edb554bcd247779603b4130a07156faafdc186e5a2dd37cee0e11ed1086a46d559bcc3c9189286e6b3977890856c5fff0aa
+EBUILD aiohttp-3.8.1-r1.ebuild 3647 BLAKE2B 2b72e772cbf987564bab77be1ee1a5377c0f9c27c101e69f71757c142011ab21292f5c12cfc7b81fd5ac5950c6dcafb84180128e5f09f10a3b8f2b75ddad9f1c SHA512 2a9213132ceb478ffeacdb7074d96150352b558191389cb4e73c654d7db4fd32a63940f79de85c1c794aaeae1dc84187f9bfe4b3e907539428376ba3346e85bc
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
index 951309a1adf6..c76eafa65ddc 100644
--- a/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp/aiohttp-3.8.1.ebuild b/dev-python/aiohttp/aiohttp-3.8.1.ebuild
deleted file mode 100644
index 798204e83307..000000000000
--- a/dev-python/aiohttp/aiohttp-3.8.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="
-	https://pypi.org/project/aiohttp/
-	https://github.com/aio-libs/aiohttp/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	app-arch/brotli[python,${PYTHON_USEDEP}]
-	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/async-timeout-4.0.0_alpha3[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
-	>=dev-python/charset_normalizer-2.0[${PYTHON_USEDEP}]
-	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		!hppa? ( !ia64? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		) )
-	)
-"
-
-DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	'>=dev-python/alabaster-0.6.2' \
-	'dev-python/sphinxcontrib-asyncio' \
-	'dev-python/sphinxcontrib-blockdiag' \
-	'dev-python/sphinxcontrib-newsfeed' \
-	'dev-python/sphinxcontrib-spelling' \
-	'dev-python/sphinx' \
-	'dev-python/sphinx-aiohttp-theme'
-
-# TODO: re-cythonize modules?
-
-src_prepare() {
-	# increate a little the timeout
-	sed -e '/abs_tol=/s/0.001/0.01/' -i tests/test_helpers.py || die
-
-	# xfail_strict fails on py3.10
-	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# proxy is not packaged
-		tests/test_proxy_functional.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# runtime warnings
-		'tests/test_client_functional.py::test_aiohttp_request_coroutine[pyloop]'
-		# Internet
-		tests/test_client_session.py::test_client_session_timeout_zero
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		# C extensions are not used on PyPy3
-		tests/test_http_parser.py::test_c_parser_loaded
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked
-	mv aiohttp aiohttp.hidden || die
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" --forked
-	mv aiohttp.hidden aiohttp || die
-}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 5de163b6192f..3c8bfe570e33 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -3,5 +3,5 @@ DIST black-22.3.0.tar.gz 1154456 BLAKE2B c89b43722839748dff0ce60debb684cd8eeae5e
 DIST black-22.6.0.gh.tar.gz 1165070 BLAKE2B ce2eef529e230954a13913063dbb9000fa13f4debb2e5ed33605e8efe5c6d62fc1b3c0b7847c26ad931b9becae43fa23b15701a1672c1e056f729810020cc282 SHA512 72e4b4dfc69436e4dbee5a75ea72a1be69a26dc37a5e4d7edfb84d62736f0e0aba8d14420f3069798b568bd8ba916e8850f0c958afc9b6134ee8832e54d3dc4c
 EBUILD black-22.1.0.ebuild 1397 BLAKE2B 89116657e56fb1f9a08ebdfe35de2d5d9761f43c5dff5a2ecfb0c8cf5d68581223dada3d0accb3261bbaabf4c26861dec3e35c482c7afdd8279ee8ab3422418d SHA512 0ec829dc329fab2b7c892405d195e34be8d8e1dd0850940c3727bdec6cd520b4a8d977f6b1a13e97b4622b2d853f9f372a515f457d2161e0412ed6be843f06a3
 EBUILD black-22.3.0.ebuild 1417 BLAKE2B ac11791cabf7d046f6a9a632174ff214c42983a5d152d9be29e8653b192bd8b72ea8f399d2a43bc64ec7c65590ba284082783db81685508e055a9d476f3abc80 SHA512 08f7e446dedbbf21a62b55e10828761c1e3962ce48c2009fe8a7846364386d8b206489eec09c91fb515c83fc54ee2efad5ae13d66427670659b6bad6a3911966
-EBUILD black-22.6.0.ebuild 1425 BLAKE2B c9b987e5fd3a395a87d6e5cc0d07b7c8c43d06527e93abd31cf3d7ae81e3275455650ad3726e3ebcd2c1e0ee7878c7fcad5809c8b598330161ba36efbf4fcae4 SHA512 ec8f72c8a18a9e91a5752fc29f4cca735ae999743f6e2309697aa04e3aff997154ad43bb9f337210fd8390b84e20e7a831a02d37e9ff817d594dac9fac3d1a0c
+EBUILD black-22.6.0.ebuild 1423 BLAKE2B 9864f3ca5c8d93515a8bc4664913f61a6478de19644d39f5cd1d9bb1918f1d419e59aed7798eea6f5f3f5b8114d95e92b6def870f0732719fcce8784cfd5be1a SHA512 98b9cd7b2b4ca3dbca15dda6bf9dcd47faec26f7e74eb486c979d02ed27c4cdb7e7d1a21ac924ee5ccb653a3be257e068ee358fd00c576aba10b593c05f11db5
 MISC metadata.xml 397 BLAKE2B 505ed4127741ef8d2fd77c36e6ad2d6168dca8ae5570cf7606a557fad29393c0dd78fe2eb1fe990d9d69abec19fb65d563481160b0bf0a914997b114e73f7c66 SHA512 357189214d3cc2a026b8c29ee5c695a62d73db229ca1f71372bfc5a1120317a4c4ffac942f5a196f20e84ae8988a4e707d4194ebde12ef7c96eb713b398f587c
diff --git a/dev-python/black/black-22.6.0.ebuild b/dev-python/black/black-22.6.0.ebuild
index d3494c28c04b..5ff4b27af61a 100644
--- a/dev-python/black/black-22.6.0.ebuild
+++ b/dev-python/black/black-22.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 9e212abedb8b..8f2315476086 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,6 +1,4 @@
 AUX bleach-4.1.0-py39.patch 1216 BLAKE2B 15bd8b862610ca68b5a2d6d7569bb72a6293c85c0dd0a2b9dda58ab50a25c021fd8306219c47d851a738e57acee3e0ddd43a55dc5a30a789010a3d385cb8ba69 SHA512 10d2aff6c5f62a56589f8f129df1f5f3b514a57a8518669b909491b801d6994b548ec4f7f7c04f161bf06c82aee397a5610787682e07aa40e0d469242bd2c5bd
-DIST bleach-5.0.0.tar.gz 198789 BLAKE2B 0b2847e9342be1854a08679230b3ea0fcb1a514eaa6c11f344057e59310b6d769e2bee91272295a0f60fa0ed1c2e4503340276d99794d260b6a63e2c4ea76703 SHA512 5b8e0c94a7bd8270581719928ec869c5c3c91900be0a293adfb342acfc55df7e63211e95786e6a39b3661b3852e91a8b37ff805387fb3e6a286e8a5dce8e3655
 DIST bleach-5.0.1.tar.gz 199642 BLAKE2B 8d06dd38e89b91bf48f3481b5337b8d9700d8cc88faf3a260898b2b8f15ecf5c5160f96bff2c5ce02f361b773b0ce9a51322d9836dcc99b7878921846e8da182 SHA512 6c8e80eaf6db6f0e6d9066f3443192f44c489e079945b6d11b11e7eb270ea865011019e05d43c7896262dc11ca168e697630d9da8dca9f5bb48f0e2161fda6c8
-EBUILD bleach-5.0.0-r1.ebuild 1101 BLAKE2B 4e34d0f4918b39b3c29d260714008bcce5a84a65ad7e72b4aec08b9f3c74dde52e768ea748d750a4cff8e377cc4116cf02b700076fd8c04a0dc6928b0a2fcdf9 SHA512 c07586ab99178517c1f84d73b45e4c46018706d10ef60895527e58b522c93b4d0cc6dea21f8f99fea65ad0ee7236e77046d544f38fe346bd1e038f266b42cf40
 EBUILD bleach-5.0.1.ebuild 1119 BLAKE2B 58481dd72886cc12594f3adda4c942139f1179d53db8cd5c54df15631f5c55dd0c3fc0c682d0f5c33b723a559c583ac696abf4d449e31abe03ba49019f12e884 SHA512 d6cec8672869829789c7f54464e2ce10645166ff5838a582f0158a3acfbe365b37bd32945abbd9ad54540f4836d92ffa0823cd0a70b40d733e7cb87eae48a8fb
 MISC metadata.xml 401 BLAKE2B 9250e95731d3269e92b401f17d066e70838fa4009e9b62e6ec88420ada2b4695179fad49a8b010eab162ed0af2e2398fa987e04cd8ad34813dfb1ed1ad1208e4 SHA512 e5ba74a86efa4450b9181fb5f32dfd63ac5d3e34b8e1c447b21acb4cb615d77711761352a8e1e4807bde17b1b2e688eded99d8a9785cd42a915d470084b98a04
diff --git a/dev-python/bleach/bleach-5.0.0-r1.ebuild b/dev-python/bleach/bleach-5.0.0-r1.ebuild
deleted file mode 100644
index 2fe9eb311b0e..000000000000
--- a/dev-python/bleach/bleach-5.0.0-r1.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=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="
-	https://github.com/mozilla/bleach/
-	https://pypi.org/project/bleach/
-"
-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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0-py39.patch
-)
-
-src_prepare() {
-	# unbundle unpatched broken html5lib
-	rm -r bleach/_vendor || die
-	sed -i -e 's:bleach\._vendor\.::' \
-		bleach/html5lib_shim.py \
-		bleach/sanitizer.py \
-		tests/test_clean.py || die
-	# indirect html5lib deps
-	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
-
-	sed -i -e '/import/s/parse/urllib.&/' bleach/sanitizer.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 49c57934f94a..aa61e05b6bd3 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,5 +1,3 @@
-DIST chardet-4.0.0.tar.gz 1923933 BLAKE2B 10dce34cbe6f01536a526931510ed625bc5062335e9419e24c9e48d5697ebbe70dcc54ffaa976ec153340cc74c3086627a3b1dd9e34be32c89a9a81e83fd70d0 SHA512 cb0e052fdd9fec251ebc6eb3f31ca95ece017f2bfa99122997f989286988058ed9688e49d00631c63d8e4e52da1050e23f02b28d0e739aee7302b24c8808370e
 DIST chardet-5.0.0.gh.tar.gz 2016879 BLAKE2B 006992a4945840b3720e93f932618cf81debc094a3ae353bfdd4e56ecdc5a01e4a250bed15473d8d59108978fdbfb769081a9b87f672d35f4892d5ba04c2deb5 SHA512 d19413a4f1f571f3627ec3f55dcc6a69497f6a1d72fe972051713f4d7a473cd539cfbce2eb2c7a070295aa640c6ac2aec6fc0064751e465311935c0e4d88061a
-EBUILD chardet-4.0.0-r1.ebuild 705 BLAKE2B 33750d7b4c1f4263412a7628ed6e4babe14764c3d5ef262fcc0790115ab86dfdbbaf16e4affb3f1b212809f2384e9d47e134363c0a0162903590c268616af656 SHA512 fbbbda1edda3d54d35b25799742834f0ed28b2b9a0ac354ca174be288c1530ccf5ab10f0dbe51712408b6c7314364991e8bdb36f53da6f917e4ead68977dff7e
 EBUILD chardet-5.0.0.ebuild 786 BLAKE2B dbd01268dea3a509837ecf5f8bca303ddb4fa0d2ad1f4a8d451ede6f3af647dfd5de7a4e6e38079ae10ca682639b1ae968fc80bfd4365aeec533212b546dc212 SHA512 6be330a9e2db4bb4375040cda2c5933ac29dd310fbdff5233954f474aba78c1f391cf15e34246f15212444fc52493a3db5e5f6ea3edb1179ab6334a93f84cb2b
 MISC metadata.xml 403 BLAKE2B 90447dade87db87cbe60f8a0ff84e0617156551d74869306167a5c196e2f6da7746a9ae9a73624099ef7d593f1f36a476cf3b61251d3ca97daab1eccc963e08e SHA512 ed1030c49899c34998da5ed13f4c6dd297f75f5f9e0a06e51106c93579aeb0b4fe37fbea08e8e182d6480877d28a963f73f4a91402241412a22ee389179d8ef6
diff --git a/dev-python/chardet/chardet-4.0.0-r1.ebuild b/dev-python/chardet/chardet-4.0.0-r1.ebuild
deleted file mode 100644
index 26a8f949b152..000000000000
--- a/dev-python/chardet/chardet-4.0.0-r1.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..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Universal encoding detector"
-HOMEPAGE="
-	https://github.com/chardet/chardet/
-	https://pypi.org/project/chardet/
-"
-SRC_URI="
-	https://github.com/chardet/chardet/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/configupdater/Manifest b/dev-python/configupdater/Manifest
index cf30c4b72ca7..7860ac2f2e9f 100644
--- a/dev-python/configupdater/Manifest
+++ b/dev-python/configupdater/Manifest
@@ -1,5 +1,5 @@
 DIST configupdater-3.1.1.gh.tar.gz 138777 BLAKE2B 9fef5815bc41903a65c2c53c6b9ff3d00d1f4efe65008c725afda8d12694be4d18810cbfc03b291246789d736f1a2933061f2683bfc62e9e1d72e2e4f159d772 SHA512 1e499f87d0ac3d75f32aafe532d7c83b4b86fbaa204fcdbaf7a3dcb5262d936fe027ee0b21d169ef69a0590edbe965a872390b14be274fbb1c893f2d4695b92c
 DIST configupdater-3.1.gh.tar.gz 138671 BLAKE2B 48e349780e11ca26b4b15b44aa298058840cfcea47fc7b2e555f3ca743de1956a15255bfea2c5f96624e02e399bed99ae45f3422ab1660b8ae83087ddf6117e1 SHA512 89685a93f3bec907184d818b5adea4f87967df313fe4e4216aeef2c227fdf0b0f98757ec27da7f43adff6e2ee37020dd57b98569d5811c9dc7c3201852b27432
-EBUILD configupdater-3.1.1.ebuild 738 BLAKE2B 8420ab7ff644adee1d38570827caa989d03abedacf9e5d018fa41862a2ca8e32f5af7cd8a88c87736888f540d4ce6bd5f6eb13f9a7b69cc838e52996c2a372f2 SHA512 21e8fcfad9c96a0745d61020b4100a8b2475b8c74e6b948a20e5e78c95790810b4e0415f124390536fad6cb801dc8ac4eff9ead090ccfc0462b3dee5037811a2
+EBUILD configupdater-3.1.1.ebuild 743 BLAKE2B 7c4be0e42e01ef9371b51c921e25853a80f416b29ed75faed5e43068cfee78fec437972c0e6d889c32440e70d5efcff4c936085abbd5e5866d40a81c0915a5ea SHA512 ec0bf3b62bb2d45c7a42665aa2abf4ca9f145b9ed6c1373adf5823d4c7823ebc87fc3c3e85a1e8f8f51b767ae120a781a801938cb8ed053a84780bd9fac6f502
 EBUILD configupdater-3.1.ebuild 693 BLAKE2B fd1c8b10619c7b2ff849c59a467687e53b653188b2395aadf47e4731eedb967fa93d203cecb8d1bbd00b309f977ad242a21658cdd371affbafe79b44e03d5cf9 SHA512 23745443f9fa98695eac44e41559300c0948ebfe099aa7ae41450239040685acaa10c97c600c48fefc046ec2fd3cb934c400c45819ddb191fc636c0206132b71
 MISC metadata.xml 359 BLAKE2B 59eca20050b8eb4620813ab2bc61abec0d905dba4c38d35806f135cc3f165634cf6f1df124d77e294dbcb3d196b521bbfaa005979e0c63164004d4942afe4717 SHA512 8ce147cc56b7c207125e40d9ce54f692f62f2ecff1944e74d661b2656e5d479e8072e41fbec7451e58976d3453c5dd0e4eff0726ff9f2b502b505926fd2d851f
diff --git a/dev-python/configupdater/configupdater-3.1.1.ebuild b/dev-python/configupdater/configupdater-3.1.1.ebuild
index f8b1f06ec0de..4f22878363fa 100644
--- a/dev-python/configupdater/configupdater-3.1.1.ebuild
+++ b/dev-python/configupdater/configupdater-3.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT PSF-2 PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index bfe006b60925..94f1d18b30d0 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,4 +1,3 @@
-AUX cryptography-3.4.7-py310.patch 8611 BLAKE2B 6cabc8056658f6a0c895a75b287ebfaa3d25c4ba9f95e28bf63c34bb87ccccdb4b04e42c5d72fdb4d889560e1ca13c602755fa05b9bab3b1fe05788abe110964 SHA512 d1c89a6c50fd4032d6aedcf026592b52b1e38922ecc2a83e8defcee5b7b4845a66de45de897fd3c2022c6118591811b9fc25df7fdd33d219647e0923cd906a66
 DIST Inflector-0.11.4.crate 17438 BLAKE2B eaf0c7f983b3186e9bc89353021a10592f2877e46585bd50b96db9b087343d1199c7b6cf3fa53cd274fb6d33de025a904b8aa31a7ac9599ae3689ecdbcec34cd SHA512 f1f6463e033b6d3c16c51dc1e1a3f5569954308b95b59058294b7f9310919bbda797e99e6a07529071bb83f0688867a243997d33795a7136b0af73977004296e
 DIST aliasable-0.1.3.crate 6169 BLAKE2B c23840c7f1df86109e004aa1929d7355bd815c69ce8c5a316c9e2810851b7faf91c7480924d67cf83520e94b86dc0cc1b90b0dcc84b446a15ba5cccc1bae95ca SHA512 a60e4280335638b36a72e51514843229fdd0cc89cb670fcf159f882a687c04ecbddcc52a1dcc3cbe8647e5308af3939037934a157facdddcc4834dcd3cb16dc8
 DIST asn1-0.8.7.crate 26288 BLAKE2B 702fdd34d5489b74cad023969c8873c6d469bd58376fc86fc124638ffe677f2d7f2592d28219ba741597d3791716b1303cff1fa6352f5df0fa41fdd0add628fd SHA512 4cccfa41423784cb82a0dc4fb0a23da7a14d7be883e22ec4263c219d9f14b1fb90d84f59750e11c561a494cbe6171494f60f9cdf1d1510411d579306c47f06a5
@@ -8,9 +7,7 @@ DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7d
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
-DIST cryptography-3.4.7.tar.gz 546893 BLAKE2B 49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1 SHA512 3c4cf64bc0b067ccdbb71efe04c32ac9d673faea6cc4ccd13d6b1b61920be4785806d19359b7657d032a2ff1c011a8b4f16ec4924d9df8a59d1a875a7f844473
 DIST cryptography-37.0.4.tar.gz 585913 BLAKE2B 3ed76d5cec1dd75ab89e9cae1357eda82b23017406cd84d97ab70d6b598cb3c453e34ea013d35b5a482f032b8513c0245d4273c2201313f42be54e404fa2b598 SHA512 9d39a2ec4facffd6d1c1db9267248846071aca8ac3bccba3da2d1a0664c6ce2a38c5245a9b8f62845a83abe6ba2782c43333aa4260960f37dc2eac3789a73575
-DIST cryptography_vectors-3.4.7.tar.gz 35168102 BLAKE2B fbefd3ff96548dde012fd290aba1c99d57db376023d486910e486cc9c143461ef1ae9b77824cc03307723d35142f0360bc961b548a4edc02357d3f1a0e7e4e9f SHA512 269b50fa4c5300da6758006d12be42f998630d23053ef9af0eb588fc9e6994b044d8822cff105e338f4d0d746ed0e204a4a9c42f54667e355e1ce86e6754bbe9
 DIST cryptography_vectors-37.0.4.tar.gz 35242881 BLAKE2B 3b58f12deec978e0d104ee84d2330248fd00291b63ca181a1e4803253e643496ee3cee14ecf84681db60da028543ca50d05968cac4d2c0609ae820b3a02463dd SHA512 33098be46d072bf35f72320d64fd244a8ef890e99ae7baa21f9fbbb8d423d60f2711c3c1293830c860ff9bdd79bff910ce4df0f4dc9f363d712b722dab2de7ab
 DIST indoc-0.3.6.crate 9663 BLAKE2B ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2 SHA512 e900aa3b001df0fdbf1f543d8b679af317e85a1f95e26fc556213f2826a4f6c82d8c4f3f82de435e3591f8bc14e78eb22668d901dcbe2287f46740e0291afacd
 DIST indoc-impl-0.3.6.crate 7933 BLAKE2B 93e232e360e8f02943ef9a9cabf16bc863d792d8096b8d9a13a07f0b7b396db590abf83b5444f082317059dad7578ffae974dbc8a7e56fbdbab817b7d2534725 SHA512 18406587ee56a09dd2062cee456af697efa903343de42c0ff618a64ddf2bf7efed5da02e7220fed2636c555a6ae18059018f5c3c9b44ba8d3e5a34ea5b53c806
@@ -48,6 +45,5 @@ DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d23
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD cryptography-3.4.7-r3.ebuild 2165 BLAKE2B 62aded5c10bc74dd3b9b231cf8d704a361783c113136d117b65193f2d9433d9b6365f84ffd87956919f52000df2fbea7efc7045ef8a467c68b913220d85bf81e SHA512 37d56d46f97b6ff2dd4b30faef32fca1205851555fdee643f2367364591228a7c329aed4e9ac9d077be3b8de93a70651e5fc59a6f566dcadd4427535e9a183f1
 EBUILD cryptography-37.0.4.ebuild 2950 BLAKE2B 7d98a035a5b8a31fe659936717c53acaa754003388556230a22cc38d53e893a13f7dafcf1bdd46401bd3387685b8d7cbedc7d51bdfbaff90a0a3a10a80163b4e SHA512 3831f1fa923220a92947aa98a826183b2675d41a67f8e514950f03421a39243ad52bc2f0ee0cf32b20d1f55a00850a7e70326cedd950d0467632c3590c9d48d9
 MISC metadata.xml 385 BLAKE2B 28c12f0c0303afca4d0fb015a1ed123efb559686e71477b3120291164a01f219c0dce373d7f4f7380ced372343945a8ee1ce875c27851d3864a468ba48eb2cc1 SHA512 f80a4794ae57fc9e434679ccdd0ff4cc5e2c4fb48274cca32316f827dd6d4cd3b903cb45f52abdd4893866987d4d1026f7ddb1efaa76cb99e0f55d01e8433b83
diff --git a/dev-python/cryptography/cryptography-3.4.7-r3.ebuild b/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
deleted file mode 100644
index a9867806b571..000000000000
--- a/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
+++ /dev/null
@@ -1,81 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 multiprocessing
-
-VEC_P=cryptography_vectors-${PV}
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="
-	https://github.com/pyca/cryptography/
-	https://pypi.org/project/cryptography/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? ( mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz )
-"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-DEPEND="
-	>=dev-libs/openssl-1.0.2o-r6:0=
-"
-RDEPEND+=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}/${P}-py310.patch"
-)
-
-src_prepare() {
-	default
-
-	# avoid automagic dependency on dev-libs/openssl[sslv3]
-	# https://bugs.gentoo.org/789450
-	export CPPFLAGS="${CPPFLAGS} -DOPENSSL_NO_SSL3_METHOD=1"
-
-	# work around availability macros not supported in GCC (yet)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local darwinok=0
-		[[ ${CHOST##*-darwin} -ge 16 ]] && darwinok=1
-		sed -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
-			-i src/_cffi_src/openssl/src/osrandom_engine.c || die
-	fi
-
-	# this version does not really use Rust, it just creates a dummy
-	# extension to break stuff
-	export CRYPTOGRAPHY_DONT_BUILD_RUST=1
-	sed -e 's:from setuptools_rust import RustExtension:pass:' \
-		-e '/setup_requires/d' \
-		-i setup.py || die
-}
-
-python_test() {
-	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/cryptography/files/cryptography-3.4.7-py310.patch b/dev-python/cryptography/files/cryptography-3.4.7-py310.patch
deleted file mode 100644
index d961af82b774..000000000000
--- a/dev-python/cryptography/files/cryptography-3.4.7-py310.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-diff --git a/src/cryptography/exceptions.py b/src/cryptography/exceptions.py
-index f5860590..3bd98d82 100644
---- a/src/cryptography/exceptions.py
-+++ b/src/cryptography/exceptions.py
-@@ -3,10 +3,10 @@
- # for complete details.
- 
- 
--from enum import Enum
-+from cryptography import utils
- 
- 
--class _Reasons(Enum):
-+class _Reasons(utils.Enum):
-     BACKEND_MISSING_INTERFACE = 0
-     UNSUPPORTED_HASH = 1
-     UNSUPPORTED_CIPHER = 2
-diff --git a/src/cryptography/hazmat/primitives/_serialization.py b/src/cryptography/hazmat/primitives/_serialization.py
-index 96a5ed9b..160a6b89 100644
---- a/src/cryptography/hazmat/primitives/_serialization.py
-+++ b/src/cryptography/hazmat/primitives/_serialization.py
-@@ -3,13 +3,14 @@
- # for complete details.
- 
- import abc
--from enum import Enum
-+
-+from cryptography import utils
- 
- # This exists to break an import cycle. These classes are normally accessible
- # from the serialization module.
- 
- 
--class Encoding(Enum):
-+class Encoding(utils.Enum):
-     PEM = "PEM"
-     DER = "DER"
-     OpenSSH = "OpenSSH"
-@@ -18,14 +19,14 @@ class Encoding(Enum):
-     SMIME = "S/MIME"
- 
- 
--class PrivateFormat(Enum):
-+class PrivateFormat(utils.Enum):
-     PKCS8 = "PKCS8"
-     TraditionalOpenSSL = "TraditionalOpenSSL"
-     Raw = "Raw"
-     OpenSSH = "OpenSSH"
- 
- 
--class PublicFormat(Enum):
-+class PublicFormat(utils.Enum):
-     SubjectPublicKeyInfo = "X.509 subjectPublicKeyInfo with PKCS#1"
-     PKCS1 = "Raw PKCS#1"
-     OpenSSH = "OpenSSH"
-@@ -34,7 +35,7 @@ class PublicFormat(Enum):
-     UncompressedPoint = "X9.62 Uncompressed Point"
- 
- 
--class ParameterFormat(Enum):
-+class ParameterFormat(utils.Enum):
-     PKCS3 = "PKCS3"
- 
- 
-diff --git a/src/cryptography/hazmat/primitives/kdf/kbkdf.py b/src/cryptography/hazmat/primitives/kdf/kbkdf.py
-index ac36474f..75fe7d51 100644
---- a/src/cryptography/hazmat/primitives/kdf/kbkdf.py
-+++ b/src/cryptography/hazmat/primitives/kdf/kbkdf.py
-@@ -4,7 +4,6 @@
- 
- 
- import typing
--from enum import Enum
- 
- from cryptography import utils
- from cryptography.exceptions import (
-@@ -19,11 +18,11 @@ from cryptography.hazmat.primitives import constant_time, hashes, hmac
- from cryptography.hazmat.primitives.kdf import KeyDerivationFunction
- 
- 
--class Mode(Enum):
-+class Mode(utils.Enum):
-     CounterMode = "ctr"
- 
- 
--class CounterLocation(Enum):
-+class CounterLocation(utils.Enum):
-     BeforeFixed = "before_fixed"
-     AfterFixed = "after_fixed"
- 
-diff --git a/src/cryptography/hazmat/primitives/serialization/pkcs7.py b/src/cryptography/hazmat/primitives/serialization/pkcs7.py
-index bcd9e330..57aac7e3 100644
---- a/src/cryptography/hazmat/primitives/serialization/pkcs7.py
-+++ b/src/cryptography/hazmat/primitives/serialization/pkcs7.py
-@@ -3,8 +3,8 @@
- # for complete details.
- 
- import typing
--from enum import Enum
- 
-+from cryptography import utils
- from cryptography import x509
- from cryptography.hazmat.backends import _get_backend
- from cryptography.hazmat.primitives import hashes, serialization
-@@ -35,7 +35,7 @@ _ALLOWED_PRIVATE_KEY_TYPES = typing.Union[
- ]
- 
- 
--class PKCS7Options(Enum):
-+class PKCS7Options(utils.Enum):
-     Text = "Add text/plain MIME type"
-     Binary = "Don't translate input data into canonical MIME format"
-     DetachedSignature = "Don't embed data in the PKCS7 structure"
-diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py
-index ef0fc443..9e571cfd 100644
---- a/src/cryptography/utils.py
-+++ b/src/cryptography/utils.py
-@@ -4,6 +4,7 @@
- 
- 
- import abc
-+import enum
- import inspect
- import sys
- import typing
-@@ -162,3 +163,13 @@ int_from_bytes = deprecated(
-     "int_from_bytes is deprecated, use int.from_bytes instead",
-     DeprecatedIn34,
- )
-+
-+
-+# Python 3.10 changed representation of enums. We use well-defined object
-+# representation and string representation from Python 3.9.
-+class Enum(enum.Enum):
-+    def __repr__(self):
-+        return f"<{self.__class__.__name__}.{self._name_}: {self._value_!r}>"
-+
-+    def __str__(self):
-+        return f"{self.__class__.__name__}.{self._name_}"
-diff --git a/src/cryptography/x509/base.py b/src/cryptography/x509/base.py
-index 5505fa3b..e3846c33 100644
---- a/src/cryptography/x509/base.py
-+++ b/src/cryptography/x509/base.py
-@@ -7,9 +7,9 @@ import abc
- import datetime
- import os
- import typing
--from enum import Enum
- 
- from cryptography.hazmat._types import _PRIVATE_KEY_TYPES, _PUBLIC_KEY_TYPES
-+from cryptography import utils
- from cryptography.hazmat.backends import _get_backend
- from cryptography.hazmat.primitives import hashes, serialization
- from cryptography.hazmat.primitives.asymmetric import (
-@@ -66,7 +66,7 @@ def _convert_to_naive_utc_time(time: datetime.datetime) -> datetime.datetime:
-         return time
- 
- 
--class Version(Enum):
-+class Version(utils.Enum):
-     v1 = 0
-     v3 = 2
- 
-diff --git a/src/cryptography/x509/certificate_transparency.py b/src/cryptography/x509/certificate_transparency.py
-index d51bee92..d80f051a 100644
---- a/src/cryptography/x509/certificate_transparency.py
-+++ b/src/cryptography/x509/certificate_transparency.py
-@@ -5,15 +5,16 @@
- 
- import abc
- import datetime
--from enum import Enum
- 
-+from cryptography import utils
- 
--class LogEntryType(Enum):
-+
-+class LogEntryType(utils.Enum):
-     X509_CERTIFICATE = 0
-     PRE_CERTIFICATE = 1
- 
- 
--class Version(Enum):
-+class Version(utils.Enum):
-     v1 = 0
- 
- 
-diff --git a/src/cryptography/x509/extensions.py b/src/cryptography/x509/extensions.py
-index 6cae016a..742f1fa2 100644
---- a/src/cryptography/x509/extensions.py
-+++ b/src/cryptography/x509/extensions.py
-@@ -8,7 +8,6 @@ import datetime
- import hashlib
- import ipaddress
- import typing
--from enum import Enum
- 
- from cryptography import utils
- from cryptography.hazmat._der import (
-@@ -634,7 +633,7 @@ class DistributionPoint(object):
-     crl_issuer = utils.read_only_property("_crl_issuer")
- 
- 
--class ReasonFlags(Enum):
-+class ReasonFlags(utils.Enum):
-     unspecified = "unspecified"
-     key_compromise = "keyCompromise"
-     ca_compromise = "cACompromise"
-@@ -978,7 +977,7 @@ class TLSFeature(ExtensionType):
-         return hash(tuple(self._features))
- 
- 
--class TLSFeatureType(Enum):
-+class TLSFeatureType(utils.Enum):
-     # status_request is defined in RFC 6066 and is used for what is commonly
-     # called OCSP Must-Staple when present in the TLS Feature extension in an
-     # X.509 certificate.
-diff --git a/src/cryptography/x509/name.py b/src/cryptography/x509/name.py
-index a579aa21..9069a9f4 100644
---- a/src/cryptography/x509/name.py
-+++ b/src/cryptography/x509/name.py
-@@ -3,14 +3,13 @@
- # for complete details.
- 
- import typing
--from enum import Enum
- 
- from cryptography import utils
- from cryptography.hazmat.backends import _get_backend
- from cryptography.x509.oid import NameOID, ObjectIdentifier
- 
- 
--class _ASN1Type(Enum):
-+class _ASN1Type(utils.Enum):
-     UTF8String = 12
-     NumericString = 18
-     PrintableString = 19
-diff --git a/src/cryptography/x509/ocsp.py b/src/cryptography/x509/ocsp.py
-index 1c5de73e..bcf210c1 100644
---- a/src/cryptography/x509/ocsp.py
-+++ b/src/cryptography/x509/ocsp.py
-@@ -6,8 +6,8 @@
- import abc
- import datetime
- import typing
--from enum import Enum
- 
-+from cryptography import utils
- from cryptography import x509
- from cryptography.hazmat.primitives import hashes, serialization
- from cryptography.x509.base import (
-@@ -27,12 +27,12 @@ _OIDS_TO_HASH = {
- }
- 
- 
--class OCSPResponderEncoding(Enum):
-+class OCSPResponderEncoding(utils.Enum):
-     HASH = "By Hash"
-     NAME = "By Name"
- 
- 
--class OCSPResponseStatus(Enum):
-+class OCSPResponseStatus(utils.Enum):
-     SUCCESSFUL = 0
-     MALFORMED_REQUEST = 1
-     INTERNAL_ERROR = 2
-@@ -58,7 +58,7 @@ def _verify_algorithm(algorithm):
-         )
- 
- 
--class OCSPCertStatus(Enum):
-+class OCSPCertStatus(utils.Enum):
-     GOOD = 0
-     REVOKED = 1
-     UNKNOWN = 2
-diff --git a/tests/test_cryptography_utils.py b/tests/test_cryptography_utils.py
-index 6b795e0c..803997ac 100644
---- a/tests/test_cryptography_utils.py
-+++ b/tests/test_cryptography_utils.py
-@@ -2,6 +2,7 @@
- # 2.0, and the BSD License. See the LICENSE file in the root of this repository
- # for complete details.
- 
-+import enum
- import typing
- 
- import pytest
-@@ -51,3 +52,13 @@ class TestCachedProperty(object):
-         assert len(accesses) == 1
-         assert t.t == 14
-         assert len(accesses) == 1
-+
-+
-+def test_enum():
-+    class TestEnum(utils.Enum):
-+        value = "something"
-+
-+    assert issubclass(TestEnum, enum.Enum)
-+    assert isinstance(TestEnum.value, enum.Enum)
-+    assert repr(TestEnum.value) == "<TestEnum.value: 'something'>"
-+    assert str(TestEnum.value) == "TestEnum.value"
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index b5f8e989c99d..1640c9110641 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,4 +1,3 @@
 DIST dnspython-2.2.1.tar.gz 304861 BLAKE2B e6446b91579c6ec0a7266a354ceb58e2f881b55b7376648770ebc2c6104fd815214497516d305b75802e9211703d47a70d66745d872a43afb72f41e55a617652 SHA512 ec545468f604d6131f07259ca154c4f71d445d12c336ac1da0d2f025d6478ada76320a7235119312fed85da071ef309d2531e541d3c2340a50deaf3f4dd7b4eb
-EBUILD dnspython-2.2.1-r1.ebuild 1087 BLAKE2B 37587cd64782afa03a19bafed824d1eb2d0c84507b9775e230a45f8a31eb316dd306daa4f4e7604f16a4504ac24f193505602756116d9146f8d0d4d4c8d7c35a SHA512 59bae28dfa94433e39a3da5e4e78e4cad8038b1d5d55e32feb8a0390773306fbb0a1fc0d09e865a8fafcfaac1a439e08ba8d897516a964c897ba87e6138261e8
-EBUILD dnspython-2.2.1.ebuild 1027 BLAKE2B 54fc604c4ad03ce4161c32e1c11368783baa3a938cbdc66641e57a80b06858c1f2ed1885fa015e61d85ece3d956dd92d2d806780913f5f79e705afaa671acdcb SHA512 19845273d317b81f7c98bb719cde9df51335fe7f48c2ad25dbbbe1efb179fe7e22d19f339949e545a6f911d3b85d872477d19fb33816e1c75b05bf02e9a307da
+EBUILD dnspython-2.2.1-r1.ebuild 1080 BLAKE2B a1c2b5e618584b5f82c40c0a449013a2eae24d99d89be5cb7996d579035e6f30aacafafb746879188f1e6d6da63397d1ab25017e910c46102bd61ea4818e9b4c SHA512 761d035b4f9e021b20b0335f6ee9a027db0cfcc7026700d170fc8834ff41ef53587f72decd964745cf8247001d3a900344494b394d1a4dea09517c49e97f1b0a
 MISC metadata.xml 1651 BLAKE2B ea1ce5f9d27de56010f40b2187ac0b5876c27f41163e966689cb8958304c466011ebea0e5979c73b2ce14e6ed406833d01251982e43af945f868ab57dfdc848f SHA512 3d66dff8a832f935110f27e0f397457940de38a09e158bafa275872f96f1c6c5bb7fd1fd558610a8db64e2a7b9fb91cc6c744d3a7dc2eab3a19b85d526c2975a
diff --git a/dev-python/dnspython/dnspython-2.2.1-r1.ebuild b/dev-python/dnspython/dnspython-2.2.1-r1.ebuild
index e22214d8d8ad..19f3117844e8 100644
--- a/dev-python/dnspython/dnspython-2.2.1-r1.ebuild
+++ b/dev-python/dnspython/dnspython-2.2.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="dnssec examples"
 
 RDEPEND="
diff --git a/dev-python/dnspython/dnspython-2.2.1.ebuild b/dev-python/dnspython/dnspython-2.2.1.ebuild
deleted file mode 100644
index 716f4a5c82ff..000000000000
--- a/dev-python/dnspython/dnspython-2.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="
-	https://www.dnspython.org/
-	https://github.com/rthalley/dnspython/
-	https://pypi.org/project/dnspython/
-"
-SRC_URI="
-	https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	<dev-python/idna-4.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/network_avail/s:True:False:' \
-		tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -s
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index 325516891d60..0b28136d18c3 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,3 +1,5 @@
 DIST doc8-0.11.2.tar.gz 25898 BLAKE2B 097c6d6b82fe4acf7cfc43ff7860334f0a53df3ca39def33de4b9f04553acab785fe339d8126dd5ae56a7d45c846c575b9c689eed47bc47302b89fd5bfabfe3a SHA512 f607251c3ae792b3210893b2074bb34aad866a54645c4244ef53e156a4c3af9cfb61ddb93617d153510cc6868be7f04409eac47f66f91d4d0b9400bb7aca0eb1
+DIST doc8-1.0.0.tar.gz 26058 BLAKE2B 0113a4738804a9ed0446ae26b18f0f7da9dd3c4a90c598e03c78d3124f5db42dbc38f1f17af05ef60cb645a8b18bcb20aeb2f5cc00c44814afd572d92b2d0301 SHA512 98ad904a994536de80d6e89a221e3d7159d5188a0f57d07961f646e0591f81790f06c624ef90c32e28ff89ecf9e39b2b052363995aaece6a4e30f643c37964b9
 EBUILD doc8-0.11.2.ebuild 832 BLAKE2B b08861a20be43f2ff1164e4b0c74f58abdc30308de47d84d20d6f6ad845110f0e720731d1b18872b8889328b2ca619615258707db797daed6388d1dd2c0038b4 SHA512 3084ec1911d0852a2191e4a09aa13108f218aa441299eb7a9abc07427b951b4ddab069b1b51007dad4b44d5e3da899809bc3505ae876f0cbcf294403ea302868
+EBUILD doc8-1.0.0.ebuild 835 BLAKE2B af83e97ec07baf0275e240135a273d8a434bd9ac351ec1cf95f1e74968a1c6ee9902ffe6c67fb8ee8794f80ec9260b110fa0a661b8d5c4969d0a1dae121780f8 SHA512 20237ac28bb047139f793dff0aee190054bc73843f8df005817ffbea2440c115daaf8c09b3848d39d875799503b9e1b058bbadf6e48129898af0f8d86c74bf65
 MISC metadata.xml 447 BLAKE2B 8be26ccdf9fd1e34e05eccee3abb8182d95438b7eb0f6dda03757e1d4a0f2b1c34861f81b9e8bbbb6634f141dc7867ecdf83022b05df6abe322716d78eafc9a4 SHA512 824cb036e31a498764941d78ebd744d2edaa2cd7a3282dbd5f2c16cbcb0adab12a80b0200528c40e01fc6dde851d1abed5b3d5fc2b27577a02cdfad5fa90663d
diff --git a/dev-python/doc8/doc8-1.0.0.ebuild b/dev-python/doc8/doc8-1.0.0.ebuild
new file mode 100644
index 000000000000..9e86c190ebaa
--- /dev/null
+++ b/dev-python/doc8/doc8-1.0.0.ebuild
@@ -0,0 +1,34 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="
+	https://pypi.org/project/doc8/
+	https://github.com/pycqa/doc8/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index a0214f59c515..263e2a3dc64a 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,4 +1,4 @@
 AUX httpretty-1.1.4-pytest.patch 4970 BLAKE2B 396fd081c958616978b0f0fa476a0b6b1f3e530aee5bddc969fcd0b9471e094dfb7c2114940f86dea6e50222f4224321cf7ed449999c61eb7006c9d1cff3e7e6 SHA512 f9064a67d852a026a7398fc1593499d4d3c7e44d00d01d1ecb68d813b1114578858a2b2d11f56f44ce7284b618143098c590fef442c118f532b29503f135ab55
 DIST httpretty-1.1.4.tar.gz 442389 BLAKE2B 020a9fd2b5dc9790b53009caac37a3cf5a0e47102b9be05f4df255880f5daf5e7689714e0c0a8f223155d191c471cb5ff4f9b0d0d34b07bd5f377311ed56ba25 SHA512 4daceea4f30ce181e871167d304bd7af9d504364f55d42f8025770f2efe7e833d018aed681c8733d653d4de90db3433e999c56bccd4675f81e66d1cc4023e418
-EBUILD httpretty-1.1.4-r1.ebuild 2108 BLAKE2B 539bf5ed92f4e182f13891346b51610b645b3595607a6511da6cd3755cf7722206b9c2eadea79c219bd7da2b6922282d4d75d08bd4f0fb6a309168da6060b5b2 SHA512 88633454d2c27e50b43226ab59e092cce50a8cd9bc395739b904d92f228ee446a4ebe610b893ae3325e0ee8c1877cf5398760aef0ee47e76ab6cc57c106a3d3c
+EBUILD httpretty-1.1.4-r1.ebuild 2135 BLAKE2B 866849ee493edefbaf9d4be0844cc34774f639964bdd6d72bf72dc810a28acaf3ed6c68db905b8c2ea0b782d483d6f04ac48a6d5a69998f9b7e46134dfa25ebe SHA512 1a876ec9c2e97a649d225fc1b3bcb210214f5f4a786dd31f6cdabc9e866b4baa3b106fdcd898eb5d673694aa1e11d446a19f85a36f02286f3ac38885b384d01e
 MISC metadata.xml 616 BLAKE2B 65eeaf117de44f4d836a207f29728912c57ea62ca6102334ab183beb5e48e4f9fe683b3356f39a8456e3981e7c9470f312d516f47a2b14b6c08befdbd777a778 SHA512 2ba0ba780ad8dba7c193d0c10eb4b993f93c8ca0e4c99d22a70d3bf86588e9b9df20f560a91edbaa72a95beead383386dfc96ae16299ef03936257d4e03a4b77
diff --git a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
index 95b5b255ea26..3be1736725d2 100644
--- a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
+++ b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
@@ -36,7 +36,9 @@ BDEPEND="
 # We're skipping redis entirely since it requires a running server.
 BDEPEND+="
 	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		!arm? ( !sparc? (
+			dev-python/pyopenssl[${PYTHON_USEDEP}]
+		) )
 		$(python_gen_cond_dep '
 			>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
 			dev-python/httplib2[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 90acee4932a6..72736298b936 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,3 @@
-DIST importlib_metadata-4.11.4.tar.gz 44160 BLAKE2B 83b39ac858c5d3b63becc19be1a62ce253ce873afba16e5dad085fed531c5dcefa173e1644de10bef6318965aa132331b5d037dd7c0c8a0908880d97764b645e SHA512 2b5a6b0788103f7f0245f172832576852f56316e1c05b32f194a56b5fbaccd987c0315971f7d32d1b225ab74c12dc9f1aa96eb2a9ed2ebfd7613a9b816398560
 DIST importlib_metadata-4.12.0.tar.gz 48153 BLAKE2B b12b61a02be6428f80de418b3932b917066f6e9396d85158f8f31fa1b800c9cbd3f7dfd7cec48b51cc6c4ad5e5532136cc6ad7ea688c70466621976b232d9ccb SHA512 a7e3b8876665880a42bab885014199eed90efafcb386b89fddf62f3a6dbf51b192a0b9d208a40fd1f8b6db9d1bf80cf6d6753c1073196daa54dffa22a627443f
-EBUILD importlib_metadata-4.11.4.ebuild 1488 BLAKE2B 16a21675ed83d39af765d032a32c2761b64e6e0f83282b8fa957e9ca4dfb4e51428ecb1b9ac0c2fd3470546b853b120bd7f5fa69908a5670845eb2a559b3731d SHA512 a0a9b7a61ca7c9002531562c1c783f4ac41774b14e5c91ae251a59b06ca3fa5de23fa6de42f6cff6c8c99aad3953dff7eaea304ad1c639caa6e6e98665bd7540
 EBUILD importlib_metadata-4.12.0.ebuild 1488 BLAKE2B 16a21675ed83d39af765d032a32c2761b64e6e0f83282b8fa957e9ca4dfb4e51428ecb1b9ac0c2fd3470546b853b120bd7f5fa69908a5670845eb2a559b3731d SHA512 a0a9b7a61ca7c9002531562c1c783f4ac41774b14e5c91ae251a59b06ca3fa5de23fa6de42f6cff6c8c99aad3953dff7eaea304ad1c639caa6e6e98665bd7540
 MISC metadata.xml 646 BLAKE2B c3f9ff98b5090d22a37a5a5b36b6c8523b4d1ee804c05c880bffe6a45ee482023d4c037b49332bfa93cb60cc5892d1178b486cf1d2e0d4c44d7da8d292e406d5 SHA512 e558c5ae62e98685a43bfafbff6fc5d5339965a9bf8c6bf0bd8cd5b542c94ae6ecaf0a04e5210b211a32abb65b37c5db6af64dc7d74ae79ec31075fcc659c9f4
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.11.4.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.11.4.ebuild
deleted file mode 100644
index 49339f2d9da7..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.11.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' 3.8)
-	)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index 2cf26646c097..e8e1a81474b4 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -1,7 +1,4 @@
-AUX ini2toml-0.10-test.patch 1883 BLAKE2B 88402feed5aa7e51587f7297b8c3afa058d04e0f878acf1a6af5dfab77cb50d0c5708cfe9e1a45d704f7fbaca068cf9f3d0838bdcb6e1aa3145129f6239180c9 SHA512 1df613aa1e793716e4b0e7a83b3f15bb69f7abd5c43831e0d09dd4ec42ee8ed617586188bfb9bfc6863f93f4cdeb0114226e9da44c8b3a73b04705f7c9139c87
-DIST ini2toml-0.10.gh.tar.gz 93535 BLAKE2B 8d8a5b31c53b9194e578b473dfd562b1b569d701b36b267ec4f59ea75ec03abd6e1df5541327b9414a2f1c04b1cb41ec57c6f900007f69a3c51a172143d2eacd SHA512 3d88f97c50a13fe3878e3fa35d70c9051874bec99d278411dcc7098d86898deb0e490be26f293e9a304d4c9a2842274e68126a2d20dac77b526161fde682dd75
 DIST ini2toml-0.11.gh.tar.gz 93696 BLAKE2B 0fb52b346065421049fd377a62de4189a6d261ad12c00679c97568a0e7b7f8fc7bf1aae2196b8fc70489d547c0ce9be1347336d25769c7fb383f9fec4d4aa205 SHA512 7329fd3ba31567638fffce22f2370c2055503bd4abc3d7dab30b1828eb54204d31036753efddfab52e79703ce7583f6070e1207c95345096c0751c2d429fd6ea
-EBUILD ini2toml-0.10.ebuild 1755 BLAKE2B 4c7a421ba090d291b492c5284c77ab8d606d720e377f94e8b7da7a15188fea23694be7d1bae37f5d3c05fbe2e9a29a6111dde08c389456204faeb8446c4ab23f SHA512 0e1aae211ad3a54bfb2964b0a0e08572a5832ee351f40fc92019ce9c5f9ae3e36091f62ea94478076f97a381aa049fbc568df3ba190ba13224e7aa19500e617b
-EBUILD ini2toml-0.11-r1.ebuild 1177 BLAKE2B 6d323c7ce812c44219351aef4a7f51b736df0753f0679b345f86be6ea24bb74ac00db4e608445c03e14bb68e75a9f3870889c6169203281c4253c88bb21e1886 SHA512 1442de3fa0b5941f566e687701cb65ab55830797338b8ce18bea71ad374253d7287bafb5003f13d607cea6f0bcfd9540a0d6769888b98a477dc4ae10db37f9c4
+EBUILD ini2toml-0.11-r1.ebuild 1182 BLAKE2B 27c7a6da18517f83420827a10be7aa53f7202b7e8b1ab22d91269973b2140f773da4420085a2313ee1175964bfa7de123f00dbaa3c0296c375e0e47758609476 SHA512 9cf37c417b63d1e006de423a9154d505d4c007ddb19d10dddfccb0cb32159acf078f2f718a518b9b3bbda347d186142d8472579f892356495ddd0ff6221dc7ab
 EBUILD ini2toml-0.11.ebuild 1711 BLAKE2B 1837c2f2e3af0b878a7e3c0a58aec8139ad2582048ffa89d5b80720c700bf53f8180db7221678209bb3aa1de89f938416df22822a4a37316281ad549bdc8525b SHA512 2bb9474cbdbe15c9d2c9ec4f59fb2661171b54d27a40722996f22b5c5a2886c0676b2ae4a8a1ffb65cc8e7c56236a9d2a8c8cbb3fb0714ec5c9a0e47b6572127
 MISC metadata.xml 374 BLAKE2B d1d096c2db4d1975e07553486be8e1ef66a63338b6a6617f71131565b80f612b9d50ca7c039d0b37b02eec56421231f52833390eb8536de44d4edd7c90d307f2 SHA512 21a272e9c3a7eb3e0950358f8ffb90b961ff0e39073519ed0b36660dfae91b24f8e09e3b89a20dbeadba45d995eea4bb89d484acc04a7251dfb9f33603bef998
diff --git a/dev-python/ini2toml/files/ini2toml-0.10-test.patch b/dev-python/ini2toml/files/ini2toml-0.10-test.patch
deleted file mode 100644
index bd1d8b093a33..000000000000
--- a/dev-python/ini2toml/files/ini2toml-0.10-test.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1a40d273d6671657ef10081123a675bd22e4bf06 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 2 Apr 2022 18:21:39 +0200
-Subject: [PATCH] Support duplicate plugin instances in
- test_list_from_entry_points
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Account for the possibility of the isort plugin occurring more than
-once in the plugin list, in test_list_from_entry_points.  This is needed
-to avoid test failures on Gentoo where tests are run in a venv
-with --system-site-packages.  As a result, if ini2toml is installed
-already, it grabs all plugins twice — once from the venv, and then again
-from system site-packages directory.
----
- AUTHORS.rst           | 1 +
- tests/test_plugins.py | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_plugins.py b/tests/test_plugins.py
-index a1e96eb..9b52432 100644
---- a/tests/test_plugins.py
-+++ b/tests/test_plugins.py
-@@ -46,6 +46,7 @@ def test_list_from_entry_points():
-     # Should return a list with all the plugins registered in the entrypoints
-     pluging_list = plugins.list_from_entry_points()
-     orig_len = len(pluging_list)
-+    isort_count = len([e for e in pluging_list if "isort" in str(e.__module__)])
-     assert all(callable(e) for e in pluging_list)
-     plugin_names = " ".join(str(e.__module__) for e in pluging_list)
-     for example in EXISTING:
-@@ -54,5 +55,5 @@ def test_list_from_entry_points():
-     # a filtering function can be passed to avoid loading plugins that are not needed
-     pluging_list = plugins.list_from_entry_points(filtering=lambda e: e.name != "isort")
-     plugin_names = " ".join(str(e.__module__) for e in pluging_list)
--    assert len(pluging_list) == orig_len - 1
-+    assert len(pluging_list) == orig_len - isort_count
-     assert "isort" not in plugin_names
diff --git a/dev-python/ini2toml/ini2toml-0.10.ebuild b/dev-python/ini2toml/ini2toml-0.10.ebuild
deleted file mode 100644
index 0e0c3b630fa1..000000000000
--- a/dev-python/ini2toml/ini2toml-0.10.ebuild
+++ /dev/null
@@ -1,68 +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=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically conversion of .ini/.cfg files to TOML equivalents"
-HOMEPAGE="
-	https://pypi.org/project/ini2toml/
-	https://github.com/abravalheri/ini2toml/
-"
-SRC_URI="
-	https://github.com/abravalheri/ini2toml/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
-	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/tomli[${PYTHON_USEDEP}]
-		dev-python/tomlkit[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test.patch
-)
-
-EPYTEST_DESELECT=(
-	# pyproject_fmt is not packaged
-	tests/test_cli.py::test_auto_formatting
-
-	# fails on whitespace/comments/formatting
-	tests/test_translator.py::test_simple_example
-	tests/test_translator.py::test_parser_opts
-	tests/plugins/test_setuptools_pep621.py::test_move_entry_points_and_apply_value_processing
-	tests/plugins/test_setuptools_pep621.py::test_split_subtables
-	tests/plugins/test_setuptools_pep621.py::test_entrypoints_and_split_subtables
-	tests/plugins/test_setuptools_pep621.py::test_handle_dynamic
-)
-
-EPYTEST_IGNORE=(
-	# configupdater is not packaged
-	tests/test_examples.py
-	tests/test_transformations.py
-	tests/drivers/test_configupdater.py
-)
-
-src_prepare() {
-	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
index 4ca42b40bd3c..64386dec26ae 100644
--- a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc"
 
 RDEPEND="
 	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 2e305e5cb807..c655a9c2dd03 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,7 +1,5 @@
 AUX ipyparallel-7.1.0-test-timeouts.patch 2067 BLAKE2B 577b33b730f110775dbd61fe02d06834fe3c4eb3c730d6df16730bbc877402e9f4756b74691bb977c3892ff981d374a4d1b439bf2b682e76c496ce8502f26583 SHA512 2d0f9fb4966be06299b40cd2ad974b4f94cfedea84fcee38b900ce4596b15cd3963068fc374aa1c0e54765b92d68c5233965fd2d3696bba5474da24917d1f009
 AUX ipyparallel-8.3.0-additional-test-timeouts.patch 1707 BLAKE2B c3dc45f6b05fa7abf551d3b8a950e078a42a709a74d8fe8c45b88ab6afb7996f822550eadf46c54da18cb7596e25cc7ffc84b46e033803a665e323273669e0fe SHA512 9b7581e02571e498155a73ac573b8a994ed414f462cfdedc5a96d9d30dbdb7c44f9c1827f86232f2a0dc273f34901a46aa40a8822ebb11a74e0890660f2f77f4
-DIST ipyparallel-8.3.0.tar.gz 6862893 BLAKE2B 9009f0fa06422b4dcd9e920d6a568030ff9b20695f3a9eab0f730b48c08465bba7682929c139bac3ef65739be2152224ca922faa6a02b6d73be2f3fb572afa26 SHA512 01ae448cd3274aa752abb033706e77584bc164c7cad626970269e516d33dda949fc0bab9a5cc3f018b2aaac60ee55078780c02ba3c9a2079f12036a869a1f339
 DIST ipyparallel-8.4.1.tar.gz 6843301 BLAKE2B 1ca0056cfa6827f5eb145584ea634d224119a485f1139964988b07bcd164fe392bb032794098bccdf67b31f74030e62e917c0a451809e0d14fae323308b2b0ab SHA512 640489b3920b91e1b2f83def00a06e8ec45c61bd7ebe33a3e4a30560e2b0acdbe0a98a685d868dd7bce4c65920d378ab69efca75cf0ae7f164ee792c870a297e
-EBUILD ipyparallel-8.3.0.ebuild 2701 BLAKE2B bc2bbfceccf127376412f62f475b572783b611d986bf617686306c536909df9044e2e4fd80e97492d9c7f45ee0d05eb81aa2ac11c64f1490f8c5d600dbef788e SHA512 ce188594d14a605d7f9d931bc02797cc95de81490f97a942cce95afc6553e2f4dfcb86a2427d2d77385965ab8e91c031314673e5e3c715c9f09103c2c075ff4a
 EBUILD ipyparallel-8.4.1.ebuild 2783 BLAKE2B 73862d6492219ae8bdb35c257b45707c4a2125622aafac8c7ef515d6e6cef6545ff71a9aca513782a0c843c6a5f2bcf8abcf6757d3154d3837882483e4546d93 SHA512 1351643b4e6e82483cc70179a8e7937cba350c34fa9d26754351d3137d64c01f6e3f42bcdcef05e800413c3c6ca5083cb0a60053d74bfabea2bf63b03673eaac
 MISC metadata.xml 531 BLAKE2B 92dd755dd3036f653f24eda893979487b8d5bbf3c369f3f10c3fc2e69ad6aef03cb6eca295bcb8c6f89f0838780c20132bfd2a33bb38b56b227e97258447c2e0 SHA512 fcd131d18b012d1511468777dd72e07ed28a514419923911082229c0256b9003d9afe2048b6c339cb5c94307026b52bc4e9b6781d45660178d18385d71af8f21
diff --git a/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild b/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
deleted file mode 100644
index 6693ba03636f..000000000000
--- a/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Interactive Parallel Computing with IPython"
-HOMEPAGE="https://ipyparallel.readthedocs.io/"
-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"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-18[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3[${PYTHON_USEDEP}]
-	>=dev-python/ipython-4[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-4.4[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/flit_core[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ipython[test]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-tornado[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-# TODO: package myst_parser
-# distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.1.0-test-timeouts.patch
-	"${FILESDIR}"/${PN}-8.3.0-additional-test-timeouts.patch
-)
-
-src_configure() {
-	export IPP_DISABLE_JS=1
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# we don't run a mongo instance for tests
-		ipyparallel/tests/test_mongodb.py::TestMongoBackend
-		# TODO
-		ipyparallel/tests/test_util.py::test_disambiguate_ip
-		# Gets upset that a timeout _doesn't_ occur, presumably because
-		# we're cranking up too many test timeouts. Oh well.
-		# bug #823458#c3
-		ipyparallel/tests/test_asyncresult.py::AsyncResultTest::test_wait_for_send
-		# We could patch the timeout for these too but they're going to be inherently
-		# fragile anyway based on what they do.
-		ipyparallel/tests/test_client.py::TestClient::test_activate
-		ipyparallel/tests/test_client.py::TestClient::test_lazy_all_targets
-		ipyparallel/tests/test_client.py::TestClient::test_wait_for_engines
-	)
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		# failing due to irrelevant warnings
-		ipyparallel/tests/test_client.py::TestClient::test_local_ip_true_doesnt_trigger_warning
-	)
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# move /usr/etc stuff to /etc
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	optfeature "Jupyter Notebook integration" dev-python/notebook
-}
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 0f0d1d8b56f8..fc10e6086747 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,13 +1,7 @@
-DIST jsonschema-4.6.0.tar.gz 269939 BLAKE2B f214f65fbb908029f221789ab3857db9cbc1a7bb355f04a46bc7798514ba73ac3ba6f78cc3eaf985c19b16607ea6cf38bf46c9a8e19b1b1aef0138ef74239a4c SHA512 82d9e0c7de867c4a53b67b9dc79a38a76e384f5d41c66b52c57d407e03eb97faf8ebf41370ef08b30966f13eca210f94916b6a40347a2a75088e33017ccc2f5f
-DIST jsonschema-4.6.1.tar.gz 278452 BLAKE2B 0b5c90b790cf7430bfbea4b38f90acec6fc256bf521d9552b463489751da3f889b43021e9d94c3ed4bd7704c462141d73d25273eea1331c85a0d2d04d5c9ad18 SHA512 5c0e2806915ef4545092b0bffe4cc1207d9a6f2a6920c10894d5b7b2a9ed665093b7a9a68114d1a05528869e7d8aed902e7569800db4393fa810c0f6853f713d
 DIST jsonschema-4.6.2.tar.gz 275975 BLAKE2B 7c587e8b5c5eff097390e6254ae633445ffece2bd3e9c003dca730bd332c4d3c236ea10225dc81b95ef9359a9309831290b106a07e80945574dcc2937bcd4983 SHA512 e41d6bda1bd6b12174201a70b5ad5209ab7c445faa6c947408f0fbc255839f3379ffe8b539760d993b435972936e4052300dbc420d4b87051f33180bced7efb2
-DIST jsonschema-4.7.1.tar.gz 278393 BLAKE2B 6840e84fac982c011c8ee7f7112d5dec0575f8491efa00b319e4d7a1d36f306a893a77ce962265505efe2493266fa6da932fe744dbf9906c2a5439d19e291135 SHA512 5fa43906a2d766c8b568f375ace8ff96d131dff634fc3c65ab9c8f4a70e973935f3626e4537ab8a04d374dd0b5e6a311849abed0dde4faabd53a2d48cd6a5ac7
 DIST jsonschema-4.7.2.tar.gz 278495 BLAKE2B 55c25847e210e0bdd3bec672b4b6a4eb1a2e2ec5167c115c34a2d0b2de079a00eaff8d901386b475fc26660887090896e78e3a38c1805f5b767fa1eece740e3b SHA512 c624d7bf317ca20fd8cdd248ec7d7679fde907ab304f1a092fc7a172464f43e41904d3f88df57e1351043b978448f51166a09af3625f00a9ad4d7353033b80af
 DIST jsonschema-4.8.0.tar.gz 279424 BLAKE2B 9e8936bde13841f9edf42ffe214ce8d1aaae8b9be4c3040871f228399a31b4292e8cfbf4bf4261822ca1b88622cb69cdf0d55bd2cc51bf191f6e364e9bfb94f8 SHA512 75a7593eb8b0163ba428f507ed4fd9fa6d51567f284776af96f4d79cb507a69666cc048034bfa3a401f960295779e935562dde4e97cf3f7b3b4571bc28b9dde7
-EBUILD jsonschema-4.6.0.ebuild 1470 BLAKE2B 83d64bd08bf75a1a8a37dc993658b3f235a6a83ec0c35b5ab25ac165cafc4a8e5d70855fdecef07b40d788ca699d9a01514a2e1a3050d7d457ea71c2527fdcb0 SHA512 16dfb19e0f76c4895172f529ed19c1e467fc7101543c913f467832c2cd45fbd23f7e8e59a07301b07381c3e8e86f68b0930555dde52973af3622e7b3e65862cf
-EBUILD jsonschema-4.6.1.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
 EBUILD jsonschema-4.6.2.ebuild 1470 BLAKE2B 83d64bd08bf75a1a8a37dc993658b3f235a6a83ec0c35b5ab25ac165cafc4a8e5d70855fdecef07b40d788ca699d9a01514a2e1a3050d7d457ea71c2527fdcb0 SHA512 16dfb19e0f76c4895172f529ed19c1e467fc7101543c913f467832c2cd45fbd23f7e8e59a07301b07381c3e8e86f68b0930555dde52973af3622e7b3e65862cf
-EBUILD jsonschema-4.7.1.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
 EBUILD jsonschema-4.7.2.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
 EBUILD jsonschema-4.8.0.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
 MISC metadata.xml 703 BLAKE2B 240a82a967bf7e2c200a2359dc691cbfa119fbc415f41c594c981a0da551a779b9d6afd6f8aadc7daab074579d6964455cf8bc8de36f01e986d344d1082095c5 SHA512 88cf98273ec371942846bba05ec8cc38939b1ff1a4f35e16f5764d09e67830e6f86b741ccb11ca487071eef205d193f5d0ca5ab156eb429c89d10c90778594b4
diff --git a/dev-python/jsonschema/jsonschema-4.6.0.ebuild b/dev-python/jsonschema/jsonschema-4.6.0.ebuild
deleted file mode 100644
index 43d7b3070a9c..000000000000
--- a/dev-python/jsonschema/jsonschema-4.6.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# wtf?
-	jsonschema/tests/test_deprecations.py::TestDeprecations::test_version
-)
diff --git a/dev-python/jsonschema/jsonschema-4.6.1.ebuild b/dev-python/jsonschema/jsonschema-4.6.1.ebuild
deleted file mode 100644
index fb6400dc457c..000000000000
--- a/dev-python/jsonschema/jsonschema-4.6.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# wtf?
-	jsonschema/tests/test_deprecations.py::TestDeprecations::test_version
-)
diff --git a/dev-python/jsonschema/jsonschema-4.7.1.ebuild b/dev-python/jsonschema/jsonschema-4.7.1.ebuild
deleted file mode 100644
index fb6400dc457c..000000000000
--- a/dev-python/jsonschema/jsonschema-4.7.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# wtf?
-	jsonschema/tests/test_deprecations.py::TestDeprecations::test_version
-)
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
index c7eb8faeaa00..013bdb296573 100644
--- a/dev-python/manuel/Manifest
+++ b/dev-python/manuel/Manifest
@@ -1,5 +1,3 @@
-DIST manuel-1.11.2.tar.gz 51846 BLAKE2B 0650c9db757a7e8bd0ba12dcdfda8ff071107d460fab7d24715796e477960ebe41375a10cd83a1c7881c76e6fa1e7cdd5cda383be75adffeea7e1cd6d763df13 SHA512 bbfd3ca58ccb0fb40ecbf54a5be0e73989e93ec026b8c686a7ef4e746c650ffed6f2fc5f119fe58e7c13a4a13cacb8c568384a69b1068413ab6bd6f01664a72f
 DIST manuel-1.12.4.tar.gz 45369 BLAKE2B e15f9261854fbad8ee1e1dc8645ec286a212c460a78fff1576b6886d8bf462ffe9a5484338fd9efc2bf053a7689e16b08de55f763ae319e66a363c5c28cf2a60 SHA512 cd65307f2ca94e66d88bc0c7c75702d49f505b358ebb812fd20906036ba10f2d1d11d2d69404b88c5f10b584dea05a988b5dc8ba07210b9d20ebd8a11b701633
-EBUILD manuel-1.11.2.ebuild 752 BLAKE2B 44a49f6ec888b5fe8ed11a5c566310f2fd3336e92453cf4422958a2e17b929221ede214bca9bbc7b931bd7a7fcc730c4e31abc21f1dda1faf91b317f0a016ec3 SHA512 3e47afbe1e22476e9119fa2e045c76630976feea3e4217922460602ed55ff42d645a7602c355ee520721eb73db45880d0eb02132abf3b704455f861b0c8d42ac
-EBUILD manuel-1.12.4.ebuild 755 BLAKE2B 4d9ae0e77ec12519e44d3c22392d6aeeda9650a14ddb581fb16b660b231fb214506c2cbf6d4bdd7e7b0807ddf45bc75fe6d47debf35ea898dfcaf8d7b1e57ca5 SHA512 9b6f63427b60d972fefbf0cba68d82e32a1275e05cc08556d5a6185b2b2749c280918a669639ac23af1ae6d08c9941b2091149fed95fd71df843e58df151ace2
+EBUILD manuel-1.12.4.ebuild 752 BLAKE2B f4927ae883af1e7591d18f7bf4628c277ae705545f6be141815fdbd3a2b7b1ed7bb93bfd2813647c7dd98c2a9852b20d88164b6dbe10a77506c82d6b87f11f17 SHA512 e905aa42718cdf3ffb0caabc283ec84a1b8e580e32f22a1e06fb7d5e6c11adc4eb1be5c94e6ef6e335b8ce0a566185ad5081236d48c03cc460aa0b131e8b8e35
 MISC metadata.xml 391 BLAKE2B 6b95f9d29d8df2b9f0cfd85012a7d751f443c3bc67f6254c376f8cd3c1c66e2972bc165edc8db6b5ef2851edf3e870cc2ca76d3f6f3c06daeb247ee349407f45 SHA512 ace493867fc08487876a55331b619a62b01e269d7b5307b2ae9e016d75ee9058f2e1354bd2e3243ef1b0cfff30cc3f8f661675e03c1ac07fb805f443b31c64ad
diff --git a/dev-python/manuel/manuel-1.11.2.ebuild b/dev-python/manuel/manuel-1.11.2.ebuild
deleted file mode 100644
index 174420a9eaf2..000000000000
--- a/dev-python/manuel/manuel-1.11.2.ebuild
+++ /dev/null
@@ -1,37 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lets you mix and match traditional doctests with custom test syntax"
-HOMEPAGE="
-	https://github.com/benji-york/manuel/
-	https://pypi.org/project/manuel/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/zope-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# unused rdep
-	sed -i -e "/'setuptools'/d" setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/manuel/manuel-1.12.4.ebuild b/dev-python/manuel/manuel-1.12.4.ebuild
index 735e15d14dfe..53d57dc4f904 100644
--- a/dev-python/manuel/manuel-1.12.4.ebuild
+++ b/dev-python/manuel/manuel-1.12.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 355e59baa68e..c151edbc83ef 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -42,5 +42,5 @@ EBUILD numpy-1.22.2.ebuild 4522 BLAKE2B f3dbd009337631f3f72590d4ed8e1dfd910a624c
 EBUILD numpy-1.22.3.ebuild 4809 BLAKE2B 591d29cf3f8786179f8c883d185357db303bb90da5b577d4fc8c0d548bfe2296d247d10901ae931e276db68e2ef197c38a34740767afe9f091b5bd266ae50442 SHA512 a2973b01c557c5956ba9aebb8f9a15c56fabc321a672f61b06e19fc0f83c03e04856128eea37453b57797ee5f45572952dd67f51436a493ecfdc7434cfb6688d
 EBUILD numpy-1.22.4.ebuild 5018 BLAKE2B a3295f9dad57cd39b62c9095bc5c1e51274821e9747b8147559aab6a572e2761ecabfd10fa77c160e7c0bfd694dfb2ad0b51e2c6a4c1f8b89cb8db73af0c0af9 SHA512 1d8ceb254e27795b592aba6a1347047528d5e1990a339c94b480b0b59cd5470107efa9c61793dee5d0f75de84bd13016d59d837df7d52995f5a4a4540e7ef18f
 EBUILD numpy-1.23.0.ebuild 5073 BLAKE2B 32f377be0893beec58c4074d5514ae8bfefaf0a458f398bd481222c5f06045580c3cb21d963d06b8af8203f2d666f630e26ed313e8a1792e05ef5cd4b93af2e2 SHA512 b31aae22b0569df0e9871bf32c80fb7d273c90e05f04d2645c873a5fdc3a5d00150623b49e49a06d18dbe52859ec559d72dec07cf6215a4d6cad639400a05ab6
-EBUILD numpy-1.23.1.ebuild 5067 BLAKE2B b6ec52209a0e2abc3695d53adf1e0417755fdacbecb34da68275eb40491bf9b57f7bd6cf77b745788308252aaf56704d3b44138a8c686e72e07d95fbb70108f1 SHA512 299545f804473de8db3f820cbcccb741cbd172edd13b6e453733c2e5283c48de37d8a6da81fe60646bca2df9eecb8d80f6a0ded5fb6bbb0ff066787f49b109d8
+EBUILD numpy-1.23.1.ebuild 5066 BLAKE2B 4f5adb42a2631323eb676097ef6cfa343bd53944de342f382e76d4c93e7b9578dbe2f04959a00d17bb8b1a58ea08c4af2503e19bda6f6c1f1b5caab21a33e514 SHA512 d8d3e30fb62933b0907ef322bf5dec7331077cba94fc7cfe32dffdacf3f187d2575ccb85f3bc86eb34d4a085692f4f753153364ec05dbca734f369ffd943d734
 MISC metadata.xml 930 BLAKE2B 8731116ae6d997dc77539b6ff9a8aff2466986888e3fc2c2a77499522360ba5ba11ec61e4eb6756b7cdbb9d7dafe05a862708dcc0735260e8af038a42dea3419 SHA512 1db89ba1a99457bef29a9501e2d14c11904251163172604fe58001048beb477eba5b1e4784c8636d0eb6767614b80a7341823a9d264a5663cc055a5a2c437390
diff --git a/dev-python/numpy/numpy-1.23.1.ebuild b/dev-python/numpy/numpy-1.23.1.ebuild
index cf7c6039c1df..329105563e47 100644
--- a/dev-python/numpy/numpy-1.23.1.ebuild
+++ b/dev-python/numpy/numpy-1.23.1.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 "
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index db79caf61f0e..fcabfcf9f2a3 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,3 +1,3 @@
 DIST passlib-1.7.4.tar.gz 689844 BLAKE2B 38f616105ba70cf93cf36383c73f2a4da7bf66ced2844effffe74d9f7c29ee0aece5652974dd1414f16e32fbe6957e2e921cf01bc59daa70195a6d50a4a3bf2f SHA512 350bd6da5ac57e6c266ffe8bf9684c8c2cce3fc6b513eb6c7bc1b302d2d8a1b701e9c01c953782520a2ac37b7ec1f6d7bd5855f99f6ee0e2dbbf33f2d49a9530
-EBUILD passlib-1.7.4-r2.ebuild 1372 BLAKE2B f7302b1927e4605d29ff5711917b34adad611c29f7f62589258757643cec443000c442ab6c1890acdc25d994489a4613eac59fa32f1faa8f4625830af03514bd SHA512 5e42070795a90fc68c5a5ee214188b9e7c446deab53482b048273d2b324d3226ac0d14f41a4bd70cada30050fe1aee5abdd78076886f2cd9d6b2e9fe08539823
+EBUILD passlib-1.7.4-r2.ebuild 1405 BLAKE2B d20dc0c07ecced9238cd35e478f15d0d4920b164055ff8d2d30f73120498fb7064b27e4f6402481592e886e00713aceca53a2c005efeae69b2d503bf2a0b178d SHA512 89f5e2b795a9908cd047d0328dd7a0d9cc459874ed0bf883cb154d4e78397c2b727d38925d96e12d5cda431369f563ce87c11df1cbefb700c21319c861304bbb
 MISC metadata.xml 618 BLAKE2B ae1d81ff9a45b639031fb9e143899a866c74fd20a5bba55d9defac47c7fd51e491822b272983d19546f30d636f930f3582441318d338e66f25d30e97160f74cb SHA512 45a87efb8f21d2b1e578f5bebfc4a820589aa401ffc623ee5ea81888700ce59cb47c769993ebc2165dd5fd6e3051c882c8dd60ee068a6113390b16ba424325f6
diff --git a/dev-python/passlib/passlib-1.7.4-r2.ebuild b/dev-python/passlib/passlib-1.7.4-r2.ebuild
index d31eb973137f..8a09e521123b 100644
--- a/dev-python/passlib/passlib-1.7.4-r2.ebuild
+++ b/dev-python/passlib/passlib-1.7.4-r2.ebuild
@@ -24,9 +24,9 @@ BDEPEND="
 	test? (
 		dev-python/bcrypt[${PYTHON_USEDEP}]
 		dev-python/scrypt[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
+		!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? (
 			dev-python/cryptography[${PYTHON_USEDEP}]
-		) ) )
+		) ) ) ) ) )
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 0e58332c09b6..c45af789a5bb 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -8,7 +8,7 @@ DIST pip-22.2.gh.tar.gz 9278410 BLAKE2B e32fe63e81593a0ec9c0110af0f07f1a47ddd3d6
 DIST setuptools-62.3.2-py3-none-any.whl 1225929 BLAKE2B 608952e201f749ebf557e3962ba9856d5bdcbc534f3a25598cab0d6c53282cfb3b9f007ba135497a8addf49db4c02bc4387c486d95a4529d01ce4114154ec28a SHA512 366d69dc44e326dd7549cdacd8dec481a14dce4feef4338adc38b9de5c4c338f04d61696e13ce8603be1315f2e8734100f92d3fe4b4b11843e19f550c9631978
 DIST virtualenv-16.7.12.gh.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
-EBUILD pip-22.1.2.ebuild 4211 BLAKE2B 2500a5b290162ae49d1739e234e9a601f28e8468a1688be9f094e672cba3464b8392232669fb0d3599ca0b92a79c329f31aecbbb0781bf51da0cec4afe098a95 SHA512 6345aee9c220b2eec11f5c17416d22615ad444aec4dc46f42a399cdbca00272f39b221bb0670a39dc9e171361ec6747911c16d57d27322fab30d3c9a3e876ddb
-EBUILD pip-22.2.1.ebuild 4333 BLAKE2B c6b975078a7e985e32b9787e3700bca0d5cc844e008a68908ea546e7592ab069f5e4dd3543a9860d23f5c08e39cb804632fc3640860e6c8ebf540b81b9139250 SHA512 fa58d29678a1d4c998204ced059980dee2b4d4d1056b9106adc097d53b2d0176a71476990551f495bfbabf4f021596d5075087112dfbde91f09f8338575edb46
-EBUILD pip-22.2.ebuild 4331 BLAKE2B be4e464d140f3981feb6180d66b55025e675c76a5dd6885e1d310a0fa1788b156223b8371c265b3e336e95bc411b1243259b1edc53837553758f5308aac2ac04 SHA512 d9ab2f0c811a1af178268ee49c6781c6a48e2be5b07034b3863777adb3f957c55db48895c2bf1d7b6623a60b77e0e970a711f6bd138eb9914b696ae181477b08
+EBUILD pip-22.1.2.ebuild 4244 BLAKE2B eb572300446fe1697e4201024ba005d25edfcfec50c4102c2053b8b586af60ea261db2898e48b7e8b4f07d9deb289f5f6719918f66132ad078ba7a35756be7e2 SHA512 737f505103c8e2401cae1ba09f25407c598379bf085d28d9761abf93d4451d67c5aa08a8f446b5a03da2bf3ac68afb2f1bb6e57e0c8fec3b8fef4cd63a0b5b1d
+EBUILD pip-22.2.1.ebuild 4366 BLAKE2B 33d4c9e6fbcfdce50fe035c1f1d50bfb6c17a7165ce3aea0e29701fbc346299ca9d36b4af9639f7db0aa50dfebe9deeac1a6d43b462917cd01cb8509e2fe01f0 SHA512 f4ad58b7d2d4feac0324543becda9fa5b89847f6010297900c95e65a4f5c994143134189a540bc38c60601d12657e8c6bb5ba0b080fe0ee1cb18c184128ef5e4
+EBUILD pip-22.2.ebuild 4364 BLAKE2B ee44ac5c56d5dbb3c82c635e8ceef223910e75d66b2862329b4b046a6ffb3e1f2b2aa9aa87098f1d193964754f8495195cc45ed44dba1ea34effe026cbac9150 SHA512 6b15f734ad93107cfc848cf7a1261b573c3fad1c64cf1739cac7fbe3b0fbd53eca5d2ee44412a32fb0de888e729d32165a248411703cf49b55d824028ae59001
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-22.1.2.ebuild b/dev-python/pip/pip-22.1.2.ebuild
index 0811bec7ca4e..92328155e736 100644
--- a/dev-python/pip/pip-22.1.2.ebuild
+++ b/dev-python/pip/pip-22.1.2.ebuild
@@ -53,9 +53,9 @@ BDEPEND="
 			dev-python/tomli-w[${PYTHON_USEDEP}]
 			dev-python/werkzeug[${PYTHON_USEDEP}]
 			dev-python/wheel[${PYTHON_USEDEP}]
-			!alpha? ( !hppa? ( !ia64? (
+			!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? (
 				dev-python/cryptography[${PYTHON_USEDEP}]
-			) ) )
+			) ) ) ) ) )
 		' "${PYTHON_TESTED[@]}")
 	)
 "
diff --git a/dev-python/pip/pip-22.2.1.ebuild b/dev-python/pip/pip-22.2.1.ebuild
index d5542f692f0d..5e07d0a0768b 100644
--- a/dev-python/pip/pip-22.2.1.ebuild
+++ b/dev-python/pip/pip-22.2.1.ebuild
@@ -53,9 +53,9 @@ BDEPEND="
 			dev-python/tomli-w[${PYTHON_USEDEP}]
 			dev-python/werkzeug[${PYTHON_USEDEP}]
 			dev-python/wheel[${PYTHON_USEDEP}]
-			!alpha? ( !hppa? ( !ia64? (
+			!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? (
 				dev-python/cryptography[${PYTHON_USEDEP}]
-			) ) )
+			) ) ) ) ) )
 		' "${PYTHON_TESTED[@]}")
 	)
 "
diff --git a/dev-python/pip/pip-22.2.ebuild b/dev-python/pip/pip-22.2.ebuild
index aca0d2742dac..98f0a4fb0961 100644
--- a/dev-python/pip/pip-22.2.ebuild
+++ b/dev-python/pip/pip-22.2.ebuild
@@ -53,9 +53,9 @@ BDEPEND="
 			dev-python/tomli-w[${PYTHON_USEDEP}]
 			dev-python/werkzeug[${PYTHON_USEDEP}]
 			dev-python/wheel[${PYTHON_USEDEP}]
-			!alpha? ( !hppa? ( !ia64? (
+			!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? (
 				dev-python/cryptography[${PYTHON_USEDEP}]
-			) ) )
+			) ) ) ) ) )
 		' "${PYTHON_TESTED[@]}")
 	)
 "
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 9f4b734ac35a..cedc1bacb95c 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,5 +1,3 @@
-DIST prompt_toolkit-3.0.29.tar.gz 417831 BLAKE2B f46ff507c991f6bf9536f0161cc79734013c53dddd9053076a8da7532233138fd179c6adb009af575329b3a78ab5bf6ef34e3d8eba1f5cf80cca951a32cfcc04 SHA512 a0d1562fe4ced52972ca7ee3bc9fe158865461b28be393436651f326cf2ddf0553d49ac8051ed700ef95d3ce2a76b9fcc10d92b6890203aca4e27e050cb814c0
 DIST prompt_toolkit-3.0.30.tar.gz 418985 BLAKE2B 2edc5024e22ccf60ab68afef9958eead5711b88f4f2abfde387e626893778eda5203f855a5590776b25efb3fccea87012d01e39551d192861841dab188d149e8 SHA512 cb0b9d71b09c353f2674052d75ec16a1803e0868ff5dd5625eefae767d45699b1b6bb99e4d98d3bca7ced7b60f52806ec10ed7ccab8a830c62d51baeeace23f7
-EBUILD prompt_toolkit-3.0.29.ebuild 624 BLAKE2B 55f6792522d0e9060e8450a4a746773f224fd920d63330ab4f1a926ec1f2f84384451d9602819dcf16f95924aef7987aec9fdcb619e937d5038c627d76f30e38 SHA512 29e465000f016239bddbca6ac3c9f880ccc670f812d3a9c58ff8b1e17d288bf61464a2d23c33331f472e66ba870a7adb87c7f4be01d11de4d8040374b8f73141
 EBUILD prompt_toolkit-3.0.30.ebuild 624 BLAKE2B 55f6792522d0e9060e8450a4a746773f224fd920d63330ab4f1a926ec1f2f84384451d9602819dcf16f95924aef7987aec9fdcb619e937d5038c627d76f30e38 SHA512 29e465000f016239bddbca6ac3c9f880ccc670f812d3a9c58ff8b1e17d288bf61464a2d23c33331f472e66ba870a7adb87c7f4be01d11de4d8040374b8f73141
 MISC metadata.xml 431 BLAKE2B 534336484c65b57df5e672729ff722b67445948e0485c3a62c2f7081724cb951b5157c600dc6162a3bb857c2be0f378b18670786279ff8b5cff2858588f8ebc9 SHA512 a9bf68326839069c61e70d4ef3fe304706f2543b9b91eb291566dd66f36d1abec00382ae205549a35f10dfc730f4613c5cc5c0ee4d6858538d50c4145bd3b15e
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.29.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.29.ebuild
deleted file mode 100644
index f2629af78381..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.29.ebuild
+++ /dev/null
@@ -1,26 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="
-	https://pypi.org/project/prompt-toolkit/
-	https://github.com/prompt-toolkit/python-prompt-toolkit
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index 592bc675c86d..2cdeac8f16c9 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,4 +1,5 @@
 AUX pykwalify-1.4.0-S.patch 862 BLAKE2B d92c4e8d4d85d28f6df574bfe2f1ab0aa82c32ba8ce2b4a2d6ecdc21fe1db4056351b6aa6dde04d897525ce596ed492781bd7dcf0fba2ca5970a3af79a9abf3b SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9
 DIST pykwalify-1.8.0.tar.gz 62462 BLAKE2B 1593f5e3e15188929574ece60bf6818438258bf024d105ae26323a97a202ac69001a15ca6daaa430970af3659c49da745bcf1f77c23ac72bed2ddca14440d943 SHA512 c77d3072995bb3f61336e725227eeece1dafe2182513e5f67eedeeca3437825b53ac691a991055aad8298db252e2012bc9a61c23d766335fcfbb10a3b587b45d
 EBUILD pykwalify-1.8.0-r1.ebuild 764 BLAKE2B 6f0e97da5005b02d032e3e78c5a15ca720ba4309e2137b7685c198ea1d99cfb7343548a0228e3a3a0c63b8118ad25bc0bf516de4af21fffec4b0bfad78ff5aba SHA512 9598368b799f0a977b69210c43f72e487c8eb9226e45d1ee13a51c8533c2acdd3ec2a6b31152b7a1e24716f691aa31f7b09b8504663ce9d055762d2faf0bd6dd
+EBUILD pykwalify-1.8.0-r2.ebuild 799 BLAKE2B eafef580274fca4ad19053d65840f786f99f26a4fe465bd78fa39a873794b622e2813e75a20d7fca2983b96d3cef3d438cda4fa5b75bc65ea73dc54ead6d2342 SHA512 fe7d3ab7eb99d2527947cae7ab75a37cf6bba2801ade17c7d3e1002cb2efad0795763bc2bd52d1b8fdb4f8a2b2d4a5e80af5d0ad0cb8688bcaf16773590c7881
 MISC metadata.xml 394 BLAKE2B e7262ef0692f68f8fd8c2d8b45cc7a18efc5c2759a7998d3c065f17450d2f4de09d4432961c7327f68fbd52cd61a9183122f19fc829a9c93a6a40b36ac3d9952 SHA512 0d96c9c00d4cd4a64afd790df32cc1536afaeb952d6172a7c3efd227c9686c7fe743e30f94c218e73ef5911c59b23aa40a9e5f19ded5474987d79e7337fcc6b1
diff --git a/dev-python/pykwalify/pykwalify-1.8.0-r2.ebuild b/dev-python/pykwalify/pykwalify-1.8.0-r2.ebuild
new file mode 100644
index 000000000000..f03443ce87ad
--- /dev/null
+++ b/dev-python/pykwalify/pykwalify-1.8.0-r2.ebuild
@@ -0,0 +1,34 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
+HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-S.patch
+)
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index d9806f695137..20f05ddfe7d3 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,5 +1,3 @@
-DIST pyOpenSSL-20.0.1.tar.gz 173736 BLAKE2B 37e1741425a296142d38c20c70f9950eec2bd043fc58e50c9955b98dc6825111328af852d247b154aa120ab42ea9dc2ae8186d350dd0c664cd5920b9a902963e SHA512 e81e0870398b882d77453b02e972559c0be82dbfe87bd8a48a65e8943acc3ea07dc8c3150b88e299c237496043443d1a5832219c337e4436f99ef419b36dd23f
 DIST pyOpenSSL-22.0.0.tar.gz 178438 BLAKE2B d34c91a54aaf6b28d92ba83c26900fb308835512275267e11a5482ede4ab45177434559a53c64a116aa19c84d65dcdb459aecd3fc5587cb13e21cd2f196a0078 SHA512 3d7695f27b7909eb82f05527ab7551fe90a85a70f20ea980293b59672a62f9b015966180407fa0786e94b01ad1d1acfaa7d40426bb63410efd24a144e559e2f0
-EBUILD pyopenssl-20.0.1-r1.ebuild 1685 BLAKE2B 45b8880c93ddb4cc93850b96080c3c8c1d028e869d06b30b600b73ef41fe2e7613fcb5560e79383b731f21cb9281386aec692a49680960eb6b107529ce79ddfa SHA512 f7efc89043547e592702ee7b834509366ae78e21acd694deef32ff374082767b73c5c7c4c885870a35e6fefe7fc4fcfc7212d713f5519d4f95e5b99458f5e8a7
 EBUILD pyopenssl-22.0.0.ebuild 1528 BLAKE2B 1ee2fa81f0d398cc094bde03512dce68da3b4c8ae84954f46dd0edd4adb0a698640fcdb3e40d131793ccd5f0d7c29b41634a574b0c8cb9cb54cbe4422e57c8ac SHA512 d15a5002a68204ef0c32819fa2adea72157fc777b0c60ebd9f9a5c275843d74e2ddcfc10390eb3c3ff92fd054b36dd6156db13e9621a047ecebee1fd12a17ce3
 MISC metadata.xml 536 BLAKE2B 86db822042b6fb3e965ece87b6b15dcabf76cdfbfa76ba285a491208ad5c6a2a196ca7144a1a73b152decc4df1641ad4c57a1cbde9f90d09d25eef1f6f4da39a SHA512 996d0e20291e744c6c20b38fd750d242920541aca7d92de63ca5b1dcc2f1c10308545797ccf499f38e50dfd04db2bb031e93b02c7c1705908f2363c813294ff1
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
deleted file mode 100644
index 71d0aef7e02f..000000000000
--- a/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
+++ /dev/null
@@ -1,68 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	https://www.pyopenssl.org/
-	https://pypi.org/project/pyOpenSSL/
-	https://github.com/pyca/pyopenssl/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_test() {
-	local -x TZ=UTC
-	local EPYTEST_DESELECT=(
-		tests/test_ssl.py::TestContext::test_set_default_verify_paths
-	)
-
-	# test for 32-bit time_t
-	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
-		#include <sys/types.h>
-		int test[sizeof(time_t) >= 8 ? 1 : -1];
-	EOF
-
-	if [[ ${?} -eq 0 ]]; then
-		einfo "time_t is at least 64-bit long"
-	else
-		einfo "time_t is smaller than 64 bits, will skip broken tests"
-		EPYTEST_DESELECT+=(
-			tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
-		)
-	fi
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index 36e387959254..d7f78609c197 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1,5 +1,5 @@
 DIST pyproject-fmt-0.3.3.gh.tar.gz 14399 BLAKE2B 82af6d6c4424f83ed9a5539d64bfd517cf08df4bb14b7f1321a379a4d87d140f1518444b503731344e5fdbb4b94d92ce23605fe2a1cc978d26901eae98a31b8c SHA512 49c4648e140b34a6d2f27cc01be7253693e79687f2ff8dbcae5ca3cc64c14f5945f942ffb42d1d286ff221e5aaed22dc1f9953216f49232ce311c4c18130754e
 DIST pyproject-fmt-0.3.4.gh.tar.gz 14400 BLAKE2B 3ab116fe4d4f683eb3700ca2cb855744111b806514ef18f56cbe6628bfdb6935b813e852ff6ff64716959f1580e8817f485ddcdec6c463ecf5c8935912316528 SHA512 0e3adddfbe8afe3b9da85033ceea7c4e37f59bf48722a5897f6e7f2963cd95ba9eef7309c095f4b3fbd927a6486a058289cc3fa5f90c0108a75686b1b81d13e2
 EBUILD pyproject-fmt-0.3.3.ebuild 776 BLAKE2B 6cacc964e5da9df0ed7b6a89e6cc4b2a1177ee2fca7dfd97b4e1564f0c9e13644ac2897f9bc8193cd7defaec18820a5f5d0b70740d5a82dc5b734ee2f480383e SHA512 7521d1c96aff9a1b3ea7d84311e410c5730b7a3cf83c12543e49b62c523b688ef009493fdc05de3a8debe29276a884fb5be3e9d01bbca505f0125e0da1ed3fff
-EBUILD pyproject-fmt-0.3.4.ebuild 821 BLAKE2B 20ab66b75eb1e44fd497f77e80292e8ee8208967ca83a5562526fc65fd5a6b854202ddf8113e7b53a3f38a450c7a4847b26cdc023583148252691b11f5dc917e SHA512 c5d65730df6495b3ffa08fd014ccdb56e61473774a7b977ffee5869f933b418cdc8cd037ec5c8bf83b79b0e499fb4894a35b902a5e7c94d2e351e98e3c13d5bb
+EBUILD pyproject-fmt-0.3.4.ebuild 826 BLAKE2B 995ec17a27c44fd85b3fe27e2f5035f352c99bce2212f7cee4a259129d433ffcd4fea81af70a7870f989ea609e0fab6bc6e21d3735d678fd54e83b15441e4ac9 SHA512 39b16c3040a6a8bb1ee696b586feddda6800f05d65f256fb4fc02a80ee70719e82575057d3ce1edf2c13be63b45eec91f5799032895bd64991432d16c7357839
 MISC metadata.xml 356 BLAKE2B 9d15eb809d02ee235382282c3eaaea6ae0f3c0192045829495fae1244f88907673f5e5ec26ee5234f25267add21b34fe416d1d48e54f3a899773160bad1cbc8d SHA512 77a3e6273b92141d5a337ab28b162ee27f3f1970316fe42becf2efbd4cdbc5ed6cb26f1f24201d0605c26dfaac75db467f42b00cc47df0093336bd0629f0a1cd
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild
index 683e9bdcff2f..cd6179fd4d81 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc"
 
 RDEPEND="
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpserver/Manifest b/dev-python/pytest-httpserver/Manifest
index 8c4e7681ea44..5611174bf6cc 100644
--- a/dev-python/pytest-httpserver/Manifest
+++ b/dev-python/pytest-httpserver/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-httpserver-1.0.4.gh.tar.gz 78911 BLAKE2B 425f72438797b55a84662f580dd9bfc1d6dd8a0513587e72b6e1de7e669eee75c777fdd6c2cfcbc92273737dd47568b48a22f12e8a40952f82a599f30705a604 SHA512 e80754910117736fd172d7bd5e5fc41721fab8adc705b72f0ee4cd866c878ed267ad3819645fd567e3af2c9e53deecb3749f1a873d72ff9e234c4fdd7f7cabea
-EBUILD pytest-httpserver-1.0.4-r1.ebuild 765 BLAKE2B 921806e34db0a4ec3ffeba9a63e761db990f5726fdce9c9bb890f3bfcad8b65b2d73e932fffab02eb3a09c1e0460d0f35423d875e37c042c7164d19fc48ed551 SHA512 192fc0eb9343f5888c2ff34366bdd1ea844bad1aa82a0a552b370802a4eb59ae28abe4b48cd5bb507d2c6dea384403cf1b38b4f887e9480d6e30eafd8783b2d1
+EBUILD pytest-httpserver-1.0.4-r2.ebuild 776 BLAKE2B 47322761db09937087458097a27ce0c1aa4eba77cd8b013d9e089c3f6ac548063d17f81b975c244b8a7386f89ec9a1339e426541b7c9fdb512372621cdc98d5c SHA512 0b4c28de701285c4084a54aefa43c44c45fc8f51607469f8fa1145e79dc9f338660388b743af251ce6f0e4d3ff4c0e217c9cc784ce4439a16c4fc9b4c4bd970a
 MISC metadata.xml 411 BLAKE2B f74c6327167acc706faa9d9e60e2f964e476f33cf33b525287850dcd46e1fd35d6a770d495c929b36bc288c6e2a08d32077bd5265c522598477bb61c4abdd367 SHA512 a536367a8872d3d722f7671d6824d05d1912e9ba53a25ade91bab5cfa4dca3cb2e3f669c7a70416c68a200f1272c5709509b37133886f0d64816b096918fb4f0
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r1.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r2.ebuild
index ec3afa2d9048..c978183c74f7 100644
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r1.ebuild
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r2.ebuild
@@ -26,7 +26,7 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_prepare_all() {
-	sed -i -e '/tests\//d' pyproject.toml || die
+	sed -i -e '/^include = \[/,/\]/d' pyproject.toml || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 1a52553daa2c..830906b15350 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-mock-3.7.0.tar.gz 29311 BLAKE2B 27227b66008c70c4016c8e15d0021a67e84730a8b49c5664dc4f29e16d5f163df293269ab332707e44b7a0b182e15e20ab0ebaf4b9d923eb911083377972dad1 SHA512 6ba69e86bac8a430a9f1f1c615ad21f505b87848ac50fc551bc02f81306bf8769fd015615d96085d87d4c695c24b0686a95116721358687b48b64de5d0ae6901
-DIST pytest-mock-3.8.1.tar.gz 27671 BLAKE2B 6bb4a3d752ae0f4e751cb50fd6018802bb7f3cee53429693161185ef369bad8addd8637d2526750fcf9ddbe9205da3d1d615efa19b1d58ae71603ca3902c67a6 SHA512 db8c0e2cbb7f8741569035a4e6ab9335ec0b03e05f0df07de0de8dad769974f96752c15d85c439da432623b51296b88970e3e29a212930e2bac33ed47d6055f3
 DIST pytest-mock-3.8.2.tar.gz 27734 BLAKE2B feaa92ba63626d7510008c41491bd0ab649b2a0cb55c888a472a5f6100a18d8b4a232532b6b3a860483bfd1676fc1216ca368e215b8f11fc6211eeef62f5743f SHA512 039342de6a22921ebac3f54a1f217a7a5d4cf9833ce4b4bee0a18ba5409d46211cd2d9ff9620a1576560d32f5e5799483e6686e3b58d32123f41dcd7a862154b
-EBUILD pytest-mock-3.7.0.ebuild 1059 BLAKE2B a16270f47039f3c785b0ab4887a8d254ef0c2ddbd9f3f47eee3c836aa306bd6c753527b46000a27cd52828ab721314b334e27b5058cb807316f6148cf7768248 SHA512 3c944b84e9242582e3e773d491d732bb16952e53e1948a73eb475d11420dc040042552b23048124dc43a709d8fbf3982bf645ed2e95ae2642596be1b1d3fa09b
-EBUILD pytest-mock-3.8.1.ebuild 1067 BLAKE2B 2054d7347b138717e9c83954c1c813a52b09081e375fe73de0bfa6dba9881656f54921a7a0c63d030e62abeb74c4ba4295cb58196af46801abc3e511c6dc33dc SHA512 427607c7a44bed7a2f47593ca67db71ec97f809dd91ceba04cd4fac564f041a22aa1d7d4ba0dd544bbbe465a4db21c6c4487bf4d857b1ac9b4777f91d495fdb4
 EBUILD pytest-mock-3.8.2.ebuild 1059 BLAKE2B a16270f47039f3c785b0ab4887a8d254ef0c2ddbd9f3f47eee3c836aa306bd6c753527b46000a27cd52828ab721314b334e27b5058cb807316f6148cf7768248 SHA512 3c944b84e9242582e3e773d491d732bb16952e53e1948a73eb475d11420dc040042552b23048124dc43a709d8fbf3982bf645ed2e95ae2642596be1b1d3fa09b
 MISC metadata.xml 379 BLAKE2B 47a45606cecad3ecc9b902d9ec690c33a89728ce93038433f11ab8c3369089ef12e86c793ab06dedeef7a816dc973ae8ea2a6b717b13085c7912d69bcd68db65 SHA512 b5e43e5e0a1cfba50868ca542b00d40084aeb38f764f203ed112a9359e966e94d34a99bbb072b98f9401a0383d3fbf834b8b87572e073592263f18d73f09db2e
diff --git a/dev-python/pytest-mock/pytest-mock-3.7.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.7.0.ebuild
deleted file mode 100644
index 6266e8ce070c..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.7.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=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-mock/
-	https://pypi.org/project/pytest-mock/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin
-	local EPYTEST_DESELECT=()
-
-	if has_version dev-python/mock; then
-		EPYTEST_DESELECT+=(
-			tests/test_pytest_mock.py::test_standalone_mock
-		)
-	fi
-
-	epytest --assert=plain
-}
diff --git a/dev-python/pytest-mock/pytest-mock-3.8.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.8.1.ebuild
deleted file mode 100644
index ce9187b4e2e5..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.8.1.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=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-mock/
-	https://pypi.org/project/pytest-mock/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin
-	local EPYTEST_DESELECT=()
-
-	if has_version dev-python/mock; then
-		EPYTEST_DESELECT+=(
-			tests/test_pytest_mock.py::test_standalone_mock
-		)
-	fi
-
-	epytest --assert=plain
-}
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index d73b0cd8ee5d..6406e259ba43 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,3 +1,5 @@
 DIST rdflib-6.1.1.tar.gz 1587670 BLAKE2B f13831124a8f292f0481f5ee9995b6b7ba82992cbe51abb0067703b2acee9f13ce5a62379636ac9f36823afa5b841799c1f26358efb6c12eca2df333611d5488 SHA512 049608dc37dba929eac1e40431885d319311f27be9fddc292d768e3703927e61a646a73137e4a1eaa16836cfba4606ea2cfd8fe3a86cfbf10e3271cee2ee251f
+DIST rdflib-6.2.0.gh.tar.gz 4886953 BLAKE2B 74044b0cbaf6c1ba6f2a43347112118dcf92b5237afdd49782ca6d637df092379ff2d81eaec254ad0bf25057f8c0cd44c82a35a89d4ce7b21c8e222de9aef16a SHA512 8177c50e9c2d48859a061dfee24c3560b8f979bc306b3d940a9251ec130e3a324bbad474f4fa7ced5e11522d3bd4e13931461bf106f31177fd972806968d8245
 EBUILD rdflib-6.1.1.ebuild 1394 BLAKE2B f25e7f9deb40dc790efdcfdfd251e3120167b5820663ad7f7cc95df73cac7406328b89c431b16c631d0680d1395d1bbb0c935aa863d8f2b85f85acf09b69c032 SHA512 4eb944c0fb47f966da9dbeefe2899d2500e611c90b09d8c4ee942f2f236ea7870b2a4a7dba542fbdea66df83210ca2ae7fd42a15b514cab2acdba3a21b3e81a8
+EBUILD rdflib-6.2.0.ebuild 4051 BLAKE2B 9c6f2d0ebdf783b857ca719647e5ddc0150fe1099d8e7791add30e1552aebb3e65c33f5fcc9ddae881d46cb29a0465ddd2aca7b7698d009959dcfa3aaf62c4b9 SHA512 b3d270d6b5bede3870bed14190d2da5806482a3e6ad63278c3259af2ea8beff66c56d9f1f01a0e43adad931bfea16fa3a5afb3e6bc79a2b22ba167f1ef37abd5
 MISC metadata.xml 400 BLAKE2B eea3d3a69375a70a1c4a93cebf48169032f9d7cc6ba5df0422bad8c0f4e1caa10721a42b66cfb0dad2ab85aff38f826a0790b4d2dbac90be16e88ecf507d9025 SHA512 d8b94c9c8c037f40db80a44d235ada552851c3b979f496462e19a909eb2b46f606c23458b20869060b596969015616d065b2df0f5b24d2b3d7224afa6089e8e7
diff --git a/dev-python/rdflib/rdflib-6.2.0.ebuild b/dev-python/rdflib/rdflib-6.2.0.ebuild
new file mode 100644
index 000000000000..e41b3e6e638d
--- /dev/null
+++ b/dev-python/rdflib/rdflib-6.2.0.ebuild
@@ -0,0 +1,95 @@
+# 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 distutils-r1 optfeature
+
+DESCRIPTION="RDF library containing a triple store and parser/serializer"
+HOMEPAGE="
+	https://github.com/RDFLib/rdflib/
+	https://pypi.org/project/rdflib/
+"
+SRC_URI="
+	https://github.com/RDFLib/rdflib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples sqlite"
+
+RDEPEND="
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/berkeleydb[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# doctests require internet
+	sed -i -e '/doctest-modules/d' pyproject.toml || die
+
+	# we disable pytest-cov
+	sed -i -e 's@, no_cover: None@@' test/test_misc/test_plugins.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# some of them fail with encoding problems (bad code most likely)
+		# but too many to list them one by one
+		test/test_w3c_spec/test_sparql11_w3c.py::test_entry_sparql11
+		"test/test_sparql/test_result.py::test_select_result_serialize_parse[xml-TEXT_IO-utf-8]"
+		"test/test_sparql/test_result.py::test_select_result_serialize_parse[xml-STR_PATH-utf-8]"
+		"test/test_sparql/test_result.py::test_select_result_serialize_parse[xml-BINARY_IO-utf-8]"
+		"test/test_sparql/test_result.py::test_select_result_serialize_parse[xml-None-utf-8]"
+		"test/test_sparql/test_result.py::test_select_result_parse_serialized[xml-TEXT_IO-utf-8]"
+
+		# Internet
+		test/test_sparql/test_service.py
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tc034-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-c034-toRdf/c034-in.jsonld-toRdf/c034-out.nq-False-options66]"
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#te126-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-e126-toRdf/e126-in.jsonld-toRdf/e126-out.nq-False-options167]"
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#te127-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-e127-toRdf/e127-in.jsonld-toRdf/e127-out.nq-False-options168]"
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso05-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-so05-toRdf/so05-in.jsonld-toRdf/so05-out.nq-False-options253]"
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso08-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-so08-toRdf/so08-in.jsonld-toRdf/so08-out.nq-False-options254]"
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso09-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-so09-toRdf/so09-in.jsonld-toRdf/so09-out.nq-False-options255]"
+		"test/jsonld/test_onedotone.py::test_suite[https://w3c.github.io/json-ld-api/tests/toRdf-manifest#tso11-do_test_parser-https://w3c.github.io/json-ld-api/tests/-toRdf-so11-toRdf/so11-in.jsonld-toRdf/so11-out.nq-False-options256]"
+		test/test_extras/test_infixowl/test_basic.py::test_infix_owl_example1
+		test/test_extras/test_infixowl/test_context.py::test_context
+		test/test_graph/test_graph.py::test_guess_format_for_parse
+	)
+	local EPYTEST_IGNORE=(
+		# Uses network
+		test/test_so_69984830.py
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "support for sys-libs/db (Berkeley DB for MySQL)" dev-python/berkeleydb
+}
diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest
index 635cd3c8c472..1ec975c3eac3 100644
--- a/dev-python/serpent/Manifest
+++ b/dev-python/serpent/Manifest
@@ -1,5 +1,3 @@
-DIST serpent-1.40.tar.gz 24140 BLAKE2B 8a790e3f0973e99840cbea6ad354012cde0b7c6ee09c50f31d56110e12cf848543a30a38900e821419c9a0aaeb2b55fe0161dbc9c233f236a21dc553cefce9e6 SHA512 9f8edebcd6e37de7442a00157f64b1dec6742cd198f45ab475be7f38aff4e090345739f7500181f0b0a4dbdc9241b2f11bca5ada7a89aa577d94646269d7ab28
 DIST serpent-1.41.tar.gz 88927 BLAKE2B 738c0e3ff3ff908514a54523aa41bcda3aa4426d0426037a0223ddb744995bf9175de96df2372506aaf45de664897e35cd7292b9aa58beab146f225ce02864f1 SHA512 cab6f9e36d2f777e58cd5f3d1dd6e11626e0f222ecb2adb8e5997338c76ed357c461dadd00010cfd43ffc6a0b1addd7de06d86b7a82ca796719e4bde2d9f4813
-EBUILD serpent-1.40.ebuild 608 BLAKE2B 61605e186d0d09de59684602bcbf7b55e841bbdd498eb2b7fd068e3effe3e16cc8585cfa530ec9434475a55e918a616fda348f64c66641d45d98ddfd1c81be10 SHA512 1eeec9e3ddf7b0e3e89ba9658e514a9a8cc475c377aeacedab3b721d116ce1a0d5d53f941e6b0f41cdfd0bb62350bef1fa70434131a112726eef17086593b5f8
 EBUILD serpent-1.41.ebuild 638 BLAKE2B f04e6794993a34b68f6a50d35061ffe630ca31b7d654ae04bc31188ec4611da28bdc2a42f2cc9ac041aad9a1603dc76314165ddd162db7a7171dcba162b5be8a SHA512 35c3f52127d86d2b49c19123e13c66584fa5feefc2bf60092ff4f318eb51274bbbc9c3e63714b658f4db69393b9d81f3fa30649d32bb61987c770336911bda66
 MISC metadata.xml 388 BLAKE2B 206deec11fe6808e269bee29bc9d3e6f6d60449643abfb03109fb35f6581aa7ead30339c7f8cecdcf89d98853fd4f10289969b19440caa39b398ef90fc71d61f SHA512 742d221049ba6feca1c30de79d67d13e3063a565d8819818d18fa778036d499dd61ef59763114c43adc523bcdaf3bd6b36ed59f5c8784562a02d2f303941f84c
diff --git a/dev-python/serpent/serpent-1.40.ebuild b/dev-python/serpent/serpent-1.40.ebuild
deleted file mode 100644
index 5095e334dda8..000000000000
--- a/dev-python/serpent/serpent-1.40.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A simple serialization library based on ast.literal_eval"
-HOMEPAGE="https://pypi.org/project/serpent/ https://github.com/irmen/Serpent"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index eed11b8bee8e..46903f961f47 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,4 +1,4 @@
 DIST slixmpp-1.8.2.tar.gz 535672 BLAKE2B 8af0329083d5e8bb630bfbedddbe67a78eadcbcb25ed5c9b9b0ddbfbedf973702110d2b3558f5bcf25257d6a7029b1e6afba87c57a37c1f0d4d36305b246979b SHA512 243223754a7c84b653d0282b38f4df58fb5905865635c210bc78b444e85c3b8b964feda7d42b66e9c414ea7a07ecadfc3206c446cc1d9fa625308e783e3d3be5
-EBUILD slixmpp-1.8.2.ebuild 830 BLAKE2B 929b5f28b5ed11b3460ad309821b5bf2a82d0d84c929af7bd1d6e4d6e8820c75a3eefd989212a83dbafa986ece18ead2758a80d34a2e19663f9f3d073f1fba50 SHA512 93003a0aa351bf3614d70ffd4d569ef74a510c27c2dd0020f7f7b1d1aa19c377b912d9eb27ec4b6c0d24292be65661ed4c914c37293d389cd52cfe3aca80e51b
-EBUILD slixmpp-9999.ebuild 824 BLAKE2B 99f3e9d3b50214d74aa29594083bf0f8bad95984656d1573dcefa27ed1111a1688b47677998043a1c39c1af1d374ab4dd5e97383ba911951e0f155e125b743ed SHA512 0174f09ce11a568861a9578afe440d0c351832d3fe69fb330cf8c41baa277769b9e2def8d97d627ab8f76a7dccc4ad2e23ad8e519edd9b22883f3d4c4706d970
+EBUILD slixmpp-1.8.2.ebuild 830 BLAKE2B d891c2fa9388a12bfa9e47ea2f03db9a39c7f069f4898f7a98f0932e4a6bda95b68962cd000266a966e1d35e5f1c37f80bbc1adb6916c9e1b62ba2e542da50b2 SHA512 e4e6b5c88ee9c39bf7d6bc6cfb3463cf055720f69d0bcd7dd50bb0611cab023871d99328c9eab8ef91e7e503d3196e9a6df97cbb5cbb087006e07321744595b4
+EBUILD slixmpp-9999.ebuild 824 BLAKE2B 14b953b8232be25a4d2386fe1790e7baf71e5547aa9cb3114746ced708b9d4fb04b7c0c7a160c5196403a4426c8bdd6bb4c54ac0ddd9e858293946531530a783 SHA512 7b2d3d11d2bde744da480ee16c271221079f693623b6a3ace76130ae5784f40b4df8c95472b415a82196d74ef9f84667c953742e2c4b45f5b47c594658761f35
 MISC metadata.xml 418 BLAKE2B 24c02f722eda50cda05da1a70efe953324ec8a1ba91a755e356bc9953387cdb35876f072a7f045dcda9e4fd74e73fd5bbd4f0f7d921431a374543bb02d5813c7 SHA512 1c36a0aef8162cd0b19eadec95dcdd5ff8f742c7438097e198736ae4772aba3a6ff41553a08878d54d0c548900444e2d40187f669a46173dd4f89072ac234365
diff --git a/dev-python/slixmpp/slixmpp-1.8.2.ebuild b/dev-python/slixmpp/slixmpp-1.8.2.ebuild
index 2ec177c68b91..bd3fed708553 100644
--- a/dev-python/slixmpp/slixmpp-1.8.2.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.8.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/slixmpp/slixmpp-9999.ebuild b/dev-python/slixmpp/slixmpp-9999.ebuild
index a09033bc02fb..5490e617241b 100644
--- a/dev-python/slixmpp/slixmpp-9999.ebuild
+++ b/dev-python/slixmpp/slixmpp-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index 81bb4322e6c2..4f6ff5bc2272 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1,3 +1,4 @@
 DIST sphinx-issues-3.0.1.tar.gz 12320 BLAKE2B 770aa19a443bacd489157244f087fdb99740d5eae2f45246ab0fd0596260f249dcf7fb0642acf0a925d1a1def08f6d944a2ec67017334843b636623b05df8327 SHA512 dd64e1611eb58fc455bedb1658473fd71e4deab1371d8a42e6fa7fe3b128a991251add12e463b9a5826fd4eb5aa12e9a117dcf953feeb8df980a7951e43d8baa
+EBUILD sphinx-issues-3.0.1-r1.ebuild 805 BLAKE2B 4cc1232f7ff63e206f52e2fa3c0a3e8b99c64e5571b3cf2c30dbd543d53a621b2f408fd1b2c5c0318ff0ba9e96dd0569e141f2bd85c22a08e53bb70eb4ee8041 SHA512 690dad07d6cca64467315db976758efdcf0a201c08789a245aedee9bf22a68da65f061c0a1c8c7f345c7e03dfbabea8932aa138fe312e5ff82daf672630e9991
 EBUILD sphinx-issues-3.0.1.ebuild 645 BLAKE2B 379662d629cc43b62e8b4d7c727166496e201318718fe560f68de98ec865f12d6c09c430988a76fa1057c93407767283e41515df64f5e285654093f81f60c76c SHA512 a51e4a999f57bb0ff7d3ee5ee1fb36c37db73c9356a03d0f4ae591361460b2c05a7caa937711b68701ff803529aa287c138af736d80ce543f0d970f011acd3b9
 MISC metadata.xml 484 BLAKE2B 7fad72573c26a9a59e9fea1805e085ad0f1833f4f34a24cb942671b5f30024d816f3f50060c92f3222e88591728f386682a93591a118bfcb74e1c8969a7da50a SHA512 16d56d729665f82a962aa82ea236abd5c98b2e9fa1172390984560680eb39a14758174959aa4ec90806b1b9c286cbb257f8c7c886b9cb52cbfcc30e925be42cf
diff --git a/dev-python/sphinx-issues/sphinx-issues-3.0.1-r1.ebuild b/dev-python/sphinx-issues/sphinx-issues-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..46bb5f21d67e
--- /dev/null
+++ b/dev-python/sphinx-issues/sphinx-issues-3.0.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-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="Sphinx extension for linking to your project's issue tracker"
+HOMEPAGE="https://github.com/sloria/sphinx-issues"
+SRC_URI="https://github.com/sloria/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# doesn't work in our pep517 install
+	tests/test_sphinx_issues.py::test_sphinx_build_integration
+)
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index 4952495670ad..b2d2b0f595c0 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-doxylink-1.12.0.gh.tar.gz 22589 BLAKE2B 322fdd0968147abc480a88247ee724daa8c4da4519ff97280af1d81e9f36d4636aca358f5bb1ba08e5ff0f138cf8446194d1fe819a9d18a227eb463b20ee5738 SHA512 7626fad06613a614b5d6efdea088825732571c7ed45f6f2d69f34e0aede020df0930716cb34ca14260891a29aa152019c7bfae8aad729039642ea1c6bbf7d09e
 DIST sphinxcontrib-doxylink-1.12.1.gh.tar.gz 22622 BLAKE2B 2818dc9e155156e60a23183ac35e72b51f316e5e3a8f08379236a141436bbca4fee2ad534a391495dbe9bbc7c0d9f32526f5646592d16c1610121c36275a4c27 SHA512 164c523d6fb081d2ee70fa249901eb0fa3233d20a2ba73b52c4f7bf5f31c3f088c0420e39ace36c66a65fceccc137d6d62c28f7b7b58f3fbf96a3f2f73372fc8
 EBUILD sphinxcontrib-doxylink-1.12.0.ebuild 1059 BLAKE2B 798ed1bcffcb23faffb634d7abbb27289989f0923ff76641f6ed15edca7ed2fa3eaf3917bf15592d93ee6d70ef24cef00cf125309635f7285a6bf1948ff88497 SHA512 09b4ca6a2fd0143e7c529540498918afdabbfac99cefa4a7bfe01c3419724249a99b013956bf4137098367d7bf68462bb5e1482c8458e1760a9ccb9636d7a1ce
-EBUILD sphinxcontrib-doxylink-1.12.1.ebuild 1061 BLAKE2B bff1a940dddc0fc5be9741aad818d2b1995e57f4b47324102f3f440b48f2eb8c43997fa44d6fedfd6c8d12edbd5371c09cb1dc2189c620caf3751da6e0d3ee85 SHA512 8e7d45598356a73c789f933dbfb19fcaeb6f578b1e266b92153d8794afac3ede91a60713853c34aa66f62212446955814bb05db4dec364751db0d299ad48c58c
+EBUILD sphinxcontrib-doxylink-1.12.1.ebuild 1092 BLAKE2B 62e65daf67508b9d1aa3a53d18b999504ee7a2c77d6f1a518cec1107c4306c2b93b60996806c89e3cafd4335f36e1d74eda4a5680fb553eb04d45d3634897e79 SHA512 e8dda95622862a60f30bab64a177d9546cc6624a88b5d50c3160e78e3a9d020ca18054f0898d366332e8858594c47bb50d0fd048b78e66633ea5e91688ca46c1
 MISC metadata.xml 620 BLAKE2B e76f6c16f0f8280d0d7a99975a0dad33a76f93a634d99114df5eacf047e434c7356cb501c4021cdee1b17c3e7dd00e7ce4720d70c1ddddcf561c4e622b528549 SHA512 89afb14c72168f5a919347726c1445a205d5839925ead8b3969cc84f062caca0a666cc141f541c21d642f95c3c40fdfe677e3f1cce78aa1a5f6445e140ae7978
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.1.ebuild
index c5b515e21ef5..a6360df99206 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.1.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.1.ebuild
@@ -38,7 +38,8 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
-distutils_enable_sphinx doc
+distutils_enable_sphinx doc \
+	dev-python/sphinx_rtd_theme
 
 python_test() {
 	distutils_write_namespace sphinxcontrib
diff --git a/dev-python/sphinxemoji/Manifest b/dev-python/sphinxemoji/Manifest
index 6e89d28f392e..3cbd7669a648 100644
--- a/dev-python/sphinxemoji/Manifest
+++ b/dev-python/sphinxemoji/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxemoji-0.2.0.tar.gz 44431 BLAKE2B 18c9a7b4c97bc6081216cac98cecf41fef0bfc90122bd24f7d11d96f5db71437ee4e80675464fcaf9bc4c6e89c2511392600e043d4fb1904cfc57ce4efbed824 SHA512 974fcfad13f326265c679a3c97fd251b0348499fc9a72b65547b2548ddb2eb895a96f71d4b212f619287ac7c759df22fbb66f1a8cfa160287f8b25878c0f0515
-EBUILD sphinxemoji-0.2.0.ebuild 557 BLAKE2B 9a942cd87fa2c5206a8adf3229f9faa8c29ed3e7a85a963e30744ffce679c6f2b02e5b9f8a37ee7b39588aa5a4293cb1c40ff444c21f64767080e8eff76c9be0 SHA512 fa5e0a5e1f2f7d12e0ce8de09fe65bc024606e205fa2cbcf7c18e8362e7fba7833d1214a98e74599e59cd47045e7a66d00058d975148aea40250c59602b7576b
+EBUILD sphinxemoji-0.2.0.ebuild 557 BLAKE2B fa9555b97aa98d872c10bd297dba5be5b5d26ba0c84fd17f3a7369554a4f32f162a795e5a76e8f00a85398e42247fe100f0da1b906d349ab7ff80e0e4d00996f SHA512 52c44e408aac6feeb7ce643a10e7fdc050ab3106c458608d71361c483a1af02dc0d0274012ae318f036649183e2fd552640da5000e3b2021bdce86b509f431a3
 MISC metadata.xml 404 BLAKE2B 5a14c2f756212767626a1787201b21b8a89a6c555baa9b7edfd22a9b5638c0897512d736916cae9b95dacc4483465b38c601f53098425c384ad7a941816d5678 SHA512 ddc72d3a945910f3ff30172ad888305a50b42599cd92e61ec39d141bfee3135ea68fbae3855d0cbbc725f4608b99de7b8f4af354ebbb108db7940a8ec6592fd1
diff --git a/dev-python/sphinxemoji/sphinxemoji-0.2.0.ebuild b/dev-python/sphinxemoji/sphinxemoji-0.2.0.ebuild
index 754bb664c494..446873841359 100644
--- a/dev-python/sphinxemoji/sphinxemoji-0.2.0.ebuild
+++ b/dev-python/sphinxemoji/sphinxemoji-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 341fa4d2ca7d..ff74b4992a31 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,5 +1,5 @@
 DIST SQLAlchemy-1.4.37.tar.gz 8155965 BLAKE2B cf21c2ab73a5ba2576a857a12f30ea516265af946e25c1b137e57019d862bf04f4757b4755cee28e6f53642d1f1b58f43c99cd1c69f87640e47ac8a1d1ff8d28 SHA512 3f8a814f9bb6fa273f7b210c4567bf7411d0cf2e5caf010a5387fb946063704c342072145a858fb906545dfb1b959155d041e6073273674e51715356fc1f39e6
 DIST SQLAlchemy-1.4.39.tar.gz 8212369 BLAKE2B d65993c4342c2cb5bc76ea4ecc986d0ec521a6eb785604ceeca0c9c22187e4af29fc8bd940a130162ca9dd5c30d58b5d0999472285382c6f6bed3863ff9f20cd SHA512 a7c6b73250044289add492b2d7df9010f3b9a3a5126c8b3448d7339cf743c4be3f1c08d238107bb12c579b2bbd7d20e216e331d3ee10dcf79c0f23ca44d496af
 EBUILD sqlalchemy-1.4.37.ebuild 2839 BLAKE2B b19eea5aad1cb6309d4b8b93777a0dbc9bafce964aea03a3cda6a80acc603fc1ff18cfcf324b6a9a65faf00354f49c778203e02277b8c277dcd484cc381654b5 SHA512 881a5a1b470dcb2c15ce0dead3ea454ec11a130202bb243e14c0622a0d7ab424747b42ac349eb3d7b4f68c27495e273f23d5d1d4c0f8d5fa4cd1efedec785e6a
-EBUILD sqlalchemy-1.4.39.ebuild 2624 BLAKE2B b8d3bff588e9894e9a064b44e70ada210012974a66aa79454ca686bcac11f7a99165e88d9f750e873f9a59e6ce12b13200c25a48b9dd93ede0a917a6c29acb31 SHA512 7235a3e56d1e6ce88ed2001a958f07635d27d79f09f7ab18613be7cb30ae2681d4a65539441d55ea047d3ab10ff3cb206b7c133b3ea6855afefe3f26f8538866
+EBUILD sqlalchemy-1.4.39.ebuild 2620 BLAKE2B dfb4b5cfc9ca87f4fb10ddc690fe4e4e2f77446a4043f771c6ee8b8b737c966a5d0b8e89135c5ba91119d4ac6275c97d15e42705ede21e81812e9e4e4a2036cd SHA512 b56f0e2e941806562be3bec7e068499fd5e69ca65746c7250623ea0a15533c561d5691ade4e4a69916a2ab8a3542f07fdc1471eee478bc49e89965eb9139e112
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
index c5be5d7d2e9b..05cc94104e2c 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 0553e3709d42..1e4637f79c40 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,10 +1,6 @@
-DIST virtualenv-20.14.1.tar.gz 12216889 BLAKE2B 7d06b47629dcf4a60299b9b0a192478b20ef820b8a7516569e50b57b2df383781e7e14fd4beda14a3425164997e69c8ed922edb593f86eb3bd85e4ee3a9f2ac1 SHA512 149e78787db23eabd4238baa172bf023ddcf87d59284fdd090269acfa15991aab182f9e168851f88ef810d5c50dd7cdce69d132c46ebedb10080d65a308e63a1
-DIST virtualenv-20.15.0.tar.gz 13523195 BLAKE2B c5d4b1fd78998ccdc7a041d11e0fcb569bfd00151975170260e245726eee03b4ef1cf758d43175312e69e4b482f9ec17b4e93e6854c3bfeafa2304eef2688a20 SHA512 2e3cddae926f89ef986a85ddf592b38d53401212e974b65243b9f47290b653798ab2405920c28d3a7961aeb726f25ed6401e19661f1e9ce7afd195e87a0524ab
 DIST virtualenv-20.15.1.tar.gz 13523736 BLAKE2B 4f8d491fae7c0c28ae349845c4c5ddd27e53b9007a427c8a36e66a427269b519829f1c351f028b63fe38b49e934f4e209bd2cf2e07363171f732c6b0a052a3bc SHA512 244e3b091c8b049edbb07d808633fd44b3327200e1d38394814794773d05723ef535721ee163b382d23bc16572d55657b5c2544efd83494753746cc85116696a
 DIST virtualenv-20.16.0.tar.gz 12217565 BLAKE2B 534d665b56191c2e804306677b6771d3d0fa6104c476f8f17fbf40c2f8a3b7ccf6ffa9f8dec4d8de515f610f2ffc7b5d67bc99d82be4c0cc73990e5664a1d1e3 SHA512 f34827ec0e1b7325ee23b53b5fa2c36c1377d3fe7265b7187cf43592f74b37d66747abf69f0f33850212bf3aa69c98147cfffc37b311b98a1127f7ac5d9c69e4
 DIST virtualenv-20.16.2.tar.gz 12217706 BLAKE2B 1dff9c8697eb80cf590819c451790599977d52dcfe2935c7d9e355aeb34c9b3bd4f6d97bb051c7a02ba95878717fac82766a0370124d21a4c89fee42a31bbb31 SHA512 3998ea1e70a56d859be808059249251ca944216998a48af70db731cf5655624c12078d94caa5827ab41326cfd702319d3a486fbc0fe424369e07df39c9cd8ce9
-EBUILD virtualenv-20.14.1-r1.ebuild 4636 BLAKE2B df586e00a1dfe68aa3eb6f1757ced244836475eb4795dfc5044f78ea612f15226fa50186d7441cf01f4b7eb3f58fe166e49dc46cd9f71e8ec1c400ee7857338c SHA512 4e307ce1dc6b604f71423942f8adc2277fb96ca94584922982cbbae801ea22fb55e2b5b4766c783f1ad39606a366539fafdbc939dffb8e4cc946f640f690d0b5
-EBUILD virtualenv-20.15.0.ebuild 4644 BLAKE2B 360e3be683b1a652b43d4776d4dd20ad0525982be0b4fcf4f36c23c5b65e8b2fb239433233821395f9e90eb6dad5a4918b47ab33d8e93b83a1054c0910a7d530 SHA512 240ee0635b462bc050cad1f239135e76acd3823fae25f44c2a9f786072c53d4e801ec300c421e4dbdf8ba79a93c2164b43e3a37a2e8a95eb7c26b9be64da82d3
 EBUILD virtualenv-20.15.1.ebuild 4636 BLAKE2B df586e00a1dfe68aa3eb6f1757ced244836475eb4795dfc5044f78ea612f15226fa50186d7441cf01f4b7eb3f58fe166e49dc46cd9f71e8ec1c400ee7857338c SHA512 4e307ce1dc6b604f71423942f8adc2277fb96ca94584922982cbbae801ea22fb55e2b5b4766c783f1ad39606a366539fafdbc939dffb8e4cc946f640f690d0b5
 EBUILD virtualenv-20.16.0.ebuild 4831 BLAKE2B 2b51a3445b2ebf8570a8af6a4a49e746854c44f3060bdad926dc20e657aca800aff09b345faf25e23bf991d7b7fbbc3f8bb9fe73b6645186a798fe38b42825e8 SHA512 cb68375357095304a6f52c6a0fea22b54c7531e4091f709a9363c202dab2804c7c018b343a7a938c97ac728124d229946280a34946c5077839b12974ed43fd79
 EBUILD virtualenv-20.16.2.ebuild 4831 BLAKE2B 2b51a3445b2ebf8570a8af6a4a49e746854c44f3060bdad926dc20e657aca800aff09b345faf25e23bf991d7b7fbbc3f8bb9fe73b6645186a798fe38b42825e8 SHA512 cb68375357095304a6f52c6a0fea22b54c7531e4091f709a9363c202dab2804c7c018b343a7a938c97ac728124d229946280a34946c5077839b12974ed43fd79
diff --git a/dev-python/virtualenv/virtualenv-20.14.1-r1.ebuild b/dev-python/virtualenv/virtualenv-20.14.1-r1.ebuild
deleted file mode 100644
index 03c4a89ffb0e..000000000000
--- a/dev-python/virtualenv/virtualenv-20.14.1-r1.ebuild
+++ /dev/null
@@ -1,103 +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="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx_rtd_theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
-		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.15.0.ebuild b/dev-python/virtualenv/virtualenv-20.15.0.ebuild
deleted file mode 100644
index f5652cdcd1be..000000000000
--- a/dev-python/virtualenv/virtualenv-20.15.0.ebuild
+++ /dev/null
@@ -1,103 +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="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-# (unpackaged deps)
-#distutils_enable_sphinx docs \
-#	dev-python/sphinx-argparse \
-#	dev-python/sphinx_rtd_theme \
-#	dev-python/towncrier
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
-		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index e0ebb7997d8c..190613ffb4a2 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,7 +1,7 @@
 DIST werkzeug-2.1.2.gh.tar.gz 833667 BLAKE2B e045f566862bfe0f86185cd10aa26bf94a4fc2f7b23173c6a28c9b55d0f239fbba5c66071fab5df6102717b51a1c1fada872e9d9383b9d3b34ab92ffcfd96e59 SHA512 28c4a794a3dbc8423e59244fbcf192b60b53f378444aaaf60330bdd62cec38a4625033b5d72b55613c8b26053a60153ddcb816331ff28ad3ee03bede74d8b1b3
 DIST werkzeug-2.2.0.gh.tar.gz 839619 BLAKE2B b6eae91d9a44d030517be5da13c448cf4a2778db7cde61ce36add8dea6f2ac251b31e71d128c4156f44083a4c1b77e546a7e6c55787d8beb93c49538d45b51fd SHA512 2de05269ccd3d83728d435d2f155887a5fd3f3bda9b71c32ffd64b089116c80e89319870fa082f1c6feeeb797b665521b9692ce6c87dcb48b7fa49b2fc63516b
 DIST werkzeug-2.2.1.gh.tar.gz 840062 BLAKE2B da7c59eb182e2318c291a6d346a2a444cc054726dd3cf47617b82440383a4c1068b4a31adb6f44d1b965e2efbacf7469c1845d3666fe24288e976bc25794ebcf SHA512 466d164f8a5861cd36eaaf3674a8bb6640593981007d1d6bced1abbdaf8c6a39666601960ebfb2dc35b7c9c17a961ea07bf919cd646c282d27fd5e0f36cc3035
-EBUILD werkzeug-2.1.2.ebuild 1688 BLAKE2B b5a505d2d7ed2d06c56d134db4d416a8967035135316fa236007326899c4fe3615b9b8984031bdb0ea5940e8f92c024c70d112bafd7638006addb494ab9888cf SHA512 250f7ebc38731326ab3bfef9b27b444a2c7e7540e5e5459b94749f720bcfbd2ec8868f8011129283e0c48fb6047bc5996f0a2e14050485adf0a0f9384f4d4a0c
-EBUILD werkzeug-2.2.0.ebuild 1757 BLAKE2B b0e9c064ec74878e2320ee810490230685083d4a5672aa6760667e67e3ef6af5fe3eaa6522d8c0108a866adf6b2424aaddcd0083fdd8422f6509e2e4b51aa43a SHA512 f23070638ebe9d908091b6ce89b4397231491506733e3729557cebc0275fad5c8f25d04b24720fc2f52324ea67a3e612b7624195debf68f07a8af579395d3a22
-EBUILD werkzeug-2.2.1.ebuild 1757 BLAKE2B f38f132bd6dd31cda18161f6060b4d54bd47235f6262c91840aefded61b0e16d7c1b7ab4d8ce914ee38acf896c4d110ad6cef888bd56dd268978f40120ec9325 SHA512 705ba05f1d2d94a82b3e4d3621a746fa8c48f9032099fa53982da74efbbb09a5bae6e0d3dc77702dd1ead14d840ac778bc96e4c77315eb93c0502c7d369784fb
+EBUILD werkzeug-2.1.2.ebuild 1709 BLAKE2B dedbd7fdb42fd86a9f64e98475e355611f2398075e17b2626821fdb23c87f8cd9aa5d1b7a2be913aecf8b34d5d41536df5bf9f23dbe79c6681f4845a438a9b91 SHA512 2abd65b9097e27f3a848ff9203cf8e8f4528e937ccd648ec8090f940974bee3463f9b079b9cc18caa056fba020908cda9222fce903a8bc1915108c377eef02f4
+EBUILD werkzeug-2.2.0.ebuild 1778 BLAKE2B 5c650451f4599aa8a6e6cfd897d56d4f56dbac9fdeb044f38a6a3f67942ae843489dc4719396472cde423be449eb59a822da34731eb784424b1a39d516389b0f SHA512 291cfb1bc5c2d12b03ca02744c9dd14ac4560f1cdef5d069f11490c8afeb12e1583c409d3dc3b36cd6e3c4bf5e19174a1a43f9075818a5184ece1685575060c8
+EBUILD werkzeug-2.2.1.ebuild 1778 BLAKE2B e011d2b1360a53bf091ad9e2f524e8cd117fa7bcd3dc2104d8b16c08ceedd5c97d2fd5d9c8b8214d725740e07abb95bbd3ed827fe8d18428f3bc40063f211619 SHA512 e944bbccbe63a1c8cfabc5087668332037e474cf01267c5517b988392fb192fc805c406d20bb0f72a932a28bf7e60c0bae65789889758d3fb0cb0586e97dddb5
 MISC metadata.xml 368 BLAKE2B 81932229098620395623f9149ac974f19fae9b65ad09943ee5c5d8d03c1e37e76061291c959fe5f004f531a244b3bb335c2a43dd66949c0be43493e45674d0e3 SHA512 67e5b5fea8052c0723820125271ea031ad984e0fe2af21d2423fc559bdc51dfe1d40f2fa5fe11e6d2b8b32216e716900080b859aad146c079ad2b390dd9844cf
diff --git a/dev-python/werkzeug/werkzeug-2.1.2.ebuild b/dev-python/werkzeug/werkzeug-2.1.2.ebuild
index 22f3f897aebc..08e231670751 100644
--- a/dev-python/werkzeug/werkzeug-2.1.2.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.1.2.ebuild
@@ -31,12 +31,12 @@ BDEPEND="
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
 		dev-python/watchdog[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
+		!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? (
 			$(python_gen_cond_dep '
 				dev-python/cryptography[${PYTHON_USEDEP}]
 			' python3_{8..10} pypy3 # TODO: add py3.11 when ported
 			)
-		) ) )
+		) ) ) ) )
 		!hppa? ( !ia64? ( !loong? (
 			$(python_gen_cond_dep '
 				dev-python/greenlet[${PYTHON_USEDEP}]
diff --git a/dev-python/werkzeug/werkzeug-2.2.0.ebuild b/dev-python/werkzeug/werkzeug-2.2.0.ebuild
index e9c3e2214e52..be897c71f734 100644
--- a/dev-python/werkzeug/werkzeug-2.2.0.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.2.0.ebuild
@@ -34,12 +34,12 @@ BDEPEND="
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
 		dev-python/watchdog[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
+		!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? (
 			$(python_gen_cond_dep '
 				dev-python/cryptography[${PYTHON_USEDEP}]
 			' python3_{8..10} pypy3 # TODO: add py3.11 when ported
 			)
-		) ) )
+		) ) ) ) )
 		!hppa? ( !ia64? ( !loong? (
 			$(python_gen_cond_dep '
 				dev-python/greenlet[${PYTHON_USEDEP}]
diff --git a/dev-python/werkzeug/werkzeug-2.2.1.ebuild b/dev-python/werkzeug/werkzeug-2.2.1.ebuild
index 8024b1a6cdd0..1d31830ca31d 100644
--- a/dev-python/werkzeug/werkzeug-2.2.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.2.1.ebuild
@@ -34,12 +34,12 @@ BDEPEND="
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
 		dev-python/watchdog[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
+		!alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? (
 			$(python_gen_cond_dep '
 				dev-python/cryptography[${PYTHON_USEDEP}]
 			' python3_{8..11} pypy3 # TODO: add py3.11 when ported
 			)
-		) ) )
+		) ) ) ) )
 		!hppa? ( !ia64? ( !loong? (
 			$(python_gen_cond_dep '
 				dev-python/greenlet[${PYTHON_USEDEP}]
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 36973c9952e7..770b438fa205 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index a029821b1474..a9f6a7d2f4c2 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,5 +1,8 @@
+AUX qtprintsupport-5.15.5-revert-cups-support-accessible-printers.patch 1760 BLAKE2B a6b4ed143edd639376f362c41c636d8fc9924aa9a2c93584039ef5b994ae53e2eff7eb0703bf8e0bce19300e7b873098fee7235ddf2f691764f33830712b4f03 SHA512 32216a87f120af2f689c2257ce1c77db2e26017ece16df04b06454c82888b9ceb800e7d4e91eb5b4ab7de127436906f3ce8c76eaee6407f779670380026745d0
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
+DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
+EBUILD qtprintsupport-5.15.5-r1.ebuild 917 BLAKE2B 6cf411ae6bbbeac93eaef52ba6c5703313318ec049b50dd989efe160ae4baf208f611b8ef4b57f82c13ca2e5de17dbd97f4cc951c2e7c0791f937d63218e5d8d SHA512 df5b1da13b0d9564fb9ea69d5d2a6a953386c3da8874ed7a9551beb7d80e483a2d1dc5f2749863ff75f102692b816cbfc2e6dadfe5f70e48460745bbf69db83c
 EBUILD qtprintsupport-5.15.5.ebuild 833 BLAKE2B f83d54fd48a8828d6bd34815915042ef61b5070fd754582efe8fe71a3c86f6753624743c6c526e1bb61ebce8d75cac812e3691f42d33c9b99ad748d6658fce3a SHA512 ce6bec40b14228bf13ef9e6c2793cbe7f8022287d1f911dc60f5609e46093df1b0ae711a8202b6fb541ec3cc6d2172288d1ad56a7b966ffbbc61ed3c1b4b3cb7
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtprintsupport/files/qtprintsupport-5.15.5-revert-cups-support-accessible-printers.patch b/dev-qt/qtprintsupport/files/qtprintsupport-5.15.5-revert-cups-support-accessible-printers.patch
new file mode 100644
index 000000000000..6df15e395eac
--- /dev/null
+++ b/dev-qt/qtprintsupport/files/qtprintsupport-5.15.5-revert-cups-support-accessible-printers.patch
@@ -0,0 +1,42 @@
+From 742cc6db31bff8e506bfb8db699a843ce60627e4 Mon Sep 17 00:00:00 2001
+From: Volker Hilsheimer <volker.hilsheimer@qt.io>
+Date: Thu, 28 Jul 2022 16:31:18 +0200
+Subject: [PATCH] Revert "CUPS: Add support for accessible IPP printers"
+
+This reverts commit 2f5f276b4a2a19b9f2669b84f28ce8e970aaa39f,
+after which valid printers are no longer listed anymore.
+
+Fixes: QTBUG-105242
+Pick-to: 6.2 6.3 6.4 5.15
+Change-Id: I6a388acff2a8033ad1052319edcf7e41a2f72c8f
+Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
+(cherry-picked from commit f387bb55d4060c6bfac0cd6da736c80dd9a47066)
+
+* asturmlechner 2022-07-28: This actually reverts commit
+  8d2c1e277f984bd4d2b98a4d58f23e578b677fd8 from kde/5.15 branch.
+---
+ src/plugins/printsupport/cups/qcupsprintersupport.cpp | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/plugins/printsupport/cups/qcupsprintersupport.cpp b/src/plugins/printsupport/cups/qcupsprintersupport.cpp
+index 1131d43f64..42a7a821f2 100644
+--- a/src/plugins/printsupport/cups/qcupsprintersupport.cpp
++++ b/src/plugins/printsupport/cups/qcupsprintersupport.cpp
+@@ -165,12 +165,9 @@ QStringList QCupsPrinterSupport::availablePrintDeviceIds() const
+     list.reserve(count);
+     for (int i = 0; i < count; ++i) {
+         QString printerId = QString::fromLocal8Bit(dests[i].name);
+-        if (dests[i].instance) {
++        if (dests[i].instance)
+             printerId += QLatin1Char('/') + QString::fromLocal8Bit(dests[i].instance);
+-            list.append(printerId);
+-        } else if (cupsGetOption("printer-uri-supported", dests[i].num_options, dests[i].options)) {
+-            list.append(printerId);
+-        }
++        list.append(printerId);
+     }
+     cupsFreeDests(count, dests);
+     return list;
+-- 
+GitLab
+
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild
new file mode 100644
index 000000000000..34caeb0c1d49
--- /dev/null
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=2
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Printing support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="cups gles2-only"
+
+RDEPEND="
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
+	=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
+	cups? ( net-print/cups )
+"
+DEPEND="${RDEPEND}
+	test? ( =dev-qt/qtnetwork-${QT5_PV}* )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/printsupport
+	src/plugins/printsupport
+)
+
+QT5_GENTOO_CONFIG=(
+	cups
+)
+
+PATCHES=( "${FILESDIR}/${P}-revert-cups-support-accessible-printers.patch" )
+
+src_configure() {
+	local myconf=(
+		$(qt_use cups)
+		-opengl $(usex gles2-only es2 desktop)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 9cfda3c5da4b..9b3d1d67666a 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,6 +1,8 @@
 AUX qtwayland-5.15.2-QTBUG-90037-QTBUG-91264.patch 4691 BLAKE2B d817e7715759dfd6a6efc13b3b8e7742406b3af7cdf8602e134121b8d6e97e857dc82bb71e32c0ad04a04fc8f20443475bd5a251ab6eb0c83412a75201865561 SHA512 82ac704e0a57a0e6272676c329e29116a7ab4186c94a1e81fe4f503bf332b20b699930d86ff22e9a83e72be856a5711230f264a6d10991fd070601ab4e4fd67c
 AUX qtwayland-5.15.3-clang.patch 405 BLAKE2B 914a7448f590cfd6e83ca32352070644bbb6c07bd794d6f86ff6346d4697f6734d4c61469f20fa27517cf14f4742df946dba1f20ac242ea50d8e712733e3c099 SHA512 41da7708a596eabbbf58baa2d081c6a870fd49ac5b284c094e7e3230df201ae29627de1470bc3a80aff3dd30166b51bf9fce53e3d6fda0f18b97452fda3cd467
 DIST qtwayland-5.15.5-gentoo-kde-1.tar.xz 32076 BLAKE2B e42d847deaef08271eb2f3211db7496bb1d3e1da976cf242f2129775c0401eb834fd7c94b35ac58d601eb28e770c3b6bedaf4135e5ad97f43e0adee5054214aa SHA512 277c3612de892f21058bac3ef9c2b3584aa43850e1f6dab0c43989a952e30656c6069d1f7d07b0f1df7d1ec2ab1893a0ba1c4c6fecc6f56c101333832bdd483c
+DIST qtwayland-5.15.5-gentoo-kde-2.tar.xz 35492 BLAKE2B 91334609155e4bd227d76e5972422b400ab4b6196389a1b6b4c271994287851bc3b624ae761ece1418037735784edf7740ed5337ef6972bf708c598c202b7e86 SHA512 2663b59c7647e8a7d5f64905be114fc1b248cd8e10c2eba6bddc25b74fbbc5216e8264f41f50b6368819664921e27dfe96d4c1556c0e56f8c3c2c0ed75a72080
 DIST qtwayland-everywhere-opensource-src-5.15.5.tar.xz 567384 BLAKE2B 01ce4d546bda7bf332f8cc4f86a5e8bfb1be0ef60336ee3cae58266a25d51cf00fef3e6c4204f0179abc2ef748f88bd3a20f89f36da74d5d15c70ae7b4975186 SHA512 828dceb7bc54ce610a73f110f0aca332a90cf95df4a3bc971bd21c4e878366cb8d2248e609b73ce4d381579a143843c87a62f23dcc95767e522874e53a1b0327
+EBUILD qtwayland-5.15.5-r1.ebuild 1153 BLAKE2B 7e5ff059f7f96da0c7c5302a8e57255d50cb7e07291d5fb9f00cc5a0c58fe223de899dd7da6132bc8a9ce6018080fa867fdae9b629fc0830b4794c3eb5699c3b SHA512 20235ece58cc1aaace573ecdd0212c65108ea54b37c692143e759eb0e1a250eccc1c45d33a3d9518befd72db5eef375965e3d804d7a1920ba6c7efae83b82432
 EBUILD qtwayland-5.15.5.ebuild 1147 BLAKE2B cb388d4b724850c2ac83f161f5546d12f9bebf2193c73f3252abe1afb9de5ee8d277b84dd539a159191c50e011c42bf643a76a0ccd2950b815edef36f1f45245 SHA512 55e53e006bb1d8f138e7c9ffe40eda9b670a0d82f22b64d6867db3285ea84846c205df1a3c3516c1636cfa20a825338ce16aa1c1cce753e93730ade702f32f80
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild
new file mode 100644
index 000000000000..82916bcd104b
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QT5_KDEPATCHSET_REV=2
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+SLOT=5/${QT5_PV} # bug 815646
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+IUSE="vulkan X"
+
+DEPEND="
+	dev-libs/wayland
+	=dev-qt/qtcore-${QT5_PV}*:5=
+	=dev-qt/qtdeclarative-${QT5_PV}*:5=
+	=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
+	media-libs/libglvnd
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/wayland-scanner
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.15.2-QTBUG-90037-QTBUG-91264.patch" # upstream pending
+	"${FILESDIR}/${PN}-5.15.3-clang.patch"
+)
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
+		$(qt_use X feature-xcomposite-egl)
+		$(qt_use X feature-xcomposite-glx)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+	rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
+}
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 73fb42174c4a..ce3bdd45b08d 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index 3f9866b9be97..6503bbda049d 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -5,10 +5,12 @@ DIST stratagus-3.1.0.tar.gz 1188722 BLAKE2B 7eefd0d1c2ab35e657d8dc3c90c279deab07
 DIST stratagus-3.1.1.tar.gz 1189631 BLAKE2B dd81b354d90cd3483674d0b9728abf9a7c6b8e2c2ab49683d8da37a80dca26eafe3bfed022b3917ab7f6f1d09c68724def5a8d107dd735dbab58cc72b224fbd3 SHA512 b5c5e3d767cd96be0fcc13476452e76ea106ddf870117f0e0b97113455c8a54a6547065b242d9a255d87c59ee755e604489e68a5ecc2e5275b32b7b5b5cfae6b
 DIST stratagus-3.1.2.tar.gz 1190124 BLAKE2B 35e9b8d33a0b6926ba7a450b893679d323dca9507b9fe2cd27ec8ee5c80deeecf8e35fd8b92eed86f308b5a8abd017d6306a08b4268c06de3c3d0fac7b74eba1 SHA512 c12012b08b04a419b0d3d35860b22fa426e06181d6ecd2998b11419227f3c226a6d584a5c3443939dfe63e0cc657eaad914f04810431bc72b7697cf8f4465b18
 DIST stratagus-3.2.0.tar.gz 1537172 BLAKE2B cd0ce92a1532cdf57245f6ef234ee1f55418f28f06bb34f358bd623b1e83d21b9a04cfa86e8129931043e480de5a9de0ef6458b75dcb2f8c40c3457d4ef31eef SHA512 7a1b4f99fa3a080905b976439435c62fa885c0895f3f9f7692404a207822520d6b71189f24627c31bec192503d6504bf98485cce393036950f6bac0a49cb17dc
+DIST stratagus-3.3.0.tar.gz 1582643 BLAKE2B 7307ac59dc4ff112f0be8f85165eb14e61b83cbd7fa2e1a58599e1422b025c42cb2527bbb08d3231a45b07b116712f020605b6ec0f79d3696acda8577e3c1e24 SHA512 9510bd85f8dff284d912b68e377041345cf141af32f98298cbd712f932cff88cbf91733f97396b1d0e9671eafddc36897383bc3f39c1497a65d270432dab0876
 EBUILD stratagus-2.4.3-r100.ebuild 1585 BLAKE2B 207b0a52a39c7704491a8e64181336401e5594f1103e6d14933df721f08f34755e066199033c9a13eba77237de8892e6964790b974622fa31c6a8c130f7a0c75 SHA512 873a5079b9783abf710df210876048f6928f06e1963cb75ed13bc7cf549b9d97fb10a0f04bbf3afde13209777013efef35225a3349e69437f8f3eeb14b8cd3ee
 EBUILD stratagus-3.0.0-r100.ebuild 1567 BLAKE2B f7cfe263858a99bb53a45cf07a57f50fe892dfb2a6aa91f88bf869fe7ff4ee10d83570470acea132f568af8de54bb2168c81de36136522c8e3e605f3972dd54d SHA512 44d075c38ebd05c4f80bc817307645e3d46477742ba3f0142a4fd48558b50fec7fa7eb9a7a17eaf4199317949f5c98f3509496569865fcae0f61a89782383dbb
 EBUILD stratagus-3.1.0.ebuild 1565 BLAKE2B 8e3342dd6cd442acb685693f7baf2dfa21b5d499fcef264c37ee753e2c8da6a1d3481fc3d5f229b9498b7545408ceffd62d2aac8b043b902b73700f21e77d304 SHA512 28bff87b1b29f291a7d29e16382acdc49b7b1a12102c363e8ae79a3125d5c7db459602f3ccbde6f690db5e3ae14373798840ceafa5291ddc165c0fa4482ebee8
 EBUILD stratagus-3.1.1.ebuild 1565 BLAKE2B 8e3342dd6cd442acb685693f7baf2dfa21b5d499fcef264c37ee753e2c8da6a1d3481fc3d5f229b9498b7545408ceffd62d2aac8b043b902b73700f21e77d304 SHA512 28bff87b1b29f291a7d29e16382acdc49b7b1a12102c363e8ae79a3125d5c7db459602f3ccbde6f690db5e3ae14373798840ceafa5291ddc165c0fa4482ebee8
 EBUILD stratagus-3.1.2.ebuild 1565 BLAKE2B 8e3342dd6cd442acb685693f7baf2dfa21b5d499fcef264c37ee753e2c8da6a1d3481fc3d5f229b9498b7545408ceffd62d2aac8b043b902b73700f21e77d304 SHA512 28bff87b1b29f291a7d29e16382acdc49b7b1a12102c363e8ae79a3125d5c7db459602f3ccbde6f690db5e3ae14373798840ceafa5291ddc165c0fa4482ebee8
 EBUILD stratagus-3.2.0.ebuild 1565 BLAKE2B 8e3342dd6cd442acb685693f7baf2dfa21b5d499fcef264c37ee753e2c8da6a1d3481fc3d5f229b9498b7545408ceffd62d2aac8b043b902b73700f21e77d304 SHA512 28bff87b1b29f291a7d29e16382acdc49b7b1a12102c363e8ae79a3125d5c7db459602f3ccbde6f690db5e3ae14373798840ceafa5291ddc165c0fa4482ebee8
+EBUILD stratagus-3.3.0.ebuild 1597 BLAKE2B b5c68b817b23a806caea730752784ea2338188fdb6fb7c28691ee5194c65e9e6f5e50e57acd62957bfa358b6c80945e65770e1cfbb64efd1bddb27f7bbe84f44 SHA512 d7675400fde63a32813e53d077a123307895f5b99a9c71ad3b2f0f35e101202a3733cf0d4d6f75f9aa14381afb38fd106a5b154d1681e2f98c383b102f807c78
 MISC metadata.xml 527 BLAKE2B a2e74273557846343071cfb7473316ccdc157da182c2986786c62739f7d9bf55ebcfbcee10e65560de3d8c68d5aa8f9ecc449a55c925a38a5769251875b7c6ce SHA512 2b02996631c65b7416a8e8a1abf307c236f065187d6d4d7a81bbad7e2226315feb4de5329201520bc24f770cd4c6193f687b9211554965126e0be9763c70ae66
diff --git a/games-engines/stratagus/stratagus-3.3.0.ebuild b/games-engines/stratagus/stratagus-3.3.0.ebuild
new file mode 100644
index 000000000000..c6eac6df2815
--- /dev/null
+++ b/games-engines/stratagus/stratagus-3.3.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+inherit cmake lua-single optfeature
+
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="
+	https://stratagus.com/stratagus.html
+	https://github.com/Wargus/stratagus/
+"
+SRC_URI="
+	https://github.com/Wargus/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 debug doc mng theora vorbis"
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	theora? ( vorbis )
+"
+
+DEPEND="
+	${LUA_DEPS}
+	dev-db/sqlite:3
+	dev-lua/toluapp[${LUA_SINGLE_USEDEP}]
+	media-libs/libpng:0
+	x11-libs/libX11
+	media-libs/libsdl2[sound,opengl,video]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-image[png]
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	mng? ( media-libs/libmng )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		theora? ( media-libs/libtheora )
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-2.3.0-doc.patch
+)
+
+src_prepare() {
+	sed -i -e 's:-Werror::' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# there are in-source switches
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DWITH_BZIP2=$(usex bzip2)
+		-DWITH_MNG=$(usex mng)
+		-DWITH_OGGVORBIS=$(usex vorbis)
+		-DWITH_THEORA=$(usex theora)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_DEV=ON
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "MIDI music support" "media-libs/sdl2-mixer[midi]"
+}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index fc7905f31def..dafc3bd72401 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/war1gus/Manifest b/games-strategy/war1gus/Manifest
index 00ccab887679..2372c729a938 100644
--- a/games-strategy/war1gus/Manifest
+++ b/games-strategy/war1gus/Manifest
@@ -4,10 +4,12 @@ DIST war1gus-3.1.0.tar.gz 395576 BLAKE2B 3fe8341bac0811c86e8240a07500dc42972a275
 DIST war1gus-3.1.1.tar.gz 395477 BLAKE2B 5e304e8e2982e971c479d41b52958bc143518008d3452903f4a4c2d40cf3ea355ac7391d5da3ff2fa3c27d89a45270e64ddb7ee161e4531df54866f3a498dc0b SHA512 3657a2ea21d01559edcc44cecd0090df058f90d1f783b3e5a885f41fc8f4104a5063db50d0c6d3055d1181330486c54d7d3cfc6c3a795a82bcc25dcf67cc3fb5
 DIST war1gus-3.1.2.tar.gz 397685 BLAKE2B fabcd74d0f8622eed5f7b1c77dcbee8bee0e47bf51c5873d2565cfe200e2e21f5bbb54699cc2afd9b457e998f88b259494a3ee7394f912d6ef159f69ba8777a5 SHA512 64a6c03645cb8f0b4b8fe963e554842988efa74273a58213f047eecd322dfc77d5b4951dd4f0cb5dbd27e0c0f83d825e7fc7fd0102b83c4dbc90bee65c3d8ba1
 DIST war1gus-3.2.0.tar.gz 408417 BLAKE2B 8369d380813aa6a5c7484e7b668284ee3b59bd4a914b82b074640344af977c08727260efc284a5ffc7d5c52ef7ae0ab45b484d87d855a088198b02adf5240bac SHA512 2e3509792509730254e9292dce66491e848980a37171281dcd851aaa0662a3dd8911444d97c25486acb61fa5ad913da3bb397ddd599cd7ea1293b0afbfc88bc6
+DIST war1gus-3.3.0.tar.gz 486274 BLAKE2B 90675ce44cab26079c53ebd70377ea24bef3894d1f194f45496a0df6528e1bb63184f3c93f843ab9176ad02c542a9e51fbfa9f4af3bce6018fa7085d31494998 SHA512 9e17101954f7e953ba11cebd2f62eb9e3465217897bd55699846d6290fa5d249574d144f271e08485bc38ef7dd63e5efa05437faa5191148d1ea9341157834ea
 EBUILD war1gus-2.4.3.ebuild 1496 BLAKE2B 88682061cccc413ed62d0916738dd40eb53f2635e58bddc11b40fdc621598a40017e64e17106a48b2188076009f57db216dbfec47c85f299568906890376503f SHA512 b7126069f9e42f13618552546d5bc9c6a407acef835271d9c3bc6842670b9ef856e87b9a2988f3aa9c0d8184a336773c1adcc097d9f3c3ffc31787cd628b9419
 EBUILD war1gus-3.0.0.ebuild 1496 BLAKE2B 88682061cccc413ed62d0916738dd40eb53f2635e58bddc11b40fdc621598a40017e64e17106a48b2188076009f57db216dbfec47c85f299568906890376503f SHA512 b7126069f9e42f13618552546d5bc9c6a407acef835271d9c3bc6842670b9ef856e87b9a2988f3aa9c0d8184a336773c1adcc097d9f3c3ffc31787cd628b9419
 EBUILD war1gus-3.1.0.ebuild 1495 BLAKE2B 10ab67d560010d6147c6e282fa338175cfac6a0123b0615cad5fc1fe8ae09247a9fa784d23ddf043bf595b4583a42ff0e182a338aa80dc43eac589d5aad2c583 SHA512 c8780c26dee696a286fb5370b53a92b90634442f2e9b4554189ab986e9e24fb98bd632a124fd702070e20f448499bbf7a624ad7e32192e06fd2d696e2015fb69
 EBUILD war1gus-3.1.1.ebuild 1495 BLAKE2B 10ab67d560010d6147c6e282fa338175cfac6a0123b0615cad5fc1fe8ae09247a9fa784d23ddf043bf595b4583a42ff0e182a338aa80dc43eac589d5aad2c583 SHA512 c8780c26dee696a286fb5370b53a92b90634442f2e9b4554189ab986e9e24fb98bd632a124fd702070e20f448499bbf7a624ad7e32192e06fd2d696e2015fb69
 EBUILD war1gus-3.1.2.ebuild 1495 BLAKE2B 10ab67d560010d6147c6e282fa338175cfac6a0123b0615cad5fc1fe8ae09247a9fa784d23ddf043bf595b4583a42ff0e182a338aa80dc43eac589d5aad2c583 SHA512 c8780c26dee696a286fb5370b53a92b90634442f2e9b4554189ab986e9e24fb98bd632a124fd702070e20f448499bbf7a624ad7e32192e06fd2d696e2015fb69
 EBUILD war1gus-3.2.0.ebuild 1495 BLAKE2B 10ab67d560010d6147c6e282fa338175cfac6a0123b0615cad5fc1fe8ae09247a9fa784d23ddf043bf595b4583a42ff0e182a338aa80dc43eac589d5aad2c583 SHA512 c8780c26dee696a286fb5370b53a92b90634442f2e9b4554189ab986e9e24fb98bd632a124fd702070e20f448499bbf7a624ad7e32192e06fd2d696e2015fb69
+EBUILD war1gus-3.3.0.ebuild 1498 BLAKE2B 642be81055314d0f2f375d50707c94dbb901bc936527f2b19042ce08fb5e703671ba90626d4db21f4a6842bd6ad004f2a1c98bad83f8946575ece78c1ac45479 SHA512 9092d857009bed0219eb2c9ca9bcbeb75d4663394be94976c4a1ee0eccc0bcee8cee7dd3a81c5b464d4795a3bd227c2e4a62ec04a132ec18a5088a3644115278
 MISC metadata.xml 327 BLAKE2B 46d81ac16cc61355d8953d219d4fc378cca7390f8b4087410c898f25b3beaf97d8c74af9f99e9201adb92efe737c9fb5c3951a2f9859d24d802b5ecb846996a7 SHA512 6b513ad53703bf295fce142b26ec995fb6a1115a6ecf13813eec0f2cd5318f3d0f0fe01f4c3ef4848a6d00417dbb2558a6ed1879e3890951960c127e7693b1ed
diff --git a/games-strategy/war1gus/war1gus-3.3.0.ebuild b/games-strategy/war1gus/war1gus-3.3.0.ebuild
new file mode 100644
index 000000000000..d61b049b1854
--- /dev/null
+++ b/games-strategy/war1gus/war1gus-3.3.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Warcraft: Orcs & Humans for the Stratagus game engine"
+HOMEPAGE="
+	https://stratagus.com/war1gus.html
+	https://github.com/Wargus/war1gus/
+"
+SRC_URI="
+	https://github.com/Wargus/war1gus/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	=games-engines/stratagus-${PV}*[theora]
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DBINDIR="${EPREFIX}/usr/bin"
+		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
+		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/war1gus"
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "War1gus requires the data from the original game to run.  The game"
+	elog "will ask you for the location of the game data and extract/convert"
+	elog "it automatically on the first run."
+
+	if ! has_version media-video/ffmpeg ||
+		! has_version media-sound/timidity++
+	then
+		elog
+		elog "If you did not convert the game data yet, you may want to install"
+		elog "the following optional dependencies:"
+		elog
+		elog "media-video/ffmpeg -- to convert game videos"
+		elog "media-sound/timidity++ -- to convert game music"
+	fi
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest
index ca60d6e9e570..61f0ac45db2e 100644
--- a/games-strategy/wargus/Manifest
+++ b/games-strategy/wargus/Manifest
@@ -4,10 +4,12 @@ DIST wargus-3.1.0.tar.gz 4977868 BLAKE2B 063d47f53b58360c3ccc1aea301f4731a0108a5
 DIST wargus-3.1.1.tar.gz 4982124 BLAKE2B 1dd583c46f841c03d0e859e3c79da72da5866c5f6c67d1e23bf186935f2ae8d539e6dec36bb7c41b6f74af3a4f93c308489c802890c982a13aa68ba2cfbc4626 SHA512 8ec6a3dd11db9cb5984c9d61882beac0851f744203f9d90f23783b8a6b7f2728a180d7354c2e85d7ec8105c731a3e6996f5a688ce6bf5fa9437040c09cea6a59
 DIST wargus-3.1.2.tar.gz 4981468 BLAKE2B 76e925a6cd469a583adffe67f53a407f919b93c6700aeaa182db05b07691d64e6040d6f9f80461b14b81b412882bb58b976253b382d9e4aced7d1429c28832d2 SHA512 6925eab28b63222c4957b40c7b9a57ca231a18a7b36509c90f72d563a43a2ac4bd82bda3ca02e68099045fcddf10dd36c5a93c6f114f7bdcfb67afa7c7471b1e
 DIST wargus-3.2.0.tar.gz 5062175 BLAKE2B e742c2dae21aa5a8a05ef8a4cefc7d1245707d401aa9e14dfc633aeac0e4e4e54459c0ce07cbd32aed842c3dcf57ea8df39fcfc34a9316211146a61ce71464dc SHA512 bc85304c0994abf778cf157d1013d9dea18e1d761a3b432018641211824bcdb2e424c938842848d8c7a670d8660289b5860342a99be7af259cf8eaf883af1285
+DIST wargus-3.3.0.tar.gz 5094634 BLAKE2B aa0b02d62dc8620ba9517e5c7d1e8193f2c4c0e20b9b96b91cd5aa57fefdfda7354c82d67507aea67704adc7c77d90b858f0f3fb78d2a1bf430b5c4c5251f432 SHA512 3a2bd04aed0ced18a11ab925ca3d4da98f8848b45a0716fe5164ee5e0f9c76a63d7783d9ba94f3de022622e841f0257cb59d507ea772b2cc42419cef01ea8cbc
 EBUILD wargus-2.4.3.ebuild 1933 BLAKE2B 1570688d37ca291df56f903b130957f8e898b8b3c618863743bdf24f3c8a4ea2ce6d3850bd3d746947efcef7f0bead9849a23f72124b87d12e323ecd4bad0e7c SHA512 eda886eae8fdd69c877d3b2f9c175eedb899a2d79b0d67c3006b69f15800679297c0397a861a86749187cd62f4423f4cffa1969ff7c10ae4583ca7ad2a800a1c
 EBUILD wargus-3.0.0-r1.ebuild 1939 BLAKE2B b8272a50ba893a4c39ab03374af5ab4e7b3da5cfa5643be31e7c6f38ed85baec5d96b4e6bdeb313481711fd2f355240ad2c5e2044df4b903cbf2ea960ff16673 SHA512 c3cd057699fd4b42111eef93e6143f554c695ead5ceaf4801b6420fc581004b61f0f6b9dae3603ed4245dba14d94075d6fd38ae9a975007883eb15611560c640
 EBUILD wargus-3.1.0.ebuild 1938 BLAKE2B dd8622e5021dcb08c3d52838023871eb1cae2f66198d336bbd8e40cb9cb780642b71655211acff480da59e65d25eb594ec9a137fd26471824e8158c3141133b6 SHA512 0a46d7635c3b3a59a18f952df7427b8e8e454bd7c5ac56e232338c88387b050eddefc028f9a1415ec1db76ac3b8c4e86d7c31ce1bc3d697aadd50bf3e14fdcc9
 EBUILD wargus-3.1.1.ebuild 1938 BLAKE2B dd8622e5021dcb08c3d52838023871eb1cae2f66198d336bbd8e40cb9cb780642b71655211acff480da59e65d25eb594ec9a137fd26471824e8158c3141133b6 SHA512 0a46d7635c3b3a59a18f952df7427b8e8e454bd7c5ac56e232338c88387b050eddefc028f9a1415ec1db76ac3b8c4e86d7c31ce1bc3d697aadd50bf3e14fdcc9
 EBUILD wargus-3.1.2.ebuild 1938 BLAKE2B dd8622e5021dcb08c3d52838023871eb1cae2f66198d336bbd8e40cb9cb780642b71655211acff480da59e65d25eb594ec9a137fd26471824e8158c3141133b6 SHA512 0a46d7635c3b3a59a18f952df7427b8e8e454bd7c5ac56e232338c88387b050eddefc028f9a1415ec1db76ac3b8c4e86d7c31ce1bc3d697aadd50bf3e14fdcc9
 EBUILD wargus-3.2.0.ebuild 1938 BLAKE2B dd8622e5021dcb08c3d52838023871eb1cae2f66198d336bbd8e40cb9cb780642b71655211acff480da59e65d25eb594ec9a137fd26471824e8158c3141133b6 SHA512 0a46d7635c3b3a59a18f952df7427b8e8e454bd7c5ac56e232338c88387b050eddefc028f9a1415ec1db76ac3b8c4e86d7c31ce1bc3d697aadd50bf3e14fdcc9
+EBUILD wargus-3.3.0.ebuild 1949 BLAKE2B c9f02b4a29a00843e327fccc84aa2ce9ace4eb2611d4925dae763ec9cfda9cf5759e9e4ee71837445c3580ca9de2573f064e2b837260f5e978c1dc8cf48cdb87 SHA512 80e5ae52de4cae8499b9d904a7f73f35ea7ea13e53c9cb6a2a9576d57afe507fa6c67036e9858949b41056ec006ad17ee5610b82f3e9dd06841a14aa77086f6f
 MISC metadata.xml 536 BLAKE2B 4d7b4b47f8ac2fd71541d4f013b9e9e68a1be97426acdf768bbc2bb75cd16ec583a6542eab31a0cf11f16e3ebfbfcce6bf4b968a7dde059d388d1b8bf18a6048 SHA512 6cb843f123a8e5c5f81e92db2088a64601f00dffbebec293a59f34a6bff16aa763aaecc49d3e7429831bfebc77c72c70d9ae0958ecaf51ae73ea2ff746c4adab
diff --git a/games-strategy/wargus/wargus-3.3.0.ebuild b/games-strategy/wargus/wargus-3.3.0.ebuild
new file mode 100644
index 000000000000..fff6023fa177
--- /dev/null
+++ b/games-strategy/wargus/wargus-3.3.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Warcraft II for the Stratagus game engine"
+HOMEPAGE="
+	https://stratagus.com/
+	https://github.com/Wargus/wargus/
+"
+SRC_URI="
+	https://github.com/Wargus/wargus/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bne"
+
+DEPEND="
+	=games-engines/stratagus-${PV}*[theora]
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	bne? ( app-arch/stormlib:= )
+	!games-strategy/wargus-data
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+pkg_pretend() {
+	if has_version games-strategy/wargus-data; then
+		ewarn "The system-wide install of game data via games-strategy/wargus-data"
+		ewarn "no longer works.  The old data will be uninstalled after merging"
+		ewarn "this version of Wargus.  If you would like to preserve it, please"
+		ewarn "abort the process and back /usr/share/stratagus/wargus up."
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAMEDIR="${EPREFIX}/usr/bin"
+		-DBINDIR="${EPREFIX}/usr/bin"
+		-DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
+		-DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+		-DWITH_STORMLIB=$(usex bne)
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	elog "Wargus requires the data from the original game to run.  The game"
+	elog "will ask you for the location of the game data and extract/convert"
+	elog "it automatically on the first run."
+
+	if ! has_version media-video/ffmpeg ||
+		! has_version media-sound/cdparanoia
+	then
+		elog
+		elog "If you did not convert the game data yet, you may want to install"
+		elog "the following optional dependencies:"
+		elog
+		elog "media-video/ffmpeg -- to convert game videos"
+		elog "media-sound/cdparanoia -- to rip game music from the CD"
+	fi
+
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 21ea43f752e6..83958ba7ddbb 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 0925d1e0fd90..70bddb99e509 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -6,12 +6,14 @@ DIST roundcubemail-1.5.2-complete.tar.gz 7852981 BLAKE2B 36920aa30301b96e1157a58
 DIST roundcubemail-1.5.3-complete.tar.gz 7857655 BLAKE2B 46e34d706b9b2a425e3c9bba2f05e5b21d9c15b9e3031c49aa4df97fbd07f6b769c4784fe4f65cd1a21fe0270629f3573239ff1e82486c39abee9ae118540e4f SHA512 b43db6ffe129e8738b34e0f3dad6fec815e6be4dc41237f81bbb53ccfe56ac2d5b115edcef0a2587d4733f73b0951e740d94f0d314b324d4dd31c4563994aec1
 DIST roundcubemail-1.6-beta-complete.tar.gz 5941128 BLAKE2B 2114a683cbf0c4ec6f5ba0b4d5eebb0a1f96121724861c1b1b5ce30f6b3a8fae02693878cae168af3d7f906a705814233aef024ddbc24d807ccd089f24b63fe1 SHA512 8a8bc9749203980d33ede7b221b96e0990b4afbe41db65fca74f0a49334adcae717306d4fe8fe1a5c938bf9fbcb5c4745d4d67bc5a587503aa3a2e9cb8f6384b
 DIST roundcubemail-1.6-rc-complete.tar.gz 5961003 BLAKE2B a21a42f69c223eb50b38f6d02ab69ebe3cf55cc2848fc49cc0e238eead5f19751801654c0b5fb6954022d9b24562c04ba085bf668591a5b7ff7b306d3a950d1c SHA512 f12f7858b19ce16613ed02a8b4cf7b4fe16753454b7c4cf4e92bbb2d11de4ba1e00b09ba70b387133613967654aadaaf09167ed16c54809885eb48adcf54de5f
+DIST roundcubemail-1.6.0-complete.tar.gz 5970153 BLAKE2B 2e8766f9b99c36c9111768fc9bc5fca9811c59f82b740d66cd03da939c15f32467750d752e60b8c0def059f0b2f25a208460dc688fe595f971babdc9923f5e4e SHA512 821733778085c670caeed6bed515e542841920dccc21e2ca97088e1f77a302b6961234d6ee5bcfbda797470889747a3be2c6d13cc5016615c8919c7ea064108c
 EBUILD roundcube-1.4.11.ebuild 2289 BLAKE2B 3e24731cb8fa44a45ff7c34aeaf0f2766849d1cec59e6c5ae26fb639443e9288889e435a976686328860fdd6bc64b98369d0ad585f879b57202cdbf6dbdd6d06 SHA512 858450c270914701ad910de943f35985c538a817cc325cef345ed6d582507fc365b3df11df2d1f800c107cebd3cd8ed0251e5d055dcb568f91423c5c62017bc6
 EBUILD roundcube-1.5.0.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 EBUILD roundcube-1.5.1.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 EBUILD roundcube-1.5.2.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 EBUILD roundcube-1.5.3.ebuild 2358 BLAKE2B 9c0d75804dd6c52f3130114c540b6a017169786d17642f09da9c7712eaa47a23cd918608fe5c35720787e7cac00513ae51434a677de5dd234969c987083b68e8 SHA512 6355e5b89d590ca1c0cb9bcae698bac146941f72ec9c81ca05c80e26041c7a88d5ed6f42162b4932531919ed1026dfe0cecfd2ab5e49f07f7aeeb2c178441d1c
+EBUILD roundcube-1.6.0.ebuild 2358 BLAKE2B dd2606aba7bc4f4a1fe6a1256f4ebece36d8e841828123e033c7402a67c49e56e0ad78014f51c05dc51467aafddd0fb7721d45f92bab42d4505149d0395bf2b3 SHA512 36d905618b994534ea6bf306c1f81c6994ea55bcb34cebff3997368973a7833686f16504c944e5d5a179dce8c9dd1c0725541b4e8e3e2e5aba4974270cf4e148
 EBUILD roundcube-1.6_beta.ebuild 2358 BLAKE2B 2ec8dcf67cbceffad488687cf6fd206e479aa317136843eae599b2dc489e4c91bdc9e8e6e1e8e2be15ed2187abb532da1fdb842c9b0529d87fe503ff206084c9 SHA512 6ef49096ec40fe9ae94731a19aa9d49d60f0868e14c9513e4a42599bd51cc15fe2cac895eae15740385a9271f1cd81bb68aa4460ddb0fac26ba38ba5b63703eb
 EBUILD roundcube-1.6_rc.ebuild 2358 BLAKE2B 2ec8dcf67cbceffad488687cf6fd206e479aa317136843eae599b2dc489e4c91bdc9e8e6e1e8e2be15ed2187abb532da1fdb842c9b0529d87fe503ff206084c9 SHA512 6ef49096ec40fe9ae94731a19aa9d49d60f0868e14c9513e4a42599bd51cc15fe2cac895eae15740385a9271f1cd81bb68aa4460ddb0fac26ba38ba5b63703eb
-EBUILD roundcube-9999.ebuild 2358 BLAKE2B 2ec8dcf67cbceffad488687cf6fd206e479aa317136843eae599b2dc489e4c91bdc9e8e6e1e8e2be15ed2187abb532da1fdb842c9b0529d87fe503ff206084c9 SHA512 6ef49096ec40fe9ae94731a19aa9d49d60f0868e14c9513e4a42599bd51cc15fe2cac895eae15740385a9271f1cd81bb68aa4460ddb0fac26ba38ba5b63703eb
+EBUILD roundcube-9999.ebuild 2358 BLAKE2B dd2606aba7bc4f4a1fe6a1256f4ebece36d8e841828123e033c7402a67c49e56e0ad78014f51c05dc51467aafddd0fb7721d45f92bab42d4505149d0395bf2b3 SHA512 36d905618b994534ea6bf306c1f81c6994ea55bcb34cebff3997368973a7833686f16504c944e5d5a179dce8c9dd1c0725541b4e8e3e2e5aba4974270cf4e148
 MISC metadata.xml 1118 BLAKE2B 2872ed8444c98f6c9f96642089c879225e14ee2b53ad2dc70b307a82b8a1e0988e19c24fc9da8f98c63bacd6cfb105941ee5a5bc8e4ee756e216e0dd6d970e84 SHA512 3bb6ac4d95aaa94e0a23f1382b79220de90a45f45e1c98dac00c91e4bf12d35646c95b633713896062c729777e0ec57a6ebcc5d4d1b416105dc63378b50afb47
diff --git a/mail-client/roundcube/roundcube-1.6.0.ebuild b/mail-client/roundcube/roundcube-1.6.0.ebuild
new file mode 100644
index 000000000000..30c03bb63b3f
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.6.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_PV=${PV/_/-}
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="https://roundcube.net"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+
+IUSE="change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-7.4.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
+	virtual/httpd-php
+	change-password? (
+		dev-lang/php[sockets]
+	)
+	enigma? (
+		app-crypt/gnupg
+	)
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/roundcube/roundcubemail"
+	EGIT_BRANCH="master"
+	BDEPEND="${BDEPEND}
+		app-arch/unzip
+		dev-php/composer
+		net-misc/curl"
+else
+	SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		pushd "${S}" > /dev/null || die
+		rm Makefile || die
+		mv composer.json-dist composer.json || die
+		composer install --no-dev || die
+		./bin/install-jsdeps.sh || die
+		popd > /dev/null || die
+	else
+		default
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG.md INSTALL README.md UPGRADING SECURITY.md
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "You can review the post-upgrade instructions at:"
+		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
+	fi
+}
diff --git a/mail-client/roundcube/roundcube-9999.ebuild b/mail-client/roundcube/roundcube-9999.ebuild
index 44d89c9d3634..30c03bb63b3f 100644
--- a/mail-client/roundcube/roundcube-9999.ebuild
+++ b/mail-client/roundcube/roundcube-9999.ebuild
@@ -24,7 +24,7 @@ need_httpd_cgi
 
 RDEPEND="
 	${DEPEND}
-	>=dev-lang/php-7.3.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
+	>=dev-lang/php-7.4.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
 	virtual/httpd-php
 	change-password? (
 		dev-lang/php[sockets]
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 5ef71e143843..3c47859aa257 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index a0d7c9c1ed22..a45942f99a59 100644
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -2,5 +2,5 @@ AUX 11.0.02-make.patch 366 BLAKE2B 1d857d76826b5906c6405aa41728121624b345ad1f9bf
 DIST unifont-13.0.01.tar.gz 21053298 BLAKE2B 981d3d79015df9fa401823034de532840652127bc881d13244243dc0fbaabc14212b006f1e72ff65233793c7064576b51855d6a8ab1f7d889e7837c9c22d4f5d SHA512 2987aa097f89b1287d126e44297b19e405e198bb8ede2e321e6452c60678ebf4cf0be5f059b9565f4584bad09801effabe64d01ab90f132f27b206174827b14b
 DIST unifont-14.0.03.tar.gz 27451330 BLAKE2B f0ae933fc493d7e724b0526968d63fb4209e28526346a835b918aa6a31cd1a31c15a0c00f89196f6fd42cf2a0b2db8c51d9b6f9d7648938609e8b7e4122078a3 SHA512 de80097a4e1751c6ca21775c8ffe19716a910a0d110749017eacaa50a9f8f02d80e0b402426f3c2309e64e129a0386e29015d1116ad5fd64f97e5dc7fb75bdce
 EBUILD unifont-13.0.01-r1.ebuild 1111 BLAKE2B 17d328acc0c6743b1acd0291ffcc50c2d5391ef398a25301b36a8f986c932225b2843457642a5e620de879db94295ef731ab41df5c8aa537214d1212b0a20c5c SHA512 cf8f9891dcb04300198161a40fc2a3ffe9c7adfd7d5567e52d8ea9e1e80f3c843ef2cbc4452e454ee2e5844f6dd8bc1c7b5a13c7174c2541cdc1bbfca2c1a1e4
-EBUILD unifont-14.0.03.ebuild 1099 BLAKE2B 804250a37644a6d811df692faa7afd1b057d98c9f7c5dd31baffa7433d597edbd152987b00f650ac3a8b09c6f102d2b2298e3cfbdaed7a7190102b835c6482a5 SHA512 38c1faca0611d7ee49b9c5205d1432f69f6ba341df17c87a957f243a54263dd27baf953891aa2ebaa44ea5510ae4a98424d2b057f336a15feedc6ea21b1e23b3
+EBUILD unifont-14.0.03.ebuild 1096 BLAKE2B 3f81fc3d6b969e67ade9cf3b321ed13a61150a88766cfe8006d01f8afee026212f38c87e311845d9f26ded910e9fe33c485f85dd76d8e5111d7167ec9e0b96d0 SHA512 dbcd7fbee74dfaddeedbdf07d3f6d7ba578966e86f25fedd1b6a5420785b098befddc7463b04bf26ca476f4a8f4a82e116f24dc650961f2dd8661022a232141f
 MISC metadata.xml 485 BLAKE2B 5547944f4afc22e78b218df90194a20fd7d3a2bf012d231a98d51e570be16bf1644890541dea1e3ddeab2ca6e621f62c26e23ebc18aaa7cf7118f4aec639260d SHA512 fbc4063b1076aaec7f62bec624dcab2b76ff170fbe9cf3abcbbd0aa64610472b39555df1a5a706589781684590b8eb465c7467446bed63d20a8ea0e8ae21ba8e
diff --git a/media-fonts/unifont/unifont-14.0.03.ebuild b/media-fonts/unifont/unifont-14.0.03.ebuild
index ff3636ed0802..7983e51568b4 100644
--- a/media-fonts/unifont/unifont-14.0.03.ebuild
+++ b/media-fonts/unifont/unifont-14.0.03.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~ia64 ~loong ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="fontforge utils"
 
 BDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e603f36262a8..55b125d665a8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index fea1a748d5ea..4c228fa7045a 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -2,5 +2,5 @@ AUX gd-2.3.0-disable-flaky-tests.patch 792 BLAKE2B 81d4d56f0365e51fd1f406f3f27cd
 DIST libgd-2.3.2.tar.xz 2821096 BLAKE2B a126fbac1c20113fe8f27187e70b1b81712212b7da01c9a0b3e5e38fb4d4356b7992a0cfd7db55a2f94877f6ecf82d775c39977a523db1f948cf215c6c0d7672 SHA512 a31c6dbb64e7b725b63f3b400f7bebc289e2d776bdca0595af23006841660dc93a56c2247b98f8a584438a826f9e9ff0bea17d0b3900e48e281580b1308794d2
 DIST libgd-2.3.3.tar.xz 2809056 BLAKE2B bde7a3218e5b07758b0beb96a654a44a97ba79abfe1ebe115ffd44aa34301be8e76f33840824362826dbfe93b16a4c4403b00b34aa631a0b18398cd46a09889d SHA512 aa49d4381d604a4360d556419d603df2ffd689a6dcc10f8e5e1d158ddaa3ab89912f6077ca77da4e370055074007971cf6d356ec9bf26dcf39bcff3208bc7e6c
 EBUILD gd-2.3.2-r1.ebuild 2634 BLAKE2B 4746729ee31a6ec9a5a8a41210a2de5f8529bca0822e8ce187e070582694a57ba43c1f63d3e01e716602c9574c3a83839bb0b51284e33ef04e53fc87919f9bab SHA512 8be8b59df981b11333debcaa821d198eef57a9c22f064905c9d9bc49a40475fa9af53760c573030d133a47360b7a403e395e8765c89622188fc3b77d9e7125df
-EBUILD gd-2.3.3-r1.ebuild 2783 BLAKE2B 62dd8cb7812ca5c69293b02ec5d403aa9989ea35ab12d854fc9807c4b47c5a34076d2f6e64efb46d4737a6afe143624d7394cef3bd0f4b1a51a73adcadb27b9f SHA512 632a8b92837c2454332581b48502049e8c175029a9a7826b106ca21b75684bddbddbbb07b2f2043308258bac9b844c79ff6d4b8627b7aa20fa65228973d05f42
+EBUILD gd-2.3.3-r1.ebuild 2782 BLAKE2B a9861bd3e1b58fde16f0d0a87f6e56995143ccf9eee8e036933a5671fbde3c605085d417a47bc1bd3df2efe020690345b716d242deae733121c6c2b7644c50a0 SHA512 148868bf4e477801fdf2f357f3e860b9cacedf149edb43802259bf7000ea4069c8d93eee7cc7166ac0f029076ee18b95e2ee6689c2efb18ffa708968e609520f
 MISC metadata.xml 1637 BLAKE2B 68ed864c268f2f84f341e7281d68c2f227c6e65b78bf490cea11dd09208f7cad4426c94b8100f8f7be1fb1725e5aca0b699bf08286135996e39f61de3d0006d1 SHA512 63c490455fa6bd7d6f3cc2b8b4d68c49eb28d14e4d83696df270bebebe8186ca04e58f4dc73e381d0f932e1f273a8c13b4f9f3a0a926debc4173bc8b4ba94d0e
diff --git a/media-libs/gd/gd-2.3.3-r1.ebuild b/media-libs/gd/gd-2.3.3-r1.ebuild
index fad25e8b6e04..2bd406826e38 100644
--- a/media-libs/gd/gd-2.3.3-r1.ebuild
+++ b/media-libs/gd/gd-2.3.3-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/lib${P}"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="avif cpu_flags_x86_sse fontconfig +jpeg heif +png static-libs test tiff truetype webp xpm zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 7ac0829db5cb..09b70035e799 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d1f4cb3df91c..44d032067205 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Jul 2022 12:39:32 +0000
+Fri, 29 Jul 2022 18:39:36 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 374b88050a4c..0291914ae101 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-29T12:39:35Z
+TIMESTAMP 2022-07-29T18:39:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLj1QdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLkKWtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCkWQ//S51mxsbFr6IK0z97goNzI4fL92E0W8UZ9At9V+PWTE96K2PR7W7A5LSS
-5z7ASSePcWvU0N1E9uyMT5Yje7N1m4/M78owmyg+6h5njlaPWQmH+YG4qrjpObrH
-YUFRH8zstavPEQRKTfUBCy3x0G/ADFzhgI9D7j2rbvNuDR9mFRQTsP5iwrE2M2ta
-4uE+lmwHDFKeeOpuEDkSNn7JdRriI0lyRHT+VnyYEPXSRa0mp/2FxHzb4wfXnEy6
-dfqSpIKDbGpNsshTBXB7fDtuS3Idc6qfW2c9w+tsguBZ+O17+pZ2vewJBPMirAzh
-Q0N2+to9bDQ3n7aQiMzc0X6pmGXZEKBhdOS1YY8Q3LBXAO45+xxJ7s/0oV+hyHW8
-zpSHrbcnZpxS7zJoJJktwWqIUa8fbetm2MBQopPPPZnAX//M9eUiWNQg/tJioAsU
-BpmF+vNz4gxXsTLyXxfBYJ814971tOgUd6C3aVc5YBAORjzcBbtZNe7L+rC9ZaX7
-4+iwIRwe6X9lI7LDG2cRsDd5dDtVxZ/FpPyC7wUkIAkrgrabLYUyHlSxrR/cU9O8
-yHBHItil4d2N5IWlu6lXKsswxElXTgbWBBRJ8lxhx5+Yfdcw2d+g22vIRJGI9MMC
-PzkA+9renqKbA/LrtcglK9umM8G7w++939nSXjsAbq8NH7dgQtI=
-=meNo
+klAgHRAAk5WTqyA32zLqViAwj2cnwAGW4ObISQgry0D92GN3vsxHFeHbJ/n2LZUn
+1Qczy5g44nrrG9yYY21xxlMTqYtuBHJXztkVfZMvBPrJsC/xPQtdycG2uWRhrb5I
+wt9GZ+8SRwLX1n3UxhxUhjTmhYh5MZqOqtegud9TpyFmxw1uETet2IzyZL9DxTto
+cYPytWfdsmSa4tazL67HtXL60GQz4sg6hsQIivZ6jW4scH6sL4U8F5JKdOYh9z8K
+rag3byjudwAZgaQ1vJ/mEXzR4xt8pKByLEqv4jCDpMlgIEvDLlFusaXTXJqkvCb2
+CcbE0OcBvWJ6A71QFjO6RbSH/Itj0bHgl1sA1waHeMhqUFvJkZPps1dkrOOYbTJD
+f/hFcFiYYkB96mjcbC1JvUJal3uqaq8Z/yN+EgCABHzLu1m50VMxfgqb8HWDH7jv
+4X/ajGBhL7hQfLAVteG9LJflr7/6VrAkPZ1ZQxUvZ7khFV/N40asO1b1HY2G5gl1
+UTbMifJIpbCi9XBnEQ6KgsgnBJWILSuzHQ8Tah070wIBm3faRO4fNiAxb6ZY5G8l
+b+sbc9kZRGWLyuWkVGxBoQC2qOnU48leGiyyiriXdsExqR7lAebF2a5xDU504JIs
+/DyvdYkyj2QvUWGKxIBukc0VFgp2Ip1N/b8oOtLz88sYO1Awpec=
+=jv4J
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d1f4cb3df91c..44d032067205 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Jul 2022 12:39:32 +0000
+Fri, 29 Jul 2022 18:39:36 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 8a6a5f578e47..19ba2c23cee3 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index fc5dceb339f8..be26a44aaa23 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/accerciser-3.40.0 b/metadata/md5-cache/app-accessibility/accerciser-3.40.0
new file mode 100644
index 000000000000..f2c21dd4a563
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/accerciser-3.40.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=x11-libs/gtk+-3.1.13:3[introspection] python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] >=dev-python/ipython-0.11[python_targets_python3_8(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/python-xlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] >=dev-python/ipython-0.11[python_targets_python3_9(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/python-xlib[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_10(-)] >=dev-python/ipython-0.11[python_targets_python3_10(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/python-xlib[python_targets_python3_10(-)] ) dev-libs/atk[introspection] >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection:= x11-libs/gdk-pixbuf[introspection] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] gnome-base/librsvg[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] )
+DESCRIPTION=Interactive Python accessibility explorer
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Accerciser https://gitlab.gnome.org/GNOME/accerciser
+INHERIT=gnome2 python-single-r1
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD CC-BY-SA-3.0
+RDEPEND=>=app-accessibility/at-spi2-core-2.5.2:2 >=x11-libs/gtk+-3.1.13:3[introspection] python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] >=dev-python/ipython-0.11[python_targets_python3_8(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/python-xlib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] >=dev-python/ipython-0.11[python_targets_python3_9(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/python-xlib[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_10(-)] >=dev-python/ipython-0.11[python_targets_python3_10(-)] >=dev-python/pyatspi-2.1.5[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/python-xlib[python_targets_python3_10(-)] ) dev-libs/atk[introspection] >=dev-libs/glib-2.28:2 dev-libs/gobject-introspection:= x11-libs/gdk-pixbuf[introspection] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] gnome-base/librsvg[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/accerciser/3.40/accerciser-3.40.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f00ceae82b06567a3613637505097370
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 7acfe7f90800..5d8d2984ae3e 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/logrotate-3.20.1-r1 b/metadata/md5-cache/app-admin/logrotate-3.20.1-r1
index d1f493f8f6c2..ab65b55a8b9e 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.20.1-r1
+++ b/metadata/md5-cache/app-admin/logrotate-3.20.1-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/logrotate/logrotate
 INHERIT=systemd tmpfiles verify-sig
 IUSE=acl +cron selinux verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.20.1/logrotate-3.20.1.tar.xz verify-sig? ( https://github.com/logrotate/logrotate/releases/download/3.20.1/logrotate-3.20.1.tar.xz.asc )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=0b2e05c27b9189ad36722be30fb39817
+_md5_=afb09f3ba2a133dbf71a470ea3510ca7
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 578225518280..f03a96b4e8ea 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/grype-0.44.0-r1 b/metadata/md5-cache/app-containers/grype-0.44.0-r1
new file mode 100644
index 000000000000..10eaed2baa96
--- /dev/null
+++ b/metadata/md5-cache/app-containers/grype-0.44.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=A vulnerability scanner for container images and filesystems
+EAPI=8
+HOMEPAGE=https://www.anchore.com
+INHERIT=go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/anchore/grype/archive/v0.44.0.tar.gz -> grype-0.44.0.tar.gz https://dev.gentoo.org/~williamh/dist/grype-0.44.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=b3fe143883a90f9e0634cd6fe5a4ad34
diff --git a/metadata/md5-cache/app-containers/syft-0.52.0-r1 b/metadata/md5-cache/app-containers/syft-0.52.0-r1
new file mode 100644
index 000000000000..3e6d9f466663
--- /dev/null
+++ b/metadata/md5-cache/app-containers/syft-0.52.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Generate a Software Bill of Materials from container images and filesystems
+EAPI=8
+HOMEPAGE=https://www.anchore.com
+INHERIT=go-module
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/anchore/syft/archive/v0.52.0.tar.gz -> syft-0.52.0.tar.gz https://dev.gentoo.org/~williamh/dist/syft-0.52.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=0f51cf1b21ba49fa2687da490045bf52
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 8de373167a85..1a9f166f3ac3 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/gvim-9.0.0099 b/metadata/md5-cache/app-editors/gvim-9.0.0099
new file mode 100644
index 000000000000..ad6e4ceca6c0
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gvim-9.0.0099
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/autoconf virtual/pkgconfig lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-9.0.0099 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=8
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+INHERIT=vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
+IUSE=acl aqua crypt cscope debug lua motif netbeans nls perl python racket ruby selinux session sound tcl lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-9.0.0099 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) aqua? ( !motif )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v9.0.0099.tar.gz -> vim-9.0.0099.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=37ceaff96d4ced7a762e5ae907e13a49
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index 264a4a6133f2..6e16ee6975eb 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/autoconf virtual/pkgconfig lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/autoconf virtual/pkgconfig lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=8
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 INHERIT=vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single git-r3
-IUSE=acl aqua crypt cscope debug lua motif netbeans nls perl python racket ruby selinux session sound tcl lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+IUSE=acl aqua crypt cscope debug lua motif netbeans nls perl python racket ruby selinux session sound tcl lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=vim
 PROPERTIES=live
-RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) aqua? ( !motif )
+RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( x11-libs/gtk+:3 x11-libs/libXft ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) aqua? ( !motif )
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5feec1f33a4950201deb00a142a4d092
+_md5_=37ceaff96d4ced7a762e5ae907e13a49
diff --git a/metadata/md5-cache/app-editors/nano-6.3 b/metadata/md5-cache/app-editors/nano-6.3
index 556deebb0e85..c8d5149bde7b 100644
--- a/metadata/md5-cache/app-editors/nano-6.3
+++ b/metadata/md5-cache/app-editors/nano-6.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 INHERIT=flag-o-matic
 IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
 REQUIRED_USE=magic? ( !minimal )
 SLOT=0
 SRC_URI=https://www.nano-editor.org/dist/v6/nano-6.3.tar.xz
 _eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0c6d90ac53f0c21ab58b1fae15fdb498
+_md5_=f2e4c07e87662d15c19964f8df9e9c39
diff --git a/metadata/md5-cache/app-editors/vim-9.0.0099 b/metadata/md5-cache/app-editors/vim-9.0.0099
new file mode 100644
index 000000000000..b9c829de839d
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-9.0.0099
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.0099 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+DESCRIPTION=Vim, an improved vi-style text editor
+EAPI=8
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+INHERIT=vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
+IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9.0.0099 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) vim-pager? ( !minimal )
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v9.0.0099.tar.gz -> vim-9.0.0099.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=55221a15ae23763c64eb95eabab7c49f
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index d32ac3ea9222..2e3709916353 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -1,15 +1,15 @@
-BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/autoconf lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9999 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9999 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=8
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 INHERIT=vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils git-r3
-IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+IUSE=X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=vim
 PROPERTIES=live
-RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9999 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) vim-pager? ( !minimal )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9999 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) vim-pager? ( !minimal )
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=02410246c16b51c57d40d83a6058ee6b
+_md5_=55221a15ae23763c64eb95eabab7c49f
diff --git a/metadata/md5-cache/app-editors/vim-core-9.0.0099 b/metadata/md5-cache/app-editors/vim-core-9.0.0099
new file mode 100644
index 000000000000..85cdf4152991
--- /dev/null
+++ b/metadata/md5-cache/app-editors/vim-core-9.0.0099
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=sys-libs/ncurses-5.2-r2:0
+DESCRIPTION=vim and gvim shared files
+EAPI=8
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+INHERIT=vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
+IUSE=nls acl minimal
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=vim
+PDEPEND=!minimal? ( app-vim/gentoo-syntax )
+RDEPEND=!<app-editors/vim-8.2.4328-r1
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v9.0.0099.tar.gz -> vim-core-9.0.0099.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=12848f638006f14b3dffd92631debea3
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index cf7c8615e88e..0d9b3b9d5cd3 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/vice-3.6.1-r1 b/metadata/md5-cache/app-emulation/vice-3.6.1-r1
index e062f499fe80..decb6bfd6fb2 100644
--- a/metadata/md5-cache/app-emulation/vice-3.6.1-r1
+++ b/metadata/md5-cache/app-emulation/vice-3.6.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://vice-emu.sourceforge.io/
 INHERIT=multibuild toolchain-funcs xdg
 IUSE=alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless jpeg lame mpg123 ogg openmp oss parport pci png portaudio pulseaudio sdl zlib
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=virtual/libintl alsa? ( media-libs/alsa-lib ) ethernet? ( net-libs/libpcap sys-libs/libcap ) ffmpeg? ( <media-video/ffmpeg-5:= ) flac? ( media-libs/flac ) gif? ( media-libs/giflib:= ) gtk? ( dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/glew:0= sys-libs/readline:= virtual/opengl x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/pango ) jpeg? ( media-libs/libjpeg-turbo:= ) lame? ( media-sound/lame ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg media-libs/libvorbis ) parport? ( sys-libs/libieee1284 ) pci? ( sys-apps/pciutils ) png? ( media-libs/libpng:= ) portaudio? ( media-libs/portaudio ) pulseaudio? ( || ( media-libs/libpulse media-sound/pulseaudio ) ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-image sys-libs/readline:= ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=|| ( gtk headless sdl ) gtk? ( zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/vice-emu/releases/vice-3.6.1.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a5767b3d66082521ebf79dadc9254131
+_md5_=7a72f272c040bafde62ec55237dd0479
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index eaaae36aec10..9261f422b4a1 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/xa-2.3.13 b/metadata/md5-cache/dev-embedded/xa-2.3.13
index cf1f4f6b3f55..5c355b982fed 100644
--- a/metadata/md5-cache/dev-embedded/xa-2.3.13
+++ b/metadata/md5-cache/dev-embedded/xa-2.3.13
@@ -3,9 +3,9 @@ DESCRIPTION=High-speed, two-pass portable 6502 cross-assembler
 EAPI=8
 HOMEPAGE=https://www.floodgap.com/retrotech/xa/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://www.floodgap.com/retrotech/xa/dists/xa-2.3.13.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=38f905e51be30b6d049c423262ca99e3
+_md5_=fc04a7a865dc2f964043c6426e8dd57b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index ca5d1bbe873f..420b0f8648ce 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/rust-1.59.0 b/metadata/md5-cache/dev-lang/rust-1.59.0
index 8dd2a015b700..67a12ab0c434 100644
--- a/metadata/md5-cache/dev-lang/rust-1.59.0
+++ b/metadata/md5-cache/dev-lang/rust-1.59.0
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=stable/1.59
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.59.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.59.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.58.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.58.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.58.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.58.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.58.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.58.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.58.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.58.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.58.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.58.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=db94ee45d6a3c81c3e53fcb82e873d8d
+_md5_=0aef8c5733ee5a281c0805bac6118b89
diff --git a/metadata/md5-cache/dev-lang/rust-1.60.0 b/metadata/md5-cache/dev-lang/rust-1.60.0
index b6b9fbd0eff2..65dc744c366d 100644
--- a/metadata/md5-cache/dev-lang/rust-1.60.0
+++ b/metadata/md5-cache/dev-lang/rust-1.60.0
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=stable/1.60
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.60.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.60.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.59.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.59.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.59.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.59.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.59.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.59.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.59.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.59.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.59.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.59.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.59.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.59.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.59.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.59.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.59.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.59.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.59.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=ee91421595c6bbd174642ccb7a0c5ac8
+_md5_=c51fced2bca68a90d1bf4aa7e32720a3
diff --git a/metadata/md5-cache/dev-lang/rust-1.61.0-r2 b/metadata/md5-cache/dev-lang/rust-1.61.0-r2
index 0cfcfea3d9e0..c49209f84bc0 100644
--- a/metadata/md5-cache/dev-lang/rust-1.61.0-r2
+++ b/metadata/md5-cache/dev-lang/rust-1.61.0-r2
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=stable/1.61
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.61.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.61.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.60.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.60.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.60.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.60.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.60.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.60.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.60.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.60.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.60.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.60.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.60.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.60.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.60.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.60.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.60.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.60.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.60.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=1a546fcfc3458a6d3bd9293b076141a5
+_md5_=23f2c4003c759ba9641183e303d9e170
diff --git a/metadata/md5-cache/dev-lang/rust-1.62.0 b/metadata/md5-cache/dev-lang/rust-1.62.0
index bdfc583a384c..5b38c92381fb 100644
--- a/metadata/md5-cache/dev-lang/rust-1.62.0
+++ b/metadata/md5-cache/dev-lang/rust-1.62.0
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=stable/1.62
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.62.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.62.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.61.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.61.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.61.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.61.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=5edca382857627f32634435164ed3aa5
+_md5_=3aca562d95f07c16d5535c1784c7f7e1
diff --git a/metadata/md5-cache/dev-lang/rust-1.62.1 b/metadata/md5-cache/dev-lang/rust-1.62.1
index ce92e4da738b..3cad9e48668f 100644
--- a/metadata/md5-cache/dev-lang/rust-1.62.1
+++ b/metadata/md5-cache/dev-lang/rust-1.62.1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=stable/1.62
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.62.1-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.62.1-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.61.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.61.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.61.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.61.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.61.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.61.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=ef1a5dbabe8611427cf4a3dc481f04fb
+_md5_=3f52a5945b18c1400e358737a8f6200a
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 14698fc21b6d..308ea2e12cfe 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/oniguruma-6.9.8 b/metadata/md5-cache/dev-libs/oniguruma-6.9.8
index 43c10f9ec51f..2a3fb9756e47 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-6.9.8
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.9.8
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=https://github.com/kkos/oniguruma
 INHERIT=multilib-minimal
 IUSE=crnl-as-line-terminator static-libs 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 ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD-2
 SLOT=0/5
 SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.8/onig-6.9.8.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=00f0a22f36ec1b0ccc073128b1041391
+_md5_=44d3d5ac018a7635a0b1383e5acd73f4
diff --git a/metadata/md5-cache/dev-libs/redland-1.0.17-r3 b/metadata/md5-cache/dev-libs/redland-1.0.17-r3
new file mode 100644
index 000000000000..c47e7b659b95
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/redland-1.0.17-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/libltdl:0 mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db:* ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( dev-db/postgresql:* ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
+DESCRIPTION=High-level interface for the Resource Description Framework
+EAPI=8
+HOMEPAGE=http://librdf.org/
+INHERIT=db-use libtool
+IUSE=berkdb iodbc mysql odbc postgres sqlite
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0 GPL-2 LGPL-2.1
+RDEPEND=dev-libs/libltdl:0 mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db:* ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( dev-db/postgresql:* ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
+SLOT=0
+SRC_URI=http://download.librdf.org/source/redland-1.0.17.tar.gz
+_eclasses_=db-use	867a9246a45efc09934e0f8e3380c813	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=eb66dfc110157c051e2f9e7d024000bd
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index d3c2568fb310..e71a3e7f9103 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/aiodns-3.0.0-r1 b/metadata/md5-cache/dev-python/aiodns-3.0.0-r1
new file mode 100644
index 000000000000..bbdf2ecf48f8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aiodns-3.0.0-r1
@@ -0,0 +1,18 @@
+BDEPEND=test? ( >=dev-python/pycares-3[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-6[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-python/pycares-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Simple DNS resolver for asyncio
+EAPI=8
+HOMEPAGE=https://github.com/saghul/aiodns/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+PROPERTIES=test_network
+RDEPEND=>=dev-python/pycares-3[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? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/aiodns/aiodns-3.0.0.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=93f7e8b90dab8a9fccd139b717bdaf85
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.8.1 b/metadata/md5-cache/dev-python/aiohttp-3.8.1
deleted file mode 100644
index a5555b39b72e..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-3.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/async_generator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] www-servers/gunicorn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/re-assert[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( !ia64? ( dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) test? ( app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/async-timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,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(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_10(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_10(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_10(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_10(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-aiohttp-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/alabaster-0.6.2[python_targets_python3_9(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_9(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_9(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_9(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-aiohttp-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/alabaster-0.6.2[python_targets_python3_8(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_8(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_8(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_8(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] >=dev-python/alabaster-0.6.2[python_targets_pypy3(-)] dev-python/sphinxcontrib-asyncio[python_targets_pypy3(-)] dev-python/sphinxcontrib-blockdiag[python_targets_pypy3(-)] dev-python/sphinxcontrib-newsfeed[python_targets_pypy3(-)] dev-python/sphinxcontrib-spelling[python_targets_pypy3(-)] dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx-aiohttp-theme[python_targets_pypy3(-)] ) ) ) 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 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=http client/server for asyncio
-EAPI=8
-HOMEPAGE=https://pypi.org/project/aiohttp/ https://github.com/aio-libs/aiohttp/
-INHERIT=distutils-r1 multiprocessing
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/async-timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.8.1.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d2852fb649739dc3538d62549ade9296
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1 b/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1
index a9fe764398ac..16b84bb99e3a 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-3.8.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aio-libs/aiohttp/ https://pypi.org/project/aiohttp/
 INHERIT=distutils-r1 multiprocessing
 IUSE=test doc 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 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/async-timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/yarl-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/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/aiohttp/aiohttp-3.8.1.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f977e54f56a070480b4e82dc9110de4f
+_md5_=9a919c80223ab990e2da26021a6f0b90
diff --git a/metadata/md5-cache/dev-python/black-22.6.0 b/metadata/md5-cache/dev-python/black-22.6.0
index 73625ac2f1aa..77bdf94b4c43 100644
--- a/metadata/md5-cache/dev-python/black-22.6.0
+++ b/metadata/md5-cache/dev-python/black-22.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black/ https://pypi.org/project/black/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pathspec-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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/psf/black/archive/22.6.0.tar.gz -> black-22.6.0.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d6a0d9b5e06f56ca59c1c87c7cd2ba4c
+_md5_=aeda3c1b398cc7afc46e460871440273
diff --git a/metadata/md5-cache/dev-python/bleach-5.0.0-r1 b/metadata/md5-cache/dev-python/bleach-5.0.0-r1
deleted file mode 100644
index ab9b5512747f..000000000000
--- a/metadata/md5-cache/dev-python/bleach-5.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/html5lib-1.0.1-r1[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-6[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=An easy whitelist-based HTML-sanitizing tool
-EAPI=8
-HOMEPAGE=https://github.com/mozilla/bleach/ https://pypi.org/project/bleach/
-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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/html5lib-1.0.1-r1[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/b/bleach/bleach-5.0.0.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=61c2b11fc4c520a8c3ed85c8073f8c14
diff --git a/metadata/md5-cache/dev-python/chardet-4.0.0-r1 b/metadata/md5-cache/dev-python/chardet-4.0.0-r1
deleted file mode 100644
index 9e61fa1866d2..000000000000
--- a/metadata/md5-cache/dev-python/chardet-4.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/hypothesis[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-6[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=Universal encoding detector
-EAPI=8
-HOMEPAGE=https://github.com/chardet/chardet/ https://pypi.org/project/chardet/
-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 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=LGPL-2.1
-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=https://github.com/chardet/chardet/archive/4.0.0.tar.gz -> chardet-4.0.0.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3894adff4f529d8e1147b519d72a543e
diff --git a/metadata/md5-cache/dev-python/configupdater-3.1.1 b/metadata/md5-cache/dev-python/configupdater-3.1.1
index 60d8667554b3..5f009efb83f5 100644
--- a/metadata/md5-cache/dev-python/configupdater-3.1.1
+++ b/metadata/md5-cache/dev-python/configupdater-3.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pyscaffold/configupdater/ https://pypi.org/project/ConfigUpdater/
 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 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc
 LICENSE=MIT PSF-2 PYTHON
 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/pyscaffold/configupdater/archive/v3.1.1.tar.gz -> configupdater-3.1.1.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e29b1765260ffb12431b844e68739876
+_md5_=6706da8aaad0f65aac8f0308889c9b01
diff --git a/metadata/md5-cache/dev-python/cryptography-3.4.7-r3 b/metadata/md5-cache/dev-python/cryptography-3.4.7-r3
deleted file mode 100644
index edb70df424f0..000000000000
--- a/metadata/md5-cache/dev-python/cryptography-3.4.7-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/hypothesis-1.11.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/iso8601[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[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/pytest-subtests[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? ( python_targets_python3_8? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_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=[threads(+)] ) 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(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/gpep517-6[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=>=dev-libs/openssl-1.0.2o-r6:0=
-DESCRIPTION=Library providing cryptographic recipes and primitives
-EAPI=8
-HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
-INHERIT=distutils-r1 multiprocessing
-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 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Apache-2.0 BSD )
-RDEPEND=python_targets_python3_8? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.8:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-libs/openssl-1.0.2o-r6:0= python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+)] ) 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(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
-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/c/cryptography/cryptography-3.4.7.tar.gz test? ( mirror://pypi/c/cryptography_vectors/cryptography_vectors-3.4.7.tar.gz )
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6e6fa303e752419befd780feae96eed3
diff --git a/metadata/md5-cache/dev-python/dnspython-2.2.1 b/metadata/md5-cache/dev-python/dnspython-2.2.1
deleted file mode 100644
index fad9d964767a..000000000000
--- a/metadata/md5-cache/dev-python/dnspython-2.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/idna-4.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-6[python_targets_pypy3(-)?,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_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=DNS toolkit for Python
-EAPI=8
-HOMEPAGE=https://www.dnspython.org/ https://github.com/rthalley/dnspython/ https://pypi.org/project/dnspython/
-INHERIT=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=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=ISC
-RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/idna-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rthalley/dnspython/archive/v2.2.1.tar.gz -> dnspython-2.2.1.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c70410b3ea09da910e237d95881de675
diff --git a/metadata/md5-cache/dev-python/dnspython-2.2.1-r1 b/metadata/md5-cache/dev-python/dnspython-2.2.1-r1
index aafec512860a..d8d0bf5ed651 100644
--- a/metadata/md5-cache/dev-python/dnspython-2.2.1-r1
+++ b/metadata/md5-cache/dev-python/dnspython-2.2.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.dnspython.org/ https://github.com/rthalley/dnspython/ https://pypi.org/project/dnspython/
 INHERIT=distutils-r1
 IUSE=dnssec 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=ISC
 RDEPEND=dnssec? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) <dev-python/idna-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/rthalley/dnspython/archive/v2.2.1.tar.gz -> dnspython-2.2.1.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=de0e4746f46acef27935a09f22c40408
+_md5_=bdff1bbf17daea862087fac125d8d79a
diff --git a/metadata/md5-cache/dev-python/doc8-1.0.0 b/metadata/md5-cache/dev-python/doc8-1.0.0
new file mode 100644
index 000000000000..380b38b61864
--- /dev/null
+++ b/metadata/md5-cache/dev-python/doc8-1.0.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/restructuredtext-lint-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stevedore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[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-6[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=Style checker for Sphinx (or other) RST documentation
+EAPI=8
+HOMEPAGE=https://pypi.org/project/doc8/ https://github.com/pycqa/doc8/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/restructuredtext-lint-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stevedore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli[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=mirror://pypi/d/doc8/doc8-1.0.0.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d9a3fd0314047d6b8bad7fe6104615eb
diff --git a/metadata/md5-cache/dev-python/httpretty-1.1.4-r1 b/metadata/md5-cache/dev-python/httpretty-1.1.4-r1
index c30add18f662..bdab60c3fd93 100644
--- a/metadata/md5-cache/dev-python/httpretty-1.1.4-r1
+++ b/metadata/md5-cache/dev-python/httpretty-1.1.4-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sure[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=www-servers/tornado-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/boto3-1.17.72[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.18.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/boto3-1.17.72[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.18.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/boto3-1.17.72[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.18.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/boto3-1.17.72[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.18.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-python/eventlet-0.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/eventlet-0.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( dev-python/urllib3[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-6[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(-)?]
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sure[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=www-servers/tornado-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( !arm? ( !sparc? ( dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_python3_8? ( >=dev-python/boto3-1.17.72[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.18.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/boto3-1.17.72[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.18.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/boto3-1.17.72[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.18.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/boto3-1.17.72[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.18.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-python/eventlet-0.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/eventlet-0.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( dev-python/urllib3[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-6[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=HTTP client mock for Python
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-1.1.4.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=030959dff00f9adf44fa7e685d56e54b
+_md5_=87c833f5b3e00f1ffd1b3a48277defd1
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-4.11.4 b/metadata/md5-cache/dev-python/importlib_metadata-4.11.4
deleted file mode 100644
index 4f784e231aec..000000000000
--- a/metadata/md5-cache/dev-python/importlib_metadata-4.11.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)?] ) ) test? ( dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[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-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[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=Read metadata from Python packages
-EAPI=7
-HOMEPAGE=https://github.com/python/importlib_metadata
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-python/zipp[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/i/importlib_metadata/importlib_metadata-4.11.4.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a5067190e1f41dc100fb201d40e89b82
diff --git a/metadata/md5-cache/dev-python/ini2toml-0.10 b/metadata/md5-cache/dev-python/ini2toml-0.10
deleted file mode 100644
index a10b5969d29b..000000000000
--- a/metadata/md5-cache/dev-python/ini2toml-0.10
+++ /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/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tomlkit[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-0.4.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-6[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=Automatically conversion of .ini/.cfg files to TOML equivalents
-EAPI=8
-HOMEPAGE=https://pypi.org/project/ini2toml/ https://github.com/abravalheri/ini2toml/
-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=MPL-2.0
-RDEPEND=>=dev-python/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-0.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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/abravalheri/ini2toml/archive/v0.10.tar.gz -> ini2toml-0.10.gh.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7fb19e3f601ad08e1122c0008181255a
diff --git a/metadata/md5-cache/dev-python/ini2toml-0.11-r1 b/metadata/md5-cache/dev-python/ini2toml-0.11-r1
index cd762b22c3df..89dcd8634dbd 100644
--- a/metadata/md5-cache/dev-python/ini2toml-0.11-r1
+++ b/metadata/md5-cache/dev-python/ini2toml-0.11-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ini2toml/ https://github.com/abravalheri/ini2toml/
 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 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-0.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/abravalheri/ini2toml/archive/v0.11.tar.gz -> ini2toml-0.11.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a68d08b923cb2e0b00b84a1d7d36cf73
+_md5_=bb8c94ef9e79bf4a9d54b13698998b23
diff --git a/metadata/md5-cache/dev-python/ipyparallel-8.3.0 b/metadata/md5-cache/dev-python/ipyparallel-8.3.0
deleted file mode 100644
index 0499041e06fd..000000000000
--- a/metadata/md5-cache/dev-python/ipyparallel-8.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/flit_core[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/ipython[test] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-4.4[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/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-5.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[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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Interactive Parallel Computing with IPython
-EAPI=8
-HOMEPAGE=https://ipyparallel.readthedocs.io/
-INHERIT=distutils-r1 optfeature
-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
-LICENSE=BSD
-RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_server[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipykernel-4.4[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/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-5.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[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/ipyparallel/ipyparallel-8.3.0.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2521bcc5bcd90285c6acfb12fb75d3f4
diff --git a/metadata/md5-cache/dev-python/jsonschema-4.6.0 b/metadata/md5-cache/dev-python/jsonschema-4.6.0
deleted file mode 100644
index 8ad960daeb0a..000000000000
--- a/metadata/md5-cache/dev-python/jsonschema-4.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_resources-1.4.0[python_targets_python3_8(-)?] ) dev-python/fqdn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isoduration[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpointer-1.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3986-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uri_template[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webcolors-1.11[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-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.3.1[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=An implementation of JSON-Schema validation for Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/python-jsonschema/jsonschema/
-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=MIT
-RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_resources-1.4.0[python_targets_python3_8(-)?] ) dev-python/fqdn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isoduration[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpointer-1.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3986-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uri_template[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webcolors-1.11[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/j/jsonschema/jsonschema-4.6.0.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=04faf5d67778d6a7559ae37b755dbbf9
diff --git a/metadata/md5-cache/dev-python/jsonschema-4.6.1 b/metadata/md5-cache/dev-python/jsonschema-4.6.1
deleted file mode 100644
index 147aa040c736..000000000000
--- a/metadata/md5-cache/dev-python/jsonschema-4.6.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_resources-1.4.0[python_targets_python3_8(-)?] ) dev-python/fqdn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isoduration[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpointer-1.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3986-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uri_template[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webcolors-1.11[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-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.3.1[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=An implementation of JSON-Schema validation for Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/python-jsonschema/jsonschema/
-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=MIT
-RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_resources-1.4.0[python_targets_python3_8(-)?] ) dev-python/fqdn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isoduration[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpointer-1.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3986-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uri_template[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webcolors-1.11[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/j/jsonschema/jsonschema-4.6.1.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e74c88d68beb2f3676fcfd941a1572a3
diff --git a/metadata/md5-cache/dev-python/jsonschema-4.7.1 b/metadata/md5-cache/dev-python/jsonschema-4.7.1
deleted file mode 100644
index fb0f718eb70c..000000000000
--- a/metadata/md5-cache/dev-python/jsonschema-4.7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_resources-1.4.0[python_targets_python3_8(-)?] ) dev-python/fqdn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isoduration[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpointer-1.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3986-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uri_template[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webcolors-1.11[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-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.3.1[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=An implementation of JSON-Schema validation for Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/python-jsonschema/jsonschema/
-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=MIT
-RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_resources-1.4.0[python_targets_python3_8(-)?] ) dev-python/fqdn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isoduration[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpointer-1.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3986-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uri_template[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webcolors-1.11[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/j/jsonschema/jsonschema-4.7.1.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e74c88d68beb2f3676fcfd941a1572a3
diff --git a/metadata/md5-cache/dev-python/manuel-1.11.2 b/metadata/md5-cache/dev-python/manuel-1.11.2
deleted file mode 100644
index 4d666438311f..000000000000
--- a/metadata/md5-cache/dev-python/manuel-1.11.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/zope-testing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/six[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-6[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=Lets you mix and match traditional doctests with custom test syntax
-EAPI=8
-HOMEPAGE=https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[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=mirror://pypi/m/manuel/manuel-1.11.2.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=443a0d45329518e27d809c5cffff0fef
diff --git a/metadata/md5-cache/dev-python/manuel-1.12.4 b/metadata/md5-cache/dev-python/manuel-1.12.4
index 107e936a4fad..452681c8e282 100644
--- a/metadata/md5-cache/dev-python/manuel-1.12.4
+++ b/metadata/md5-cache/dev-python/manuel-1.12.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[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=mirror://pypi/m/manuel/manuel-1.12.4.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=426ab49300f4789d1d766609d67c2949
+_md5_=f2aea1ece9c74f8b66cdb10a1003ac0f
diff --git a/metadata/md5-cache/dev-python/numpy-1.23.1 b/metadata/md5-cache/dev-python/numpy-1.23.1
index 343ed35d30b4..d4b23062b011 100644
--- a/metadata/md5-cache/dev-python/numpy-1.23.1
+++ b/metadata/md5-cache/dev-python/numpy-1.23.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
 INHERIT=distutils-r1 flag-o-matic fortran-2 toolchain-funcs
 IUSE=doc lapack test 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) 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(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( 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/n/numpy/numpy-1.23.1.tar.gz doc? ( https://numpy.org/doc/1.23/numpy-html.zip -> numpy-html-1.23.1.zip https://numpy.org/doc/1.23/numpy-ref.pdf -> numpy-ref-1.23.1.pdf https://numpy.org/doc/1.23/numpy-user.pdf -> numpy-user-1.23.1.pdf )
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=cdcdd2f612b3e423e4cf1607bb572654
+_md5_=17c0aba37a8d655fbbe5c46106af7e93
diff --git a/metadata/md5-cache/dev-python/passlib-1.7.4-r2 b/metadata/md5-cache/dev-python/passlib-1.7.4-r2
index 1eb29aa3d412..5de00ac4cc53 100644
--- a/metadata/md5-cache/dev-python/passlib-1.7.4-r2
+++ b/metadata/md5-cache/dev-python/passlib-1.7.4-r2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scrypt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !alpha? ( !hppa? ( !ia64? ( dev-python/cryptography[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-6[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(-)?]
+BDEPEND=test? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scrypt[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? ( dev-python/cryptography[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-6[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=Password hashing framework supporting over 20 schemes
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/passlib/passlib-1.7.4.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=48494a315b9ace0467c56e9d492388cf
+_md5_=51bde48f289e87a6b188341258b812ca
diff --git a/metadata/md5-cache/dev-python/pip-22.1.2 b/metadata/md5-cache/dev-python/pip-22.1.2
index 1f105de7bf1e..a696dc0b2313 100644
--- a/metadata/md5-cache/dev-python/pip-22.1.2
+++ b/metadata/md5-cache/dev-python/pip-22.1.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_python3_8? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !hppa? ( !ia64? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) python_targets_python3_9? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !hppa? ( !ia64? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) python_targets_python3_10? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !hppa? ( !ia64? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) test? ( >=dev-python/setuptools-39.2.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=[ssl(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+),threads(+)] ) >=dev-python/gpep517-6[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(-)?]
+BDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_python3_8? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) ) python_targets_python3_9? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) ) python_targets_python3_10? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) ) ) test? ( >=dev-python/setuptools-39.2.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=[ssl(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+),threads(+)] ) >=dev-python/gpep517-6[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=The PyPA recommended tool for installing Python packages
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/22.1.2.tar.gz -> pip-22.1.2.gh.tar.gz test? ( https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-62.3.2-py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.36.2-py2.py3-none-any.whl https://github.com/pypa/virtualenv/archive/16.7.12.tar.gz -> virtualenv-16.7.12.gh.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=351dd772b407e6a7bb31030cca5686a1
+_md5_=a1c66de809607ee769a6dff581e17440
diff --git a/metadata/md5-cache/dev-python/pip-22.2 b/metadata/md5-cache/dev-python/pip-22.2
index db91e401bed7..b7f0bb77dc25 100644
--- a/metadata/md5-cache/dev-python/pip-22.2
+++ b/metadata/md5-cache/dev-python/pip-22.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_python3_8? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !hppa? ( !ia64? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) python_targets_python3_9? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !hppa? ( !ia64? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) python_targets_python3_10? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !hppa? ( !ia64? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) test? ( >=dev-python/setuptools-39.2.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=[ssl(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+),threads(+)] ) >=dev-python/gpep517-6[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(-)?]
+BDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_python3_8? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) ) python_targets_python3_9? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) ) python_targets_python3_10? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) ) ) test? ( >=dev-python/setuptools-39.2.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=[ssl(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+),threads(+)] ) >=dev-python/gpep517-6[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=The PyPA recommended tool for installing Python packages
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/22.2.tar.gz -> pip-22.2.gh.tar.gz test? ( https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-62.3.2-py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.36.2-py2.py3-none-any.whl https://github.com/pypa/virtualenv/archive/16.7.12.tar.gz -> virtualenv-16.7.12.gh.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=038a35a7d618fcdc82ab6b380ddd8fc3
+_md5_=034fbfe1aa92c89962f12c1dc74c6ceb
diff --git a/metadata/md5-cache/dev-python/pip-22.2.1 b/metadata/md5-cache/dev-python/pip-22.2.1
index b39a5cadaf93..31fe67b6106c 100644
--- a/metadata/md5-cache/dev-python/pip-22.2.1
+++ b/metadata/md5-cache/dev-python/pip-22.2.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_python3_8? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !hppa? ( !ia64? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) python_targets_python3_9? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !hppa? ( !ia64? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) python_targets_python3_10? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !hppa? ( !ia64? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) test? ( >=dev-python/setuptools-39.2.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=[ssl(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+),threads(+)] ) >=dev-python/gpep517-6[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(-)?]
+BDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_python3_8? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) ) python_targets_python3_9? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) ) python_targets_python3_10? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scripttest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tomli-w[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[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(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( !sparc? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) ) ) test? ( >=dev-python/setuptools-39.2.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=[ssl(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+),threads(+)] ) >=dev-python/gpep517-6[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=The PyPA recommended tool for installing Python packages
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/22.2.1.tar.gz -> pip-22.2.1.gh.tar.gz test? ( https://files.pythonhosted.org/packages/py3/s/setuptools/setuptools-62.3.2-py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.36.2-py2.py3-none-any.whl https://github.com/pypa/virtualenv/archive/16.7.12.tar.gz -> virtualenv-16.7.12.gh.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ee578e9ac7b4e32608e0c8051786739e
+_md5_=f72300f2b129d787d660276b14375b69
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.29 b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.29
deleted file mode 100644
index af1a9caf4a6c..000000000000
--- a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.29
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/wcwidth[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-6[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=Building powerful interactive command lines in Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit
-INHERIT=distutils-r1
-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 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-python/wcwidth[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/prompt_toolkit/prompt_toolkit-3.0.29.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7ad7abd8bb8413b325c7c57894d47362
diff --git a/metadata/md5-cache/dev-python/pykwalify-1.8.0-r2 b/metadata/md5-cache/dev-python/pykwalify-1.8.0-r2
new file mode 100644
index 000000000000..f63badb17e3b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pykwalify-1.8.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/testfixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/docopt-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.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 ) 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-6[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=Python lib/cli for JSON/YAML schema validation
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/docopt-0.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pykwalify/pykwalify-1.8.0.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=113585c9b9ba4db019529bbfeca743d3
diff --git a/metadata/md5-cache/dev-python/pyopenssl-20.0.1-r1 b/metadata/md5-cache/dev-python/pyopenssl-20.0.1-r1
deleted file mode 100644
index 3db7d603957b..000000000000
--- a/metadata/md5-cache/dev-python/pyopenssl-20.0.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretend[python_targets_pypy3(-)?,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[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[threads(+)] >=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[threads(+)] >=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[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/six-1.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-3.2[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=[threads(+)] ) 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(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/gpep517-6[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=Python interface to the OpenSSL library
-EAPI=8
-HOMEPAGE=https://www.pyopenssl.org/ https://pypi.org/project/pyOpenSSL/ https://github.com/pyca/pyopenssl/
-INHERIT=distutils-r1 toolchain-funcs
-IUSE=doc test 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-3.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(+)] ) 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(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
-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/pyOpenSSL/pyOpenSSL-20.0.1.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f3138f419878f1091c584c012f748ec6
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-0.3.4 b/metadata/md5-cache/dev-python/pyproject-fmt-0.3.4
index 8e16b955577c..a0bc06fad3bf 100644
--- a/metadata/md5-cache/dev-python/pyproject-fmt-0.3.4
+++ b/metadata/md5-cache/dev-python/pyproject-fmt-0.3.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tox-dev/pyproject-fmt/ https://pypi.org/project/pyproject-fmt/
 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 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc
 LICENSE=MIT
 RDEPEND=>=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.10[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/tox-dev/pyproject-fmt/archive/0.3.4.tar.gz -> pyproject-fmt-0.3.4.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=29a1f31cfbd27ce9bd87e1cdb126bae0
+_md5_=43e8ef197c026fd7595bfdc6b511358d
diff --git a/metadata/md5-cache/dev-python/pytest-httpserver-1.0.4-r1 b/metadata/md5-cache/dev-python/pytest-httpserver-1.0.4-r2
index 36055844b897..786894fb0a33 100644
--- a/metadata/md5-cache/dev-python/pytest-httpserver-1.0.4-r1
+++ b/metadata/md5-cache/dev-python/pytest-httpserver-1.0.4-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/csernazs/pytest-httpserver/archive/refs/tags/1.0.4.tar.gz -> pytest-httpserver-1.0.4.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=666e9bbaaf9d4fdaf5768a83a45030f0
+_md5_=6a02dc43f9515cab92dfc2acca97e3ea
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.7.0 b/metadata/md5-cache/dev-python/pytest-mock-3.7.0
deleted file mode 100644
index 963e0f7b5a6d..000000000000
--- a/metadata/md5-cache/dev-python/pytest-mock-3.7.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(-)?] ) test? ( >=dev-python/pytest-6[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-6[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=Thin-wrapper around the mock package for easier use with pytest
-EAPI=8
-HOMEPAGE=https://github.com/pytest-dev/pytest-mock/ https://pypi.org/project/pytest-mock/
-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 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/pytest-6[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/p/pytest-mock/pytest-mock-3.7.0.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=212673e5dbb4d865c74def9f45319ef4
diff --git a/metadata/md5-cache/dev-python/pytest-mock-3.8.1 b/metadata/md5-cache/dev-python/pytest-mock-3.8.1
deleted file mode 100644
index 3544976e2f9a..000000000000
--- a/metadata/md5-cache/dev-python/pytest-mock-3.8.1
+++ /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(-)?] ) test? ( >=dev-python/pytest-6[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-6[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=Thin-wrapper around the mock package for easier use with pytest
-EAPI=8
-HOMEPAGE=https://github.com/pytest-dev/pytest-mock/ https://pypi.org/project/pytest-mock/
-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 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/pytest-6[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/p/pytest-mock/pytest-mock-3.8.1.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f0c20ef46892604e808b9f63d86a3262
diff --git a/metadata/md5-cache/dev-python/rdflib-6.2.0 b/metadata/md5-cache/dev-python/rdflib-6.2.0
new file mode 100644
index 000000000000..ca3181190acf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rdflib-6.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/berkeleydb[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(-)?] ) test? ( dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[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[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-6[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=RDF library containing a triple store and parser/serializer
+EAPI=8
+HOMEPAGE=https://github.com/RDFLib/rdflib/ https://pypi.org/project/rdflib/
+INHERIT=distutils-r1 optfeature
+IUSE=examples sqlite test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[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://github.com/RDFLib/rdflib/archive/6.2.0.tar.gz -> rdflib-6.2.0.gh.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=3a68df77db0f818f15102d1111db7455
diff --git a/metadata/md5-cache/dev-python/serpent-1.40 b/metadata/md5-cache/dev-python/serpent-1.40
deleted file mode 100644
index e021b4f7153c..000000000000
--- a/metadata/md5-cache/dev-python/serpent-1.40
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/attrs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A simple serialization library based on ast.literal_eval
-EAPI=7
-HOMEPAGE=https://pypi.org/project/serpent/ https://github.com/irmen/Serpent
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
-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 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/serpent/serpent-1.40.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ddb4b397ca11534bd78b7408f6ac1a8f
diff --git a/metadata/md5-cache/dev-python/slixmpp-1.8.2 b/metadata/md5-cache/dev-python/slixmpp-1.8.2
index 7f79f163e8aa..4181c57cd7ee 100644
--- a/metadata/md5-cache/dev-python/slixmpp-1.8.2
+++ b/metadata/md5-cache/dev-python/slixmpp-1.8.2
@@ -1,17 +1,17 @@
-BDEPEND=test? ( dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[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(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/libidn dev-python/unittest-or-fail[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-6[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(-)?]
+BDEPEND=test? ( dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-dns/libidn 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-6[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=net-dns/libidn
 DESCRIPTION=Python 3 library for XMPP
 EAPI=8
 HOMEPAGE=https://lab.louiz.org/poezio/slixmpp
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~riscv
 LICENSE=MIT
-RDEPEND=dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[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(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/libidn 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 )
+RDEPEND=dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-dns/libidn 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/s/slixmpp/slixmpp-1.8.2.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d783ac66841e689af92600a06078bc2c
+_md5_=7a21929c91710eb2bace8b18c4d04240
diff --git a/metadata/md5-cache/dev-python/slixmpp-9999 b/metadata/md5-cache/dev-python/slixmpp-9999
index 1cd143c356db..0597b32f5a9c 100644
--- a/metadata/md5-cache/dev-python/slixmpp-9999
+++ b/metadata/md5-cache/dev-python/slixmpp-9999
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[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(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/libidn dev-python/unittest-or-fail[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-6[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(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-dns/libidn 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-6[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(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=net-dns/libidn
 DESCRIPTION=Python 3 library for XMPP
 EAPI=8
 HOMEPAGE=https://lab.louiz.org/poezio/slixmpp
 INHERIT=distutils-r1 git-r3
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[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(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/libidn 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 )
+RDEPEND=dev-python/aiodns[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-dns/libidn 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
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ab197fa1ab6a5a322a64531be4776de3
+_md5_=0713309b23dc5df3725dfafb55c6f462
diff --git a/metadata/md5-cache/dev-python/sphinx-issues-3.0.1-r1 b/metadata/md5-cache/dev-python/sphinx-issues-3.0.1-r1
new file mode 100644
index 000000000000..6fae406fce25
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-issues-3.0.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/sphinx[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-6[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=Sphinx extension for linking to your project's issue tracker
+EAPI=8
+HOMEPAGE=https://github.com/sloria/sphinx-issues
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+LICENSE=MIT
+RDEPEND=dev-python/sphinx[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/sloria/sphinx-issues/archive/3.0.1.tar.gz -> sphinx-issues-3.0.1.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b4d2cf679bcf4d11ec2f3ef3c4235a44
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.12.1 b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.12.1
index 7394b8ce384f..205cd2338d72 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.12.1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.12.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( app-doc/doxygen >=dev-python/testfixtures-6.18.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/sphinx-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.2[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(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) 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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( app-doc/doxygen >=dev-python/testfixtures-6.18.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/sphinx-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.2[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(-)?] ) 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(-)] ) ) ) 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-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extension to link to external Doxygen API documentation
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-contrib/doxylink/archive/refs/tags/1.12.1.tar.gz -> sphinxcontrib-doxylink-1.12.1.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6873b15730a12244be390b73b5394b1b
+_md5_=b5514063a5738edca666993c825933c9
diff --git a/metadata/md5-cache/dev-python/sphinxemoji-0.2.0 b/metadata/md5-cache/dev-python/sphinxemoji-0.2.0
index 784840d29f04..a14932868b1e 100644
--- a/metadata/md5-cache/dev-python/sphinxemoji-0.2.0
+++ b/metadata/md5-cache/dev-python/sphinxemoji-0.2.0
@@ -1,15 +1,15 @@
-BDEPEND=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-6[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(-)?]
+BDEPEND=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-6[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=Extension to use emoji codes in your Sphinx documentation
 EAPI=8
 HOMEPAGE=https://pypi.org/project/sphinxemoji/ https://github.com/sphinx-contrib/emojicodes
 INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
-RDEPEND=dev-python/sphinx[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 )
+RDEPEND=dev-python/sphinx[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 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxemoji/sphinxemoji-0.2.0.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=77b0f3bd4f27d612b6c9c58427c6d2ef
+_md5_=29fb68b0751146e1c3e903d3665f4ba6
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.39 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.39
index b7d17cb77b66..e8a8a57022e2 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.39
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.39
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
 INHERIT=distutils-r1 optfeature
 IUSE=examples +sqlite test 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[sqlite?] ) 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?] )
 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/S/SQLAlchemy/SQLAlchemy-1.4.39.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4ea25a617c47c8cf428d0d05de7dd70a
+_md5_=9f182c66870f4d984cd2ee5e648ddddb
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.14.1-r1 b/metadata/md5-cache/dev-python/virtualenv-20.14.1-r1
deleted file mode 100644
index dace7a1bd431..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-20.14.1-r1
+++ /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/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pip-20.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-freezegun-0.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-1.3.4[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(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.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-6[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=Virtual Python Environment builder
-EAPI=8
-HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
-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=MIT
-RDEPEND=>=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.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/v/virtualenv/virtualenv-20.14.1.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0a89ef5beec5c8495a5c41c79250ab4e
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.15.0 b/metadata/md5-cache/dev-python/virtualenv-20.15.0
deleted file mode 100644
index ee24789cafa4..000000000000
--- a/metadata/md5-cache/dev-python/virtualenv-20.15.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/coverage[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pip-20.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-freezegun-0.4.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-mock-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-1.3.4[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(-)?] >=dev-python/packaging-20.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.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-6[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=Virtual Python Environment builder
-EAPI=8
-HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
-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=MIT
-RDEPEND=>=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.9.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/v/virtualenv/virtualenv-20.15.0.tar.gz
-_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2497fe68ecbb21affe5dadc37754a5b7
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.1.2 b/metadata/md5-cache/dev-python/werkzeug-2.1.2
index 0002f4c17d4e..02146a47a3f0 100644
--- a/metadata/md5-cache/dev-python/werkzeug-2.1.2
+++ b/metadata/md5-cache/dev-python/werkzeug-2.1.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ephemeral-port-reserve[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(-)?] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/watchdog[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !alpha? ( !hppa? ( !ia64? ( python_targets_pypy3? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) !hppa? ( !ia64? ( !loong? ( python_targets_python3_8? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) 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-6[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(-)?]
+BDEPEND=test? ( dev-python/ephemeral-port-reserve[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(-)?] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/watchdog[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( python_targets_pypy3? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) !hppa? ( !ia64? ( !loong? ( python_targets_python3_8? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) 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-6[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=Collection of various utilities for WSGI applications
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/werkzeug/archive/2.1.2.tar.gz -> werkzeug-2.1.2.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=85c64dc4cd30e729bc403c0535a65c6f
+_md5_=b313a2046c29e0a4743725b1935f1e11
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.2.0 b/metadata/md5-cache/dev-python/werkzeug-2.2.0
index ed3bfc0ad652..d6037cec01ce 100644
--- a/metadata/md5-cache/dev-python/werkzeug-2.2.0
+++ b/metadata/md5-cache/dev-python/werkzeug-2.2.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ephemeral-port-reserve[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(-)?] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/watchdog[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !alpha? ( !hppa? ( !ia64? ( python_targets_pypy3? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) !hppa? ( !ia64? ( !loong? ( python_targets_python3_8? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) test? ( >=dev-python/markupsafe-2.1.1[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-6[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(-)?]
+BDEPEND=test? ( dev-python/ephemeral-port-reserve[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(-)?] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/watchdog[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( python_targets_pypy3? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) ) !hppa? ( !ia64? ( !loong? ( python_targets_python3_8? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) test? ( >=dev-python/markupsafe-2.1.1[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-6[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=Collection of various utilities for WSGI applications
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/werkzeug/archive/2.2.0.tar.gz -> werkzeug-2.2.0.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ecb799537e59a530214992226307bd82
+_md5_=797dc887b6b35aa646ceab52fb055f8b
diff --git a/metadata/md5-cache/dev-python/werkzeug-2.2.1 b/metadata/md5-cache/dev-python/werkzeug-2.2.1
index 7a1edbdf2d3b..d6f262fc618e 100644
--- a/metadata/md5-cache/dev-python/werkzeug-2.2.1
+++ b/metadata/md5-cache/dev-python/werkzeug-2.2.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ephemeral-port-reserve[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(-)?] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/watchdog[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !alpha? ( !hppa? ( !ia64? ( python_targets_pypy3? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) ) !hppa? ( !ia64? ( !loong? ( python_targets_python3_8? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) test? ( >=dev-python/markupsafe-2.1.1[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-6[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(-)?]
+BDEPEND=test? ( dev-python/ephemeral-port-reserve[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(-)?] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/watchdog[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !alpha? ( !arm? ( !hppa? ( !ia64? ( !s390? ( python_targets_pypy3? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) ) ) ) !hppa? ( !ia64? ( !loong? ( python_targets_python3_8? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) ) ) ) test? ( >=dev-python/markupsafe-2.1.1[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-6[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=Collection of various utilities for WSGI applications
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/werkzeug/archive/2.2.1.tar.gz -> werkzeug-2.2.1.gh.tar.gz
 _eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2d5f625d41cdf1c7ea49a09c44695773
+_md5_=0659b74ad8c99ee8d3ce409ce95fa883
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index e5897dc56091..a4505df5cb41 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5-r1
new file mode 100644
index 000000000000..e7695f394420
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-qt/qtcore-5.15.5*:5= =dev-qt/qtgui-5.15.5*[gles2-only=] =dev-qt/qtwidgets-5.15.5*[gles2-only=] cups? ( net-print/cups ) test? ( =dev-qt/qtnetwork-5.15.5* ) test? ( =dev-qt/qttest-5.15.5* )
+DESCRIPTION=Printing support library for the Qt5 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
+INHERIT=qt5-build
+IUSE=cups gles2-only test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtcore-5.15.5*:5= =dev-qt/qtgui-5.15.5*[gles2-only=] =dev-qt/qtwidgets-5.15.5*[gles2-only=] cups? ( net-print/cups )
+RESTRICT=!test? ( test ) test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=5bd9562d5f372f6ba89d27b429d8a854
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtwayland-5.15.5-r1
new file mode 100644
index 000000000000..8d518c965ec4
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/wayland-scanner dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.5*:5= =dev-qt/qtdeclarative-5.15.5*:5= =dev-qt/qtgui-5.15.5*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.5*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) test? ( =dev-qt/qttest-5.15.5* )
+DESCRIPTION=Wayland platform plugin for Qt
+EAPI=8
+HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwayland https://community.kde.org/Qt5PatchCollection
+INHERIT=qt5-build
+IUSE=vulkan X debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.5*:5= =dev-qt/qtdeclarative-5.15.5*:5= =dev-qt/qtgui-5.15.5*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.5*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
+RESTRICT=test
+SLOT=5/5.15.5
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtwayland-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.5-gentoo-kde-2.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=7a5fb6c1ce7ec005a24500fa3ef9d8cc
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index b30abe5c212a..2eb55c6ee383 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/stratagus-3.3.0 b/metadata/md5-cache/games-engines/stratagus-3.3.0
new file mode 100644
index 000000000000..530cc8a751ab
--- /dev/null
+++ b/metadata/md5-cache/games-engines/stratagus-3.3.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/toluapp[lua_single_target_lua5-1(-)?] media-libs/libpng:0 x11-libs/libX11 media-libs/libsdl2[sound,opengl,video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-image[png] sys-libs/zlib bzip2? ( app-arch/bzip2 ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) )
+DESCRIPTION=A realtime strategy game engine
+EAPI=8
+HOMEPAGE=https://stratagus.com/stratagus.html https://github.com/Wargus/stratagus/
+INHERIT=cmake lua-single optfeature
+IUSE=bzip2 debug doc mng theora vorbis +lua_single_target_lua5-1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-db/sqlite:3 dev-lua/toluapp[lua_single_target_lua5-1(-)?] media-libs/libpng:0 x11-libs/libX11 media-libs/libsdl2[sound,opengl,video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-image[png] sys-libs/zlib bzip2? ( app-arch/bzip2 ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 ) theora? ( vorbis )
+SLOT=0/3
+SRC_URI=https://github.com/Wargus/stratagus/archive/v3.3.0.tar.gz -> stratagus-3.3.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4f0b552db67661fb1bd14fd3f9e8ce08
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index c5194014bb82..dc4d5a9cb9dd 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/war1gus-3.3.0 b/metadata/md5-cache/games-strategy/war1gus-3.3.0
new file mode 100644
index 000000000000..d3bd81064c01
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/war1gus-3.3.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==games-engines/stratagus-3.3.0*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
+DESCRIPTION=Warcraft: Orcs & Humans for the Stratagus game engine
+EAPI=8
+HOMEPAGE=https://stratagus.com/war1gus.html https://github.com/Wargus/war1gus/
+INHERIT=cmake xdg-utils
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==games-engines/stratagus-3.3.0*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/Wargus/war1gus/archive/v3.3.0.tar.gz -> war1gus-3.3.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e7ec42299e3188c526ff1d6ba8d073df
diff --git a/metadata/md5-cache/games-strategy/wargus-3.3.0 b/metadata/md5-cache/games-strategy/wargus-3.3.0
new file mode 100644
index 000000000000..e562d7cda1c8
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/wargus-3.3.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend test
+DEPEND==games-engines/stratagus-3.3.0*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11 bne? ( app-arch/stormlib:= ) !games-strategy/wargus-data
+DESCRIPTION=Warcraft II for the Stratagus game engine
+EAPI=8
+HOMEPAGE=https://stratagus.com/ https://github.com/Wargus/wargus/
+INHERIT=cmake xdg-utils
+IUSE=+bne
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==games-engines/stratagus-3.3.0*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11 bne? ( app-arch/stormlib:= ) !games-strategy/wargus-data
+SLOT=0
+SRC_URI=https://github.com/Wargus/wargus/archive/v3.3.0.tar.gz -> wargus-3.3.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fd7b1aecaf34f8151a6792cf9750955f
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index d9720b328677..68a15920a959 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/roundcube-1.6.0 b/metadata/md5-cache/mail-client/roundcube-1.6.0
new file mode 100644
index 000000000000..5ada96a0ca43
--- /dev/null
+++ b/metadata/md5-cache/mail-client/roundcube-1.6.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prerm setup unpack
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
+EAPI=7
+HOMEPAGE=https://roundcube.net
+INHERIT=webapp
+IUSE=change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-7.4.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) app-admin/webapp-config
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=1.6.0
+SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.6.0/roundcubemail-1.6.0-complete.tar.gz
+_eclasses_=webapp	d872f28d7595b70dd46545199ef35fb0
+_md5_=9e5900db22771b4cd6b6a67c9f52f869
diff --git a/metadata/md5-cache/mail-client/roundcube-9999 b/metadata/md5-cache/mail-client/roundcube-9999
index 62cb1e2a381a..925e00d0f27e 100644
--- a/metadata/md5-cache/mail-client/roundcube-9999
+++ b/metadata/md5-cache/mail-client/roundcube-9999
@@ -4,11 +4,12 @@ DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
 DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
 EAPI=7
 HOMEPAGE=https://roundcube.net
+INHERIT=webapp git-r3
 IUSE=change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip vhosts
 LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
 PROPERTIES=live
-RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-7.3.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) app-admin/webapp-config
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-7.4.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=9999
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=599e10f20d44bced818462c8f18bbcfa
+_md5_=9e5900db22771b4cd6b6a67c9f52f869
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 9ade0363462c..97263f7ab926 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/unifont-14.0.03 b/metadata/md5-cache/media-fonts/unifont-14.0.03
index 7b4df526e8cc..019b8a1cd5fb 100644
--- a/metadata/md5-cache/media-fonts/unifont-14.0.03
+++ b/metadata/md5-cache/media-fonts/unifont-14.0.03
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://unifoundry.com/
 INHERIT=font toolchain-funcs
 IUSE=fontforge utils X
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~ia64 ~loong ppc ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(+)] )
 SLOT=0
 SRC_URI=mirror://gnu/unifont/unifont-14.0.03/unifont-14.0.03.tar.gz
 _eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=534dd3c952c84907f12647a41ff6c6d6
+_md5_=93e9fe683f99080b66a590288343d7d6
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 4e2b2192b6f7..f0e0177dceae 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/gd-2.3.3-r1 b/metadata/md5-cache/media-libs/gd-2.3.3-r1
index 62ad62a966a2..f95bd494af28 100644
--- a/metadata/md5-cache/media-libs/gd-2.3.3-r1
+++ b/metadata/md5-cache/media-libs/gd-2.3.3-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://libgd.org/ https://www.boutell.com/gd/
 INHERIT=autotools flag-o-matic multilib-minimal
 IUSE=avif cpu_flags_x86_sse fontconfig +jpeg heif +png static-libs test tiff truetype webp xpm 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gd IJG HPND BSD
 RDEPEND=avif? ( media-libs/libavif:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) heif? ( media-libs/libheif:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=prefix? ( fontconfig ) test? ( png )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2/3
 SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.3.3/libgd-2.3.3.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d14a6337d009210e926ee39f5f29fc80
+_md5_=8b846e3e4fcbf21aeb2acadd390b94c2
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 5c250134db24..f89347a06693 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/samba-4.14.14 b/metadata/md5-cache/net-fs/samba-4.14.14
index 920566fd8708..48385ee21e1f 100644
--- a/metadata/md5-cache/net-fs/samba-4.14.14
+++ b/metadata/md5-cache/net-fs/samba-4.14.14
@@ -5,7 +5,7 @@ DESCRIPTION=Samba Suite Version 4
 EAPI=7
 HOMEPAGE=https://samba.org/
 INHERIT=python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
-IUSE=acl addc addns ads ceph client cluster cups debug fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=acl addc addns ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 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 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.3.4[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.4.0[ldap(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv python_single_target_python3_8? ( addc? ( dev-python/dnspython:=[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_8(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_9? ( addc? ( dev-python/dnspython:=[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_9(-)] net-dns/bind-tools[gssapi] ) ) python_single_target_python3_10? ( addc? ( dev-python/dnspython:=[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) addns? ( dev-python/dnspython:=[python_targets_python3_10(-)] net-dns/bind-tools[gssapi] ) ) !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( sys-libs/ldb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/talloc[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tdb[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sys-libs/tevent[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi[dbus] ) client? ( net-fs/cifs-utils[ads?] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) ) selinux? ( sec-policy/selinux-samba ) virtual/tmpfiles
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.14.14.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=76bae028e8a45ff4311c1581bc3b2495
+_md5_=e4a599fccae22a00b4597b659c44a5bf
diff --git a/metadata/md5-cache/net-fs/samba-4.15.9 b/metadata/md5-cache/net-fs/samba-4.15.9
index 763fadd1305e..a00b1d859c51 100644
--- a/metadata/md5-cache/net-fs/samba-4.15.9
+++ b/metadata/md5-cache/net-fs/samba-4.15.9
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.15.9.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=65b118b14ba52e177a8bf37cbaeddea9
+_md5_=aabc624077aa0c270cbba7224873fba2
diff --git a/metadata/md5-cache/net-fs/samba-4.16.4 b/metadata/md5-cache/net-fs/samba-4.16.4
index e2cbbbdc541b..f4fb45d702d5 100644
--- a/metadata/md5-cache/net-fs/samba-4.16.4
+++ b/metadata/md5-cache/net-fs/samba-4.16.4
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.16.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a013ddb9616b646cc3c43b907fc9f452
+_md5_=73b45819daa30387e712d432b6bdaa37
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 03d597c5af4b..cddcbc19007e 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/miniupnpc-2.2.3 b/metadata/md5-cache/net-libs/miniupnpc-2.2.3
deleted file mode 100644
index aa310dcddc6c..000000000000
--- a/metadata/md5-cache/net-libs/miniupnpc-2.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=kernel_linux? ( sys-apps/lsb-release sys-apps/which ) verify-sig? ( sec-keys/openpgp-keys-miniupnp ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile install prepare test unpack
-DESCRIPTION=UPnP client library and a simple UPnP client
-EAPI=8
-HOMEPAGE=http://miniupnp.free.fr/
-INHERIT=toolchain-funcs verify-sig
-IUSE=ipv6 verify-sig
-KEYWORDS=amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-SLOT=0/17
-SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.3.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.3.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=580fa56a97d8a521e90c776a0c04ec4c
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.2.3-r1 b/metadata/md5-cache/net-libs/miniupnpc-2.2.3-r1
index 95f82ab0b975..ae17065d86ff 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.2.3-r1
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.2.3-r1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=http://miniupnp.free.fr/
 INHERIT=toolchain-funcs verify-sig
 IUSE=ipv6 verify-sig
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 SLOT=0/17
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.2.3.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.2.3.tar.gz.sig )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=aff79cf513872d40795f73cc8ca8e01b
+_md5_=d61ff677bbe2ffad417d8982883148fb
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index cbf26b355c8c..71d4cc44b590 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/sof-firmware-2.2 b/metadata/md5-cache/sys-firmware/sof-firmware-2.2
new file mode 100644
index 000000000000..34da1fa473c3
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/sof-firmware-2.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install preinst
+DESCRIPTION=Sound Open Firmware (SOF) binary files
+EAPI=8
+HOMEPAGE=https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=media-libs/alsa-lib
+SLOT=0
+SRC_URI=https://github.com/thesofproject/sof-bin/releases/download/v2.2/sof-bin-v2.2.tar.gz -> sof-firmware-2.2.tar.gz
+_md5_=663d46deaf91bacb3f24e4b8a07e6758
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index b353de4ed904..e9a6df3e3bea 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r5 b/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r5
index ae62f8fabbe9..5c8627131c02 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r5
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.2.6-r5
@@ -4,11 +4,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/
 INHERIT=bash-completion-r1 python-single-r1
 IUSE=ibm +firmware python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches dev-util/gperf sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig elibc_glibc? ( sys-libs/glibc[static-libs(+)] ) firmware? ( sys-kernel/linux-firmware )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~whissi/dist/genkernel/genkernel-4.2.6.tar.xz https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-1.0.8_p20141204.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.15.tar.xz https://www.busybox.net/downloads/busybox-1.34.1.tar.bz2 mirror://gnu/coreutils/coreutils-8.32.tar.xz https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.1.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.xz https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.4/e2fsprogs-1.46.4.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/gentoo/hwids/archive/hwids-20210613.tar.gz https://github.com/open-iscsi/open-iscsi/archive/2.0.878.tar.gz -> open-iscsi-2.0.878.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.43.tar.bz2 https://github.com/besser82/libxcrypt/archive/v4.4.26.tar.gz -> libxcrypt-4.4.26.tar.gz https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.188.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz https://github.com/strace/strace/releases/download/v5.14/strace-5.14.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.9.0.tar.gz -> thin-provisioning-tools-0.9.0.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.13.0.tar.xz https://tukaani.org/xz/xz-5.2.5.tar.gz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.5.0.tar.gz -> zstd-1.5.0.tar.gz https://gitweb.gentoo.org/proj/genkernel.git/patch/?id=8c9de489290dc470e30f8c7d0aaa3456eb124537 -> genkernel-4.2.6-s390x.patch
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b57ebb0f22138904b791eedda564f645
+_md5_=3a77e5dbc4584efd85ad1a28f56a09da
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.285 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.290
index e3200594631e..4e9357f063ab 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.285
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.290
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.14.285
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-296.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-296.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-296.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-296.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-296.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-296.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-296.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-296.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-296.experimental.tar.xz )
+SLOT=4.14.290
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-301.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-301.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-301.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-301.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-301.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-301.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-301.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-301.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-301.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9ba899e3e8e021713e59a697a5acb7b8
+_md5_=96c410ab7f343c5256b120b85e37f5fa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.249 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.254
index 4cf1c5e0af41..00acbc5f2313 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.249
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.254
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.249
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-248.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-248.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-248.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-248.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-248.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-248.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-248.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-248.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-248.experimental.tar.xz )
+SLOT=4.19.254
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-253.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-253.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-253.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-253.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-253.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-253.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-253.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-253.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-253.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=888fe135c6024a2fe62ebb00e24beebe
+_md5_=33c04aa6db48deac175ed4b9ccbe45fe
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.320 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.320
deleted file mode 100644
index 565c3b46ad4a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.320
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.9.320
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-323.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-323.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-323.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-323.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-323.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-323.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-323.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-323.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-323.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=13580e31fb738820ff595381372d9da7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.319 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.325
index d21cc6967b6c..1b37d3f0b636 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.319
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.325
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.9.319
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-322.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-322.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-322.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-322.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-322.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-322.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-322.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-322.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-322.experimental.tar.xz )
+SLOT=4.9.325
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-328.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-328.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-328.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-328.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-328.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-328.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-328.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-328.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-328.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f15b2df45fceddf5dc415dc337b7779f
+_md5_=67cbee9e78c175ad94fcf9a154fab4ec
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.127 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.134
index 367153c32bb2..5ed01fa21d72 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.127
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.134
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.10.127
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-136.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-136.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-136.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-136.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-136.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-136.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-136.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-136.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-136.experimental.tar.xz )
+SLOT=5.10.134
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-143.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-143.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-143.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-143.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-143.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-143.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-143.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-143.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-143.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e1d801f4e17679a03fe06b3e6611f82a
+_md5_=f80ef7366a30a9ad561ed9188191a10e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.51 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.51
deleted file mode 100644
index 77d3d8a28a39..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.51
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.15 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.15.51
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-55.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-55.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-55.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-55.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-55.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-55.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-55.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-55.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-55.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=605adfc9c756c4abefbd7cd154a17ce2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.54 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.54
deleted file mode 100644
index c749737e8cdc..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.54
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.15 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.15.54
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-58.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-58.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-58.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-58.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-58.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-58.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-58.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-58.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-58.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c5aa604638f44d50d95f09cdd8ffc4e3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.53 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.58
index 48b662262851..2a4baf65ff10 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.53
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.58
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.15.53
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-57.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-57.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-57.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-57.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-57.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-57.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-57.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-57.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-57.experimental.tar.xz )
+SLOT=5.15.58
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-62.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-62.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-62.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-62.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-62.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-62.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-62.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-62.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-62.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=69f47e4a89a7667e5d53ecc9357acd24
+_md5_=228fc81817229e46891dbc05fa0a7c31
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.17.15 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.17.15
deleted file mode 100644
index fd88817ec2e9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.17.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.17 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.17.15
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-19.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-19.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-19.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-19.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-19.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-19.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-19.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-19.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e398d8ccdd433a5931e5fc98a95f493e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.10 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.15
index b1e3d9286b84..aa84bcdc175b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.10
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.15
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.18.10
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-13.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-13.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-13.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-13.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-13.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-13.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-13.experimental.tar.xz )
+SLOT=5.18.15
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-19.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-19.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-19.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-19.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-19.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-19.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-19.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-19.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-19.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f215a91e3f1945d1a608e23ce0ae65ef
+_md5_=e398d8ccdd433a5931e5fc98a95f493e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.8
deleted file mode 100644
index 651e57173119..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.18 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.18.8
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-11.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-11.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-11.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-11.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-11.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-11.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-11.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-11.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-11.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5e912f55d1d3898cd36cfffd5941465e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.9 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.9
deleted file mode 100644
index 1a8572d08147..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.18 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.18.9
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-12.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-12.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-12.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-12.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-12.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-12.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-12.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-12.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7b785d200cc8fd8733d1c44868f90057
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.202 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.208
index 20c8215bc381..11a790035d42 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.202
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.208
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.202
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-207.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-207.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-207.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-207.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-207.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-207.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-207.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-207.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-207.experimental.tar.xz )
+SLOT=5.4.208
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-213.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-213.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-213.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-213.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-213.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-213.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-213.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-213.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-213.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1816c5f9bc7377745d823510ade8d3a3
+_md5_=8cf62f89bb18f67e2472fc020a5f91c4
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.289 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.290
index c3624ab24ffe..f114b70b57ab 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.289
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.290
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.14.289
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.289.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.290
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.290.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.253 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.254
index 89e6ae89965f..8995b8d456b7 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.253
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.254
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.253
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.253.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.254
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.254.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.324 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.325
index c4addf0e3d2e..d22f8408d639 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.324
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.325
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.9.324
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.324.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
+SLOT=4.9.325
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.325.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.133 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.134
index 5de18dc9215d..2e7f91c73bdb 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.133
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.134
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.10.133
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.133.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+SLOT=5.10.134
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.134.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.57 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.58
index aa7617d9491e..b1cc776d8191 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.57
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.58
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.15.57
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.57.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
+SLOT=5.15.58
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.58.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.14 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.15
index e80c57cf7a3b..2ded272cd04e 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.14
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.15
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.18.14
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.18.14.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
+SLOT=5.18.15
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.18.15.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.207 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.208
index 0ae82311d722..e97e210b502d 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.207
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.208
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.207
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.207.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.208
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.208.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 155633e55e0e..676320b65c8a 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/ldb-2.3.4 b/metadata/md5-cache/sys-libs/ldb-2.3.4
index 46c6a79184d2..094dca437584 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.3.4
+++ b/metadata/md5-cache/sys-libs/ldb-2.3.4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.3.4
 SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.3.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
-_md5_=4df4f451c5267639444571d66fdb7702
+_md5_=43c58c05241dbe9d80a75ad31128c9d9
diff --git a/metadata/md5-cache/sys-libs/ldb-2.4.4 b/metadata/md5-cache/sys-libs/ldb-2.4.4
index 7b694960e301..7847539d9713 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.4.4
+++ b/metadata/md5-cache/sys-libs/ldb-2.4.4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.4.4
 SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.4.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
-_md5_=0a663a10c5525c00e1b83041a67b2b3c
+_md5_=96616fec445b585c489746b59a22c13d
diff --git a/metadata/md5-cache/sys-libs/ldb-2.5.2 b/metadata/md5-cache/sys-libs/ldb-2.5.2
index 7ccd8cbf3b57..5e70b76445c5 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.5.2
+++ b/metadata/md5-cache/sys-libs/ldb-2.5.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.5.2
 SRC_URI=https://samba.org/ftp/pub/ldb/ldb-2.5.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
-_md5_=e914a474fcece25a23b8d54d84d2b53c
+_md5_=b8141c885b0ff378932cc43d537679f1
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 3ea88fc8d1b9..1ee2b83d9ee8 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/glances-3.2.7 b/metadata/md5-cache/sys-process/glances-3.2.7
new file mode 100644
index 000000000000..cfec9df3fdde
--- /dev/null
+++ b/metadata/md5-cache/sys-process/glances-3.2.7
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( dev-python/sphinx_rtd_theme ) test? ( python_single_target_pypy3? ( dev-python/defusedxml[python_targets_pypy3(-)] dev-python/future[python_targets_pypy3(-)] dev-python/packaging[python_targets_pypy3(-)] >=dev-python/psutil-5.4.3[python_targets_pypy3(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] dev-python/future[python_targets_python3_8(-)] dev-python/packaging[python_targets_python3_8(-)] >=dev-python/psutil-5.4.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] dev-python/future[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] >=dev-python/psutil-5.4.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/defusedxml[python_targets_python3_10(-)] dev-python/future[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] >=dev-python/psutil-5.4.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/defusedxml[python_targets_python3_11(-)] dev-python/future[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] >=dev-python/psutil-5.4.3[python_targets_python3_11(-)] ) ) doc? ( >=dev-python/sphinx-4.5.0-r1 ) python_single_target_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[ncurses] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses] ) python_single_target_pypy3? ( >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-42.0.2[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=CLI curses based monitoring tool
+EAPI=8
+HOMEPAGE=https://github.com/nicolargo/glances
+INHERIT=distutils-r1 linux-info optfeature
+IUSE=test doc python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=python_single_target_pypy3? ( dev-python/defusedxml[python_targets_pypy3(-)] dev-python/future[python_targets_pypy3(-)] dev-python/packaging[python_targets_pypy3(-)] >=dev-python/psutil-5.4.3[python_targets_pypy3(-)] ) python_single_target_python3_8? ( dev-python/defusedxml[python_targets_python3_8(-)] dev-python/future[python_targets_python3_8(-)] dev-python/packaging[python_targets_python3_8(-)] >=dev-python/psutil-5.4.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/defusedxml[python_targets_python3_9(-)] dev-python/future[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] >=dev-python/psutil-5.4.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/defusedxml[python_targets_python3_10(-)] dev-python/future[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] >=dev-python/psutil-5.4.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/defusedxml[python_targets_python3_11(-)] dev-python/future[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] >=dev-python/psutil-5.4.3[python_targets_python3_11(-)] ) python_single_target_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[ncurses] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses] )
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nicolargo/glances/archive/v3.2.7.tar.gz -> glances-3.2.7.gh.tar.gz
+_eclasses_=distutils-r1	17847def14400dd2ebac1ede4e941c5a	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	6f8f68a64a4304f487bb725227f2fdac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=28d44c51b214771dfd70d794eb374a36
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index df05447351ba..79dfff2f735c 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14055 BLAKE2B cc8989d376b82bcdb8980643cfd55acab354a49641b1b95506a263a9406db16da70c2af5a10755e35d180167a8123cedb0da0411496add38143d06cd2295da30 SHA512 4c08ccde16f1dafbb970968ef0ea2bc4a0d1775c0b6a687dc12042e322b948a5c4a0b48efd1d01d039c0971c8836c30c44f1f4fad1679d7fa254072281c88eff
-TIMESTAMP 2022-07-29T12:39:35Z
+TIMESTAMP 2022-07-29T18:39:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLj1QdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLkKWtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCRDQ//SzTPeFcGVSu7Ur1XNgv84Wlf1K+6/E4AbNHlaxkz9ORtg0betzjU7mPa
-kyRn9n0vzHiIl/fjucfhgtmz2VuG2jkHRTwa8vcTmWAcEAoskZgAtez3HFp7g+16
-ScToCo3rGbyvg+erRz6W+PDc8Sq69sStirCmn4WSGiky5K+lQsO+PXAJ0Ym8N36N
-dVbmcEjLSsA+oLYzCo4ngPj4vp/m2ssa787LmOEp20wK/+lmb6QNsloYurczcfGP
-IG9/BLRnhNVdMupDH9LSqcasArn1aCvdlPX0HZMFD7bs3M38Kcx2O2aJlHBFgZUU
-WpTYC0V1zlH3k2VFKFJ95C0zrYDSMMn6jQuL0MtiURpabjbFK1ouTXGrM5E+Ltir
-39zKRatwrGQcfh/jMK364yw5ZNOnzi7D/extv+nG0UQ3Mj+L1FcSvvL0VlmHP5R6
-6956H1TPp14Xy13SkD6Hb4rEllMXTH5h5k3D2OHO+ca5nkscvAC+lHazvlEDrZA+
-yhRee/XUlUT4EDbAGcm9+sSz3cPEMId3H1+f5UC3u84FiIQYXNTXa4jz9ENkUp2W
-PG64D0nX/3inmKzU/0RKFQD9ONhLXd22h/+Q4qW7mSwqzLLgnkiUG6MDQXzH3RxX
-FA1VBA8qDzqOraA0lhINa/sFeNZhR9av5ctRAcnHmFLU0slmfqI=
-=Irf5
+klA5+g/9HUxIVV0vuOCMUOwW11ppKlMzqHcuIUoebR4kiBKFOT+amDgMMMQDNhZx
+/Q5oNkrb8o/PkbCfWShnqydkPl7V3PLqBSoiS7fQPnq2OcJdnxSb1BLovIK3i+Hl
+7NdnsSqCjmt8BmPN8MuZVEVlHwFyGGi5IRN0scKlXUIIxMGaTo8x5CJR8aZ9MpGt
+VGZFyE2pFmkQTSMovlvKNzhzNxTSyRMe3tRRuI/sAckLa+Ey07Iv+GXsrF4qjBhz
++XtBUo/MLiF/Qmqrklx7qTx2T19CRPJfmnpHwIP8JU/1KXGkLn1y6idU2v5To++h
+4F8Gk8gzwdbb73EKg9547AE36lg0mKOlPFkc0ysxwm1pK/Qy/gre1c6TJOBOqj6I
+6xPK2EBU6gFkVomzEp6EG41bHtmr0rrYIwTbBW7bNetXa+U3OFtteDz0gXMpEDZX
+gjogntAXKyvVdzAkWfwmR9avcPQzLXptCiuAcd1ZNwU3JlghssJR71Cck4WMqDaz
+d+UfpY8gNuWiUoM6M+1SZDbBPP1R3OpIePTxnzN03ZNVIk6h+6Qw5ZANP3pDrLRf
+yK3VqhAnHpFI+owl2fdIUttwkaY2FeO+D/R6jtTV+l9ziwTSe0+S7TO7bsnXUUQe
+i4DOVxauvnytnuOTwWNYDlybI/+v5ljKH7RG+A6oGyYKJWCXPJQ=
+=+hvs
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d1f4cb3df91c..44d032067205 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Jul 2022 12:39:32 +0000
+Fri, 29 Jul 2022 18:39:36 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c9139afd2599..72b5f18c98e3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jul 29 12:39:32 PM UTC 2022
+Fri Jul 29 06:39:36 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 54ed0a32a8e9..dc3e8a910778 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Jul 2022 12:45:01 +0000
+Fri, 29 Jul 2022 18:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e4c6a5e75021..f942b4c1141c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-5da24bc82e365fc216c4cc9b90f124e85adc3144 1659097606 2022-07-29T12:26:46+00:00
+483b910e8dddc7d9f56309812ea9e8445b98e8d0 1659119679 2022-07-29T18:34:39+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index efb5919e9e3e..c55cabec129a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1659098401 Fri 29 Jul 2022 12:40:01 PM UTC
+1659120001 Fri 29 Jul 2022 06:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d1f4cb3df91c..44d032067205 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 29 Jul 2022 12:39:32 +0000
+Fri, 29 Jul 2022 18:39:36 +0000
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 2ed49ef073df..c9b64f145e33 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index afe3c1c5a0b3..515cab52d99c 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,7 @@
 AUX 4.4/samba4.confd 2035 BLAKE2B a9fa538a0b259c8a184012e0370819729e24fa971de52e3d3891107bd78e6d4e074a2df80b1c424c23229ce5e84ea1da908887c8fef88dd45104eb5c6eb0e4a5 SHA512 d6a7ae560621407b7a5f94db6489d6a85c5056f4212a2a9a24210eaeb585caf4f15801282d1b8682962c0cf5642766fe09cc70c48fffafd1560de615154503af
 AUX 4.4/samba4.initd-r1 1112 BLAKE2B 91d28710ccd512e19307bfd5ba97710ca071b478696d8e933d90b385f0c958a493ab684436915630de2884383e24eb1c9955ebd2b526b0b8f30438d9204dcb57 SHA512 3bfa4c8e0d77994fbca25eb0e12617166909c4d6742d1800c73f5640a7c39ee760988a315d39ddf8a575097df3d3c6fe3f308e8ca1cd698018544a9060176f4e
 AUX 4.4/system-auth-winbind.pam 590 BLAKE2B d8c0190dff88c5b65f7f01b3a84fd776194d3b4ce5c973bd1145e6a12750f01882b2873be03b537e9a68899c0a19fee7a4834385961090e4cb69dda7ae1763c0 SHA512 0886cfd99b3c3dc117b2a83b04bf59d080ebf77d6ea91f24cfc4d8be7af9db377e0efc2216e7c1f8a180b09fb425476ef6874180d9f0fa47e4889faf1d429679
+AUX ldb-2.5.2-skip-wav-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f2a60f52a64f181b85c227be6cf9c9373a64528afbe4e9db1970e8316d5bddf76ba9395a75b194f27bcf25eb4d2e7695c5530eb SHA512 19028447cbde09a425f1a07fe2d9a2a6f16cada1785e6e9684a8b573db5705b6694a29cd6f5480047360920562fcc654fc10faad39e73c565f7d475558cb57c8
 AUX samba-4.16.1-netdb-defines.patch 546 BLAKE2B eb42eb3429a221d700cc53381cda2a2dbff72cf43a0c3d5d8564d5e264a1ffaff15e3fd13f9647dd0a76e99323d656c07f26cf9c941f7407769c1a986c8c9025 SHA512 3802cf51d1dbcdf631ab4ffdc115ea58ad8d7bf1a23600e91eff2a70fcffb80161a3e87c360f7c961dae99c8f0267bf8f9feed739b388d012ece32bcf97c1dcf
 AUX samba-4.16.2-fix-musl-without-innetgr.patch 779 BLAKE2B cf6ba59edd10b6540f052dd9702d2e541cf8a7c864195485a5ab1bcf7acde8b1df875b8eded3f111eb1e71818ba88aa4df95482334563179f31e8dcc31bb9a3e SHA512 123c8885957c75893bebf8362778d978ad69102763fd87439cdd265316f72a60f7df86e4a1219ccb37df365ff3e54308f8b6c5cf6c0aa9189f17e0e9568737aa
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
@@ -18,13 +19,13 @@ DIST samba-4.16.2.tar.gz 30597031 BLAKE2B d1268cb34ef951a47bd6cd8b76fa8576f3db2a
 DIST samba-4.16.4.tar.gz 30605121 BLAKE2B e685511a76770272cabd1292f36d2b005e2d21212e4782cdf4fd05039f7667b35501873cffa9a53547d523805b2a91ffeba0881aaee905304968c42efef22dfa SHA512 9754275ace30755b75f747e201f8ad4550a823c8606e550c0ce6b3ccbaf048dd895bf2c21127271298304be7f80de9b6451091c4949ebe267ee1cf3ab497cd85
 EBUILD samba-4.14.12-r3.ebuild 10031 BLAKE2B ef98c98e96c6bc442ae917f5ea98eac20ad8b47e5cf95d629c3c057885a5e0d2b15c57d435c792b2a4edc5d8e75a76a4b0903d08efab1b9832e8a324c23d1357 SHA512 e73d8c96e32582e5c7fb80dfa89f4c1506106e8dc9bdb07e17ab676c1d8c2a9b319e1f4e5d2cf76046dfc5b78868484fca5c32b1835ca06701e6719be754b635
 EBUILD samba-4.14.13.ebuild 10032 BLAKE2B d7cdcb67afe6dbb05e9a7fa8c3b9f5d3749cf91ed035c7581c504ad5db8c01dc21d8bf69a6a07e61e4d0a0db680677b7f51c5774b3d0ef5eb8758b91b0bd773a SHA512 1f96a484968fccb76e3985025701fd3ac97d191377ac3295212f78eeec5160af9919bd0738d8278f3a7bf0adb2ecbd04b9cc5e7405485f0e1a07c659e25d5c9b
-EBUILD samba-4.14.14.ebuild 10039 BLAKE2B 45ebf1d86df61fc705e0298cf9e15cd7bf679222d338ba5f7109ef6f76d5cd75ae974c9407d2cf3887e139b7dc0993df1a719a2a130df6418552939c20530009 SHA512 26b1b775bd3a8c2e9bc71b27b0b85ac5549adf19bdcc3b50a18589a597b22602a7f75ffb1b10370042c28c2e8bc3ae00c77f5e498b5f765b6b4efc73fbc5d788
+EBUILD samba-4.14.14.ebuild 10166 BLAKE2B f35e1b27a38f6a0eab5466c45e8ec045571c75399fa3ddcedfc5ce705bc498ae3fea2b880728b0e778d13c323a6a842822eb76f9d8b26e4973b5bc678a45a2a4 SHA512 59060251c5fbb0071ada04d74fc8ba23581c4f7e309edde4d732dfb08e1632317fff4f6d851e28b35953d5da7fa795a8277da1eb2cb7393bc454467208efad9c
 EBUILD samba-4.15.4-r3.ebuild 9964 BLAKE2B 33e95d71e3a5d3172fc8dae76807e198b2ef4100d32d5e8bee2964dd41b2a9f3396c3b9b9d2a93e75ec47b94365871c6005ceca35a153f42f5e143b8fe2c24aa SHA512 bacfa5b5a1c29f8eefaea6b5b31134ce8a0059b2365987453cf14994ae0122cca4e241445e600689072eab27ca1809347c0321515728da792a166aad37801fe1
 EBUILD samba-4.15.6-r1.ebuild 10022 BLAKE2B 0588e5c12f2c4d31bc8e34c50de2cc8894d7eb62df1d55f243f067e0938408fea6fa0cba01d47606ad132e560214a76f2771f2197318b2757c988255a18d0a3a SHA512 45f04624f8a88acbc4b3939d7192c38bc3e86495a4ce2e16095aeb66b7eda7ae68ff4f920fa50577cf27a16791edfa621497094f287c13bb758f5e0117bd9788
 EBUILD samba-4.15.7.ebuild 10015 BLAKE2B 2c9fb60746e70d5fb0582f75da7b0af11a51ba4f1b080716fb82c8dbc62de22b340d99e715e5bbee2f7c05cc8eb95ab414bca68f6a37eb1cd696878bc54fd717 SHA512 07e02a792279cb9a7a2db43722b9f2c6652fb67b52c0adaf3c894fc5c88a43f294a51ab32fc8bc403e6fa03661c16dc4aefb0950837c8135414225ac802a9157
-EBUILD samba-4.15.9.ebuild 10022 BLAKE2B 29e5d9bc88635df131f2ed64ef0c271932f1f39601ca5714be1ace27bec18a33269d86059d47d26b05c280652fb0ec00089d1545377ed054b9da3a38b3114f66 SHA512 a85457c41f014f1a4f014ea8d9abab8a2546de733a1463a73fca21c391c4e6b20f2608f601d7e056103b1390dd56434042abf2e338af969eb239cc5d68f27cc2
+EBUILD samba-4.15.9.ebuild 10075 BLAKE2B 11c43c5b5f054a3bc2646b9c5652d588a15b31fbdd9a22a2449a01585fbcf7d339e818040bc56822f430ac346cdbb77da76acb314ccab9e21a19216bd35f497e SHA512 4fbed884141cd19c0849a2cc70aba65cc6212e408aa5ec4241614fe0f48c9608854ac016b32086de17d7e1917117476b780c540626cfcdd316110ccbc8a50498
 EBUILD samba-4.16.0-r1.ebuild 10037 BLAKE2B 8679d1dbc9fe6a550eecfb86fb32ab26297c9b02eccc8a36621bcc13be96c70450e25759d9ffb810f87a43b6768e2bdbc459a990bbf4fbc261ff5bee5bac2ddf SHA512 75ff78eae02920315c40d74d7348a5ff98d5d20abc463a615e572602d2daf6e61f6fa66fbd910933c883ca9e7731360441d1fe575b2643926dace994fb59a549
 EBUILD samba-4.16.1.ebuild 10085 BLAKE2B e652f81751b0e4971ba0f1850cdf6a629732b998f0a97a91f4a623a28a6ef1e67cb0d949144bd8e62f46cf1b970d62b4d5db73deec39420b68e0b913c71dbe4d SHA512 82f77c0504b778265c346347b1f9ca1955fbb436c23cb285985f0271013a221c121aba707eb055ec4215137d7a998356d8199fef100a811fe5a4156d2f1224ee
 EBUILD samba-4.16.2.ebuild 10117 BLAKE2B a11e7d116874f83589503eaeb3b5f689ab01e0c884d89665cd8586800599f7bd7dec1068e174cfaafe77f18add3a7f89cc4581a4a71319b68ad8e7478f52bf14 SHA512 59ec9c24962ae778c7b4928bbbd27bd0083fb13b5510e611aa3b5383334db77fedd2b97449b2f17e6ea76309fe61d7d89e8878add620f2333cda3199ddd5bc7e
-EBUILD samba-4.16.4.ebuild 10117 BLAKE2B c6716648f6f610c1f378d8d9d34ed4e6ea8fff59ef9fc7bc7ba880eda5253d55932de22d11a24d65519c91e5c27a764ac7a81ee03da58a256902e4e7db353e20 SHA512 837eacab1cc4017f22049b1ff2bfcd57e1f5a1363dac582a33180909ef26628c8a17222f576708e8f1291bab0dc6d312adc5d63b3c9c7c078d92cf7bf1d69f37
+EBUILD samba-4.16.4.ebuild 10170 BLAKE2B e6179fae0d08d6c22babe8cd34390f9796ae11991fe18e69b35924a196ffe5fe98738c0543ccefe3424f48d107fcfbab908f55b3582564ed6786854fc15b6579 SHA512 84a4afe9253197da0f50378a526b2cf5b34685ff45a00a615b3d4bfd557a9e3a1aa28adc06f8a0ce9a2f249553b7e4d093a6d486f9fb4078047fc30114f9c5d4
 MISC metadata.xml 2061 BLAKE2B b6232fb0408426e595b8569a26aba4938e2e0edd61cf4d73650ee4eed48725ca3181c212003515ef573a95bd73659fe482d964e26fef3ff61a66e06f0566b600 SHA512 301d931501a67d7189881fb269c31f75790b99c3c6c74caea963507ca5a60e5ae39bfd97f8d7e2f3096ae71645c8d7abea36d70ae621017c72cb20c9ec51d2d8
diff --git a/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch b/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch
new file mode 100644
index 000000000000..4578435064b0
--- /dev/null
+++ b/net-fs/samba/files/ldb-2.5.2-skip-wav-tevent-check.patch
@@ -0,0 +1,12 @@
+--- ldb-1.3.6/lib/tevent/wscript
++++ ldb-1.3.6/lib/tevent/wscript
+@@ -34,8 +34,7 @@
+         if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION,
+                                      onlyif='talloc', implied_deps='replace talloc'):
+             conf.define('USING_SYSTEM_TEVENT', 1)
+-            if not conf.env.disable_python and \
+-                conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
++            if not conf.env.disable_python:
+                 conf.define('USING_SYSTEM_PYTEVENT', 1)
+ 
+     if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
diff --git a/net-fs/samba/samba-4.14.14.ebuild b/net-fs/samba/samba-4.14.14.ebuild
index d7e8bd93a28f..82300ebb6402 100644
--- a/net-fs/samba/samba-4.14.14.ebuild
+++ b/net-fs/samba/samba-4.14.14.ebuild
@@ -22,10 +22,10 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
-zeroconf"
+IUSE="acl addc addns ads ceph client cluster cpu_flags_x86_aes cups debug fam
+glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit
+selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test
+winbind zeroconf"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	addc? ( python json winbind )
@@ -143,6 +143,7 @@ BDEPEND="${PYTHON_DEPS}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -209,6 +210,7 @@ multilib_src_configure() {
 		--nopyc
 		--nopyo
 		--without-winexe
+		--accel-aes=$(usex cpu_flags_x86_aes intelaesni none)
 		$(multilib_native_use_with acl acl-support)
 		$(multilib_native_usex addc '' '--without-ad-dc')
 		$(multilib_native_use_with addns dnsupdate)
diff --git a/net-fs/samba/samba-4.15.9.ebuild b/net-fs/samba/samba-4.15.9.ebuild
index a2c269deaa76..2ba0530bb6ae 100644
--- a/net-fs/samba/samba-4.15.9.ebuild
+++ b/net-fs/samba/samba-4.15.9.ebuild
@@ -140,6 +140,7 @@ BDEPEND="${PYTHON_DEPS}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.16.4.ebuild b/net-fs/samba/samba-4.16.4.ebuild
index 6aa50af58785..02f5797dfdc2 100644
--- a/net-fs/samba/samba-4.16.4.ebuild
+++ b/net-fs/samba/samba-4.16.4.ebuild
@@ -143,6 +143,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.16.1-netdb-defines.patch"
 	"${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch"
+	"${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f12a60fb8351..bc5099e11958 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index c57e89cfab93..80af14e285e4 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -2,6 +2,5 @@ AUX miniupnpc-2.2.3-drop-which.patch 1209 BLAKE2B 32ae4d0eee181cc428bc8afe6aee0e
 AUX miniupnpc-2.2.3-makefile.patch 2179 BLAKE2B 38854b992d62f219394fae19d5038dcc2f9c2249184cbeba3a4c0948a61ca2147ae2cb7df2d19e38f76e3f6bedcec8e4ffa80d6685fb2f360fc36b8590399e1b SHA512 b332363db1e8df16a86153748a69ee5499a115df215d46cc3d2012e26574991a9545e81ce966f0b051f69601639dddde10a632555075c92c06d132624936a28d
 DIST miniupnpc-2.2.3.tar.gz 101360 BLAKE2B d2a7f64d56be524c5c4aadfecd40da4e1ad040fd7eab64be5b5716cb06047e86e3ed6a9c17f697fd3210af0fb0a6ae032b6ef0a5c1f0d96a2e185db97b0d06e8 SHA512 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee
 DIST miniupnpc-2.2.3.tar.gz.sig 543 BLAKE2B d10bcb765e0d7a1eb68dc6269080b71535fced443e801a09677872bc498c866a02f22d851db963fb126331f28d2314542507713f514560d9d6eca2262287dc8b SHA512 636ad425b430629ee91b2755b543e9754aa88e243972f47839a2ad958757a12ff598f962e9328e5ad0fa3e0b2f895854c9cb3ca099048e7c132c8ce27806986e
-EBUILD miniupnpc-2.2.3-r1.ebuild 1545 BLAKE2B 8f0182cb4c1ecf2317b3e883d90f35d3fe1fc1a6b161514b2f4ff4145d7eb9f36dc6c915b7a716d3bcd78f8ad0205f3cc2eb6afb93a85cbab25a1a55ed85958a SHA512 30b085a96e22066cd11692cfe17698cca2b88d3b6e3acb65443dd12d5031233d7552218372d522490fd29044aef79b0e547349d83d6543514248bc417b8fe158
-EBUILD miniupnpc-2.2.3.ebuild 1521 BLAKE2B 066d26958db1796f5566383fbaf99a1ff837c2d3267cb8062b3a09c222984876ab0d96ee6181860b6cecaec3dfdafac2596428e017217a79851a557059bffa63 SHA512 bface54f8a84857ab38898a9db0eec8f97063765a06e5d856d3c55de11b3eed3b2aff6473f5cc60dd0eb5f014e31fea5ceaab865c0a9678e09fbd534570848bb
+EBUILD miniupnpc-2.2.3-r1.ebuild 1544 BLAKE2B aa215b5a60e3e1ec4bcca653b61937f3b6bdc98cbaf16b076f6b843c51c6d0c06e359b0c4d91e7abaaabaf99069d2913a381ccad0750193d6a917560b36fa97a SHA512 4f11ec9894ca27552b6753f2b735d41f69f8c2474a604cc3613478b72ecd33912b4f12a43797afcd75cc6878396e29dfb08ffa0d8bdf388d9160a41f4425d5f1
 MISC metadata.xml 330 BLAKE2B 02b7193f99aee0f3cad145954d1a6f7f9b2f63e21cc23d02ae3048d89618050a5a8df2e206d771a3d0853664d4a0de9a09f44660b108eb280618d9136d1c86be SHA512 6a395c2a579f4ce8c891261da25c031284904a8d6366733c14a201a948e6744ae0037067f178f799d6134e4be670f1be3582f257414e067de654e8050963b972
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild
index ae6258202316..d4182dc8183b 100644
--- a/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.2.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="ipv6"
 
 RDEPEND=""
diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild b/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
deleted file mode 100644
index eb241b980d00..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.2.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
-	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="ipv6"
-
-RDEPEND=""
-BDEPEND="
-	kernel_linux? ( sys-apps/lsb-release sys-apps/which )
-	verify-sig? ( sec-keys/openpgp-keys-miniupnp )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-makefile.patch
-	)
-	default
-
-	local exprs=(
-		# These bins are not installed, upnpc-static requires building static lib
-		-e '/EXECUTABLES =/s/ upnpc-static listdevices//'
-		# Prevent gzipping manpage.
-		-e '/gzip/d'
-		# Disable installing the static library
-		-e '/FILESTOINSTALL =/s/ $(LIBRARY)//'
-		-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d'
-	)
-	sed -i "${exprs[@]}" Makefile || die
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake build/upnpc-shared
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 9bf95906a84c..d5f638848665 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index b7b7e209b1da..102e1e5d3436 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -2,16 +2,55 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Various packages requiring Rust.
+app-admin/ansible
+app-admin/ansible-base
+app-crypt/acme
+app-crypt/certbot
+app-crypt/certbot-nginx
 app-eselect/eselect-rust
 app-text/mdbook
+dev-embedded/esptool
 dev-lang/rust
 dev-lang/rust-bin
 >=dev-lang/spidermonkey-78
 >=dev-libs/gjs-1.66
+dev-python/autobahn
 >=dev-python/cryptography-36
+dev-python/gcs-oauth2-boto-plugin
+dev-python/google-apitools
+dev-python/google-reauth-python
+dev-python/josepy
+dev-python/keyring
+dev-python/libcloud
+dev-python/moto
+dev-python/ndg-httpsclient
+dev-python/oauth2client
+dev-python/oauthlib
+dev-python/openstacksdk
+dev-python/os-client-config
+dev-python/osc-lib
+dev-python/paramiko
 >=dev-python/pyopenssl-22
+dev-python/pyspnego
+dev-python/python-daemon
+dev-python/python-glanceclient
+dev-python/python-ironicclient
+dev-python/python-jose
+dev-python/python-neutronclient
+dev-python/python-openstackclient
+dev-python/python-sshpubkeys
+dev-python/requests-kerberos
+dev-python/requests-oauthlib
+dev-python/secretstorage
+dev-python/service_identity
 dev-python/setuptools-rust
+dev-python/spur
+dev-python/sshtunnel
+dev-python/tempest
+dev-python/trustme
+dev-python/twine
 dev-python/watchfiles
+dev-ros/roswtf
 dev-util/cargo-c
 dev-util/cbindgen
 dev-util/git-delta
@@ -28,8 +67,10 @@ media-libs/libavif
 media-video/rav1e
 >=net-irc/polari-3.37
 net-libs/quiche
+net-misc/gsutil
 net-news/newsboat
 net-p2p/deluge
+ros-meta/ros_comm
 sci-geosciences/gnome-maps
 >=sys-apps/bat-0.18.1
 virtual/rust
diff --git a/profiles/features/wd40/package.use.mask b/profiles/features/wd40/package.use.mask
index 6c8a179103ef..ebb4216a9647 100644
--- a/profiles/features/wd40/package.use.mask
+++ b/profiles/features/wd40/package.use.mask
@@ -1,6 +1,33 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2022-07-29)
+# More packages requiring dev-python/cryptography or its revdeps.
+app-admin/salt keyring neutron
+dev-python/boto test
+dev-python/dask test
+dev-python/docker-py test
+dev-python/google-api-python-client test
+dev-python/keystoneauth test
+dev-python/libtmux test
+dev-python/locket test
+dev-python/pyjwt test
+dev-python/python-keystoneclient test
+
+# Michał Górny <mgorny@gentoo.org> (2022-07-29)
+# More packages requiring dev-python/pyopenssl or its revdeps.
+app-admin/salt libcloud openssl test
+dev-python/aiohttp test
+dev-python/cheroot test
+dev-python/cherrypy ssl
+dev-python/eventlet test
+dev-python/google-auth test
+dev-python/pyftpdlib ssl test
+dev-python/python-novaclient test
+dev-python/requests test
+dev-python/uvloop test
+www-apps/roundup ssl
+
 # Michał Górny <mgorny@gentoo.org> (2022-06-26)
 # dev-python/trustme requires dev-python/cryptography.
 dev-python/anyio test
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index a77065a35b37..d779264c5e73 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/sof-firmware/Manifest b/sys-firmware/sof-firmware/Manifest
index 2b90b21f7aa0..1b8d8040dcec 100644
--- a/sys-firmware/sof-firmware/Manifest
+++ b/sys-firmware/sof-firmware/Manifest
@@ -1,5 +1,7 @@
 DIST sof-firmware-1.9.3.tar.gz 3710193 BLAKE2B d52fe0660c73c8e76fb60c492abe19f9e64b3064441880b84488193aa66710e49ef022c7cd1b8ece69d010aa5e416fbf4307a9c92d823525dbdc734194b0a98f SHA512 0c04bf47ecf65d3352b730e79968cb020211c274f64a3cc21e4c5e49c5a9706ab4d541aaea931e72c1bcc67fcde6387bc6bf952a33691aaab06e6b93aa73a024
 DIST sof-firmware-2.1.1.tar.gz 4056718 BLAKE2B 0246f6240504d3e8b609b402c41ffe6ed9b8350b6a31c6567851069354e5de5b4ca6d803e78fdde77cdaba7be87c8a8923b2d0fdd0544fd3b28d1e332cd59b63 SHA512 77e9562f67014d78b213fe428edef6a08dcc058a9a762da09a486c002c3aa0b907ea7c8ba6d4f88f5ddab5e564de06df9f2ed77206341a0fe2e1aaab1d9740ce
+DIST sof-firmware-2.2.tar.gz 4211499 BLAKE2B c0ab39cba3ef3dd19b67d714b5a4e5a6a6cb3e8fb2d290c3fceadeb3f7dd96db986411184e16bca56bdd1905a697f8d416cd4aa5bdff90fe32e96713ff87bb71 SHA512 3cd06f6b8f8d6c3379b987cffa019a0d84263b8e00de40c18516c3e90745d5e150bdf71a8005b1ba704e44bf84d7030195e9c0ebfcd6e35228f4c14e9290cd95
 EBUILD sof-firmware-1.9.3-r1.ebuild 721 BLAKE2B d4621f609e37290410c46fc89a8f9e7f472439b001e6f2e0ac3b2f9197579dea2870efaf75f4912cbc886892bc3d4fa95e32527eefaac1fb48b93600b38f24a0 SHA512 556aefe2f7bd6128de89891689e6843acb7f5b23acd424dc112266b7a6eed1081cd39f3bf47fa0a49269582d09d1237edf24908ff7898b9093c03cc5a4a834b5
 EBUILD sof-firmware-2.1.1-r1.ebuild 899 BLAKE2B 6510a99bbadde60caad29440742a93c9f31878f65122f428f991efab01e2fbe9c13ffb26dd3e80b19f9b5556536f17e386b58db60d38867846690c7e5bd4f7d2 SHA512 91a698791d36560e74d1bed08fa1bc26f64788985efaa99f9cfd80d9bf6a9c78a29b573ed161d7724a5870e1d55a55150352ade276e4aea2f485d2bff0f0d288
+EBUILD sof-firmware-2.2.ebuild 899 BLAKE2B 6510a99bbadde60caad29440742a93c9f31878f65122f428f991efab01e2fbe9c13ffb26dd3e80b19f9b5556536f17e386b58db60d38867846690c7e5bd4f7d2 SHA512 91a698791d36560e74d1bed08fa1bc26f64788985efaa99f9cfd80d9bf6a9c78a29b573ed161d7724a5870e1d55a55150352ade276e4aea2f485d2bff0f0d288
 MISC metadata.xml 218 BLAKE2B b13b149202bf20882c38ce2cfd0e1c4ea9a15f584ff819022fd74261c2f73dc52efe21fe1e621fd84406527ab86bd29147ef34c895ccf9de3596ce58cb59d846 SHA512 068fda6c090090d62a719b26812505efa881b855004ed63dea86b1ee9b698d5d6ccd3210366e7cfa886f886c77e31b90cd69ec015e67286ce0611483304e798f
diff --git a/sys-firmware/sof-firmware/sof-firmware-2.2.ebuild b/sys-firmware/sof-firmware/sof-firmware-2.2.ebuild
new file mode 100644
index 000000000000..b51c9026bd32
--- /dev/null
+++ b/sys-firmware/sof-firmware/sof-firmware-2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Sound Open Firmware (SOF) binary files"
+HOMEPAGE="https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin"
+SRC_URI="https://github.com/thesofproject/sof-bin/releases/download/v${PV}/sof-bin-v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/sof-bin-v${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Needed for sof-ctl
+RDEPEND="media-libs/alsa-lib"
+
+QA_PREBUILT="usr/bin/sof-ctl
+	usr/bin/sof-logger
+	usr/bin/sof-probes"
+
+src_install() {
+	dodir /lib/firmware/intel
+	dodir /usr/bin
+	FW_DEST="${D}/lib/firmware/intel" TOOLS_DEST="${D}/usr/bin" "${S}/install.sh" v${PV} || die
+}
+
+pkg_preinst() {
+	local sofpath="${EROOT}/lib/firmware/intel/sof"
+	if [[ ! -L "${sofpath}" && -d "${sofpath}" ]] ; then
+		rm -r "${sofpath}" || die
+	fi
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 43f06b08e348..566b976299c5 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index f0d70e3f575f..a07fe42d9394 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -75,6 +75,6 @@ EBUILD genkernel-4.2.5.ebuild 11468 BLAKE2B 44a9a5e824574e14f036b2964b325367f3ab
 EBUILD genkernel-4.2.6-r2.ebuild 11619 BLAKE2B 4eaed74c7fc68d45137723f604ad97b2591a114bfe48064be4400ecf88224e15f2de97465275177e8df2ceedf37df6fcede6c6f6b77b997c101a48533200b413 SHA512 105524dd26614ffa33ed38cf5a45350d5fb3b22b9fcf84ba92840af0c7a85ef71b9bc8ffe29bdbb28e583a32de40f5d7768d8ac28155d51473afb56740b1042c
 EBUILD genkernel-4.2.6-r3.ebuild 11667 BLAKE2B 8970c3817c942a224ba67b01fc34d99ff1b22f32939d58bb87d8f6451a4c7b4a33b9170996702fede6c5609fc862ef3ba6d39ba006d1261442eb30967d926c29 SHA512 cb2addc25a0bb808b0edabdb0f3d3b43f947e54b8d3843e7b90259e74311b3875b83e11a26f8372494f28acf1aa2dcd563f9b13cccdecec466bfbed161a8cbb8
 EBUILD genkernel-4.2.6-r4.ebuild 11711 BLAKE2B c3a54d2354ce25e8787dd50dd46f973294c590686c79d691b62b9a47dcc09be6ca1ab9b643e0e0c5bb2b11e1c4e6124e38402b5869ae8eb11511816204401109 SHA512 593e8c5d5b5b69aefdce8a6db91c7b5cdb90828014985c8cf235936d5d5bfa9ac4e40460e3fabb6772183494b2059748d32f12af19fa9c8ecfcf3ec7e349448a
-EBUILD genkernel-4.2.6-r5.ebuild 11902 BLAKE2B 125c90e1ebf0595532b5b58378d29305f91a2a6527663a166b8cf9de8070d2b7d09bae2542934af4cc02c53e950b71f1c77e676761acf4dc2447e1ffda6c55bc SHA512 d77fea850e225d16f6a4e13d52546c1af6829c78cf5719cbd6b2e72c14ffbdf93bf85e44e055eb5e6455a6cead654305837ace9e0a67d46856d27ba52e0784a9
+EBUILD genkernel-4.2.6-r5.ebuild 11901 BLAKE2B b45f0d525dcacfb1e56eac3ce8471b838d6287e8379d55c6d8074089ac37beed39fd88b28793bb89eb8333077d57fddef63f4dde5d7fd3a212567488f4fa6d3f SHA512 9e896569b26b3e1fb8fce99b41106bf221bb63120d8dd4c710508cc7b839e382d333e6dc2811f5d82796939e4c6a1cbe388c5755e2c2a312fa2bcf1e0ec8a827
 EBUILD genkernel-9999.ebuild 11679 BLAKE2B 7fa6e85abbf9872158f186c1d1d849f1eadb37697c3d27dc9c12d74e48e0781dd587f8a75e21b2f45b0f7a5c137274e34aea16b7bffc60284d8c4adf303c28d1 SHA512 68614f253f0b5c852f720bfc095235625445979719a4d71b5b638768a98ee5e6dee12f75115d045104045e05af7f56b495fba4e8acaaf30d39551755f7482a33
 MISC metadata.xml 473 BLAKE2B 7d2bf14ca0bd4ba5bf05d0ac1529c0c8eae3655a4f52eba56ddb6865e8a44978366b3abad6f334c99b5ad30332113761ea0b7afd76a9eb274c536a7c23aa3983 SHA512 49c916ec4e0690ba17dbaf363acacf3cfaa69f180e0d48644eb742875c55cb409f51123f1e055ecfcffda0f18604208cc61fd2372c2b1aaa6d949dec9edc80a5
diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r5.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r5.ebuild
index 614f8a7ea768..da125f8192a1 100644
--- a/sys-kernel/genkernel/genkernel-4.2.6-r5.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r5.ebuild
@@ -91,7 +91,7 @@ else
 	SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz
 		${COMMON_URI}"
 	SRC_URI+=" https://gitweb.gentoo.org/proj/genkernel.git/patch/?id=8c9de489290dc470e30f8c7d0aaa3456eb124537 -> ${P}-s390x.patch"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 58fae257252e..0e0dc3291e80 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,9 +1,6 @@
 DIST genpatches-4.14-291.base.tar.xz 5658836 BLAKE2B 30ab73fe0546c890f448cfe25e886d357992cf0f249ac2198dd31f1aff877f22a1e0a2a5feb0a3f3498037adbe902fc5b7a67b7522433e67ba3b01db41530f57 SHA512 39a7ed30a8684956afa404437883a7340bdfb99c0c12960a1734c6ef4b489920db6449c15026db2bda829b6a63ca206985d2b46f4214c92f3011bc06d276b907
 DIST genpatches-4.14-291.experimental.tar.xz 5712 BLAKE2B ea121af4612118e390e45cad5eccd87ca6f783aeec0d260923910bc40beccd03e632e11cf76bf6f693827290a04656cb6b17b25582ac7e510edde4371c6f1ff7 SHA512 8420f540b938cea77ad5c4e56eef553818669c1760b9ac66c5c31ce4d8abad4d1bac8b025b6f7bbaba1b29a647860156935d6988d86043f4a5cb9a7d3dc76a0b
 DIST genpatches-4.14-291.extras.tar.xz 3656 BLAKE2B f1a6222bc8f824b75987c3c06c9dd322dcae28f6eb6a67cd23c839c2c840d6cfda3936b5160c90dac183844308efd06ef406c18fdc21744a56ca923253bba1cb SHA512 0bedbe1d9f163913b06b115349df12f83aa72f5b1d20436b54331077f0ad4c03a5f5d623bf392219bdf04098265c878d1cb69a0cc16053e93a4c4408901f09e2
-DIST genpatches-4.14-296.base.tar.xz 5768444 BLAKE2B 874d9cea6cdbfca3f80c32489e1b46ba5fb076c443ef2e804a4c2632a8dd1eb2314ee88051e119a1211491a07c14c4c7d63ab231c5e0553c05433bb1a4f68ce2 SHA512 1005d923b05f215bc88dbcab9ef0000577c738100fda88d587ab2db136d5484012140526e1d806ca009e16b00290ddd7338fbe7ce9eba6fe44e40a0894eeb616
-DIST genpatches-4.14-296.experimental.tar.xz 5708 BLAKE2B 2154c51fea83d38d951c087765c39311803f54e4f78ce871a76ead357121053a0bbf4dd313ea3fd1c97c6f208c34eb1b129a84f90f1faebc026ee4a42f98db9c SHA512 6d8b7725ca76e718d9fe6119388265cb868bf212ae98d6e4a49bf0657a02c8fd53a4895110535adad79b085ad5dcb79b486e114ecdf161d96ec20a7d5b653a55
-DIST genpatches-4.14-296.extras.tar.xz 3656 BLAKE2B c52754503851d81f3935161fdf0c116ef51d220f6bcc8d0a89ea0b1ebba84d78024063184e04ae006e5ec65e70bb70fb94029566ffc37d989488c719d1557eaf SHA512 c587f51b34034080dbd2a1163c2c6c28ba019f3097a5575d2c942b2651d945db06551830f7262b21f21402db29627e45145ffc3c58876f0afa1049e3e3e6ee80
 DIST genpatches-4.14-297.base.tar.xz 5775104 BLAKE2B 70aea407f18b7c777d16573c30ad310d4275096910e0c24f73ae14e87e111a6e33d16430673791c2390ac2c8a9541bea5b6dce492a1655c87e319f106acaaa87 SHA512 86a0c3ea93276dc0c27bae38de5d641b8db23feb7dce708ef7043aa9ecd1f97a3f0d1e28f49b994fcb2b5b24cb2a5bd8aeaaaea2ef1876114eb56edfa415a231
 DIST genpatches-4.14-297.experimental.tar.xz 5712 BLAKE2B acfa053f39fc3f0b34bdb579c788ba0b2fdba89687accf93fde5a3e475dcc8a402cf845b0b6e530902fcb36cedc9c36bcf6aef41b3b1a3cc0e96c393421b0e74 SHA512 850d8c73805fb43e62fef4ede5d54eb415048858b30d49f446c1c55bd5102978e8aae0be353300d7295b75bddc2ae521653ccc8b10b166daed616085900cee27
 DIST genpatches-4.14-297.extras.tar.xz 3656 BLAKE2B 7677e00d7cb635deacf1ab1db2c8f6a062c9d6d694a88d75cc48fdb98293c302bb4289cbf114be94ccc1c49826ef8a10ebdd85aa93cdde7eef3ecae7d1d7d032 SHA512 238b117d29afde4734adf69f25d10428c976efe38d3a4da1afb79f220bc6adf377fc3b9befcd82da024286e6a1c6365de427dcbc677ce00c4fe7e878d987a172
@@ -16,12 +13,12 @@ DIST genpatches-4.14-299.extras.tar.xz 3656 BLAKE2B 21504331411d0e852aaa1ac3762e
 DIST genpatches-4.14-300.base.tar.xz 5794308 BLAKE2B b17fc764d91dd61c21f8be2a1239ab8bfa1c81df66f40d45f5942d81611890072df39c198dcd58fdc379e326541b75b1a2f46df61dd64e183c78ba9caa86dca6 SHA512 4ab66e2788df34f63330e12d8c46e8d0f19d888ea654f71c68504c24bc9fbe907cc1bfe38614242c0bba0734830e2847cf6ddeed8c04e9d76343f9c6273c4315
 DIST genpatches-4.14-300.experimental.tar.xz 5712 BLAKE2B 6015379531c2345ebfb1cae18bffedfc53e8e7741b14c51a0a2d305de2efa7c62e8c43a3ce745d8988b8d147512566e09d6e389782a316de68f0f23c86460389 SHA512 ba4bfee69eeb068439361644dc248f57bf9eb9242bef0e516ef5613f3b988023554477b9e047c0c0b8b113a6526759a8a8dd534b232f007a907a24a7150c4c82
 DIST genpatches-4.14-300.extras.tar.xz 3656 BLAKE2B 103f061db8a79fb05036c723c203cb3ca5dba4e9498715cb6587d2b447ea8d807dde9df1d5e74a3bbe4cebfcc2c50a51beb3d80d6b79d1e48aecc99d23629676 SHA512 0a79d8839eaf22475e54474c049245c8b3e62110e604549dd086325e4654ac2b9ab982a0700e7cf3d66d599368d6db2f6145a03ccdb07703d62d80de8b873b3f
+DIST genpatches-4.14-301.base.tar.xz 5804348 BLAKE2B b1c9ade93e379d7e281c4f6d1e11de4778af9e4caabe80ab294d57c2d40fd0704fc30b6d281dc56ace9ade92f99a53a5e92cf143239516bf5fe2c3b1678e92b2 SHA512 bbad16c9f6a271c12ed10c3dc2055dad139c27645c449709b20157130485a9ca1ab6e9d5bdb24b1635d59ac887118131a85b3f09606dd48067aed087a7163914
+DIST genpatches-4.14-301.experimental.tar.xz 5708 BLAKE2B 5d4c3def13ad4728a7793305da5d005b2631151889530a60c409fb9f41bde62cfc520aca51cf48fae819552a727a18a17904d8cab9044ee0b45a596cca80d7d9 SHA512 84fdbcecc42ed937d15237bb0010a3601516ce6ea1df3c71b1d7ef20051cdbb001e4a15de1e8795aab4bd340f985476b059918c5067e1aa554ef4b185a6d9920
+DIST genpatches-4.14-301.extras.tar.xz 3656 BLAKE2B 74009e3b7921088b1edf09286d405b057d93e047924b7e4b7aa62c9d11a7eb59ed92a650be70319db5a63f61e34fce48d5f41197dd2871f0646629601d460263 SHA512 f44f4aba1664416bb9ab9db886e094c20384ca9f5fdf03a27e0084d8b04abc068b53efdc17d08cbf6f4530acc9e09f27830b9de1bb0d31e559d7abb3626e658d
 DIST genpatches-4.19-243.base.tar.xz 5453472 BLAKE2B f90618cd1150dd02ef53e9f42c7fc30f926d7744f7d9bb3b9e31c412a9462c28a1e685f63b5e4c83a754c3b1f5c749750a33be0756c49292a444fb7206c3954d SHA512 768e6897cc38c6ee0d0211d5f67f7ef786dafc343784791195ce81689a506db0862f9805a62b085fba476bfd239ecfc109eb3ae12049d42eb9b18ab738740eeb
 DIST genpatches-4.19-243.experimental.tar.xz 5460 BLAKE2B 3153a542de9536d0ec9d97f9112ec00867100aa25420af852bb356f0687a2d49148a25c18186d46b87587a57976a4c92be1aefa17bea5a6719cd3a9b05a27827 SHA512 7e9a8f0c23814bee9f186564f879bc1702f2b6860508d7888bffef5a5177a31142daa3d8e26431a2b4bce72c5c1c2a4d24b27c636d509aceee692e11b53445fd
 DIST genpatches-4.19-243.extras.tar.xz 3664 BLAKE2B 0201e661888c86275319aaf3c9e63d3b8279eddae2ab34b22f801933c27b7aec3d56c8042f8662583977b84c55f008152f87b8244d429e2cb13696260c7d533d SHA512 d000fa8e7038f6fe46a53e5e4326bc588980696164fd4ae1ba75295dd02eb3d83da2185333becc2732d050c9f291390a5197a219e0cd71ae30249a96d3d18fe0
-DIST genpatches-4.19-248.base.tar.xz 5591104 BLAKE2B 14c6cb90aaa8ad2a46545ca98836a6a5127d77489e2170232fa0fdb3bd05c8c129f6e30eaebbf74acd98bab83f6310e7e326b6fffdd29d23b269eaf5b7e04a71 SHA512 52ceebda804548f26d31bd4d5d6ca3789ac5445937a3b371fd9128d1abee72672b926d348d5644ea0e8a9b5ff9f556466b2569467288bd2eb60c8a87c0dfaea8
-DIST genpatches-4.19-248.experimental.tar.xz 5456 BLAKE2B 27f250711b4cd6bd967bf2b6378826f6ecce02c220b696eb0f758cbba4d28cbea0425aaf490c9ffd133cd53abb93968514ce7a32ab485e529484074a22ee6bfe SHA512 1b46f68f789f1371fe99c0e6677601a23ad988d7c8fc221d9231a99a99173f8f207e0a90bdaedd33296e5746a0121a572f39a897b81ce5384c4579053ffb0271
-DIST genpatches-4.19-248.extras.tar.xz 3664 BLAKE2B 6987ec67f106cd59d53cee4dc9fbd89e23dbc220d3aca92dc6516f5d4b7a5dacb04c701c70a51e626d355435dc082e6d227976a2b694702e489eddcb14f110a4 SHA512 717ffa362d399563e2883c03840cef40dff006da4d1bb8c4d064605c8cebb5d2c57173d205cdc3d363bec9207398fe9eddcd8b1c9b4e4bdee99ea447b4c9d6d2
 DIST genpatches-4.19-249.base.tar.xz 5600204 BLAKE2B aff3a7c269f42dc509a2d71285c90737e4e6872bba67f9ed5ba6599ea57cd4710152f31b4916cf3bfcdd6f4a0115953723b5f4851c2b2ebc247a3c9322bce90b SHA512 9fbd1b6c0a83478d20695c0a29a5ce61c296173317bda3226f76f5b6d588c3bf141ad7170b9397eb76e1454ee68e48ade8550af33add15e8568e753da6955173
 DIST genpatches-4.19-249.experimental.tar.xz 5460 BLAKE2B 07bfb98c286bf7d893e5b4b9478dc3428236262b66d39160ce0a34b713d87d382b614e35e5d418305658da0706a67b0fa93e4926007a0c3fdf48131fad6a499e SHA512 753abcb94e38ac8282bf5f9a49a1b2fc65db67ce8ff473c2f5969213922e79996c447de0cb1a776e013c2e07753d4ae6a03189f6bde7da3470e0644cadb61a88
 DIST genpatches-4.19-249.extras.tar.xz 3664 BLAKE2B 3f5a8d3f6d6acc48e1d1c82e7cf5bca7b9fcbede5b2362637ef82b4d36b406ff91b01654ca3c1129f3ca40377db35926b02ee6bb87c2ab27357e08b7554d3ba5 SHA512 f25835630b6f09037f706394ae173ffc0d4a41300d3a9065f241f322175bbb630bcf882de3c6a2cce2059045a10fdb2cfc4358ad8ebfc68c161331b84100846f
@@ -34,15 +31,12 @@ DIST genpatches-4.19-251.extras.tar.xz 3664 BLAKE2B 55a116f9ce0d96db2340bbd76625
 DIST genpatches-4.19-252.base.tar.xz 5625760 BLAKE2B 29064436d0e994fac5b700a779d9685f639267a371e7f31d40887bb7572ec309f28a80f59b5d57558b8185324faa0acc36d76d037d447a33210e5f85d7911bbd SHA512 54c9688e2d58feba1648bd37b4707b15298ac207abf5140e94e21f3368267590e1580c7d7026c86b8fb804f4ce15c37fde219bb1bb18509904fceb96c5382153
 DIST genpatches-4.19-252.experimental.tar.xz 5460 BLAKE2B 033575713515f26d023a9a9f073f45bba901d324256ed672f47255d523a4b9d4a90b81ab7f932d1ec348bbc9fd967f16e817c649b92a33b148c52f509d98b56e SHA512 cb046a79e61b02bc8e49a73af4a56e5d961348b4b21d97b9375e9e38889ba6e52e9ac80aa326100594fad1b5171fcbc5d5b1318aca0494fbdcbd9583596d230f
 DIST genpatches-4.19-252.extras.tar.xz 3664 BLAKE2B cf5b8fa06cdea22043ee6f291547d501c79802a438a09333d371350dcae0118534f7bf7d680d24a5437b12e470274ecc0a4d393d2c0bd6fd485e7b2f29a44420 SHA512 3516a485185b66dc06bf135bc6910bc58aae37c1e1a1a3a8ed871182edf1fdb6240ddf8cc0d297256a8fb09daa4fc37249e249a8bdf586703711941306071344
+DIST genpatches-4.19-253.base.tar.xz 5642084 BLAKE2B 155fb8844207b9963986fc0b91c5d457f65b1724d033f224de15d971d84087490caa7361dcab6cc0d8d6dc08d7a754be354f7f2501e999ad3fa098e25267a3f8 SHA512 eeab6e7cea48a2f83d9e90aa27018aa728869cd6d8b596cfda03a8f12f0fd56ac8bd1d3669d982bc8b2be3561ca3024647b0eccb7eb56b25b6ee80d92a3710b2
+DIST genpatches-4.19-253.experimental.tar.xz 5460 BLAKE2B 05303142767c86af4e5dc2386995cf4f3a2c6a0ee505d5932b68c0b28d9a596b7deadf5ca0a0c8d31ed1227d92f64d3748abb9a80108846dfb3464bc4e8390f9 SHA512 5a17a528dc0bef04dee24a73bf6a7ba918b10379f7ce5bb36ee224eaecd988409fe6e627c270708b39c9fea39dc678740593231838b3192ebf2208f8d060e6ef
+DIST genpatches-4.19-253.extras.tar.xz 3664 BLAKE2B eb96ed2925448ba20c41186ccb137423509c52d27f97bb322ae041f0a6068018abb247ce6060d28dc62e6acae0b7306ece046f1d3aa8935b41390cf0efd7d489 SHA512 f863780a01fc641422528c105552a8c201437da53d0bb60159f9a8f33bc0b288204178afae68fa8072e5e39f2c871bd9432b34d04fff5f88c6d151699f290f7f
 DIST genpatches-4.9-318.base.tar.xz 5151300 BLAKE2B 568a51692657549568ce2d4332f9e0035dc55b86a4aedf9ce28451cf027504359e108ce187ad9f10908126014288a46aa78016e8d52703b8e3f51b9272442c34 SHA512 32f9802e78c54360cae4349611f58c8e5f9c5e8452721802c315fe75b216e2fe2f7d5808e2ad2e915aea0f20ce65ee667fa3db366d0e9b49fa7fca54304bc6e1
 DIST genpatches-4.9-318.experimental.tar.xz 106368 BLAKE2B ee253ba8f55728c546720dbe206a3c70de95f1e15693950254505173a5721d1d682007a9988ea956533e4cef1b615b3da28b79d7c282a2099af66ee20c539296 SHA512 56453356ad599543dd9cace88ed59399556eb4f8e8d56fb150f08c2532d1a8765b4d7005d96aee4a4c9e5871869ce96f590d86d26f0792c7c8c99f0e643e2676
 DIST genpatches-4.9-318.extras.tar.xz 3676 BLAKE2B f8d266992b4fff6a3668347fccffb6573c1a0af85adda7f622d346244aaaaa8123bfa518527dbbb088f804d6f177362f5d7999cca807c5dc69e46acc7707b71a SHA512 52124e1245b3749039e7e2013ac9c30ff6b2dc6d3ffbc37c306483901f1916b0bf0ec5f5064452f7dd5729ef9da8f94ae7b5dc084ddf81b55078948988deb3b0
-DIST genpatches-4.9-322.base.tar.xz 5195332 BLAKE2B 5a5c84f6b5d93aaf3787fb43763d48602a463b0a132a0faff2cfd3597328a184ce19e23127c462922db365c0b5a985c16f99e7d8d2fea5456811a662039da1a2 SHA512 9c6e5715d8e8c5b106f06c24077528579fd02dc5ddf6d031b598d7ae6610dafbe5938bf592b2d4994f661fbd19ce45ab08704f38c7332e010bd7d8e8419e2012
-DIST genpatches-4.9-322.experimental.tar.xz 106392 BLAKE2B cb66009c1d658a011cd7cd340b3a0145ec0f2854d23661f17bb8e3ceed7af79e8356ec292a6851fa3c7fd3a58e59c4d6fa34dcd8516b868977aaac8c18fe4355 SHA512 d67fdeffb4553872d1d9d2a1171a66e0efe84ddd46bf0e8acbd41d5b70a36772f86059147ec1bfb0c95d7bdc2d1b13577dcb9f66c6a64d6e88d69ab31d511ab6
-DIST genpatches-4.9-322.extras.tar.xz 3676 BLAKE2B fd9fb9e1d7b021a140d704ca088c7a6429b255a29d4198f27e8036e0a3921537ae4b386d2363dd6c0313f9aff9cde2ce0c37f47818fd24c71aa85b0f4e0b92b8 SHA512 ef11a6becec65725e4d571dd60ec389629b20d3c69f16ae965d5f98d44be0bc912a5ee5721e073cb72f1922e9e5600e9ec8faef162e1102650c547eb23f92d24
-DIST genpatches-4.9-323.base.tar.xz 5251280 BLAKE2B fedf3eb4fcce2c3008f208d93a4a9fc580326d5b22267722498c0d02fce7f149015314b2332d33e80193ffa89f155b8c77701c828849e711b9679b0fb01b7d9a SHA512 93a3172bb2c48d9b531de65310f4956e2743bcbfe0359e11c7e3a32a8e9af2a0bad289eec9477bfc31ee58e2d83a83ba83b02f95b67186df8614205d1b5a043f
-DIST genpatches-4.9-323.experimental.tar.xz 106356 BLAKE2B 798ecb65c34c89409a60e4c60ddeade6f6af65eaa2fc0a6b15c58a1feb12382d5b845c0ffd3c451bf075efaf379a4bdebeea9479226bdf62a68cabc55d20d690 SHA512 c070dbbec9b4e7581ae480e0857397f0c26a022e9d43f81ab75fce55ffc7fb194f9eb34db3e6e30ea009c9b36e8cbc37cae9da79a69f892a929ae836c3b72a6b
-DIST genpatches-4.9-323.extras.tar.xz 3672 BLAKE2B cddb7f597031934f22c378156c0164bbb42968da83f21ec802143b0b31cfd33260d0cd7acabc11fca6920de7b457dab1f9eae6e8fee992033c229ac67a8944fe SHA512 291f3634e88dbfdfae3f7ff47e334c36300a8d8e1b6b7f635c026b925c2f37e649c469cfe9540ce38af13fe14463f750efe3862735b6fbd3b2930fcae986d56c
 DIST genpatches-4.9-324.base.tar.xz 5256552 BLAKE2B e264347c300df06aba685dc116100b82cd5f611971aacb22fb2832467cba51bcb6379b5543cbb89bbe05a94966cd12960996de3df8338bd30272e15dd54513a9 SHA512 1a93982191932dfd3ccc3bd80727a6c00e7a6326b196725468b1740f19c50ae7020afc67cde474c5e0ca0ce4c6cabbbfbddca980752bf5f22c7782ce76efd97b
 DIST genpatches-4.9-324.experimental.tar.xz 106360 BLAKE2B 6453e139134cb068f59d2c855c2d74cfb09fb450fcd0061c92d8951a45b85bf2b69dc9777649e183b463a86b3c4cba9bbb6ff7d53e9bdebe341a2cada4f57900 SHA512 aef60a9b2235487775790fc799749aaba052bc5325e2a1f328dbdc09e42857bfb73995c9de66067fbceb028588716201c023edbe30156ca3f9a7329b5ce63987
 DIST genpatches-4.9-324.extras.tar.xz 3672 BLAKE2B a0fa11eb759f5ef643c17a31ca86ad2e68d78de9e038664508fe0ee598057c351735aed675aa7e8aadaa1358e79fc860ccd357dd6811befccab02da0a18a226c SHA512 78eb0ada42db6ec736556c55910587fc6ee05f18a185a48532e2db3910d8da407243fe07a547b33607aca626e1ef948dda513457e71798df2210a9e1649a2771
@@ -55,12 +49,12 @@ DIST genpatches-4.9-326.extras.tar.xz 3676 BLAKE2B d62d45886b6a49aa30185531a7d1f
 DIST genpatches-4.9-327.base.tar.xz 5271596 BLAKE2B 98a620dd68ee28b827acd72151d0e01e834427b5ff433c2a9702d3e30ecf8cd2d463b2c34fe8aa559196981c6a6681b87311a4b4ea74914f67363416628d9c4b SHA512 6c59586b6220cce2ac3adf70820e0863ae0132d3f7cc77cbf1ffb6bf10d0c5a8e5eb8df60cc46398fd60de5e82cd4a4df87c394444971583c99a9672d3b95c62
 DIST genpatches-4.9-327.experimental.tar.xz 106396 BLAKE2B a175832ec2adf636a64cb739c9c0111827ca9951d20878abdf151185449c12f778ad4397172584927c3aa1619a0b61c2b6b4b6a77f264fa75227e4b74ea159a0 SHA512 d59ce6e521c1f76e5314a2e0fa4c9a220d0f0b919c7ce9e8cf9ea321a1067e8189cbf35b9798741cde2f253c3c377229a387419dde58bb3728100bbce7e5984b
 DIST genpatches-4.9-327.extras.tar.xz 3676 BLAKE2B 4df82f5fce49054efcc3cc1ec68a691ddfd52448bb5425ec119ac1afe4c858fc9bccab4d590c0ad9980ef3336fce8e24a3aa5993b04780d60b18ee9f7a2408b4 SHA512 4fc62397cbb9c37e97f230b13f47a0e1eab645c9795bd100d39f016f76972cc0dca053ea3b42857dd54a8b2e6186d4c8448e6d756754b2335e398cf4606d2076
+DIST genpatches-4.9-328.base.tar.xz 5278864 BLAKE2B 2e445025ce40a0422d9d95aaadf6ca17fc76107edfdf2ff5c7a3aeb2922a740f3c422f7c350aedcfa3af60f3a5e268d1a705a7c4682a72989e6b39da08983600 SHA512 77bbce0383d602ea897e8ba89ec9a59504b4217388302ea44e39a4394ec71ffc4355e24833ef0980a622f43a8cff86fdc9b6046313fef0c56cb9c32777b010cd
+DIST genpatches-4.9-328.experimental.tar.xz 106388 BLAKE2B 13ab516bee3a7094b671f0d03a4c1a754fb3dc8f4107ce274ecfbc4389f2b89c830f6817a77553d0eac7ca2df3e4ae7c54473d9c77ed0d5494139ddc545836a1 SHA512 63aadf90dc59048d7757b6a68d2fbdd5269762709faf4ce0442e443d22f95611fc0b7fb419b217313697eb4ebcdc336ef9055f97719a2ae0b370ee36f9f7b23d
+DIST genpatches-4.9-328.extras.tar.xz 3676 BLAKE2B 067652688a8184345d797196a11d125e5a698483e403781c12770040b5a5d0116767f357a3997847c1e2c36106ef0f6eaff0b7dd961dc5ffad341e13f35b607a SHA512 b6450fc2aeb6a719399b6bb3e760f671a7db522691eb8777e9cfe73bcf1ab3e6849dcff490b73f7271a72af4ef82b1a188509ff326682ce49bb13069cf51d913
 DIST genpatches-5.10-126.base.tar.xz 3445148 BLAKE2B f21381f177a1c3de8e9be21c3fbf2b5ffd43dd12a7726fbcbec2e259a44e353fe63a98cc29b3e207d67cdf2642aaf142a69f438c395b0e928b13159e8fcc9fa0 SHA512 fce3451abb11c22afc8ab0ccfa6483ef2ba23916e2ebcd3191af775f1286716f90167a0bb835ecc0738d4e8a13326bd0644f46fbff19edbaa9df6c33fa5bafd0
 DIST genpatches-5.10-126.experimental.tar.xz 16872 BLAKE2B 9a963dc0eaf7170318a18fe8b6f7385e08c5e986428997d2ed6b95c027fa3bcc32b67afbf1ded290ae3f2b70fae3c9e2e902d9723707fc731e5c57f039d61668 SHA512 2be758896ac79b8a4d2bd1c8cf4c6edaa87d1e8b30938af9d26c496b26ec2180700c607dc40d72324859965b097f459be0d3037c1f25b74fddc7290b11c294ab
 DIST genpatches-5.10-126.extras.tar.xz 3868 BLAKE2B b08b05b945fef23421cf8a0f18c7b6c23e86edd4717ad80b24f4109d199373477c0bb16cb2a370a540c2d97bc99c1bb4d9feb7a9c964e9e80b9505cf51ae0ab6 SHA512 57e81535f7cbbeba031c03d0bf634035789266d1be7c7254d44a6777e554b5b6b14649c04e2a910ecc16f8e53f122b6bd0c9657cb5c9bb1fca56ab4d73f1f259
-DIST genpatches-5.10-136.base.tar.xz 3735152 BLAKE2B b8719d909793dad9e9970af8a8e7e63c66b84c4d0cf51670f2146ab1678f9c7937b366a0c4be1989688193655bca895f2cb4afef6e2fe99697f041c7527ac921 SHA512 f9b025f2e1e70daca9d33a87702948b8783cd6a0fd41ab17683b51ba3496ee1e46d9f2a0b885eefd535bdf9a98463e310efd80c2eafb0d80d1159ac8a491802e
-DIST genpatches-5.10-136.experimental.tar.xz 16868 BLAKE2B ce6f21ae2929f5299e62911288b960887f10a83c2380825195f6dc2eed7573b317712408e34a134ac23d849c4bea747b00848579b4f0d196b0ce433a2c6a4667 SHA512 f5240a90d73ef9cb80ce0b2cb0cccef11d5794cb83395882b0c4d06fb714a8a36b11d94b8584a63ef2bb74387b0223f2b32bc8de65fb301b4dc62b784dd67fa2
-DIST genpatches-5.10-136.extras.tar.xz 3868 BLAKE2B 4d914dea81f6223ac97dc8a9a36f4f635e3a7223c25d311d5a313e25d21d779fcacc6688b2c303ad3ddb5e68b6a5572050e060a4129a90b7c6dde8f5325147be SHA512 c02024ea0782ca11db45d117f112702bdd839cc318e4a3d852be6d3e8e62b88fe200705ec817d0cc99b3a9d2bea1206964ae4ff5a2a9e06867ff987c5fd0d389
 DIST genpatches-5.10-137.base.tar.xz 3737796 BLAKE2B e0af05dc22c6f077a110518f9e0cd790798b8a68f5d40c409dac7ea1845b8d80741975cc11d588a8cad96aea474c98803cc0db7631575d295ecfc0a1b4080864 SHA512 f9dd222670326f89a9ba62360290a29d5185afd89efe8aa38292a025dae941b10c28ab047c1fc7e84506d43ee56fda0790280c52ffca482e3041596696437ff8
 DIST genpatches-5.10-137.experimental.tar.xz 16876 BLAKE2B a733e9e9ec2262856dffe9147489e8d110a8a166fb9e489d2b5c6eb6187e8d73f2f4d2891965fb151d43a2acfd78b128df5a3589ba1bce5200fab4c33146d1a1 SHA512 4b28cfd6c350ed0124e9a77ad4c1da9e48dffc955e1a1eb04e6f940cd8600d6c0374cc19e141284f39d14c4e9231d3df63e85b42ec94c8614ac7871b394caf18
 DIST genpatches-5.10-137.extras.tar.xz 3868 BLAKE2B 97e6520ab0908d1270d10b6dab659899335aa405083e187822e7846a5034677fc77a05a20c33665ff9cd7b8a57fe95126b3c60218b0b5968967a866b241f03e1 SHA512 3945379ae2e5c2d5712788fdd27db2f74952686c319266897f649003198d0a5717c48c214f8e07310d6c489de8725e3cf4a74b4d05bcb4ae01332af175fbfbb9
@@ -79,21 +73,15 @@ DIST genpatches-5.10-141.extras.tar.xz 3868 BLAKE2B 2f2dc5299a10634e3c011457d1c4
 DIST genpatches-5.10-142.base.tar.xz 3863448 BLAKE2B de45611ba9c92f59829a61b84ad0461535ca68fc5efa2418417bd1fe7e1ac643e2b65e0b467414eea90fd034445219c13782b1c99136367247420502289f7523 SHA512 63b835f0006f0e2ec97432cab93f21f47a7a36098f5699305d6ca2d01d2419fe6ac6588e68210d1332b4e1dad8a6fc74ad95034c8be1524601e4c30b447a3634
 DIST genpatches-5.10-142.experimental.tar.xz 16876 BLAKE2B 8acdf92ffdba6f0b23e99a92ee6dbd4555239ec6f50a33138523c4add372ea71262d5d547a3b558871743572c2f9d8d787ddc2c658c05fa1badc650ef88d8bf7 SHA512 3939e91c3bc7f119a4750e6d7380d50b23f4394492ba615db07be20a8417c52d9e955d428b6f6bf656bbe7e6ef8cec3d02360b63e01b472c4fe33d12c01d182c
 DIST genpatches-5.10-142.extras.tar.xz 3868 BLAKE2B fdff4c1e3ac6b09322168d92469bc5220dded731e05250100df2b5a94d90b2c5bd7612e6c32574ae1c67cd59e6f73d348b3f56bb9027ed1ba11427975796f1e4 SHA512 227bba85de2bf1eba0b0c3d4f314ca0f2f5c3c475ba78e5a82fbb3a682fd37bcef80ef1a91f1ee3747bd2a8c639d2f791110ac72c5406243dd2f54c87d846dd4
+DIST genpatches-5.10-143.base.tar.xz 3888492 BLAKE2B 981a8e21ffff29acfb070164fef85e6beaf41e36a6e9b139a7bbc2027750321286d7e1a6cc51604841352bd65fcc363a80edbb6455c9d8ae83be560603350f95 SHA512 6556642c9d99f0e8160c4e50f99dff42982346ba132abe77bdb83c1fcaf9435fd2573fa56380ce140efff7773ee5ef1cf9475360e6d5703caf4c38b14c135ec0
+DIST genpatches-5.10-143.experimental.tar.xz 16872 BLAKE2B 1b6bea488f7e2016a107b0d1b841e53ae9fdc60c9bb0737913215c8e3e2298d4cde47df57022727ba7786ffc6fb5e039bee51196a7f35edb1c4a467f9285d9fc SHA512 dcd5c51c26105c3cc7a58673000d14669e606b8d971bc025c12bce265f3faf15f640b09f5dca7bcae2d2b4f8b908ed23c425d5382657fdc8eb2f4f0eb14a0fce
+DIST genpatches-5.10-143.extras.tar.xz 3868 BLAKE2B 8bcfec127807585e1145930a119e5f8b6f4f481370c4243dfa0b3f5aac36f5b19ce566b458718128224ae63ed3ac8d232a60a917e80890a13a9b48325bd7253f SHA512 ad4f8a858caf876456536ddb7f6998f7d11c81047efa23cf3289fa93b6b9067fbdaa9329cf7b3e3089c0c07b9adabeca49ffa7a1a7eea7d9f5c0a306996d1fb1
 DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33afd0f35367d9304051999a0daa84da26feb99fc76a61af77a5e477a5a8ded1a5c12316450563cd56b6c93a93e6df6421b107 SHA512 9435803d4dd65fa78d8e14e992681aeb016d3672b81d589b293d1cbacc024605e18429529803ba344ecae1610bb77150a7b2405cd43f00fc905e9c6babef04c1
 DIST genpatches-5.15-45.experimental.tar.xz 5420 BLAKE2B 984a3e683708e1a1ec4e77fcacc592caca20d134a994e3922548b2cce0aea6b69e0dd3ae93899182b147e42a171b2dc5b230e601cb3b06b09ee6c8ca88bf489f SHA512 7305e4777e3001ea5526b059ed1684c16879e07f83f54536d1326c03a495915cd1f9776865d0bff024053312d9e9f4a94d27e4c047fffaff831995a5aa69561d
 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
-DIST genpatches-5.15-55.base.tar.xz 2235252 BLAKE2B 7304a492e04d83ec505c76af4f3eb61999547647bcbcfcc82a2211aadbbd2fd63bc3335eeee9ccb8927d3d0486e41afeab6adbe3d3e8da4ad0c13d39f1ff4139 SHA512 47c488dcba5854a28a6b8f968e13f97fb31dc5f31a5a3abde426df7972a890c8fa36530ead386f02f3ecfaf2ac49da1e27d8a2de2df5c6a5c5fdf302e3c492fa
-DIST genpatches-5.15-55.experimental.tar.xz 5424 BLAKE2B edb4b1b9c0269b78f84dd35eb893feb86bf5469c9c12dc1449e04839851f19a225ab642b48e479eea3b96f91cff73cab4bb320d0329cbaaa1eeadff87e06bab1 SHA512 5227b710ac93562ecfae031add1ce2f19385bbb23c67bce8411b5c41f8190771f84f4227e652e779945fe09acdb23c92279ab8323727c8f5390b74ebd204a349
-DIST genpatches-5.15-55.extras.tar.xz 3932 BLAKE2B 50132ad9a1b3a9012ff46cc2ed8c0d18ffd7c48aed1c481eff24e4757652e3787172049a3025b2586092382c827c6d139930d157d039258d07ad228ea716c12d SHA512 188abe81e73bf1a809125dc634e10be8427c1d11f696f4ad7fa60a0ba269773278e3a9e568e3640f7ad8fb8f4736de7292a154b05f8f7bfab4fe1fbe341bceb8
 DIST genpatches-5.15-56.base.tar.xz 2245780 BLAKE2B 0f5e5d7c8a29f590598f4721307e3b1a316342cc31b8e5ab5496ed58b65470d19bed59ff40cf7b26bd4970eee04581ee8ac544eebe63c54063c161a55c828cea SHA512 0a1c4edd8f863f2c77a14cf48d79c35868ba8b2f02fb2436e1913e97c8285046ecbedc33e6faddf02a0c813e677492be0fc972e3731c733e488006602eb6119f
 DIST genpatches-5.15-56.experimental.tar.xz 5420 BLAKE2B ca95771341b6086f23ea70d99dfec6228e8f6486d520045c110bde63948008095715d68fa67e5e29ad46eab58366ab323736942b5c7bc83bbb61c2dc4e5c2b95 SHA512 1ec3dc2c019d0aedf03e2b70dcc6a5c80cc39ae0d1eb83b400c480818a97d6b212868dd370b4e529e01d40434313ecd2b0270e6055a22b4fe373e7a6cb91e724
 DIST genpatches-5.15-56.extras.tar.xz 3932 BLAKE2B 2b167a35d9dfe16a18b22318ac4597147fb25bef53a66108c2f2e4d6e6d3df1c9d4b1fd6d63ba4a8078f94f8cd69d14b359123355ba266ef72b44f7d9addca9b SHA512 ce91556981720f3718921993eb15f5af623cad8dc40a36bec6cbb0d52153fd1288bf97927daab1b1e3ccd1451d4295b109ead0160c657a00c62c2d6f25fbc09f
-DIST genpatches-5.15-57.base.tar.xz 2275504 BLAKE2B 23dad9d2e9dfc1f77f6e39f8d9e68a6e3168d581136d50d53b3503278bb5e4abfc25e2f9fdab63eeed674e370bee8ae7cc5c54058f6942abaa4eeac49258d765 SHA512 b675437c320b28f4b4ee979fff5c32ea607fd795b090206b49d66fdb95fc2ca1b959fffd33b9e5241a160c2f19902efc8218f2c39eaaa312a5b4149282e08b99
-DIST genpatches-5.15-57.experimental.tar.xz 5420 BLAKE2B 52c1e0ffa9dbe076d3a6e99526e4a2b54b5160bd547a2b5e657f762386935309856289937bf5d5630b86df96d5681bfe79203c351feec51b672284ef7addaf42 SHA512 273facf404b45dbcd728e401478146c6f7589c6eb17a107151fdcfab73eec97464004a92d77b1d7c628d479111c058c6d92876caf4443c5328e11f4ffb51a6aa
-DIST genpatches-5.15-57.extras.tar.xz 3932 BLAKE2B 670c631eb992f3ea25caa61037c8eb5135fdc1c9dc9e9cc91122f753fc2755f5e8a22a832267bb5e620a604a450cec7fe80d6b6ecbeb7fa5e5db2356df6b2163 SHA512 8f3685cae1613b3e93d33d67746267c4860d839d0a9917bd9668c7d917c83ee1300e1f7fe14eac5dc34de94f440de0127b65a2f862bc821c354e8c36beabb1a5
-DIST genpatches-5.15-58.base.tar.xz 2355372 BLAKE2B 27cb7a5b7ecb66f55a6c9b294e77e14f8c231df39953e19e0c6375ffc084a92dcbdad22e430987d771c89516e4b66b2e938347ef13f932fd593c38fe7c670870 SHA512 70968b3808b1a08d3041f6e9aa08b96f54f98cc26932a66bc8eb91663f83054615057f4d14e03bdd7150f0d83ee371cf718a1bc70ae9f41124afe506287d754b
-DIST genpatches-5.15-58.experimental.tar.xz 5416 BLAKE2B ebbc84556ea7485818334baaf5946f5f756d325e9ab7c86998a555b7b47ae718ecb112fc9fa33a29ce749260a9c5a1a102e6df60445237cb70e040155b7cf975 SHA512 636fa3d586acaa3d7a2b946e4bba3f12216829dd74e8dedc0c50fb41c4d405e2c635013ca84d1b4f5520c648336945de8946f32801fcfe7a21a8eaa1c0474a3d
-DIST genpatches-5.15-58.extras.tar.xz 3932 BLAKE2B 00c41224b6449df6c03c51b0528ee7da9b718d3feaec3dae3f58177983645e2f798ce8221708d7a470a057e37f1d7ebfc3ac843d97b3ce920e671247ccb6bcde SHA512 194275a95d28aff48262aafbc770931b1add0861c1333122c1b82e95c5a39c318a1d57fb2bd5c986f806f84b417c2050287ba55d91d8d40e93541c41cffb7951
 DIST genpatches-5.15-59.base.tar.xz 2355388 BLAKE2B b7752f0691ff64a0bbffaa262a674942623b9b3aa5794b8ffdcc9aa23bc4cc63e65aad8d132e48ee765ab2a4711bb32735680794413166c1c358084e286f4f58 SHA512 d249a9e37ace3688f1f7f5aa368e45fb428220ab193d0ad569c2e1dbfa41b268348378928fda642d1d2521ff0cfacd5b7292b4a1e20555a1b0c7e5232bfd7410
 DIST genpatches-5.15-59.experimental.tar.xz 5416 BLAKE2B 2530a8f8e9922057638d824afa46b5adb3cfe4d80715a88a857e3b68ae18340a32da128fec85a81bccff354f2b76bb3e3f06b0bc53d2f456959e72c49c904bfa SHA512 b03d8843199931c325ae271f789c0553f34c9dd04346437edd1d7327faff1172ca1e8311305a733a0f471598c288c96654199a61278e4cb79ce846605706f82a
 DIST genpatches-5.15-59.extras.tar.xz 3932 BLAKE2B 7438a1bd3f63bd989b93b8d1bcc2474406670958291d7cbffaab792789461336d30465664e6d36c2cc91d77d82fb1ac521d13dfc7cf9691563dc417370dd3107 SHA512 127ab6f173b230c4b0656653af36a5086d021d3ac81d5549a60ca681c1873dba351aa33e3fe96da811dfa6e0a006cab14aa6894f03a9eac1a447df8f724d75cd
@@ -103,18 +91,9 @@ DIST genpatches-5.15-60.extras.tar.xz 3932 BLAKE2B 2c9b704aa65d9ba6fab93252cd581
 DIST genpatches-5.15-61.base.tar.xz 2438712 BLAKE2B 44a8bff3e2df4203943aab61398ce4f136f5101e10a8764885202e799e8d5a6a1270800c5c8cbec98aac4ede007a49616120356aae66008ef2578698aa25dd3e SHA512 88cc84df8f11c8f714a629cba8b22dc730b1cc90d5285c2c5475ef808715418e4080f421ad268c7e8a34c18dc70962b89fbbb23c73ab5f3c76f30435d98ad0ee
 DIST genpatches-5.15-61.experimental.tar.xz 5424 BLAKE2B ee7c36187ca8be35717cba8908671947d01f08715db71606aa130e4e7c3c62decb39e75a96144f1797ba8364498797e6c142d6aa2f94beff24cc6a70a3853dca SHA512 1da52a963c7672824a8185ec66208fe4bf34c0b2075baa1b16f122518b6f3098c997c78fb495314eb962453781b263add3c74bebdac744baf49e3bf66206b37d
 DIST genpatches-5.15-61.extras.tar.xz 3932 BLAKE2B f2579301f9ee4e2dd46dd65472bf208d62642df674863cc905dceb0e91d62cc3e64f1d0d4ed99f0ca9c010108b7df58a12a34b6291eab34f565d9d4ec69c2751 SHA512 17463a7d9e3a2e017654e78dcffba58114ec5cae5e67858f7f3c50bf14a92c1b488f85f4fd5fb61eb53fc74f6a90f0ab152ba9396d0d928050851b4c5ab643d7
-DIST genpatches-5.17-19.base.tar.xz 1122576 BLAKE2B 62a8ef6da90d967676754daec496101b7638c1301ab5bbde5d94f8186d66f7f5672c55b8f97ca64cef9a83da00a46db7ab804cadff62d3137ecdd2bd41885be1 SHA512 b5aaa9013bf2372a658e885ce37e3171077002881e95bd81da87ff1a69645d4daed0f7717b4d35441f25ad647dcbbe92ecbd01318eb449101bdc415409c60e41
-DIST genpatches-5.17-19.experimental.tar.xz 5404 BLAKE2B f50ae6a0b623b38aa5a29fffdd55c53fdefcd451be59c7636c861fb397324bd8eaeb18fe3c476a180767cf4ee0ce9e4a06b3e6788928ceb16d283d38942463d9 SHA512 1a9d538ba714b60ebc8a5b0b8a80a21829d395a382a2cfa838bfce58c2437137deba661ec6b1622b674cc0fa67ced444256050392d5ce1b4d6a9f5b3dd988432
-DIST genpatches-5.17-19.extras.tar.xz 3932 BLAKE2B 87ea5b908c969c61d8da8067f13f0b674a4f72c4614b576a5b7648cf6d6880e88735931314faa43a3f4907c4d75baa3f705908bb609b95af3d9de582dfc7989a SHA512 191eed3aa27c2a2dff28b79a45db4d2c703bc45f5f63eaafbc6229541138601b6462df8262d808fcb5155eb7d632aed85e26d06e13a4095e305a493345dd02e3
-DIST genpatches-5.18-11.base.tar.xz 547804 BLAKE2B d0550c546e93b806d96c8e64c5ea90d22f9675f2c6a020032ce5e35b7401601c79d2849c0d82cc53673e6c22fafc975035509079253f235c7db769fe20670e59 SHA512 4301f61e38ede94fa5c6e02f67e22dc32cb1078463aaf641ac81d959444e8088c1e7da6c3ac7d877f1f94777bf14de1a24207caaa8c560fdfc352a6972ea5b47
-DIST genpatches-5.18-11.experimental.tar.xz 69928 BLAKE2B 2251f78707cb08944b28db479e95ba76697f5bbf15a5460e972a58e75d19c1751068297f252448170bf883d5aac03d4e6c3bf2e8bb1d8e400ee2fafdea7656ee SHA512 ef2e4c0b7e8275685833247faf6b8a6d62b9af4b06f40a997684f479f7ee5609e9fe37ef08c3505eac8e8f74f799b8157e2652ca7677f50f862e08493c2517bd
-DIST genpatches-5.18-11.extras.tar.xz 3924 BLAKE2B de48f32f46f5d8fd8cb607490eae51338e6e7e94501e2e1ded2c990274270d80c7a883ed227203cb7306c0259f8dbe226ca3ae271eab76e367eae0ca7bd653e0 SHA512 bcb9190ba00f1028ede7ec7c18615260d8de263f508cd9c543938c6dc0fc9b0be856be386af4a86770562453e094e1794fad064baffdcb4363cb128abb35fa75
-DIST genpatches-5.18-12.base.tar.xz 549680 BLAKE2B d6973dfb0d7749fadfc511b1092dedc67b3f8a57e2a117674113f43177bde8608b6106c4c84fbf5f5a161b9710cfad28a3c2fd419fb3c4088d98f9a504ae0cb8 SHA512 c7ad63058bb77c92d3ecf618a41164476a56f2b7b879c667c7fc9666fa1d7f81b599d6ffc5f0fbaa3223e7d399dbb6348ddd511598581083f7b78d505dd81e7c
-DIST genpatches-5.18-12.experimental.tar.xz 69932 BLAKE2B fa86df5d33d02c6d9e37b6225d3e2013afc2ee50bb387767046b51b5d6cf41033f89f48e77a14f358fce44667c8dde63450102df8a100293ce3e2039c3e38096 SHA512 512305ff6342ce300f4d7ab5ad6fb9e21b3a12e95d6a7945f54ed5bf5cb5a4450c38452ddec8d7ef8deab1bee570109ec62149db11b1f8a00c9eead43d516615
-DIST genpatches-5.18-12.extras.tar.xz 3920 BLAKE2B 89642c29bae1b15664749c11e581ebf1d0b42801cbd3e436805faaacc419fa7d946a05e7d37bc8d056e36768d181b2e71dfdd6b28943ea112dad9f17a9c2bde1 SHA512 301cd52af9db5a8ec91891a0258a262261d87cf22cb01c27a531d0274ee23d0e928977abe8f5928d3dcba430d032a3cb418193bd1f3e09a923ca6e8718ec7420
-DIST genpatches-5.18-13.base.tar.xz 578484 BLAKE2B 03215db005e5a3668898b1ac4c25aeee5f20d6802d00b11d24d41f506ca9f730f031f5cde187f81406a3c75937d65f854acd3c0e2d2cf9f9cb3ba99454304180 SHA512 bdf29085cf76022aa21faaee63033e3231b9757282633eb5897717128bc340cbf38b12a2918b169b452e85aafc9fadac2645df414f877f43950a3147e00dea68
-DIST genpatches-5.18-13.experimental.tar.xz 69892 BLAKE2B efc39ea8d9bffa3cbf8a6c8c76a8bb86fb7de9857536b9742bb2f0f6359655d69070bd76181b1fb71acee4be5d2af48293d715eba9746300ba5f157c1d9d6740 SHA512 f836169c744d56ca1922faa017af4c8b3cba938b2dbfe39937f4db390e5e91819c83af46d86691bf14951c9a1709f6818f224a6ede2a08445790ea245968ac5f
-DIST genpatches-5.18-13.extras.tar.xz 3928 BLAKE2B 21db8944e961dc054e69901d711a85d2965bc90dcdbcaac4d939e033d7b2007860f594e7bd3decdb5b2ed73b0e6b67872dcbd64a3301fc106cfd1c9c189f071d SHA512 21fe61063d2e4b3ff40664d700643693068aa73d1d5416272116001c7f4ab6a3c006824ad868fd4185fc20fe53647727874e7fff01450d5f5dc36aec84a6e55f
+DIST genpatches-5.15-62.base.tar.xz 2506840 BLAKE2B 29d99833ceb0835a02f5acdcb9fac48d7e12107303caf9eb218f9ca4914b3a82fdda0e47399cab1c76d3fe4e0f17378aa466453a5409e01f69ef37ab1753b648 SHA512 5e0725ec3a7f07ff8506c8db54fe5842e0e71f5b5e62e70af43a14e7c2002a71e9b59b73ff943fa64feee453750c63b92033340405098f072a547251d2623dc0
+DIST genpatches-5.15-62.experimental.tar.xz 5416 BLAKE2B 1fad57f413aba9a61c3795a835e84c033863d057a8a35c9e42065458379bfd3ad59c9ef52ec4c18533c63acb8e695504e91e2ecd143eb354cf010838a2288fc0 SHA512 ab3980140db60b93b45c3ddd80949af772e1005a8beb4eb294349d8222b02ee13b4d4f65df13c392af0eda2111e8f7788166f6acdbba0d6b615c97b659318f9b
+DIST genpatches-5.15-62.extras.tar.xz 3932 BLAKE2B e4478eeb5bdf3b6db3e9e9de9c02641477aeca08ed07e0b0ab66419301f273b8a79f4b28fc7a22095fde8521479878bc71d70fc585d934efeefe4a408af3493a SHA512 6c241a54f503205408b8b07c1389636fd4ac0e8785d12aec2a363842f8b172e06b9568a8fa9f7607b6ab2f09b5d7892294f3618d1a7549a9c41a78f0c4e02d2c
 DIST genpatches-5.18-14.base.tar.xz 610104 BLAKE2B 1bb79a0ab1239773023c353305c30c8c9ba5cc9ad50c539f1bceb069ad20e6feacc45bc8249b6d23f2f707d9ec3870afc5425140698411070f54593fa33b26f8 SHA512 b646dc8f7dd8177d2d97a52e8bff958ce036edcf1d1304164c8e9e7e6b796383593fb0838cf3ab16b3aadb31aede16eb763c915062763b78676c69a094234626
 DIST genpatches-5.18-14.experimental.tar.xz 69876 BLAKE2B 9e38a5a18642ebbce2c0463dc13157dfcff8c4cc9cdde604353333762c6987deb59c4427906176c0297cf4da968cf79a2c229ada5e99bdbe5eaf89c194e898c8 SHA512 00bace0749a8eb19743c1e17c034b46cf125f2f6f05c4f2a7aa550b022ec9cfd389b6af9fc54e19b9c2ae1926cc12363fa159bc07552561ff877aa9214a28184
 DIST genpatches-5.18-14.extras.tar.xz 3928 BLAKE2B 6daca2ba0f7a1a2f318f3a398a37303bc9e1524bcb9cfb2713642eeafc86f1919f2e16789815780b78a391607d2f6fc34a84682f257360fbb3793e34aa56c84a SHA512 58e6fe384be03255599468c196b89e8f3f266f113a6b7f623494937205892d5f7dd301361ead1569790f05c4bf0a6f3813b4511a11cc77294dfc2d2e69590140
@@ -127,12 +106,12 @@ DIST genpatches-5.18-17.extras.tar.xz 3924 BLAKE2B 4d8bb90dc2446493cee33f5db27f4
 DIST genpatches-5.18-18.base.tar.xz 701140 BLAKE2B ee91222d6f6ce56d30cfe02b5546fcf7ee3ba04852c4875e9c98ed4177a7b73311e515e543a20107ddd1542077c9b4e2d13fd9cd0e05d507ade84f8fbb942300 SHA512 57aa8878d165ce05c2981c25e9a381df8ac8004336de88b330f779841683a1998dce79cb0e0c1263c77c81a84f01768630ff5e2385693a79b420b5ba05136a1b
 DIST genpatches-5.18-18.experimental.tar.xz 69920 BLAKE2B c23c3cf2f7b59b300bd4492fed25abc4aad4b462fa80de49910093180352c3aa6aafb5763235951c81e4e4d21246a47dd2022071a333e80c6e98b949d8d084ea SHA512 e0c8831079785730ba9ccda0f6419451043fabf1a284217d4c79dcc828eda72fcb6c3ea2a2a6724f280ec1236b23916bdd6b357b3c6f6ae082e3b64a994fdc5f
 DIST genpatches-5.18-18.extras.tar.xz 3924 BLAKE2B f01ece5d1568a0a760b58108571cfcad343a37be3d344ea728ff89d3fa5c972d7d1c6808ec41ec699ece98a2049ea2c5cc036bae5f44e93cf23528a71e3aa922 SHA512 e810217c00867d3836c4606586e35cc26e8c934382d5927ca188249610b613605437013ca0015217d650e89bede32d67f4daa443bd445dec382832a4e43937ab
+DIST genpatches-5.18-19.base.tar.xz 754304 BLAKE2B 4827ddbf25d32b89c8635f7cbb16bf2ebe3533450d86e358f0f47084a240bcc5faece567f3d8ca943ad980463b324eac184e04c2fee80229f38db8cddf7d25ad SHA512 157d3093573091224d151c930d309fef2160b2d8130ac4d28155d56cde993b6d17ede10fd33d436fa820da5c029bd45021ff393045250e260f7469660305338f
+DIST genpatches-5.18-19.experimental.tar.xz 69896 BLAKE2B a1028e0a5dd71507cb86a3d04103eebfb6f6bba5c539fe788f2d8569186b1c5d7045a1a68bf943c26e0eadb74ce9074899ce6ad21c633f5badb3167a3ebf8596 SHA512 52b47420a51b013d58ee900295f028be3a9bf8378368d1100f8cfa87c52f0f4e27c547ee286107d36755ad7f42aaf316669f7c2801bf38a9dcc8bd6de3581f46
+DIST genpatches-5.18-19.extras.tar.xz 3920 BLAKE2B ba251facf88903832ba28ea4a7619b2ebfdac8b3d507201cad624763523283936c2d8251a715a7e0bd8c72569b55468e2d5c43dc48e6b504cf5d3c024dc840b7 SHA512 40113011145749e3aab4d0ad23ecf2bdaec2eacbe8def70201f13c0208cb0aa142a4e7be8d484e3db3b31142defdea125fbd8f54f4e3220e15a10b4b4f67bbe0
 DIST genpatches-5.4-199.base.tar.xz 4683396 BLAKE2B e1e66ce10c436bb196a5890e08d5beb8d0a1ece7f19f8fb3b1027747509cc7b6102ace634abdbd299dd48fbc8750f3bc127abe55014410b1d558b4aec497f475 SHA512 8a16d67794e864749fdcdbf413ec0fe996d3c4fb5f04f8c8a2d3001377c8b5d4d7007a96efaa3590fd4b595cccdea36d83c6dc292629566e5398f322658d80f4
 DIST genpatches-5.4-199.experimental.tar.xz 16904 BLAKE2B 496602e26da272a8b58a61402eba0fc9871a96e78005014bd49b4e4354336269e17eeb6828a393c74f0d0cded080247f561a1bae7f6ed22c22d575cc12659ed6 SHA512 fb23e903b297b7660df9aed9aa3a7c94e100c2aa8061e7591823b4abbca82c898f2775b42e319908e4380bec45138acb44972e1f2d09927c96c141a4ba6deff6
 DIST genpatches-5.4-199.extras.tar.xz 1812 BLAKE2B 03b9ebf9d306256e58c895006038f4bb3d908590ef2f603487d9b970963c24acfbe78fbe862b2b493ab477e6e901aba332dc69916eb881fc42a79a62d7f81da4 SHA512 d100e876a9b64d662331d4a78b8531a71144bb70b789e0ab0b76e6957c368ee3a88025e040cd622dd4cf6e4da358a3636571ddf55b94e42dbc250a62a629baee
-DIST genpatches-5.4-207.base.tar.xz 4860968 BLAKE2B 66c74dd8794faca08608b12616e2e1b570f9615b329138d97dea9d708c448148340efdee61e892837aa47eabf3b69baf2b39ad62537e3b774b1d27a1363a2387 SHA512 254be29bd17ab2fd52a6dd84a317ad58677f6a1e821bafb5bc197b4cb819147315a23648b4f829989ee4a8318cb61f10b4e8b745d7d23ce2f395f9069a95933b
-DIST genpatches-5.4-207.experimental.tar.xz 16912 BLAKE2B 1e228f9b3edd75487008a903e280deac440b36c488d34d641c4acd104873e41ff905126c1d479d0c3f77553ce210ab9eeb967b1b3790916b2cf64c11b5e4c25c SHA512 78c0dbd343d92041310b09d39dc75f05708dd5de8818efd88177d163f4b43cc1ce17f34d4fa117b718e0c840575d13204178c93691b0c0a7bc2a7a96165467f0
-DIST genpatches-5.4-207.extras.tar.xz 1812 BLAKE2B 53da29109cf54563a505ea1ca636d5762c2030cbca87c3634efb2c0409345962f91be465e1152e9ad7c86e0def9a509574a90ad5316eb680bd451640409502e1 SHA512 f199548293ea31c20ddee22401afa48181ba5ff29a9bbadf6e6b70f3608efa94e2b2a8c1b82eaf921844bb3b50d5bf3be01f94d83218d821709dbda144c22149
 DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
 DIST genpatches-5.4-208.experimental.tar.xz 16908 BLAKE2B ae7e40749a5bf9e80bb0c417a735c1a29cf88131e60a4054cb3ca021911f35d37a1b4ee185a7fa1227a068ae7967fc27c3db817dfc84fbee462e2779cf99a02f SHA512 3afae20a8afc9795516b60cdac904fc7e60e234a57b8f77fdd2738a0b881ba80780b47b5ff4c42a26707ff2168e6824a72507bcbff262450f816dd006abae975
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
@@ -148,62 +127,58 @@ DIST genpatches-5.4-211.extras.tar.xz 1812 BLAKE2B 3edd098fdbae33053dad710c08baf
 DIST genpatches-5.4-212.base.tar.xz 4910124 BLAKE2B b09dfb8e041beb3ba5813e3f93ee02ef2fe3a6bb62bc4a9124bb19b74612ddca745e7066d9d11e520b6ab60e4a123428dae8e97ad28323e0d279173654a35f41 SHA512 f13c5f6d38e8b71544ee07dfbd049b611b8228d2eadb26225f0a3cb532c8aab2b321a52c17e11a732c6bbfc71586649850bb4c43b932206d7b5ce4691a0b9e2a
 DIST genpatches-5.4-212.experimental.tar.xz 16900 BLAKE2B e1b2c1cab767b4abd772ba5f4446b0ab83d3abe9929d8f1dd338e09e67bfa180cc8f9bd94cc61e3d900d341cb0d676f3b56c15888c6f17253b71e41729c066c0 SHA512 a99e4f97507ea699153351d65c5bcc89ce010ab44ddf7aa5ebe4f0ac3fc97c64919713b868f790b05d9ae6d1f6c86032cc0374b999d4a7bad093f787fbceba11
 DIST genpatches-5.4-212.extras.tar.xz 1812 BLAKE2B 8016640dadf0add8c91a6631fba836b97173243f900abac4c12e5ae19d1c63e19d21f25df2f22b2880d18cfcc83d002fce7014a26d9f4f3a4bd788fc084db403 SHA512 0f5e5f8b6ad6538bf6850c506019fefe4e95a36f7f568b0c5188ad2c0c06fcb904287452e5692bf63480c321b24a6bdb2db9adeecd3a181c7260ca74f34fb5fb
+DIST genpatches-5.4-213.base.tar.xz 4933392 BLAKE2B ce7ea84b52c60d4ae9cef1ddc3abd3f37de0ad5d7344645b3e4376db29d45b2acfe7b7b89e557c6265b4abbda9827fc68d4ef7c63eb418d3707166d7ed50586e SHA512 6107308eb5f3a0b1b079297fa7815a335620a2a0023250f1c4a92c84dfcf2ab7afea9388906e93fcc21d9ef85f350d638a8d245c29cca5b38968b71ce1a4d06e
+DIST genpatches-5.4-213.experimental.tar.xz 16892 BLAKE2B c2ec3c171e2e31a08681666b093c2f3ec2a8f613922d7a44861d54ef2fbefde5286ef2d1baf5c4fa8392a4ed70c7b1938041c4ffa6482700a29388a79cdf1a47 SHA512 f18a4b89c7afe9e276216717d4ff62c5a66ecef56243f0d28df3452f2dc44af0d2e5e8b964da86f245fceeeccc5d7daa3b1687c5f6de11df4ab8d3f1cb4ee144
+DIST genpatches-5.4-213.extras.tar.xz 1812 BLAKE2B b6812b7e126a55b2079832ddce8c9ba09aee71b8cfcc137c5d0e553a7878e9fdc6e57e64b3670123cb90661d52b3aa0818fbfb7d3d48bd0521c0a0f46ee420e9 SHA512 1deba84aabde4c35213ab38e0f40fe1aa696470bcd5a6f103635d0078726622574ebdbb5caeed7d1516ef45a326052b2ac9d4f6ef2dfb0e0f84f837f9a350927
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
-DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-sources-4.14.280.ebuild 667 BLAKE2B 3ff55d59dbe8db6e11ea6e26d11b952c0768218beccd0ed11272130bf89d6e0b7ffcd6c4f5a19a03691e54864bdbfd562ef568b3f87207014b9feab3f581acf8 SHA512 cae5148f0a4fb75380ee07ae10484b912a7dee5b9efac6e9dfbb0b78f1253cc378856bab37e36a39bd4ff91ae9bdb7c529ddec2f3992145a750804f91b89fba7
-EBUILD gentoo-sources-4.14.285.ebuild 742 BLAKE2B 7885bf89a76ace308cd833579bf29c01de5be629983caf6a80af63c276dfcf56eda6228719c3475e0d3d3b7c11361389829982e225fe285adfa518df839484a5 SHA512 9f6462451d42ed5860cc79e023b7d7c132f4fdb28060270a4204877b200c33478f383b50d61be45a48622e826dcbd91dd06e2d38fbd4b98cea7e605a04cf00e6
 EBUILD gentoo-sources-4.14.286.ebuild 735 BLAKE2B cc64bf6482fbec5786fee22379a605b0d75bcfbee4c9ced2e4040faab796ebb5f76989ffa2d203cdd33c21fd8cd15e7232565f27a8108759c75fc5fa4ef576be SHA512 dd4218528cb7e352d94182efc41b37f5fd6dbe5c3fcef41757a2ba8fe259c63022148820bb43f10a6d5529429ed29b30175428d11557decc6dd8abfbd3378348
 EBUILD gentoo-sources-4.14.287.ebuild 742 BLAKE2B 92081202a50bc61d79cb6364943cbd445f053c4b087e844b587d08c7435be942b47ac917dc74f95c34c16df0fc9a68f1cab783c498306ec019712f91ed17c6d0 SHA512 e4faf1ec75329cb058b665bab5ba970a58fbb289d62fcee9f5ec1b931ad0e177e40c582ab60580a37c29ac835c07de24ad88c105ce245d65e57cba4d52ad96eb
 EBUILD gentoo-sources-4.14.288.ebuild 742 BLAKE2B e337d3860428b6b165150faf259cfef4f5c91bffa2ec866d2d2fd3398a545a9791b61d0102f3b7f309a19fa1a1288dffd5020a8ac6c2930d95b0c684ab4bc573 SHA512 4ee3ab772f1fa8196d6841caa00a2f70d4d4c2689181ad2d7b73dfd775138d6feab1e4eb563cbb2b9fe0494c40e3556e46b98b6d2b9d47a7d16162b30fa95cd3
 EBUILD gentoo-sources-4.14.289.ebuild 742 BLAKE2B b55a8be09876541314117b1c31a1c764d8c866740ad3d84b4cef3ebdec40b587812ef7576b5919d86d416e05a329c1b1e7d59828e3ce260f3deea1558e698ac8 SHA512 0a76dc1805dead6fada507bbe1e66f88c75902db584070189c9178e501e3c0a4f92170c4ca1430368118ca1075808ac11058db286c6bf6b81245c5dabfa69588
+EBUILD gentoo-sources-4.14.290.ebuild 742 BLAKE2B e8605a14bfccbff51ffa3caa230019262257a80f0115baac81aba65a546f999d11ad1267c5d343e73e73bf0ca14e01fd9f8ce327a436374b67397d225f2cdca5 SHA512 bf6a0e114ae1b6589c7e5fe9f925d283197bf3586661bfe4c0ff6e84fb8664d95deafe3a1e5f93f9886dc9572814ceb80a5c54641fee173dee2a78c6eed8b7a8
 EBUILD gentoo-sources-4.19.244.ebuild 667 BLAKE2B 8f65a002b8a7466090131a6fadbbf7915ee482dc26889ad02d0370e8842bf3c0d0c201750b44db37760c17a0e8dd05a4c15ae2df89f47c6eba9d27b096a577d9 SHA512 66f49805f0496ee553b657280710ec5627c0d376b0105f7bb4888c3932063f9bcd4d930c725c5397ab3b35eb58479555415bbe19d67a41f619fec1511644e048
-EBUILD gentoo-sources-4.19.249.ebuild 742 BLAKE2B 0ac599e8e9a2b7a3529e24801d8a727c82c9f0e8bffc2d3ec64f5fcad66e9f69b4c0b1d2a42bc93a974186f6df57aa7bfe10ce5406612063a3fdba7ef54d1639 SHA512 15676e738c0af2012a41cfe9ac8e719099598960a8e8230f4de2d15b2867ff33e618ce89962c2da541b4939ea755e637e75e576547de38eee6840e43226f7bd3
 EBUILD gentoo-sources-4.19.250.ebuild 735 BLAKE2B 304e8f45e1eb1b6965bbdb6f4ca2b86cc3960f05254987c1a566012c9b3b11fe0139e55d5452e478c0df81a7c34bd9ef060d7970d62cc14cbb7a76d04a31db87 SHA512 3b409113cbfa4990c2e5d3a923888bf0d4e6306e169cd407446e35da6eaa7a9ac89f93c471f963c3e28bb0b264c676fa7db8c504d66b6afa231c95b673ead521
 EBUILD gentoo-sources-4.19.251.ebuild 742 BLAKE2B 9d3303e7a4be23a9bc760f7121ffd671a41affb8a4dbbe02ef8492cc413376d9e01d229ba613358b35697fbc418b05b5a3680dcacb8e9d583be650a69047633b SHA512 2073d2c9b86e372e28dc2760a4fdedb28406f64eb07eedcfd7c365fe86beda6b456a12237ab0a6ea3f2d17a610beb20e46928ef659625d8b5951b369deeb5bcd
 EBUILD gentoo-sources-4.19.252.ebuild 742 BLAKE2B a2ebe9471a2c8bd0660045da6909fa06d21734446d9c413a299f3271a171e99db76b8d62f57fc16213fc1dc6b95eca5a1f0436b2f35026de3a5e0889e5158c11 SHA512 f46bcf1872a291e32d98378f573b2a335f206632118d32970a7120d923b9aba1d39030ab576dedda40b3f36568ab90db070707b5e0802f1197e0a6c4ab8901a0
 EBUILD gentoo-sources-4.19.253.ebuild 742 BLAKE2B 6d1f692d30f3dba344b0a87abc9b46d17ee56ef2e645441efbaf821f105a563f6cf5c4574bf9c39b27b0446985da5aedbb51e8d57bb0ce077770efb8b22b2495 SHA512 8c39d2598447258279e85bda996bc4e3f3cf296706d09ec6b8c9fecfaa16dcfcfc0e2b24fd63ebd117b49c6b9475f365d3a1d14d346f6fb9a8a44e1d606afb9e
+EBUILD gentoo-sources-4.19.254.ebuild 742 BLAKE2B 18cf51ff0c61c4f1547448ed18016317e83347091cbf8a7e4df8e9c736fbe6bb3d2c52627dff1985a8283d2ef39e274b367d0ef6ed034a9a716a46d6b7e2caa1 SHA512 3d25b0812b9de3db13d046e92d7b7a9a468a2a4033c674bb6bd01b08de2612d77e10fbf33080bb11ca69e27ddde7dc250a8b51c3224f1923eef7fd6f64e996b0
 EBUILD gentoo-sources-4.9.315.ebuild 667 BLAKE2B 651b899c0b88c868bd88ced775d74d25a955dfb31e0dd021a9e0df02c7ac6f26fe6202890b83816ca8a8ec861c38feccb947cf7db5fbd1fb2dd508b785d7b3a5 SHA512 ec11490a1db1bd05caaae94f765831209fe68ec97c1df8a28d513c95a5dcf961675e905e3c57293a281230e3316c9485b600328b75e2de3333591c1b91e35f42
-EBUILD gentoo-sources-4.9.319.ebuild 742 BLAKE2B 9ce62a9a4e5d55ff60572bd7e82997e4de05cb02d941799361c9e742f331ad55b4ea33c0cac5dd4ef4af34d67f474d250c4349edcb41928f9859c50454945392 SHA512 b702f4fc142dc826b357cb1c289375af60b5faf9a8f5a8a8ac9b6efe07d86046ffaad79bd8d1104f5e99cb262cd8dd51b15ccb7c59286fc4e6796efc71bc5036
-EBUILD gentoo-sources-4.9.320.ebuild 742 BLAKE2B a5791186662053c679053148901a3c2717bdb8752771dec239da27e40feb6e20041d556277a302689e0cd290c6a3e62eb2f27a06a2ffa5150b7fa2f8b14ef0c6 SHA512 88cfb3966ed9b2594f23da503145a16b3edda08f7e407092ad4f75f3d9be9c598dbd5e6645e17f8a4797d0918fa5077d73202dba0737be900b3ebb5f10126145
 EBUILD gentoo-sources-4.9.321.ebuild 735 BLAKE2B 2a2690fb4e89b183b053feec0d4434af2a41e47d28d732fb9e61688b29003b304a01b2035f65b5dea594ad5fe3704045e9e1f6fdff4027dd54e3b1cd82734aa1 SHA512 7aa0f5dec60b9e6e26563a66c15e1ba213a9539da0c4d3e48b99e9e03f28c431940895c98e6882b40d2dbc535b6b0dabdf28a5258b4186a3dc88f920e336c569
 EBUILD gentoo-sources-4.9.322.ebuild 742 BLAKE2B 886e7c34a3d3d9b67f8e60e379f88869285057072bd8e0af85cd8e240126e7e3e24c015a20a4c173c2b981929d169f6251d1a719dd05e58d354c878c8ab13140 SHA512 40b514b5bab0e3d155ec5b65a74e5bff4c360711bfc5877f2e149eaae732a2e659bdcdbcf534d111372db259034fcdc2b44f87c7971bbd316bd2f488f6e9888a
 EBUILD gentoo-sources-4.9.323.ebuild 742 BLAKE2B 56c3e69dc8bedaa69c023094a58be3e7fdc305f7b0b51fc87b30d3e6b39b19943d02ee92c558fb4e0c79c17315bd1588b51941f419ea525505c258ef7709469f SHA512 6d05854370cdd93d873ce248ef08189983fe96eec4aef4a3b0c3b40dcccf7442219817ac1fc8526e15b9d1828b3809beb2d2d691751cd132d3c2cdc3229134c7
 EBUILD gentoo-sources-4.9.324.ebuild 742 BLAKE2B 6a8ed700a077c6415016714146eb744cf476e43fb7ff7c8e80ab6830b293905f063d0aa889f2627805d7b2055b037ea63c793fec517cc845597aeee7d84fdbca SHA512 44b0f3fe1ef8652e7dcd3bbf381651e0c60ff7f46d1bbdcd167dbabfe2c3288e251a6881b31a12f0935493214357ff224d62d84dc88b94d47bdfd0478efdcc6f
+EBUILD gentoo-sources-4.9.325.ebuild 742 BLAKE2B 87e872fb425c07a71ddaf6124257e931db9ea5c44d81054ab1049892cd77291627d55b30e71d3719b1312e791b17e37eddac3292e199be8a9e2873815a406fbc SHA512 667642cc8567c52bbaa8c27a5e3aff14a5717e1654681ce7abc8cbf9dcacd6d027888e32e36ab489bac5a00a1073b8104e5b0aad5c001eab29f109ba480a04d1
 EBUILD gentoo-sources-5.10.117.ebuild 667 BLAKE2B 638794ec57c82f72f14658cb37934f0c66dab1ea3b44e80a1f350756f43feff056074beea37727eb95837e769f59c248febd88e8c364e0adbb15933e84b64554 SHA512 b451e35b6e4b42dcbc10c4c06c25c68b084b36245f59cb463f4393759fe091f8e37f84f463942c5139c485e84571e769472a1051442e10c55c09d0072ccb9aa1
-EBUILD gentoo-sources-5.10.127.ebuild 749 BLAKE2B 5ed5605a616fb7158303af0b7b0ee306ebbf0140ef3a2a02fb109bd2dbc88842bb0c006ab7d70551535b85d07c4d625d603c3413f5c7ac653c791cc6c3c889ff SHA512 4df7f22eac034a9aff6b7f1b44b5e1f24392672cfb80e7d8951e19e695a643e9531e4ae9e9fc4804a58cf47f3ef2a04dfb900fbfbbff463b40a8c5647a3cf8d7
 EBUILD gentoo-sources-5.10.128.ebuild 742 BLAKE2B 24427c09689e5ef8e14c1eddc4a38dd9538221f2a9284e736da271667fe7dfabea725800e9401591906578a0f47ae6f9f85e067c47e0c64b1015bc04d0923128 SHA512 166d903f07230c7c7b2287c1b01a6f93332ea2f4ab2bd87cdc2a7d9f09cd92898603367a12b79c60d8f4478ac486a0ef4790a81dbe4ce4469c574c8b6503400a
 EBUILD gentoo-sources-5.10.129.ebuild 749 BLAKE2B f8c3ce5ad3771bdabc7b92e74e2a35b6aa0beaf9d9f6c9be13c858653607b623f3287ee6ce0fda82ec1e7f93e534af1d76158f2722da4d71cf21fcb02d922129 SHA512 26a733d2e3c4d3583c91caaef4dba26b878fb2364b404d5a4b3e011ac4f7743d176c696d36e452cbb96f10cd4a9228f9857d3daa140a148171d0ae9b41090f36
 EBUILD gentoo-sources-5.10.130.ebuild 749 BLAKE2B 10810e23b779de11d2f70e774fc81725e89a485b5905481d7c137ba4b35dac63b6d6d3a82106f55c6091edc6e9adfe0668ab8cd69b825aa64ea375db7eb60e4f SHA512 70127e2df6bbea8b8ff57ba2acc5f05940982e2a64c62073051a8ac8fbffd5690ebba1c43eee975dad52d8eef98838ea34df8389045a599cf792627a2ba05056
 EBUILD gentoo-sources-5.10.131.ebuild 749 BLAKE2B 17f8f743b95a36eac42f06dfdd1cb8abad5585aa279c6963e1082211bc69f5471fd7e37dfab00e4b766ab2caa0a353e83b056bdca9c4f099b25e82eada4e85a4 SHA512 61a3cfdf1ab154ab8478f8f919afa3ba8dfb57c759a690202b2d2dee17658fe2269fd4a8070d63557cb68209a15fa76ab6bb88f3dfced39256705c4d602d5f60
 EBUILD gentoo-sources-5.10.132.ebuild 749 BLAKE2B 6a8a4f0da48abc195626231bc6176998f2a1de32001d2d055091ccb797a686b234deaeeefc09867dcfc7ce17bc43cb686c21b53d472788f50b564934d3f164a6 SHA512 0c57f9c580e27c27dbd694ad4e72b8ed2b448588badcd7222d887df78d1681ab79c62a3de0d8a826e97e7534f0e53334a1fa22a5cc490e00af89f15270a795e7
 EBUILD gentoo-sources-5.10.133.ebuild 749 BLAKE2B 37573524d0d43383a0b02d04095dfcb32addb15be0e4b7e96cbc9ea56bbe4fcfb14a45dffd35a3e23bdffb4b5e662e54346d846290d0a7f2e0ae252e33f03aa4 SHA512 4e719af0af3225494c44ab6d987a1bbb65a3c71474f9e342c10cd7dced6eb74287e7e6d2bbdc7488b31e075f93b4b66d2a6098fb04bd0583122a1f61c676a08d
+EBUILD gentoo-sources-5.10.134.ebuild 749 BLAKE2B cbcfb384a75e395e35cc6da2847056a4182e3dfeb6e9325eec1e0c317ecc00c0c6e3b56b342503c6c9a8f19971107ff2a181fb1cfa5d90617739d6550370d0af SHA512 4f696bc98214d44a62ced8a7135816b5178abc9169ff03446054597f5fb93cfc65e4ec869ebabda53e08e8bdb77e6d4b6b6bb4ab6a75a8ba4dbec84262b7931d
 EBUILD gentoo-sources-5.15.41.ebuild 666 BLAKE2B 54a0154beb3416c7d8043c92cb51f8e844216d5e0ce8966dc7bfead0efe84af53c6a9fe5d5d381b46ff5744dfddd9ed00314d1f329141e1567882a6801d453dc SHA512 d2af7925054fa71204d0542976955f32aeee5002b6be5f4c2498bc1e8cfbf9603f87a0ea1f708f05b00fe73fdce3d12f7a4c54206bc255086dc45bad50a0bfbb
-EBUILD gentoo-sources-5.15.51.ebuild 748 BLAKE2B 0011235955d7b0b496ee4882edbe6964e1eb6d578224ac32fe69321386d373e1211b91ad28d829e013760c54d9f9efa9e98e22b6070f565aeb5c0a66101d7a24 SHA512 0157620c50d2a6dfd401b5d9282736852e536aa4900f02315d62b62dd77d0540d5ca0418ff4aaf6c9f387dc1ad5d3f24707f11646e815140cf6918dfd6aa1bbf
 EBUILD gentoo-sources-5.15.52.ebuild 741 BLAKE2B f0807bb2c48707668b147d0478dcb519b706283fb6c4e720bfc43148f3957a0007ced878593ff6a694df4389904539cd42c1328c9786b9fce24edd0c514ebd0a SHA512 d9fa36c265693a77d20a22009621785328078674f87173a831333f1c4519073a01233d9922eaf79737958e36d5b1f370a0fb4b2c877c3ebea018d1b4afa5d09f
-EBUILD gentoo-sources-5.15.53.ebuild 748 BLAKE2B 8741ba0a4d822d557c334683408c67bc00067c7c9bb6a1b5db7c80c2a1bbdfb5773046a899da346e8b7dc8f4d225abd32b9b8393ca4510a38502860566026252 SHA512 456df5470f80e81f1c6c3352bddaadf4a2b13e15ed74439465ebbb42acca9f5d3ff1c7da1935b15c5aa4b0ac1bdecf590f65bc1d4df582c60fa27fdff7faba67
-EBUILD gentoo-sources-5.15.54.ebuild 748 BLAKE2B c81d62582f0a42a3d80c13dc65ed85e45c0a5116d7c02ff0dba8c7bdc669e4b037f5a4c5543e6646b6d9133c0130e023ede137be715f7c54ddfcfc0ec662f196 SHA512 3ea22dc47aa3a5da0d8dc050255fa7161fcfe6dc881221e49959f05933578f944c027489ded510211e619542b401059317c853117e496d16b6159a9ef10abdd4
 EBUILD gentoo-sources-5.15.55.ebuild 748 BLAKE2B 3cfb357a78f45b9c6581470fb08d165325d26910e4ea8d0d5d590f9f0031ca1da5c9ad704585a7b911cf0fc0f1ecf08e0b34f1ea96a6acb17139efb11e9b13fc SHA512 a3ed9c831130d51dbf03e5f67f5d1404e1e7f66a8e7ed15936baf74473b68a3a1f2469c64b1b9f53b494854528612371049e3a196a21968b72a029d2278f1618
 EBUILD gentoo-sources-5.15.56.ebuild 748 BLAKE2B 5e4a558a375eacf1fb96792b20be782afc030857f10b18ae9542324539d73f5f02b91b116065d78e38fc1e5b277d5f4ff9c1c8b79a0e641c12fd5c41f5e084f6 SHA512 52bbf503e3f3a832fe94e89595847e6cf4241ceba422af699be0b02b8f8e9ca3588841728b322a248035176307b86bcb7f28005f72c82db3967aa65b9040978d
 EBUILD gentoo-sources-5.15.57.ebuild 748 BLAKE2B fe43897f265d5a390ef6bf37a0f6384087db25072c9ceebe6e47a71d4bea4412b28c54bea22aae1a7705c4e96ede3bef79205f73b7b59c304f969948a7b08ca4 SHA512 d0f2097a342865bb6d134edc8c1ca3fdd2e5df1e93295e1bd42295f62e9dfd12712475078daaea77d34043a34015be431d72acee0b6a1447cb56795b4129df6e
-EBUILD gentoo-sources-5.17.15.ebuild 742 BLAKE2B 09390111bf79b7d6192bb16fc2c27afd5e3d3446d595cae4e475770f84416fc4de320acbaaffceee168bcd0564377fa3d8bb9781c10d357b04f201e6f1e9897e SHA512 63aa56ccc9ca8263e44c96fd374187894f57d8baee3e6c1a70a679f55a6b26cf489f69aae648241ab414eb901fca95ba60b708f56e704c1240dd48ded28cbc14
-EBUILD gentoo-sources-5.18.10.ebuild 742 BLAKE2B a776c8acf62c71990205444dbcc91ee6497b129f0cffe91a46a656ce9d376299985831d32da405790c53f8bf332560fd10c2a5a389e8fb0bc076292d6835fa3a SHA512 7eeb9ffbb469c44d42769beda98c1afa022475b7fc55690b4d76b64acbe0ad884a288bce5b4da4e8baa9f67ccd762eb79c738218886bdf59440491995e8233be
+EBUILD gentoo-sources-5.15.58.ebuild 748 BLAKE2B ed23f67bf9e2c73ad823341316327033a57ac2bb4a9bbeccb48756b6c6deaa9b469c1569ccad46c06788eb1af6c36f3d32be8d01f76fe55d840717443917cfe1 SHA512 b60a984333d0847795c9fcf198e4ce546e29aba2a73d892960402d7e12ccdf9034a1da976ceaf514b2dd88c448f47933b6bb3d3ec1e3df4c11902cd1a4505e4e
 EBUILD gentoo-sources-5.18.11.ebuild 742 BLAKE2B 31d367e09b24a52e3bc3a9537ad829850dea730cd589626fcdd6209c3c3d2864bba9866240892d685a55132ea0f265604fb375337c0a8a2da5e99edb59d76037 SHA512 c9dd14bb7e31f6aee7214a74c8195f663dfac0db16f7fa01fc77cdf649171c2433157d1287c420120e6695061b9eaa97519121c97fed34ea7b400af9194d7ea9
 EBUILD gentoo-sources-5.18.12.ebuild 742 BLAKE2B 63381debe04b3b6a2550c64d745c5124c311a8f3372d32c7d1e3dde4134d1980f7b5223ccc40396ec2e93e82fb49cdee9eb72af33906e84507be8f62b0a199be SHA512 4f868b2a033fc7c1bf7f22fb03b01d6aa75c85615c4bd29c11df250d27fdfe2e9cb1ca675683e2172ab37e1b1b1fdb2ed51f0e439c58464b0c2e4380fc06c122
 EBUILD gentoo-sources-5.18.13.ebuild 742 BLAKE2B a1951a077001ae3f8fdba7d3adefe6cd3bcc1f38af0fce4d29f6f9ea1327dea7451fffed4e0491674da14f7c17a2edf67eaa9238196ae11163d3f66d4ed996c5 SHA512 64e6b0ea1ce3d41d7b78805db8b7c8f95d120ddf1ed0d1ccedc88faf3a5b1063b60c6c85c32b93e75166933471b2b1fafac9b6cef7bed99d597d516ab3b706cc
 EBUILD gentoo-sources-5.18.14.ebuild 742 BLAKE2B 12997100b81fee9c1bc6a048d189f68b66a312046e7d7daf590f6db6bf31edc774a5e882cab430cac09c49fac8b0b4c3396bb712d7c8b22e275528ea4f9dfee5 SHA512 3bba7236c8c24e2b135ddec3ec7e4b8098c9325332ff82930a898a4081aeb2a68f4d3f68095fde6ed9be44ae46b646845a73b3a9357caf49cfe6cc5d443ac2a6
-EBUILD gentoo-sources-5.18.8.ebuild 742 BLAKE2B 227a639a956829c3fdd0cdd4529ff974db99c58b36a50bdf6b81a162cd14f33fa3032815d4e16ac9abaa8e46e86c13825370a27550806b0687e45b302c7f040f SHA512 77657c173f204d57907181881139b199ed7e81939987cbc10254f7df31414df49d60f451d80e423558909e9a99ec80b7a07337a860128eec389987050bd808a4
-EBUILD gentoo-sources-5.18.9.ebuild 742 BLAKE2B 95e0f99a778f310f85ff86fd862bb4d418aa40a0c0230800f9a417c9e89827791a8e0d87a17d3d607a777172ad00650f8dbb62de1dbd98a47b3aa0c2de21b1db SHA512 3dd8b4a3c88451fbe76b85742c870d491ebac0a1bb0e9a1b28c10254b596abc79ac201f043d4e258322257a55290096c97dce2c8c1f926b35af8b25b8f287f6a
+EBUILD gentoo-sources-5.18.15.ebuild 742 BLAKE2B 09390111bf79b7d6192bb16fc2c27afd5e3d3446d595cae4e475770f84416fc4de320acbaaffceee168bcd0564377fa3d8bb9781c10d357b04f201e6f1e9897e SHA512 63aa56ccc9ca8263e44c96fd374187894f57d8baee3e6c1a70a679f55a6b26cf489f69aae648241ab414eb901fca95ba60b708f56e704c1240dd48ded28cbc14
 EBUILD gentoo-sources-5.4.195.ebuild 667 BLAKE2B fcdafc6d942cb657315e9de05f6b8f479bcfadadfd7427fea2dec8459e440d0b32363ef70564a62be1f9368d3c666b30cdb9307ce430f58b23e41ab606e46fd3 SHA512 1bc0f17971e9a6335299b27c0841bf56b3b82369ddad474ddaf762a373cf4f66f47a7f2b9bc5bec01197da4bdbd21845825a802fe1afba134eb5b454e276557b
-EBUILD gentoo-sources-5.4.202.ebuild 742 BLAKE2B 10708aba18cb6fbf67640d80fc0cf568a175c769733839ea43a89f4e40697ec7c752c07d93d430e87230491cd36e2e91ec1eaecda3bceeb1c0887b48bcac3b79 SHA512 b8bf2d4a2b9ae58729fafab56661e9aa06aab067e805ea8c28700043b3aa79884065d6637206aaa42fe799fd11d1da428e1c5668bc5cad95763090cddd461318
 EBUILD gentoo-sources-5.4.203.ebuild 735 BLAKE2B e5c80c672c24f56773e209717e53d70cca3e06956a698e53faaa720b5582266cb98ea3c449f50a6e195325770308d5cea37cc4fd75150be3a1f4781a8e81377b SHA512 c569b36f3a3c722113355b307dc89ea86b1284507c7f152136bbc2fd37aff1cd8ec30f3ae2a8b59b4f773c51ca5d113dc8a9a91362bf6b45750d4de384710539
 EBUILD gentoo-sources-5.4.204.ebuild 742 BLAKE2B c1901b9bca3aea2e66a1c297f944513912c73ba0fe53bb978c7c165d247153ccf9edfcc4fec1fd38c7f2b77e72feae595bd802a6cb90addad5303760682123ec SHA512 8a3671c0bc59b64ad979088397a0243ca687cff145a03dffa612b57f26ea2657cddc3dd756b44609cd45485ba179c8cad20fc3e0a4e3f3e32c40bfa0e828428a
 EBUILD gentoo-sources-5.4.205.ebuild 742 BLAKE2B 55b01acd03516a5b17d1887e9964a350390b0ebf697b2e2484088e34d415c3be4e57accc27f48f4e93b7cd3d201580baa592fa219d54d7d8cd014120cc60a3c6 SHA512 e9e6ce2371f2de20d4cc897a62daf67d047215f7089a892beea49b89c260b63945fd827465788ee282b2595de626804145f8540869f9c8a2245726d1bccf43cc
 EBUILD gentoo-sources-5.4.206.ebuild 742 BLAKE2B af27e3794b3f997453cf7d7175b5c38931464171b27aa86d27e27124db8fab9dc079d073ed5c8cacaca87ac95c3a4ddfd97c4b6080f446c5793f5ae76dc3d6e0 SHA512 cd771f3bb727a2aaaa30894c5624b5182d9b0b3b2c62eb50da0dcda5a5e56b36b25ebe0f682d29858f3ea104bbfcc03ef3cc4a55b44ffca614ffdd081590715d
 EBUILD gentoo-sources-5.4.207.ebuild 742 BLAKE2B b5a8c155ec257156c8ae778975984148ab822a7ecea7f0bc7b2f7981196b8c041ec269fc4eed5ca6523e598de27a3139c7b1af510ea845634e7068bef8c67734 SHA512 7045fe59665fc834786d30b8d3ca5c590f9123f12cd526c7f0a90990875150c5863b9d1b583aca72c194a9b0d99b50804df96455dc11ff8dd9e25188a14633d6
+EBUILD gentoo-sources-5.4.208.ebuild 742 BLAKE2B ca48ad7e69dd84499ae520b707fffc178034f61126d4f59cf8c024b8c4c87433017f020f351b9cb2afa7f64e61abd84252fee59cec110ef6b126b1e06fe12e52 SHA512 82979fb4388afd800e528b5eb40e8a12007e4e20af55ff7f458818b7016ec306184a3f207bae9e9fa99f97740335312d397f597d900258e8f399236b2ee5a778
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.319.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.290.ebuild
index c6406efd2f4f..a1bf435a1589 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.319.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.290.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="322"
+K_GENPATCHES_VER="301"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.320.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.254.ebuild
index 316c6284e890..84d720c6ab63 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.320.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.254.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="323"
+K_GENPATCHES_VER="253"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.285.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.325.ebuild
index d087ca298869..55375c323faa 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.285.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.325.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="296"
+K_GENPATCHES_VER="328"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.127.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.134.ebuild
index 7dbfde7bd0d4..3095e0596d57 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.127.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.134.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="136"
+K_GENPATCHES_VER="143"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.53.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.53.ebuild
deleted file mode 100644
index aff330b1ede7..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.53.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="57"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.54.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.54.ebuild
deleted file mode 100644
index 8e3788bcc275..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.54.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="58"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.51.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.58.ebuild
index d4f4d9dd46bc..32dab095f1ed 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.51.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.58.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="55"
+K_GENPATCHES_VER="62"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.18.10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.18.10.ebuild
deleted file mode 100644
index ea5d108c44f8..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.18.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="13"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.17.15.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.18.15.ebuild
index ef8c1b6ec4a6..ef8c1b6ec4a6 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.17.15.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.18.15.ebuild
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.18.8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.18.8.ebuild
deleted file mode 100644
index 6f21e009336a..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.18.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="11"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.18.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.18.9.ebuild
deleted file mode 100644
index 872ba20829ac..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.18.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="12"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.202.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.202.ebuild
deleted file mode 100644
index fffcb5c755a5..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.202.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="207"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.249.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.208.ebuild
index 76795046c636..1de7fa9856c4 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.249.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.208.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="248"
+K_GENPATCHES_VER="213"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index aaaea022174a..3e51b8738594 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,18 +5,18 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST patch-4.14.289.xz 4832540 BLAKE2B a4618e32f4f96b12d8971950bf96d9b592db8cd11f07357b67d90ce9405282c4148837d0b1e507ebe1a6f96bc43b99b7dde4103030cee1c7e64cc2030f194f9e SHA512 adad95e9e6a29fb87bce4e87c2e9e63e79341a87bf88bae492a633c6ea73dfc02dfedcaeb0328dc0cfc3fe0a2cc33b398387be4020cde15f6c74c0327e599f9f
-DIST patch-4.19.253.xz 4758396 BLAKE2B acc1f07c337070313f5110e68f08bd4826513c00c2fd9fc7dc41c5f0093f6293ef613a5909d0bb60f1d1ac1aff581b914f997527d59c558aa8d5d4eb43beb3df SHA512 42a8569a4d37e78d0977009f01dd84095aad43555d311976d29aeaecdbb9d6bfd39fd106d73ae0bb7c186881d932c60ec43159709b32249acac7e5bdbd4b4ff9
-DIST patch-4.9.324.xz 4423456 BLAKE2B 9ad4a4fac55c0d9b5968f9282bcbaa8476bc5940941db3522ba94b402ef7adad6e3c35a0190097be796f09f2448ae4213b91146818f4204b49d0f5ff84c8c108 SHA512 4f6d5fcc92c557f7c03a5f2da2bebbf8f753e6d09b4b19f9ac5ca3feb25760cd1dd9b6421d50a70c8a6b533f410e5510cabf2df2230667140ad4e7ff1e1e9c6b
-DIST patch-5.10.133.xz 3462456 BLAKE2B e0d778491b5259ccac9bf5de997b4eb7d74b79024bcf0b03e6c81b6e66873dce1e6c014324815ff504e568bc4bfe5cf1d63e5c343197c267b09e35ee560905e1 SHA512 f193eb85ba720d6ec055a7535430b8bab0ca226e699a8c773bff460cbebe1e05001ef45e413b1b1f9f94314f9dcbf2033ace8b579fecc60055af70fb7781c25c
-DIST patch-5.15.57.xz 2273008 BLAKE2B c37438a609759e5d6b7bcdf54081214c76abc6497b3c3768c8af1ed90125360d0afd8f0330f82182d1b887575da1c9d8f0abfd86739b31817f1765b2670014b1 SHA512 4c1c4cc9d912bfc933c72198994abcf2fa0fd72110294f29966f8efc6753437b9d37df3d25e4cc05d47ca7c8893debdd8ba1d3f2fa8a5f64dc2093479078cf6b
-DIST patch-5.18.14.xz 682416 BLAKE2B 6d057b4a007ee308748196f2244a7ea4eb8fdbc3562063a0e565dc4c350d75357e8976e466d8b3f4bed4ba0cfa14bd6d91c11b72d7833ebeca87b27203856806 SHA512 b19f56ebf6bc7641ec565f0cea001dd4a0fc67d3e8bae642b732f1f76fbc43519b8844e2a9178a435c10e6226dce1fd11fcdc9be6cfcd76043bf2b58d2fbb92d
-DIST patch-5.4.207.xz 4110096 BLAKE2B bfe6cf2d363ab8d672f5ecee6a2d57551df52ac5158158b7fc161fced3cd513405723fa869ed39ab0f23d99b082ea68cd535ec235c3adf8186c79998831b5c61 SHA512 6d1f771ac4db79b69d1e8ab281ce21654d25e3ce6082f3d01dfea15a60928f979672b60ee1b028df337ea94b6e53f7cfe91e2a3066d607f12b1c4f85652fe1c5
-EBUILD vanilla-sources-4.14.289.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-4.19.253.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-4.9.324.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.10.133.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.15.57.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.18.14.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.4.207.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+DIST patch-4.14.290.xz 4840940 BLAKE2B 0f799c4b4deeac7ae4b7e16fdf62e46ee066a50d210c5bf7fb44acec872f4605f3d223314c3de192151dbfa5aa80baf1a96db28d5dbf677d933ee3e88e73916f SHA512 43cd1ae942a35e93aa9bb0908b3487b690cf56a0a2c611505a386019c82cfaaa41d9d50c92ebb7d173ec034ac06f10349b6b24a0f5b0a37730531c328daeb18a
+DIST patch-4.19.254.xz 4772260 BLAKE2B 2479d9917d447db6aec55627cf1a3f96d7947ded724467e5bcd18a9a3341e39a55dfe2603b4138b961c8c01047ed61944e314dd029780d49581e33009634e2ad SHA512 3e4fd2c26fd3cd9826915afae8a083a32c5a4921559a839efd23fb42aabdac2b0892963469268a691236a147e002858343b2bce62f641103f2280a49febb5c37
+DIST patch-4.9.325.xz 4429432 BLAKE2B cd67bc408aac069e89ea26d29cea69745dfabaca24d875323f4354204472e70389c0e0bdfac4966a11892b626088668bf7a1d6a7a6e355550806cca102699e38 SHA512 8e673fa0f2f69cde042e781fa9b2e6940e91faad8c5503ff5eae021680a1c6eb40f3a516fbb6728298887ad22fbbf50894b6a0b039672118f27d3200d45d7749
+DIST patch-5.10.134.xz 3483008 BLAKE2B 1987b65d3c91a7c010e351027034e2bd87f1eab89aff6a72877d09c4f5c9e852956e1fa28c671ae6ef857934f87628ec4b259e6c70073b6fcaf42cb9e51c96da SHA512 fba6792bc4097b9d19aebc378df8bd71f95eec35b8bed59dab761fcad0e92a1b112683a38787f7b73bf4849dbe9cc82eb7a88cc57f382ba12da16210d4f2a56e
+DIST patch-5.15.58.xz 2333904 BLAKE2B 34fee56dfee399544aa5f9636e467c2963946b1c747c56c6b22000d52740a5a6aa85bb8124d53d1cd75c1f668087c16783feb928be451993f652a0d3247cbc24 SHA512 5c3fca3f9b971a107c0e0ff609774dde5f01ed7ca232e5dad6694c37c04cbff131dfad1cbe46f009008cae5870f5e611e9a8bb725ef84611c78c248567c413c3
+DIST patch-5.18.15.xz 733348 BLAKE2B a10236113f6aa1db023e1e7cba172248f8e0583ec2da47bdf6b19054aa6c11d7cbd3a091c3baf1e9de87c048fdf01d321f4abfa38abe73d3505034cbf0415c8c SHA512 822f64afdff24be0148c161e7465d859e1e2c200295cbc116550469cc5e5b3f9e9e5a6ecb0f7dbf684695eaeabda3a6abbf5734bd89e2a20d4d4907d4020b3bb
+DIST patch-5.4.208.xz 4132432 BLAKE2B 6df2ea0554c63f923e5bcdade065dfb170e061eb4d4c7994e9a7943364bb0a0b109d3672777371e638bd77f8178937c12958b8bef3fbd955f046428998768c8a SHA512 01ee61140ff11cbaf689819c224fd9462660058063e7601ca85cae60fc361a84641c0dcd8aaf5c8ae6cbb898d36d6b5dcfd2e103edde7fa7199358bce83f9da1
+EBUILD vanilla-sources-4.14.290.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-4.19.254.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-4.9.325.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.10.134.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.15.58.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.18.15.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.4.208.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 MISC metadata.xml 340 BLAKE2B e283ab9d2ebb7212e3ba37850c93761f165b4697a2ee6dbf07a67ce907df8ec71b3290a411cb81af8d8d8869b7e45c572487d4d2667dc0a0971986f0f6d1aa8e SHA512 bd0f7f570230dd5bd9f6e270345a3ebc556eb2dbcd19b04e33b5c6df8d9e6735a6e23fe934b39d9ef130ab5e78c6fdd29d7a167cb8ee4ac8ce919c75cec7425c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.289.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.290.ebuild
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.289.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.290.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.253.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.254.ebuild
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.253.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.254.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.324.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.325.ebuild
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.324.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.325.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.133.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.134.ebuild
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.10.133.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.10.134.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.57.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.58.ebuild
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.15.57.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.15.58.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.18.14.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.18.15.ebuild
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.18.14.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.18.15.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.207.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.208.ebuild
index 39693afef068..39693afef068 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.207.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.208.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 8231ebe7878d..9f1ad9210016 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 537a712b1713..c41ad1682ba8 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -1,6 +1,7 @@
 AUX ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch 701 BLAKE2B dd2398f9e1fa39bfc3de89928dd3b935fd6ee9db4bc2c4e381ba5672098ae9209b2d6e475fa2549a9cef2e3ce5e9a789557413fbdb1bbd68842cca89ce1e8094 SHA512 35ba295d94ab5ce767f39c4cd5eb48d57a6e4993977013ee6ae0d640f74b5437a4dff6f1d14dc44dbcdc25d4e51e5084b0e3216353b2af383d8f544993228170
 AUX ldb-1.5.2-optional_packages.patch 1441 BLAKE2B 0b9413cd9690aae2b2eb26f097d2509c0bbe0fc59f81bab22add57ffe0c603a8fb0c9be038d06693dcbb1d3817d4ad97a5931120b18bd9783efaac599fe0ccbc SHA512 2f313c3377385279ca3da6db21d926df0559d971e1fd42f8cce57b4001078c3817f472b85088a1f3b0e5ddcdfbbfd943199485d6e4a00412f62c883c6ea04afd
 AUX ldb-2.4.2-skip-32bit-time_t-tests.patch 1308 BLAKE2B 1ff687160b92c5395c7838ade8af32ba77637a2b18153d146b9e1496f96ec9c411cc5e5f9721a8dea1730118e6574a091ee7fd1edca1830cc54c5d4fddb007ab SHA512 27a35123cb9a1f6e39b88c91de8241ecfc0f0ed125a235ba26b95767dc3121d176b267ba97b1579e5b68cfb9e3879f40326f0163a31e311f01a1b2eb7751caf4
+AUX ldb-2.5.2-skip-wav-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f2a60f52a64f181b85c227be6cf9c9373a64528afbe4e9db1970e8316d5bddf76ba9395a75b194f27bcf25eb4d2e7695c5530eb SHA512 19028447cbde09a425f1a07fe2d9a2a6f16cada1785e6e9684a8b573db5705b6694a29cd6f5480047360920562fcc654fc10faad39e73c565f7d475558cb57c8
 DIST ldb-2.3.2.tar.gz 1718583 BLAKE2B 48b9fb77e414af0f9fffe0cda9cf49971d79ed8b66213b01b73f53a61969e03f9e6426a04a33ff70da906c814470d8fa356902a68aa1169d969cc597e8c234d7 SHA512 be324e8f20db50529634548451dbc5f95f26a701e124bfb40ae2b0a5069de78b7c5c1a66222097209ea24ef6077373d996e67c00257a5a05198f1b81bf0ed53e
 DIST ldb-2.3.3.tar.gz 1719542 BLAKE2B 2a5cfe3ddac2054d167c2857e0cd92e0f88d2c196f9285c029b2a525d781025a956a296bd6d793b65f848188cf7adf70f99542999061a85be473b3fc3b2856f1 SHA512 ffb50208fe971afd544a431b79905ec8fce67d78d20c3fcfb8345a56f3b278fb664bc48079d7239a8ca5b70aae8b32076b6007cb63e080cd536e9fe458efeccd
 DIST ldb-2.3.4.tar.gz 1721000 BLAKE2B be54c0bffdc910029b5e324578ed2f1e0350dfd19202749cb0c05dff20f3786d0cb612f18ef6f9534c7e34e94c0a283adb3dd935ca3c3252aba0290faca590ef SHA512 e0128a0e36411424fbb092ce24f503f530d0bc75dc98f31e0f457df34c3c2c01c23456d55722eca9965ff89f4dec5cde36c1dabbfaf3ddee536ff4d1dedb1c1d
@@ -13,12 +14,12 @@ DIST ldb-2.5.1.tar.gz 1736209 BLAKE2B f06df9878ca664a456859464895e91c21da55c340e
 DIST ldb-2.5.2.tar.gz 1730347 BLAKE2B a0d3a9ae02f79c27b396314b804195ecd37b8bcd843fb94f9813a69fb15773db94ed2210f4102e395333562c2dccebabde1c2dcc0c2fceac97dfa31b2ad97e3d SHA512 02ae1246f99d9b6d6b33c5030488aa46c6abb535b4da4b13799a62b49d32c490b7c088ef41c0bc5a1b2f7263c680faceb8033827834cb6f66916adcdb5be421c
 EBUILD ldb-2.3.2-r1.ebuild 2942 BLAKE2B d2495240018b7ecece8c88092c30ea64f411ea0f073f0ff2404ca6184fe931ada8342ea3beffd710fb0d3c137174cc01fba37d73d7884ad11edba84855f2ae08 SHA512 8711a2758689c818b66af5548af9881cf217839d5ea951cbcdbc83531ec602a9b39e1d2b12e8452e60691f09ef4e9db0d0d639e7d4a45d16cc7e75db583c714b
 EBUILD ldb-2.3.3.ebuild 2942 BLAKE2B d2495240018b7ecece8c88092c30ea64f411ea0f073f0ff2404ca6184fe931ada8342ea3beffd710fb0d3c137174cc01fba37d73d7884ad11edba84855f2ae08 SHA512 8711a2758689c818b66af5548af9881cf217839d5ea951cbcdbc83531ec602a9b39e1d2b12e8452e60691f09ef4e9db0d0d639e7d4a45d16cc7e75db583c714b
-EBUILD ldb-2.3.4.ebuild 2950 BLAKE2B 2600cdfde710bdd53589a880e147a9ee57a43d30fc9ab1846437b0eb7ed0049236e95a3e89af2674a51568ff950b90e87ea052535f274000e0cfe0bccb9b4de9 SHA512 ac497d128ff2fb368991f9aba2272366427022d07438ee5af57381cd7f53e6e4a067e53c585d0dfb4e4bf1851646c2e0634289302079aa413ba9fda32a22bd7c
+EBUILD ldb-2.3.4.ebuild 3005 BLAKE2B bc5b406e3df600e1967e684b85597830afc2e0d7d200b8af1bb9408f367b88cc0675c2fac5ff23132a3ef0706278caa8088f2d21b91f227bf24a59a68eca0e86 SHA512 abeeb41495d874dc66bb56c13007e88beb2fe5461cc379f555b82e71adab9fef15afab53870a986c65e25ab6ff7801287fcfe7b99b146e3ddecbb29ca9660e28
 EBUILD ldb-2.4.1-r1.ebuild 2943 BLAKE2B e96f5909024e90dd48096bd1a80d123460cd86c6a1743372992cdab7ed758f0759f889f558ce999cd493b625a231f8185852e18cf678f086bc221a61f895e887 SHA512 60ffaadddc5007e6c3aa8cbad369b20e5691b26ed163e747196cc7c1fb40ee74477ea00e022cfd94ff69eb9c911aaa51945d793913aa3056321b8026bd38bb66
 EBUILD ldb-2.4.2-r1.ebuild 3000 BLAKE2B b792c10c41f0f6aa6e05ee45fc59bfb88c7bdec2a3e6c191a374b387e9b4d169b9179fcf698e8d0856b4335dff27741e1d6873a013f298faf3e73889a7210671 SHA512 a9b6fe64a246d67c6193a2d14377a479a4dca9c851b9c183984c217dcfb32a0a5e15bf32ba5f373eb6aa2c4d106c2403f11c39123685ddd001c93072b6cb3e7b
 EBUILD ldb-2.4.3.ebuild 3007 BLAKE2B 543d57e1e3e50a57fdde0a15003fbd04990b16300df7e38b0be8021549f57e2bbfc30417a81b8519ca47d236cfbf3be3bf10d8dbeeff2b5d06e575ab9acff22b SHA512 71027d7877c6af0db3b859aa3271aefb3e9bb0134d732393e5c7d6a2b14da9a55d255fac0e04de271caf269a9d627f4203a932ed13d74137558d1c7adfcccc51
-EBUILD ldb-2.4.4.ebuild 3007 BLAKE2B 543d57e1e3e50a57fdde0a15003fbd04990b16300df7e38b0be8021549f57e2bbfc30417a81b8519ca47d236cfbf3be3bf10d8dbeeff2b5d06e575ab9acff22b SHA512 71027d7877c6af0db3b859aa3271aefb3e9bb0134d732393e5c7d6a2b14da9a55d255fac0e04de271caf269a9d627f4203a932ed13d74137558d1c7adfcccc51
+EBUILD ldb-2.4.4.ebuild 3062 BLAKE2B 815d6ddc9d3c4d674545fe4b91bb49d17ff4ab26e013057550cef98bac41ab46f5bc7c125fef4a1c01f9d7dc108dd6fe31f3827ca27283376071046ca1ca4399 SHA512 e59137d185362a895eac41b7e80a36f63751959b06b7d52429b1b28b14b1dc62f551cc5236983102a00589bf086486932e6b546097c2e265db4a2f6242f3093a
 EBUILD ldb-2.5.0-r1.ebuild 3007 BLAKE2B 0abb5aa964f1b945d2bddd1154421bf35d24e9fb78dde2b0ae34b4495326142dbda601c1aa2579bdfb81face8bf6072f0dafb676524d2aa3c1f2e9947c7a9cf7 SHA512 ff46752cb5c33374665b52eef69398821f7c463deaa1a5c8c05115b94fb97cc56c805df49826f09ded208adf91a50799fa9f43e878f36291676ff7e2c9f917a7
 EBUILD ldb-2.5.1.ebuild 3007 BLAKE2B 170849834a556b081cbc072f591d766eaf65d930165d3cee11cc01de81eb8325b15cdc8e4e2abd083e630f6c956bf70140982172c360d0f49c1a818d8551cfa1 SHA512 62f423a99c35d367122e6edae52aa76a387d569c824bd2cbf4b4c22221be655926b3db3e7b5d0230b7ba34c376c9a274feacc78855e00ded0580f4e1ac605a93
-EBUILD ldb-2.5.2.ebuild 3007 BLAKE2B 170849834a556b081cbc072f591d766eaf65d930165d3cee11cc01de81eb8325b15cdc8e4e2abd083e630f6c956bf70140982172c360d0f49c1a818d8551cfa1 SHA512 62f423a99c35d367122e6edae52aa76a387d569c824bd2cbf4b4c22221be655926b3db3e7b5d0230b7ba34c376c9a274feacc78855e00ded0580f4e1ac605a93
+EBUILD ldb-2.5.2.ebuild 3062 BLAKE2B 37a460f7a8682d39a51097ff90f1781aaf61eb6ac269b03d0b4468694375e3de2ea4d308ec21ac9879ae20c3b55f64c7ddc7f5a5c967f5de3e8495e3a116796e SHA512 ce49c8f7af069f0f1d04a85d364ed4d0ee721ad1a89a852890de69da71de6c2c344c061d61ee073fdc28ba7a8bbd48e1ac8f2f3d6bd17dca820927be45e774de
 MISC metadata.xml 526 BLAKE2B 004dbbf0286ced4bcd404eb3caf091f973e67e00b9230d2399f07dcb31d93a423045b353c1813958da151cded2f52996608de1b4294e3cb90cb8da0ac8877f9f SHA512 9f8008b5b57e5f73e79df68d828f1644edb0a154fa97504c3088301aa60e6ba3ac83a2e06d55d14c06cded89196dd635598f1d767ca93398cbf9610af3b49038
diff --git a/sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch b/sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch
new file mode 100644
index 000000000000..4578435064b0
--- /dev/null
+++ b/sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch
@@ -0,0 +1,12 @@
+--- ldb-1.3.6/lib/tevent/wscript
++++ ldb-1.3.6/lib/tevent/wscript
+@@ -34,8 +34,7 @@
+         if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION,
+                                      onlyif='talloc', implied_deps='replace talloc'):
+             conf.define('USING_SYSTEM_TEVENT', 1)
+-            if not conf.env.disable_python and \
+-                conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
++            if not conf.env.disable_python:
+                 conf.define('USING_SYSTEM_PYTEVENT', 1)
+ 
+     if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):
diff --git a/sys-libs/ldb/ldb-2.3.4.ebuild b/sys-libs/ldb/ldb-2.3.4.ebuild
index 85ca63eb5be2..0730a2c090be 100644
--- a/sys-libs/ldb/ldb-2.3.4.ebuild
+++ b/sys-libs/ldb/ldb-2.3.4.ebuild
@@ -53,6 +53,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
 	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+	"${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch
 )
 
 pkg_setup() {
diff --git a/sys-libs/ldb/ldb-2.4.4.ebuild b/sys-libs/ldb/ldb-2.4.4.ebuild
index 54d9456e59cd..05b4d0c727a9 100644
--- a/sys-libs/ldb/ldb-2.4.4.ebuild
+++ b/sys-libs/ldb/ldb-2.4.4.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
 	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
 	"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
+	"${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch
 )
 
 pkg_setup() {
diff --git a/sys-libs/ldb/ldb-2.5.2.ebuild b/sys-libs/ldb/ldb-2.5.2.ebuild
index bfd7de97a612..c723951c9d16 100644
--- a/sys-libs/ldb/ldb-2.5.2.ebuild
+++ b/sys-libs/ldb/ldb-2.5.2.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
 	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
 	"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
+	"${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch
 )
 
 pkg_setup() {
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index cdd4f4276c7e..dfe0087ab72b 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 402c9478b95f..c0c56c73e0f1 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -4,8 +4,10 @@ DIST glances-3.2.2.tar.gz 6861708 BLAKE2B 99ed3298724a82f036660f05cfd374f8dfa488
 DIST glances-3.2.4.2.tar.gz 6914758 BLAKE2B faab5df2689477c5b6df047a2e0d03b09981f064d13ece4e66bdabb816168e035771ed7fd8863723b57c88f47d42674ca3553b5538c0386eab32516fdc7e2a1d SHA512 74d495303b8c0e421a2139167d998c56adfb09434f72faf34c46e0be07087c0a152a1a637b62badaf3b1934ee7892c1a9e205c260aa10655b0bfff91491fc5e1
 DIST glances-3.2.5.tar.gz 6913167 BLAKE2B 8dc96e59f3cfd624211e0e30d5c5c5bc790a2fea62cd92068bfb779048d51fd95e6c83e62fd70ad2d1e8450435616803e01f7434d419b4f4187ad41fc193121a SHA512 ebff1cf893ca4d3e490f4a6b72fa70df0afb4c36ac1b3fa762dcaa47206bc1e613c8d87f1b2fc5cae27636612a89b417ae91d016a129da4ac43a2a8a6f913945
 DIST glances-3.2.6.4.gh.tar.gz 6950769 BLAKE2B 69437cce71640c4291bc9f91a6c65a05d608e91e834193fabb5b66c4a5fba92238a3aad3b972e71e8e4baff6c92045d1807e65bad43f1318a7cc077c89c4f978 SHA512 21e2a6dacd2181d9b84927365425d4cf7767b73f92949e778c42db68634cf655802c371418c51265c89099bbe11ed130e4b74ca0605601b7703dc0ee992f5417
+DIST glances-3.2.7.gh.tar.gz 6950597 BLAKE2B b76632787d39cb0f9388c00cc5838a9f553020b7ce1b502f205bbbf2255d7e2e02a2f2d629a84b23951b02a019d20b121dea7ea2cb7dec0a77b7c88ea4679cb1 SHA512 12edf99cf30c72a60eb7a604bce99bdac3ae290e910d0b88fc0b8b99045512dafd8d39bc61e8c768191335727ee5e2db4fa7d17ad92f63e849413a233c2ba5be
 EBUILD glances-3.2.2.ebuild 2642 BLAKE2B 30a1aaef83fceaf8a536e2f40e4700cf855efdb2ea6cdba7411143517e2c3bd56eff810e07f7c1322c1c7f073b9b15568df6e56b4c0d14f1d4bd35c2303d4db7 SHA512 638160f58f8e31cf1eb608171158147273be704f91c059c7208e51b2ada1c26dce54bec973d8f335c40bd8cb923027709f3e74fa48e208b9bc9e493a2b03a71f
 EBUILD glances-3.2.4.2.ebuild 2773 BLAKE2B 9420d6174eba92da6520d2081c57c5f7e578bdd76860d756ee44e28e246a436c3f0634a3a592bfbad8c5250cd7dc4bbe8b1551ff38c0277238c0a7b2bde736da SHA512 4777bf73f12df1357bc690c9a68c1431d295224e51b553d5f889d1ef2c2c5e2ba18077411a3308b2195178df36d4f5be943de2579ff4ec11bc0f3c39564651b3
 EBUILD glances-3.2.5.ebuild 2778 BLAKE2B c477c2be17d127a40c57cab8b941fe6c88b9897582b464ec160deeb37bb044c187b9ffd2947c1be4e0036461356b87e6f0facea8901102b0cfa93fb3bc2335f5 SHA512 1dd0e5abb860c65f28b7a72a76b60c37b1d3b3a6de8e59548658f31133bfabe8796f13d4adcd3a5e6b7434309739849952420d5b3bf292ae5b2dca84e1406a1a
 EBUILD glances-3.2.6.4.ebuild 2788 BLAKE2B bb19bf44bfda45cbcc09f8c7732353a23067c0ca7b66d2e18f705bb3d0f4c1c0c029f7aa1f5317f35bd03485988dc50a885e645a676898cea952940e8ad08c13 SHA512 439a8382b5ae247347befce0abcf088a3e1dc184ac372dab4d17c4fa14d83afa23982b9e86e44f233a1b9ecdb5f7990f4492032d38071011615ec31f749b2842
+EBUILD glances-3.2.7.ebuild 2788 BLAKE2B bb19bf44bfda45cbcc09f8c7732353a23067c0ca7b66d2e18f705bb3d0f4c1c0c029f7aa1f5317f35bd03485988dc50a885e645a676898cea952940e8ad08c13 SHA512 439a8382b5ae247347befce0abcf088a3e1dc184ac372dab4d17c4fa14d83afa23982b9e86e44f233a1b9ecdb5f7990f4492032d38071011615ec31f749b2842
 MISC metadata.xml 966 BLAKE2B d7161ddac280337b7054b2c1b898cb83b84d79d44bb11f587292d98cc70771c35da6a4e903250d9ae74a6ca33d316029fc569c6c1eab40b01e436c93757dac9a SHA512 acdbc968713b9863489933e6cb3625cf1e1bfe40278f6d0cc8bcc3146d2dac1c12c1157a6827eb4d3174035d706c820773fc50b5851981d855d4a04d10369a84
diff --git a/sys-process/glances/glances-3.2.7.ebuild b/sys-process/glances/glances-3.2.7.ebuild
new file mode 100644
index 000000000000..ae070a4b0976
--- /dev/null
+++ b/sys-process/glances/glances-3.2.7.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1 linux-info optfeature
+
+DESCRIPTION="CLI curses based monitoring tool"
+HOMEPAGE="https://github.com/nicolargo/glances"
+SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		>=dev-python/psutil-5.4.3[${PYTHON_USEDEP}]
+	')
+"
+
+# PYTHON_USEDEP omitted on purpose
+BDEPEND="doc? ( dev-python/sphinx_rtd_theme )"
+
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.5-disable-update-check.patch"
+)
+
+distutils_enable_tests setup.py
+distutils_enable_sphinx docs --no-autodoc
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	# Remove duplicate entries of a prebuilt doc build and
+	# ensure install of the file glances.conf in /etc/${PN}
+	sed \
+		-e '/share\/doc\/glances/d' \
+		-e "s/'CONTRIBUTING.md',//" \
+		-e "s:'conf/glances.conf':('${EPREFIX}/etc/glances', ['conf/glances.conf':g" \
+		-i setup.py || die
+	sed -i "s/, 'irq']/]/" unitest.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	# add an intended file from original data set from setup.py to DOCS
+	local DOCS=( README.rst CONTRIBUTING.md conf/glances.conf )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	#optfeature "Action script feature" dev-python/pystache
+	optfeature "Autodiscover mode" dev-python/zeroconf
+	optfeature "Cloud support" dev-python/requests
+	optfeature "Docker monitoring support" dev-python/docker-py
+	#optfeature "Export module" \
+	#	unpackaged/bernhard \
+	#	unpackaged/cassandra-driver \
+	#	unpackaged/potsdb \
+	#	dev-python/couchdb-python \
+	#	dev-python/elasticsearch-py \
+	#	dev-python/influxdb \
+	#	dev-python/kafka-python \
+	#	dev-python/pika \
+	#	dev-python/paho-mqtt \
+	#	dev-python/prometheus_client \
+	#	dev-python/pyzmq \
+	#	dev-python/statsd
+	#optfeature "Nvidia GPU monitoring" unpackaged/nvidia-ml-py3
+	optfeature "SVG graph support" dev-python/pygal
+	optfeature "IP plugin" dev-python/netifaces
+	optfeature "RAID monitoring" dev-python/pymdstat
+	#optfeature "SMART support" unpackaged/pySMART.smartx
+	optfeature "RAID support" dev-python/pymdstat
+	optfeature "SNMP support" dev-python/pysnmp
+	#optfeature "sparklines plugin" unpackaged/sparklines
+	optfeature "Web server mode" dev-python/bottle dev-python/requests
+	optfeature "WIFI plugin" net-wireless/python-wifi
+}