gentoo auto-resync : 09:08:2022 - 02:15:09

author: V3n3RiX <venerix@koprulu.sector> 2022-08-09 02:15:09 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-09 02:15:09 +0100
commit: 3fd9d065ab109700e92fc1cea2a6519a39a5b007 (patch)
tree: 2666118c9404e846180636fbd2de92e3bd7870fd
parent: 11c791ab62dc711840a52676eef212362840fc17 (diff)
226 files changed, 3826 insertions, 212 deletions
diff --git a/Manifest b/Manifest
index 64dbb1af4891..f412db5c2c7f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29669 BLAKE2B 7f921b2f30a9e8cee11ac8a12414a778b41e90cc5a03fa0449ea97d48662a7f52dc6740a83e562d2b3d94d678d4a09defeb0682ac8716ae059d2baf792780fe7 SHA512 fa01b06467717c7b3460711e276196c5841053b2794cc1e40b16435312e39ed1991aa3382fb0c3f736248a52364888b72201cca10d7bb42cdfa3c5f5a10203a7
-TIMESTAMP 2022-08-08T18:09:59Z
+MANIFEST Manifest.files.gz 29680 BLAKE2B 6c3ad77b4f79c76b70e2226ef9ce559781fa4a3ff364c43033a8e77ca0fa9d2b3466474aa492b3953c02597618f481d69a273b4d3da3b2538f3378f1062d0f14 SHA512 cd6cca4163832dc39f8f1a902abcb38fa2dd933a002935f6e28332faa8c8f2585079a579d1aded6e082f206084c60ae02630e3f857713572fc959f1d5ef1a065
+TIMESTAMP 2022-08-09T00:39:59Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLxUXdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLxrN9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDI5w/+OWCX821I4j9FqWwTiPOS5MZrPlkEFwNzebLPXXQwrBNA/drrftGbeX3I
-Hh/0QVjZsPXfe+FKlxAHVnUyKAqWs6+Z+qdSNo5Ix7VgLIf05Ztp1kPQKTPfCck4
-Lb9j+cPtsXc1oFJN8H2luP67Qpi+Fs4zQgcmGWRyqtobaDydNxW5fDDdOBoh9Ndt
-p+cJh5ncB8SHn2NQH8WUkDO2tYUrMCknXPSnNXktoV4axuNhGWkFZgFcpxTs/Fgi
-bhPnxIhPnj1qK/9FY70IhfrQvqjDeE54s2Gv5idNXQm2VZlxjBQOz6FHJLYPQ07W
-GwIy2LhX8xSRNee0Q/Jywk9J+30lt3LetfppA68ao6l+mN9iZ4M6RX98c3npYDRb
-I5gJDmT8rJ0ySAhr4DUgEotB8mUQthpIc8581f5PtCsyyayFyO046hCQ7LElxTrm
-0t+L/QeNdZL86qIaIh0izLy5FW3mBXKcJjJNXxg+Mb4Ec0TdtufoaW/TYp1a/PjR
-Gq0Dufurg09tPPfO1kN8TksQLShOMMozU9wqLumW1wNwce61xVJ0zBVdUol5QNA0
-094T3B2EzxHKd6aZZrTBu7zH7brUVNo6phrguJ5fmR8/FB15iOJQwuxlcgphns65
-NnonWdujb3friBw1G0f5y85nTv5eotQz6zRHLK+W0NN3o2P2bJc=
-=JGGA
+klA7IBAAoV0wBIxMBTUBcFqOV1KJZNSmmF/ScT2kEXOB5gqEjp4TC1VTLiIz8hxb
+XtAINU0aNu4KryjlJrqSMYAmXqF8CDmSiToD6BJnL87iFZk11YLhxqyxeNUF5A6w
+Eo2v92LSHTORP66B5oWCt0SIuEBWUlZm/kc1yBzamPLTw48mqiTHT1rrwnQ+QL26
+MkDpPe1w6mhy5c3CToSqUDBi2loxIAIG1YdLCr4O+qyRExm/xW/b7epe68DTxrKE
+GTtsaK05t1piFHJKtNghpa+ZBjkU0KUW/nZ0oOA7aqYT2G+yYAW6VvvBAGMxTRho
+sdHyx7NgvxDQ9Lw8u4MaWfu1MIc8d8gEEBSvmmcJ/1/V215QbzDcq7Bq3JRkueVf
+49TE4u4HXoV129SHIJqGUeThPVkA08RrdLdaR+QSz5efkjnej1kv5JA5LabJf+FE
+ptOdmbJsPawKYlL5shZo+htXskb4+65pZZpKNAeVehUCJWSoZ2sK14NYh/gZUmGW
+E3ihcB61ow0rSbhFM6mf0Sf1eYGq4GxuBamy3lj9gXYs65sMTJpbzs/JWz8pVYl+
+kvih8iJTY7NyQFPnqVkjkj3R/tVFVzDIM2OkTjIqgZx1U3UGDqPvT7YOAwwjK7+P
+yJszniMZ+gtMKYM06RrzJa+0cm15ZqzX0JAe08+8IAApA4/bePg=
+=erxJ
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 51cb0b30e738..4d088e9a73ee 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 0529a1f026d1..c311eb359fd8 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-package-manager/Manifest b/app-eselect/eselect-package-manager/Manifest
index 0024d58226b3..4f13f1b3cc65 100644
--- a/app-eselect/eselect-package-manager/Manifest
+++ b/app-eselect/eselect-package-manager/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-package-manager-20110108.tar.bz2 1273 BLAKE2B 453e258a8de1cfc77f66bd3f07b9bca191c36d6cce47a6d0f43f5682bf60de8b898576b998acdf6b9b9e5c7307ce6199797c9649cbd5917eca18624e32717425 SHA512 3fd7d9b33c4d2e3ca4c580e9e55e0033a2bbcc6718e0a2706c9725a125c219bbc937f6347b65fedd58cbad9f00e5c757025c6efba0bf4e7ba131c16134c33962
-EBUILD eselect-package-manager-20110108-r2.ebuild 529 BLAKE2B 427b2845242f0d42f2996d0e19d416ea580b5c76a037226ff4fdbb9f33fe7c3cb2b5dc4e35d9cd032b26cd394af08c9634a64091ddc9536b7b9f7c55a4724f10 SHA512 58ed852f46401d17de59ae2ea0e7460790bdb165818afa4960e086ecc8383b95e07d26ad9304aa5383be641afd28f56ac58375a9b0a97ed88d7f8b39fbb32aab
+EBUILD eselect-package-manager-20110108-r2.ebuild 522 BLAKE2B c32a5dc8ccf91326bde50ee2308a8c61aa2e3006589af36162f160f5315830a9c69f7c4d1cc588b12ad57c744d2fc7fd385bb5374a9a7fbb25c2189c5c5068da SHA512 fe308133136ec810a71790c3cd73c5a8e53776e70ab13d5f5a40bb79f17f8b09dffacaa6ebba31095ff606deb8a5db61856dd4526fc82e688606d72aefc81c12
 MISC metadata.xml 296 BLAKE2B e85bc236c75ea0d16ab1a1c9339401228253233e1aea95aea6c803200ecc2be4bdb1271d6e5d2c2729c8775160edd0ef4a9cae657f5efa4f9814911344f0872f SHA512 21600f531a173e7005d057af01a5bf202c4831a86c23ea261d3c63d0f6a4551bdb7dfdbb27f7b154a548ce52056dde7357387cb63277862c95a20db4becb205b
diff --git a/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r2.ebuild b/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r2.ebuild
index d8f794a0e6e4..7ca40cd34e72 100644
--- a/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r2.ebuild
+++ b/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=">=app-admin/eselect-1.1.1"
 
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8ab49621a7e3..fa93249dec25 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index c08dd92f48b6..3fdee2049d92 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -3,9 +3,9 @@ AUX tmuxp-1.7.2-tests.patch 475 BLAKE2B 07d6def54c025b6b1d538813258ba06cf9b030ac
 AUX tmuxp-1.9.2-tests.patch 564 BLAKE2B f164bcd3bd5344e39fe050bc3c716dc3678584071990ed19c6cdcc0ab816852d0b18f89d358ba0607260dec0eb87596e245dc386a7afb0884461d44e22dec35f SHA512 f15745bfeb8c72dc0d4a1e1cac489acaa31a18282aa8d39e5b142d207f92cbbf110e1752449f14eb2b4fabcaf9022d7f3256956e26328a2f607edfd87ac05c47
 AUX tmuxp-1.9.4-relax-click-dep.patch 305 BLAKE2B f15674bb3b007321dda444b747cfca5f5da13b4d3e5ff741aa7559271c804cf5939d511792259dd0cdd62864e08d12ebc6acc0ba2836f9d8ecc50e93f3546db4 SHA512 cb476d64cb95f94b41536ec6fb5c1954cb6e168836c1d6b40cba407d4cb0753174d6e437e71d1aba51d084004377e048e129f84caa03df671022995c4a1349ec
 DIST tmuxp-1.11.1.tar.gz 830701 BLAKE2B 37f23abf16ef78b27f04e6af9c95990d39173e62fb4ab2c898fb45075242ee2761e0c69b8f391cb59d4fd2ccee8d157650718450814ebd06716c54afd0e59338 SHA512 23cf70cffa86e8478f39661951ca468b09a8caa3e7c8a9114011a5a5440fa817c3425b38cbf00b9b7966ac1449094d101f74a450e77c153e9a1d9ca73c49e856
-DIST tmuxp-1.12.0.tar.gz 839506 BLAKE2B 83111ee0c24611f762ddd1c22f81f164c29fd89d9e581483a6cc826f65e943228af5aea6779b3f715ea911631ccfe0ef8027a2e9a4db658fd2c66bdcc46195ee SHA512 e6c24ae0be116a627902628ea08efc3c4e33436ecc86007fa3906f4e3eb22fa3b7cc275eeec0ca336ad0d6a18d897a1a1a6f962b8219ee58faad57b63601335b
+DIST tmuxp-1.12.1.tar.gz 839714 BLAKE2B 98ecb807c1bb1d6cea05e997001866c29a0b4e43b79ffbae945093ed8a2487563b1d1a884fce8f8fa9ff202f602369774677ef760ab0e03881c66bc7390b16a8 SHA512 2b7f98d6e003964fbe6ed873d251fd120da50fd54f48521a0c5cbc441cb2b3031ecc963c273824ac3541783989ece4fab329a89bf29a8e9572825fcdfb541dc1
 DIST tmuxp-1.9.4.tar.gz 821650 BLAKE2B 34454919e811bc4901dcb570046b45d481934ab36f9b8f50753972fe6545ca9e487b2f04ee818c4b54eea01181c62efb1f5262ab033f2fc92c3cee3828d16bf4 SHA512 ecf113011231a03998b3be2d146f7e6c6cc2ccfc36af59b88d51e09726259c92dc4360bde569fba13ca8d81eb9639f85b45cd5f4b50d70d347e3237e396ea446
 EBUILD tmuxp-1.11.1.ebuild 1013 BLAKE2B 5ac12b621d4f1821c584465812ed9bc8de91168702cc4b831e7dd45e24a8a887a246c747e27a7cdc7ae3fb06da53bf0693b3c04d802edca3032a8fe54ad47a2a SHA512 c8b7424ee32b259c12c8e19f5e4da0b8f7feb44a83707331d8935796c8a872c90012b3cd153c88e0dff542af54e23f9510baaddb2231441b175ef980e0146b69
-EBUILD tmuxp-1.12.0.ebuild 1013 BLAKE2B 03da38be3654cd6cd4fd3e68a945f604d491f859f4b559e4eff8ecfa8a8d2a4077b1016b39b5f2128d5a177c06a3e3f710e6eb6cdde7b16d394a2b42bd16d242 SHA512 a07afa1fb7899184079c38ab8ffd6b67ef74ec47741a5487b1ccb815f8ba3a6d97199b4082add5561f200e9915b2035e3b9d23a97f5d96d6a814b09f95f38d11
+EBUILD tmuxp-1.12.1.ebuild 1013 BLAKE2B 03da38be3654cd6cd4fd3e68a945f604d491f859f4b559e4eff8ecfa8a8d2a4077b1016b39b5f2128d5a177c06a3e3f710e6eb6cdde7b16d394a2b42bd16d242 SHA512 a07afa1fb7899184079c38ab8ffd6b67ef74ec47741a5487b1ccb815f8ba3a6d97199b4082add5561f200e9915b2035e3b9d23a97f5d96d6a814b09f95f38d11
 EBUILD tmuxp-1.9.4.ebuild 1028 BLAKE2B 3b7b6711c437b617ba12d41756fff7b5dfd239d1db0b9043785b65d45f31c78d73fa4c1d63e6ccc72c88904711c69fd674ee2e5a2066c42a90a90b0bb381f2ab SHA512 4a8125d4702bd42220db1e7abd1300ecf053d1f847468051e06ad0934c27b52bda2cff4f55ab7afa69cde11c0f680d07e64dc98f25c398c2ee6c948863707bdc
 MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
diff --git a/app-misc/tmuxp/tmuxp-1.12.1.ebuild b/app-misc/tmuxp/tmuxp-1.12.1.ebuild
new file mode 100644
index 000000000000..e4488877fe08
--- /dev/null
+++ b/app-misc/tmuxp/tmuxp-1.12.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_USE_PEP517=poetry
+inherit distutils-r1
+
+DESCRIPTION="tmux session manager. built on libtmux"
+HOMEPAGE="https://tmuxp.git-pull.com"
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
+	~dev-python/libtmux-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
+		!dev-python/flaky
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/tmuxp-1.7.2-tests.patch"
+	"${FILESDIR}/tmuxp-1.9.2-tests.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	SHELL="/bin/bash" epytest
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index d2726ce1c5a2..04db9e341103 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/diffmask/Manifest b/app-portage/diffmask/Manifest
index b528617a8e4b..6d8992665d91 100644
--- a/app-portage/diffmask/Manifest
+++ b/app-portage/diffmask/Manifest
@@ -1,4 +1,4 @@
 DIST diffmask-0.3.3.tar.bz2 8605 BLAKE2B a7699dba6b619ff2e64a8148057e06be8d477605fba100b45f056957eb1b55cc50634b698250f68023137bcf01932635c7de798f42edfa1297cc38097e764f44 SHA512 5f28f68dc1adba2fb7b0db5e2a329e46017298de9c44765d521a0f338223eef2a77573636987e942595db9b89b72db93b68cf5b805091b0ebb1e91a18bfcd48b
 EBUILD diffmask-0.3.3-r4.ebuild 544 BLAKE2B 047990aac93ff7ceaee037c9ae1147f2474d2bdd4e024d468511a8c8bb8ad44bcc07a2266b1efeb0a60cb8ac90e424eddd3e4ed3fcb00ca06f975f36aa2a6ed2 SHA512 4831b31221f2427016ae54c163a19d7a4b1c7eb66e338982db14b2a2ea886949ad0b7c2c0d7ce323f51feed36dcaf30c205552317838abd0f69e7a2697adc5f0
-EBUILD diffmask-0.3.3-r5.ebuild 551 BLAKE2B f1ff209c902d23ecda10a7d213d0c024a9231c6ca59cd3fb483c3bfba37cea193efcb5cf0098de1a554f14854b74ecf20dc6b9960b15da3817c325697fd02265 SHA512 8a9b1a84124ff9d132a2c95f8ddcc137f8e6e6055cb5f6721f06c028495042cdddd31775a94fc59e7b7e9ccf530bc6835ef3458065698116aa0112060a26c851
+EBUILD diffmask-0.3.3-r5.ebuild 544 BLAKE2B 82bca667e0179945fdde82124932af1383d1bb2801aa8e7e11f512cf18d337967567c55a3a3a7c9eb1b54de655390a4509f00f6ac4635ac7a8291d65e3e35df2 SHA512 f163775c9d00a460c3d7d6646d7ed511a1a4fcae7e8b4c45c50f35e402b539dec7a912bc5f724e1dfbd57b731a0b229e1da4c76285e29cd86210ae151ca607a9
 MISC metadata.xml 752 BLAKE2B afe13741c466af0964e8df5675b09dd0951bb4a34b93f3bab8070b1385dff66a50e3013bb455c4c7b5deb32d8b922e9fab8959760692cca28536738001e895d7 SHA512 8b34c7a30cdb16e08df2808ff355b560c68bb674242b83c4f30d363b3d789472383cf40c0160a334f260bb0ced04774c89e091bb08a793b7906118b66424a79f
diff --git a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
index 442991c1e514..e1d32c613721 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/diffmask/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
diff --git a/app-portage/distpatch/Manifest b/app-portage/distpatch/Manifest
index 80800065bc59..452bc453ab2a 100644
--- a/app-portage/distpatch/Manifest
+++ b/app-portage/distpatch/Manifest
@@ -1,4 +1,4 @@
 AUX distpatch-python3-support.patch 15542 BLAKE2B bd0e0ca9d1c77c0ddcfa254f723488ce44002258988854b5a4d911e6d919d93653d07a66f43dec63ede94d914ea98e72e8fba4f7f2510e2bae23f75447cb71ae SHA512 1384cbe023f8cbf6dd67990c1a2bc6b80c9ef9a19082e76353dc3079dbdd4e2e330b344e7292cece4587e1dccabba58fdeb4aa1cadaf2425fe143fec223c23ee
 DIST distpatch-0.1.2.tar.gz 19998 BLAKE2B 1ede140e1b427df8f35011a025dc81b614c1a372668e41a26bbd02a3ab084b97c504a5de8e288a9d16d75439d0e3393ac13ef8cf49d55620babcee79fd137699 SHA512 f4dd08fd69a5b2030e0b912c1153994bcc03f40af65fff185231a220c110d0e7b5a4acf402d116e9dbfef86b13d17036ca563d0fefd89bc62809e1ecc9acf1ed
-EBUILD distpatch-0.1.2-r2.ebuild 608 BLAKE2B 7d97523fdcc8bd9e5692990c7dad269a3b64c5dc2b92f6430d89d85af65cfca4b3b4527b56102e777286bc2a540c5b087dfd071252b504e096ba146e08eb7ec0 SHA512 fa2ac8198cf0699ad6cc8902bd4669c13d189db48a1fd2c9ea1e2380e0e25e8b6f1ac479c9008ac6277a773a64e1d876217ef3f410fe5466485a493f5fd46639
+EBUILD distpatch-0.1.2-r2.ebuild 601 BLAKE2B a7ad57cb018e1fe77f182952bee188c269b3cccd927390eb0db83bc31d6ba2f4746901c7392f52b24431eff585253612c4923c2efe9ede809d79a9c9536a6987 SHA512 9e84e5650d8f6100d7cbc797748bd979483762573de8f9201d6ec50aa128bd32f7487b53d0b8eb98c3ce6f94042e9e2fdda4c1dde729e465c78d4c5a0736ab85
 MISC metadata.xml 420 BLAKE2B e05b176a6adc97ddb6dc1c0a5e6d74ec7c182ac5888e58dd25be263eef5c9300e17b87100e0d487c79a535f24ac9cc9937aac77b31bbb79e6e2b95e640ff7507 SHA512 10b011f430228cd515514e944a96e9e8c3da4f1c1afb0b7a1bc9ec8b16bb009ea71d42729e6124af6b335e0413308834964b1f748cc4c44fff6edf2256a0b9a0
diff --git a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
index f1d2196dcddc..dbc1ab1b44d9 100644
--- a/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
+++ b/app-portage/distpatch/distpatch-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rafaelmartins/${PN}/releases/download/v${PV}/${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=( "${FILESDIR}/${PN}-python3-support.patch" )
 
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
index 950d36e90a4f..7ec02ea4fccf 100644
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -1,3 +1,3 @@
 DIST emerge-delta-webrsync-3.7.6 24117 BLAKE2B 05bc77b6454e057247f225404cbf6f7b8fac8b54b19137434a4df028d5b6e8330ee853f4fa0f94a6c56e97ea088c7eac3f486c0013059b475f1ff36c858ad0a3 SHA512 85e5c2b5fffe952f6642507dd9dfd960725e86f385a5fc0ac289c5fcfe4666f0a50efdf7621342f8ae29f7623b8431f697ea33afe0fe2d6a837c820feefccae8
-EBUILD emerge-delta-webrsync-3.7.6.ebuild 1107 BLAKE2B a84664bec6a4c21f8107b7d6b22a11074762feec691e2960bb17f6d620a86b29611df121d641602b26250a810b57b8cf7615b458674b3930c19d430497ebba51 SHA512 ab5515ec3fee8f666b475cd5ee3d450829c48613671fb8b59be6c5703b3f441db61cef81c13bdcb9decea90bdb06ddd4c7cba9c7a9efd2c1ba1ce1cc9e99519c
+EBUILD emerge-delta-webrsync-3.7.6.ebuild 1100 BLAKE2B bc609c1925e017f949165c57d1636e3e08a8da6663dfe06b7175fcd829edea3693ef9146f4941edb393ddfdb5282221bb0c2e06135f6e3449a0085aa9c14b505 SHA512 39d6bb607c7d74e791c73ae05b7b7416363d56b6f68b0f19ad24dc645780b9b23b80361c4e71db7dc2c6a95a6c687a6be36e78eaf08ca64eaa9fd5035eb2e328
 MISC metadata.xml 295 BLAKE2B 068d48438b6feb762e2833a3f9194fcaa989625b8165a230fb9b0a6fca6176a56fcc9ab19f641f4a39c3989b623ee1bd5bea24a3f7611ff7131a205fcead1f00 SHA512 a733a856857fc71a1b72e088f02134d17478029417af16ca703187cc75a5263194aa79bbd45e1926aaba847cefb4a963b128832f00d11313db655e9abf139701
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
index eb5db101ffaa..3eb15e1fb1a2 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=829623eadbeda97d37c0ea50dc5f08f19bf4561b -> ${P}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-portage/epkg/Manifest b/app-portage/epkg/Manifest
index 7694ec1aef80..99e55432fac7 100644
--- a/app-portage/epkg/Manifest
+++ b/app-portage/epkg/Manifest
@@ -1,3 +1,3 @@
 DIST epkg-0.4.tar.gz 3696 BLAKE2B c0532ac424159bf9bd66c3afb549f6aacb8dfc47ec25e2bfa0b789aabc0a203d29c51f810e3d27de058c3374caae41e13b22fef0239fcec6ef491cddcf9770ac SHA512 2b9ef0e2d0ec123a1e333403371d0d4d750bc5247a05771dc2f694d225ea5db2702dbc9a126cec1d0ddca38dffa837dd66acaa046ac94d00a28890f3e3cd7879
-EBUILD epkg-0.4-r2.ebuild 505 BLAKE2B a472627b4db917a97c0d101ae87f3d77d95bc1b014c7786779529f7f5e9b080307ac1fe0eeaa9b4fef00bd349cf3569ca22794378c9becea41e5b00089e8fcb2 SHA512 71f83cf1e7050eea980dbdbe9d5b46a0171fdfd0073c90d00a60fca4a83807746f57117ce8ef996d57199584893685f59138f85ff0acc833a14e094f237851b7
+EBUILD epkg-0.4-r2.ebuild 498 BLAKE2B 4a651f5f8a5e5089588b36c5d1939901e41b4edc2fa2affc7e3116629af9824ea7a369ecc6b049c7ebf7352feb6d305d859eefbda942ab1f7af388b88624dd9a SHA512 5cfc22ea4a4e57bb73ee0c5117f1d520252eab455bc15f9dbb7118d74e83835b6b399c8fbc6db9bfb30b3b8bbd71f238dc08b9fa6a86c7f32fbe8e9eb15e8866
 MISC metadata.xml 247 BLAKE2B 069d0d8ac9c3e996f08cca692b772941e3e4776f17bc7a35ceffcd3c41b06cc4f33d30a5adb18f31f059268ac19b2d322daa4e287ad251395ff1ea70689887f5 SHA512 9f27a4436597b7fa2ab05b68ff1ac2a859d9236d5db06f315daf06afb031cacd40079206968c90623cfcdde9d3f35970c7037f26f234b2938bae81c3a787b3d5
diff --git a/app-portage/epkg/epkg-0.4-r2.ebuild b/app-portage/epkg/epkg-0.4-r2.ebuild
index e090bc941e9c..5be72cf13641 100644
--- a/app-portage/epkg/epkg-0.4-r2.ebuild
+++ b/app-portage/epkg/epkg-0.4-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jdhore/${PN}/archive/refs/tags/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-portage/eix
 	app-portage/gentoolkit
diff --git a/app-portage/fetchcommandwrapper/Manifest b/app-portage/fetchcommandwrapper/Manifest
index 9534f3075fbe..a35084690082 100644
--- a/app-portage/fetchcommandwrapper/Manifest
+++ b/app-portage/fetchcommandwrapper/Manifest
@@ -1,4 +1,4 @@
 DIST fetchcommandwrapper-0.8.4.tar.gz 4553 BLAKE2B 10cf10ec5e4af355940d3f02eb7e9d4dd79ed8c13b06ed2e4c4c5c23f257e54e0825387b3b646451f3229ae6e7ec4e9c2074734204caf20389a3009fa7767a3c SHA512 e32b1a774bcc2a52356ccde8ec29a2d42de08b1e4672a0cad11a187e7996ade491dfda4fb09526e77ff5a55abfda91130cec1d0b075541d227d0e34ecb55f019
 EBUILD fetchcommandwrapper-0.8.4-r1.ebuild 694 BLAKE2B cda4976d475f7a9979e9bc2edcede45bcfbac5a3f92692109f9523981fc461c79e706af9180f041d27529236a4fd2014ef8527641760f84bf5d9680f26599aa2 SHA512 1fdf60198d2f136cadace1487a6f4b35301ab9b5f8113a5d176992e6db0edb2393f487cf1006707930fb41aa437d397648e25d0a7df5734f1a66b20d3ee17636
-EBUILD fetchcommandwrapper-0.8.4-r2.ebuild 669 BLAKE2B 51e1f070c9d07830eb399499600084ac391fe485cf9b88b5ca258037e3425c951dd13091ca5c36030437f503bc3861f62eb5bbd7711990f789425df38511d890 SHA512 5ea5d821efaa24ad843f31cfcded5a3443383cea5428a0204eb20fd190ce7750004082468d375c6653f7bb152b593173100e900cc83a4003d1e6841fde69b27e
+EBUILD fetchcommandwrapper-0.8.4-r2.ebuild 662 BLAKE2B e5950174b603a7478002e0c588f16ac9308b9f033903f0ff3ab1370d7002c5759d35f246f31ba5a6c18ea0df4126a697dc31696e3995152c29e85e8c31e46cc0 SHA512 249a739b143c57e4939bbe306efce614376cf21f1093e32f6ba161b56cf34938314a2fab332fb39b379e3c711cb0cd11b443155e1fc7714a12782348bf18d4d3
 MISC metadata.xml 351 BLAKE2B 7e7aa1c611e93ce3b12b616a0953640fe9bd8fa9472bdd540398133e1e18f1bb3fadbd4bbb43539b2ce06b1dd5c1323e5c89e0d091e0a43fe5c2bc9569abbfd3 SHA512 70f21af5f98ec4eb306882517d848f3a7bbd55e27b2e0106f60808f66a04453a37e2fa1c50ec3cc822baa8aa355f6d153e1e77db1bfe2defe549c36717a69e0d
diff --git a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r2.ebuild b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r2.ebuild
index 2bedfd58f8dd..6da2655d1d54 100644
--- a/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r2.ebuild
+++ b/app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-portage/g-octave/Manifest b/app-portage/g-octave/Manifest
index 4b11386b08ee..d1a8231ae2da 100644
--- a/app-portage/g-octave/Manifest
+++ b/app-portage/g-octave/Manifest
@@ -1,5 +1,5 @@
 DIST g-octave-0.4.1.tar.gz 52285 BLAKE2B d1e39931471c527c5542683c976487c56bca2a4666a437e110fa41b504287c0dd87aad94bf98298544c374c6d3faa0722fb3fab43228c56425be19b450ae0dd4 SHA512 424b95e626981aa5685795ffb3df1a1d608e5293adba074cc67f7dcf08d4a0c94a0174005f97a8da1ba1ae4233299e6a530af96ba3b9fd0d8b224915e947efb3
 DIST g-octave-db-bdf02cb.tar.gz 39836 BLAKE2B fadc374e69bbf785f9e9ecae02eeba6f1c048d11503e5d97db2b4cc65c820ec829615be72ce823ef44ecb0e59e1b68dd40f7310d19d0b7706a2ff47ab95c0851 SHA512 5eae00e18b6d4633ed0feda3a2eea6b36da049c133bcd49e54481443ff435bfcab0f303ab9f0e8c3f48fad707625ee13b4564c510d89fa196e737c7599ea5fa6
 DIST g-octave-patches-0.4.1-r7.tar.xz 8800 BLAKE2B 514b154d7cbb816f15d88a2efe0d0b8503a5a09dedfcc79ab61fdb2fca8be193752ffb477ad7ea7be167e341a91e8d83c5b70fa20ed9d55da6f668acc8743e6c SHA512 cb03afd16bb7f2f0ddf2c4f11bdde2748b8ee0124642cfed4697e19adda30b141b3217afa55e996acf3e295d06af0636ba235a631039e65ca7920eef3243e267
-EBUILD g-octave-0.4.1-r7.ebuild 2387 BLAKE2B 1ac340c94ad427622b9323cef44ca99f88c6be314744f16e8753f33f2c6c770553a8bfbc913e709776a43ac9f522014fc51441d4a1e8da07553672bed6b71870 SHA512 e1f0830bba55056eedf38ff95b7c0ef18106e71544c63fbb5dcda44f01936198ed80c443550551e83361a0925709117a5bafc33f394d17a4dd77d6210d562221
+EBUILD g-octave-0.4.1-r7.ebuild 2380 BLAKE2B daad561ff18de84570b805e94b501c63a0757f49291c4b60d95d233030904407aff5277599b676268a5b3bbe2c0d55604df4335a7da327c305550f1c867eb0ee SHA512 ae0f74c39d02da1857fd6b98f1899130037fa2a0d01377d60935cf5d8cd014b5662476c1047a69d4ee1de3ce768efbcd8f54f794faf72ef39edb05ea99dd0267
 MISC metadata.xml 860 BLAKE2B 0cb64216659e4a4c6bc1a3e43b58efa7827362fd740975e1928d7acc5567f772d6ce1f1525cda1ed4f8fbcc2a1aa8ffb2c05eec94f8812480e6987dd16d2e975 SHA512 59c11da190a3f3ad81385d12e1ea0fa9f4d7c7ad5b9c65b8b96b296c4bbb9fd7d44e9cc99314e49754d64e9023abdfcfb189152bf2e93199edfc2f0f8a45259b
diff --git a/app-portage/g-octave/g-octave-0.4.1-r7.ebuild b/app-portage/g-octave/g-octave-0.4.1-r7.ebuild
index a0e4a4e1656f..d787f7309a5d 100644
--- a/app-portage/g-octave/g-octave-0.4.1-r7.ebuild
+++ b/app-portage/g-octave/g-octave-0.4.1-r7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/downloads/rafaelmartins/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 BDEPEND="doc? ( >=dev-python/sphinx-1.0 )"
diff --git a/app-portage/gander/Manifest b/app-portage/gander/Manifest
index 2f8900ffa449..f173313f80d5 100644
--- a/app-portage/gander/Manifest
+++ b/app-portage/gander/Manifest
@@ -1,3 +1,3 @@
 DIST gander-0.0.1.tar.gz 8882 BLAKE2B 29c25fedabff3936e13789ae31f2e06871cfe4eb31a0eed1d36150ec219e741d25ba1603d0151d026777c81dff8461a1c051e4c02bff2488d8b9d6888ebe9618 SHA512 d72b2fd92ddd646369f8eb16d73a67e7b793aa84109231365abebec3ab2e14a8c76bae301271ec1cc82850a71bcb217a72f969086554e6c850117b5492215d57
-EBUILD gander-0.0.1-r2.ebuild 803 BLAKE2B eb7339bf2f546446eb1b31a5b137a88cbff2fa122deac71541e4ef5dc2df64ddface5498ccf08f0ae23b7177a02004fbb7814638a580144777c92756d0e75925 SHA512 ca35947f662376b491cd92789b0f020df9363ab7c87979f11ae978b68733e700282b50d294953922e26f106e3fa81b073db508e78acdac5d568ae980f225aa25
+EBUILD gander-0.0.1-r2.ebuild 796 BLAKE2B 77fb5be23e306055ae5d297a60dfe541cf83478e74c254953abecb0ed37e1be403aa00cd06114a7c70c806b3b8008799f721e1add80656530c20b5030497e968 SHA512 7b22821068b83596e4bced8e8ebdd6b399653a6513131174008a65a20bb6efc31178c23caa0b79aae751842e448dd57b42d24f3818183c0a09e2938ad91ca953
 MISC metadata.xml 326 BLAKE2B 63c40c392a14654552fc7fe5d5b719afb2cb6876966d283360b15c88c57621b486b17a8bfd7fa11d5dcaf8f61d48ebca6641d5708f64472254b98c34bd109cc6 SHA512 a66081eaa96514f941073ae4060492202f6ad350a839811bf0137b9866b5bb896f4561eb9ced5d57392503089e88c8d6aad19b91528190b0e0ecb2b3a81e712e
diff --git a/app-portage/gander/gander-0.0.1-r2.ebuild b/app-portage/gander/gander-0.0.1-r2.ebuild
index cdd04f886c1b..b2903319f0c2 100644
--- a/app-portage/gander/gander-0.0.1-r2.ebuild
+++ b/app-portage/gander/gander-0.0.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mgorny/gander/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
index 16d96d78b85b..ed72a05ef47b 100644
--- a/app-portage/gverify/Manifest
+++ b/app-portage/gverify/Manifest
@@ -1,3 +1,3 @@
 DIST gverify-2.tar.gz 4609 BLAKE2B 73f97ba232fe0269ec56649bc5682650d48c001e432f8076c820a58a94c3d1de079dc89873d589a76b91164153e5c5be78870ef34b3b69f3c39ca0c0e388b114 SHA512 1756671d22047edc6ed1121b65af8c163afba854364a50a9089cef733213ccd6c9dd1276e876b9118741bcfa92ad02cde572fe2b6cebb22339664552c67d2957
-EBUILD gverify-2.ebuild 696 BLAKE2B 8075d2998727988789d2360ed5d6f115a1a1d53a6a8077670dc262f0b5236d02086f65d3a90fa34c08f8d37032a18ac96c08e20e8b04fc7bc248d6637112761e SHA512 b59f6d7ddb5f6013df4a5b943a8869c5f8c245d9889fe76e3c4a6ab1d5229fbfbddf29b268d1736ad28a0936d171e1a7e0c21a616ddafde1af2b33ec7f3f52f8
+EBUILD gverify-2.ebuild 689 BLAKE2B 4732acae8f1ce9220685e1ccdf44c16f505c76dcb6b318f618ac87981cd2db45a4195ad6d9d11562967a989c3e4fc221a4e5d25661390ab7e92fe2c8756c7b85 SHA512 21ba14a2bd1f17bab89492520d8e601c3616c0ee7a95acf89b0a7d384ff6f441450fa4a9cba312181fba1f6a39828a3b1b0fc58c974d3253b37839a4464f3ea5
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild
index 75bb5c8c04f1..a6afeed27f55 100644
--- a/app-portage/gverify/gverify-2.ebuild
+++ b/app-portage/gverify/gverify-2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/gverify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~x86"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 2a0059874113..ceb57ef3da5f 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -4,6 +4,6 @@ EBUILD metagen-0.7.2-r1.ebuild 708 BLAKE2B 096b3982cd7b27b127b44528b628ed5fd2971
 EBUILD metagen-0.7.2-r2.ebuild 834 BLAKE2B 92e3d9180b49fcd49ec41f7a3bc92810dfaf31b96a6c3b828ba841f4476bfeb5be56e2d31cbb3457452346cbd654b2fa81875fe22170e06d3df36cd84a077175 SHA512 848ce0bcc332cd1eec100747eea6feb63d94019e71af55295077f9da3da1045bb19352c6227ccdbca0f5ea033419d03ae91bbfbeb277bf43c08758ea7de67151
 EBUILD metagen-0.7.2.ebuild 737 BLAKE2B b8abed80940833688f245cef82963833ddea9994479d11896016bf601677c36b03531a4bba48ac5a7ffd7cd0ca15cb30e1db7890496e8f8e78507b4205e501db SHA512 3e4eef66d79eab73b0c1e4b7c0dd0b6fafe7fed3d529a399729bb9378ce68bb8d75f8eddca165fb7f814470bcceedf828e5dd239948895cea9a2b04d73e847b9
 EBUILD metagen-0.7.3-r1.ebuild 917 BLAKE2B 4f877e298ac88905fb472d5d0ecec5fd449a698ab95233a7976fbb6ec008b283876fc0048d35e000325271b7be6befe52b73a904ec8cde90def93e2a0cac68ab SHA512 a837efa97113dc77caaa51cd08b7e983de8570b2c7870c10f18a5a9a9920f52cc7ce2511a67665f8675bebc92529d41f6ab3278ab36841635f43396955b22edb
-EBUILD metagen-0.7.3.ebuild 914 BLAKE2B e4050fe964dce6eff2688d66be69cdb25c028edc08636570f55b7d4ac30929491bf5549501e6e07e2222812ed8a7be840a933ea65bb2a552a5c5212300d35edc SHA512 aed89a4dcbc7ed37379fb1d776536eb32e5fb22092c538bbd81ab2d7a73755bbe07d076479959a1e3ec4f2dc105397cffe3ba6b01ffa231e28d878888f618233
+EBUILD metagen-0.7.3.ebuild 907 BLAKE2B 06ae338c257137d117c7ec61d348cde9ecf4d211d5226c6868bb29ee2d8a1a34f6c6f4ae5508400812b116c07f25ac9e8b056e90295bec34b3c29f11e8c9f4dd SHA512 1725954d03287400e9fe88aaaaad61b05aad2f107a54443665142e66cc18ca45197196f07b41e41caf5f7bf5bb8419a75c9770a6ca337a2dee2a43f5436797d7
 EBUILD metagen-9999.ebuild 855 BLAKE2B 5a9267fd79da98fb6b6f4f091c0ed77973b3888b007672ff4de4fc3e792c5fdca45d272ff16302b40e8ca302942df2a30b696758ced85d64afad5d3cb9da7186 SHA512 31d06fa0d5b3878c2bc6e84bc8804baaa2fd7826cd8384af652065bccf7affd555140eaf5af3d8d34f8744d1a22b7fc517c4ec735122eec49e9d69e174968134
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/app-portage/metagen/metagen-0.7.3.ebuild b/app-portage/metagen/metagen-0.7.3.ebuild
index e7da9642ac65..81ea3b03c351 100644
--- a/app-portage/metagen/metagen-0.7.3.ebuild
+++ b/app-portage/metagen/metagen-0.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ppc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/app-portage/overlint/Manifest b/app-portage/overlint/Manifest
index fd2e4cc8a936..4671d814b9b9 100644
--- a/app-portage/overlint/Manifest
+++ b/app-portage/overlint/Manifest
@@ -1,4 +1,4 @@
 DIST overlint-0.5.3.tar.gz 2706 BLAKE2B 78c76a72556213bbc84b91ada3ea1d71ad045fe4498baab1f6710190a55802e5ffee14d652540d2cb7caaecd407963f7bad9682cb72e5e6571597983384bf019 SHA512 348b59e5f013b1c4060312208fdc7fddad3252d6f386513d743b7685d8aafbf76ac626fb9000c2d47c362b85d223dea5f59b4cfec55dbf24a52185c5b943a149
 EBUILD overlint-0.5.3-r2.ebuild 492 BLAKE2B 88f8dffd215e12d3a4d702a6ccb9eff5eac8224943313e89d625407d4df9225da7f02ed4b480eb0155897646109f4e9f85729f73e2def914b54f1815b96a726f SHA512 5ea1480eb20656a499ebc9eb753d6377db7acf1388b3f8c34359d52eb806ce1e55fee4a5bb5ec3b8274f9ab027e7dfd810ffd821d2feb80caa2783fc29b7014d
-EBUILD overlint-0.5.3-r3.ebuild 500 BLAKE2B f2bd7ad0db933cad56da74a3d66aee38843624b19582be6ac13d600b918fcee5ee27dbabf35bb3aa7bd6ea31a30c7b512290553986c78c2a66ff0de47e7082a5 SHA512 92c2e59a3c0be4bae2d0613d31580566aec2d5c1ba688f031713ae2183836753793a653d837dc911a3432d7c4438e3e56ee5773dad8fd27a9366fe5348f4421d
+EBUILD overlint-0.5.3-r3.ebuild 493 BLAKE2B 343e054ddb1dccbb1b5f70310680e8d481bb5b05e4b1c6f84b5989a8788d0b2bf18e0bb20592e0db3abb3ce8c84a3450fb46f9451c680e472f9fcb4d26a7b28c SHA512 05ef59ccdc300e01cfc0c698fcbea090411b026e344a9666f0cbe427dc432d82a74e0bd174eb950774173d562d3c8fc26524d55f121bec80969d8970c89b0ece
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/app-portage/overlint/overlint-0.5.3-r3.ebuild b/app-portage/overlint/overlint-0.5.3-r3.ebuild
index 4831809350eb..2af4a8c15b75 100644
--- a/app-portage/overlint/overlint-0.5.3-r3.ebuild
+++ b/app-portage/overlint/overlint-0.5.3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/porticron/Manifest b/app-portage/porticron/Manifest
index cf1a77586598..cfeb1cf02de8 100644
--- a/app-portage/porticron/Manifest
+++ b/app-portage/porticron/Manifest
@@ -1,3 +1,3 @@
 DIST porticron-0.7.1.tar.gz 6530 BLAKE2B 6eec2bcab3e3d7661783c4fcf8f5521aac5700e4c642112d074187af372ea51137a7bfc06cd14c86f55e6b1414b2af766454a829c815294606a8bd18141e7c07 SHA512 ba2f365011e1ad2f7cb67d655839fa425791ab95309753719b4a4206db735f141d473d24bbb68da25a88db54919d033f53efaf497c26de71f3edb4a39dcc957c
-EBUILD porticron-0.7.1.ebuild 574 BLAKE2B 619ad9072e8eb948abc62861b40d2a621619c4233d0f07cbc93dd35513c29067b49abbe3758e9143b1c1d40e13a4dc739dcaa6a71ebc9bece34fc56304ea8820 SHA512 ef6e025f883e908667c9176917e25f4d686c74e4d5c974ee97e0d3ae50be0bfb3c56220cd319e38f7a3a9ffe09cd48f0fb5831dbffdba7e042172f333a6d0b85
+EBUILD porticron-0.7.1.ebuild 567 BLAKE2B d24ff81ea68fe8eef0319ca700c776a18fae10840745f7bdda6061f654938ed7d7e17077b94936a9d15528691a488fa95ca4259b9383b10978e3f61ab0f5a225 SHA512 ef8d65513f2847549e4602fc65fbc497f37ba3e79a3b03925b6159d2bc27d9c1d4ae0120cfddd5f68e6402a7fe5f51246d1040f053273b4671b2d872d0dd21b4
 MISC metadata.xml 254 BLAKE2B e8873c09a7b18372b964c2e8bb515bf6843f441b58da5e41d6a51e433a9660ae8f6fc913adcdc000c8907f02f271139ef50220acd2d3330c73aa45091de0a82f SHA512 1a705c11d078bc0fb97a7bb51fdf41e35d88c41a74d1b7a3b13cd5cf78a70fc1dd064ac097509cb6c58669fbdb268861f494f28205bbceaacc4c1ead705610e8
diff --git a/app-portage/porticron/porticron-0.7.1.ebuild b/app-portage/porticron/porticron-0.7.1.ebuild
index 6f3e42fa8aaf..68254d6cc552 100644
--- a/app-portage/porticron/porticron-0.7.1.ebuild
+++ b/app-portage/porticron/porticron-0.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gentoo/porticron/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index dde5f046c9a3..f37243ade747 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,4 +1,4 @@
 DIST portpeek-3.2.2.tar.gz 13550 BLAKE2B 4d0ba85d270699ebb7ca770d1fb3959d3f82135f3d75a65ec35f154ab6d46a9a51b9a2603940d16ed0f7f789f6ab628ef0a1536c2a2cf877b8e19e758e55568e SHA512 9362419f41ccc437ca8d90c0196044b2b17c683f3f2474c6f0bf484209a20fa8af1f17d69a0553038691190bdd410df0bbde51c016e2da944c6772651e99d7a5
-EBUILD portpeek-3.2.2-r1.ebuild 732 BLAKE2B fcd2ed325a1308c7936223c53ef486f3f58286415add07403bb79022141bc02c149bfddca0bfb9237d6d12dd5a315b66d9068515bf375caf5ef6f4662c9a160a SHA512 a268ac3be63772d14b5222907a5fb5b819f0b26eac076815cb4b7839c8f7072e19bb8c001c4c3d5687fdda3289cadff80457af9dea2d08f6c44ba8674e7ce913
+EBUILD portpeek-3.2.2-r1.ebuild 725 BLAKE2B a71586679ec5b36f1109d06e0a49e77974dce75fce7179370b7854451265349f051ebae807a8d9246f770fb1043cd70afd4bf8e5560b709c6d24f08513a15c21 SHA512 93e3edd3c0523dc4e0d7f10ef9767c90a4a67ef1bf715ae3f91aa75ac822a0d134e4f7e19354aa430a96fc1126fe20bd9c7500df4a56baa11f8d8c387b7170ca
 EBUILD portpeek-3.2.2.ebuild 713 BLAKE2B 2b828901d833471ae3cf9c960ae8696e8130f03985359a612fa284a185eb726ab81f560c54ad578d1ad8cfe6c2e8deaa44906d188fce979298fe74ec896f49c4 SHA512 ffcaa643a8a9bb0ad84e90697bc1d8d9d143949387e834784e922cf041c8cce38e804785c771c3fa0410595ac6eda3f00307226c8f4c07c881235748d688890f
 MISC metadata.xml 333 BLAKE2B 8f862f87d0f6cb53dcbcda433a03202c648723f7b965798173fa1caaf8cb2d9d6801283b65c8a1184685e47c7cddd76e927facb3f9b014325bd5c88a2d69664f SHA512 1e16d124fe120663bb0ecb7995b6be4dc65f5d164bff681029fc6f82113926aaa875a97dcdb6f9231e170b416c6bd3e19a935aa5dfebb01969b169e7b9c89f10
diff --git a/app-portage/portpeek/portpeek-3.2.2-r1.ebuild b/app-portage/portpeek/portpeek-3.2.2-r1.ebuild
index ee766aab4d4c..459e51243625 100644
--- a/app-portage/portpeek/portpeek-3.2.2-r1.ebuild
+++ b/app-portage/portpeek/portpeek-3.2.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mpagano/portpeek/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-portage/repo-commit/Manifest b/app-portage/repo-commit/Manifest
index 697c6a6caa8a..75b8a6dbeb99 100644
--- a/app-portage/repo-commit/Manifest
+++ b/app-portage/repo-commit/Manifest
@@ -1,4 +1,4 @@
 DIST repo-commit-0.4.1.tar.bz2 54416 BLAKE2B 85b4c9608baac4fc267047cb3177a80fa9d5ef761cb70a7d752acf5448607330c873ec1180c207a399e81b55d82ebf23816cfefed380ecb2de0d5eff3fc63b61 SHA512 25d4ec02605454e49dafb59a753abbe6b28b2e07225d5479bfa0e0d493d3dd6bd2302dd4efaa2d6a6af5f8c7e41a5029ac8edb9d7b1dd8ec9349a057d1d61622
-EBUILD repo-commit-0.4.1-r1.ebuild 572 BLAKE2B ee3014439ea65162eb02b6981f0f6b7abfec2504007729157c5573f05f8bf4d8f42614cf1e369bc1bdf47275afbd2a2d0698d5738ab1b9276472710d98516884 SHA512 a8178efd4146b589a6bb3f7e48cbd78510d40d5558f6093e62db9bf9bd1a87e1498137e355cd6849f65c7408e45b53d5b50e17a5d84506939d0d4a8ee8845f3d
+EBUILD repo-commit-0.4.1-r1.ebuild 565 BLAKE2B 6b390d82724de16fabe776b92eb6c44d8a5eb9ff6e4ec5334b6597ed30542b0f4dfff17fda889c9a92f79ef34258f5c4d84e8cb717a5c638d4a1f0950711ad69 SHA512 5bfa2f49e4a3df33e412b9076b03bbcc691e8ad0d3c805a11ce1dc6b3a47d92d830a497ade2e108567eae4919224a99159e6249f500d951b25d2edbb574dfdc1
 EBUILD repo-commit-9999.ebuild 565 BLAKE2B 6b390d82724de16fabe776b92eb6c44d8a5eb9ff6e4ec5334b6597ed30542b0f4dfff17fda889c9a92f79ef34258f5c4d84e8cb717a5c638d4a1f0950711ad69 SHA512 5bfa2f49e4a3df33e412b9076b03bbcc691e8ad0d3c805a11ce1dc6b3a47d92d830a497ade2e108567eae4919224a99159e6249f500d951b25d2edbb574dfdc1
 MISC metadata.xml 458 BLAKE2B 36ed05c8a47c84ffc0de1fa67d9a71c269946bfcc579605501212b4c4404e2b4fc6a05f85c4695db5e485c12a77780208fe9da7266d276440f8da1f31642a94d SHA512 d6225685eb26d8ceb3857741b44c6d525cd737e8902efce1eeca83412d1bed8ae761979f8bfd57d4248f5a1feb41dc3dbc0373d804c7689899a178f38a73499f
diff --git a/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild b/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
index 45258f6009d6..5e2bdee57fc1 100644
--- a/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
+++ b/app-portage/repo-commit/repo-commit-0.4.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.bitbucket.org/gentoo/${PN}/downloads/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="A repository commit helper"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 3b2683a48634..29bac7a25156 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 88549a15ca89..a8d656f09ecf 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -13,6 +13,7 @@ DIST erlang-23.3.4.15.tar.gz 57510217 BLAKE2B c07a1de91389774a8c62a0618567c0b8f8
 DIST erlang-24.3.3.tar.gz 59296830 BLAKE2B 1792274c77001b6f49e84f1584620a247cf3acdf075a8d581403f31a2b4cfe32e7b8104d325f3c1a999595d94484cb74b7996a35599e9ef8935931a133a554f6 SHA512 5e8ce0ebd50c1c67ca29ce9405fc18f5461793b20a1732418bc8fac404078044deb72526682aab92ee3e737bc9dc9e94e6be162a088e2cb7cc68c14b1d76454e
 DIST erlang-24.3.4.2.tar.gz 59532491 BLAKE2B 28c48f1a3197a151010a775286cf0b775567301411b8480b32cfb39c68978de5586b63c245fe58bff8034ebc04fcc3b002dee7c953127ecf581ed6d716587ae4 SHA512 78bc2dc67fe60d3ea6049c361a017c054e12b0adeeae890b0a1ee5301744505593bd19f3731acebff8312b323a3bd21a1359507d122fc34f0eb85eefb3aac88c
 DIST erlang-25.0.2.tar.gz 59800286 BLAKE2B 4344ff5a21a6c0139842067d10d82435f504a5bd3b4112137f92ad06d7bff21352244c80eadad4a9efbc29692ac2be2a81b87ddde9b29433d1461a1148a733c7 SHA512 717406816b4428fb8bd808a9d25575b7e33a05e6aed5428295682ba8576d53f1433bd1b1593236943e592e673ed2168047873127cfd293b5522636c514328f43
+DIST erlang-25.0.3.tar.gz 59811038 BLAKE2B 81176f415e814b57f298782d2ae77ebf68c1493753b747b29409d95f811dc501ec5301975e90ec464ef611c3f06cf066d36b34f21e92bae10e5f02fe3f87c8b7 SHA512 d6c83722bd86e20568b879cb770e95e37b6227b932e4e74e50bbb9dc426b1f7f5286600a182011baa2b83ff7f006717ee62812959f133868765d819ddf57399f
 DIST erlang-25.0.tar.gz 59574655 BLAKE2B fddcd0d099b84981862b06397dcd6d1a53e11c5624f5e8e60ef0caa1db215a8447b6a9eaecd56761d3d7d213ca40b5e7e7b0860d2cbf0d547f5dfcf9e9edd08b SHA512 36f2d36c5d2d5dcd28c6f817f3dc008c902838115b8830a684f9d9290017074cbfbb616d4a28f02fedaab097e73183c86cef1ce28f656e0852df0a95c30c5639
 DIST erlang_doc_html_23.3.tar.gz 36224657 BLAKE2B 7e2a3e16f4cfa0f15c01074740e02af7a45b480b4a94e764463717658ab7e5d0281f928c3ec585582b10168645e3e06cfe72cf6a0ba1b88f539b80f2b7ad99be SHA512 8be4aae46839239604b875b39339e7b6b6c677c099b3d749d5f1041c4508c1c3b4aa8136a93df12b1e5cb6333ef907276f5965c9726ed2b9e77a6043c8ef53b1
 DIST erlang_doc_html_24.3.tar.gz 36645792 BLAKE2B ef90b7d05ed43656ab1ffdbbd0833c9da08a867ad7a99ec0f7f1eb59697c1f9cd5ccd150b2e564af80b2098f063da0c76121d4444b5444e603581442ad1c7bc8 SHA512 b8d3832ffdbdede656b362d719474f7b9ff04a32ea7235e77d63755629cf9305c203cd6cd9ae089171b2cee694f9641d6ed5d0197e2acf893a31d25696096f1e
@@ -26,4 +27,5 @@ EBUILD erlang-24.3.3-r1.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c11
 EBUILD erlang-24.3.4.2.ebuild 4788 BLAKE2B a770984061152835a9452bd8d57f13394d6af4198d4291d6b78d14a03b48d5ef886fa696b5372e32e7927e6bd7466a2be1a505922ea1b7772e1bad69f35a622c SHA512 60f3edf46bf5169b0c205bafa1bb9858dbc3e1cc190616111bdb7950139e9a6adba3d61aa11f490ba98406a7a2b02d261a86b1583474a5ac48b339bcf4ab4125
 EBUILD erlang-25.0-r1.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
 EBUILD erlang-25.0.2.ebuild 4788 BLAKE2B a770984061152835a9452bd8d57f13394d6af4198d4291d6b78d14a03b48d5ef886fa696b5372e32e7927e6bd7466a2be1a505922ea1b7772e1bad69f35a622c SHA512 60f3edf46bf5169b0c205bafa1bb9858dbc3e1cc190616111bdb7950139e9a6adba3d61aa11f490ba98406a7a2b02d261a86b1583474a5ac48b339bcf4ab4125
+EBUILD erlang-25.0.3.ebuild 4970 BLAKE2B a956aa549e09eed55901972ff211d542f6a6f51d330e42925fee1d028ccd2f97d4754d8bdcb6439df282c458e8854f87d8cc7122fc4d811c161c7c08f1ffacc2 SHA512 63b75adc44342017727236021034fc0ca198f6466627f85047794102937e1c598b6361c3ce59db2184b279b33aee173103a1c85148b25741907d9e769d946526
 MISC metadata.xml 735 BLAKE2B 6deb116831085a15f4a06368d1d1f3e9d57501799236c7d1fe9fa8aa9a72da0151e92fa13e14427177679c361f8849379784e9c0124f28468f71e2eb54b78bbc SHA512 8ac9f9f29494b5aa9ff023460009c8b69cc3dbc4cc88ab419b62f715066ea3789a4575eab545eed5a430a95f4d0709e069fd240f2cb256eca4dfca7ce3838ab8
diff --git a/dev-lang/erlang/erlang-25.0.3.ebuild b/dev-lang/erlang/erlang-25.0.3.ebuild
new file mode 100644
index 000000000000..e5b9526aba8a
--- /dev/null
+++ b/dev-lang/erlang/erlang-25.0.3.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/erlang/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( https://github.com/erlang/otp/releases/download/OTP-${UPSTREAM_V}/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	acct-group/epmd
+	acct-user/epmd
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
+	java? ( >=virtual/jdk-1.8:* )
+	odbc? ( dev-db/unixODBC )
+	sctp? ( net-misc/lksctp-tools )
+	ssl? ( >=dev-libs/openssl-0.9.7d:0= )
+	systemd? ( sys-apps/systemd )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-24.0.2-serial-configure.patch
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	tc-export AR CPP CXX LD
+
+	# bug #797886: erlang's VM does unsafe casts for ints
+	# to pointers and back. This breaks on gcc-11 -flto.
+	append-flags -fno-strict-aliasing
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+
+		# don't search for static zlib
+		--with-ssl-zlib=no
+
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_enable sctp)
+		$(use_with ssl ssl)
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	local path="$1"
+	local var_name="$2"
+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+	local erl_libdir_rel="$(get_libdir)/erlang"
+	local erl_libdir="/usr/${erl_libdir_rel}"
+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+	local erl_erts_ver="$(extract_version erts VSN)"
+	local my_manpath="/usr/share/${PN}/man"
+
+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${D}" install
+
+	if use doc ; then
+		# Note: we explicitly install docs into:
+		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
+		# To maintain that layout we gather everything in 'html-docs'.
+		# See bug #684376.
+		mkdir html-docs || die
+		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
+		docompress -x /usr/share/doc/${PF}
+	else
+		local DOCS=("README.md")
+	fi
+
+	einstalldocs
+
+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${erl_libdir}/Install" || die
+
+	insinto "${my_manpath}"
+	doins -r "${WORKDIR}"/man/*
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	newenvd - "90erlang" <<-_EOF_
+		MANPATH="${my_manpath}"
+	_EOF_
+
+	if use emacs ; then
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init-r2 epmd
+	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
+	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+src_test() {
+	# Only run a subset of tests to test that everything was built
+	# successfully, otherwise we will be here for a long time.
+	emake kernel_test ARGS="-suite os_SUITE"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index e6f3b004dd0c..b295d7af1be4 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -2,6 +2,6 @@ AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214
 DIST go1.18.5.src.tar.gz 22847094 BLAKE2B 8edf133aa5b1fa4076db72bd7c63240db6cbd6b9b4725c2a71384ff302bee77e193bcfad6b55bfd31ee58f08fc59d9bbee5750d9227598fe402d6293863595ff SHA512 4ba69ad49b5c17963fdc39ae7f5360fa38950db39ec1fb9b52744d6a209abf177dab6bd587e7457c83a4fd265589907ec241d8b09d0eac76cf984243a14500ef
 DIST go1.19.src.tar.gz 26521849 BLAKE2B 2f985c4a9a125fa81fb6bd83e47d2382b4f256b689da1e16b53cdd83c896894d89b8601fc6263e8cb344d9e45c9b647d0d3c88fdf65bb304a352612d98e4bb7c SHA512 c4460d54957a0bcf3407ea72cd1c6b3c645ef4ef6cc0fa142a80cb43c06ca4af31d52b0ccd723c81d17a62004bc96559cad23da874a4b668b4d8b168f1da2186
 EBUILD go-1.18.5.ebuild 4798 BLAKE2B 8857c2432424a27febc299a46ca61bfd267d9a1d2fad7116096e5938a519410d35bf90b61a1827e2ad769986b9406ecd0bf1b9197e64b8a176e0a8d9dbb600eb SHA512 9e2efbcb8652fd203e239626f2ace311dba12c591829ce00e4204f28c3d908adeca69d1a17855c2544f2f8bc5d88a636a3d1c806d36542788c1949204b5535b8
-EBUILD go-1.19.ebuild 4799 BLAKE2B 3433ebbdf6313194cdc57fc5c53debefe00a8fdec5702d7c6e5c30009582cc696a8e5ad8717af3f3b8324cdcbbe74e493acd0dbc696bc7d68b95b3bfaef82353 SHA512 7690654033f336486269430230c7488d2fd683239cf3c623305fe0b307a324f83e73152db23a6828733d2418de14c544727b1b384c485dbfb5b1eda1d9be9379
+EBUILD go-1.19.ebuild 4798 BLAKE2B 50daca174e8bc89f747432e96bc7d66e6c7dd50320d0b4c97754bb90267d62b700d34c250a892fdf60c907fa5eb881dd7adb3e64eba7ceb240740bd90c399f83 SHA512 051671c9a99efe554f9ed66423a20d053546ba68fdbf8a900e4ef0a365622bf8fcc976c678e393ade4a5475e01ccc53668d61d98e1b976e69de030662498273a
 EBUILD go-9999.ebuild 4803 BLAKE2B d2b93e9fca1ebcc0619b6c72c724c95da3b7b0223f2d0ac95081096fcf2c5123f0c4f8284fc935450780545c1d408f71ad905ad12029c02dee9eec1f2e4f45b9 SHA512 356f3323b209c69113a81920367ac38793bf3d8599fa71d64838027da0db878430fa0856ec0d74db943752e211c2fbc410eec30fae3f15a4fb8cc53b15f63580
 MISC metadata.xml 537 BLAKE2B 8017fd0edeef2ec4b17f75e8686f6014ce3c3e39b7083c347f601de9b15f34896305d6041edd0bc2b6a0687a69827c9dcecb2f07ca5994f29a3c0f8014c0604b SHA512 5f6b42721e1602efab24f33955806c33ace6433e17b41755dbee47abea79a2744292148c330d6e5a04612b0b451545c32241236cc8f211c5e7cf22c8cdebc778
diff --git a/dev-lang/go/go-1.19.ebuild b/dev-lang/go/go-1.19.ebuild
index caf4943ce8ff..884f323da511 100644
--- a/dev-lang/go/go-1.19.ebuild
+++ b/dev-lang/go/go-1.19.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-#		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 5fb06d81d86f..1735eec64491 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -10,6 +10,8 @@ DIST Python-3.11.0b4.tar.xz 19573532 BLAKE2B d28b85c4af39ea8c8b1448857698a7018c9
 DIST Python-3.11.0b4.tar.xz.asc 833 BLAKE2B eaedd106d3599c7ee6974ff9eee33899b119fdb45ab5b760f5f02e51e12ba58b3161f6853464a32638385fd596ddd350097c28dde55e3efeacc6719f16275d84 SHA512 8f6c633911755767d351fc86e031df6cedd6091ca5ec0ef55331ac65d2ad532c71e568c173513a2bbb2235e5e3fc9dd77e1b7ed230df1f0d8bd6e23da470b1e2
 DIST Python-3.11.0b5.tar.xz 19792136 BLAKE2B 574ed58b2d063b954931c39c1154e776f5d233fe6e3f0803e5a93b68f48aacef1d9df60a2839df952b631d8988d6c44fee073dae5486420b808866944a3025d5 SHA512 b1013e449c9a0e9b61df5a266b5f05458d284b3524c6c44d44d8a5007bcb95ff754f21296cd695f353111575c7cce71f8a2808a9adf8c573512bf97f691d2200
 DIST Python-3.11.0b5.tar.xz.asc 833 BLAKE2B 80594608751a141a6e5ded035c4de1a73716d72442228fa2dfcffc10d1ccb9928b864591fad4b5fb3a55e20629a22ad92fcc4a40d8e294858a85088b26d545af SHA512 6f658c7623e7750c0c8c18b4a2fe86d6a2414f3b411487ca4d2dd9840165ae3e6eea8b3468b1376862181b7b58d3fe99681a00d290172a6986f0f2ead5d6c3bd
+DIST Python-3.11.0rc1.tar.xz 19815524 BLAKE2B 7dae240dbed052667b46927ccbb483a717b0fe0ba199721d526354d1b89a6dd2842ab0f6c3b078385e4acb7557d06f252d61aacb07d70c7f5598ed91567d2053 SHA512 2a72ea59277f8115e418ced671969fc0d5ba271c7740f70c665a4b450a59d7752278d061bd59f136dacfa608ed167f983c6589b214a973b1b63ea2115ea298bb
+DIST Python-3.11.0rc1.tar.xz.asc 833 BLAKE2B da46a0ab62ef3f2b7a7921294a0d775ca6ab254e3229338232b3d11107aa1d74adc21911678f08f44cc1cd9184beada00d4b60dde60722ef91a247367b13e191 SHA512 d4cffc90c2ed7b8ea7228a21f7ac902a92f27003f1420ad751b1691de950974ea174cb0471b6e19ed1548dc5382012fa9ad5fcf83c34646c7ea2d73c88799e38
 DIST Python-3.8.13.tar.xz 19023016 BLAKE2B d3cb8624496e56d93d34f2aa5082746869a99210197529bc19e6a9d265f4ce246e0e83a3528a7602a28aac8855bf84e6bf6495b85e9202fcf04ef90600cb5e43 SHA512 5c732b5d21b189b99a0e9ccd3ae59466bed60a930d5d3f437a262d38f0797b776cecbf12a1852eaebcfb638a6f2e28e471cc2ebf94237cc728144be21842cb81
 DIST Python-3.8.13.tar.xz.asc 833 BLAKE2B 918894777e1a783f2a7c7958a808610631cb7a6039df84675158e8d2fd66782f29921d44ab9b4625c4ca3821852e0d0e0005163b086c7d0c3d617e3a76cb7033 SHA512 6683c4ae6cf20a97a29165f96b9f5dd09d618892583650d803aa677240695968dfe344294fc33db68fd4669c82021afcc29a1f6afe49915be51fae281eeeedbe
 DIST Python-3.9.13.tar.xz 19754368 BLAKE2B 4f583f66c28b791e19cd6d79695fe9eb815fd333542be22aec8bd73d1f4d3f17f2c4e9de198e7b16c1ca6362a613a8a02fb965c7dc7db3e510fd31de15ba2d19 SHA512 e9664e7f908092df11236b22465d217531d6f0378e88d889108d19fe77f28f46ffb629b8733f84b41409e255367321893a2b1bd64518930d9d8cae5d1b774d23
@@ -19,6 +21,7 @@ DIST python-gentoo-patches-3.10.5.tar.xz 8584 BLAKE2B d4a812a33e485b1eae5629e519
 DIST python-gentoo-patches-3.10.6.tar.xz 8580 BLAKE2B 4ff3839be2f6bf172acdca22bbded702804809d6334e088190cee4ae4c61e25580a3bdc105bfe27b7f3c3b5f219d363cdca21ef895a3e91f13515afb348a77a0 SHA512 c58a85f7c48a4e822527411a6e0618be5408e1a82fe72b21a254dac77b4e5d4b01ac24cf70dc277cd16ccdc8499a9fa53b7cebae3b9f8facc9c978adcc8a2876
 DIST python-gentoo-patches-3.11.0b4.tar.xz 4388 BLAKE2B 16b112f1ecdce86022ed64d7c7007fb323b7bd4497b5802a48bb0a86667c282d1a9150d744f44cefbe9321af4916d35941707c1259a0cf175c0161c8e1b17e97 SHA512 f9c8c7180da20e839a0862571b9077b2702dbee8a1acd55ebb11329912cf9f81862ba615be484b92d39461c3eb6c38890f8d58bcbce2c4722418a967faedc1f5
 DIST python-gentoo-patches-3.11.0b5.tar.xz 4384 BLAKE2B b036e9103f8315d6e2bb6e85a2db12ec60f8e05ccff083183f24c0b4ba16c807a2eb1fa43b88f8d7a253d5bbeef0880b31d60e13b449f7de992156319753ef33 SHA512 af6315f97b0f2463d6c0f18a99a5ff5f96c3d18567ae0d73461f0fc82ca2173a8f6c3fedc2fada2b9460547a457d4264bc2acb90f1906599229afe85bcc2afde
+DIST python-gentoo-patches-3.11.0rc1.tar.xz 4384 BLAKE2B 31bcdc055bfaf3434dbb02543aaf66910eaccd01808d9a0e57bf7cb3b097fc0046c00ac44737d9c37e3b6d074c524f4dd3ab439a741e66d74a0425889ecaead5 SHA512 05b044e2d8f881c471528600ee300bfd9cf5160609dfb3d7cbdb8e43f47b681542582a85de97e28e6a3b89a3fb6c8d7398e029d31e20cea9c5a2a71700382d4e
 DIST python-gentoo-patches-3.8.13_p2.tar.xz 18816 BLAKE2B 8612ca33e5569319c5d1a5a3fb1a81e860bd515bfde656b79f087ccf7020923fbd06b315178bef8630e4c36bb22c27299fe439aadc6a161f1ec93be8778314ee SHA512 be5668a0a4be0a03e61466436973125a3be4f33a61524e4a5c8d86745727cfcae59e5048477887c9f6bfc09727f3aef3652ad47a13a6bf0f1452d3172f1c34dc
 DIST python-gentoo-patches-3.8.13_p4.tar.xz 23084 BLAKE2B 44be6b19275189bd04c9dcd3c4be4f4b8f92a0003710a12a12d60c0ab182942993a76d8d7f26b289cd0a4226eeeb9a39723822dfb896307fd6e75d6980c3898e SHA512 b78a39a15d361aed4ce887b4726c7967c09c0ee3add614f1dbca24b6f301bd20660fe074c03a58b325f8720ad853c109b334e41102de0b6cc362c467fb669feb
 DIST python-gentoo-patches-3.9.13.tar.xz 12836 BLAKE2B ba687a3d6e00baf4d9640ab78a29c3e21bf1872b5019198991521cf37bb0780f592db742ee4fdfe6bfb1cab1c1f6587889dfdb024cae72766b6c83c2ffe319be SHA512 e393992ff92625771c6ffeb500637862f0163c689c685fd245a6e5bbdd3128154ce439ecab56eaf1359e67ea0d173dfb19f65a4098ea2266922bfb43aba517dc
@@ -28,6 +31,7 @@ EBUILD python-3.10.5.ebuild 11701 BLAKE2B e83015ffd3bdcbceab4271ed82f6ee54d8b794
 EBUILD python-3.10.6.ebuild 11189 BLAKE2B b50f71bbb9b5a72724f52193aa114fc7ec4ceef3559649964899f9aec4911726503ab24ec4c07b53d2f15ba498844913d3618832763e9b3728d8f9303a97a3ea SHA512 2a09997fa8f451ab873bd039f47a7f4c1a146befb43c8b56467ea9fd93f61e7d55a90ef289804aa6d15c9e5ebc5fded62879eec8dccd528ab25e4df8d39e63a8
 EBUILD python-3.11.0_beta4-r2.ebuild 13637 BLAKE2B 230701d089c7e42f80b0666a1ac6c5d48ff6fe8a5b7822ee3d4cd41adfe6e50143ecde143e228416f97cc0886910b22bc0fbb83ffad3ad19006aebcc382516fc SHA512 ec7a302106654abefb0672e25e1f189506d35111be4a983ae5b51281bd195a452fe1fb7170b77f8048c880563664f8b9b3624c434594a4f3b36306a203e299e9
 EBUILD python-3.11.0_beta5-r1.ebuild 13385 BLAKE2B 00d7c1d17bd8ad3acebfde6907fc27f77abc91a25f3d3e576bb6895c46f7cae88a8cd6dcf883dc3d91d0fba36349f3b209a512fff70cf4ff950a7f52d3e7d548 SHA512 56442b0cd0b7789c30d180b07e2e77b3203720e66084340cc85923410d54ca2ff40ce9096af844cde217f44bbd4e95ed4f8e69f192130de45bf14883d5127982
+EBUILD python-3.11.0_rc1.ebuild 13384 BLAKE2B 7ac3f74190fafd1321f2ae9b478cb1b7381f13ce88d1839bbe2eea12a9abb0f14286f3e6036ca65c2d37ca6b07b62c14f557a7af080f6f05f119e7bbd77764cc SHA512 3b94a9e45017c0ec3d2bb2ca346d423a0e31d3b1f2c1fa098aa2c4f0af58e49f3626688dacde9740b2c1f44c63f143bf43ec305d0ce69c3e68de3ff6ae0a88c3
 EBUILD python-3.8.13_p2.ebuild 10219 BLAKE2B c736d7417d2f7c8f8a6ee61182e1b2b9e22873343594a3779c83fc1af03103ae71f440f856d7dae7a661dc7190e70afa7c478dd7d8531d28637897c1ebd4106f SHA512 89f482e716b308565f41c4c6ce1db32f9a4023a41570070ddad4ac9d156f802d79f8ad7d2971b9ed02487482c50d8e4de64d212df092dd907d2c94838e6af921
 EBUILD python-3.8.13_p4.ebuild 9739 BLAKE2B 7baa8adde29baaea89a9f126a3090fba2186bcb2734ca737705c97d1b3f8d3036341ab2b626dc6e4cd5ab7630e386ef7f3444bb5847b79abf41806e2607715a6 SHA512 80ee67adf3b1c7461edb6b3ba60f5f825d93d89cc68f4a11b1de2bf84f4cb428718cee8079e68b074044a8e7f00d2423c97fc0cc3bfaa0848b6154b9abc3d6c7
 EBUILD python-3.9.13.ebuild 11462 BLAKE2B cfa217f58ee03528ce5dd467daa9023c67f89d4673def5a183eb7a0c2db6fe40527a78067803f7edcdcf32eef5dc72179b9be9d9a04f5766258945a4a16e3991 SHA512 4a7fbd6f6e7ae1fc1726a170879e26a6f7e74fe4fc2b52efacf5608350bd967ee52d63df4fb8d52aebe881bc003285e29d55fca5aedf74182cdb5f8b120ca8c4
diff --git a/dev-lang/python/python-3.11.0_rc1.ebuild b/dev-lang/python/python-3.11.0_rc1.ebuild
new file mode 100644
index 000000000000..77ad9301d29f
--- /dev/null
+++ b/dev-lang/python/python-3.11.0_rc1.ebuild
@@ -0,0 +1,482 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build +ensurepip examples gdbm hardened libedit lto
+	+ncurses pgo +readline +sqlite +ssl test tk
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-crypt/libb2
+	>=dev-libs/expat-2.1:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	!!<sys-apps/sandbox-2.21
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/awk
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-python )
+	!sys-devel/gcc[libffi(-)]
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+if [[ ${PV} != *_alpha* ]]; then
+	RDEPEND+="
+		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
+	"
+fi
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# https://bugs.gentoo.org/850151
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs)
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-x test_gdb
+			-u-network
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+		--with-platlibdir=lib
+		--with-pkg-config=yes
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+	)
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	if tc-is-cross-compiler ; then
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross to satisfy --with-build-python.
+			--without-lto
+			--without-readline
+			--disable-optimizations
+		)
+
+		myeconfargs+=(
+			# Point the imminent CHOST build to the Python we just
+			# built for CBUILD.
+			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
+		)
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS_STATE=disabled
+			MODULE__DBM_STATE=disabled
+			MODULE__GDBM_STATE=disabled
+			MODULE__DBM_STATE=disabled
+			MODULE__SQLITE3_STATE=disabled
+			MODULE__HASHLIB_STATE=disabled
+			MODULE__SSL_STATE=disabled
+			MODULE__CURSES_STATE=disabled
+			MODULE__CURSES_PANEL_STATE=disabled
+			MODULE_READLINE_STATE=disabled
+			MODULE__TKINTER_STATE=disabled
+			MODULE_PYEXPAT_STATE=disabled
+			MODULE_ZLIB_STATE=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the --with-build-python value
+		# immediately.
+		emake
+		popd &> /dev/null || die
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# force-disable modules we don't want built
+	local disable_modules=( NIS )
+	use gdbm || disable_modules+=( _GDBM _DBM )
+	use sqlite || disable_modules+=( _SQLITE3 )
+	use ssl || disable_modules+=( _HASHLIB _SSL )
+	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
+	use readline || disable_modules+=( READLINE )
+	use tk || disable_modules+=( _TKINTER )
+
+	local mod
+	for mod in "${disable_modules[@]}"; do
+		echo "MODULE_${mod}_STATE=disabled"
+	done >> Makefile || die
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	# Prevent using distutils bundled by setuptools.
+	# https://bugs.gentoo.org/823728
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+	export PYTHONSTRICTEXTENSIONBUILD=1
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict /usr/lib/python3.11/site-packages
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# this just happens to skip test_support.test_freeze that is broken
+	# without bundled expat
+	# TODO: get a proper skip for it upstream
+	local -x LOGNAME=buildbot
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.11/site-packages
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	# -j1 hack for now for bug #843458
+	emake -j1 DESTDIR="${D}" altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"sqlite3 || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
+			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
+			ewarn "installed previously are no longer valid and will be regenerated"
+			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
+			ewarn "when installing some packages and checksum mismatches when removing"
+			ewarn "old versions.  To actively prevent this, rebuild all packages"
+			ewarn "installing Python 3.11 modules, e.g. using:"
+			ewarn
+			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
+		fi
+	done
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 063f23e071cd..84337944fd48 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libliftoff/Manifest b/dev-libs/libliftoff/Manifest
new file mode 100644
index 000000000000..4f8b18dd04b8
--- /dev/null
+++ b/dev-libs/libliftoff/Manifest
@@ -0,0 +1,3 @@
+DIST libliftoff-0.2.0.tar.gz 31359 BLAKE2B 70ad8c5ddb26eafd320758320085907ab4f2aee367013c7d342bd4c0a94074edf2e48248b27d78a07c3ab8f4b02e713fc741d5446a2cbbfa5e88dafea6e361f6 SHA512 b2e9dea31c8635f1b1f0e2e80aefb3e1ab5aa968ba205f6813d43d406e3aaa22e4dea5d2f3024a2b5e927d5757d23ea66bbcd68219a1a6fb7fce87c99e766d34
+EBUILD libliftoff-0.2.0.ebuild 424 BLAKE2B b92b27a48682fb61d7c3cb5c76b658f6ef5282a529dc03238815a1557b520fad8c7f3513e0dee2d6342f3502f7f496f1a206c5c9d99198d7cb071345528f8f13 SHA512 92d3c14c6ff8be3098d101fe5fdae9d41351930178efe871e1c4560be74395a3603e4f0025f0df5576a9f4296d42a64a915626c4d8d134d8c598e5c0f749bfe2
+MISC metadata.xml 248 BLAKE2B edac7e3ba8c55e21f79f34bf97705bdd8ceb89a6433c8bb250caa9e0549ac8960551566884194fb09ba596c54fe5166708c66f4d3185389c142f6fc08c53763c SHA512 c8d7e336ee4062bfc9a9fb25250d7388b837e839dc641adcbb9caf1bfb80b197e1f6171cc7842ca7edfbc26c27db5ee8b348b4e35f5a88dd5f8dbc7a8031108b
diff --git a/dev-libs/libliftoff/libliftoff-0.2.0.ebuild b/dev-libs/libliftoff/libliftoff-0.2.0.ebuild
new file mode 100644
index 000000000000..bb61df9cef3f
--- /dev/null
+++ b/dev-libs/libliftoff/libliftoff-0.2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Lightweight KMS plane library"
+HOMEPAGE="https://gitlab.freedesktop.org/emersion/libliftoff"
+SRC_URI="https://gitlab.freedesktop.org/emersion/${PN}/-/releases/v${PV}/downloads/${P}.tar.gz"
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	x11-libs/libdrm
+"
+DEPEND="
+	${RDEPEND}
+"
diff --git a/dev-libs/libliftoff/metadata.xml b/dev-libs/libliftoff/metadata.xml
new file mode 100644
index 000000000000..96b4fdc27920
--- /dev/null
+++ b/dev-libs/libliftoff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/tree-sitter-c/Manifest b/dev-libs/tree-sitter-c/Manifest
index 7dcd93ffe298..57b9210acd20 100644
--- a/dev-libs/tree-sitter-c/Manifest
+++ b/dev-libs/tree-sitter-c/Manifest
@@ -1,3 +1,5 @@
 DIST tree-sitter-c-0.20.1.tar.gz 244061 BLAKE2B 94cb11c80fd54a89b3c6c3ebc7937fdaa077a11c5128866e0e43c970bacc3b7f14743b3f19ceca515ef70d4499d2d3893fce6d948ce9a42bf2f499c58844a8da SHA512 b2f5b6d54fe05e7706708b50a5dd821a5669a121c916da4de3f80b6c57ebdd99f12f37c80051a8719f9737d4b0c00542aee62b45823dbb878acd4e02974f7a67
+DIST tree-sitter-c-0.20.2.tar.gz 249711 BLAKE2B f5f0ef1b15ba0fc216c082c973d6a52e79affb6075bc7fcf04e7ff93209b4624f4e9b414440fe6d20c0ea0bed5f3d96f538237c2fa365b919d6c280f98cc54b4 SHA512 ac559ee1d29bb77ce3cade02cfa4ed95c24cea7b84844df6521ebbf6213894c6f91499eb782e04e5e778091300f0043d59b9324a78d72d9bea4f40cc67d56cc1
 EBUILD tree-sitter-c-0.20.1.ebuild 280 BLAKE2B 2ffa82c71779586e1d17db3d0e8b075ad53d49927aab613a936653b1c70e3227d60481e1a78fcfca200718a1f526fa1704362907097a146e79abf68b3304edab SHA512 c0791c8673d269daed621431aa4ba38a9f28ad13a012cdd3a9d41df0d0b1556fec4ddfca48067eea94b13b159256d9c0eb8f99f7bc8dfbcf5338544f38efe8a3
+EBUILD tree-sitter-c-0.20.2.ebuild 280 BLAKE2B bab7c214cf78d4b44ad03665139162c6a1fea8e3e33f8b68bb07b2ab02163d61966bc964ff19feabdef3e65d850b69d46aef5a2b08889d3888399abfd8470544 SHA512 20a5b181c585ff85f7ade897da0eefe56f612424f94f693c4474cc9b3297f6233d5daf05df375b4a2a076aac61af232b15eb63167be5d141d96bee764aecafec
 MISC metadata.xml 443 BLAKE2B c991c80494cc1964b793eb2ff67aaf92cd85c5d18c1a223bd61b09e9714a314c3594af86cfcaf55e11d5788e80f68578e8b7ffadfe63c0ab0adb2d250b05bb16 SHA512 e62b93fb4eb9f7a0bf2cdc2f8a25fc099f55289c040eec3d4f51a26e2497d6c6695e110e9019d435227856ef33da97677845e6a6b21fa0cb964acb309202c166
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.2.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.20.2.ebuild
new file mode 100644
index 000000000000..32ac75f4a397
--- /dev/null
+++ b/dev-libs/tree-sitter-c/tree-sitter-c-0.20.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="C grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 2c3cccdedd0b..80d023b89002 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -5,5 +5,5 @@ DIST weston-10.0.0.tar.xz 1774600 BLAKE2B b2b8fa4f7542aba03970ca8abf504f340f8f8d
 DIST weston-10.0.2.tar.xz 1776748 BLAKE2B 6caad07ffa8b9eeb048e8e8bd1383c16f373fb1170c3705fea070d3e3d27b68cb4678424866ea23d46ceb93d3fa01d305418501b387780c07d20cd583e006ce8 SHA512 1b9e9162bd13c2424c8c495274be406cdd5a5ea7f5901b5c5f87b46cca546e73e98bc4b55af17445e60c9544b34022bf9f9a915fc5133c50f607d376b064f2ff
 EBUILD weston-10.0.0.ebuild 3934 BLAKE2B fd140a51aeceac3251a2f5f0878cb5f4e37b630c4ad7807873ac041c863f490bb7845d29086dc17d169856dc8e9dd9a1e87c042b94c6e46ef2b5ae0810412ef1 SHA512 f48f41f7fdf96d2b1a9842150d57e1fd394b7e86725318aabb8bc472d7fab2483e1e4654c37271f13dc92efc92139e58c12bf8972d250028d9f7dc7dfd469921
 EBUILD weston-10.0.2.ebuild 3872 BLAKE2B 1375a741be055b8d4a107a4e1d340053bfa2d8e792efecb0a40728bae205124e02bdd34d7a8db5d190b9d85022030f7117f068c225a8492f4328f5eaecee73da SHA512 9f948f3bc883290e058244149c9de0e0c11132fceb9f8c142003765d4d7a16f438994ca8423c2dd2c1f060b9dcdacc516b3672d9dbf9c790dca817850fc5eacd
-EBUILD weston-9999.ebuild 3736 BLAKE2B 9529febf4619e0464c7e479a2c064ea3811c18a2dbe750656efd4459f666bf6f81669c1f3e62b82a9d10fe6e04b3f424251ff063209aefa7408d81aa0e6a2948 SHA512 fea8d317c942d84333ffa7456f78eef654a0127c94fca386ca2402234d156a919f2223fc0daf2b2879f33c17c930f3f3e31c46df98d3a2c6f7a3cc8e5d20dbbe
+EBUILD weston-9999.ebuild 3627 BLAKE2B fb6f6b6da4940df21fe57f99d2913b78393bb26937fa99a723f8f0c3333f00890dec5a535a7659f0ccf8392c4417f74b5d5ed9f92f5bb9093de4a34bd110696e SHA512 cb80ee020ae5ad8626adcd347e28a69a744637e3b09b6ddd721c99b0b62b8d778c88d39247a48b70cd6109f4127b8e6e88da613a3d0ef6691034f820bcd5287f
 MISC metadata.xml 1520 BLAKE2B ac2338fd000b3549fa197f281e439a09974d1bfd13afa766f255727a58a793fc8b4a6bac2237afb59029d11b02fc7d1dfb69072d9db227dd6f7db783fd842fad SHA512 434b1fa93ce9e1b8329301333ea47b73def8377c068735ad12d57bd5fd2ebdb5fc9e778b8df04bc4ac7b71dc7cc004fd8750581a17624d3cb3d2ff6faf81218d
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 2056e5ec50fa..94da35c7886e 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -25,11 +25,10 @@ fi
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="colord +desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
-	colord? ( lcms )
 	drm? ( gles2 )
 	pipewire? ( drm )
 	remoting? ( drm gles2 )
@@ -52,7 +51,6 @@ RDEPEND="
 	>=x11-libs/libxkbcommon-0.5.0
 	>=x11-libs/pixman-0.25.2
 	x11-misc/xkeyboard-config
-	colord? ( >=x11-misc/colord-0.1.27 )
 	drm? (
 		>=media-libs/mesa-17.1[gbm(+)]
 		>=sys-libs/mtdev-1.1.0
@@ -113,7 +111,6 @@ src_configure() {
 		$(meson_use ivi shell-ivi)
 		$(meson_use kiosk shell-kiosk)
 		$(meson_use lcms color-management-lcms)
-		$(meson_use colord color-management-colord)
 		$(meson_use systemd launcher-logind)
 		$(meson_use jpeg image-jpeg)
 		$(meson_use webp image-webp)
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 65494548315b..14a810a0c6ec 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index b28e0747a7c4..b217f7102aba 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,6 +1,6 @@
 DIST ansi2html-1.7.0.tar.gz 42189 BLAKE2B 91c7409b4f8b7503e719489b18e9d7267d80c5259b7481f127cb8d1e6429649249b0832746285efc3e8a4f90ca8f21b872b002634d47a4a54ddfdcc74df0f576 SHA512 bcae0de9874899bd8440853b8279f3b2c4ed46e24bf807221ddc9d1bfa39647e2efd178aefc2fd39bad27b53890270b6ff7c150a0b8e74581b8323ef7a16c977
 DIST ansi2html-1.8.0.tar.gz 44146 BLAKE2B 66672927a64ad38dce0b0819fabc3778f6aba82d176e992630a8db076988a21af8dd445306b8bb580f1539b35044b95de749d6bfb65c27f9b431e4cb6bd562c7 SHA512 cbdda41f206ced5b19761a1ff9747acc6cadca3a5a2f58c97c6073db7d517e59fea7601bba28a8e7e105f3c0c9c4d78ca4f242100cbded6c8a9ca2d598de0ab4
 EBUILD ansi2html-1.7.0.ebuild 1225 BLAKE2B 22da4cbc4407e2f8921fbc4ccf1f28c3e33e441dd129acad36000417b0f1088bb608a73c9a20123e833ba24acf21919b7f7605d682ff78e31359efdc1233bbbf SHA512 b428dc5cd02c81b8002f951becc68192320ad9c8adca1d77e8f0d9af5ec3899f9741b0d600ca3f793fde48a407a904c6b259cff4bf21d70823658b855001773e
-EBUILD ansi2html-1.8.0-r1.ebuild 745 BLAKE2B cbdc9158d87f858d8bd471afcce71351575f0a27fbce6b6ba95c1749f38da7ac356f3a929ba9850b7ab890966daceab92288a0dc8e3f726e583d9af50e1aac75 SHA512 8b1b1db98380efac7944a87af2e89438d64ed620f1447cb0bcb5162de3f68755522d387ca4a762c28dd57339b63f2ca8c25ccebd05c43ff4563aa18a28e98b3b
+EBUILD ansi2html-1.8.0-r1.ebuild 742 BLAKE2B 380f51661ecdfe136a5bb1a628081c3433231fab9445656652afc5e0c17780aaca8e2509c10a6b107df65b810e5276048a4658d652633d0c9085b1e3b68994cb SHA512 8878db115faff206b183f5905bb5f66cbc9c6ba09b95f8f6630cd99a5a0a228f0e2ecd37c445e1769d93b5bfd49ca286c73c8a65b2e9c3a64f8340bc5cf457b6
 EBUILD ansi2html-1.8.0.ebuild 956 BLAKE2B 6ef8144a9e0f8854e78553e67ebad97ac12ca9569ad6215bd1372704cff15c69c86b712f97eff7096815f16bd73db9b351b95cb63aa73bee4c70009aaf2b86b2 SHA512 c75224640c51ae057cf0d53480645cee9c9ecc84d686f2c1f208dda3a59ad19d29914214026225414f0a9acfeb088c5298bd9b0ac3f4e6fc9f778be923f53a20
 MISC metadata.xml 406 BLAKE2B af6335def83547635dc916a45f1d9296faa0e1806237eeb76deac4ea28e701549bdc7fc9cab7e35b84e8f5c32e31ac7bb22c924865872326b70485acef36d517 SHA512 ebbf8d50e3c798cd2889bec1f5bd3f827bbedb9bafe4610b88fa18b1805514f156351786461ae558769f1ce299174d50ee06c864e008d013b26a6c1afb10792e
diff --git a/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild b/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild
index f4df310fdf7f..2d740d2b891d 100644
--- a/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.8.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 arm ~riscv x86"
 IUSE=""
 
 RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 593b241369d5..e39b2e606640 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -3,7 +3,7 @@ DIST astroid-2.12.0.gh.tar.gz 429498 BLAKE2B 4daf36a96c1f47446558ef223210becd78d
 DIST astroid-2.12.1.gh.tar.gz 429733 BLAKE2B fe55fb38ed5bdaa70371425f8e7bf11d52d0cbb70cc94d568614f507bf716b66d7c54e98ddca6b2508384234b330ef880c4847826d9e0907bf724e1a06aaeefd SHA512 586c094b577f1d06c5cfe90b54a220ca331657a2c5f9daf3fadc26795a631b8edfdafbd4ac7988aa3fbdc4527ca0ea3392cd38fe15c9444f5471d9bee4bf90d4
 DIST astroid-2.12.2.gh.tar.gz 430857 BLAKE2B 8b34366368718cd4329298bdff3b761cab59b6bf8b856660912ef44bf1766136573145630b5193481454a4bf897ae950c5b6f7bb3611d3d343dc4f3adb2e5906 SHA512 3ba484bbd98b196b4241fb8bb9405b48a1e6aafaf318a67fc9264c8c1679f9d6b6788b8139077b60c751b0a26732b905196b3bb48671da2aa15e1c323bf396d6
 EBUILD astroid-2.11.6.ebuild 1786 BLAKE2B 56b20263f11843ff7b511229e3cf7af3cf61b0ae95ae0a12409fe6895b7f232bb85ba9286940b80291c4264223b9bbbcd406ffd2f7f88a029205fe195dedf50f SHA512 90e3ede82dfd55199b56671640c30adb0252df7deb49257a730a7ca13b8186425dde611b1b2539a8c5bee076bcf9dc0b96bb160276036033277022b2d516d28f
-EBUILD astroid-2.12.0.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
+EBUILD astroid-2.12.0.ebuild 1808 BLAKE2B 40ae0cdd718a0e862da50b8ff0d01081ea02b75c2725cd1cb5b18aac82c0472d9357ed135e1b5d3c3ae7a2311ad51a22edcd5d0510e3ea8a6b97da1c15e6104d SHA512 92747d9cc013de6177180c065cb1f5e92d206245d544d4f630e44592ae000cea1b15d887ea0ec02b1b6c0567b9c43a938fc91fdf14c82417c90b7f41536c2b29
 EBUILD astroid-2.12.1.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
 EBUILD astroid-2.12.2.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.12.0.ebuild b/dev-python/astroid/astroid-2.12.0.ebuild
index de2148b20e43..632eae5577f4 100644
--- a/dev-python/astroid/astroid-2.12.0.ebuild
+++ b/dev-python/astroid/astroid-2.12.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 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"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index a2db988e7cf3..3926ceaebb04 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -2,6 +2,6 @@ DIST autobahn-22.5.1.tar.gz 435571 BLAKE2B 5e596102b639228d95cea027a0e7187adc4f0
 DIST autobahn-22.6.1.tar.gz 467355 BLAKE2B 54015ee50fa45f23fa589927da232b3ea523efae291b56b44704b66d171075d9459f1c3cf6b96b34fec119deddd2731ebd0695d49345a724bc84b57d7494f332 SHA512 b99f9e4508650fe9484e680b0cd9a0023935445b26ea42fce7565152a5692fc0d1c80f9854b4b3b3004ea17f60d13663477a8710e977211509a14dfad973c635
 DIST autobahn-22.7.1.tar.gz 476789 BLAKE2B 4860a6ec1a2631986dd5d8e94069134e75650eedb67dce18dd4c1e8ad45bd76ca183b4dcbca6ef4474c25f6feb4a1407c9fed4c74f0751e9c0c7fbca2b013406 SHA512 ea2c4d61d3f0f8ef35a31b599bc432781536dccaa316cda474a61003b10df0ef6346615d16228848cc5acb24a4e5f4c50be1fe759daf35b629f636da55688137
 EBUILD autobahn-22.5.1-r1.ebuild 3681 BLAKE2B b243c031a8db9bbb87b668ea39f2b3f674d05c054590889d5b7b2f7309b124762e59d278e2eb3e40517344995bd7f8892dcf6fc3bafc5a5cfb80e621ecb32e15 SHA512 c779c1d38e54f125739b178ce06278b98735ecee1dfecdbd98c21f0cb2c1eddb58e6f05a62aca166f1d43c26df5f52ed3bba55c4a027813dfe1aaba3fcbe7ba8
-EBUILD autobahn-22.6.1.ebuild 3685 BLAKE2B 38a2c5e862d2d284444ca0e7483914cd7dda97303580fc85c65e2c3f99596baa5208db8480f199681e02be6cebdd2d21f79369d3af9b5a61126a25b936b3a9e2 SHA512 8c729eb36a389c05c262181e6b2e49a43cbe7873172155a60cfd994ef13e9554c185095529bd8edda6cbfddba140686be7aebec7d7825f03eeb1c3f80ff9d262
+EBUILD autobahn-22.6.1.ebuild 3683 BLAKE2B b2f6b476326fba84e3321dde12b89ba00e1729da8186f15c8e1b4a032aafcc841248559025b32226f22180587e4da3c5dbfc959502de598c0d0fba95b25a0cf8 SHA512 63448a6575aac86932afada0bbf63509e8c6a3acccff62ac805c3c090c57efd72fe93b4e115b739c232c58abba7b98236fb399c9155e2944693cf4099d447221
 EBUILD autobahn-22.7.1.ebuild 3696 BLAKE2B 41c24bc853524f25c4ca94118708cbfc56f733dc0e06113343f2126305f63d6fc00470500db12a965e476a5e97684e077425a29301bc73fc3c2694b4775c2f38 SHA512 e9a61719bed1b14d39626acec28d255a7908a3ac73d99439960916d20d70a48ce7023f429d3b3cc0d38a7076fcff2cc3a62a9dd91f1af755e22f6ae45af5c221
 MISC metadata.xml 596 BLAKE2B 07cc4fbcb4c6fde6b1bb49a0a30fa8d2ef7ff4424397e29053a6ac89d87acd9fa7b1897c5381910d53f590192945a89a5b987fcdb9595e42f67f23333010a0ba SHA512 4d4cecf09593ec201711b13de1820e59f007f745b41611471ec737da4d679323787ac06a3a987cede9bf2c8dff71c9dbcb197e6a9c9109cf4d3a34d9247f9962
diff --git a/dev-python/autobahn/autobahn-22.6.1.ebuild b/dev-python/autobahn/autobahn-22.6.1.ebuild
index 1d5606fe61ec..71e1aa99c055 100644
--- a/dev-python/autobahn/autobahn-22.6.1.ebuild
+++ b/dev-python/autobahn/autobahn-22.6.1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 arm arm64 ~riscv ~x86"
 IUSE="test xbr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 9161bbd92698..724c1b0c7ffa 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,7 +1,9 @@
 DIST aws-sam-translator-1.46.0.gh.tar.gz 1082378 BLAKE2B 915f09ab6ecdecca7cc149ebd93d7370a3cfd103cf7e222fe5f8aefe084a8f285606a7a18467d996d643c70b132014d7ebeeb6d313498b8879ad13d905f3afbb SHA512 c33edd6209d7051a0d8132cdb675953a691f371e4ce02207d047be03211aff4d4c491c0f8d0fb8776a0693ff702d24ffc338d005bc9c6f166658e8293e478731
 DIST aws-sam-translator-1.47.0.gh.tar.gz 1087660 BLAKE2B 47e13a468f2ac0015683acb187a83f0e8f8b23162d4cd1b70eadfe36d3e10ea19259f2f313beb557175456f3455da3b08594207bb013cc33d30e4964ddec8ba8 SHA512 29af2b6c51384c906328d839f412dddbf0d9fcf07e77484567fd6c63be44d152b003087595530e20c63e504bc2fc27cc041c4cf21aab070240b6211a93a2dd20
 DIST aws-sam-translator-1.48.0.gh.tar.gz 1098247 BLAKE2B 99f3c94f94535e1ccfac5e20a2e403d7be6867bf7a644390a0aeb3444edaecf55d6b9454dd01c09ab12693c9abbf9c2994ea018f636f759f0f2d67e364ef4dd6 SHA512 150447a0068e056f38b246f27e3c5db831fb4a01cbc302d6203713d935a480bcd8d758873819eda02f2a4bf5a07ab397cbe63b6006bd053c5589b3220515eb65
+DIST aws-sam-translator-1.49.0.gh.tar.gz 1100512 BLAKE2B d1c5cbdcf4b4bd53b2d3fb1fa4e945a38294e2c4da0c3d1479c0d43191045a8b4c85edcb008e7e843830c203f795b0620607046d0715a922e8dc4629be781961 SHA512 b614438f6dd7c903f7817a66f26d18026b909011cb48adb19c23f1897e6657bc997a964dd1282d7da37d782aafc0c0fd503524ae0024a682bf06ee2e15020f27
 EBUILD aws-sam-translator-1.46.0.ebuild 2296 BLAKE2B fa619349b1d53e29f090ca641a7e4d926f2b69d4d6406e93ddc3cd7413b97252d61dacd94bec36fad3596886b70a8fcc037ea004c1918e7d08054899aca555a9 SHA512 f4baa83bcafa8452758d4977b20b4b0df4924540ce3bb08fbfb4488fd983af8365ede182503859bdb87b005dfa7645a791d7ceebbb3d2637ae2bb9351ad36d90
 EBUILD aws-sam-translator-1.47.0.ebuild 2298 BLAKE2B 00b0c58231c5c470c4fa9c5a8a45f1d6328c96183af14b0ebd5f3050401df631704f76f35d71ece3a3853edbc10553edd2eb85505c5b5ca5efc515583ec51037 SHA512 7d2b130306f5c0a0abd8bc582b6a0cf451e28f7950d6c78bffc8c6c667f057a7e3c7e2baa49d3fef49f99d3adf2b4131a72b9e08d7ac168b12d3c6716fb5d002
 EBUILD aws-sam-translator-1.48.0.ebuild 2298 BLAKE2B 00b0c58231c5c470c4fa9c5a8a45f1d6328c96183af14b0ebd5f3050401df631704f76f35d71ece3a3853edbc10553edd2eb85505c5b5ca5efc515583ec51037 SHA512 7d2b130306f5c0a0abd8bc582b6a0cf451e28f7950d6c78bffc8c6c667f057a7e3c7e2baa49d3fef49f99d3adf2b4131a72b9e08d7ac168b12d3c6716fb5d002
+EBUILD aws-sam-translator-1.49.0.ebuild 2257 BLAKE2B fd134b743ab8affdd452652ccabccb31122939c458dcd52f2019a0290c4a2725ac5a0b10fd102e71929f41d17037a2b7f10c3ef2019a022b94d5a80b79e691fc SHA512 756fb5f4baa0b7647d7af262ff895fcc5605cfe8fca0d8089f90d62e5ff846b60d0432a8df5e4a47487b289f10b20b3b4e7f9ec8a1927cc6b17cdbb245cec13b
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.49.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.49.0.ebuild
new file mode 100644
index 000000000000..4194237c6fc3
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.49.0.ebuild
@@ -0,0 +1,59 @@
+# 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="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
+	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls
+)
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -i -e '/addopts/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index 53bb642af610..9fdf5f7465ad 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -3,5 +3,5 @@ AUX debugpy-1.6.1-unbundle-pydevd.patch 2908 BLAKE2B 2c9ef22ce4e00f8a7bafa4097bf
 DIST debugpy-1.6.0.gh.tar.gz 6366079 BLAKE2B 134d2adcae6ec926dcdb7161f0874b830a1d0e3c55abb991f4861fa5a58045437ee4f4cb4c9572b902e3e33634bc3f9970ae055985b983d89d0ef1d99561bda8 SHA512 fe245d4ff751a6c2ef0e75a5249f99661b78075ac62c931c20e3ccbc9389d39a08dc2fda44a33eb23a0a76e5ee339edae439b0004d130cdfe421048f3cc83962
 DIST debugpy-1.6.2.gh.tar.gz 6684477 BLAKE2B ab1bdf394d3447ba347db149e5c4c36820df6df24c5d0984fe862419a490cea21b240322d76644bc9ebadbdf9a6d6c8709ae28452828d42b45d65edd2d2e58cb SHA512 64ecd9f8290588358abcff538f2c68025f14efc38ac5b406f32cd40a580aab90e0b2f145de90ca81943872c70969d6294ac51b3151bc4e03f18370ddfbb9ac6c
 EBUILD debugpy-1.6.0.ebuild 1102 BLAKE2B 7d06281e8ef9398df0abec8a4f80343164406d12309612b11c2427354cbc10c7ad87eb6c2b69cda51238d3747d7f67abe70a6112feba12571316e5521f56fe2c SHA512 bdc106ee170b4d9b72a7e85da442ea64d5dc25b668fad251c4d9ad494d09b40c6fe58e047dc4707aa3439bfeb90ef98d6a78838c56aee06504ea2eef94a9f27f
-EBUILD debugpy-1.6.2.ebuild 1140 BLAKE2B c7f27f9699c7f841bd6dd862161b21cefce64591e0804e95d57bdae70a0f0f7c5b31abe85ba688b7386918dd9026f9fcc0740208bcaff4d49254f7d8163f690d SHA512 cd4e41d850a93ea169fa20542c38bac0c280ca8dbb0f186a48105c63a7ab96f067c6c60696c76189b90e264b45b1d58e62db4bb9e167680b46c672011f5d9fd5
+EBUILD debugpy-1.6.2.ebuild 1138 BLAKE2B 6c4f05a780e3a5ea01f8e6e364387fd54cb955b3890893ae44ce15186c8551ce2fb651cdca511ab63b110b323a5fffbc4fee3091acd0f3c545d71e12f4d66a72 SHA512 b02b4e267308a81d36e69794ba56b4fc08c447cc9a816d4d8ecf39373a093447c011264758af0c242a1a146cecff84058f89f3de73e50c9c4f898281da726b46
 MISC metadata.xml 451 BLAKE2B 671153316362e0394ae59824e67f5ea897615d3853552aa92fb273d4a41a88916cfe03650ab42248ffee557cb95149b21160395e0fcb2f1fd69bb3bc2c97ea55 SHA512 393d4898c3555b425c34dad5f540f42fc8e281f6299360d1192d099e73486467c92ed16ca710e34d2868aec63fca2eab4775b86e95e6dea79b8721ff70e1db87
diff --git a/dev-python/debugpy/debugpy-1.6.2.ebuild b/dev-python/debugpy/debugpy-1.6.2.ebuild
index 87982f97e4bb..cbb4ada9728c 100644
--- a/dev-python/debugpy/debugpy-1.6.2.ebuild
+++ b/dev-python/debugpy/debugpy-1.6.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # This is completely broken
 RESTRICT="test"
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index 569ceeb4ce30..73f4b83116b7 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -3,5 +3,5 @@ DIST docutils-glep-1.4.gh.tar.gz 6758 BLAKE2B 92b519022df5d8ac90b7eae15a08e0f073
 DIST docutils_glep-1.2.tar.gz 6771 BLAKE2B ecb17f69dd2edb12d81ea1bf90789564e86b921125c20913134500dd53ae04b0962141183cbcb9bd17af904196ead2228e4c80a6e256576b715ae6323afadc30 SHA512 696412447120893c198dcd9f13e042d20b35465e83ef8b488ee2f1c184b5fd3928ddbf10ed4e78886c4c72dfe1f9fa46c1f75c7997990afcc04353b5d59ebf9f
 EBUILD docutils-glep-1.2.ebuild 658 BLAKE2B 11210c6707f5b9d1f863389fb9506690621ef936b9e5d76302339000cfe64d57445aba8474119c34e153c91fe5cc8e0b62bdae9e011ca3ffabc78d73bca9cb51 SHA512 b953d35d3fe58464e84a4044ec4d8fcc79a5f87e677e4a9c83443a25a13f5ad19ca3b84ea9c072b630eb3217f667728cd891360901e67fbf4d0e80b2fe9593fa
 EBUILD docutils-glep-1.3.ebuild 753 BLAKE2B 97a14b09e92cd2f4a155581f538aaf8517b7252c7337cc4acd0c116badbe86c83186d42aa5f51cbd2f53a6ff68e36714d48c781eea32b7068fbb2564d530f113 SHA512 566e256aa50f3a1ae0af798ce179a8e80957ea98c5fccc8be83d8f935a70e28bdf481a621a89dbbb1ae8405e364ed1ac4f0c8a34cac570e66d6b1b78f0aac622
-EBUILD docutils-glep-1.4.ebuild 753 BLAKE2B 97a14b09e92cd2f4a155581f538aaf8517b7252c7337cc4acd0c116badbe86c83186d42aa5f51cbd2f53a6ff68e36714d48c781eea32b7068fbb2564d530f113 SHA512 566e256aa50f3a1ae0af798ce179a8e80957ea98c5fccc8be83d8f935a70e28bdf481a621a89dbbb1ae8405e364ed1ac4f0c8a34cac570e66d6b1b78f0aac622
+EBUILD docutils-glep-1.4.ebuild 747 BLAKE2B ba1b9d670cfe99cdeccce8c7ede95fdc17455bdc495bba341957b4fdcda19d980b9fcc4979456b9a5d08451b367ee9e5626b3db114e5cf0f90d5bd96d6253b95 SHA512 93dbd724d7030d65c89824b53b15ec7fc0da180e2d3fbd635aa7bb4d7ffe7069d1be270e3381868d85bc4274377c85a53c1cf820e934306965abdf686a665d01
 MISC metadata.xml 509 BLAKE2B f45fe783677dbdc1238885adc25cad6679c816319049704d11620b527d36f57dd8a3a46eff1981c176776bdaf7caa2cff9c88996a31a8171f658db0c95f4a676 SHA512 87042d6122f394f2329ebca60df6d638c1b28afd6a35a01546e075103bd26907235ab77ee0ca79a329fcccc624aeb361c31dde530968c513b40a7ac4328486de
diff --git a/dev-python/docutils-glep/docutils-glep-1.4.ebuild b/dev-python/docutils-glep/docutils-glep-1.4.ebuild
index 7901094e4045..55b62ed77009 100644
--- a/dev-python/docutils-glep/docutils-glep-1.4.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 38c95561fdc2..94eca785b654 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,5 +1,5 @@
 DIST dogpile.cache-1.1.6.tar.gz 393076 BLAKE2B 62c16ee7cc00608432d45fa7cb068300a4417a494e4580a2af5c3f7c5a0bf40a54e1b6f4924bbd7b40a0efc1cb9afb42f361811c257fa77eabcd64cc35fbcf51 SHA512 179246abf598675cdef988b463df4997c7eed8e7a110c22704052f905b65ad537b22ba28d7c96a28b2aa85b3e83ac42beb36843dc78ad503d41225ea1f9e7e77
 DIST dogpile.cache-1.1.8.tar.gz 394499 BLAKE2B 3371e6ffceb6629200a18095a20a313952b8a246d2ec7580e6409bde0f16851f8332922647b92383b47276933cfeb818dde6df48efd2534df0f94cbbc511e01c SHA512 2bacc111e17ecc706b3389f5c40ded888cc893f6d01c34a4e1e0d8d94c4592369b0c283aa80eb6ebec90dde7a89fd3b7fb9bbcbdd8010f90ad7de4501db13ace
 EBUILD dogpile-cache-1.1.6.ebuild 764 BLAKE2B eddcf9fc01c3942cc1292bd2dc4e5ab10abd6162a20824f4b6ddd8c6c26fe34f974750e5a6acd853fd36f039f8c70d9121cc08ac7125e45c4f43556996568e4c SHA512 029b30a4b8233841b577755fe1fd516161afc08900d2d8131ceb761e27237274ab206bd7ddaaa599bf9758fecf0641f8f1bd76fd01de2078f692be76fc92fc96
-EBUILD dogpile-cache-1.1.8.ebuild 765 BLAKE2B 74e7a3620be0721533785ed14f4f0fe32c74e9a653c49fd48e5cf829a15fcdaba9886ef9719aba6b86211c10fa39b487e199363bf45099dce69d7c5bebed5869 SHA512 8c4ba3f8f0a3b2701ab59492bd58306951f9ab72087e969feaa56f97f2ae5015dda333da80f2291a5cc7f92b525aea229d91bd214cb9e692a021c3e674a8f25f
+EBUILD dogpile-cache-1.1.8.ebuild 762 BLAKE2B 68ebf2112bff436d7c4745c4c1121b0be2850b84bd1f21243aa79168e1aefa45c53ffc3b652f7e41634a5e6b7da8ac640544e36e0b5703ad9c4fc7d1a35f1023 SHA512 9c497ded0e12b68e0bb2d32c24636c004423a7dd6b8964a86af41cb91fd101d509993aa4a5ddd833d3ace63f1e038716dfe31815eded4f7a4f1c525df17a39c7
 MISC metadata.xml 843 BLAKE2B e0b6ed26300c658bb3f9bdc500bd24c38f26821d3a32ce448c56e5fd129f211efd58ef0faab1a6a9114a96991514de5fb9cf53b26601cb68fedb4c43aab3cdb2 SHA512 992ae84d983cbc06969e888e298cf8124dcf6068871bd5e12dd479a70ca00f5422d8c3cc178a842a340bffc5f72a5b203ce307ccbe49a0a60c0c52a5091052d9
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.8.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.8.ebuild
index 6223cbabac68..c1124b64178f 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.8.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.8.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/flit_scm/Manifest b/dev-python/flit_scm/Manifest
index 2055f13f9b0a..d4c680a2d4f6 100644
--- a/dev-python/flit_scm/Manifest
+++ b/dev-python/flit_scm/Manifest
@@ -1,5 +1,5 @@
 DIST flit_scm-1.6.2.tar.bz2 3230 BLAKE2B 3977f1be820f2f590f4f781f065661adfc4a05427a87882093acad81f87eee2ba20d910ba3662b5b19997735f0356d262a4f150ba940310166b62a019b68ba05 SHA512 32690af4d24eb704338c78fdb0080d9f910a0741066d282e79eb88c473ada8d9a3daeba1a9aecfe830b2a6d0cea8da471bf6ef904b105fd8036994e4a0e12d12
 DIST flit_scm-1.7.0.tar.bz2 3259 BLAKE2B 9b785f9f92b16494f6bf0c21e16ee1abf6a130ebb5c41d4e0e73f4ab1c892ec14544a4b86fe9ba22dbb43a2c28cebbe84328c172566b27c195d41e3686184b9e SHA512 a030cd2ab9d100b971ac20ad5f52f206d951fb6c88cd48db0250269a32cf0dfae70738bf3dc4d36396a3da3e09c7283eec365e12608f6f6d7be3e9076bb931d2
 EBUILD flit_scm-1.6.2.ebuild 896 BLAKE2B 1a26aafc4ccb9981069129f196bd1b2f32e5d83d9d17b29c58d1047356b7e6732419a992df1a0a6233902c610390449039014f99ce8426c7e35904d6055ae81b SHA512 db39da0c733fc9ecb41c0943ba76c7dbe1a687f81f0b81ed245e7f8440f67319ba824620c72e55b86a37b78b1cddc18d9e0a9013e1a3b65a3e33ef289eedc58c
-EBUILD flit_scm-1.7.0.ebuild 950 BLAKE2B fae16a16034ba45173bed832afe0f110050a7871572eb6590b9429dbe9ba63503061ae7ed1e46a9d7e3307d70321d0d73c811c5b4ddc07a75179e0d965e4f29c SHA512 f295be2440246fa782c6df3ae951a8b00998dab33fc82f2963f263dd7f24a445f055bafef6250deb6c3ad4e1b36a1c6642d6b03fd9adc189ef3a4c76b774c2c2
+EBUILD flit_scm-1.7.0.ebuild 948 BLAKE2B 77c6eaeca79a53069a072b5dc674e9792cd8b62545796c267f17366556daee454d03102e4ed6e1fe85453a58b11705116e5db1050d2d1140656a0b17ecdac8a7 SHA512 0fe698db6458c23df8cb4488097de1cd24ea7e75fda5d6de623fbc88d30bd5e0c8740d3b7adfe6989f49aa424cd57ebaec59c6f74bd50ce4a5f315c35b346eb2
 MISC metadata.xml 290 BLAKE2B 555156b5f21d6d87b8077755a5e7ce59b7341380e29c073535e55fe44aa668db2837e42416f88d8802ef879be0dcc1ce85e27545db479add9b4273de348083c3 SHA512 7c3f74c83b9e928eac698099602db5e75cb9878354bd465c063f0e050fdc16ebcfa0e7ead8e26e5c82cd54684e9eea9b2657376c26330bb8c77bfee42116b889
diff --git a/dev-python/flit_scm/flit_scm-1.7.0.ebuild b/dev-python/flit_scm/flit_scm-1.7.0.ebuild
index e89e6c0577ab..f05405a6fc66 100644
--- a/dev-python/flit_scm/flit_scm-1.7.0.ebuild
+++ b/dev-python/flit_scm/flit_scm-1.7.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index d34d942016e1..4500bf525918 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -2,8 +2,10 @@ DIST imageio-2.19.3.gh.tar.gz 388949 BLAKE2B bf7f7b2cc036d6bc808cedeefe624dfe43b
 DIST imageio-2.19.5.gh.tar.gz 389832 BLAKE2B a4455f97d2607d215ba4797e076487f4648ae6b21bf7b5207df8f337b52319ba4dd415d6e351289b588a049c800e8c541fcdaefe064cb4c83de12e63c492cf83 SHA512 481f14116961927946a71a7448ecf38f9781172969ab4e35c05360d758f7273be22262d4cd774a76b2089be3b7f0af6cf0a67d40814504e7a65db7075428966c
 DIST imageio-2.20.0.gh.tar.gz 390281 BLAKE2B 745364f98e3835c428e89abbfbeeb657d10cd730cd61283e5859b10a6e48b63a5b9771860fce75aa8dd770ab77671979847b34bbffe17d215fac5ceb8eb2c7d1 SHA512 fc1c41559cc15b76bfacbf4866717c200889661787de4baa49d69fab189ff7d00e376afdeeaaf74b5581e1ffc96da2f02566dfa9c0953518b98a4c4b695ddf02
 DIST imageio-2.21.0.gh.tar.gz 391056 BLAKE2B 90fbacf7b396ab2b422d8694274ddc3642c92cfd325bce2861100f5bd28d82120cef6819b53b8ed82ba474d5e287765b63da9a7edfbfab5a026790a39d4edc1e SHA512 5bb070da560ba3a2e10bdb288ad539274ee14f8cf0543847859f0bae052b3d1782777d823435b74120bcfdff0b6cb15a6c80b2a9bf729439bbb3802f15cf5684
+DIST imageio-2.21.1.gh.tar.gz 391159 BLAKE2B 4c569ec81255d1f5985d2d30f303a978f9cb22e0d7368845648ddab9e5734adba52173d42ad73c94c424ce1a5806c3a10ae31381b04949f7f8c30fd327b585b4 SHA512 61fd4a1a64fb152fa5c419cac9a69ea979ac762fbaed81076ddd13602db98f71f31825615111958f21b021213d55be060197417159022bba84d631618f5bb286
 EBUILD imageio-2.19.3.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
 EBUILD imageio-2.19.5.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
 EBUILD imageio-2.20.0.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
 EBUILD imageio-2.21.0.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
+EBUILD imageio-2.21.1.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
 MISC metadata.xml 959 BLAKE2B 284b4b8fdf53cc63b6d46d1afd03abf322f8a91ad5feac3828c30198a9e0baa1514f34b91385dbc00830b306e4f78eac5d2bf4be8e377fe98cfb7e5c8db896be SHA512 0a72e91831dec56af50fa96fc6ed74b19fdc15e68255d19fb09c542eea85cfcdaa5a382608add10a63d3e421783225829d20d9b31c26883f7640b6214f2c20e3
diff --git a/dev-python/imageio/imageio-2.21.1.ebuild b/dev-python/imageio/imageio-2.21.1.ebuild
new file mode 100644
index 000000000000..6770d9759db9
--- /dev/null
+++ b/dev-python/imageio/imageio-2.21.1.ebuild
@@ -0,0 +1,52 @@
+# 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 library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+	test? (
+		dev-python/fsspec[${PYTHON_USEDEP}]
+		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+	# Tries to download ffmpeg binary ?!
+	tests/test_ffmpeg.py::test_get_exe_installed
+)
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 47b6a34a3ec1..414c1a7caf16 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -4,6 +4,6 @@ DIST inflect-5.6.2.tar.gz 69378 BLAKE2B d20739928bc0a5e181456c3bbc583e5816bd87b6
 DIST inflect-6.0.0.tar.gz 70108 BLAKE2B 5e20c265ef7683d1cd671d86697b8fc8d683ef4e7dd856fe0e0797e39a5e97a9a62984b9dd39f54187e54e3a7b961dd6c77b0f50822fef19bec462c485ee7600 SHA512 8cd38dc2e59bba5b47dfbf0f7626fce43bc4ecafa22f4555e48d9827b4f7f235c282477e9a008f172cc08eefcb5f44e2133de2c28e04ddb29c9392a5486b2719
 EBUILD inflect-5.6.0.ebuild 617 BLAKE2B 9dc0fccb61e8cd8133edd89ad0b0fde7ad15783866cd06aadad9a84a3d7c75a715ca257210d24bfca8733a19dd722dfe36b3683e368a0175e06e6aba3a7ad0f5 SHA512 ae11ec54c11d6a463f8c965231f27af5f8efce904e8250f41ee0e06ed3f8d50e4083bc5e217ec7015fe67cb0a3bf7a75450def633669923868d4e9c15d2a7778
 EBUILD inflect-5.6.1.ebuild 625 BLAKE2B 0010d499b772531b632526ad5038b15ceb23571d0e700fdd172d4eba72f950953532126811efa54f69c88f71177796ec6897b9982573ff41a084fe44f69c83c1 SHA512 5c59975845ec5b1b94dbdbb92352b2c865ae49bfeeb040b7cb599f35b53f7497ba84db92eb4d7269b8b0c3059ad08640529b272103ee010133306a4ac24ed9e8
-EBUILD inflect-5.6.2.ebuild 625 BLAKE2B 0010d499b772531b632526ad5038b15ceb23571d0e700fdd172d4eba72f950953532126811efa54f69c88f71177796ec6897b9982573ff41a084fe44f69c83c1 SHA512 5c59975845ec5b1b94dbdbb92352b2c865ae49bfeeb040b7cb599f35b53f7497ba84db92eb4d7269b8b0c3059ad08640529b272103ee010133306a4ac24ed9e8
+EBUILD inflect-5.6.2.ebuild 617 BLAKE2B 9dc0fccb61e8cd8133edd89ad0b0fde7ad15783866cd06aadad9a84a3d7c75a715ca257210d24bfca8733a19dd722dfe36b3683e368a0175e06e6aba3a7ad0f5 SHA512 ae11ec54c11d6a463f8c965231f27af5f8efce904e8250f41ee0e06ed3f8d50e4083bc5e217ec7015fe67cb0a3bf7a75450def633669923868d4e9c15d2a7778
 EBUILD inflect-6.0.0.ebuild 676 BLAKE2B 622ec0a79e3ead6a7c522a37b6139d79e26152ea8762ec97d2569c16827dc66b4f3ce429b3ae813833710ab4e882dddd7425850e30a4fd0ee67271c367278bea SHA512 f01758a576147087780a85c15bf429848bd23ab1426b607c5827df809e5f694545fb86fcd39a385c57f51412a7119677d4a153cb46b234ba3b8508d5c0af7956
 MISC metadata.xml 557 BLAKE2B 1a327bb3ea2f7ecb0b3100d9f443c9c0c20a89f1e560eac79cef20a6f12855355dab9c71bab94881774e2be6fc2b4bd9530e1155caecdf687228db259ed34bba SHA512 d719ba7da2f6544cada37998dbc6b104cebb6419ab65bd164411928953c5898da2f5f2f789b72d41f7b46ee7a5570fc6646d331e0df39b34c1fa0685fb9165ab
diff --git a/dev-python/inflect/inflect-5.6.2.ebuild b/dev-python/inflect/inflect-5.6.2.ebuild
index ea873a0cffa0..1eee83767dac 100644
--- a/dev-python/inflect/inflect-5.6.2.ebuild
+++ b/dev-python/inflect/inflect-5.6.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 06befc811511..43e28d1dca9c 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -3,5 +3,5 @@ DIST jupyter_core-4.11.0.tar.gz 73671 BLAKE2B f7e8855428d77fb36728199f76299686ff
 DIST jupyter_core-4.11.1.tar.gz 73661 BLAKE2B 38f93826fd86f5b4dcd5495473426e934365aea3156e6bd881041920b5604a7ae11becc3d1037785f448f085b03e5afa361b7221378425e9e758fca90ed850e4 SHA512 38348e8fc349ab7bdc83599607e6179c2d14dd3a42daf6b52cb0a6fb4feee360aed4e7c682e6349dcf560b2dec598f9a27477e0b2e982fd85e5a385b1bca5858
 EBUILD jupyter_core-4.10.0.ebuild 699 BLAKE2B 3e8c3f9c3c9f18cd45a6b4c29a9d97320d6563c502c28603d4150b8efc4123ae845e4ef69a3b4a39b29ae15a682e7d42f37c5d671bdcc1d88417e021c92b26c4 SHA512 dd2662c46606b2ac3b74e013403cfe22eb7898b0ea43b591c84cf5d059c8c0f3ec63e6228b23151ff600cd1f3c8bbb88c453e60ce47fe031330fdf00c0d25800
 EBUILD jupyter_core-4.11.0.ebuild 670 BLAKE2B 54dda3ee90ac06523760e3fc844431b5459c5923dee8a0adbee3b0efa3d722fae4cd6479e045e9aa25942fe92e1e009ac1481ba9765ed86b7622677ef3d8b72b SHA512 38e976b33d61aae618827588647a1c523ebb431a572505ce53a125a7fed3f64c1d36d881ef2c2f273ce65c09286bc6fb1b965ccb347eef915ed4a16d5c31608b
-EBUILD jupyter_core-4.11.1.ebuild 670 BLAKE2B 54dda3ee90ac06523760e3fc844431b5459c5923dee8a0adbee3b0efa3d722fae4cd6479e045e9aa25942fe92e1e009ac1481ba9765ed86b7622677ef3d8b72b SHA512 38e976b33d61aae618827588647a1c523ebb431a572505ce53a125a7fed3f64c1d36d881ef2c2f273ce65c09286bc6fb1b965ccb347eef915ed4a16d5c31608b
+EBUILD jupyter_core-4.11.1.ebuild 662 BLAKE2B f73ead1fe9358d15a04732beceea90c10525a1d6db3c91913ba4e66dac88908a51bf8cb89b48b70858d77def53b0ac4b1fb50882cc8935a61a6d52c51b52eff7 SHA512 cbcbbf755c13d602563b2f93a95791eb41104fcac4fd9c1e3b6d837c42fd00be2636bb6082e1c97f91d36358fcbfd954ff2b5665774857aa8579558aac8f2fb3
 MISC metadata.xml 759 BLAKE2B 4ef6a95640943d1b082bb65ae17515300089c6d78c0aa81410f4c7e57e1447787ad15373f314f8ea5c980459f4e5f74ee54edace2eb9421991e2425793040adc SHA512 d9769460a005d11961ebabc81636065aec545166820e923ab7abd58782e0832592a58611ccb4485164ef7c1c646812e8f608fafb9639525663732dec730542f5
diff --git a/dev-python/jupyter_core/jupyter_core-4.11.1.ebuild b/dev-python/jupyter_core/jupyter_core-4.11.1.ebuild
index 58d1fe82bb25..e4eb5545ed32 100644
--- a/dev-python/jupyter_core/jupyter_core-4.11.1.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/traitlets[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index 1bbbb433430b..6138c0dc08fd 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1,5 +1,5 @@
 DIST jupyter_server-1.18.0.tar.gz 450132 BLAKE2B a378ba3bfdc629d05478c33365b2d6df893b9ce1dc3ce26c78efcbd69b42441ff730ca58a83fb87446d073f849ce5a6c725784a15953fe9bdae119e529fe30c8 SHA512 5a194a9811162774990b125020d75c134ca32ab916c046cf0345a3959868ab7b293c0659bd54c2da91ef5e8bbb9b433f9a6c16d829277d0f34e924c6332fa6c0
 DIST jupyter_server-1.18.1.tar.gz 451117 BLAKE2B ac9088f8f5c5afa6455f41b4006c0d49286006574101b42dd8e28501c97dcf10d7ee534d54b8cf26a8f34c7d2ba446485ce273ce04e22c39a22e5346d55ea4f5 SHA512 7acf101f337af903318de263dcf78cf3b45b799bb6095bc79568fde7f3f56ca508d39a1d40ffe2a4ab0bdc0173f0ee2f4a7426f41e0855c1b7f9dfd86f7e6d73
 EBUILD jupyter_server-1.18.0.ebuild 2276 BLAKE2B e9e843f90e4049e7ff58576e7134f4583878ab73c3e520a6efcb701eb6934f46bc89c67f3a982b70d930473b8fcef5673311900ec4085dc9bbb02e49802359da SHA512 381d31e6f7baad4bb8d0a2bdab05def7ccf14f8ad4ed546370d787f8a665a4600d1ee7397489bc34999fdf2483b6f03d1ae39228e74a5960742248958959c485
-EBUILD jupyter_server-1.18.1.ebuild 2284 BLAKE2B bc12a7e86bcc8c5cb2e3da9ce7a4446b4fefb396f6f269bbd58bf7b7c860baf9076d2de92f30165c6dcd5b63735269f6b6f5122a2242d77529ae596de82241cb SHA512 c4f9b09bb07f2ce436144a48fb6aace74a922f0eb50310facc328efc399d4d385227779e8c0a039103043bc6d6f86a33e0e14b97157c5a7ffa80866c71a37cac
+EBUILD jupyter_server-1.18.1.ebuild 2276 BLAKE2B e9e843f90e4049e7ff58576e7134f4583878ab73c3e520a6efcb701eb6934f46bc89c67f3a982b70d930473b8fcef5673311900ec4085dc9bbb02e49802359da SHA512 381d31e6f7baad4bb8d0a2bdab05def7ccf14f8ad4ed546370d787f8a665a4600d1ee7397489bc34999fdf2483b6f03d1ae39228e74a5960742248958959c485
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild b/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild
index 7d41175712ea..248b7cd68bc2 100644
--- a/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index e9d0462070e1..447cd5b05322 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,7 +1,9 @@
 DIST keyring-23.6.0.gh.tar.gz 45236 BLAKE2B 98ea183760da39512fcebd93b182b10f031853ee88d4e93add119a760851d9552d830fe599c57937d84a23df67b6a6ca9e33a5623a034da2fc8b28c0216a6aaf SHA512 dc196914389ad12f89652614ea00b2ca17cf22471f1bd41ed3cb58519b1ca9b8ad7f497707d77c31d1354c12d73b9881d4f5511c61a6dc562ec358f3009a0c70
 DIST keyring-23.7.0.gh.tar.gz 45352 BLAKE2B 8cad2f2c7443adf710220d546a080c4ca106c9939f5a91ef56cd6f034cf71fcb86515005f17adf3ffc35ab616ed722e469ae0c92040d57d4183d6a4ced6a2682 SHA512 351afb3e376350192d5b02f2cb9bdf4bc28d551e4184145bd05ba7fd0c950c7cfeae0f75ed63bfed670648e2b7d2f491b894939d37edbdb0869d4cb74a4fc97e
 DIST keyring-23.8.0.gh.tar.gz 45941 BLAKE2B db78b53e2d2964c65d850df4226954db696037fa220f003d91e94603ce12b4d3668b7b53a91b71244d8555ba9c9195309a2e8a9aafd88d12da0f1a916b469857 SHA512 daa0b88b9f7c6e94eb589c15f364ff2a0fb83cead50b4fcafa6214072681d4346c8abe7ee8ab76f0ab93b7c7bccc551f65912dbfa749256e226f1e84793676dc
+DIST keyring-23.8.2.gh.tar.gz 45987 BLAKE2B 3a8faf6487c2d4dd76e549585a236e4744e5a4d23a778515425e7e78c7161717c2d16b8f268fbc8b8c59d6fb3fb39fc789b0dd92363b6d61073047af8d99b804 SHA512 af5c764d355c548d1f1364006dbaf6ee366a7dbbda9649145dafa5d610a4691ab4488151c054359e26a467312653601ddf722bddf35deae309067355337eddec
 EBUILD keyring-23.6.0.ebuild 1196 BLAKE2B 9efefce508179c4944bf4262e2ef6e83b4f63418fe2858012526af14e825e2bf6627eafdf6667f3b589d1b28d296ecab370768c869f67b06477e8373bfc4d146 SHA512 74707f49cf183442aaefe8cad7a5ef4b8f36ffb02aef50efc0fd0363effcea5b16293e0ba5b92307e6b07330470139166f95101e3107c03433f9af1cf99ff9bd
 EBUILD keyring-23.7.0.ebuild 1203 BLAKE2B 1782811352663db6d7532c2d2a949878f19c1073ad25a2958a2a43b590b77b7b25c5b3a82cd215077b00132c2f41fd2248223c1a9864f3f5ca1ecf6dfebeeb60 SHA512 b304bbdaadbe3c101d51d9fbd94d29396a3d4e9d16f20f3ac630d696cdf0f5773257cfe8869f119ccfdbf29bb23682989021a26c683d5c821cdd2b67eb7d04e6
 EBUILD keyring-23.8.0.ebuild 1203 BLAKE2B 1782811352663db6d7532c2d2a949878f19c1073ad25a2958a2a43b590b77b7b25c5b3a82cd215077b00132c2f41fd2248223c1a9864f3f5ca1ecf6dfebeeb60 SHA512 b304bbdaadbe3c101d51d9fbd94d29396a3d4e9d16f20f3ac630d696cdf0f5773257cfe8869f119ccfdbf29bb23682989021a26c683d5c821cdd2b67eb7d04e6
+EBUILD keyring-23.8.2.ebuild 1203 BLAKE2B 1782811352663db6d7532c2d2a949878f19c1073ad25a2958a2a43b590b77b7b25c5b3a82cd215077b00132c2f41fd2248223c1a9864f3f5ca1ecf6dfebeeb60 SHA512 b304bbdaadbe3c101d51d9fbd94d29396a3d4e9d16f20f3ac630d696cdf0f5773257cfe8869f119ccfdbf29bb23682989021a26c683d5c821cdd2b67eb7d04e6
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-23.8.2.ebuild b/dev-python/keyring/keyring-23.8.2.ebuild
new file mode 100644
index 000000000000..a90ebe22521a
--- /dev/null
+++ b/dev-python/keyring/keyring-23.8.2.ebuild
@@ -0,0 +1,51 @@
+# 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="Provides access to the system keyring service"
+HOMEPAGE="
+	https://github.com/jaraco/keyring/
+	https://pypi.org/project/keyring/
+"
+SRC_URI="
+	https://github.com/jaraco/keyring/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
+	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# this test fails if importlib-metadata returns more than one
+	# entry, i.e. when keyring is installed already
+	tests/test_packaging.py::test_entry_point
+)
+
+EPYTEST_IGNORE=(
+	# apparently does not unlock the keyring properly
+	tests/backends/test_libsecret.py
+	# hangs
+	tests/backends/test_kwallet.py
+)
diff --git a/dev-python/metakernel/Manifest b/dev-python/metakernel/Manifest
index c280e829db14..803d604ff00e 100644
--- a/dev-python/metakernel/Manifest
+++ b/dev-python/metakernel/Manifest
@@ -1,6 +1,8 @@
 AUX metakernel-0.25.0-disable-brittle-tests.patch 762 BLAKE2B 440f29b4566beac51b5428e691c0fc6dfb13c2b3912486956589f414c44ad07ecb7ad23b5ef4b5e160bee15205c7b68b327c3bf612b81cda2a73fd51968ba83a SHA512 475829494bd4cc20b994f69428228a2d12a3a1b004e72be50ac5e2d746e37f9ae6203fe776e63a96e4d673bfdba814ca1ae1dc609392a4e346648a5b1471d314
 DIST metakernel-0.29.0.tar.gz 197295 BLAKE2B 486c57b3d0c4c41aa73c129cceccebbf818a4932beb35f5114723e43e37f496d04df50d3cfd09b7d4c254f5dea02d1c7b43f9f6e9c9e7af8e946fd79179a892b SHA512 0748663e79776680f9c52cbc4b0ee76f33ece0a489740068d60455c5003ff27e3fbe8f8c1f0f51ffe9448dbf32109e7d15e8d851198e1947d638fe91dfb4e39c
 DIST metakernel-0.29.1.tar.gz 190413 BLAKE2B 726ad01bb4f53add8a538c59aa92c801293e9ec45d54d86d1e6f81ffd9d22c2066ec4cbb744f7e79bbb0ed2253093b463498d0023d7dfb4ef3733350b460a6e0 SHA512 cde9e0ee89edfd829a371b72f098a44423b107bf18b35d5f318764925f716add1d860cf5b508c562b8788b68c00ac4e97dfafc5fab775931a104e0590dc87bad
+DIST metakernel-0.29.2.tar.gz 189938 BLAKE2B cbcce893865d82198a79c892b40c67809202e4d947a590fce52d2ca85bd919bac5556d0fb27b53a91a4e7f5b4409c48c84bcb6ae28c04aed159507bf1f65102c SHA512 d4ea32ea4f9b00cf223419f641f297a65737f8acb1774bd0dc209006a33ac0e41853da0d077492149fd3bd141de0e181a15df092618b2977899a68768c750ca9
 EBUILD metakernel-0.29.0.ebuild 863 BLAKE2B be8491354e3632d786060813de5f3a8ee0ee34cdc529ccbf57f6736c2195b8999a1dbdfbb03fe0da430145c6200f15cb13bfb1eaac5a5d9a5d20446acec3aee4 SHA512 04ac387af15e33b725ee7d9017d9b3eb79a8f7b6d687ba3c5806b7b1a7e4d96f73f10f23e348ff314f04eba71c4501b9a0ea56e4e1a03e5149d4b0edb6adb894
 EBUILD metakernel-0.29.1.ebuild 865 BLAKE2B b3c73455ddb49f856c891b7292de8f9dbd601ee64a04f0c155bf20ccc6259b94425424bbfb905a25fc13d4e0ab53d62ba2711e7dd5ebbb213d18ee8d0de3797e SHA512 28b4e9b17209bfdec511af29a93afc3ad6b9eb6161b1e790412fb398ce971525d5d62d5289bb6218ffdde53fe14d02e01ae4570fc49def0bb32342c6d5bb5937
+EBUILD metakernel-0.29.2.ebuild 870 BLAKE2B fcca27bd8d1dc6785e625e488b82b7721d12edb4eb9f09610edc2e2844fcdca489f54b4740d2593b6542994fa18338ca2d24d427d87bccf1e8242ca32bf1b8cf SHA512 1c2d6f1dc7143fc7161949bdfa833ae13cfc9eb4bbb7120b1c9538bb5e19790cd0433a029cdbeb97f89a3a6350e497bc6c7f1612b9fd1c81c84fba86071f3fe3
 MISC metadata.xml 635 BLAKE2B 3f108898788d2cd20d5638feaed2cb9ecc32db4350f8ee5996c7d3724b304fae040cc4c9ec20d9c7fde8041bad1ff1ab79106adbd17fe57722daa7f191eb2dbf SHA512 d84bd755109e0d4b45a2e8dec6b7ed2a5ac9dbcbe9fc8453c599969c06dc3d4e7a9001382e37d1e7c2d0fec940cf636b29ebd7e6a2ea7aa2f1420d20a4194e1e
diff --git a/dev-python/metakernel/metakernel-0.29.2.ebuild b/dev-python/metakernel/metakernel-0.29.2.ebuild
new file mode 100644
index 000000000000..8a7ea2d46121
--- /dev/null
+++ b/dev-python/metakernel/metakernel-0.29.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Metakernel for Jupyter"
+HOMEPAGE="https://github.com/Calysto/metakernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ipykernel-5.5.6[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.18[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.8[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/jupyter_kernel_test[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.25.0-disable-brittle-tests.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index ba213ceec557..18b132db305f 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,9 +1,5 @@
-DIST Nuitka-0.9.5.tar.gz 3858378 BLAKE2B 0b8aa2b191caaa348fda81af41d7a4ad486479742acb929c6e0f0c1ec08b06ca02c5cae46b986c569a8bb792e15fbb90e49db9ece3b226d4e09c054b4311f079 SHA512 4e0def27cc12f4b37debb509c015ba9e56649e82ecede31c142b7c420424364fb243932bd146397bfb82aea1591a06566b346a1b2c6d64cf26cdc59eb77cf875
-DIST Nuitka-0.9.6.tar.gz 3858273 BLAKE2B 5fbe454c5f5612d94342b1247b463a4248a35123d7d4515dadb4c9f4cf5b6714f55e1972d55f60cfdfe65ca97af5fae2cfc92009b274ccf9adaf944217a39333 SHA512 6088459a12f5506a547d40a4c3f0f16f8ab470ee4875d36dfad97e4ba25d7cdc25cae1115a11dd7752dafe51d6c83d80798c74a110c995e47ba127d9b2afbf81
 DIST Nuitka-1.0.1.tar.gz 3893766 BLAKE2B 7d48344231fca1efce8d783a197813a1aa77c992fad84c1a958740287ea8079566c98bb6ac1e017030a6d6dba84bdef6a7711542adaa8a59612aed19da96f425 SHA512 0d3ba38733fdee4f6f4bff80fd2c7729177209e101f0eefe2c5a74fd449d038710eb979e1b313c1534bfe079ea3a7f88cda07ba2977c153032a56db0b75f739c
-DIST Nuitka-1.0.tar.gz 3892664 BLAKE2B 6772c4af5a4fcee704a0c9b14b25a5ae8ca0d5663f2a60791dd194ae402dc0dccad1fbc3b85089469090f2f10cb0641fe739ef3f1c8c236292ac7e468c0de27d SHA512 4b8d17e49da152ab7c0ad146296375e8f8566bbd730ceac158c8dc9ed1588509384627f538dec347774b890a4715b4ba054b3be66b1b425bb736d35752b5db58
-EBUILD nuitka-0.9.5.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
-EBUILD nuitka-0.9.6.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
+DIST Nuitka-1.0.2.tar.gz 3893195 BLAKE2B 7d3f154ecb128da34f1495d977ec81bc54dcd95d5d53d3ef437a0a55f11f91529eb12c985eba6256d53d2746e0b2925a50ab4fd19967f602c552a57c1ec51408 SHA512 a1cd4ba3b2ced48fd2b8fdd2438f8b6108ce3638fb59507bd2398cc8d3e9c9eb9b93d86446e960d26df351c2769799df3a8ca248482eee531dd6bbc276036a90
 EBUILD nuitka-1.0.1.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
-EBUILD nuitka-1.0.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
+EBUILD nuitka-1.0.2.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-1.0.2.ebuild b/dev-python/nuitka/nuitka-1.0.2.ebuild
new file mode 100644
index 000000000000..5b987e13729d
--- /dev/null
+++ b/dev-python/nuitka/nuitka-1.0.2.ebuild
@@ -0,0 +1,49 @@
+# 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 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index cb592b20785b..f1abd654b816 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,5 +1,5 @@
 DIST pip-run-8.8.0.gh.tar.gz 22145 BLAKE2B 18b915a29a1767022a609e356005e87f035c3d9bab6dd5ab44f9f42668f4d64c4ee5360cb92b217aa2b7b94e0fbfdb5f0e494e668d9bed8badc38ab36cced353 SHA512 301083a34dea08035819024f17d8108f9751a765cdfc8f2e273b948c7746111efedd80765a63c3ac145bdf7d2b41c9a0b2b20286181c4c94cbc5501fb81eb74d
 DIST pip-run-8.8.1.gh.tar.gz 22443 BLAKE2B 4f87e3ec9867971916a0d5c463cdae63c7bb95ba457ff6e04101c1c37ea8728e2db2bad805b10bb6843b5ded1cb095d0f493b02c8a6e73aa4b782b849aa5ffb4 SHA512 ae964ca96f0be33fdb33974061e75486c443fda5edf0cf43247e8bd293d9a6a87d2cd421100578ed5179f13c9f46ff10ec730e0b403982da7e8aac22651268ea
 EBUILD pip-run-8.8.0.ebuild 966 BLAKE2B edd6810e1e04ec7fab7f848f104266a05c69d45f74c09de4949990ad2ef81536edf7a16ca3ec52fba121e15d57c898a073669333848a8442084532f5f0943d41 SHA512 7dccd319794d0aaa015a6a2cec2e9bf6061ce1721eb62c15be441573480e50afdbd05470ec21cc2c4032beb443a265e24027c36432bf1d0d4f9e497568830e95
-EBUILD pip-run-8.8.1.ebuild 974 BLAKE2B 7fa0593cf6e100731ba7d8ec202fd7fa3ba7507f10fa5c3eac0f4c3224e2fd6fd837a012394d890999c1dd39a5368a50f4d07e513d3c4268d1df2fd07e683799 SHA512 bed26e0721739cf9377ec6d21afc2ca8ab52179bed079d3bf3da178e3a80ba446300d83cc49fb8d5bac158db3be0a9961f57a64d39eccfe74a61eadbc473d1a6
+EBUILD pip-run-8.8.1.ebuild 966 BLAKE2B edd6810e1e04ec7fab7f848f104266a05c69d45f74c09de4949990ad2ef81536edf7a16ca3ec52fba121e15d57c898a073669333848a8442084532f5f0943d41 SHA512 7dccd319794d0aaa015a6a2cec2e9bf6061ce1721eb62c15be441573480e50afdbd05470ec21cc2c4032beb443a265e24027c36432bf1d0d4f9e497568830e95
 MISC metadata.xml 389 BLAKE2B bc573b4f57b4f8371ecef97266b8441d47e66d551f7088a7f312ca049f7debd90e989d24d59d7aff182795ae27e553d131f3875c789dc793532ff9c812bcaf20 SHA512 00b81cba684e7118a3ce79ec5cb6a27d6ad67064a2745ffead8dec51c7786c9441139b800868cad8854ff39d7e38163ab2c8fa5c7d3f328390b628f8342fb0ca
diff --git a/dev-python/pip-run/pip-run-8.8.1.ebuild b/dev-python/pip-run/pip-run-8.8.1.ebuild
index 4a52697a06ef..4ce3a99ddf97 100644
--- a/dev-python/pip-run/pip-run-8.8.1.ebuild
+++ b/dev-python/pip-run/pip-run-8.8.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/autocommand[${PYTHON_USEDEP}]
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index 613c6db696ac..aa0f7063c364 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,3 +1,5 @@
 DIST pylama-8.3.8.tar.gz 36319 BLAKE2B 5251bd32549793a8d06b6180a3e4f4c20f23dbdfecc146eb877222995bcadcf8cf8343f99ad897fb3e00c0f455762f82f4e3d157c34be6f21b4f220e87b636a2 SHA512 b55d7cb28a94f19270bde7ff6a8d760ef9132c845aaa85340271e42af6987fcc919ba9b0ddaebb6da6c1ffe789aaf39c83d273f8adea88db58a9218577899924
+DIST pylama-8.4.1.gh.tar.gz 37850 BLAKE2B dea99fc784736f3b229c5d82a59f2e2b5490fbe344ad98167e30e550b6c774c7b42cbddfedeb073d9d843cf53169c441812974036b06088ab07d7b7996def4a5 SHA512 fb038c39a2e962bd065ac5ef545f1be50f5b230141141a55e1701ffdc6a241b5778613ac91f29ff648b7ce48fa969c3961a11b7e906b6e350c84b57eea5369cd
 EBUILD pylama-8.3.8.ebuild 1006 BLAKE2B 3e2a3eada1fd7a44bdfcc1ea51c736922f3162ce5dffa00d11ff3dea366bd27b7f589de3e681618298c24ee31db7977ea2e8e9add35748790ce1104076eb7376 SHA512 2067b81d72b61bf61db5edf3c4a90615fb4d8b90a630f48a99f9fcc4b0a7bda3282f64dec22e3e854d7d1f943d20a0d7051e851413b151a47814bae1842e7d5d
+EBUILD pylama-8.4.1.ebuild 1017 BLAKE2B ba71f62e2961f3ca6920db633813bd76741f8ccf4aad5be1a4eb34b60f74cc7e91c5c820f470ec4427d3feb6cc9ad762ef52f80333dfdf904d4bc43e63170f33 SHA512 5c2270aa803e16bc0be05cd3c5093b211a0c87455b31d26e4b8aa6e0ef001f32e3321c7ac44623657f13bd02b679d9dc7ecaa30d0a7f08cb13fb1cdfc27030b8
 MISC metadata.xml 490 BLAKE2B 4c0dda4b057901937d4b6af02041edc0544e392ade5a3497de0d58ba5c1423332e6c1f0b289a3bbbdcccc1b45eedc01f158778e99f9a6f3911cb6b91d999519d SHA512 d3dc1fdaee046554de697e6aeb324910199ea9329a57ac89cebc96f2143e4d2482e31cadc5df16893fcd012058282f600fef676992d8dd55dba3f045f69bc52b
diff --git a/dev-python/pylama/pylama-8.4.1.ebuild b/dev-python/pylama/pylama-8.4.1.ebuild
new file mode 100644
index 000000000000..45e31850131b
--- /dev/null
+++ b/dev-python/pylama/pylama-8.4.1.ebuild
@@ -0,0 +1,41 @@
+# 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="Code audit tool for python"
+HOMEPAGE="https://github.com/klen/pylama"
+SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pydocstyle-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/eradicate[${PYTHON_USEDEP}]
+		dev-python/mypy[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}]
+		dev-python/radon[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# not packaged
+	tests/test_linters.py::test_quotes
+	tests/test_linters.py::test_vulture
+)
diff --git a/dev-python/sexpdata/Manifest b/dev-python/sexpdata/Manifest
index d313dfa83a3f..f69dbc12459e 100644
--- a/dev-python/sexpdata/Manifest
+++ b/dev-python/sexpdata/Manifest
@@ -1,3 +1,3 @@
 DIST sexpdata-0.0.3.tar.gz 13105 BLAKE2B 36c4082a63f6748759d71fc38a056ecb7467eafebf0a1a0b006fbef1302488f23a859462c9526dc365f7c88b8b6c331dc6e4892e1d96358abb44ca60a909d283 SHA512 03d4d1557bcc950124e408d6870894c8ee9e72a2ee83c881adf48f8e53bdf3744b4f3e3e133a74a195d236424b434cc690583a68d8395324ca4e84947e548501
-EBUILD sexpdata-0.0.3-r2.ebuild 476 BLAKE2B 889690e69c22d23724fb3468d1f7e0f84fca3adeda6cf1617bf7e775097e4db50319d1a855c38bccabecb41b056861bf081acdc5067358a8554b2ca7cb010cce SHA512 ff74fad34f8a5f4dad09a9a158ea55c9082baeead31fee95a8fad4d5800eab4d5993f08659fc15b446b18a4de42bde273dc3aa334330497cacd4ab2ae119c353
+EBUILD sexpdata-0.0.3-r2.ebuild 469 BLAKE2B 90434045a9af0209128dcc3ae132364edfcfe94e364f14b670c54bb02e4c1ed0d64aac276b01cc24e588cc9b63b2ec6ae903bcddffce699ad61b570a5f68b039 SHA512 c61e71f2927e75371e070d9c9a6824b3d79f1dd006f46c497b922be6f43406daceaaacc2c60c63c4ae90478ea6883f2d5fe14de330de0e178d54469fcf19b814
 MISC metadata.xml 380 BLAKE2B 531e59f20c41d7f47f34245fa53682a5b00659e8ff591762c779e82c80ab1a6d37a9ec6c22a83a35b780cb362c18b0b909702184e8865152e9a475930fcc775f SHA512 65e354095ed1f50d31db59f03308e4a5a6cfee73c74dbca59a5b0ffdd1ce7434bcea308d31f23dc8d6ea1a04c09c50f25a872fd4a7b4b6f06646ff232648c93e
diff --git a/dev-python/sexpdata/sexpdata-0.0.3-r2.ebuild b/dev-python/sexpdata/sexpdata-0.0.3-r2.ebuild
index b02a4baffc7a..cef2841d5473 100644
--- a/dev-python/sexpdata/sexpdata-0.0.3-r2.ebuild
+++ b/dev-python/sexpdata/sexpdata-0.0.3-r2.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://github.com/jd-boyd/sexpdata/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 5ec79defa35f..83a4c0b4b095 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,7 +1,9 @@
 DIST sphinx-autodoc-typehints-1.18.3.gh.tar.gz 26457 BLAKE2B 343a6ffcbca40f28a66c67266431f3a9b2292bd0d991de4287b9adf9e02b7d8fb24094646caa55790f32cd9081abca525f310367335d60fa1b7ea3bc9623bb1c SHA512 549bdfad8f5c07f5edb1c6cdeaff39df22cc7bfa475c70b5c54ff46b311d14c9f3682bf68663d852b95ebff8fd1b71038fc077495d99d870ae2efbf72ec99a42
 DIST sphinx-autodoc-typehints-1.19.0.gh.tar.gz 26950 BLAKE2B 4e530c0b16500d8489bed7f50518b1bc30fdc824d41eb6cc66786096c09c910deb92ac580438395e3b71fd2d3b64690986cb035ff2d784e26918a42bdc73d8fc SHA512 d9459aca1091da0fa446d7ce72ef83c172775b66081d87431c14fd9cfda42770dbd08450ff193e3accffe0eb11efde22804e4ffff20a8e0e9072a05bc34a99e9
 DIST sphinx-autodoc-typehints-1.19.1.gh.tar.gz 26942 BLAKE2B a2b16292eeaf87cb4879bf54727874952b61b596c6226679ba472a0e138fc09f82aaeffabf0f83eca56d2b2df609ed0355e1f3ab5dffd8119c1eccc755bbb16d SHA512 16227301bb0e3035163734c852068d7d06ff03c1e577963bdbcffb5b24b1ededc7feb16025fdcf8611182bdbbc7b071288f5d1d42cb0115bef6f9652898e3a8a
+DIST sphinx-autodoc-typehints-1.19.2.gh.tar.gz 26983 BLAKE2B 694edbf94bac05670adad992cfdc7e1146228af7b888a97c4f8e2394623ef3e42251ba0f3c22985517b2a251996cc41a305ea5497b2369363bc00d4bb3d24da7 SHA512 c35c7ed3f0698651be5ba4dd2232912d1f6d9d30e08153527df3fe16001266abc80cd1b11e3a41ccf92140c6baea98105e9bccd9466e65664dcf008f9a944634
 EBUILD sphinx-autodoc-typehints-1.18.3.ebuild 1066 BLAKE2B e43ac460f86ddb31256e3e303b3837f542d0b2b296eb3b917f877dfdd426b542b779d6ca0e4036e80d6689e8de3bda3c2259923400bdf6dc9a46faa6fa6ab012 SHA512 d841abad7e984d33a332262f92eade154363aec0f1fa9588381e6ab9c1c6f0e193f05ccc5d5f9755df52429f096238f2c1b51e2040ae24cca027a5d3fe8492c1
 EBUILD sphinx-autodoc-typehints-1.19.0.ebuild 1073 BLAKE2B b7579a2dbe8747265b60eed1d96627561447d2631279c5793f6eee56dfba83e74f21c21eaca4585de78380722da1ad567945c4053b058891172a2b91645f80e2 SHA512 a68916030b5b9a2b0b4e14ff548ba23a3f4df1baa7e0633436b91fdf4a1ba5b4d1a7d937fc44ed637c262192a1c437d4e78b698b6c1294967e078d955cdb3c58
 EBUILD sphinx-autodoc-typehints-1.19.1.ebuild 1073 BLAKE2B b7579a2dbe8747265b60eed1d96627561447d2631279c5793f6eee56dfba83e74f21c21eaca4585de78380722da1ad567945c4053b058891172a2b91645f80e2 SHA512 a68916030b5b9a2b0b4e14ff548ba23a3f4df1baa7e0633436b91fdf4a1ba5b4d1a7d937fc44ed637c262192a1c437d4e78b698b6c1294967e078d955cdb3c58
+EBUILD sphinx-autodoc-typehints-1.19.2.ebuild 1073 BLAKE2B b7579a2dbe8747265b60eed1d96627561447d2631279c5793f6eee56dfba83e74f21c21eaca4585de78380722da1ad567945c4053b058891172a2b91645f80e2 SHA512 a68916030b5b9a2b0b4e14ff548ba23a3f4df1baa7e0633436b91fdf4a1ba5b4d1a7d937fc44ed637c262192a1c437d4e78b698b6c1294967e078d955cdb3c58
 MISC metadata.xml 807 BLAKE2B 368714db91017473456e0854b7e2024ac6d24b4ba3d5ae2a44697546c4f96185a44ecc9da8dc816d9661f5815d7d31751d2d87d599c748d06db3f1dde32a141c SHA512 04882668dfa68354aa8ee5860db11963153fb29d9c26b3367fcef63da4ebbccf049909946e73fd06250bf784dcb783b1bc70fb29b9aaa1fcb19be9fcf470ebbe
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.2.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.2.ebuild
new file mode 100644
index 000000000000..9eca6f1f4db5
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.19.2.ebuild
@@ -0,0 +1,44 @@
+# 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="Type hints support for the Sphinx autodoc extension"
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+SRC_URI="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/sphinx-4.5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nptyping-2.1.1[${PYTHON_USEDEP}]
+		dev-python/sphobjinv[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 96742000f2b9..7426d8cc9207 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,3 +1,5 @@
 DIST SQLAlchemy-1.4.39.tar.gz 8212369 BLAKE2B d65993c4342c2cb5bc76ea4ecc986d0ec521a6eb785604ceeca0c9c22187e4af29fc8bd940a130162ca9dd5c30d58b5d0999472285382c6f6bed3863ff9f20cd SHA512 a7c6b73250044289add492b2d7df9010f3b9a3a5126c8b3448d7339cf743c4be3f1c08d238107bb12c579b2bbd7d20e216e331d3ee10dcf79c0f23ca44d496af
+DIST SQLAlchemy-1.4.40.tar.gz 8277132 BLAKE2B fa4362a8abec9845beb3cdb65de4066a8a77a40518187a624af3207198395ae3702db5ca5f65970ec7485e8647bdc5a8685f5d9a3b772778c7d6ec66ad820dcf SHA512 49b8ad8becd6fb2c43615890ef05554ce151f44cda20971a585ff5b325a6a91bb356a3c4320f4b1ac877a9eccdca9bec65cc9942bc5948d4143495b5c884f458
 EBUILD sqlalchemy-1.4.39.ebuild 2617 BLAKE2B 8463ac4ba31b500c01b444cd7b305f2c4dfcc9e39752e68fa0d82b6e7a45a34c55fb72fc87e36035139c714dd5c74fdce6a9f7c9f5c39aa1e4b52b1c0695333b SHA512 53105444a9d92f70b4823ba420d533358c609f6e567911fbe1231eb791d552f6d2a34540718c2ed224b1fdb54d09df7faa04eb9f0684322cb11853b28eadd4f7
+EBUILD sqlalchemy-1.4.40.ebuild 2625 BLAKE2B cb12c0a41a713cad62ed92c4232a24a3ef0293e5d48488ed3ebf9cb70106a9febab2caa70bfbbb7c22e281d6db222f1a0e3cc5ce782272880effeda6a4ae2fd8 SHA512 dec936b66e10c04ce2c9eb2af65cf48c64a5e9b04ef1279c1133fb56d9a424853544ef5c3e7412d5cd5bc58c36c3697f34e2ce05cf847335872891d5f397e16c
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.40.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.40.ebuild
new file mode 100644
index 000000000000..b9b2ea0d21f1
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.40.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+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"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index 5f62baf74bfd..be1f4a7b2e5f 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,5 +1,7 @@
 DIST tomlkit-0.11.0.tar.gz 185695 BLAKE2B cd2a22afb8ea445e39567cdc65f636d8d9f2aef07575a2dd989c19abf1a6f7baf2e9adb78003576af9cdefebe4e8c6031efdabcc9487e10770565589a67b0c86 SHA512 2e89748140cfdae217ac3ac999f0b718414d28218d61fb5219adc503ede2ea1f4003be9ef4453f189b0ee86df463c59520244b9fd26553bd4d8047674cba61c9
 DIST tomlkit-0.11.1.tar.gz 186422 BLAKE2B 805cf22577a2eb32f4c0183d517886706c23cb925b66a4620d11c4b7f8c6b4314f83403b01d5139695e70e3cb83125923db9e93d651d9bec598fe5fe6ea08038 SHA512 04e8c05ce6ce41a7040fdd02274bebc7ad363f54da9525af06ce39e842d4e7548395dca90a3d1f60956d29d051108719847bebfe6a9db0842a19f400e75481ac
+DIST tomlkit-0.11.2.tar.gz 187584 BLAKE2B 0b18625ab2a1a1caa916961ebedbe943f87a20695b9412ff8d276a39510f897e8df000c45e3b5324e285ce1bf925cb22370e9eef1008639e14f01ce28599692a SHA512 9f8e5f85ae9f408c10a1c64d1ab649db7b42c1b19eb0162a5edcfe894f0a179a0ba39ac7f478eb7bb14267f610169bea1d4e96cde8b9cf62df91218c989d5a2a
 EBUILD tomlkit-0.11.0.ebuild 810 BLAKE2B 37d3168a8b555cc7e4b3116e05dd9f9d554dee22322e0796cd379ceb1f39d7f09036fbee267e82f318da1bc3e5940ebe9e9edbb30fc42265c7c1953ecffc853c SHA512 726e6c2b38ca8d736a1a9fd093092d691d0d750f593be44cc7d79b58873d80c1dbf52e9f85c61413681306581df8abcb79d6c1ed49abca31a0a42f15c56f4490
 EBUILD tomlkit-0.11.1.ebuild 818 BLAKE2B 87ddc686dd14ac5ef59c37878dd1b72c6b6b281ea1d49794c4fb0b481cd458da531ce33cb7ecb0207c66f4510e4a3a1f16b9a56477c16122f2a2acf15e1436ee SHA512 c8d41d025284798c0926e3a64ef45aa9ffd7c5f7a03c85f5f8fa3cfba59b2166dae450327e3b86fc730f7e0b5beb636780ceaa7cea1c44111e1bdf61d22d2012
+EBUILD tomlkit-0.11.2.ebuild 818 BLAKE2B 87ddc686dd14ac5ef59c37878dd1b72c6b6b281ea1d49794c4fb0b481cd458da531ce33cb7ecb0207c66f4510e4a3a1f16b9a56477c16122f2a2acf15e1436ee SHA512 c8d41d025284798c0926e3a64ef45aa9ffd7c5f7a03c85f5f8fa3cfba59b2166dae450327e3b86fc730f7e0b5beb636780ceaa7cea1c44111e1bdf61d22d2012
 MISC metadata.xml 525 BLAKE2B 663169c851817eb7368c49d678119f1f2dfebe642325d3dbc59498f60b452710a257ca5cd5173a4fc8391d33038cce079b3fba112ad7e9c0caf0c1872ee43f13 SHA512 5a6cf412fc06854557d001ae4a6f654b36d351c8c0b4bc08c1a7c40f49d8dceba931598f5eed6c75e1d7797570fcf8fb7799f5f035931f80d05b1e9bd0d258c0
diff --git a/dev-python/tomlkit/tomlkit-0.11.2.ebuild b/dev-python/tomlkit/tomlkit-0.11.2.ebuild
new file mode 100644
index 000000000000..8f575bb2866a
--- /dev/null
+++ b/dev-python/tomlkit/tomlkit-0.11.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Style preserving TOML library"
+HOMEPAGE="
+	https://github.com/sdispater/tomlkit/
+	https://pypi.org/project/tomlkit/
+"
+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"
+
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	# use setup.py to avoid circular dep with poetry-core
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["setuptools"]
+		build-backend = "setuptools.build_meta"
+	EOF
+}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index e15431a56d73..ec88fe2adbfa 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index 1d4a1db568b9..4982f7ac44ff 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -1,5 +1,3 @@
-AUX Makefile-nostrip.patch 635 BLAKE2B 6b8c6e573d64e284a4a6842fe8346b382f4f656a98bae59fff5c0b84c71557e74a9c91065f15d82910c3ecaeed720d38d42ba9366beaaeb9b5d1ffaa6baff954 SHA512 08221300c19fd115fe713a6e3f20e83f791d20807af33c27882f7f05e1dc20436dd1459f6b9e011118720c55d26c91f6d4650afa5977e6d2341898fbc7b54971
-AUX Makefile-starter.patch 1346 BLAKE2B 4f33f059ce0c9a02a27250d4893d00423854281ae6343443b7ffc7ddb7eed75951a31cbf11a9f89cf23d3c86513b54f6c42d9e66a006072f032c14957bbb9151 SHA512 a3dd1c1ed1cbb6ca596d32739ac56b1a4db188035572ff9015035061f69f0ef173c0b2dfae4a820b540c30e06d763c65e9d3192d16aaa6c6c25f6f74369f91f8
 AUX racket-8.4-ncurses.patch 4768 BLAKE2B 5d2a76efe004446624aac6ac23460a4daf9997a6fe1bd87bc890194939e38ca89ab08769668744afa45f3f5720ab0965a4ed50bf9569a6b3bfff71d302deca65 SHA512 028e0e3b57cfbe7baaea0c7c9c4c27561b663c9eaf4ea0716fda2ffa1d8cebc213ab1f7340671ed1d6a88329a079ee37f8d24a99427e89b7e8cd24ee70546c8d
 DIST racket-8.3-src-builtpkgs.tgz 150608486 BLAKE2B f002934c07afab4152ad8395c4ab5c6c87ef810f5cf79cf5ae0b41f4caa4508e0044f4246812513def14130d507af57aa61efaff8106eaeac0b86918bd775902 SHA512 7c340f65d221343beb2b4205cdc58648bd65dceabdb16f40cda425474faa905f4dd441193dc6cd4856f7863fb83834721394d6888027db356f830eceb127dbae
 DIST racket-8.4-src-builtpkgs.tgz 151809822 BLAKE2B c42f7943975a6f91a03ef0f668d218571dfc4159eac5a5722b9513b978413a9617b4e1bf3ccabef051014311ecf51fdc80d7563942e9e645c442ddfc4995a308 SHA512 afd9f357673a28ac5e4529ea0879a4edc3dbffc5b8627aa3553f1caf867be3296b94620dc2d86b8bb3f0c7ec7743d0057ce897c5caa705e02f2cc469ce4c7116
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 505b9b1a7f03..59d1d5041f66 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffball/Manifest b/dev-util/diffball/Manifest
index 5b5631af47e4..fcfe96b88955 100644
--- a/dev-util/diffball/Manifest
+++ b/dev-util/diffball/Manifest
@@ -1,5 +1,5 @@
 DIST diffball-1.0.1-bug_543310_stack_buffer_overflows.patch 2945 BLAKE2B 17aa01d64464edccc490e7714dc9db8767d19b0c8b6d14223359d266d38e47aae822454aa14446c038b2b3477a4d8a8db228be7e28666528883ebf02ac2cb65b SHA512 be9a44cd9abfb41f32683d0363375902477f739f9c0dd23b30cfcd9fc6fced61111a2b101cb46db2d6320b4d70ed04627a1c178d44f23530f248bcb87e6efd32
 DIST diffball-1.0.1-bug_708736_cseek_xz_reset_avail_in_out.patch 1041 BLAKE2B de4ac71445f30546eeaaa28201640f3295bc288d83b75b8f84d3134f070249248c777edfe9b0dc705ff7990e6d4dce37d53aa1a9e153bc9a71cff6192b09f8f3 SHA512 eaa9f55b1de0d82a7c21280c4d7e6effcb90944c65f42e0230ef18044f6651512befd425128619c4ca3641111be3cef1418f1800e1854cced24433e1deffe5e7
 DIST diffball-1.0.1.tar.gz 86387 BLAKE2B 1e2c6d522b00a643666e88d19d2d6986ce02c7835378dfc9799e43fa291683bf08e129546a85c332b04ab549788ae4ac3b4d57fd6140a29a9556bece4293cbf9 SHA512 3344f03a65e2b44615eaf9210d26a4438712684c438fcea9caabe89688fe3b3d5436703f0ed63412a18a63acb49ca0dacff190fa002ea76b346bbccba3388ee4
-EBUILD diffball-1.0.1-r2.ebuild 1316 BLAKE2B 38c805d34afae42cc867f97e2cc615d250e7bfc124eb6013504408d9570264b78650d878a775ee3d5cd1ff8ad8a6547352fd10dbdb820d10bc4371d5db628048 SHA512 21e69012307e7f0599521b8b2e38102a2f1f2a112ae8b5c252a0381d9a504619d6dba7e69f85db66b01b3401e07f6dd794ab506940a180fa73f7d858cf2cdb55
+EBUILD diffball-1.0.1-r2.ebuild 1309 BLAKE2B 9a58ebb7721fc03400f5f7138197dd40f9ec4d57813715f8e52a81c1711cb756746f2855ace605e01a2ee2cb3105611ec79f779b77d57653ef77f36db5fc8805 SHA512 6b9923eaf40fb34960d9b63f287fae7a72102340b6523c0868a12cfea1790fc3de1787e051344976e8a88e4c4a2d31241b6b19602d0a9f9c304fd528bde6e806
 MISC metadata.xml 326 BLAKE2B 4a98bb903ca4b64a5507daf8539d07c20006bf9ac8ed051de4611d1697075cb6d96b0dd55571de32e0b03247363d7dbe37391c76261c1ad2be718db797ca6e4a SHA512 6a796aaea08f25043e793b5e1ca09441f4b97eae19b7c9262b1ba269746973cb05a8dd1f2e91764d6ad5aaae7d23dd61ce5820fe6376766dbcc0f11885f9eafc
diff --git a/dev-util/diffball/diffball-1.0.1-r2.ebuild b/dev-util/diffball/diffball-1.0.1-r2.ebuild
index 8c0336eaa368..789ab5f84495 100644
--- a/dev-util/diffball/diffball-1.0.1-r2.ebuild
+++ b/dev-util/diffball/diffball-1.0.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/zmedico/diffball/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug"
 
 RDEPEND="
diff --git a/dev-util/difftastic/Manifest b/dev-util/difftastic/Manifest
index 0f742032e30a..51f787e2aded 100644
--- a/dev-util/difftastic/Manifest
+++ b/dev-util/difftastic/Manifest
@@ -18,7 +18,7 @@ DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST ctor-0.1.22.crate 9311 BLAKE2B a13fb97cf767fae19486ca8b970f1712bfcf4ec9edda40c01add4bdb7a81e9136acb1208c79763cd612160bf39b342460fecc334c6e421e7f7ff610c4bc44e2f SHA512 cd7c60dae8fb19c3b10e0bf1ffbcedac90cbbd147d564335e4da2d5483f64ea3dc10ad17d7573b00958db0a72cce45f8b7bc10c32864dd943fe64df8d22aaaab
 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
-DIST difftastic-0.31.0.gh.tar.gz 26710743 BLAKE2B 23e894504969cdf60be86d07b6ccab046233ca3fa8cf94f1fd523cf4c72873c5c78440ca8563593a6f5a590319e9f977a127cbc71e641f09edbd2eb41df810b5 SHA512 2a1c5b953a4fdb5a43baf138528eab1cb5d38b140a6d99b814bba52c20079a6b790af9f4becab10b0687aed7fc1de89c8df570ad9d7116cec76fc004087d4763
+DIST difftastic-0.32.0.gh.tar.gz 26712270 BLAKE2B 3ff97b6169111a7bc3a728f857333621ef262ca7ff538bc887f424fe8636732d9db4efa3b924b8893917cc0dbcf63f76d3a6a9aa0213fa4289447bd7b52f1b25 SHA512 a76a7e87d4a92bab5db8578aa450c1a1be12cc1a6ac37525832232b098516ec78b964b3bab98bd5875b3ba0ccc712122d08101bb2db317c2a6dd66de3abae642
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST fixedbitset-0.4.1.crate 15551 BLAKE2B bcebd833a45215566a565bcc8cc3440c5bacbced810d2658048da7050808b56c13951bacdd3930f85530129a118bdc23c42381206b63265da7d6846085937536 SHA512 8c53515f1a372a2626e83bc6999adaa00be6451f68627a63e0207ce6a8967e9cab6061adde3e33305c700c472be750903eb36b6f5ce071248db461c0af450b33
@@ -76,5 +76,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wu-diff-0.1.2.crate 33439 BLAKE2B 78b90ed8a42b3a7a1697f92227edb9f0cb8e74583edf8079b8f85110f6fc049eb68370e93ead3940ae222d108c2f18b7f301e9285968e046d362669a79bbb3ca SHA512 6d93c8854dba66f48f736db3f9e997d11d07a0fef3e13219716e553c0f5936f1d00468b88d9164329cfd195271aa242ec7dfd58560074f1a41e8558719ba5af0
-EBUILD difftastic-0.31.0.ebuild 2313 BLAKE2B bf57e684cd5a5e8d0f3f95ee97879c3fa3584a7f4b45c412b8690a4f2ca48ee78b4987de0291c7052c1c7322b6048b3c8e1f60a24fea7056c8b6e242d02ca012 SHA512 cdc8b87101ab07a6ff3ea171b2b908e1bdfc2d571fba8489b3b05af400e7bd25440f8b772291046eefb328244df03e4ce4b589f4f13f9f840978ab0386f1faaa
+EBUILD difftastic-0.32.0.ebuild 2313 BLAKE2B bf57e684cd5a5e8d0f3f95ee97879c3fa3584a7f4b45c412b8690a4f2ca48ee78b4987de0291c7052c1c7322b6048b3c8e1f60a24fea7056c8b6e242d02ca012 SHA512 cdc8b87101ab07a6ff3ea171b2b908e1bdfc2d571fba8489b3b05af400e7bd25440f8b772291046eefb328244df03e4ce4b589f4f13f9f840978ab0386f1faaa
 MISC metadata.xml 333 BLAKE2B 3ba43124273c8969651c7ff68c86718cf0484850e98b2e5de2b4aaacea67e95609b286c6156dc74cb1fa1201e198f0cb685b9cb1f80a6c81cfb8b712dec96a05 SHA512 0726b7ca030ff47d0a304f30f97671e7274905c9c5187edd61eba9224207430ad1cd98d76ecb4120f8b9d722e628834f7bc3d0a3734ef22f0df48fcb44c6c2b3
diff --git a/dev-util/difftastic/difftastic-0.32.0.ebuild b/dev-util/difftastic/difftastic-0.32.0.ebuild
new file mode 100644
index 000000000000..3e049575a92d
--- /dev/null
+++ b/dev-util/difftastic/difftastic-0.32.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.1
+
+EAPI=8
+
+CRATES="
+	aho-corasick-0.7.18
+	ansi_term-0.12.1
+	archery-0.4.0
+	atty-0.2.14
+	autocfg-1.1.0
+	bitflags-1.3.2
+	bumpalo-3.9.1
+	bytecount-0.6.2
+	cc-1.0.73
+	cfg-if-1.0.0
+	clap-3.1.18
+	clap_lex-0.2.0
+	const_format-0.2.23
+	const_format_proc_macros-0.2.22
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	ctor-0.1.22
+	diff-0.1.12
+	either-1.6.1
+	env_logger-0.7.1
+	fixedbitset-0.4.1
+	fnv-1.0.7
+	hashbrown-0.11.2
+	hermit-abi-0.1.19
+	humantime-1.3.0
+	indexmap-1.7.0
+	itertools-0.10.3
+	lazy_static-1.4.0
+	libc-0.2.126
+	libmimalloc-sys-0.1.24
+	log-0.4.17
+	memchr-2.5.0
+	memoffset-0.6.5
+	mimalloc-0.1.28
+	minimal-lexical-0.2.1
+	nom-7.1.1
+	num_cpus-1.13.1
+	once_cell-1.12.0
+	os_str_bytes-6.0.1
+	output_vt100-0.1.3
+	owo-colors-3.4.0
+	petgraph-0.6.1
+	pretty_assertions-1.2.1
+	pretty_env_logger-0.4.0
+	proc-macro2-1.0.39
+	quick-error-1.2.3
+	quote-1.0.18
+	radix-heap-0.4.2
+	rayon-1.5.3
+	rayon-core-1.9.3
+	regex-1.5.6
+	regex-syntax-0.6.26
+	rpds-0.10.0
+	rustc-hash-1.1.0
+	same-file-1.0.6
+	scopeguard-1.1.0
+	static_assertions-1.1.0
+	strsim-0.10.0
+	syn-1.0.95
+	term_size-0.3.2
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	textwrap-0.15.0
+	tree-sitter-0.20.6
+	tree_magic_mini-3.0.3
+	typed-arena-2.0.1
+	unicode-ident-1.0.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.3
+	walkdir-2.3.2
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	wu-diff-0.1.2
+"
+
+inherit cargo
+
+DESCRIPTION="A structural diff that understands syntax."
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/wilfred/difftastic"
+SRC_URI="
+	$(cargo_crate_uris ${CRATES})
+	https://github.com/Wilfred/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="Apache-2.0 MIT MPL-2.0 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="usr/bin/difft"
+
+DOCS=(
+	CHANGELOG.md
+	README.md
+	manual/
+)
+
+src_prepare() {
+	rm manual/.gitignore || die
+	default
+}
+
+src_install() {
+	cargo_src_install
+	dodoc -r "${DOCS[@]}"
+}
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index 1752c0195812..708fca8a001a 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -1,5 +1,5 @@
-DIST gcovr-4.2.tar.gz 222847 BLAKE2B 44864c89b58b526c5afc293168c8af2c9082a99e92f2315485f10430fa5ff959046d189c018e0fa121ff4e9fc3685c13b737c112856c841966052d5fd6c9169a SHA512 bf9e22a58b8390eca391dc8f6ba58c4ca0765e66f18ac6f8d8f80609411df2bab74a846eb179a1aded81b7774fa8a8121bb2d586556aeaf43fd729205b0d0c72
 DIST gcovr-5.1.tar.gz 1676960 BLAKE2B 106c30c7e349f8ffa7a9c52d70e59c32799a8def11986027e3b794ada07fc11ab27b322c377b553f4bb96ca8662bf152eeb7de2d1913381e6068123d2430aa6c SHA512 ae2f0d9ad04f2dc851db9bc99a30a5dc1b1f43dbc6336422ecf5228d37f6994406a83e50f1ee6b5c8d6ec6d7b9e2bba726fd3d502dc5022fe359d480e6d267a5
-EBUILD gcovr-4.2.ebuild 960 BLAKE2B 4864811a5f83e87c1b5acd1c7148d8dad1e48986ccc20aafa3ee1ec61adebb2e3869ac0593dbb41d4a812caba33dcc09134f60406efdfed79e23c88f7062ebbb SHA512 29b855c81c3c3f27aeef82a5e20b47f58803dfcbc96437d9a9632ca61fe6f3e5e176543d67aeef250732fdd3bed809c554d0a8b7f5c6b0e8cacf957fcbc9a593
+DIST gcovr-5.2.tar.gz 1381017 BLAKE2B 8dcd7eb5d482f2020eb29da74e215f0b7731654a66b4ca6d0d919ad6b7eebe564c211a8ec5c4ef87efd61e7c18bfa524aae56d653522f23e4bb902a3921f9522 SHA512 d1a4dd63129ac1d2b9a892ced9b4a0644dc49dc3a115d81ddf348e43fea0e7809c6533104106da8f89a666a4af9ff5a62429b4270ff2272ca61bbebecb7fb921
 EBUILD gcovr-5.1.ebuild 1010 BLAKE2B c19e665d9db7f789c8c296da9d733f26ebd892e1297f016e105f4848d9572e95016ad9729dbfebf3980e5b943e42ef4653eb5b5d71fe1cb97d12ba894ebd53b1 SHA512 90502af6227a1ac3673d3941f2063738e13adeeb433282ac875a1973bdfcbbb50e4ba9a0990d7229347c136060da8007349e5ab807bc932275cb6ea2d05c19ba
+EBUILD gcovr-5.2.ebuild 1050 BLAKE2B ebfe978936a7e8429a6e00d8a26aafd7e7aa1dbe3d90682d8a0b05cd31b368748a89a2d2bdd0176256d6d9ea39d593d408ff70da881e5e10c8f84af4f42ad7bf SHA512 13b06e9c7bfdb7da24a0d22f9827d743aed013062a11aa9ba3ff507cbf6f253944e894991c02c5cbf44558b5564f15e17421156469b866338cbd6f71b1be50a0
 MISC metadata.xml 326 BLAKE2B 0ff392fe3a804fc6d8ea83de983357676a8155dee2fbb5204baf0ead2800210ea30a0171398c71dc60b1d9423a6fd65c0a9032d4511caa459c9b4d4f70ee4132 SHA512 5f5a49bfbbd3d3b77314f7de0c5981a3e700b42733d1c4f6868a7c25d12bb6227ebd254925cbbb6a5d73bf8a0b9f99115d396009d55797e39b53dc43a1a79107
diff --git a/dev-util/gcovr/gcovr-5.2.ebuild b/dev-util/gcovr/gcovr-5.2.ebuild
new file mode 100644
index 000000000000..6c280db429ab
--- /dev/null
+++ b/dev-util/gcovr/gcovr-5.2.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..11} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="A Python script for summarizing gcov data"
+HOMEPAGE="https://github.com/gcovr/gcovr"
+SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/yaxmldiff[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+# tests fail on gcc newer than 5.8
+#RESTRICT="test"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+
+	local -x PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib"
+
+	local deselect=(
+		# those tests fail on gcc newer than 5.8
+		# https://github.com/gcovr/gcovr/issues/206
+		gcovr/tests/test_gcovr.py
+	)
+
+	epytest gcovr ${deselect[@]/#/--deselect }
+}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 876c466778c4..0dfcdd308f0c 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,6 @@
 DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28
-DIST pkgconf-1.9.1.tar.xz 306396 BLAKE2B 69fe07a15fa1084d5493712f8c41e37b0bbae65a25afe27346619331967129649292897dc81e36748443b0d9eaebad62b5c9d3e287c3fc5d18568e4fc8a5abd7 SHA512 d94ce1b65a2488b08bb1b67914144a8f731baeb125b8a02e19191fc07fdd04b94dbb8ed8fbcab0e0f4ebe56498e29b545538abf9712df35931a22d0268b54e83
+DIST pkgconf-1.9.2.tar.xz 306876 BLAKE2B efc52d49279fdf698d3c139163451552c350d475d95eaa046d3d3fca65d0b71777247dc124d789f543ed377df6b9d2ce439fb03af0bceeb507a0075255771b36 SHA512 97681487502567da9dbd41da38356078e5a09c512f3b463aa7e2d063c048c50719dc9d9e3b7ef98c8cf935f11b0c5b8f916263444168e3c893b0e35768e4a0f4
 EBUILD pkgconf-1.8.0-r1.ebuild 1628 BLAKE2B a331c5e6da602547564a077f346d24cd8ec374d61806a2504203bbf0ef2409850556a641294678142a6da04692e395e73020404b1c556c3e275c7c1278fd3cd6 SHA512 fbd538560cfc2a4440519d89abe3dac785145f468bd9f8d1def6e7a7838e30c2af1da36032736d4c035f5b28a4e9c50618642f2ad50ba3c4d55051978590e983
-EBUILD pkgconf-1.9.1.ebuild 1621 BLAKE2B 97b55d48be10dc388bbf5b287b6c6a58b8a299868c47cfa8017d54601bec182eea70717f35cc9b7e22b8331990383e78d13e0d8ce22b904c7dcac0aef645c717 SHA512 31e8bb9d725759aa6bda1dc0c794ea690b28076fea221deffd063e68a85b9f83bc0b107ac5116806c5feb6dabb0d9f416741c811c8b451d20a9578329dc2edb8
+EBUILD pkgconf-1.9.2.ebuild 1621 BLAKE2B 97b55d48be10dc388bbf5b287b6c6a58b8a299868c47cfa8017d54601bec182eea70717f35cc9b7e22b8331990383e78d13e0d8ce22b904c7dcac0aef645c717 SHA512 31e8bb9d725759aa6bda1dc0c794ea690b28076fea221deffd063e68a85b9f83bc0b107ac5116806c5feb6dabb0d9f416741c811c8b451d20a9578329dc2edb8
 EBUILD pkgconf-9999.ebuild 1620 BLAKE2B 09844e6f488727b8553cc7e97ae7f9ff9771bd89f6004f388b98a6a63a0cdd5eb37c8fbc3e0ea9cb7331595822340ed0b99f0d0ea7b892ae64e21927e60c4ebd SHA512 7b3863ce3d49d59ab90c6acd0527bf49d59be258a9ad16cfd0abe2230a6509f01a24796128e4bd8f0afda8c4bf65b7ee5110a51b1402384ee18f76df57f4db0b
 MISC metadata.xml 482 BLAKE2B 3bf8c3349711340133d9e7d81ca94172ce16e607b4fe9135cb7145d0214c0e9753bc884d248d89e2f5d2ab83368b07a95713b2b2a26ad5aaaffe10086a70a9b7 SHA512 6c372c1bc8e8794015838ad7646a503dd19f06890c8a425ce1ed12f3e5211ff01b1c8cc7ee1685b7ffe10c3b1fb89b81a80152f114be72861c27e5bcc6f17653
diff --git a/dev-util/pkgconf/pkgconf-1.9.2.ebuild b/dev-util/pkgconf/pkgconf-1.9.2.ebuild
new file mode 100644
index 000000000000..743bdb4a60b0
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-1.9.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2012-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
+else
+	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
+	# Per release notes, 1.9.0 is a testing/development release.
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf"
+
+LICENSE="ISC"
+SLOT="0/4"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+RDEPEND="!dev-util/pkgconfig"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/pkgconf
+		/usr/bin/pkg-config$(get_exeext)
+	)
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-system-includedir="${EPREFIX}/usr/include"
+		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
+	default
+}
+
+multilib_src_install() {
+	default
+
+	dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
+	dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 88b23a136dfc..b91103fd71e2 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/stagit/Manifest b/dev-vcs/stagit/Manifest
index e91b957c3f3d..9e5c22ff6dff 100644
--- a/dev-vcs/stagit/Manifest
+++ b/dev-vcs/stagit/Manifest
@@ -1,4 +1,6 @@
 AUX stagit-1.1-pkg-config.patch 578 BLAKE2B b25ff1e3bbb4eed09aec97bef30f965a3cdf50ebd05ee42e65aaefc9b090f38debadcbe4e81dfac7af3b00765d8905bcecbf1477e1df9b5a607f69a2576cd74d SHA512 19d2336729eb34fc8ddb330a8655e9d1ba736d415c2735a21cc9ac6ba66cbf48e52fe8c72e67c9eb8e5b6a7427c51ed3a89b2ebef5f400788a1f60e7109edded
 DIST stagit-1.1.tar.gz 19648 BLAKE2B f77f7d79a475d5e7eda734fb0dc5f4006156df90c0019b0cc664efe8a5e0b988e2c9f0bf36efcbabbb06d7c59e6ad81434184c2c73bfef28849261251eb052b8 SHA512 e75d47b84d2783f7396a932b402a4dd36572027931559eae908861f9b8c658f43f5110bdfc81c5a0b65be3a0c53939ba9adabcc1e36fe88a6dab54b929526e0f
+DIST stagit-1.2.tar.gz 19818 BLAKE2B 610a1313f2b5e09c75bb43dfabda35164c43277b0b74e3b63c0f345b55035df8b4590494a4f36bc6e1ac8fe387942d2e12941cdd6116f82d3c929ebd5dd44fc7 SHA512 f9d9f157145b47a14b5ff098e3db261b4739145e5e7cf2a273e188fc8617681dc9b7b9737de2182334bb9a50bef061ebee452ccbc1e013e14f2ef8c4a4c32d0b
 EBUILD stagit-1.1.ebuild 631 BLAKE2B c7cd3ad40e86f7be2f65571c5d425e6c8a5454456878f5784abb8eb44f7a240bda5beb57631ecfda4287451370b1a290b5b9ac8e35ea9a95ff38c17e19ae05dd SHA512 758631e6fa7f44aae36c4a39b5f87b14e121bc718f9a0d0ca00bc2c4815474c90fcd11526511aa0933297630f40ba76155224e84b7017a5effec8b0fa6db749f
+EBUILD stagit-1.2.ebuild 631 BLAKE2B c7cd3ad40e86f7be2f65571c5d425e6c8a5454456878f5784abb8eb44f7a240bda5beb57631ecfda4287451370b1a290b5b9ac8e35ea9a95ff38c17e19ae05dd SHA512 758631e6fa7f44aae36c4a39b5f87b14e121bc718f9a0d0ca00bc2c4815474c90fcd11526511aa0933297630f40ba76155224e84b7017a5effec8b0fa6db749f
 MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
diff --git a/dev-vcs/stagit/stagit-1.2.ebuild b/dev-vcs/stagit/stagit-1.2.ebuild
new file mode 100644
index 000000000000..c820b61e2951
--- /dev/null
+++ b/dev-vcs/stagit/stagit-1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Generates static HTML pages for a Git repository"
+HOMEPAGE="https://codemadness.org/stagit.html"
+SRC_URI="https://codemadness.org/releases/stagit/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/libgit2:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1-pkg-config.patch )
+
+src_install() {
+	emake DESTDIR="${D}" \
+		  DOCPREFIX="${EPREFIX}"/usr/share/doc/${PF} \
+		  MANPREFIX="${EPREFIX}"/usr/share/man \
+		  PREFIX="${EPREFIX}"/usr \
+		  install
+}
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index ae42892b552a..7cd7361e798a 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
new file mode 100644
index 000000000000..47117f6072ed
--- /dev/null
+++ b/gui-wm/gamescope/Manifest
@@ -0,0 +1,3 @@
+DIST gamescope-3.11.33_beta1.tar.gz 188791 BLAKE2B 9866d6131f7ab4bfa90e564d8cde21ae3fa3913fec9a22bc5fa83e418379814a087adf24207e67b737af243523725108958a3a8c34f245031683710b436144d7 SHA512 0842e52e6e9bac154b6256852866f8bb861256e07fa8b78535f2b8e2946c0ff5379c645fcfae710bd7168be2ddc9e48e77aaf49fc65f4b061e225fbb16b8b78c
+EBUILD gamescope-3.11.33_beta1.ebuild 1479 BLAKE2B c5dd3c7250afb0e4dc0a0eec048270e13eb6d7da29752c270878fdc4d0fda0df059c5b2f543b06d46a7f784eef75ac357d3fa15e1ff06557ef3e82ee8c41a227 SHA512 d6655c3ce5ad87966bfc3ff91cd7ecf3018f5deaadce10b8da9523359c928a3d9edea89b6651b7005a0d181b98b9bc2124aa6b3813a6aafefdb3494fc0ef422b
+MISC metadata.xml 329 BLAKE2B 55576d120d50b3fb6103479d383fb56655ab5ffa022bf829bc7a797b263fd7cf92da18d4b5c1028d92a5eb48fd2efa356fb3ecc2c1db7f57dfb58d63ee7f1649 SHA512 e7f2075f12a696de416e1fff294a17d1e9c669d5f7e430d8ffc9d317650ca665f96283023d38e0c68b79b23998881fc6a62fe9d9dd7818e69fe5f6b142cdc60e
diff --git a/gui-wm/gamescope/gamescope-3.11.33_beta1.ebuild b/gui-wm/gamescope/gamescope-3.11.33_beta1.ebuild
new file mode 100644
index 000000000000..d236ff8e6802
--- /dev/null
+++ b/gui-wm/gamescope/gamescope-3.11.33_beta1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps meson
+
+MY_PV="${PV//_/-}"
+DESCRIPTION="Efficient micro-compositor for running games"
+HOMEPAGE="https://github.com/Plagman/gamescope"
+SRC_URI="https://github.com/Plagman/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="pipewire"
+
+RDEPEND="
+	=dev-libs/libliftoff-0.2*
+	dev-libs/wayland
+	>=dev-libs/wayland-protocols-1.17
+	=gui-libs/wlroots-0.15*[X]
+	media-libs/libsdl2[video]
+	media-libs/vulkan-loader
+	sys-libs/libcap
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrender
+	x11-libs/libXres
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	pipewire? ( >=media-video/pipewire-0.3:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/stb
+	dev-util/vulkan-headers
+"
+BDEPEND="
+	dev-util/glslang
+	dev-util/wayland-scanner
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+FILECAPS=(
+	cap_sys_nice usr/bin/${PN}
+)
+
+src_prepare() {
+	default
+
+	# Normally uses stb from a git submodule. Upstream does not ship a
+	# pkg-config file so we don't install one. Work around this using symlinks.
+	mkdir subprojects/stb || die
+	ln -snf "${ESYSROOT}"/usr/include/stb/* "${S}"/subprojects/packagefiles/stb/* subprojects/stb/ || die
+}
+
+src_configure() {
+	local emesonargs=(
+		--force-fallback-for=
+		$(meson_feature pipewire)
+	)
+	meson_src_configure
+}
diff --git a/gui-wm/gamescope/metadata.xml b/gui-wm/gamescope/metadata.xml
new file mode 100644
index 000000000000..c218716acb8a
--- /dev/null
+++ b/gui-wm/gamescope/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<use>
+		<flag name="pipewire">Enable screen capture via PipeWire</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 8d7e9c5a3683..45bb7740afb2 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/renderdoc/Manifest b/media-gfx/renderdoc/Manifest
index 9f93fec7517e..559d912f2884 100644
--- a/media-gfx/renderdoc/Manifest
+++ b/media-gfx/renderdoc/Manifest
@@ -6,6 +6,9 @@ AUX renderdoc-1.18-system-flags.patch 845 BLAKE2B 0d4aae31af353b2d199ae66ec999be
 AUX renderdoc-1.20-system-glslang.patch 8281 BLAKE2B 3bd15c373de0f37831c2d8a03d9c5c4f14684aea2e1d2e350e6300cce7c2182427014f2607199bbe913d460f113faa352dc882ec40a56403f91d87ce0afe4df4 SHA512 7503a5241aa79c241d300f4a758338d0ae511ee2ce9582b5f3720939f9ee71c149614244a0facc620ba2f2da46ceb7dcf7298440c5cd4b528be96245cafc01fa
 DIST renderdoc-1.20.tar.gz 46744415 BLAKE2B 574933653fa37e8a8a4dac4ec1e4156a9761fe3bf086ecf2a5125b51c368dc885f9c27f47fb9f7ddd4318e627431583be1371b92fbd5a5a8ed9f04ed90cc3498 SHA512 5c395cdd68fcacd7d728f4793301a7c11d11bbc09bc1f168d91b18964756f01bd702c0ffda53f3156ee48c06cc2e8c3b2f7ad8da49146e151d8ff6cb7290ed2e
 DIST renderdoc-1.20.tar.gz.asc 833 BLAKE2B 233875056eff2858054566900a3198e857a6970454e4671f57703c5a8a8e1daff3c5d069cba5293791787e7da7db0a40aab17f26df044ed09ca9113c453f8bf6 SHA512 1ccfe4cb190c1c578abbf5e3f0264a00cb6054333f6829e726c2659c352b3ece585a1f3d55e4602908c737a349020c4fd2edc906cf225519ae049338876e0632
+DIST renderdoc-1.21.tar.gz 46911586 BLAKE2B 4d4a38de38837c29e005f6c576a3de9edd221eb1dceda7e65fad65ccc6d672f2de0ebb008a9c0440f61647996f30189ffb71f2379aa04a20e68386416b6f4b35 SHA512 9386a42a1ceeb4712d43c18c699a0234ef7f55f6ca03c7a0537cd97dc76fa1429220b95d8f66c5007dfc92535ff552fdb8b3b755aa8e6ce159aa1e98c6fbce5b
+DIST renderdoc-1.21.tar.gz.asc 833 BLAKE2B baa858de1915a2e4e69bf1fdf21271fe39d0e768100330db3b0a9f312235a0253c8289265dedb6d458a2c829c3058dca74166269b08c8639ecec2d049a7193e5 SHA512 a2197421d004aa7b86672824fd61261ed91d802e1eb2319e1d5ba5d0c32c58dd61a7916ec41dc9a3b8661e24bd9d3f6da70d44e6ebe4a8e6a7dafe4f83ae5338
 DIST swig-renderdoc-7.tar.gz 4006241 BLAKE2B 619f41239f4aef496264d61f44ae042cf80d3ff28491d452cf11ad07e898554c4a32df6119ee0e8e3de36e6bee61855358cd968ad01c9281976e24e9a6cac839 SHA512 5285a65924c069cfb9f73104ad8a95251badac4001293a1757b97ebead5953730c03289159741f82da4c5afe4f61f7c826b105eaf82df044ed2fa21810242c86
 EBUILD renderdoc-1.20-r1.ebuild 5441 BLAKE2B e92947959aed6e9557b53f88b63d0e3515f146c2e2acb61f84f90714d6bb8176fc9b582d8347d28a16174480392c0d5b1c06db01b049c305642e2b9b8de73c51 SHA512 4b62fc9e1424284e285ed031b3d1120964412abda30295238506136dfcb9201ac0a9fa771b69274a4f8386446459b263c0adfbe320d40b47efeb8186208f3ca0
+EBUILD renderdoc-1.21.ebuild 5442 BLAKE2B 32fb65554b850968bf5c268a7e0257b1789d0fda6002ade70c0ac6c1bd17727647a211d1a013a0557b683326cb410fbec1b8a001f7f8ba169d3d29d68090ef62 SHA512 7f173c7a94c0bfc8b5e2678522204fa2d3a84b99ac72c569f0f7a11d7ce88764c295354e2af6a9341fa05c53691d30ee7a0a61d8f58b04a33d831ebc653562c9
 MISC metadata.xml 551 BLAKE2B 6b04ab731ce0f9c836b958914e25fcd4a4b76032fd97ba41f6bda742e99a4b7404de51acac99fe4736ba87e488300e94dc1ef7621a780d0a8e453d0fde0430f2 SHA512 a1c2b5260d0265efe2e1294cb88aa1c43618654c7d989cd8f4bd6e919082ea1d37fed4df8a601a702b5b120d5fb5f6658d3e155c5346dacb17249fed629c04d0
diff --git a/media-gfx/renderdoc/renderdoc-1.21.ebuild b/media-gfx/renderdoc/renderdoc-1.21.ebuild
new file mode 100644
index 000000000000..52cbe285cf97
--- /dev/null
+++ b/media-gfx/renderdoc/renderdoc-1.21.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# The swig fork is required for compatibility with both provided and
+# 3rd-party Python scripts.  Required patch was sent to upstream in
+# 2014: https://github.com/swig/swig/pull/251
+MY_SWIG_VER=7
+MY_SWIG=swig-${PN}-${MY_SWIG_VER}
+
+AUTOTOOLS_AUTO_DEPEND="no"
+DOCS_BUILDER="sphinx"
+DOCS_DIR="docs"
+PYTHON_COMPAT=( python3_{9,10} )
+inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
+
+DESCRIPTION="A stand-alone graphics debugging tool"
+HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
+SRC_URI="
+	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
+	verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
+"
+
+# renderdoc: MIT
+#   + cmdline: BSD (not compatible with upstream lib)
+#   + farm fresh icons: CC-BY-3.0
+#   + half: MIT (not compatible with system dev-libs/half)
+#   + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
+#   + md5: public-domain
+#   + plthook: BSD-2
+#   + pugixml: MIT
+#   + radeon gpu analyzer: MIT
+#   + source code pro: OFL-1.1
+#   + stb: public-domain
+#   + tinyfiledialogs: ZLIB
+#   + docs? ( sphinx.paramlinks: MIT )
+# swig: GPL-3+ BSD BSD-2
+LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pyside2 qt5"
+REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/miniz:=
+	dev-util/glslang
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/xcb-util-keysyms
+	virtual/opengl
+	pyside2? (
+		$(python_gen_cond_dep '
+			dev-python/pyside2[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		${PYTHON_DEPS}
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+"
+DEPEND="${RDEPEND}"
+# qtcore provides qmake, which is required to build the qrenderdoc gui.
+BDEPEND="
+	x11-base/xorg-proto
+	virtual/pkgconfig
+	qt5? (
+		${AUTOTOOLS_DEPEND}
+		${PYTHON_DEPS}
+		dev-libs/libpcre
+		dev-qt/qtcore:5
+		sys-devel/bison
+	)
+	verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
+"
+
+PATCHES=(
+	# The analytics seem very reasonable, and even without this patch
+	# they are NOT sent before the user accepts.  But default the
+	# selection to off, just in case.
+	"${FILESDIR}"/${PN}-1.18-analytics-off.patch
+
+	# Only search for PySide2 if pyside2 USE flag is set.
+	# Bug #833627
+	"${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
+
+	# Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
+	# built.
+	"${FILESDIR}"/${PN}-1.18-system-flags.patch
+
+	# Needed to prevent sandbox violations during build.
+	"${FILESDIR}"/${PN}-1.18-env-home.patch
+
+	"${FILESDIR}"/${PN}-1.20-system-glslang.patch
+	"${FILESDIR}"/${PN}-1.18-system-compress.patch
+)
+
+DOCS=( util/LINUX_DIST_README )
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/baldurkarlsson.gpg
+
+pkg_setup() {
+	use qt5 && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+	   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	# Do not unpack the swig sources here.  CMake will do that if
+	# required.
+	unpack ${P}.tar.gz
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Ensure that we use the system glslang headers instead of the
+	# vendored copy.
+	rm -r renderdoc/3rdparty/glslang || die 'rm vendored glslang failed'
+
+	# Remove the calls to install the documentation files.  Instead,
+	# install them with einstalldocs.
+	sed -i '/share\/doc\/renderdoc/d' \
+		"${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
+		|| die 'sed remove doc install failed'
+
+	# Assumes that the build directory is "${S}"/build, which it is not.
+	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
+		"${S}"/docs/conf.py \
+		|| die 'sed patch doc sys.path failed'
+
+	# Bug #836235
+	sed -i '/#include <stdarg/i #include <time.h>' \
+		"${S}"/renderdoc/os/os_specific.h \
+		|| die 'sed include time.h failed'
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Build system does not know that this is a tagged release, as
+		# we just have the tarball and not the git repository.
+		-DBUILD_VERSION_STABLE=ON
+
+		-DENABLE_EGL=ON
+		-DENABLE_GL=ON
+		-DENABLE_GLES=ON
+		-DENABLE_PYRENDERDOC=$(usex qt5)
+		-DENABLE_QRENDERDOC=$(usex qt5)
+		-DENABLE_VULKAN=ON
+
+		# Upstream says that this option is unsupported and should not
+		# be used yet.
+		-DENABLE_WAYLAND=OFF
+
+		-DENABLE_XCB=ON
+		-DENABLE_XLIB=ON
+
+		# Path to glslang*.cmake.
+		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
+
+		# renderdoc_capture.json is installed here
+		-DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
+	)
+
+	use qt5 && mycmakeargs+=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
+
+		# Needed after qtchooser removal, bug #836474.
+		-DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
+
+		-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
+	)
+
+	use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
+
+	# Lots of type mismatch issues.
+	filter-lto
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "android remote contexts" dev-util/android-tools
+	optfeature "vulkan contexts" media-libs/vulkan-loader
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 09df93ae55a5..70ccef9537b4 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 145c93b56e21..820b916bbf16 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Aug 2022 18:09:55 +0000
+Tue, 09 Aug 2022 00:39:55 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index d4e3a90e56eb..066d7a07d2d7 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 519553 BLAKE2B 95b916bb9f20b609241e18817604d9aedbd9b94266162c0ae72c4075b346239f9bd4fbc73135a0dac0faa2a62330ae77a5fadd98fff5b4147580808a7c200ffe SHA512 4eb7457d78ec74e73c36af46d3c675bcb9bc9cf33d2f1fde05df8e517560b480fc8f920df111c03877fd301aeb0d0d260bbfc22b80cd0d7497e107fd5ded7e3c
-TIMESTAMP 2022-08-08T18:09:59Z
+TIMESTAMP 2022-08-09T00:39:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLxUXdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLxrN5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDTsw//ZMBCjXCk3DDdEF/Id0LMb5fuuotdcXvOXe20HWAnPmBQXDnSTJrbDGfL
-26XiTWhlDirWFi9LrrVAk0qoVThFJt5KL3BfBEAhus/XIMHKeg6lyF+Zqpkyn5fU
-BhcBdsAbzc4RAatsdJTnoI8NoKy4v+Wii63EUtOYLvaCEOsXFK6cuHav6qXVWk6m
-h3wVtJJO9V6qVfNNa6fNzMTA+Cu9ec07CyNIMxQjiffNdf6FmvuscH7/5mhAlROR
-Qy2Vk8Ino8P97pxfAjgzehSw8pf2fuM3wWIcJthE8C8ARNowAFDuA7D0QK631ox8
-id/LThM+B8XWMVZU4mAAaxzsuh9XyOADMnXCEh8ch9VgiUpwM/ZfSGx4NkhyhPot
-mJKWZdT4w2KuEbOkmO06I4wYcsbbtIHD/Es4UmNzlgmg7XD0+sGbf9rjWvBlIfXM
-NA5RxL5smAfAnKv9fDWLnZOXqCc1ITBU15RVL8FtZDnjAUvIShWWsFpnkIIPKLi/
-RqPKpBUYPrqI1zpYpKf88WZnapMpxf+ORU4OKvQEUqVFyiWD70FNoIC8ECThCnQB
-V3cqlMwJzz8/e5yoqw9YCC/xN1EGpDz8T68TXIFf2oXto18/NvSMO8VUaU89PEo3
-rHv9zQvXviTtwUDYQUbTcOPtLA1iUj/rAIQlxkJncDVTaULnC+U=
-=zXmH
+klDI3g/9HF1IlcQZogUo6NitRHPUDpVLyp9dAzwwcS/dBNTp+/CER92G296fu+N/
+4uIJYm0IFDWp8c+jaMQ4GIeTLXIab3rpJAV2cKyn7OLur2hKzrRY4O8qFSGpMgap
+Zo2B4MlUmLMQrGolFu8x51yxkQSNpn69zisZHZPbCtq2ovdFB+1jww6JpM3hWj1I
+pdcF/JekK9MqR8BOovngBiAz5ke1CO8xmedvLh8Q/1ni0g3GtXd5s3j2t8yLjWck
+lBvKVjfzkjq/+xXVauKH9DfW0e1iG2AUhIUUaM/0DwAUn9ekckGb67mDFzQAXaCX
+ah29V33f0Ib3u3T+qlsNoYP9NDpQtOz8n1mjzzewzy2a2Z1U3YcWierxGCKVhOKi
+YFh6FoXM0fEK+i1KTBHSA60PSZVqG2GiR5/H3XsQ31KXBBImbrrv4EpZMMfqkoKY
+Rk5HdjezrY3D4lIM5mTuGH1Wp2BBpCN5xMHL2atslg/Gd9TNDF0IoVjatARWWxfJ
+Ukey4Q5bChFZ1U8/Mi95+ocEHamCxIU9F04tDQjqfPli987pkuV1OZr9qjndBthx
+mDJvnPMHm2YTn6pKa7hDRhFshy3P2eJrhSU/nOUgI0clqA01ogj8Dg6AJWo2FK1m
+EVxUeCk9miM/trU+R5PXCDyXUoae++YOada63jqk5w51Ai6+VR8=
+=hmQ6
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 145c93b56e21..820b916bbf16 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Aug 2022 18:09:55 +0000
+Tue, 09 Aug 2022 00:39:55 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 7a4b0b688b03..c105d68f0605 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 98294f61a999..49c26f80c457 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-package-manager-20110108-r2 b/metadata/md5-cache/app-eselect/eselect-package-manager-20110108-r2
index 220ea9e744ec..fd3efa778559 100644
--- a/metadata/md5-cache/app-eselect/eselect-package-manager-20110108-r2
+++ b/metadata/md5-cache/app-eselect/eselect-package-manager-20110108-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Manages PACKAGE_MANAGER environment variable
 EAPI=8
 HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-admin/eselect-1.1.1
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-package-manager-20110108.tar.bz2
-_md5_=7c19a093b58af96a7b3f2e900756f481
+_md5_=52c36c79beffbeec77a2b0841110722e
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 3b5c4a7c5091..3b005b4dabb2 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.12.1 b/metadata/md5-cache/app-misc/tmuxp-1.12.1
new file mode 100644
index 000000000000..f70ab7900562
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tmuxp-1.12.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-rerunfailures-4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/flaky ) test? ( >=app-misc/tmux-3.0a >=dev-python/kaptan-0.5.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/libtmux-0.12.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/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=tmux session manager. built on libtmux
+EAPI=8
+HOMEPAGE=https://tmuxp.git-pull.com
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=app-misc/tmux-3.0a >=dev-python/kaptan-0.5.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ~dev-python/libtmux-0.12.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathspec[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-1.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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.12.1.tar.gz -> tmuxp-1.12.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1ade02e9f6928b47c554ffc567675e3a
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 20186f2d6634..35153b51d4bb 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/diffmask-0.3.3-r5 b/metadata/md5-cache/app-portage/diffmask-0.3.3-r5
index abd551fa9ef8..90be588f898b 100644
--- a/metadata/md5-cache/app-portage/diffmask-0.3.3-r5
+++ b/metadata/md5-cache/app-portage/diffmask-0.3.3-r5
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/mgorny/diffmask/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~mips ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sys-apps/portage[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 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/diffmask/releases/download/diffmask-0.3.3/diffmask-0.3.3.tar.bz2
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f7645125e422914659905023b3b083fd
+_md5_=6d6399854666b30f56707bc61b4f1493
diff --git a/metadata/md5-cache/app-portage/distpatch-0.1.2-r2 b/metadata/md5-cache/app-portage/distpatch-0.1.2-r2
index 3f2288a278c9..b6e91b956541 100644
--- a/metadata/md5-cache/app-portage/distpatch-0.1.2-r2
+++ b/metadata/md5-cache/app-portage/distpatch-0.1.2-r2
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/rafaelmartins/distpatch
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-util/diffball-1.0.1 dev-python/snakeoil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=sys-apps/portage-2.1.8.3[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 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/rafaelmartins/distpatch/releases/download/v0.1.2/distpatch-0.1.2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=78e000e75611675c8da2f55a14af2fe7
+_md5_=c00d543e68a8adc333d0660c79200a84
diff --git a/metadata/md5-cache/app-portage/emerge-delta-webrsync-3.7.6 b/metadata/md5-cache/app-portage/emerge-delta-webrsync-3.7.6
index 4be97b1e6208..0522d911ad7d 100644
--- a/metadata/md5-cache/app-portage/emerge-delta-webrsync-3.7.6
+++ b/metadata/md5-cache/app-portage/emerge-delta-webrsync-3.7.6
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst preinst unpack
 DESCRIPTION=emerge-webrsync using patches to minimize bandwidth
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-shells/bash >=sys-apps/portage-2.3.69 >=dev-util/diffball-0.6.5
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=829623eadbeda97d37c0ea50dc5f08f19bf4561b -> emerge-delta-webrsync-3.7.6
-_md5_=fac68f3d1b419616ce5b5a3c7af87bbc
+_md5_=aaea2d361b86fc1a42b5474a4308533c
diff --git a/metadata/md5-cache/app-portage/epkg-0.4-r2 b/metadata/md5-cache/app-portage/epkg-0.4-r2
index e40d0e3e8556..9105ffa2504c 100644
--- a/metadata/md5-cache/app-portage/epkg-0.4-r2
+++ b/metadata/md5-cache/app-portage/epkg-0.4-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=A simple portage wrapper which works like other package managers
 EAPI=8
 HOMEPAGE=https://github.com/jdhore/epkg
-KEYWORDS=amd64 ~riscv x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=app-portage/eix app-portage/gentoolkit sys-apps/portage
 SLOT=0
 SRC_URI=https://github.com/jdhore/epkg/archive/refs/tags/epkg-0.4.tar.gz
-_md5_=005a8f3753edb01bbbcbf6633ced7eb8
+_md5_=678b78d0641ce5e639bf7e96823bfffb
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r2 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r2
index 3b74570dec8e..ad61468b4bf7 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r2
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r2
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/hartwork/fetchcommandwrapper
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=net-misc/aria2-1.10.2[metalink,xmlrpc] 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 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fetchcommandwrapper/fetchcommandwrapper-0.8.4.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b428ab3e7dbecc11dffd17e1f06be75d
+_md5_=11d1b9e3521f8fc5d5545a5c8eae1367
diff --git a/metadata/md5-cache/app-portage/g-octave-0.4.1-r7 b/metadata/md5-cache/app-portage/g-octave-0.4.1-r7
index 7776778f58cf..53c53d317a8f 100644
--- a/metadata/md5-cache/app-portage/g-octave-0.4.1-r7
+++ b/metadata/md5-cache/app-portage/g-octave-0.4.1-r7
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/rafaelmartins/g-octave
 INHERIT=distutils-r1
 IUSE=doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/portage python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/downloads/rafaelmartins/g-octave/g-octave-0.4.1.tar.gz https://github.com/rafaelmartins/g-octave-db/archive/bdf02cbf0a8d017c6c1bddeffd6f03d5d90695ed.tar.gz -> g-octave-db-bdf02cb.tar.gz https://dev.gentoo.org/~rafaelmartins/distfiles/g-octave-patches-0.4.1-r7.tar.xz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f380f24262f206f81d5f0450fc2a1557
+_md5_=c7a7c79a7a17c5040fab45061c493004
diff --git a/metadata/md5-cache/app-portage/gander-0.0.1-r2 b/metadata/md5-cache/app-portage/gander-0.0.1-r2
index e94c2dd7445d..8fd7edfb012d 100644
--- a/metadata/md5-cache/app-portage/gander-0.0.1-r2
+++ b/metadata/md5-cache/app-portage/gander-0.0.1-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mgorny/gander/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/portage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gander/archive/v0.0.1.tar.gz -> gander-0.0.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b2b87c6a5e38ac6cb5139d069d001e96
+_md5_=0a6f66b4b1a439628b71d4cbad68c404
diff --git a/metadata/md5-cache/app-portage/gverify-2 b/metadata/md5-cache/app-portage/gverify-2
index ccab77337dc5..b28884e949c6 100644
--- a/metadata/md5-cache/app-portage/gverify-2
+++ b/metadata/md5-cache/app-portage/gverify-2
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/mgorny/gverify
 INHERIT=python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD-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-crypt/gnupg sec-keys/openpgp-keys-gentoo-auth dev-vcs/git
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gverify/archive/v2.tar.gz -> gverify-2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=15c8614323025310cb4f3bf478d803d3
+_md5_=f9ba98af72077b9e461e470de5f9d59f
diff --git a/metadata/md5-cache/app-portage/metagen-0.7.3 b/metadata/md5-cache/app-portage/metagen-0.7.3
index 58314871de89..88221226499d 100644
--- a/metadata/md5-cache/app-portage/metagen-0.7.3
+++ b/metadata/md5-cache/app-portage/metagen-0.7.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~hppa ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/portage[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 )
 SLOT=0
 SRC_URI=mirror://pypi/m/metagen/metagen-0.7.3.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bbe07c70c2f3fe04e42c94d873a0dfce
+_md5_=4daa620414de65cb1f08e69f7deaa35f
diff --git a/metadata/md5-cache/app-portage/overlint-0.5.3-r3 b/metadata/md5-cache/app-portage/overlint-0.5.3-r3
index c3f0090b0269..d61c44da2f5f 100644
--- a/metadata/md5-cache/app-portage/overlint-0.5.3-r3
+++ b/metadata/md5-cache/app-portage/overlint-0.5.3-r3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://cgit.gentoo.org/proj/overlint.git
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=sys-apps/portage[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 )
 SLOT=0
 SRC_URI=https://www.hartwork.org/public/overlint-0.5.3.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bc281ebca34d2266a295dd42f7dc8487
+_md5_=8939851082f0c4db659b08375d5de372
diff --git a/metadata/md5-cache/app-portage/porticron-0.7.1 b/metadata/md5-cache/app-portage/porticron-0.7.1
index bba4af582bf3..8985b231f268 100644
--- a/metadata/md5-cache/app-portage/porticron-0.7.1
+++ b/metadata/md5-cache/app-portage/porticron-0.7.1
@@ -3,10 +3,10 @@ DESCRIPTION=cron script to sync portage and send update mails to root
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/porticron
 INHERIT=vcs-snapshot
-KEYWORDS=amd64 arm arm64 ~hppa ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=app-portage/gentoolkit net-dns/bind-tools
 SLOT=0
 SRC_URI=https://github.com/gentoo/porticron/archive/v0.7.1.tar.gz -> porticron-0.7.1.tar.gz
 _eclasses_=eqawarn	c9847c43b3253a276ae2eabddedab3d7	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=84cdeeeb5565dccfe1b9c8ee91a2d4c3
+_md5_=42d2219c61365ec1b4220102a6d6be4a
diff --git a/metadata/md5-cache/app-portage/portpeek-3.2.2-r1 b/metadata/md5-cache/app-portage/portpeek-3.2.2-r1
index 2f6f822b01ab..6b4a0c7005af 100644
--- a/metadata/md5-cache/app-portage/portpeek-3.2.2-r1
+++ b/metadata/md5-cache/app-portage/portpeek-3.2.2-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/mpagano/portpeek
 INHERIT=python-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=app-portage/gentoolkit-0.6.1-r1 || ( >=sys-apps/portage-3.0.31[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/mpagano/portpeek/releases/download/3.2.2/portpeek-3.2.2.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2f7be8d99582231d1682348246271678
+_md5_=64ae907cbe7956f9f96d72eeacdcc7c1
diff --git a/metadata/md5-cache/app-portage/repo-commit-0.4.1-r1 b/metadata/md5-cache/app-portage/repo-commit-0.4.1-r1
index 0930080ebd52..439cfaf66c4c 100644
--- a/metadata/md5-cache/app-portage/repo-commit-0.4.1-r1
+++ b/metadata/md5-cache/app-portage/repo-commit-0.4.1-r1
@@ -3,10 +3,10 @@ DESCRIPTION=A repository commit helper
 EAPI=7
 HOMEPAGE=https://bitbucket.org/gentoo/repo-commit/
 INHERIT=out-of-source
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=sys-apps/portage
 SLOT=0
 SRC_URI=https://www.bitbucket.org/gentoo/repo-commit/downloads/repo-commit-0.4.1.tar.bz2
 _eclasses_=out-of-source	6dc5829f04ddee3f91b9bb274a701fdb
-_md5_=8302d3d71c788c773acf2472d93d147c
+_md5_=d0af1a4931894f669fdb242c268bf292
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 6c215c5c57ba..29cd1f05fc08 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/erlang-25.0.3 b/metadata/md5-cache/dev-lang/erlang-25.0.3
new file mode 100644
index 000000000000..e1ca3e5ac65f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/erlang-25.0.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
+EAPI=7
+HOMEPAGE=https://www.erlang.org/
+INHERIT=elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
+IUSE=doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets java
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/25.0.3
+SRC_URI=https://github.com/erlang/otp/archive/OTP-25.0.3.tar.gz -> erlang-25.0.3.tar.gz https://github.com/erlang/otp/releases/download/OTP-25.0/otp_doc_man_25.0.tar.gz -> erlang_doc_man_25.0.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-25.0/otp_doc_html_25.0.tar.gz -> erlang_doc_html_25.0.tar.gz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	e7aaa047873789f549ea3df2f04b2145	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
+_md5_=0273d51a0c33d9248436622a5ae7f5fc
diff --git a/metadata/md5-cache/dev-lang/go-1.19 b/metadata/md5-cache/dev-lang/go-1.19
index 3d194992cc55..ab530cefd66b 100644
--- a/metadata/md5-cache/dev-lang/go-1.19
+++ b/metadata/md5-cache/dev-lang/go-1.19
@@ -5,9 +5,10 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=cpu_flags_x86_sse2
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RESTRICT=strip
 SLOT=0/1.19
 SRC_URI=https://storage.googleapis.com/golang/go1.19.src.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0720f989c1899b9806c341d7086688cf
+_md5_=1b6b3950019970bfd1b5ad3a82d3f6c7
diff --git a/metadata/md5-cache/dev-lang/python-3.11.0_rc1 b/metadata/md5-cache/dev-lang/python-3.11.0_rc1
new file mode 100644
index 000000000000..926dab5c6216
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.11.0_rc1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) !sys-devel/gcc[libffi(-)] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_11(-)]
+RESTRICT=!test? ( test )
+SLOT=3.11
+SRC_URI=https://www.python.org/ftp/python/3.11.0/Python-3.11.0rc1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.0rc1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0rc1.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=85fafe32470d8fe06669f17d2a169a36
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 0e566f4c94ef..a18508c95700 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/libliftoff-0.2.0 b/metadata/md5-cache/dev-libs/libliftoff-0.2.0
new file mode 100644
index 000000000000..e4ea45a52e6c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libliftoff-0.2.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=x11-libs/libdrm
+DESCRIPTION=Lightweight KMS plane library
+EAPI=8
+HOMEPAGE=https://gitlab.freedesktop.org/emersion/libliftoff
+INHERIT=meson
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=x11-libs/libdrm
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/emersion/libliftoff/-/releases/v0.2.0/downloads/libliftoff-0.2.0.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=822265dbb13138aab91e4740ca871a33
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.2 b/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.2
new file mode 100644
index 000000000000..f692162b9c6b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-libs/tree-sitter
+DESCRIPTION=C grammar for Tree-sitter
+EAPI=8
+HOMEPAGE=https://github.com/tree-sitter/tree-sitter-c
+INHERIT=tree-sitter-grammar
+KEYWORDS=~amd64
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.2.tar.gz -> tree-sitter-c-0.20.2.tar.gz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	tree-sitter-grammar	7ea5209555eb31addcb41eeacff59fec
+_md5_=7bee33656eee9a5f3cfaa35725992fd4
diff --git a/metadata/md5-cache/dev-libs/weston-9999 b/metadata/md5-cache/dev-libs/weston-9999
index 10d548c30ed6..ee3d7e33353d 100644
--- a/metadata/md5-cache/dev-libs/weston-9999
+++ b/metadata/md5-cache/dev-libs/weston-9999
@@ -1,16 +1,16 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.24 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.95 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm(+)] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.3:= ) rdp? ( >=net-misc/freerdp-2.3.0:=[server] ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.24 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.95 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config drm? ( >=media-libs/mesa-17.1[gbm(+)] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.3:= ) rdp? ( >=net-misc/freerdp-2.3.0:=[server] ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 DESCRIPTION=Wayland reference compositor
 EAPI=8
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
 INHERIT=meson python-any-r1 readme.gentoo-r1 xdg-utils git-r3
-IUSE=colord +desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland
+IUSE=+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland
 LICENSE=MIT CC-BY-SA-3.0
 PROPERTIES=live
-RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.24 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.95 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm(+)] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.3:= ) rdp? ( >=net-misc/freerdp-2.3.0:=[server] ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
-REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) remoting? ( drm gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm headless rdp wayland-compositor X )
+RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.24 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.95 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config drm? ( >=media-libs/mesa-17.1[gbm(+)] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.3:= ) rdp? ( >=net-misc/freerdp-2.3.0:=[server] ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+REQUIRED_USE=drm? ( gles2 ) pipewire? ( drm ) remoting? ( drm gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm headless rdp wayland-compositor X )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0133f1cf55737a4811be2ae032e975ba
+_md5_=eb208220efe109cf4561c2629181072f
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index a29d43ed4894..5be63861f7fe 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/ansi2html-1.8.0-r1 b/metadata/md5-cache/dev-python/ansi2html-1.8.0-r1
index 0f318b09d478..023f6478b9ee 100644
--- a/metadata/md5-cache/dev-python/ansi2html-1.8.0-r1
+++ b/metadata/md5-cache/dev-python/ansi2html-1.8.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ansi2html/ https://github.com/pycontribs/ansi2html
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~riscv ~x86
+KEYWORDS=amd64 arm ~riscv x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-python/six-1.7.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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.8.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4f3db9dbce90c528f8d1befe50b8855c
+_md5_=fc81524ba817003911c568080116bf4a
diff --git a/metadata/md5-cache/dev-python/astroid-2.12.0 b/metadata/md5-cache/dev-python/astroid-2.12.0
index 83be8e1f7b5c..2b8b3e460fe6 100644
--- a/metadata/md5-cache/dev-python/astroid-2.12.0
+++ b/metadata/md5-cache/dev-python/astroid-2.12.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/PyCQA/astroid/ https://pypi.org/project/astroid/
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-python/lazy-object-proxy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/wrapt-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/astroid/archive/v2.12.0.tar.gz -> astroid-2.12.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e39bf0e4f19207ce82a1a8b79d2060d3
+_md5_=71c46c93272709addffc310965c90d0e
diff --git a/metadata/md5-cache/dev-python/autobahn-22.6.1 b/metadata/md5-cache/dev-python/autobahn-22.6.1
index 60087407d5dd..e71b8ad7e039 100644
--- a/metadata/md5-cache/dev-python/autobahn-22.6.1
+++ b/metadata/md5-cache/dev-python/autobahn-22.6.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://crossbar.io/autobahn/ https://github.com/crossbario/autobahn-python/ https://pypi.org/project/autobahn/
 INHERIT=distutils-r1 optfeature
 IUSE=test xbr python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=~amd64 arm arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/zope-interface-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-20.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-20.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/txaio-21.2.1[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/hyperlink-21.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-22.6.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=886e59c216e7b575c758611e52ae4e94
+_md5_=f09914007c63cc8d3d969659a6615f01
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.49.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.49.0
new file mode 100644
index 000000000000..95de9a1dd680
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.49.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
+EAPI=8
+HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/boto3-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.49.0.tar.gz -> aws-sam-translator-1.49.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=485f35ba7ed8681c67a26dfc45c1d571
diff --git a/metadata/md5-cache/dev-python/debugpy-1.6.2 b/metadata/md5-cache/dev-python/debugpy-1.6.2
index ec5265283ee7..56b37acf9c18 100644
--- a/metadata/md5-cache/dev-python/debugpy-1.6.2
+++ b/metadata/md5-cache/dev-python/debugpy-1.6.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
 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
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pydevd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/microsoft/debugpy/archive/v1.6.2.tar.gz -> debugpy-1.6.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=22c2e1cabc403a8a73acaf375f944d4f
+_md5_=922f7cb24c92fdc0eb162b9431eccd3c
diff --git a/metadata/md5-cache/dev-python/docutils-glep-1.4 b/metadata/md5-cache/dev-python/docutils-glep-1.4
index 308ea48da02a..35e919f693ad 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-1.4
+++ b/metadata/md5-cache/dev-python/docutils-glep-1.4
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/mgorny/docutils-glep/ https://pypi.org/project/docutils-glep/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=>=dev-python/docutils-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] 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=https://github.com/mgorny/docutils-glep/archive/v1.4.tar.gz -> docutils-glep-1.4.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ddaf10a152c827ead7844efb0a8bd77e
+_md5_=1c5604ec4754e26ae09e74afe14fd66d
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-1.1.8 b/metadata/md5-cache/dev-python/dogpile-cache-1.1.8
index d2253ae1c9ce..ac94870d5470 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-1.1.8
+++ b/metadata/md5-cache/dev-python/dogpile-cache-1.1.8
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sqlalchemy/dogpile.cache/ https://pypi.org/project/dogpile.cache/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/decorator-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-1.1.8.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=adbe8d5ee91e4d26a718e0e531ec91f8
+_md5_=5745f8cf565a008cf90477e1f27da93e
diff --git a/metadata/md5-cache/dev-python/flit_scm-1.7.0 b/metadata/md5-cache/dev-python/flit_scm-1.7.0
index 402ef5e63428..4e0ac8e37fad 100644
--- a/metadata/md5-cache/dev-python/flit_scm-1.7.0
+++ b/metadata/md5-cache/dev-python/flit_scm-1.7.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/WillDaSilva/flit_scm/ https://pypi.org/project/flit-scm/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/flit_core-3.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-6.4.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/tomli-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( <dev-python/tomli-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( <dev-python/tomli-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( <dev-python/tomli-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-2[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 ) 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 )
 SLOT=0
 SRC_URI=https://gitlab.com/WillDaSilva/flit_scm/-/archive/1.7.0/flit_scm-1.7.0.tar.bz2
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6690f7f8ddde0d37f5f2636641785225
+_md5_=6fe236a8135a72356885dbc3f6c66689
diff --git a/metadata/md5-cache/dev-python/imageio-2.21.1 b/metadata/md5-cache/dev-python/imageio-2.21.1
new file mode 100644
index 000000000000..fcbd8621109e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/imageio-2.21.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/fsspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imageio-ffmpeg[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/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library for reading and writing image data
+EAPI=8
+HOMEPAGE=https://imageio.readthedocs.io/en/stable/ https://github.com/imageio/imageio/ https://pypi.org/project/imageio/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+PROPERTIES=test_network
+RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/imageio/imageio/archive/v2.21.1.tar.gz -> imageio-2.21.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1be6ddbf12ba1226d0caea4060f90b37
diff --git a/metadata/md5-cache/dev-python/inflect-5.6.2 b/metadata/md5-cache/dev-python/inflect-5.6.2
index d489a4396618..fa4726d2a0c0 100644
--- a/metadata/md5-cache/dev-python/inflect-5.6.2
+++ b/metadata/md5-cache/dev-python/inflect-5.6.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/inflect/ https://github.com/jaraco/inflect/
 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/inflect/inflect-5.6.2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e5ccee3d8252cf122fe4c2bc86089caa
+_md5_=48387a80fe9fea68fd360789a012fe09
diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.11.1 b/metadata/md5-cache/dev-python/jupyter_core-4.11.1
index 455c3c2405a0..fe5ff8221e28 100644
--- a/metadata/md5-cache/dev-python/jupyter_core-4.11.1
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.11.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/traitlets[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/j/jupyter_core/jupyter_core-4.11.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5ef587be990985aa2350adfc2aff569b
+_md5_=28dc9071e9043de24cc03d8b07f39561
diff --git a/metadata/md5-cache/dev-python/jupyter_server-1.18.1 b/metadata/md5-cache/dev-python/jupyter_server-1.18.1
index 507bc6a6144a..6aed8fc3a890 100644
--- a/metadata/md5-cache/dev-python/jupyter_server-1.18.1
+++ b/metadata/md5-cache/dev-python/jupyter_server-1.18.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/anyio-3.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/anyio-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/argon2-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nbformat-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prometheus_client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/send2trash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_server/jupyter_server-1.18.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=550754f1a7ecd8b518e89d9d5c590a24
+_md5_=7a9a1b7fc58a8b430e50ef47d5bb4427
diff --git a/metadata/md5-cache/dev-python/keyring-23.8.2 b/metadata/md5-cache/dev-python/keyring-23.8.2
new file mode 100644
index 000000000000..73826f3715c2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/keyring-23.8.2
@@ -0,0 +1,16 @@
+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/secretstorage-3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jeepney-0.4.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/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Provides access to the system keyring service
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/keyring/ https://pypi.org/project/keyring/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=PSF-2
+RDEPEND=>=dev-python/secretstorage-3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jeepney-0.4.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/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) 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/jaraco/keyring/archive/v23.8.2.tar.gz -> keyring-23.8.2.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1b13c0fbed3f1122980c2d7a7a8ba640
diff --git a/metadata/md5-cache/dev-python/metakernel-0.29.2 b/metadata/md5-cache/dev-python/metakernel-0.29.2
new file mode 100644
index 000000000000..920d044ca243
--- /dev/null
+++ b/metadata/md5-cache/dev-python/metakernel-0.29.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jupyter_kernel_test[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/ipykernel-5.5.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Metakernel for Jupyter
+EAPI=8
+HOMEPAGE=https://github.com/Calysto/metakernel
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/ipykernel-5.5.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.8[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/metakernel/metakernel-0.29.2.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6aaafadd338dcd39682ed953d87aeaf3
diff --git a/metadata/md5-cache/dev-python/nuitka-1.0.2 b/metadata/md5-cache/dev-python/nuitka-1.0.2
new file mode 100644
index 000000000000..4b145be70fd7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nuitka-1.0.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net
+INHERIT=distutils-r1 flag-o-matic optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~loong ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://nuitka.net/releases/Nuitka-1.0.2.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a74a9f966bba95c284e57252c51c882a
diff --git a/metadata/md5-cache/dev-python/pip-run-8.8.1 b/metadata/md5-cache/dev-python/pip-run-8.8.1
index 3c69d535b48f..b03cb1a2d751 100644
--- a/metadata/md5-cache/dev-python/pip-run-8.8.1
+++ b/metadata/md5-cache/dev-python/pip-run-8.8.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jaraco/pip-run/ https://pypi.org/project/pip-run/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/autocommand[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/path-py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[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/jaraco/pip-run/archive/v8.8.1.tar.gz -> pip-run-8.8.1.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=896c9d4d54994b5e6d017f4ff2fbee55
+_md5_=40734ce5010915e873fb8b14a6b4192a
diff --git a/metadata/md5-cache/dev-python/pylama-8.4.1 b/metadata/md5-cache/dev-python/pylama-8.4.1
new file mode 100644
index 000000000000..7fa7076657aa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylama-8.4.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/eradicate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pylint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/radon[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycodestyle-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydocstyle-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyflakes-2.5.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-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Code audit tool for python
+EAPI=8
+HOMEPAGE=https://github.com/klen/pylama
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/mccabe-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycodestyle-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydocstyle-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyflakes-2.5.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=https://github.com/klen/pylama/archive/8.4.1.tar.gz -> pylama-8.4.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=060ffaf7c6593f67814c901cb6f15c30
diff --git a/metadata/md5-cache/dev-python/sexpdata-0.0.3-r2 b/metadata/md5-cache/dev-python/sexpdata-0.0.3-r2
index 14f8c4b34952..cdecacf8e012 100644
--- a/metadata/md5-cache/dev-python/sexpdata-0.0.3-r2
+++ b/metadata/md5-cache/dev-python/sexpdata-0.0.3-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jd-boyd/sexpdata
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc ~riscv ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jd-boyd/sexpdata/archive/v0.0.3.tar.gz -> sexpdata-0.0.3.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=365747e96adb0d42e288204c2393148c
+_md5_=44c8986e23eb19321eb5f7774683476c
diff --git a/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.19.2 b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.19.2
new file mode 100644
index 000000000000..6cf3647fdf6a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.19.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/nptyping-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphobjinv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/typing-extensions-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/sphinx-4.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Type hints support for the Sphinx autodoc extension
+EAPI=8
+HOMEPAGE=https://github.com/tox-dev/sphinx-autodoc-typehints/ https://pypi.org/project/sphinx-autodoc-typehints/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/sphinx-4.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tox-dev/sphinx-autodoc-typehints/archive/1.19.2.tar.gz -> sphinx-autodoc-typehints-1.19.2.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e2af2245c23de4f22a42e0e7b09ad230
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.40 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.40
new file mode 100644
index 000000000000..e5070b6c6fcb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.40
@@ -0,0 +1,16 @@
+BDEPEND=test? ( 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] ) ) 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=[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?] ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+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
+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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.40.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=06ed5f2d932ae54b6998f77e71b0d866
diff --git a/metadata/md5-cache/dev-python/tomlkit-0.11.2 b/metadata/md5-cache/dev-python/tomlkit-0.11.2
new file mode 100644
index 000000000000..e808757ecc17
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tomlkit-0.11.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Style preserving TOML library
+EAPI=8
+HOMEPAGE=https://github.com/sdispater/tomlkit/ https://pypi.org/project/tomlkit/
+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=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tomlkit/tomlkit-0.11.2.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f07c48cac8eed20330eec89b7a4c9139
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c85e15df26c2..83e657256700 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/diffball-1.0.1-r2 b/metadata/md5-cache/dev-util/diffball-1.0.1-r2
index 951bc8787d5a..893c4993ff73 100644
--- a/metadata/md5-cache/dev-util/diffball-1.0.1-r2
+++ b/metadata/md5-cache/dev-util/diffball-1.0.1-r2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/zmedico/diffball
 INHERIT=autotools flag-o-matic
 IUSE=debug
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=>=sys-libs/zlib-1.1.4 >=app-arch/bzip2-1.0.2 app-arch/xz-utils
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/zmedico/diffball/archive/v1.0.1.tar.gz -> diffball-1.0.1.tar.gz https://github.com/zmedico/diffball/pull/1.patch -> diffball-1.0.1-bug_543310_stack_buffer_overflows.patch https://github.com/zmedico/diffball/pull/2.patch -> diffball-1.0.1-bug_708736_cseek_xz_reset_avail_in_out.patch
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=72b1fd0cea712b14d80c75c4d1e529ac
+_md5_=4c661830d7e5c126d54fd2d1f8038e4f
diff --git a/metadata/md5-cache/dev-util/difftastic-0.32.0 b/metadata/md5-cache/dev-util/difftastic-0.32.0
new file mode 100644
index 000000000000..34d797b459a7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/difftastic-0.32.0
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A structural diff that understands syntax.
+EAPI=8
+HOMEPAGE=https://github.com/wilfred/difftastic
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT MPL-2.0 Unlicense ZLIB
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/archery/0.4.0/download -> archery-0.4.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/bytecount/0.6.2/download -> bytecount-0.6.2.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/3.1.18/download -> clap-3.1.18.crate https://crates.io/api/v1/crates/clap_lex/0.2.0/download -> clap_lex-0.2.0.crate https://crates.io/api/v1/crates/const_format/0.2.23/download -> const_format-0.2.23.crate https://crates.io/api/v1/crates/const_format_proc_macros/0.2.22/download -> const_format_proc_macros-0.2.22.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/ctor/0.1.22/download -> ctor-0.1.22.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fixedbitset/0.4.1/download -> fixedbitset-0.4.1.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/libmimalloc-sys/0.1.24/download -> libmimalloc-sys-0.1.24.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mimalloc/0.1.28/download -> mimalloc-0.1.28.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.1/download -> os_str_bytes-6.0.1.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/owo-colors/3.4.0/download -> owo-colors-3.4.0.crate https://crates.io/api/v1/crates/petgraph/0.6.1/download -> petgraph-0.6.1.crate https://crates.io/api/v1/crates/pretty_assertions/1.2.1/download -> pretty_assertions-1.2.1.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/radix-heap/0.4.2/download -> radix-heap-0.4.2.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/regex/1.5.6/download -> regex-1.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.26/download -> regex-syntax-0.6.26.crate https://crates.io/api/v1/crates/rpds/0.10.0/download -> rpds-0.10.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.95/download -> syn-1.0.95.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/tree-sitter/0.20.6/download -> tree-sitter-0.20.6.crate https://crates.io/api/v1/crates/tree_magic_mini/3.0.3/download -> tree_magic_mini-3.0.3.crate https://crates.io/api/v1/crates/typed-arena/2.0.1/download -> typed-arena-2.0.1.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wu-diff/0.1.2/download -> wu-diff-0.1.2.crate https://github.com/Wilfred/difftastic/archive/refs/tags/0.32.0.tar.gz -> difftastic-0.32.0.gh.tar.gz
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1d873de793758dc17a204b811da6f1a8
diff --git a/metadata/md5-cache/dev-util/gcovr-5.2 b/metadata/md5-cache/dev-util/gcovr-5.2
new file mode 100644
index 000000000000..8c3be6a70e0e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gcovr-5.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/yaxmldiff[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/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python script for summarizing gcov data
+EAPI=8
+HOMEPAGE=https://github.com/gcovr/gcovr
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/yaxmldiff[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/gcovr/gcovr/archive/5.2.tar.gz -> gcovr-5.2.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=9c6428b17cc7876e8581eaf5409b3d62
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.9.2 b/metadata/md5-cache/dev-util/pkgconf-1.9.2
new file mode 100644
index 000000000000..bd53b918ac75
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgconf-1.9.2
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-libs/atf dev-util/kyua )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=pkg-config compatible replacement with no dependencies other than ANSI C89
+EAPI=8
+HOMEPAGE=https://gitea.treehouse.systems/ariadne/pkgconf
+INHERIT=multilib multilib-minimal
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=ISC
+RDEPEND=!dev-util/pkgconfig
+RESTRICT=!test? ( test )
+SLOT=0/4
+SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.9.2.tar.xz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4a08e1f8926c695ac51c722edce28389
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index d84fda04ea5a..bfc7e4816bf5 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/stagit-1.2 b/metadata/md5-cache/dev-vcs/stagit-1.2
new file mode 100644
index 000000000000..deb68a068096
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/stagit-1.2
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=dev-libs/libgit2:=
+DESCRIPTION=Generates static HTML pages for a Git repository
+EAPI=8
+HOMEPAGE=https://codemadness.org/stagit.html
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/libgit2:=
+SLOT=0
+SRC_URI=https://codemadness.org/releases/stagit/stagit-1.2.tar.gz
+_md5_=dcb16d09ba82c4eb5adec21e513151f2
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index acb653a6c98c..039e833194c6 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/gamescope-3.11.33_beta1 b/metadata/md5-cache/gui-wm/gamescope-3.11.33_beta1
new file mode 100644
index 000000000000..50431813e3db
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/gamescope-3.11.33_beta1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glslang dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND==dev-libs/libliftoff-0.2* dev-libs/wayland >=dev-libs/wayland-protocols-1.17 =gui-libs/wlroots-0.15*[X] media-libs/libsdl2[video] media-libs/vulkan-loader sys-libs/libcap x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= ) dev-libs/stb dev-util/vulkan-headers
+DESCRIPTION=Efficient micro-compositor for running games
+EAPI=8
+HOMEPAGE=https://github.com/Plagman/gamescope
+INHERIT=fcaps meson
+IUSE=pipewire +filecaps
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND==dev-libs/libliftoff-0.2* dev-libs/wayland >=dev-libs/wayland-protocols-1.17 =gui-libs/wlroots-0.15*[X] media-libs/libsdl2[video] media-libs/vulkan-loader sys-libs/libcap x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= )
+SLOT=0
+SRC_URI=https://github.com/Plagman/gamescope/archive/refs/tags/3.11.33-beta1.tar.gz -> gamescope-3.11.33_beta1.tar.gz
+_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=9d54f4b235e45ed0c005af082e28243e
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index fe63ecef4afd..6c0fd8627f8d 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/renderdoc-1.21 b/metadata/md5-cache/media-gfx/renderdoc-1.21
new file mode 100644
index 000000000000..118bdb7fa332
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/renderdoc-1.21
@@ -0,0 +1,16 @@
+BDEPEND=x11-base/xorg-proto virtual/pkgconfig qt5? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 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 ) dev-libs/libpcre dev-qt/qtcore:5 sys-devel/bison ) verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] ) ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( 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 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+DESCRIPTION=A stand-alone graphics debugging tool
+EAPI=8
+HOMEPAGE=https://renderdoc.org https://github.com/baldurk/renderdoc
+INHERIT=autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
+IUSE=pyside2 qt5 python_single_target_python3_9 python_single_target_python3_10 doc verify-sig
+KEYWORDS=~amd64
+LICENSE=BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB
+RDEPEND=app-arch/lz4:= app-arch/zstd:= dev-libs/miniz:= dev-util/glslang x11-libs/libX11 x11-libs/libxcb:= x11-libs/xcb-util-keysyms virtual/opengl pyside2? ( python_single_target_python3_9? ( dev-python/pyside2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyside2[python_targets_python3_10(-)] ) ) qt5? ( 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 ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+REQUIRED_USE=doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
+SLOT=0
+SRC_URI=https://github.com/baldurk/renderdoc/archive/refs/tags/v1.21.tar.gz -> renderdoc-1.21.tar.gz qt5? ( https://github.com/baldurk/swig/archive/renderdoc-modified-7.tar.gz -> swig-renderdoc-7.tar.gz ) verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v1.21/v1.21.tar.gz.asc -> renderdoc-1.21.tar.gz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	cmake	44afbf15c35884f7c840470f1cf05d0d	docs	8ed2a8a28ff109e7a3582c9abb7fe327	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=06c4b3a54bc6d1e73776a5bc3d438f88
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 2a1588520926..5f4a791f9ab5 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/mu-1.8.8 b/metadata/md5-cache/net-mail/mu-1.8.8
new file mode 100644
index 000000000000..3ec94b9e9cda
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mu-1.8.8
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/texinfo virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
+DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
+EAPI=8
+HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
+INHERIT=elisp-common meson
+IUSE=emacs readline
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
+SLOT=0
+SRC_URI=https://github.com/djcb/mu/releases/download/v1.8.8/mu-1.8.8.tar.xz
+_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=483a95b897ad1759ae2ac6e4b85b8a5f
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 873836d475ca..436fba4682aa 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.5.4 b/metadata/md5-cache/net-misc/nextcloud-client-3.5.4
new file mode 100644
index 000000000000..6be8a8070daa
--- /dev/null
+++ b/metadata/md5-cache/net-misc/nextcloud-client-3.5.4
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 dolphin? ( kde-frameworks/extra-cmake-modules ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-qt/qtconcurrent:5 dev-qt/qtxml:5 || ( gnome-base/librsvg media-gfx/inkscape ) doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) test? ( dev-qt/qttest:5 dev-util/cmocka )
+DESCRIPTION=Desktop Syncing Client for Nextcloud
+EAPI=8
+HOMEPAGE=https://github.com/nextcloud/desktop
+INHERIT=cmake virtualx xdg
+IUSE=doc dolphin nautilus test webengine test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-3.0 GPL-2
+RDEPEND=>=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nextcloud/desktop/archive/v3.5.4.tar.gz -> nextcloud-client-3.5.4.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=df1ca1f879b024c713d3bdaaf69764d1
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 2423265ba328..4c3c21abac5c 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/stp-2.3.3-r2 b/metadata/md5-cache/sci-mathematics/stp-2.3.3-r2
new file mode 100644
index 000000000000..0becd429c2d7
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/stp-2.3.3-r2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/lit ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/boost:= sci-mathematics/minisat:= sys-libs/zlib:= cryptominisat? ( dev-db/sqlite:3 dev-libs/icu:= sci-mathematics/cryptominisat:= ) python? ( 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 ) )
+DESCRIPTION=Simple Theorem Prover, an efficient SMT solver for bitvectors
+EAPI=8
+HOMEPAGE=https://stp.github.io/
+INHERIT=flag-o-matic python-single-r1 cmake
+IUSE=cryptominisat debug +python test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ MIT
+RDEPEND=dev-libs/boost:= sci-mathematics/minisat:= sys-libs/zlib:= cryptominisat? ( dev-db/sqlite:3 dev-libs/icu:= sci-mathematics/cryptominisat:= ) python? ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=0/2.3.3
+SRC_URI=https://github.com/stp/stp/archive/2.3.3.tar.gz -> stp-2.3.3.tar.gz test? ( https://github.com/stp/OutputCheck/archive/119fe41a83bc455a24a11ecc9b78e7b13fcfcc45.tar.gz -> stp-2.3.3_OutputCheck.tar.gz https://github.com/stp/googletest/archive/2ad076167a676e3ed62f90b754b30fac5caa1f88.tar.gz -> stp-2.3.3_gtest.tar.gz )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5f664bd4f0b268985f21b3d26764aac8
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 3051dea76252..2a6eef41845a 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/systemd-251.4 b/metadata/md5-cache/sys-apps/systemd-251.4
new file mode 100644
index 000000000000..da8a75c48c34
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-251.4
@@ -0,0 +1,18 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/lxml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] 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(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0: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(-)?] ) >=sys-kernel/linux-headers-4.15 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=http://systemd.io/
+INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] 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(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0: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(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] sec-policy/selinux-ntp ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd-stable/archive/v251.4/systemd-stable-251.4.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	529bb8cd5756c8476d37ba89dd41e635	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=f68827008820d1ce802863145cce5546
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 2bd130ae09aa..f0db49a51180 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam ope
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	529bb8cd5756c8476d37ba89dd41e635	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2c8b75a3919d9e69f3375868a2057f88
+_md5_=ff6089d674c36d64bd77f89c6d2df239
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-251.4 b/metadata/md5-cache/sys-apps/systemd-utils-251.4
new file mode 100644
index 000000000000..0691ade74497
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-utils-251.4
@@ -0,0 +1,18 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] 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(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) >=sys-kernel/linux-headers-3.11 boot? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=Utilities split out from systemd for OpenRC users
+EAPI=8
+HOMEPAGE=https://systemd.io/
+INHERIT=bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+IUSE=+acl boot +kmod selinux sysusers +tmpfiles test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
+RDEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] 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(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
+REQUIRED_USE=|| ( boot tmpfiles sysusers udev )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v251.4.tar.gz -> systemd-stable-251.4.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-251.2.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
+_md5_=b3d86cfc8d08205c6874088f3570aa26
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index ec92df47854d..0780a65f2a46 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/mold-1.4.0 b/metadata/md5-cache/sys-devel/mold-1.4.0
new file mode 100644
index 000000000000..8464beda92db
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/mold-1.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare pretend test
+DEPEND=>=dev-cpp/tbb-2021.4.0:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
+DESCRIPTION=A Modern Linker
+EAPI=8
+HOMEPAGE=https://github.com/rui314/mold
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~riscv
+LICENSE=AGPL-3
+RDEPEND=>=dev-cpp/tbb-2021.4.0:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
+SLOT=0
+SRC_URI=https://github.com/rui314/mold/archive/refs/tags/v1.4.0.tar.gz -> mold-1.4.0.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6b495f0b3e9af0e2f9a6b007dcce9265
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 0310687d99e4..0a20b66c1825 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/nextcloud-23.0.5 b/metadata/md5-cache/www-apps/nextcloud-23.0.5
index 3201dde45e01..d17697691666 100644
--- a/metadata/md5-cache/www-apps/nextcloud-23.0.5
+++ b/metadata/md5-cache/www-apps/nextcloud-23.0.5
@@ -7,9 +7,9 @@ INHERIT=webapp
 IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
+RDEPEND=<dev-lang/php-8.1[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=23.0.5
 SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-23.0.5.tar.bz2
 _eclasses_=webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=cc7361863c504fe90137d33274be7b27
+_md5_=c193ced3b25ca648475dde71a0dacea5
diff --git a/metadata/md5-cache/www-apps/nextcloud-23.0.7 b/metadata/md5-cache/www-apps/nextcloud-23.0.7
index c9cfc7f48dc9..d158b9816e41 100644
--- a/metadata/md5-cache/www-apps/nextcloud-23.0.7
+++ b/metadata/md5-cache/www-apps/nextcloud-23.0.7
@@ -7,9 +7,9 @@ INHERIT=webapp
 IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
+RDEPEND=<dev-lang/php-8.1[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=23.0.7
 SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-23.0.7.tar.bz2
 _eclasses_=webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=3f833028e18e338c628eb155a10b3d90
+_md5_=7a53827163532918954795fe86d0f62c
diff --git a/metadata/md5-cache/www-apps/nextcloud-24.0.3 b/metadata/md5-cache/www-apps/nextcloud-24.0.3
index de84bad1f092..29a0f9a6dc10 100644
--- a/metadata/md5-cache/www-apps/nextcloud-24.0.3
+++ b/metadata/md5-cache/www-apps/nextcloud-24.0.3
@@ -7,9 +7,9 @@ INHERIT=webapp
 IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
+RDEPEND=<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=24.0.3
 SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-24.0.3.tar.bz2
 _eclasses_=webapp	d872f28d7595b70dd46545199ef35fb0
-_md5_=3f833028e18e338c628eb155a10b3d90
+_md5_=a8ff3c6c90e9b826aadbdf86b7422e3d
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9525b86b6a3a..a814743cdf0d 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-08T18:09:59Z
+TIMESTAMP 2022-08-09T00:39:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLxUXdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLxrN5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDiAg/+J/blz1TeMcWMopRgtteFw323NML1W3OCQAWruvrQ6feyxaBKgbFw8b2x
-wdwzgTb6/vwxX8FGFzKCFab3KvsFOTGSnFsut3lP0mmTOQnf3BT2kSrzlMvIuHOo
-t4uZaxFy1qyezxtFJ8QizOjMgrVCDrtZm7Oaydo2hdEYuCi6mTIBTkIFFX4C0oTM
-F3yYeQdkZ2v8z89TW6Xf+O3K2Q9VFqNijjO4f73yLOeI4IxaszbuXp+EIvRv9Hxj
-IjEFcvulbxZELeSqsJ1NK3E8+z/6WbgF086I19aJBceaJpkq8AmnjK6bVlqDVU83
-Qb/XEwCNGqzGcfHq7I+tFsW/UvPzTuVTt7JOXdvloQk3UtvFl68LgEtbtm0I7UOR
-FJSkjNmkI0oHsU2teDQ9rx//sA3U22DIUUPu0wZzWO5ztrYgfMnWHt6kszmzvF62
-ozf1XtwDpWt0dDSi1MqwTURi0emPrE+Pzj4h8wgDXR+HBx1p9eGCnsB5yKPy6y/A
-KmCMgxcOmZ/54tXGhqLZwf3EUrgVGRmka+Vq+rYlK/YY4Jws/hTas3O/GQOlHHuK
-ScQPTe66KLhcGkjRI/AHLyawyEZcC9GpIOC/zStwN59SKWMFr0v8/UI/zeZfEAdm
-skhulU+UKzTFNtLaxhJonvMVzIDBkCDauTYJ5aykEtZnyDAaUp4=
-=6SRC
+klBe3w/9HtkZWGriwW6mO1HeQX+k8QkhR80L+OI9CpKnAr4Xse99/0K/7O3nQwP7
+jYJtIdtaT3TXysrMka36NWYGBHofQkchAwLto5iD2CP8Ih3k7RLRGSa9Ojsc0tQz
+4mlQmvCvHJQqkLen9VTrt74rplyGI99SSNmNrqDs9pEo0oCdPhVuGPtbhFr6JLwO
+QGv59w+EGwnICkt5fRQFRKFqPkiCP3Sl0juokci9izAgbaKc8XfdvoYreDe7dzaW
+fR/1jfCf+7a7MZsQlpT1Qn4N3AQEH4KPnNkDQ8rmokCNwmw662gQXtjHy71grbog
+lRovd/T7JibdIsq1l5/2P44+95RtnDh4/zlO7WFzSbzCAbWp65dh5HdWqqi+wMMk
+9yJ2N9o2R4cfvjM52OhFGVgA2OI3a0gDP3x/AFHk0ETjJMxITnDnrKhNWW2gUYXW
+BIhOkyqRsRqE5SzMz2NGVVbfATFbD3sbnWRHs7WxVxXwKrhiup215fH1Vus5LGYC
+H0IQrazsrpoNY+xFd8j7W7Hts2LW+7B19IihT77grQE1LquastWD05tRmPrPyW/f
+oTGQ3PhOle9XPFla4xeOAKHtYZz0Op5cscmenlXfJMrdAFM9Dc30Oc9TF8gkzyVp
+twMftLnavimgl2iQtafo4/OUNF3liy3QG8nHGRROTxAeMPs1C4U=
+=/Fer
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 145c93b56e21..820b916bbf16 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Aug 2022 18:09:55 +0000
+Tue, 09 Aug 2022 00:39:55 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2c14dfcc0f2a..b8cd37fb09cb 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Aug  8 06:09:55 PM UTC 2022
+Tue Aug  9 12:39:55 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d6ffd02ac48f..7179e1e459e5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Aug 2022 18:15:01 +0000
+Tue, 09 Aug 2022 00:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b55aeb9d2175..0ccf68eb155b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-bf7dbbab6e73180e27b0369dcda0c9af9622039c 1659981688 2022-08-08T18:01:28+00:00
+f23a1058da70a7005c5a164c1388e76d1a07427d 1659999386 2022-08-08T22:56:26+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index eac3917ed637..4d4d4277c54e 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1659982201 Mon 08 Aug 2022 06:10:01 PM UTC
+1660005601 Tue 09 Aug 2022 12:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 145c93b56e21..820b916bbf16 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Aug 2022 18:09:55 +0000
+Tue, 09 Aug 2022 00:39:55 +0000
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index cc5bbca1c929..85a0b1a2ff7e 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 58e4a1681f2a..ae20878212c2 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -3,8 +3,10 @@ DIST mu-1.6.10.tar.xz 867008 BLAKE2B 6cce22f18691c3ad6dda1ec012d72c398df2ba4d1be
 DIST mu-1.8.5.tar.xz 539368 BLAKE2B 6efc12f82aab2beee86475ee49492ce59cb70e8b4fa63f2099a6071ec3275e7f0f308a868133ab3be4646d2280f720a4f6bb5673563a4437d2135e149b1cdfac SHA512 f43afb9484937077f32a38f347352b1ec8fb74c85be74f3afdd53ff75b965f42ab88daa58433fd9292a10c69ed2f2daf3ddbaf3d8d5d5595b0b29b81629a846f
 DIST mu-1.8.6.tar.xz 539684 BLAKE2B ea220a1a6f1fafab54574aa79638232aac4108d32c1e84cb3a1bc910dabbc0dcd1092b18ab62bc5dc57eef4118e023b729d279f9cb84b1fa061d72d60bfa5a91 SHA512 09ac9732e9c18ccdf85b2e2ed64f21f8b87d1484b773ae5ce6edea37f46711ec8709ccceb76f500f8ac02ad5cb54c2bbbc86f75185682ef73bd05a9b467c254c
 DIST mu-1.8.7.tar.xz 539664 BLAKE2B 2f0081f350c0d6da4b7920c0380a02aab42eda12062011bd03a46ceb925c179089b794b501df53b4fc84daa38e6e977a3510801685aa7c91c1c0be58c9c78929 SHA512 04c2027acec80c7569f055c8324f947862721aa36b093dba07ac80b9051229a51225e5371af7cd48fae71c9d5148bd3dc2081f591b9f733bccb5650b4853df67
+DIST mu-1.8.8.tar.xz 540092 BLAKE2B 3cd3d5f41aaf145dee66fc6d5e71256a650b16d0ee99da253d7ffc87df2e36b5fef6d19dd8831002d040c5d6ed13a53e9df69d18d7c002a05a64fb22fe32f5f5 SHA512 deb48ef7d12d76575f14e5313e9c94a40a04dc916943fa45d4281aa637b6549cbcee3cc0879b9daab51e0409cdfdc619acae12bf2ff3edaeb84fb77c3bee8982
 EBUILD mu-1.6.10.ebuild 1586 BLAKE2B d14b3421814913a85460439407fb4fc90b9537df3132520c64697a20b5b3f35fc8c658395a36d4fabf514da9964333969c4e86d1092866cc6d033732d836a168 SHA512 465f3afbb8e522ce51404d6f0de08984b680498fe322484bec0f9dd2a5740fc4405ea69a78d081d9e07fcc26520c50e3349706d830c8cc2fb5dd4539f719c15a
 EBUILD mu-1.8.5.ebuild 2102 BLAKE2B a026d31582256c907d7cbd37ffad970c7dcd83059087206913139d06ae83f5e938d3f96d17d89487d987df1ea81866e2871431f27614f528e5807444d01970d8 SHA512 eaeff846b61926dfe7f28a555d1d892679295e835e6b569c1dffbb0803320dd1dc9ebbce50c15e2b0fe2dfdff32e18f5e075a3cfb2ef24d11fbfdc319380d783
 EBUILD mu-1.8.6.ebuild 2103 BLAKE2B 3def0840baba20487d6256076c9327c2762cca569af1e1c48589ee7308569f20e88aa32245b449eca9416dc4f819937f1720a0c569799d7ae29cbc7b595eb07a SHA512 f24cb94e4c8d62559a5ef824472d2684ff7b8a5239c9112c8bace36a4df6c0c38089a707bf9138928b874ef445165efd5e18bca644659fb140f1a90abb548459
 EBUILD mu-1.8.7.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
+EBUILD mu-1.8.8.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225
diff --git a/net-mail/mu/mu-1.8.8.ebuild b/net-mail/mu/mu-1.8.8.ebuild
new file mode 100644
index 000000000000..2e8ad733ced5
--- /dev/null
+++ b/net-mail/mu/mu-1.8.8.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common meson
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+IUSE="emacs readline"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gmime:3.0
+	>=dev-libs/xapian-1.4:=
+	emacs? ( >=app-editors/emacs-25.3:* )
+	readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/texinfo
+	virtual/pkgconfig
+"
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_prepare() {
+	default
+
+	# Don't install NEWS.org into /usr/share/doc.
+	sed -i '/NEWS.org/,+1 d' meson.build || die
+	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
+
+	# Don't compress the info file.
+	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
+
+	# Instead, put it in /usr/share/doc/${PF}.
+	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature readline)
+		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
+		# NOTE: Guile interface is deprecated to be removed shortly.
+		-Dguile=disabled
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Since meson no longer installs NEWS.org, install it with dodoc.
+	# Also, it must be uncompressed so that it can be viewed with
+	# mu4e-info.
+	docompress -x /usr/share/doc/${PF}/NEWS.org
+	dodoc NEWS.org
+
+	# Same as above.
+	docompress -x /usr/share/doc/${PF}/mu4e-about.org
+	dodoc mu4e/mu4e-about.org
+}
+
+pkg_preinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "After upgrading from an old major version, you should"
+		elog "rebuild your mail index."
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
+
+		elisp-site-regen
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a05264b30254..2ea3a0e880d1 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index f66e4b813b37..7c7466a17e01 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,3 +1,5 @@
 DIST nextcloud-client-3.5.2.tar.gz 15433543 BLAKE2B 082031ac34a644f0db09679ef34237ee8fc9def88ff4659ad4a71e3ac611b3be3f9a0750deda25cd0ef34aca7e9d3c60fe7d3fc5a4d747eef46978e2fe84b742 SHA512 2892c277466869e3872a68049541c3d5afe94ca4dde1e97ea13ac615adedba198946763b5ff5dcb4694a9cec1946e35d1d6b6fd950d26b23cd6ddd94181f4b83
+DIST nextcloud-client-3.5.4.tar.gz 15436558 BLAKE2B e95aac753e4fcc70093ba497022572d4ee2988ed943e09247a0ddec3b039d658e3f1f498c24f5b5a92c15bd50b14c7e5c71f420c35e8de4894c2f65d06563766 SHA512 7b8afe19acad7f7ca96184b0f925e0eb324605a11bc468ef5662e5a879cada16483b9185e12336471ca2a9debf2e00671d8245bdbae2f7be01af756b57225bae
 EBUILD nextcloud-client-3.5.2.ebuild 2325 BLAKE2B 210232aa19801f2eba06f956ebf725eaa7eef552167b6a4253354362f29f763d1633740683d7b05bc2fef46ed803688a77b896a7198c81724bdc23ea01132de7 SHA512 250fa76d1da6da6ba842c3e448747c8682bcc533ccb3063d659527900cbdd1d81ff184ee1e007c84cac6241a20d8e8e2ca84b4224cb4b0be02d79e1f25d7a6ea
+EBUILD nextcloud-client-3.5.4.ebuild 2327 BLAKE2B fa7770b9c8249bbfff50766d4b83f8b39288844ff5ee174412334d834705f5c20e3dcbc47d79ddef4b25ad1394ed067ac299aa9c604c9300cf165e752566b213 SHA512 fea8427b376b4701248ceb960ca9e69aa0cb97b6406b97dfd62d58fb6ccd1eac6d3e14d92a167abd262ffedbe9acc3b3a7791cd9d4c6a0708ea11bb20312fec3
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.5.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.4.ebuild
new file mode 100644
index 000000000000..5599ebda4bf3
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.5.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus test webengine"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-db/sqlite-3.34:3
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain:=[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+	|| ( gnome-base/librsvg media-gfx/inkscape )
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	test? (
+		dev-qt/qttest:5
+		dev-util/cmocka
+	)
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+"
+
+src_prepare() {
+	# We do not package libcloudproviders
+	sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
+
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_UPDATER=OFF
+		$(cmake_use_find_package doc Sphinx)
+		$(cmake_use_find_package doc PdfLatex)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_compile() {
+	local compile_targets=(all)
+	if use doc; then
+		compile_targets+=(doc doc-man)
+	fi
+	cmake_src_compile ${compile_targets[@]}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index eccaac2fa75c..61c234e11840 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index abb07837320a..1fcd23c4ed56 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3414,6 +3414,7 @@ gui-libs/wlroots:X - Enable support for X11 applications (XWayland)
 gui-libs/wlroots:vulkan - Enable support for the vulkan backend renderer
 gui-libs/wlroots:x11-backend - Enable support for handling input/output devices through x11-libs/libxcb
 gui-libs/xdg-desktop-portal-wlr:elogind - Enable support for rootless session via elogind
+gui-wm/gamescope:pipewire - Enable screen capture via PipeWire
 gui-wm/hikari:X - Enable support for X11 applications (XWayland)
 gui-wm/sway:X - Enable support for X11 applications (XWayland)
 gui-wm/sway:grimshot - Install 'grimshot': script for taking screenshots
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 65dfbd464d9b..88110b83f339 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/stp/Manifest b/sci-mathematics/stp/Manifest
index 725f20c6f849..37f687826087 100644
--- a/sci-mathematics/stp/Manifest
+++ b/sci-mathematics/stp/Manifest
@@ -3,5 +3,5 @@ AUX stp-stp.py-library_path.patch 372 BLAKE2B 1e36f48d2c403cdea156157826a1b3c3e4
 DIST stp-2.3.3.tar.gz 2577550 BLAKE2B 9ebedf3cb8e6b50d037cfacbc14826bd4e6505d29a53b1fcc6580749f0637fe5f96619c166babdb3a52b18fb6337e49c02f5693e233effe84d0131d0e7402381 SHA512 a0b1bf419d8230e40ce0aee90d9c8c9d814aca300831c24b3576c75623362942abf20673c419f9f0ea1e0505bfae000dc65fdd818179f5759879b0b255f1b99a
 DIST stp-2.3.3_OutputCheck.tar.gz 12002 BLAKE2B f8fafba8f7957f3d0ee480b9e1e8c8923c373cf134512d6329adf84a96f3177ad07d00eae4dc6dd8d4b09ca82dfc8b425602f1926e3f88ccb2556b4b7121e5b9 SHA512 36012ae2b2aee1ff3f36ba1678a4bcbfeb590e01c2042ca35eb2f49b6a890b767c1809d1415e7b03f2118204361f834ad9caf70319b59fd14b2c140bf858d16e
 DIST stp-2.3.3_gtest.tar.gz 469100 BLAKE2B 386444657d3f23e54f01dac8e0ac36da4d97c3eebcc8cf79bfc754c474a5ed64765a0ad389fef358667e468469c47d02a407e13e6882d426a4defb0102e4a758 SHA512 2fc79fe9c8a4e0487e7e76db9508fd2207df0cfe3940a51aeac32e4440afab9e265bfe553b1cd66086cd5a574d8bf99dbb9e1d9c4a70fafd7b31f38825914aa1
-EBUILD stp-2.3.3-r1.ebuild 2226 BLAKE2B 75dcdf8ac6b409bbfa046c9f89d1577be646f0246de3bf716b91559954be4ae8e80c1466a7f12021336c318c9e06c13b58fd6ff1b9bffacb005e5c4a18c9a03a SHA512 a92f8a0834c4e479050bf2b52efbcf75914b855f99d6b8217952ffe172a90e2abf7a08cfd879c15350eddb6d996051d30ef43a6a336aa1d2b8539761f462a703
+EBUILD stp-2.3.3-r2.ebuild 2488 BLAKE2B 123f264236f77e4d4bc6cc3464bd20c52037d7ec890b0f09a8eedc5d0a8004b56c9d0e291612d9c4cb8b23cdab44da0cd5018f996498a697bb0a80a1afeb687c SHA512 438e9aa6900d038d9b1cb54d25b53be292b06bb569ea2390641d4bef9dda5c213e1bc903d3a387047ad7477b9a4574840b9c18304b65052a19f56585ee6d45d5
 MISC metadata.xml 1110 BLAKE2B e13b9420b7f730e6b9e2571e3f4e8a48cf7f54b16fa767fce48099549071c4c819e16a5da25b6779c77a5a7a7f21c3ec61eeb2719867f874a1c4fa21b84e32f2 SHA512 aa3ddfd8d3bf4647f230f0ca55b6f70f9f82f2ae63fe21edad637397fb1bd2779241a2e439a48bed59bd1de11ef3b4e275731c6a90873ec5d86bb5897bf2a9f0
diff --git a/sci-mathematics/stp/stp-2.3.3-r2.ebuild b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
new file mode 100644
index 000000000000..e59e4388c2c3
--- /dev/null
+++ b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+OC_H=119fe41a83bc455a24a11ecc9b78e7b13fcfcc45
+GT_H=2ad076167a676e3ed62f90b754b30fac5caa1f88
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit flag-o-matic python-single-r1 cmake
+
+DESCRIPTION="Simple Theorem Prover, an efficient SMT solver for bitvectors"
+HOMEPAGE="https://stp.github.io/"
+SRC_URI="https://github.com/stp/stp/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://github.com/stp/OutputCheck/archive/${OC_H}.tar.gz -> ${P}_OutputCheck.tar.gz
+		https://github.com/stp/googletest/archive/${GT_H}.tar.gz -> ${P}_gtest.tar.gz
+	)"
+
+LICENSE="GPL-2+ MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="cryptominisat debug +python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/boost:=
+	sci-mathematics/minisat:=
+	sys-libs/zlib:=
+	cryptominisat? (
+		dev-db/sqlite:3
+		dev-libs/icu:=
+		sci-mathematics/cryptominisat:=
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-python/lit )"
+
+PATCHES=(
+	"${FILESDIR}"/stp-CMakeLists.txt-fix_cflags.patch
+	"${FILESDIR}"/stp-stp.py-library_path.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	if use test ; then
+		local i
+		for i in OutputCheck gtest ; do
+			tar xf "${DISTDIR}"/${P}_${i}.tar.gz --strip-components=1  \
+				-C "${S}"/utils/${i}  || die "failed to unpack ${i}"
+		done
+	fi
+}
+
+src_prepare() {
+	# Replace static lib with get_libdir
+	sed -i "s/set(LIBDIR lib/set(LIBDIR $(get_libdir)/" CMakeLists.txt || die
+
+	# Remove problematic test
+	rm "${S}"/tests/query-files/misc-tests/no-query.cvc || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# -Werror=odr warnings, bug #863263
+	filter-lto
+
+	local CMAKE_BUILD_TYPE
+	if use debug ; then
+		CMAKE_BUILD_TYPE=Debug
+	else
+		CMAKE_BUILD_TYPE=Release
+	fi
+
+	local mycmakeargs=(
+		-DNOCRYPTOMINISAT=$(usex cryptominisat 'OFF' 'ON')  # double negation
+		-DENABLE_PYTHON_INTERFACE=$(usex python)
+		-DENABLE_ASSERTIONS=$(usex test)
+		-DENABLE_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# Because Python files for tests (in BUILD_DIR) and those installed on the
+	# system differ, and are generated upon install, we have to wait for CMake
+	# to install them into the temporary image.
+	use python && python_optimize "${D}/$(python_get_sitedir)"/stp
+
+	mv "${D}"/usr/man "${D}"/usr/share/man || die
+	dodoc -r papers
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f4915515ad9b..281b271b5a91 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index c0afd1c46e7f..f26705e150cd 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,5 +1,4 @@
 AUX 250.4-test-systemd-tmpfiles.standalone.patch 1369 BLAKE2B c0f2f51d0b7127a5a0161f9a56f4e94d9b4e983f9f496601ba4ce9197076556df4f699871480ce0cc0a4002b0c8a6fec6706a358b1b28ab75dcf216f2e408821 SHA512 18b9852cf9fe53e45ca0d3f051580e726aa39462c5477c7143523903c3836f131df44837ec19acfff10281bfe0e0b4c53ea4cb2ebed9e342f1289db07fc752ed
-AUX 251-glibc-2.36.patch 4101 BLAKE2B 79b05ed39a2c840358b2030fd5bba61a3c0786e376f7fc4dee133aa7539a55008ac57a58d5c11ef9e2a2f047b359b6ab2841ea0adc5977da066e5b6c2ae26cc2 SHA512 0c4a05129a3ce22432db6e189e87db71c73be517b7e4a10e2218a0b24f0fd5d8dff331249574e6e0e1958476db95315054320837b784ae6351473f5eecc20800
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
 AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
@@ -9,8 +8,10 @@ DIST systemd-stable-250.7.tar.gz 11214975 BLAKE2B 5d94b4b1f8b0cd6e8284a89ac0d4bd
 DIST systemd-stable-250.8.tar.gz 11215608 BLAKE2B 2a66a2d8cb70f265b59640ace907b8d927018fe11c8977e134a33d67683f06b26c1eb3fd5afe40431bc2c15827ba60c46a37ff1a0a4c716dd24b73aca1583d00 SHA512 653f527f10779a31213da06f7587a3617bd4b823bd3e5a43d626c5a4a7301e4a0fb42cf1fd056d28af6d87e52f258da59d5f0d4a2d98076905f9d3fcda6d18fd
 DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
 DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d33998674be50020b8db0627bb9d0c86be6576c404ce786b01ceec86f1c75b174c6fc2d7e0d7fbab802a78f48c9d0915c2b8 SHA512 fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f
+DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
 EBUILD systemd-utils-250.7.ebuild 11342 BLAKE2B 67a094e130be3b21a647a3db3a66ea0b35b6f4292fa98c3e81d6a2ecd09b291ef08efdbb048e73c5b141b1cf815a4d7a340c6b43c65aa6a3f5b31fa962b60f89 SHA512 2d88c146cebdc0ae5344c80cf807507e343e77ca37af9b0c28cd131ce2f532418e13773ae00a712d54302b8196e4b5696c1a213dbb2472931d79e1f8485b4537
 EBUILD systemd-utils-250.8.ebuild 11350 BLAKE2B faf9c2a6685159fe9352e88ecc5855f38c7806f4a2da41e2e5ad1ce6124a4fbb9b42a71c351070297a821b093856a4b75263865b1ffe0d7fe16ebdced0dfdc64 SHA512 6ebec4e3a65f50467bc3b5995acb0ab483723e87dcfef8d4c5a7b4f26d8116049ed2c4c78f3f03f9216af5dc87767e69195f0bbff909644bfa91e688bf602058
 EBUILD systemd-utils-251.2-r1.ebuild 11492 BLAKE2B d32e0222842f5981ee2aab1a3a67b1679e409b195503ad9f7ef185150e5fa2b98504c774f4bbcf5260523309d431582dc75fcf3d67818a981dbaffe40add999a SHA512 b2c1c51130c7ac90a98ae8af25167d2dc47dee6ec92342bd83159898f1a2170b4599c984d00430294cd4ac7895996e7b8682d111ff82148d574e613719b00588
 EBUILD systemd-utils-251.3.ebuild 11648 BLAKE2B 42845e077f498cd0a4c1ff7d5e9f473ab6c6981cb38238c6b1eea712d8bb1c43ad7d287974fee00793b4ed295ef5e1b58a31a93cb9f104be3ebc134a36c2bc4c SHA512 48726c471c0a213a1dd7a0d54c9af5280deee217b76fd049db117105d1cd9d5e04cb9a63e4b90d3d37fcd4257a75473d77d50ef9ba7e02210911e72cfc63124f
+EBUILD systemd-utils-251.4.ebuild 11605 BLAKE2B 05df0fe17d81668674ce544c647a06ad269627d33fd3910e59f57bc96c52aa2aa6228bda07adfc87a6e9bae4086608179af2f4d57920ed79fa9c89cef948cd73 SHA512 a2a7914cac1d8e19b227716d82b09d7de1fc66a4694bdecde85ce977ee7b7038f567f685da6e9343895c6accd97e5640dea9c6595d1120f2635322162b9e1687
 MISC metadata.xml 571 BLAKE2B 6b3a69524c5fd3fa0bbe534ccbf3598cedcbe51542d738237ca13b465fd342555f35b2ebd1d784b7a81664c58125e01404434ca48a07502343a24dd395618c4c SHA512 8184f6d8107be83d7411f63e86a8469c4b86c96bf4738ebfda8d654e4ecedf334b4319c9d442832c8373a34e7c35ca14b879e75eb4e006d48fa3d667be0a66e4
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4.ebuild
new file mode 100644
index 000000000000..d66f463cc001
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-251.4.ebuild
@@ -0,0 +1,514 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+	MY_P="systemd-stable-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+	MY_P="systemd-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-251.2"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	elibc_musl? ( >=sys-libs/musl-1.2.3 )
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.11
+	boot? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	boot? ( !<sys-boot/systemd-boot-250 )
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!sys-apps/hwids[udev]
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+python_check_deps() {
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+	local PATCHES=(
+	)
+
+	if use elibc_musl; then
+		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+		# Applied upstream in 251.3
+		rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
+	fi
+	default
+
+	# Remove install_rpath; we link statically
+	local rpath_pattern="install_rpath : rootlibexecdir,"
+	grep -q -e "${rpath_pattern}" meson.build || die
+	sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+	# When bumping to 251, please keep this, but add the revert patch
+	# like in sys-apps/systemd!
+	#
+	# Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+	# wasn't backported to 250.x, but it turns out to break Clang
+	# anyway:  bug #841770.
+	#
+	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+	# to unset F_S first, then explicitly set 2, to negate any default
+	# and anything set by the user if they're choosing 3 (or if they've
+	# modified GCC to set 3).
+	#
+	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+		# We can't unconditionally do this b/c we fortify needs
+		# some level of optimisation.
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
+	local emesonargs=(
+		-Drootprefix="${EPREFIX:-/}"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot efi)
+		$(meson_native_use_bool boot gnu-efi)
+		$(meson_native_use_bool boot kernel-install)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+		# Link staticly with libsystemd-shared
+		-Dlink-boot-shared=false
+		-Dlink-udev-shared=false
+
+		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+		-Dstandalone-binaries=true
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+efi_arch() {
+	case "$(tc-arch)" in
+		amd64) echo x64 ;;
+		arm)   echo arm ;;
+		arm64) echo aa64 ;;
+		x86)   echo x86 ;;
+	esac
+}
+
+multilib_src_compile() {
+	local targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			targets+=(
+				bootctl
+				kernel-install
+				man/bootctl.1
+				man/kernel-install.8
+				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+				src/boot/efi/systemd-boot$(efi_arch).efi
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers.standalone
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles.standalone
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+			)
+			if use test; then
+				targets+=( test-tmpfiles )
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				src/udev/ata_id
+				src/udev/cdrom_id
+				src/udev/fido_id
+				src/udev/mtd_probe
+				src/udev/scsi_id
+				src/udev/udev.pc
+				src/udev/v4l_id
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/64-btrfs.rules
+			)
+			if use test; then
+				targets+=(
+					# Used by udev-test.pl
+					systemd-detect-virt
+					test/sys
+					test-udev
+
+					test-fido-id-desc
+					test-udev-builtin
+					test-udev-event
+					test-udev-netlink
+					test-udev-node
+					test-udev-util
+				)
+			fi
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			udev:shared_library
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if multilib_is_native_abi || use udev; then
+		meson_src_compile "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use sysusers; then
+			tests+=(
+				test-sysusers.standalone
+			)
+		fi
+		if use tmpfiles; then
+			tests+=(
+				test-systemd-tmpfiles.standalone
+				test-tmpfiles
+			)
+		fi
+		if use udev; then
+			tests+=(
+				rule-syntax-check
+				test-fido-id-desc
+				test-udev-builtin
+				test-udev-event
+				test-udev-netlink
+				test-udev-node
+				test-udev-util
+			)
+			if [[ -w /dev ]]; then
+				tests+=( udev-test )
+			else
+				ewarn "Skipping udev-test (needs write access to /dev)"
+			fi
+		fi
+	fi
+	if use udev; then
+		tests+=(
+			test-libudev
+			test-libudev-sym
+			test-udev-device-thread
+		)
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test "${tests[@]}"
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use boot; then
+			into /usr
+			dobin bootctl kernel-install
+			doman man/{bootctl.1,kernel-install.8}
+			insinto usr/lib/systemd/boot/efi
+			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+		fi
+		if use sysusers; then
+			into /
+			newbin systemd-sysusers{.standalone,}
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			into /
+			newbin systemd-tmpfiles{.standalone,}
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+		fi
+		if use udev; then
+			into /
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+
+			exeinto /lib/udev
+			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+			insinto /lib/udev/rules.d
+			doins rules.d/*.rules
+
+			insinto /lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+		fi
+	fi
+	if use udev; then
+		meson_install --no-rebuild --tags libudev
+		gen_usr_ldscript -a udev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		into /usr
+		exeinto usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+
+		insinto /lib/systemd/network
+		doins network/99-default.link
+
+		# Remove to avoid conflict with elogind
+		# https://bugs.gentoo.org/856433
+		rm rules.d/70-power-switch.rules || die
+		insinto /lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+
+		insinto /lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+
+		dobashcomp shell-completion/bash/udevadm
+
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+		udev_reload
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index de0de65a8a06..da3253be84fa 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -8,7 +8,9 @@ AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f1
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
 DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0314e44561367506ee763a9e98fb97579b3fc49c7a402c8da142945dc98444558f0e311557f52c50863cebc7532c17c651f SHA512 0c4011b685a1e8d535af123cbaf79ab53d59ea665ca5350ab1077ad4e962b49c1fd5b1b5bb3f28c3e28145dfd02aa83023f78de5edec15afe84e3e06e742a67c
 DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d33998674be50020b8db0627bb9d0c86be6576c404ce786b01ceec86f1c75b174c6fc2d7e0d7fbab802a78f48c9d0915c2b8 SHA512 fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f
+DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
 EBUILD systemd-251.2.ebuild 15630 BLAKE2B e107322c07f313e0ec5bffaaace81074c71ad7d8ec33d71382ba9726552b0ebd587b4cd8b3b52093deb38e3d11b115eb41854cc76a43e9794e08eef0d724a30a SHA512 1b9cd6a6dd45185f40272a29a06bcd8eee8de4a0d9a2469aaf487d3bf476dee439170ee089bedce41abbe83bf98bc7f9ed752dcda441eff13bf60c41e2caf005
 EBUILD systemd-251.3.ebuild 15509 BLAKE2B 67e70ec120e8a8f90d884b4086c1b1ef496b93c391c56931a206ae93f7142360b05f724fc870a7e2589f2eb3d03df351cadd4145ff25fb814673a1889de05a5f SHA512 fd374c62f852bf3ce32807713a4b676f7b65bfe1e03ef76cebe5696fca57c51bd5886bed5ce4de3d89754ca84d196501c5021bd04ba5dd92fe75b509b3836c6e
-EBUILD systemd-9999.ebuild 15326 BLAKE2B b7766927af373ea36f35917e2eeee3c80a6cb6f1c779dd2bafae6939d6b7c38ae878092378569c0f8729a7370707a43275c414152e54335354ab9e50e7035c94 SHA512 b018d9d52830cceef6a9a9e106c53597a1261430163576bb909088ee509f4dc9a06f4e730994a4bcb601309b5f2ea96ac75b17fbcb1dd6a13775f8d7813df52b
+EBUILD systemd-251.4.ebuild 15470 BLAKE2B c40b299789a6e198b93abcbee7c77934c5b7a36de8ddabd8373547102081453022746a812ee984d92bc28717f84dd22eae2425aedd7b341b0aa154c5e7b4b497 SHA512 31a1f63070d27f1ce076825dedda6e382fe70b0726ab99e40510e815990925ed9ec4ef5b44bb2bfde08545f004d366036a115609f842e1c37628e95d096c172c
+EBUILD systemd-9999.ebuild 15334 BLAKE2B ac6c030c144740183f952b2d6f122b876536490fb5e2f4d78a19755eb93c4fbb74deb5e74fc051c9bde2561171ecaa67aa26e40c74e2ff516b5e6da91463ce80 SHA512 63956cffbf94ffbc68ff4df6023b925c623bfb287e05fcbfcd87adad85a452164947f2dc3419ca391e34125d0f2b21d325636559d8ce72358be55fc24fc1b01e
 MISC metadata.xml 2600 BLAKE2B 718d14371e0df2946ec8c21459d51199d7103c40b8457fb685c2e8a0728b4c266718ea9854db46f732a12d176c6c8f34619ed03301f8183f8422c3d99fa705e2 SHA512 03cf65f6f619b90e76fe7837016dd21ea43c992da61ad2bf266a0c3adbbacb9b24e644751bda605cdd4be081c0892e48c00682b9ffe965333e8290d47a851e43
diff --git a/sys-apps/systemd/systemd-251.4.ebuild b/sys-apps/systemd/systemd-251.4.ebuild
new file mode 100644
index 000000000000..064778e7f0c7
--- /dev/null
+++ b/sys-apps/systemd/systemd-251.4.ebuild
@@ -0,0 +1,529 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..11} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+UDEV_OPTIONAL=1
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
+	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
+REQUIRED_USE="
+	dns-over-tls? ( || ( gnutls openssl ) )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="4.15"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	iptables? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	selinux? (
+		sec-policy/selinux-base-policy[systemd]
+		sec-policy/selinux-ntp
+	)
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-apps/hwids[udev]
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
+			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+		# Breaks Clang. Revert the commit for now and force off F_S=3.
+		# bug #841770.
+		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+		)
+	fi
+
+	# Fails with split-usr.
+	sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	# Broken with FORTIFY_SOURCE=3 without a patch. We have to revert
+	# the upstream patch for it because it breaks Clang: bug #841770.
+	#
+	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+	# to unset F_S first, then explicitly set 2, to negate any default
+	# and anything set by the user if they're choosing 3 (or if they've
+	# modified GCC to set 3).
+	#
+	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+		# We can't unconditionally do this b/c we fortify needs
+		# some level of optimisation.
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		$(meson_use split-usr)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
+		$(meson_native_use_bool gnutls)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool iptables libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 1a8b1c931c45..c8aea75e5c3e 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -168,8 +168,8 @@ BDEPEND="
 "
 
 python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
 }
 
 QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 392f72d37823..1ad833081d83 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 05c592426491..a7448ca46c5e 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -2,7 +2,9 @@ AUX mold-1.2.1-install-nopython.patch 1178 BLAKE2B 62092d363291f640567e334a7d16e
 AUX mold-1.3.0-openssl-pkgconfig.patch 887 BLAKE2B c014be11c2e18b8df12f156ac8a40468afdf1b0b600c9af73a7373063b1e3658dd199b5ef3bd538641720bfbe10c602d96b0066420c321affb5d2f432fbbda57 SHA512 072f311bdbde5b556bcf1916d5586124007d0d47642c3555cd76c96d19fc1b77ef2f260937bcdc9014201c2a702ce5b4d9612cfdfab1e7b5d80882db2332329a
 AUX mold-1.3.1-fix-riscv-set32.patch 831 BLAKE2B 103fa9944f16993842b941b607b7e157b8fa31064fd7a115c8f1da4b617b98939b55caae98b246047e6ec0fa136d2b175001ab4dd18df5817cb282fd4e3aad9c SHA512 03b1ae4708826df19d7a879b985f7e81ad283abace64e306b982800ba633136d8f01b00221b3d9ca57fe3b21eb2796af33b0c3fbee4d94e6bb9e84043828fe01
 DIST mold-1.3.1.tar.gz 4692379 BLAKE2B e34e9416cfc65d2097c4659ddc205a0c4492e50a1c6e4560006757e5c371d27410e38131f353cd0ee60b124e5fe42b0a1c50cdc3a7bed9f666596e608340e4fd SHA512 f576d2fcfee5cb3bade5ba24dcdd3020a16131ce7d4c3a00c3f92b94785ed86f3f040a6f5814b9c975c4c3d90a2b8c36a8101d5fbf1bc0a4be316f4a4a6dcefa
+DIST mold-1.4.0.tar.gz 4722082 BLAKE2B 65ac52724018f5df82ca40b287a5f3b2c3e4b6b313ef2573bfd0ed6d03054d92b9e1e52cbdad1930406cff232c4b952c33a16979968502c439b860bd782726a9 SHA512 7b7c4a7bac6bbc6e22372d93d94a6cb804c7017eba16b90e9bbc42b9608108c724ef55337aabdd9ce2f5244b94c8fd64311e70e18b5f8cf5f68533c2639e550d
 EBUILD mold-1.3.1-r1.ebuild 2264 BLAKE2B 5353e5967cae7cbfcf4d768d42c23701ecbc0016c6b5e177d655ca2a6c578df202b7598850af9c9cf527ea5361c6ffbedf18d39b8a1adfbfdf3ab7036cae2802 SHA512 44bb07f58b481536ad247da9576dc9ab510b2e4148dc2a4c94cf6c356409344a21319b1a59ee576f6ec41422631158cc6d540aa4fc4105dcc81b8d071952b611
 EBUILD mold-1.3.1.ebuild 2200 BLAKE2B 7e8a4f95b4edfe6642f6409cd41ef8bf9938ac5c688d0942d74c074b0cc0f1de0b1cf491f876685c59c04934d882cf8e728820b7ea9064a5d0700058ea0842fd SHA512 e962c064be2f8fe1699838fe93ead8b5864dcc64f0f4b10b052522d6099cdeb3d2096fee74b6951d0aa18e2f09ad99d595c1f0e5f4666788eebb80fcd03a6000
+EBUILD mold-1.4.0.ebuild 2200 BLAKE2B 7e8a4f95b4edfe6642f6409cd41ef8bf9938ac5c688d0942d74c074b0cc0f1de0b1cf491f876685c59c04934d882cf8e728820b7ea9064a5d0700058ea0842fd SHA512 e962c064be2f8fe1699838fe93ead8b5864dcc64f0f4b10b052522d6099cdeb3d2096fee74b6951d0aa18e2f09ad99d595c1f0e5f4666788eebb80fcd03a6000
 EBUILD mold-9999.ebuild 2193 BLAKE2B 12b3d1d0a480392843605f906051bc8e83c988cb2e9717c5b1ae2dcd0d4f5503487c5245e24fd32e9dceaa4083b05e0862582a6e78078be7b9646d416aac7172 SHA512 7562327a3f6c95dec206df868bc4f8c1cf59b2962249811068bd106ad480c4a5769aa1194b88ee8e20e3477b67ec51a068d3049f7ab786ab5fa3c1b8f539b1b5
 MISC metadata.xml 424 BLAKE2B a1c0cbdcb86c323fa1e6143c9665ec548f7713e74002a25b2fc26c51b60dae00922d3448a5aaecd5027a8cb026a681386ca7dea90657a3e10b25fb194dafc0d3 SHA512 1adc934e78ca0210743a1aa7479ebc4b5ea0b66a348c4408423460f02b404b885d3a8eca6e89ea8ac53ac9c76e85116965f1eef79e3f3e1f0451c8cf5ce0dfd6
diff --git a/sys-devel/mold/mold-1.4.0.ebuild b/sys-devel/mold/mold-1.4.0.ebuild
new file mode 100644
index 000000000000..53cc37505b9c
--- /dev/null
+++ b/sys-devel/mold/mold-1.4.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rui314/mold.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~riscv"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+
+RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+	sys-libs/zlib
+	!kernel_Darwin? (
+		>=dev-libs/mimalloc-2:=
+		dev-libs/openssl:=
+	)"
+# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
+# TODO: restore SYSTEM_XXHASH upstream?
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# Bug #841575
+	"${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
+	"${FILESDIR}"/${PN}-1.3.0-openssl-pkgconfig.patch
+)
+
+pkg_pretend() {
+	# Requires a c++20 compiler, see #831473
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]]; then
+			die "${PN} needs at least gcc 10"
+		elif tc-is-clang && [[ $(clang-major-version) -lt 12 ]]; then
+			die "${PN} needs at least clang 12"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Needs unpackaged dwarfdump
+	rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die
+
+	# Heavy tests, need qemu
+	rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die
+	rm test/elf/lto-{archive,dso,gcc,llvm,version-script}.sh || die
+
+	# Sandbox sadness
+	rm test/elf/run.sh || die
+	sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \
+		test/elf/mold-wrapper{,2}.sh || die
+
+	# static-pie tests require glibc built with static-pie support
+	if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then
+		rm test/elf/{,ifunc-}static-pie.sh || die
+	fi
+}
+
+src_compile() {
+	tc-export CC CXX
+
+	emake \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		SYSTEM_TBB=1 \
+		SYSTEM_MIMALLOC=1 \
+		STRIP="true" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+	emake \
+		SYSTEM_TBB=1 \
+		SYSTEM_MIMALLOC=1 \
+		check
+}
+
+src_install() {
+	emake \
+		SYSTEM_TBB=1 \
+		SYSTEM_MIMALLOC=1 \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		STRIP="true" \
+		install
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 5359544ea9fa..cd843bba6c4d 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index d4b38f569800..8fbb08be7aed 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,14 +1,8 @@
 AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce7426729e75471f017e15bb45b50cc885609e54817077e36d9feb4484bcff5b40c4f669ad80d4d5a643da8bc SHA512 076bbbfb9305a2608b60fb7f9802a5a455c5d049d39c8f209eadac1a306ba2015d11a30b4544d8cdf43025077a3c3087f3e9922cd9b530a08c089a7818590115
 DIST nextcloud-23.0.5.tar.bz2 140493624 BLAKE2B 13c524a2f26affd3c078210cf1552b1af044fdcd3c6cdcb2a2bde50808bf2953bbb658efa13ebff8806b2e2deb9ff23e36c0cbd7d8bea17329a6fe7e2845f1b8 SHA512 460ddfa994cf1e9423efa8e940dd1beebec17a99bdf78c238384554618b9590405e58c31bf29b011b7fd41cdd21f183053fc9ef6bd245ca9f47d43a19870a0e4
-DIST nextcloud-23.0.6.tar.bz2 140681183 BLAKE2B 05e57c4c725192672a3ed63005f9563b9bbf3978cf1aa0f8c78e8bb0b08ad0b4953c56079900e17dc98ec296420f26c8af740143cee6a3de39a5dc97cf49f9ff SHA512 e7ac52a7a3793bc710de71c4ead7a7477f697c39ea35ee553745a9355271cd6ac838758ef6a5c80ca1202369fb5cc899f78c594ee4e7561c6984719b0670d53b
 DIST nextcloud-23.0.7.tar.bz2 140383300 BLAKE2B 1ffe7e4019c71200c760f0f7bcf742c32edc30d9b25bfacd4ca0865903526246e404712691fbafeeeae918cf529862810f4898ecc478c0001572c7668b5786c7 SHA512 917277bcb45cb3a2286f93271f6f398371331bd0faeb56d94af89daa6f33ff7008314829ffef1efd35046d68b7b31e7f875e0ef66423408ff6090f7d2f552fb9
-DIST nextcloud-24.0.1.tar.bz2 123379803 BLAKE2B fc00f22cf1ed9e09da29ed5681f5e1fa5c46df80ba81f26680391effa1f68b9022879b05d1f92402e7c3c3982c755491eeab151880d7532425b3f230a7ab8166 SHA512 29746cd27356ee81c310854b714189a3d1a3817683cc29706af3d76daa70ceeb1201ead92ba3f6ac0de4c6ccdf6a9bbcf646246dd213fbc85638f92e0d73a2d2
-DIST nextcloud-24.0.2.tar.bz2 123445625 BLAKE2B 6d5482d26caa74abf1627c2b260780f0b7a601f9b9edfac94ad1a72b68be7a7b2674cfa54f1342c75d8265849aa3fa4b4e4882d2f5e3bbf7043b7a1511989d60 SHA512 937855549c1060546aa61a95e51485d70145253072f2e1def4da622c33822a31516f820ed82933d9e9ec32748553430bbea42b8840e534d8f6310c9a9d565db0
 DIST nextcloud-24.0.3.tar.bz2 123680045 BLAKE2B d837520f1cf700e19f158c7e4bd4d564c2ba9f040af375186cebd0ab115863edd0f2e8180373fb5919f7bea077d99738819c86abcef2b9b0b5d84668cc001eaf SHA512 92714758f542fa7aeb511761b4f1becc16dc64e5b4b2d54b3dc2fe6b3927b1a9a5a632c5b552efc591568752d7691e92aaab9e4f771435360db9b2c81977300e
-EBUILD nextcloud-23.0.5.ebuild 1081 BLAKE2B 12416bb95d60bbc1a105a62079176135b65fe17e05b4008991e5c8b17fee813bdefb24dba9911315a54de1fb1325236a59f9ab6b3b8b0e38e4a7bbfb0a044567 SHA512 bfbdc2cc665179a1d4ed9bcaa34c8284bce1e78e2f987cc2f490e8d52b010fe3c1e00e8201e729b895cc45614863731a9d6c3b5dcc72e04604eea530fe63ffc4
-EBUILD nextcloud-23.0.6.ebuild 1083 BLAKE2B 55f30c1489c3358c7cd85ad2df85f92714f81d2cd39c33e555ab8cc3ac3f0679df587bbc1400fef0952efab213a5bb7b663510845ce72a2b8ff1d08b4a4f14d6 SHA512 dcd8e897daef37e0aef08338a8a44e975dd7b91feb82bc8b13fd4c0dd031ff6bc041aaef01c02423bb6ba1f1f4d01354cdede5173b7262c04406c90433a945c7
-EBUILD nextcloud-23.0.7.ebuild 1083 BLAKE2B 55f30c1489c3358c7cd85ad2df85f92714f81d2cd39c33e555ab8cc3ac3f0679df587bbc1400fef0952efab213a5bb7b663510845ce72a2b8ff1d08b4a4f14d6 SHA512 dcd8e897daef37e0aef08338a8a44e975dd7b91feb82bc8b13fd4c0dd031ff6bc041aaef01c02423bb6ba1f1f4d01354cdede5173b7262c04406c90433a945c7
-EBUILD nextcloud-24.0.1.ebuild 1083 BLAKE2B 55f30c1489c3358c7cd85ad2df85f92714f81d2cd39c33e555ab8cc3ac3f0679df587bbc1400fef0952efab213a5bb7b663510845ce72a2b8ff1d08b4a4f14d6 SHA512 dcd8e897daef37e0aef08338a8a44e975dd7b91feb82bc8b13fd4c0dd031ff6bc041aaef01c02423bb6ba1f1f4d01354cdede5173b7262c04406c90433a945c7
-EBUILD nextcloud-24.0.2.ebuild 1083 BLAKE2B 55f30c1489c3358c7cd85ad2df85f92714f81d2cd39c33e555ab8cc3ac3f0679df587bbc1400fef0952efab213a5bb7b663510845ce72a2b8ff1d08b4a4f14d6 SHA512 dcd8e897daef37e0aef08338a8a44e975dd7b91feb82bc8b13fd4c0dd031ff6bc041aaef01c02423bb6ba1f1f4d01354cdede5173b7262c04406c90433a945c7
-EBUILD nextcloud-24.0.3.ebuild 1083 BLAKE2B 55f30c1489c3358c7cd85ad2df85f92714f81d2cd39c33e555ab8cc3ac3f0679df587bbc1400fef0952efab213a5bb7b663510845ce72a2b8ff1d08b4a4f14d6 SHA512 dcd8e897daef37e0aef08338a8a44e975dd7b91feb82bc8b13fd4c0dd031ff6bc041aaef01c02423bb6ba1f1f4d01354cdede5173b7262c04406c90433a945c7
+EBUILD nextcloud-23.0.5.ebuild 1086 BLAKE2B 2ae7c83454143e030323f02caeb6bf359464177e6365a4c9dcd4ad8c5df63070ad0ff848fbd0c22f628adf214600993c7c6b8ea12dd7c5985120328e83a9bc06 SHA512 0970a61a387c9beb7bfcec2bf22ad9bae8d281992d99a0712696b3d9d8f0b868a13f0c07dd30637269dd7977156d6b961768c300acf90dcf95e3b4e4c6ea3cbd
+EBUILD nextcloud-23.0.7.ebuild 1088 BLAKE2B 83dea08b95d1f947bda224a9a5cf2d42956344956b461f6ba533cb37dae1b4a63e39855d616605f5e7c4744b9ae57d3c5a825935ff318c1f0b31d65d22954987 SHA512 efb61bed84b86d9c86fe3e5a7a354535cc61295e2bb8486836b5f51cbef8994f6e1146e537c182266b6482e2e6729417d65ad02152cfc8b20b2e1d9953dc8227
+EBUILD nextcloud-24.0.3.ebuild 1088 BLAKE2B 7962cd29c375d2ec2dff7669ee1f7e78be6147df08150437dd6afcaf90805269a0111aad4e1a54e4b9884acfb26366e9944bde0c4811db0462198220e9d82339 SHA512 2c16f73f666ba666908750fb360323d005da3210207396c1eda30b062d6fd094722a5a651eb710d99dbbcfe16642266ca27ebebcd36f14f70d6824e03c2baf16
 MISC metadata.xml 533 BLAKE2B bbbb5b440e2d38d6882451584a997c4b21b2afcb8e8da8c8dd9fcaf00fdae0a3643413d3619401faa3875f93cdbd1a090db308b72d315711e859405757d4df7f SHA512 a18ee96f8aae2ed8c66faa777a303bb45eb27c49c25ff56e5f01ef4a4f9df03ef0581ad92084e37683ece26b1c25c1a9ec843d1219964954d19c2bcfbe3f4a0a
diff --git a/www-apps/nextcloud/nextcloud-23.0.5.ebuild b/www-apps/nextcloud/nextcloud-23.0.5.ebuild
index b398da7a1cb9..37b7883c8d76 100644
--- a/www-apps/nextcloud/nextcloud-23.0.5.ebuild
+++ b/www-apps/nextcloud/nextcloud-23.0.5.ebuild
@@ -15,7 +15,7 @@ IUSE="+curl +imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+RDEPEND="<dev-lang/php-8.1[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
 	imagemagick? ( dev-php/pecl-imagick )
 	virtual/httpd-php"
 
diff --git a/www-apps/nextcloud/nextcloud-23.0.7.ebuild b/www-apps/nextcloud/nextcloud-23.0.7.ebuild
index 3c8e3b4c7564..ae0486c3b736 100644
--- a/www-apps/nextcloud/nextcloud-23.0.7.ebuild
+++ b/www-apps/nextcloud/nextcloud-23.0.7.ebuild
@@ -15,7 +15,7 @@ IUSE="+curl +imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+RDEPEND="<dev-lang/php-8.1[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
 	imagemagick? ( dev-php/pecl-imagick )
 	virtual/httpd-php"
 
diff --git a/www-apps/nextcloud/nextcloud-24.0.3.ebuild b/www-apps/nextcloud/nextcloud-24.0.3.ebuild
index 3c8e3b4c7564..e35dd132e50a 100644
--- a/www-apps/nextcloud/nextcloud-24.0.3.ebuild
+++ b/www-apps/nextcloud/nextcloud-24.0.3.ebuild
@@ -15,7 +15,7 @@ IUSE="+curl +imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+RDEPEND="<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
 	imagemagick? ( dev-php/pecl-imagick )
 	virtual/httpd-php"
author	V3n3RiX <venerix@koprulu.sector>	2022-08-09 02:15:09 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-09 02:15:09 +0100
commit	3fd9d065ab109700e92fc1cea2a6519a39a5b007 (patch)
tree	2666118c9404e846180636fbd2de92e3bd7870fd
parent	11c791ab62dc711840a52676eef212362840fc17 (diff)