gentoo auto-resync : 19:08:2022 - 20:37:18

author: V3n3RiX <venerix@koprulu.sector> 2022-08-19 20:37:19 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-19 20:37:19 +0100
commit: 343082998723d09c7b354eb21ff4793c6d4fda3e (patch)
tree: 1ac116f7e87117a78651da3a40230efefd5bf847
parent: b1f2cdf56e5eea363adc4c1ea1bd418f65733a7a (diff)
248 files changed, 2273 insertions, 1177 deletions
diff --git a/Manifest b/Manifest
index 2e817cb4137f..9bb1819e24de 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29630 BLAKE2B 832cf641b345c2b19e9baaf9e2f548e937723773141d909bb0b66afb6b2d6d9156f9432b36640a95233120938b0d9f0308d4fbb3d147e36ef9b6805bb5675fa1 SHA512 4599357e02208d6740da90d466b5560ee39f4b31ff3474d3440d2675350c164c99083f33f63b14b7c5b7beada3e28bed8d79b4ea73bf34ec747fb120c9403da6
-TIMESTAMP 2022-08-19T12:39:50Z
+MANIFEST Manifest.files.gz 29640 BLAKE2B d1dbf36710871bc395beb1de798a925543cc37cbfd0952b4f38f55fb2c8c0e7ffc7710d21742ee580986cbe639bb9af5a08071693f4ada9803da693a8679b485 SHA512 8af18729a13f98e9ef3a2b33210a071f7822ca14df19609384592d694cd100a2476d161e76547ac13f8f5347f505e85bbb33fabdc636599a9c875e899ba726da
+TIMESTAMP 2022-08-19T18:39:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL/hJZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL/2PVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDZ6BAAq/CFV/nX9Awh+BaDyqT8rvKcFQiWnR8knIBV7eJGIklcVhZYeHfKG/zA
-Qqz1JUl53rL/yNT1C4fR0/UxFj8hiAfDNxpF36koTkMr4zEH9RpGIw7WghHPF7j/
-8fF9XjGEb/r5exRu1VFhE+M6aSCTD9aM+Dsq4Jz80I7uKvKxCj7suqnURdkvem2r
-HJdsCIbVyg8OoVDREhPQaSa86xIxzWFE7O4Im1v44Iqo58utW/c86COFYpazCmKk
-d6utRcZwyMUncguv/6a2/WalfiFqaR7onNjiN5B2/2XFuwFKxc/atuIMl9hXEP2b
-c1v8DxZDs59VRophBseudYjeCh95aEzMDsvu8QYXBYNtJxZLg66HnmLYjUS4oFJr
-ibZoD/Seq+kdePpbIlP/8DCQRU8Pg6M9nmg7gssnUEaGJHI0qn/caXzwILhpFRgb
-gkFXzBeYV91FY9Hevvlp9oEfXQ3AcxExV9wqSfmqb11dSEWw7xbVe6P4iVZNGqAe
-OEiUvBIsakzDL2ebT3nrRF69MpB9QnamoVS65gthA3C0Xjmpk6KAK0IYKzOMh80a
-RdaqJIKyxMFG/XabuPu+lVqyvjQXBTnGEmSkOe2X/zDAhWg7LYC+Jprnt/zEeKsf
-5dFAkAvWuhdXsxkErjRM6Lmf7ReWRlR6YMBfPKtYboO9plwqXXA=
-=3ZxH
+klDI5hAAoAvS2XhybFvmtKV/4n/Ljsrj2d8RyYsNBVzRYgsAPAQk9VtfbqIRO4KB
+5u2g6liBnYUbvvuo3qgs36cIbhpZd5QJiQVjdGnsQBwSL4LNZrSe/ZQT7qV96mdh
+lcKwx4A/5n7IdDC5J+se7XU3kgFJnevdjRmnj0B/kxDqOZzspDahL4YM0ke8iE82
+i2mCUWvW7bItVeRpmF8bAbtitjLgu6p6f1X/P6PQSST30wjZWXypw6K1Uh0z80IV
+qlBGfdC2heDiXf6NsyeAtE5lsEv85fPoawGcTa7M6a69pX/RIoYF4NFYNyPvRsxf
+bokGnjtIIvfV7etc3P/gipt3UgvvaTKX26G7R1nihrsgTgyLwIsQ3plH5mbj1V5Y
+k6OCDV+4VmgDdAGexXX7mND+J8+Rl4JWj+hBnVZ3gIZfxFhL3tuddxn9Gl34Gu0y
+vzk8FTlBTIMdFoRMcKYSLiC/GFxV9cssTz2rhlGEWuGStcbwJ2PBIza1yoUkDOoY
+iYJegI81HWA6qJvKeYj54IOMxYm0+PjVP1+8Ty0CMwYDTQeGN6jzikh6pHEXPZij
+ZlDJKHiDMcW/t+Asr8m86XYcgTs+RZkTY1K00wYiQ1SqMAS1d3zYjLKXNqWaPbBn
+g5PuoSFkyBJ6w4a3E6mwgK063ec9wJwNvPrJUkrXjc26YIby+00=
+=ekrM
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 65f7064b1c56..ef00b7bb6948 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index b2238099d2ef..f613630743f2 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/speechd-el/Manifest b/app-accessibility/speechd-el/Manifest
index 76fe69c31d29..bc26303334b5 100644
--- a/app-accessibility/speechd-el/Manifest
+++ b/app-accessibility/speechd-el/Manifest
@@ -1,6 +1,6 @@
 AUX 50speechd-el-gentoo.el 207 BLAKE2B e12cf59adb3c4867bdf0f7926b5de6d63ff46991140343c4961fd5b11a4befa9fbba877a74e4c7b0591221e2f8deccc37a28fb37414a03c80f95a8e9015cd99e SHA512 f5a891ca804aa7cd60f0ea7095903f15d9dfd6ae0bfd149fa897423f31db52a1e7786134e009c706207825d0bfe6e258288f8c6425cf26e7ad9da26fb1e9dee5
 DIST speechd-el-2.11.tar.gz 144000 BLAKE2B ab87885b9b0873a4f00f8a960d9a4c10321a88e1edd402bc92a45dd2fc631be2a17398d0995c4c9e8c88221727739c27b506cab9cafb3a9635193bd5b9b83a3a SHA512 fc6be9f9c6dbf34be559be3ceb38ecca0e94ed7230a8e738f3bdad4153e7443cdf72f34a229c6cb119cab627bc4cfcee0542817715d980e01ed2c776c23b1b6e
 DIST speechd-el-2.8.tar.gz 474614 BLAKE2B 36ac862c2f14b3f9b5be25bf666c466093f8e5bf3d456058d73a4eef0cc766d9b36ce990d8a3ee8161edb4190637a199853ac77eaedc28afd101ebd95842c47f SHA512 1a34e433d5ae61c83dfb7d3a9f26e25210613355f3a71e7601f15865cd9693db81dd9f559aef41bd3142d25702db88006bb9fd2053b597799f1b68c48911a3d2
-EBUILD speechd-el-2.11.ebuild 934 BLAKE2B 302e895d8326ec3eead108c930cba556486d9e8fb6f621cac1951e6c1ed4861f466313cc7c886da3b9719c544d3c281c7c1ef0bb132039b05f299dd5e47d17d7 SHA512 33f2d48d062b803c50617b2f58f8c827057897b88de702176ea6da1713161790646950b41d515ed5c934f5135c7b2f39924c3f386814dfe543fe391eadc1ff3d
+EBUILD speechd-el-2.11.ebuild 933 BLAKE2B 8f9a0b5181daf3698302c622194f5b1f49dcf00bc0da480077ac8e753ff3481041ded697d6c72e20301f1a03a9bb474a7b2e27ad9b0d37c5f947053c80e9e63d SHA512 03b944671e7d5224102d797fa6ba85e9992501a17df4435e086cafdde54799fc9b6f7dc8573d204082f3fdadb04c52b9f297d8fedccd455eaba40e2ad5f84990
 EBUILD speechd-el-2.8.ebuild 994 BLAKE2B e912bf5b2d44d7f9db9de06607627c0a8f3a404923de6eccc58807d23c20b0ea0950684a8a09c8bd951b0e02719d1b3fb68c40f4618fb3b6adc5fd055430e061 SHA512 94d620eeb4ccfa108ef31a36480a360f84e0fff64e37bc1fb8290ce2d46a769b795a1b9f3b9417fcb5875186e3fc93768d45ef7dce92ceb78ac3f30d3d01f27a
 MISC metadata.xml 464 BLAKE2B f2eaa295dcc054afa26f0aff0b2cc4a8a653d73a1ff955577843b7db02887b9d1391e1281b6e2b3ddf2e7c38f7f3ff411d4cb4db12cb91aaa6a9b22233b87414 SHA512 786e80f36a29dbe3e16a9701ed6b5a30051ac28e551842693c456d8936621eb6a956d8e7f650308ae52baa4af8e6fc35fb6de2ec6002a291f49f2430127269c9
diff --git a/app-accessibility/speechd-el/speechd-el-2.11.ebuild b/app-accessibility/speechd-el/speechd-el-2.11.ebuild
index b61e7e11bada..960621156ddb 100644
--- a/app-accessibility/speechd-el/speechd-el-2.11.ebuild
+++ b/app-accessibility/speechd-el/speechd-el-2.11.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-${P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND=">=app-accessibility/speech-dispatcher-0.7"
 
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a4ad75c73c29..fe9894d1764e 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli-bin/Manifest b/app-admin/awscli-bin/Manifest
index f4b72336a59c..0b2fadc89393 100644
--- a/app-admin/awscli-bin/Manifest
+++ b/app-admin/awscli-bin/Manifest
@@ -1,10 +1,13 @@
 DIST awscli-exe-linux-aarch64-2.7.11.zip 46384612 BLAKE2B 1728dac769441954b86f1436708c7b84aa4d1f7affc634de9e6a7bea66a10e5143a6d1da3fd24e8e721cdaabff0bb4b363bef78e29aecc976e9cd5b961284a2b SHA512 3f3e2670614bdcf6751d556a8a150d573712b036ad904a7cbfbb85600241d04f7f257df2d1159e2fb6f5b0d02b7f65df1bfb00764218ef60782a04a7fdebdc2a
 DIST awscli-exe-linux-aarch64-2.7.16.zip 46227549 BLAKE2B 28c72891454779337e7da8cb554310d54af0d3e3aab45a9aea76350eb0db5cba592c67f55f8feb0b4f57044a7b2292d6ac79809ceafd1a8d62639c67f6018e7c SHA512 e577e3507310dc48d323635592df5c7c12ac5ba90578d5e9e0a74264007b3c4bcaa0bf43d95f37d4974e7a83e57fdd3ec3a36e43ccd8ad359d5a56b7cda7402c
 DIST awscli-exe-linux-aarch64-2.7.20.zip 46289081 BLAKE2B 1750e609bef53775e4bf66f1be78e2b05f763bde7677be99867ae89e252f1deb81dddf6011718ceafe1f97b53ac4871657f2644c478887eb4d021e14be400121 SHA512 f519aaaf2ebc3e163ae55abdb85b08dd49e148f902a06e671f582879790bdfa07e32f8d8e773ddeb95494aee3a38dc3fbdf91a93b14215f63e13ae87cdf3de4a
+DIST awscli-exe-linux-aarch64-2.7.24.zip 46460084 BLAKE2B c24cf41c888b1469a793354c9a97cec4273f6a762ec74b4079ab8626d0eddeb95dec5ef66270764a1c8d3b1525a5460e63009441ac83ef966b43f68efe41b00a SHA512 ee4201a193e393cf7fd1e9c473eaf41a1d7934e342035b931c3d69e985bc9e74434d31d0b46bf176c27c41d1b1000bbd487a514d62c8ccdf8d7c7e82c621d1f4
 DIST awscli-exe-linux-x86_64-2.7.11.zip 47188206 BLAKE2B 9530ad2cf832dab1d5fb38a4942d338629c24bdadebe6abd0ba3a1759688e2ea9666cd97d8643d6ba7469bc446f09bd4c63a43f36deba1afb133ef00da49ce6d SHA512 6a15745502e273ddfad1d9ac118aea1684cf62f533a0fa3ac7661c31e49984ce1d0b608c61f5ed182692686ab7fd992f9a8da6a066bc4da6fe5e3d386548ab8f
 DIST awscli-exe-linux-x86_64-2.7.16.zip 47030919 BLAKE2B 1ac5789003753b015278eda42109c9ca5ee4710d32b07940c3abac0100844065fa6bffdc854446a7b4493727d3648f0514fe10e09b50c77d79f42139e2c64fcc SHA512 ae76d7425974154f481546b804cc6f359702f9357e670dfaaa7f943aa2ca27124c66388032ad9b4fbd05d82f73b7401fa7d07d7d4742c8f37c49eca17e6e6564
 DIST awscli-exe-linux-x86_64-2.7.20.zip 47092365 BLAKE2B 26320deb54f66043693aa40cd2fee2e110f2dbf1710278ce431781d49096860dacd906bd91a01160c69c484020cc1ca497954283213e85d42206ab2dba3f1c92 SHA512 6f5ab60fe3b59a7c8ad73e81b3d3003660736fe9da35e5e44b8d222a94cf195676a4802e8ea391bbefb9cbece77860148be1f616f32281d18726af126c7daa4b
+DIST awscli-exe-linux-x86_64-2.7.24.zip 47216162 BLAKE2B f99393a089bc495fc82d4f208f555bce144adf817b15c2995ad97493c16e18e38ee6cb77fb29c9225ff144193f878a7334ef90c318a5770d5c58b1f7e2209632 SHA512 2c25637fa421117aa3629ddfe8f9ead7ad3d7f04ead819b958e2b274621c858ea9e1ba2d9c111e63511ab75a1a7f0db275f653da2fef58dd5ee03274b1e7e8b7
 EBUILD awscli-bin-2.7.11-r1.ebuild 2289 BLAKE2B a10366396fb39fc81382351de2b57dd95afac77cb9eddac2c11245460fb16614d8d50be696dd88ca978f13096070bc0de3909f9433784c2b3ae3ef7d1237d3a0 SHA512 19eba643095a14c9e3a4723f704b4a6d34a8fe6e60b75d6baa56030b55f7870af23cbfa8ddab7307929d611843d43ad1ebf0dbc65eeb2abcd2a198e42afff871
 EBUILD awscli-bin-2.7.16.ebuild 2289 BLAKE2B a10366396fb39fc81382351de2b57dd95afac77cb9eddac2c11245460fb16614d8d50be696dd88ca978f13096070bc0de3909f9433784c2b3ae3ef7d1237d3a0 SHA512 19eba643095a14c9e3a4723f704b4a6d34a8fe6e60b75d6baa56030b55f7870af23cbfa8ddab7307929d611843d43ad1ebf0dbc65eeb2abcd2a198e42afff871
 EBUILD awscli-bin-2.7.20.ebuild 2305 BLAKE2B 49bd417c8c54ac715176c3043dff2c99ff48f2eb62c80e26f4464c9b9bba989de0eed39f7e12a435098a02b50790cf0b6c3f2ea073f4af3669981728d3124cd8 SHA512 2977797f3c8e9a1a16e5cbad3de6c765234d2d093cca1f166929465f75d116e92fc7be4bc6f1bafe63f1a82d303bbc9cf10b3cff88fb89f79aca5df7c10a88e3
+EBUILD awscli-bin-2.7.24.ebuild 2305 BLAKE2B 49bd417c8c54ac715176c3043dff2c99ff48f2eb62c80e26f4464c9b9bba989de0eed39f7e12a435098a02b50790cf0b6c3f2ea073f4af3669981728d3124cd8 SHA512 2977797f3c8e9a1a16e5cbad3de6c765234d2d093cca1f166929465f75d116e92fc7be4bc6f1bafe63f1a82d303bbc9cf10b3cff88fb89f79aca5df7c10a88e3
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/app-admin/awscli-bin/awscli-bin-2.7.24.ebuild b/app-admin/awscli-bin/awscli-bin-2.7.24.ebuild
new file mode 100644
index 000000000000..84c6be57c790
--- /dev/null
+++ b/app-admin/awscli-bin/awscli-bin-2.7.24.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="command line interface for Amazon Web Services"
+HOMEPAGE="
+	https://aws.amazon.com/cli/
+	https://github.com/aws/aws-cli/
+	"
+SRC_URI="
+	amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip )
+	arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
+	"
+
+LICENSE="
+	Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception
+	openssl PSF-2 BSD-2 GPL-3+ public-domain
+	"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+
+RDEPEND="!app-admin/awscli
+	sys-libs/glibc"
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="*"
+RESTRICT="strip"
+S="${WORKDIR}"
+
+# This code is based on the install script in the upstream archive.
+
+set_global_vars() {
+	ROOT_INSTALL_DIR=/opt/aws-cli
+	BIN_DIR=/usr/bin
+
+	EXE_NAME="aws"
+	COMPLETER_EXE_NAME="aws_completer"
+	INSTALLER_DIR="aws"
+	INSTALLER_DIST_DIR="${INSTALLER_DIR}/dist"
+	INSTALLER_EXE="${INSTALLER_DIST_DIR}/${EXE_NAME}"
+	AWS_EXE_VERSION=${PV}
+
+	INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/${AWS_EXE_VERSION}"
+	# INSTALL_DIR="${INSTALL_DIR}"
+	INSTALL_DIST_DIR="${INSTALL_DIR}/dist"
+	INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
+	INSTALL_AWS_EXE="${INSTALL_BIN_DIR}/${EXE_NAME}"
+	INSTALL_AWS_COMPLETER_EXE="${INSTALL_BIN_DIR}/${COMPLETER_EXE_NAME}"
+
+	CURRENT_INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/current"
+	CURRENT_AWS_EXE="${CURRENT_INSTALL_DIR}/bin/${EXE_NAME}"
+	CURRENT_AWS_COMPLETER_EXE="${CURRENT_INSTALL_DIR}/bin/${COMPLETER_EXE_NAME}"
+
+	BIN_AWS_EXE="${BIN_DIR}/${EXE_NAME}"
+	BIN_AWS_COMPLETER_EXE="${BIN_DIR}/${COMPLETER_EXE_NAME}"
+}
+
+create_install_dir() {
+	dodir "${INSTALL_DIR}"
+	setup_install_dist
+	setup_install_bin
+	create_current_symlink
+}
+
+setup_install_dist() {
+	cp -r "${INSTALLER_DIST_DIR}" "${D}/${INSTALL_DIST_DIR}" || die
+}
+
+setup_install_bin() {
+	dodir "${INSTALL_BIN_DIR}"
+	dosym "../dist/${EXE_NAME}" "${INSTALL_AWS_EXE}"
+	dosym "../dist/${COMPLETER_EXE_NAME}" "${INSTALL_AWS_COMPLETER_EXE}"
+}
+
+create_current_symlink() {
+	dosym "${AWS_EXE_VERSION}" "${CURRENT_INSTALL_DIR}"
+}
+
+create_bin_symlinks() {
+	dodir "${BIN_DIR}"
+	dosym -r "${CURRENT_AWS_EXE}" "${BIN_AWS_EXE}"
+	dosym -r "${CURRENT_AWS_COMPLETER_EXE}" "${BIN_AWS_COMPLETER_EXE}"
+}
+
+src_install() {
+	set_global_vars
+	create_install_dir
+	create_bin_symlinks
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 8ffbde7fc606..b0093faa8b54 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -8,6 +8,7 @@ DIST aws-cli-1.25.51.gh.tar.gz 2241823 BLAKE2B 86e7463a8fb63311351d60ac3dcd01a2f
 DIST aws-cli-1.25.52.gh.tar.gz 2241932 BLAKE2B e11ce7250040886ae9a00413c8ce67c929e90b5697a83d36184750d69d947c389afc4fc97d590c64874c2c259ba4a10b97b5d20f6148aee167d9cf6b9af6ff9d SHA512 5c5e06c9e2b0529508edc829c1baa7359238a1e72712e45e269030fd58644fde2f7b94767d1e33b1ff35859a25985f2b00b7d13c96e37dc5999bc7e24cc4f5da
 DIST aws-cli-1.25.53.gh.tar.gz 2242474 BLAKE2B 000bb154882210f52f8fe5c40e56d43526b28665a9e5666d7d8b61f95302d411a8f0d0c6eeaef3bd5aff46cfa6ae1133263dc38cb6a7274b4d7058c26005c369 SHA512 82790f15c9fdd736f2bdda976aa5990849521f7af05c95ee9c2c55cf232e140d875b396714be8be1ffba382ebf8f26f8b0a03bc064699de0316ca41156b993b8
 DIST aws-cli-1.25.54.gh.tar.gz 2252442 BLAKE2B 7f3f55af39f52be60daa039c42cd494a806998bbf0e27d5218949f0b6b8de29d85fc515697b76fa163e93e051405ac69a4df82322ac573fd124117d548040cc8 SHA512 bae88f022cfc8d596569412dfacddeed626ac88019632fc846a8351447ff02ae07dd481962e9a1495897896bb2f8b96186f8e3572bcb4fbd37d82b016afb8e33
+DIST aws-cli-1.25.55.gh.tar.gz 2250376 BLAKE2B 21a61086d4eb737229990fbcacdde652e8bd94e146a027dbdcc8fcc8ab005f6dcd4525625276df196408da3d11e0c215c602df4cf298fea3f12f6bd923f7f191 SHA512 e53997ae7475fb125e08bab90ac63b49723abd7ff66312d15145ca452c806986237f8e20fc6cb467d4654087a288b0835fcec48f7be6ec8795e90345a0983ef5
 EBUILD awscli-1.25.36.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.41.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.46.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
@@ -18,4 +19,5 @@ EBUILD awscli-1.25.51.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77
 EBUILD awscli-1.25.52.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.53.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.54.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.55.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.55.ebuild b/app-admin/awscli/awscli-1.25.55.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.55.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 959dbc4495a1..fd33fe9d66ac 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 82a2c2139c96..e90e3746a2d5 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -20,10 +20,11 @@ EBUILD emacs-24.5-r11.ebuild 10781 BLAKE2B 436f02959a1aa71165682f8e133dc0d7964cf
 EBUILD emacs-25.3-r11.ebuild 11091 BLAKE2B 02e66e0142e1fe4a5bd262548ee01bc399328d3b3cfeaf81bf67ad76dd10405bac1013de66d648f0e3cf5aa09b46ec69989130b514ad9989c5962a06d465bc68 SHA512 1ec9fdc1c130274277da7dd689640c48b9f3e439bf948dada9d4b79d6f2dee74e22d53e2854c1a2bd223da4b81916f2217efb9dd788e344004d50a28ba9f2b7d
 EBUILD emacs-26.3-r7.ebuild 11779 BLAKE2B 69ef04e1707478913d6d574cc9569e1b7eece4152f68c70112e9caf1e192b6b2d5f74fff7e0e89f4d730429861c1b4e1d70a0c1e6b9cb42565fefe740085f8d3 SHA512 6757269a4fdd86292b107d138d8ac39f44f055858d017e988ce005dcb4985ed3b49ce58b61335aa61fb031865f8a15bd1cbb46c402ae5466529adcee6280b552
 EBUILD emacs-27.2-r5.ebuild 14310 BLAKE2B 8875ffdd3002c88240d58891d67c840ea67bba108009e7fbf5963050a36b9e4f1cc4903e38c37a7456c3becf9a5c42c29bb910e8797940b9389b3fad8747948d SHA512 e47f5035c3d687b7a58ef3a05952ec301a00d17ae7633a9d5055c15f8fe9631d7d60927966eaf0b3e9fb1a3f0d892e3830269dc995efc2ff3400aad23815df1c
-EBUILD emacs-28.1-r2.ebuild 14934 BLAKE2B 0d81ef8eddbc2aeeace9071b7ce9214f539dd7bb3657ce0b066ea85bb0b38e4ec09d921ee01ed0dc6d4cfc6ab5fc2d25109105e318339b0e4ced569ff1c3c17b SHA512 d0692d7227f44052d2996468d59b4a16dafc55ebd73d84b53c15728701af81b281d126bc50fe1c7994151ec8e5c3a98b505be7e7f8146fd2e18e1edcfb101a60
+EBUILD emacs-28.1-r2.ebuild 14931 BLAKE2B 5549f73dee5219b3d59aa010f174900d15e3604f3561b43a90526735f0ba489bc327aa2754f5107f929430dd0a07c772b840cab8069e7185299d29969cbb2bb2 SHA512 5c7003be07e9bd27be149b704bf9d580a74a4125da0917b51472948f4657295115194c862b37c8b1f8b16ccba85d1c191ddd8db6fd227d51f3a1ca526211776b
+EBUILD emacs-28.1-r3.ebuild 15011 BLAKE2B dd646d6c697403a00294aabd72d55841a4d886c034ae1d47ce118de4f0ad2b301fd27c91ab7fdc56a3825f97793044da624ab95bf576df8a26d22785731c39e6 SHA512 b09a22af3bf5f4e9a2632168cde59071285ce5748237dd8e40fd2437831a69bb0b35c9c55a647c0bb0a44e9d40639da06a92e020926d70ebd43b680a673a8eb4
 EBUILD emacs-28.1.90-r2.ebuild 14940 BLAKE2B b6bb7cf14803f2649554168191d2533a2912212d399a31c1095c1b463356a7284ce135d648b1378042f20ae780cadac6b848efacecc1cda5c190fa2f925fb7aa SHA512 b7d7852e3f7367f18500132317ab0c95a076ace63080cfa805ed638266cbd7171ddd6814911bed3532f0c5740300689f2773790744e9cccbc426ac7d1867c2af
-EBUILD emacs-28.1.91.ebuild 14940 BLAKE2B b6bb7cf14803f2649554168191d2533a2912212d399a31c1095c1b463356a7284ce135d648b1378042f20ae780cadac6b848efacecc1cda5c190fa2f925fb7aa SHA512 b7d7852e3f7367f18500132317ab0c95a076ace63080cfa805ed638266cbd7171ddd6814911bed3532f0c5740300689f2773790744e9cccbc426ac7d1867c2af
-EBUILD emacs-28.1.9999.ebuild 15037 BLAKE2B 61cbff92ed83808be6868a4451f6e7f4064474da368f7e93295a3b23ff8a9f3a6ceb6c78ebc3955a3aa506ccf01e096b6a906b0ae4225c532b649b7492c865dd SHA512 37e7756db860b4564557b7f93c6a46e3b390dd899568802296ea2416cf9b23c408843192e5f9793a2968eff9bf622138c09858210efb85f16da0f006a912693d
+EBUILD emacs-28.1.91-r1.ebuild 15017 BLAKE2B ffff9bb339105d79ba5acbdb98f923b28efe05d1f8156b9a5327facd85aaf989ba69de8c788c7904de164662d9dddf4523330d701c1002798b6e2dd736da3923 SHA512 c5c75748123da1ce2b32f11e0026f9ec9250a3a46534b0611c3fef699946e8fdba0118ba25e8951f3cb047d13da7397749eba32e0272650d128aac5bcde75413
+EBUILD emacs-28.1.9999.ebuild 15114 BLAKE2B 4b42d6c38221d17a3119523dc7248fc44cc8e75fa49c20f8bf4513ffd00860bebc88dbbfc25cdc9d1b1a10cadc3666a30afae95caed7eb7ea4163400afb69888 SHA512 00e7401f911a2e23f6530555fa352af7f024acce2b7f13d3b0427cbe8ee7ac91356d4340abfb5f636be8689dc1e5d405649b701a3c769670c65d579d8f04a751
 EBUILD emacs-28.1.ebuild 14789 BLAKE2B a34823f4e5f862663981f580fff6b3a66e8b0b6c605cb584fb5bed3c5f2aeca0ae266668c31c0d302855fcfdffb1790c7193bf7a5d77596438bf7c0530d300af SHA512 b752b2befed614b341ea8688f6e66ef752dc026015906b77a32ef1828fb7f115de4a7c45e21be09081f72b631a5ea2bf6cddb98a0b0a84a681ffdebf2cea4dcf
-EBUILD emacs-29.0.9999.ebuild 16519 BLAKE2B ad8023a343f5b3809ac1a1b361c6213921931c2afa9eeca1d57d77b925f56c319ca10880ab7d70a33488e44c35969475b14442989c50147b7722e3d9cf44ee03 SHA512 50c3e8308f7627dd0da511104fcf3dc93e6095ad8334fa425de17b597e44e6feba58e0851cf15a8e1deb280b4957fce2ae173688f519b5e27bd4be25c42ffcb7
+EBUILD emacs-29.0.9999.ebuild 16596 BLAKE2B ca64fcc0271d921d216171411d5849fc7d8a3ec04b348b41516e2f677b6e710c917609be44345d6fd72b8fe580a5f37d5651b96d369c294465e5270388139cc3 SHA512 eec5cb8e3b7b25760c6df63410e844433103b84f695c12d5bc29ae910b89b5809426823974704259f7476e33cd48392a892d52982f89b059b33deae633ad9177
 MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee
diff --git a/app-editors/emacs/emacs-28.1-r2.ebuild b/app-editors/emacs/emacs-28.1-r2.ebuild
index b210e66a8d40..21cc8cee17a7 100644
--- a/app-editors/emacs/emacs-28.1-r2.ebuild
+++ b/app-editors/emacs/emacs-28.1-r2.ebuild
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/app-editors/emacs/emacs-28.1-r3.ebuild b/app-editors/emacs/emacs-28.1-r3.ebuild
new file mode 100644
index 000000000000..20c5afe8a337
--- /dev/null
+++ b/app-editors/emacs/emacs-28.1-r3.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-28"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	# Patchset from proj/emacs-patches.git
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
+	PATCHES=("${WORKDIR}/patch")
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+RESTRICT="test"
+
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	jit? ( sys-devel/gcc:=[jit(-)] )
+	json? ( dev-libs/jansson:= )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( media-libs/libjpeg-turbo:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			harfbuzz? ( media-libs/harfbuzz:0= )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			x11-libs/gtk+:3
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
+			)
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	if use jit; then
+		export NATIVE_FULL_AOT=1
+		find lisp -type f -name "*.elc" -delete || die
+
+		# These files ignore LDFLAGS. We assign the variable here, because
+		# for live ebuilds FULL_VERSION doesn't exist in global scope
+		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
+		# gccjit doesn't play well with ccache or distcc #801580
+		# For now, work around the problem with an explicit LIBRARY_PATH
+		has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
+			&& export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \
+				| sed -n '/^libraries:/{s:^[^/]*::;p}')
+	fi
+
+	default
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" --without-gconf"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=" --with-dumping=none"
+	elif use m68k; then
+		# Workaround for https://debbugs.gnu.org/44531
+		myconf+=" --with-dumping=unexec"
+	else
+		myconf+=" --with-dumping=pdumper"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--with-pdumper \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
+		$(use_with gpm) \
+		$(use_with jit native-compilation) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+	rm -rf "${ED}"/usr/share/{applications,icons} || die
+	rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
+	rm -rf "${ED}"/var || die
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-28.1.91.ebuild b/app-editors/emacs/emacs-28.1.91-r1.ebuild
index 52d3b54aba86..f40d3160db81 100644
--- a/app-editors/emacs/emacs-28.1.91.ebuild
+++ b/app-editors/emacs/emacs-28.1.91-r1.ebuild
@@ -152,6 +152,9 @@ src_prepare() {
 	fi
 
 	if use jit; then
+		export NATIVE_FULL_AOT=1
+		find lisp -type f -name "*.elc" -delete || die
+
 		# These files ignore LDFLAGS. We assign the variable here, because
 		# for live ebuilds FULL_VERSION doesn't exist in global scope
 		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
diff --git a/app-editors/emacs/emacs-28.1.9999.ebuild b/app-editors/emacs/emacs-28.1.9999.ebuild
index ce9357f531fc..9dde01902de3 100644
--- a/app-editors/emacs/emacs-28.1.9999.ebuild
+++ b/app-editors/emacs/emacs-28.1.9999.ebuild
@@ -149,6 +149,9 @@ src_prepare() {
 	fi
 
 	if use jit; then
+		export NATIVE_FULL_AOT=1
+		find lisp -type f -name "*.elc" -delete || die
+
 		# These files ignore LDFLAGS. We assign the variable here, because
 		# for live ebuilds FULL_VERSION doesn't exist in global scope
 		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild
index 0fde98bc4137..c533ab2a5a6e 100644
--- a/app-editors/emacs/emacs-29.0.9999.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild
@@ -171,6 +171,9 @@ src_prepare() {
 	fi
 
 	if use jit; then
+		export NATIVE_FULL_AOT=1
+		find lisp -type f -name "*.elc" -delete || die
+
 		# These files ignore LDFLAGS. We assign the variable here, because
 		# for live ebuilds FULL_VERSION doesn't exist in global scope
 		QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 5f9bc2f65c17..a133b84ac370 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/eldev/Manifest b/app-emacs/eldev/Manifest
index 5dd6329b31da..6033c40c49d0 100644
--- a/app-emacs/eldev/Manifest
+++ b/app-emacs/eldev/Manifest
@@ -2,7 +2,9 @@ AUX 50eldev-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b569
 DIST eldev-1.1.1.tar.gz 214901 BLAKE2B 42ca0089519fc97cb3cd89718eee2eef5c14d1b4cfd0864524a8a5cd22855e1fbd399233229951f3356b7f9ff6d69bbe5ed8abd8c6ae6129fae67279f900ce53 SHA512 4665bde0337a224e34fb3ec81fc6013a38800770e81e2b0911c7e05cb958fb18846995cba1494f84ae1299e1e4374645de3173ad12b01b379b61759b3c893032
 DIST eldev-1.1.2.tar.gz 215487 BLAKE2B f34af28c43b9799935a73892561fbe0a28feeb864c05bef9d3fd234cff905096bf84cd12570ac3da00b89b99edc891f13e39ed6c6574e07a67d45db0e25d604c SHA512 59742d1b50be10759dd90aa81e5a80c0c52e3f32b45d458a9774f98f37459682cb5de03c248e4c8dd664f53a8f6253db1dc93a3958a4e74306c50e20e578ef56
 DIST eldev-1.1.3.tar.gz 215481 BLAKE2B 9eed051f29be1eda9e7bbb2f55fec69d217d52fda592b206afe39c7f64584140a8e3df75f0963f1f6ba95b555961218663bede39b32f86508f0ade95e627515b SHA512 5d91d3067d82287543d4ec55440874900c3cd52359415da961641af96984f7cee978ded1dc77752d6df55440d48c951c010070657177180aee623647c9dd76b4
+DIST eldev-1.2.tar.gz 237458 BLAKE2B 8b91de9fe66c3746519591f44fc7560971d7aff72c81b320991a8bb2dd2ac5a102ccbee2edb4b1488ed8492b42071c79be0c8ec1fa7fbccc4307132cfbf52706 SHA512 ca1fbf6af218ad4632f9b8d199bf6a25a75a915263dc92b3b5bc4681c62aa5523b4e6391a110fa961bc578ce01aa4c4ec62a543418febcb1e74e4e8706801884
 EBUILD eldev-1.1.1.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
 EBUILD eldev-1.1.2.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
 EBUILD eldev-1.1.3.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
+EBUILD eldev-1.2.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
 MISC metadata.xml 982 BLAKE2B db2324ced8f4bc4ba579130677175a9de7a8dc7b8d937cd902edd69a20bc897bf4ee034acb6a9400b88de82c58c2b144e62ec4ac7b75d8dc63cdf56670cacc9e SHA512 3e4d2d7ea4fbada45b4d933d7711266bcd9ffd217ee3c3e3351e9f66145785dc11449b4f09f5ffa4853d2b475db45e501848d259f80fb5aa26429acadcb6da7d
diff --git a/app-emacs/eldev/eldev-1.2.ebuild b/app-emacs/eldev/eldev-1.2.ebuild
new file mode 100644
index 000000000000..3f35959f7270
--- /dev/null
+++ b/app-emacs/eldev/eldev-1.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Emacs Lisp Development Tool"
+HOMEPAGE="https://github.com/doublep/eldev/"
+SRC_URI="https://github.com/doublep/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.adoc )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ELDEV_LOCAL="${S}" ./bin/${PN} test
+}
+
+src_install() {
+	elisp_src_install
+	dobin bin/${PN}
+
+	# NOTICE: If ELDEV_LOCAL is defined Eldev will use it
+	# to load up it's components,
+	# if it is not it will bootstrap itself from network
+	# always check if it uses installed Emacs Lisp files.
+	# Also, do not forget to run `env-update` & reopen your shell.
+	# https://github.com/doublep/eldev#influential-environment-variables
+	echo "ELDEV_LOCAL=${SITELISP}/${PN}" >> "${T}"/99${PN} || die
+	doenvd "${T}"/99${PN}
+}
+
+pkg_postinst() {
+	elisp_pkg_postinst
+
+	ewarn "Remember to run \`env-update && source /etc/profile\` if you plan"
+	ewarn "to use Eldev in a shell before logging out (or restarting"
+	ewarn "your login manager)."
+}
diff --git a/app-emacs/spacemacs-theme/Manifest b/app-emacs/spacemacs-theme/Manifest
index ee35af2c278e..424a7a0f8c31 100644
--- a/app-emacs/spacemacs-theme/Manifest
+++ b/app-emacs/spacemacs-theme/Manifest
@@ -1,4 +1,6 @@
 AUX 50spacemacs-theme-gentoo.el 114 BLAKE2B d8dae7a2e3ed0d55f87f3294acd13cbcde06565c35d19ec8a52451f3c47f341420aa6e9aa036d0a6177e08432edf7b67ad58ca2bdad5bfff3269dadb3935b862 SHA512 f776939f1471433fb063509f4e0733db81a46c1182a2ba0d15ccb4270ae6890e5d8b61272b9ac88483a12789335aff5af07478c28e396c352435c97aab252345
 DIST spacemacs-theme-0.2.tar.gz 688604 BLAKE2B 1806fbe9b2b1b9a625778415aa6df74e4acc62279d811ff782620a7bb18e6a1327b16dacc174267c61fd959191f2ccaecaaf08f30ae5bb2844652bf92919cda2 SHA512 250f15e11c38e16930107bc2bf0c265876ba74383743714c0aa6bdb270f55cb14ee41c1f2c4d1008a6d90d3c361f44f363d36af0fb0e92087df8d320e0a888a0
+DIST spacemacs-theme-0.3.tar.gz 688782 BLAKE2B 5df23e5c98396d824e0b6d6a2f29f83966dfa935371266449cfa6e4b8522ffcd4e0719617a0e13722ed7cb5f8df5329e0603b2c21ab30b0b21a8a4bfff1ccf7c SHA512 ea11248299fbf3be85fd96b2be28d1ec2b770e53d138d36a0ece9e519d8c186dfe6e454d69bc9e5d5d5a3a5d8d03452fff3d452927fe6655356db856657c212d
 EBUILD spacemacs-theme-0.2.ebuild 490 BLAKE2B dd14d856a750926c23a8fde8cec2634e80d9f4a3ec5656d14197a532a81c61314c5e6d5a6f90dc86ae781fbc44d62ac5e9877ad710dd90c09d4bda88406a06a7 SHA512 42bc6f8a0585def2dbca037d5e305da394756ee2f94f4f56ed9711ca191dc11ef29c51494b77401ed4183614001d5296580845c3368d21a8e74a9baf9b96fc4b
+EBUILD spacemacs-theme-0.3.ebuild 490 BLAKE2B dd14d856a750926c23a8fde8cec2634e80d9f4a3ec5656d14197a532a81c61314c5e6d5a6f90dc86ae781fbc44d62ac5e9877ad710dd90c09d4bda88406a06a7 SHA512 42bc6f8a0585def2dbca037d5e305da394756ee2f94f4f56ed9711ca191dc11ef29c51494b77401ed4183614001d5296580845c3368d21a8e74a9baf9b96fc4b
 MISC metadata.xml 437 BLAKE2B 36e22919e1f78b39be205814074e044256b7c2ffce32427b508f4e58cb713006a3a89ef0ad4dfe79c76a459d6eeb6c353f0553d9ae4ff9e759f395be0864d938 SHA512 78251c276dd66a11ef5d467136b9b29fdaa6afe8ec2e4c6d68ab2301c4ad93b6c4e65619409e98eb28b6508d15c5ce71f10ec1fe7d1441cc1f35168e2dda0f9a
diff --git a/app-emacs/spacemacs-theme/spacemacs-theme-0.3.ebuild b/app-emacs/spacemacs-theme/spacemacs-theme-0.3.ebuild
new file mode 100644
index 000000000000..634cda8539e9
--- /dev/null
+++ b/app-emacs/spacemacs-theme/spacemacs-theme-0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Emacs color theme that started as a theme for Spacemacs"
+HOMEPAGE="https://github.com/nashamri/spacemacs-theme/"
+SRC_URI="https://github.com/nashamri/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md img )
+ELISP_REMOVE="spacemacs-theme-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 606719e46848..ac20ebd79db2 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index 021fdcd8bfd8..c9daad8b1fcd 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -2,5 +2,5 @@ AUX virt-viewer-10.0_p20210730-meson-0.61.patch 1022 BLAKE2B b4ff7ec6d33da1e73b7
 DIST virt-viewer-10.0_p20210730.tar.bz2 271223 BLAKE2B d66e915eccdea6eadc7d93309c66d648828da65e76e4884bd2a98a645db328296d0013955fe94df45bac5d21079230218de7e09909d29f63568d2fc32b4fe762 SHA512 58d49eb67e1bbeb73fd7672871348911ef8eaab95b0f90dd3ae2564cc2321d620eec703fe8520748a96c80429ecbdcd13ba4a7c31b249fd347a935c9b9c02531
 DIST virt-viewer-11.0.tar.xz 259772 BLAKE2B 41914a60361f0a47a0b0b54962d228ffaec67c6b69c664bb6fe683b7074dd5e2136d2bf3528b6e1b6b785cc4e337125fe16fdd94dd603dd42e8fde543931241a SHA512 738034e15e40a7aaadd2646bf289c12409cbf2d06925d43baa50fa7bc8438188480d6b97687e9816427ac0a9dae84d205351715cb2f38afdbefa2dd1d134904a
 EBUILD virt-viewer-10.0_p20210730.ebuild 1437 BLAKE2B 0e6f3b91d512a7603f009944524a9529b16cc37d7dad95bc1e45b200ff1de3c0acbdb39ada98b00a33724a4f409473a72d53280432c7c75a1c02e3161e0d7606 SHA512 554a8c23d2c4b2efe99fb7f0a3efb7cf13bd5ac0add3c845ca2b6543bf67abb03dd508912a044cf35dded8695b5cbb3117af1c3f20aa353be3e8a00a02b299b0
-EBUILD virt-viewer-11.0.ebuild 1613 BLAKE2B 37fda2240e6032f5f96d8f281676eca4075e866fa8444430834b5844c4d0a858e26e3bcbbfdd68eefc90d0093c91e56926456ebac77012c85f95917b65ab80ab SHA512 1eb62eed4a9023ee529bd5bda72fae61fdf4ec50271644294212439eb3e1079b7af11fb605385159d70cf3b80a974ab08f059c84ed4bb2da463659facdc2f5b4
+EBUILD virt-viewer-11.0.ebuild 1612 BLAKE2B 5ad745fb468134ea788b64e7f898d783a4c9e96764709d12d02ab12ab93bf1f5da85bf1d3b704fc5e7a52ab82363e423911b2dca1dec006f6d87eed2b232af81 SHA512 97d9aeb05053439b88e579049ec5d334105530520fd06b6520899693b10563fd60871fb1b8a95fcaa9f1eabd948590bbf10020c5215bc0e68f599bacd569f5d5
 MISC metadata.xml 734 BLAKE2B f25e87b2bb317cda7595ebefa8854e36f479c2a4bb4531289bcc3ae6ce53d1c9aaf36832272707d9a30735cfd519dfb56b7b04a1121c33afb767c3c5514336d5 SHA512 935b4a7d1af8199cfbd90db7c0e8e3ae52fe939739724f36fe12ecbf222220483af94a7746fb54a585c971fb0dc28c629a2e7fb34690743ea0d08a965b30db0f
diff --git a/app-emulation/virt-viewer/virt-viewer-11.0.ebuild b/app-emulation/virt-viewer/virt-viewer-11.0.ebuild
index da805aee42f0..398445a8904f 100644
--- a/app-emulation/virt-viewer/virt-viewer-11.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-11.0.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+libvirt sasl +spice +vnc vte"
 
 RDEPEND="dev-libs/glib:2
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 7dabdddd1b52..a9685a081d78 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest
index 8d4631f9daa5..7e6b535829c9 100644
--- a/app-text/pandoc-bin/Manifest
+++ b/app-text/pandoc-bin/Manifest
@@ -2,6 +2,9 @@ DIST pandoc-2.18-linux-amd64.tar.gz 16713899 BLAKE2B 89f2166fb93793c07af9d3ddff5
 DIST pandoc-2.18-linux-arm64.tar.gz 18522530 BLAKE2B 84e2479a77c12ace90a93ed9b66be2abdec357e0b4338143db8a9318cd48e76852d9fc12ceb8bd795860412a2e98d11a4d1e54bf74bdf68494c699fd5878c818 SHA512 e2be1473edeba12996a9eb7af3fe7dfd860adb1054446d2b93db6d712708282424628b14fea8809dba903e93daa1626a0dc3e1304af33b77e9da298c8fd7885b
 DIST pandoc-2.19-linux-amd64.tar.gz 16807538 BLAKE2B f92ca873d3f048768ecf39533c60157db59ed3c0b1849b7bfe8093f1590a076bd36f3fda81800527d1ec03b2387564e4bd37e35fd991a356d3caa33afb3de30a SHA512 8ad0b0a790681d2665866d8ecd6b04a5b0944e88ff6c202e4b44c0dc0ad27f45ab24136641dbcb03e10953fcaa833020125b0e08f12e3a18e014dab32934f67e
 DIST pandoc-2.19-linux-arm64.tar.gz 18631015 BLAKE2B 5e4ca9f33a10dd98c3e95798f073d2527d6aebe8a12af2d24fb93346a5ef5c6e567d3fb1b26a222a4f252efc77d874233ad4eb0c26a2b7185b4593541235d583 SHA512 f16c8114e2551203e603285f4ab27a1343516acaad622b672d617ce15b3fb108fe4e9a5926ba1d70545bdba8822291a94f4b65ff228a89bf7262286c80eb887c
+DIST pandoc-2.19.1-linux-amd64.tar.gz 17167943 BLAKE2B 7799baa54cf340581113eac5e783c8eaff52f93cd0992a706f6c1cfd176d37466acadd46be9ef624de3633c5f32bd9f62b61d886af64f00a7c993829fe57aac8 SHA512 504ee74f8fa67789472d69f7545588cbc990a4a637f38281ee7e71ce9022153994f291a1470fadbbe457d032543524e2c62ea98889c1f75ba86788dcc605c652
+DIST pandoc-2.19.1-linux-arm64.tar.gz 19030188 BLAKE2B de56902e276e9df89e88c92cb470e177d23a957542bfb11ff8449fec3c5af4a461b36b3093c5523e273d68a28784de9b88af862aa5d1be6f493c3a7485c001ca SHA512 8e74784690bb14d2239f83a52992548f7e27ad5ff93cf844cdb93f6e74d904592cd64cd98b6e93daa66b5cf83ce6c3e5968ab4ae86f23d69557b863ffea60ce4
 EBUILD pandoc-bin-2.18.ebuild 990 BLAKE2B d155ff808a25b86ab0e86a6e57f1b4ab6f3a4a819a3a8149f0b832520811d7f2b3fe82d69b28ce38b1b583b89b886b1092a823944f92c1536131b1027300e9da SHA512 2bd39771dcfe4ef3ac5c882b8d38a04570d5cf7eca730e3d683dca56ed4b4abf5e8a6cbe4130135cac60ac4d3e56326e8ea3c95fba3d3c7b728aebf9024d2a6d
+EBUILD pandoc-bin-2.19.1.ebuild 1008 BLAKE2B 3dc7415786f348a5f91dfa14c0da4297cc5180c4ea234b5415c1e73706caa4b21cb6c63e1ae460c60257f495cb4b01116eb27bc52c28b8350d9f51dd4395f5a9 SHA512 4d86d329d78f57d1989ffe9d9a2a26c078f34118dda500c82a448b1eab9654af99a5b02166b106975203c142808a12c6bdbce32c66f7f18021d6edef104d306f
 EBUILD pandoc-bin-2.19.ebuild 990 BLAKE2B d155ff808a25b86ab0e86a6e57f1b4ab6f3a4a819a3a8149f0b832520811d7f2b3fe82d69b28ce38b1b583b89b886b1092a823944f92c1536131b1027300e9da SHA512 2bd39771dcfe4ef3ac5c882b8d38a04570d5cf7eca730e3d683dca56ed4b4abf5e8a6cbe4130135cac60ac4d3e56326e8ea3c95fba3d3c7b728aebf9024d2a6d
 MISC metadata.xml 986 BLAKE2B 10ab442c2f7892545054ba2747c0cde115d9d875673c077d2cefcd035e2ecd6d04f2aef05ef9ca58a2150a983079ad8fbdc6910ca93fc14977409041e5f20201 SHA512 c8e241d4d7bba0a6f36320517d18fbb99922e32970d7771d5bbc80a8ecf5086f8f7d1eadd0188d457412a66db898d044074b4d4f0301aab1e19cd1213e562375
diff --git a/app-text/pandoc-bin/pandoc-bin-2.19.1.ebuild b/app-text/pandoc-bin/pandoc-bin-2.19.1.ebuild
new file mode 100644
index 000000000000..b11a33225c2c
--- /dev/null
+++ b/app-text/pandoc-bin/pandoc-bin-2.19.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN//-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Conversion between markup formats (binary package)"
+HOMEPAGE="https://pandoc.org/"
+
+BASE_URI="https://github.com/jgm/${MY_PN}/releases/download/${PV}/${MY_P}"
+SRC_URI="
+	amd64? ( ${BASE_URI}-linux-amd64.tar.gz )
+	arm64? ( ${BASE_URI}-linux-arm64.tar.gz )
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"  # Upstream provides only AMD and ARM 64-bit binaries
+IUSE="+pandoc-symlink"
+
+RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="${QA_FLAGS_IGNORED}"
+
+src_unpack() {
+	default
+
+	# Manpages are gzipped
+	unpack "${S}"/share/man/man1/${MY_PN}.1.gz
+}
+
+src_install() {
+	exeinto /usr/bin
+	newexe bin/${MY_PN} ${PN}
+	newman "${WORKDIR}"/${MY_PN}.1 ${PN}.1
+
+	if use pandoc-symlink ; then
+		dosym ${PN} /usr/bin/${MY_PN}
+		dosym ${PN}.1 /usr/share/man/man1/${MY_PN}.1
+	fi
+}
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 2f998ed55bd8..332158d2a21e 100644
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
diff --git a/app-xemacs/debug/Manifest b/app-xemacs/debug/Manifest
index 5b9a909c5716..41c9d47c233e 100644
--- a/app-xemacs/debug/Manifest
+++ b/app-xemacs/debug/Manifest
@@ -1,5 +1,3 @@
-DIST debug-1.20-pkg.tar.gz 107953 BLAKE2B 90af70a49f6d62224248a73907dec986ba9671a99782aa84cdf9024426f192fca74781ced10f539da9c3115586cc1fe6ecfbe91fef536228d259280c251fb6f3 SHA512 3985447986f5129a8789d1f9058a662cef5dbbe0e9d565f00973e79a6d32139581fef777f0e6d683ad5338896cc679bea3ffaf18d51976a5a2e27ba5484cd9c9
 DIST debug-1.21-pkg.tar.gz 108036 BLAKE2B a713832c1ccb5c17d61b8ddd054db638537bbb8f9d82e59a7caaa623c2fdb1cacd7d6c585fc2ccb25948ed73a578720eae9508fc81b710e0949654891f0919f0 SHA512 91d2597c85ee207b1c28c433aacd856bbdb136d69c1979a6d84a567dcb1b1ac2b09fcc788a784252d4319d52d45788f3570c59fb248c99983144114b31fd7f17
-EBUILD debug-1.20.ebuild 310 BLAKE2B fee374e5762c46f193929372779e3fcfbd983e1f15d76e5c9f95fd8ee21a7feaed083bb59a591292b2375ee1c340eb8fbd9727e3dbb205ad5aa89073a31b54f7 SHA512 eea988f19ce44f282a2af6433587139459bc8fd52938e5c81f59b61e2c402fe8ec26ffc12c1429ae195f785c8f4bbb8877ddc80645e3b69eceef74d73a6ba71f
 EBUILD debug-1.21.ebuild 345 BLAKE2B 78878686e257e8add7e477d12847e912306124b6937940d23c438ecc06e60efc461fa49adc903af18a2ab7d584ee76653712f1dfb978feb5c5379debe11f1524 SHA512 f0c66b5649ca83ef5ce66606309b919bec6b20787e49840706be4949c92cd5c2ebf12334d647db05b3f56ce0e49e62ea10da0cf8719307f4c04b0b43b2311def
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
diff --git a/app-xemacs/debug/debug-1.20.ebuild b/app-xemacs/debug/debug-1.20.ebuild
deleted file mode 100644
index 7fd65fab4e70..000000000000
--- a/app-xemacs/debug/debug-1.20.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="GUD, gdb, dbx debugging support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/ecb/Manifest b/app-xemacs/ecb/Manifest
index 5af9b8bdd7ed..30bc24f1e59c 100644
--- a/app-xemacs/ecb/Manifest
+++ b/app-xemacs/ecb/Manifest
@@ -1,5 +1,3 @@
-DIST ecb-1.25-pkg.tar.gz 872399 BLAKE2B 513181b108efa75b0d54ed2f568d586db6bd944a453ac2334a6b43ce83d8331b53dd34a68029869a1b7cc1e4f0218277c5966e8d49a4bd87a065719bc3dac58c SHA512 bfcb9e9d7fc55b9eb281f991ee57ef7059b7ecc6cf9b7a3c9693d40afbec36fc90789cfe2c3b007aab737db341154ac5cee73ea5056fc435ff6b0d86941ca8ba
 DIST ecb-1.26-pkg.tar.gz 872978 BLAKE2B 5b969a574ae209a0942782b82b9f62b0a01e333d485da616fc65fcce3e5256d06d40ae816d2596276675bbe213dec48822e67859ca6225699ca73d5fc2ee5a2e SHA512 b6baca962bc41abeb67b58eb266d12196a60bf1cb8d3359a0c30e65ed068a89a4e03b35893eef8caa8ccb524d81332aec8ffa3e56adc93aae5fedae0046df1ab
-EBUILD ecb-1.25.ebuild 552 BLAKE2B f209c60f7c98e1094f6e6f2d4aa1574c2d2222a23e768f82cde51dc8dc7b6644f95caad079a19f4c1b804793ff2aa29985468b090d58b3d80874445cf3185d71 SHA512 48d78d6f1264e03d3a5add882c66650873878c7954f6c1c495c9d52d6c9209d2196a64f94f2f49aba668f62321623de36a1616cb4c9d419e532b7a0b6e0ec5d3
 EBUILD ecb-1.26.ebuild 587 BLAKE2B 1c6b5c3a14d55d1c8315f0272ea17af0dbacf93ca0dd52f908e14999627c2af514a755f8a5e34a7e0a0f05591b5474d9dd879d0b92e302679246a2088d34706d SHA512 d7f7281561d019324bcd123a993feb0c5540db33604f5f7d47caba2a0b6e76d8cbb42edb5fc14bfcfac5c284a6c8bd73da3181f249437593f25e85e8c5fafe1c
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
diff --git a/app-xemacs/ecb/ecb-1.25.ebuild b/app-xemacs/ecb/ecb-1.25.ebuild
deleted file mode 100644
index 6596709a4edb..000000000000
--- a/app-xemacs/ecb/ecb-1.25.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Emacs source code browser"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/semantic
-app-xemacs/cedet-common
-app-xemacs/eieio
-app-xemacs/fsf-compat
-app-xemacs/edit-utils
-app-xemacs/jde
-app-xemacs/mail-lib
-app-xemacs/eshell
-app-xemacs/ediff
-app-xemacs/xemacs-devel
-app-xemacs/speedbar
-app-xemacs/c-support
-app-xemacs/os-utils
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/edit-utils/Manifest b/app-xemacs/edit-utils/Manifest
index b3f081aaa09a..2ec55a1aa909 100644
--- a/app-xemacs/edit-utils/Manifest
+++ b/app-xemacs/edit-utils/Manifest
@@ -1,5 +1,3 @@
-DIST edit-utils-2.58-pkg.tar.gz 1159051 BLAKE2B 4eb07e163863724431e2b2692014db84b0aa3926f1a40e3ef958285f692107fc00c132b30e6b74bd68fd90e916d1602dbc98b29c13d3c1e59e2f4f58b387c3a9 SHA512 42fa35bf31a0941186ceeb89afd138604cfc9903ad2feeaa7623e8d2343660368cb57b8aaaa9104182eb314a3641b0a7a9f8ee8fa525cff88a6b071c96820b5d
 DIST edit-utils-2.59-pkg.tar.gz 1161415 BLAKE2B dbfa16c4b641cce2b8d122bd3e3e55a56347cdac8bf9fe03987f32d6ee607ba29e976b0ee3e2532f79194f3352650b8943a9c7867a6ec877f1af108d2919780f SHA512 d602bb7f238f8dc6f716be6e1a83c7d027c0b0e57b7538a28ed60103c0afb746f6aeffc3d88f7f8b70d130ed47f2842769d30cbc006f7b574bdf78f5aa298c98
-EBUILD edit-utils-2.58.ebuild 405 BLAKE2B 5f1f6b1aa72a8f9706f98fe217c50480c1ca31978506582c25b8796001e87d17772bbf53c856fabb5342d30de5943e34f9db8e1db0d24a98aeecb1edad49501c SHA512 2cffa7f1f051913d62d069748c39d08c7b86e1562080e82596aa6df88c7cc4bab569cc1de9199267eb1b5927f98b79d60a216270824ee50820ce65bde6fa0cde
 EBUILD edit-utils-2.59.ebuild 440 BLAKE2B 4925dc164a54e35880169405022f63a82caebb38caf14ae8a9e7418d683c044c7d9f9c28e2e5ccb8fb4b1dbf6392b01a6fd9c4bebd85e13f1e1e50708fb76ff7 SHA512 e02594b823c67a0e87369ba9567e95d05b6f4d38a816afb4db523988c8c959c14a269fa3e04a511be5abf15122e61ddbe4dafb92e29c828a95fe5fb04e57904f
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
diff --git a/app-xemacs/edit-utils/edit-utils-2.58.ebuild b/app-xemacs/edit-utils/edit-utils-2.58.ebuild
deleted file mode 100644
index 71e35676802f..000000000000
--- a/app-xemacs/edit-utils/edit-utils-2.58.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Miscellaneous editor extensions, you probably need this"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xemacs-devel
-app-xemacs/fsf-compat
-app-xemacs/dired
-app-xemacs/mail-lib
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/eudc/Manifest b/app-xemacs/eudc/Manifest
index 0956c64a236f..9de6a8bad91c 100644
--- a/app-xemacs/eudc/Manifest
+++ b/app-xemacs/eudc/Manifest
@@ -1,5 +1,3 @@
-DIST eudc-1.43-pkg.tar.gz 79973 BLAKE2B 86c53b32707c715f7501d5467c8c6e80a5829a5c36baf57ee6ec23766a5ab5882731eacf258489fa8c1120ab1e593e8fbfc66e33b1cb758ac3a9743f85536e2c SHA512 2a4b4c46c4e164fcac083dc75c8c2f2b8eafc0882d966c5e7fea8cc899a13f0c89f8d7b8562a79f972482dc569d48e8004a121a02a7a0b430a1da0800009635d
 DIST eudc-1.44-pkg.tar.gz 79883 BLAKE2B 81c5c4ddd8244a422a229c47826f8d39876aa474ce38236bbeed311ed4349ad04a7b8ed2a4f23585a65273fd8636adcb8b2f57031516c509b32ef22d928d6972 SHA512 5d0348454e52bb8140f9df3f09fad909ad3927ba849faf8dd3c4b31aa4d0774957bb16b1edc8827f2e1248dc2646b51a772a015da54520dbe65c42741e95f978
-EBUILD eudc-1.43.ebuild 514 BLAKE2B e00c8448d773a6698c41ecf18251b3865700fb650bed95bdea38f866a537a79440bd935ad1e8310603606b39891c2e901431a92669ce17a4308ed58805f1eaa5 SHA512 0ce9e22b918e791895511abdcea06701966c7650b04a2be5087099abf7a97d1858a3f2a2ed3cab324f560af6c0be681b09a05be30f61c9069864a0501e2b6b0c
 EBUILD eudc-1.44.ebuild 549 BLAKE2B e50ce4fce10b952c5e589acc0d687c7ad46f6484d08ad03bbdba8a6753d318db53664a7c2357a7cac67a79f92f433a5f13d8e760daa14e3f08ccbf184f909858 SHA512 9c94e2fbd5c7511e84553393b30ef62eb8a1916a945bb1ac7e1f16dad3ae7d049db97eef10314677fbaaa6978c458ad60e4ed8b153c845145973b838d6de3a39
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
diff --git a/app-xemacs/eudc/eudc-1.43.ebuild b/app-xemacs/eudc/eudc-1.43.ebuild
deleted file mode 100644
index 76934ee64fb9..000000000000
--- a/app-xemacs/eudc/eudc-1.43.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Emacs Unified Directory Client (LDAP, PH)"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/fsf-compat
-app-xemacs/xemacs-base
-app-xemacs/bbdb
-app-xemacs/mail-lib
-app-xemacs/gnus
-app-xemacs/rmail
-app-xemacs/tm
-app-xemacs/apel
-app-xemacs/xemacs-eterm
-app-xemacs/sh-script
-app-xemacs/net-utils
-app-xemacs/ecrypto
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/general-docs/Manifest b/app-xemacs/general-docs/Manifest
index ff58f32c9528..3ad07e0408aa 100644
--- a/app-xemacs/general-docs/Manifest
+++ b/app-xemacs/general-docs/Manifest
@@ -1,5 +1,3 @@
-DIST general-docs-1.10-pkg.tar.gz 150069 BLAKE2B 12bc9cdb095685d954500373dcbf5b9000cbea49bda67dc81945ade24896a66ff3ec7b9d73a840706f48570b30da2dd10874bb15bc732a6cd11de5bfa56f64aa SHA512 f94798e437d5278c31e0cf18e22f22c88cc0c8eca1febf23f6c1e5dbe8856955c9334334c70832d6ce25db535704e56355536cb402c7c587a2bfee450c1485b9
 DIST general-docs-1.11-pkg.tar.gz 150119 BLAKE2B 3f7a9a32d6725de4ebf146df461b4a2d2b4d23ef49b91efbe201e964d6a82721d7a9eee8f960565b683255057dc6f3fdd49114a5032703a6d869a1ae0a50589f SHA512 9b11acf31eed4ff79f2c488f7036d4855fe7dd38bf510d00bb87b94b4fbe7587c0cef776b6d2b5a69d9c69745e534b997a2374d625c179c540c631d396361599
-EBUILD general-docs-1.10.ebuild 272 BLAKE2B 5de092cd657db9896a7b1e070daed7b1f6f4ac26784b4e1396f175d9fabaf1d739b1038bab60564660ce5e0bc4d27326ee2105cbf06b1550987753e8b7ec800b SHA512 823d0e2b2a9d80ec1f8d2432013bd6cd912102b7eac0f142829551d51621e8cd4324a332d0fdb574e2ed0396cdeaf5867007141e2238a51be003bf5eccb62dd0
 EBUILD general-docs-1.11.ebuild 307 BLAKE2B 7294e8e1de3259f666f48fc868126f5b21fd00fa501439c77eb03b2654d5ac45fd9b081b72d6d8b6f6f7e6403a3856b2c5a1f14c97419bf18e1f33e9265241ae SHA512 5fd8e1c5f53c25cacdbb9f728d64d4e11794f6cf131a6ccb8a6e9b831d3e80625af2f9efeb70a21e37aba395848d30576b0cfe50f794aaa234981afa83fcf903
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
diff --git a/app-xemacs/general-docs/general-docs-1.10.ebuild b/app-xemacs/general-docs/general-docs-1.10.ebuild
deleted file mode 100644
index f7955730c84b..000000000000
--- a/app-xemacs/general-docs/general-docs-1.10.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="General XEmacs documentation"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/gnus/Manifest b/app-xemacs/gnus/Manifest
index 12d160f57937..6bb82d304cbd 100644
--- a/app-xemacs/gnus/Manifest
+++ b/app-xemacs/gnus/Manifest
@@ -1,5 +1,3 @@
-DIST gnus-2.04-pkg.tar.gz 3628467 BLAKE2B 1b6f6ffd4693065a666353e87cf5ec4ae5f897470fe1423f43c5f3ec99c827f6c9074c70f4add6cbf7462491ee0a50b8faf0b9f6e1d4cab16d23e64e20d07975 SHA512 d7bce3b6ff62ca901e9dabf59a5bf2044ec569ab1dd84898f11cb966dc97bc35b1842b61c62ad024e200db4bd1df9f7d17fd642c251e42931603b0eb286356e2
 DIST gnus-2.05-pkg.tar.gz 3615284 BLAKE2B c06784a2e7a42df390f67b3e2e4dbba2a427b932bb4e2e864b2bf696adda8bff16d61892167219f5b391befd2ef667f36b67304b22d3e80cb63a6e7a47df485c SHA512 892b76ec6a57d8359d48cfda322ccd7679a018d2f7e6bf40b5d4c412dcac0fe3ea42e94decb05d5ada4765e323646c1eae6d30f1ade97ae30ded07355279a75a
-EBUILD gnus-2.04.ebuild 562 BLAKE2B 981f97ca6f2ddf0ac3060c10b12119f8f83e08537c7d58ebb95abc46918b13bf039cb668fa7f67e61ee93bc178f2a5d43a2803f91fe28fcc7803b3545a4084fe SHA512 8447da2c422f2d8045b0e9bb2330652f37fe381126b3ab76fe1e443da598b5ced9cad829ae36a51622f5d7b37007fbc67e11a1dd6633b311ff2e5c548f20044f
 EBUILD gnus-2.05.ebuild 597 BLAKE2B 97a0961714af5d473749357497a2f8f33ccf684ad23452c74e126968dbd9d146643b4e70cd587e9bb4a59249fbd36b74bc5629d50b2024e2d5256638ed9c4505 SHA512 500cff56d6675b72e774803bc78a7d3fd721b12a5e2180ff8e33b28b513cf64571f9aee7777459ecb51833565fbdf873883152a2086bc2eebb20613cb5d9e33b
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
diff --git a/app-xemacs/gnus/gnus-2.04.ebuild b/app-xemacs/gnus/gnus-2.04.ebuild
deleted file mode 100644
index 3a6600afd7e9..000000000000
--- a/app-xemacs/gnus/gnus-2.04.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="The Gnus Newsreader and Mailreader"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/mail-lib
-app-xemacs/xemacs-base
-app-xemacs/xemacs-eterm
-app-xemacs/sh-script
-app-xemacs/net-utils
-app-xemacs/os-utils
-app-xemacs/dired
-app-xemacs/mh-e
-app-xemacs/sieve
-app-xemacs/ps-print
-app-xemacs/w3
-app-xemacs/pgg
-app-xemacs/mailcrypt
-app-xemacs/ecrypto
-app-xemacs/sasl
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/hm-html-menus/Manifest b/app-xemacs/hm-html-menus/Manifest
index 32eddd582eb3..a6404a7ee6a7 100644
--- a/app-xemacs/hm-html-menus/Manifest
+++ b/app-xemacs/hm-html-menus/Manifest
@@ -1,5 +1,3 @@
-DIST hm--html-menus-1.26-pkg.tar.gz 179409 BLAKE2B 483ec82621700591f47128f9268b0c839d9094cff1044ac00deea0c4d1629bd7a6d4a66d7bd4db7e3ef54a73e89574ec23a1568a204b05713ffedf083396dfe9 SHA512 943c3e5667ad1f2caf6d66ef046e744c90cd1a2b7f06dcbf1e935cda984b62365b34b74e66f014c79e1a1bc0b97b183f85846d59a9f3da1aa400cb3d39949ce1
 DIST hm--html-menus-1.27-pkg.tar.gz 179441 BLAKE2B 3ec0aff8ca7697576c82cc0efef441996d950784363b69662f048892c541c0e532f221c514f62fb94070cd851bc2929371485c555336d624c6662a61860d69af SHA512 91856d8687803c486935ae85f6252ae94f3c04af32285ee3993c1f796488c7234f5d24b834ced3e574b2b1046ad72f562fad61b69e4bb733ff75696bf9945218
-EBUILD hm-html-menus-1.26.ebuild 380 BLAKE2B bd1dda03355303abe66f5c43f1a7460b4a1619fc1329c9074f3eedda8c6ea3991db8f4b5d640682570eeb65bcbb2d0018ffeace4c5f8b9cec35f7dd8a188c0f0 SHA512 90acff24200f374a6837a5ad977b1f319a4fa8699787406fa0e0a9110f4da22b4ce06fafcee15e490d63f996853a54dfee86d46d7e2bca572b63b2e83802dec8
 EBUILD hm-html-menus-1.27.ebuild 433 BLAKE2B 2e0d33e5b1ca7e8afb7d85f3ceddf4522ca757a52b3f036cb4bebb7b2a7f9b423d2b9b661b023c719072e35e216ffa1a638da198f985b412b9546d77f6dea4b8 SHA512 8bdc4299f80e8aee544cc98b959a8bd8800e3b3915de0719e3a80fe58a93f6634452a3b51f85a65972babd5b455ef52855253a64f9cd51a089be3facc166eacb
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild b/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
deleted file mode 100644
index 11c424c80ada..000000000000
--- a/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="HTML editing"
-SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/hm--html-menus-${PV}-pkg.tar.gz"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/dired
-app-xemacs/xemacs-base
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/mail-lib/Manifest b/app-xemacs/mail-lib/Manifest
index 47a6d07c30f5..0762ed1a936d 100644
--- a/app-xemacs/mail-lib/Manifest
+++ b/app-xemacs/mail-lib/Manifest
@@ -1,5 +1,3 @@
-DIST mail-lib-1.84-pkg.tar.gz 245832 BLAKE2B 500f1f63a23b200a3636792886ffb61e7dcb22c03f6a2237f3f5789cb1798eac5abb52f24b54f31e0678af375f6d569c675ceca3385cc502e5bc1014e758ea70 SHA512 43c43715b1950fb665feceacf8422e26e8a7739ce2491bb9fb80bbda27c70f9452a3c146de3c54ed14f38e6b56176610fc301bdeff4cdbc8de83828f96d87269
 DIST mail-lib-1.85-pkg.tar.gz 245917 BLAKE2B 0c43375f1543bc269c36e894782bafce1b3cf27db7b2c7119df43aa7946005d101f9a3accac13627e274b89a22d0faef22d5367456d1fa29c212e3ff6f7225bd SHA512 a35afc2b74cc173f0811245ecc17eaae9883062f8a07ef22cedbbaf57b7b6ff49ef9c64abe0bd9043c20e4a6b96ad7a43875016341aad38e8ddef7ed15bb5c17
-EBUILD mail-lib-1.84.ebuild 403 BLAKE2B 7e6d2c969d2c808963f3f3e8047649b94f5ae6ec7fb540fd92e842bf25f557f12c27859c2e109aff6b04328a9781f2926d36011752798b568ad357d3e4c54bfe SHA512 5bfc0ba23a281f41d356c2e5c16bff9f6d6a333aa318ae7b37edd7b42e2ee0f20164c15e84779c6e4b314ee33a35feb702fffe4dc6e8cd97ceafcb6d7445587a
 EBUILD mail-lib-1.85.ebuild 438 BLAKE2B e8d5f014c36eca4cb5e987afc69abcc86804f68e7911264b46482283ac31111b60b3434808f5627fbb9ad10395806ae449e43ea6baa496c7eeaa45d5aecbf2c4 SHA512 fe9d5db668320a28ad2aceed381e03511323b7c6ddf5a497ba6b21263a83ef332cd032b5f0ee03fd95a5e6e0a9dcc2607be36067dc203a1a0c411440ce33edbe
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
diff --git a/app-xemacs/mail-lib/mail-lib-1.84.ebuild b/app-xemacs/mail-lib/mail-lib-1.84.ebuild
deleted file mode 100644
index f3032cd8a630..000000000000
--- a/app-xemacs/mail-lib/mail-lib-1.84.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Fundamental lisp files for providing email support"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-eterm
-app-xemacs/xemacs-base
-app-xemacs/fsf-compat
-app-xemacs/sh-script
-app-xemacs/ecrypto
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/mmm-mode/Manifest b/app-xemacs/mmm-mode/Manifest
index 6402428218c7..f2252079cbf0 100644
--- a/app-xemacs/mmm-mode/Manifest
+++ b/app-xemacs/mmm-mode/Manifest
@@ -1,5 +1,3 @@
-DIST mmm-mode-1.08-pkg.tar.gz 205604 BLAKE2B afb2b9c3f43fd3256ca2de0c32d3356a206a6f883303698cad719f8fd287366ce2fd91a275922fcd6d61e31cccba93b0f0c836a3ff468ca2e28aa2e18ad45e7f SHA512 d26b2d4762e363d34a0fdac19841640351532f3c28772eefa7dda3a24decfa8035f7e156fa3c8c49ede54291a4bda31ee707467757c704a76803718e7d463853
 DIST mmm-mode-1.09-pkg.tar.gz 205637 BLAKE2B 7f2a89b3ef432bb18c21575f021969be55b3ded4f5301cb166df4861de50617957bb40c0162556b8c05311596f61afa18f5e591c8099911687beeb016fd430c3 SHA512 b2d0b282eec99d623cf8dae21db71e7622689d4276c48691597d6df6fa5b2ae289ac214fbceac6e06bc083628911c797eec354e1f4181c5080cc3cfc8d98e0ec
-EBUILD mmm-mode-1.08.ebuild 328 BLAKE2B 021d6619249c0f8797a4be15e7f21169edcc5f222b344071882f33806daa0e2c8f3ddc825943166f82b0d87bfe674393ac42ed8b3a4259f2847cb6308250f764 SHA512 6d107dbf86fc21ddd8ef54b0154aaac0f5b23d31265ff17a02fc92e6bc6ce264960b3d8e08926f62fc5d90c43d9e02303d56469d9a1bbe2a3a2c15882f29a057
 EBUILD mmm-mode-1.09.ebuild 363 BLAKE2B 9815eb16b0b1a08c8d746ab65bace56da5a7009809cc72e4cbe8f7266562083a141f6bdb1a8e5bf69f48f0922d8222303e5c47057b283ebb8412bc09c8ce14d0 SHA512 15781980d8542ee6a060cfead5a5c3df7b010a2796bd25c27508bd06573cd86e47f8d45317fdb1eda1d84893c000e961a3cefe71d24b7bdf083099d319bc48eb
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
diff --git a/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild b/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
deleted file mode 100644
index 0ae3cb510420..000000000000
--- a/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Multiple major modes in a single buffer"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/fsf-compat
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/prog-modes/Manifest b/app-xemacs/prog-modes/Manifest
index de311e3f2ff1..29b2dc12a22e 100644
--- a/app-xemacs/prog-modes/Manifest
+++ b/app-xemacs/prog-modes/Manifest
@@ -1,5 +1,3 @@
-DIST prog-modes-2.33-pkg.tar.gz 874585 BLAKE2B c29525ecad896041368bed7fb647110428c968fbd77b13b0322a59eb1fe2e73e7000e6e119b2658ca82bd01b6014aece2b588f807f80ecd926e755e28f09ed5c SHA512 e2c7cba8916b41c1c3e932c4daddb57ce330f242c6ef189916608b0f682122f066f18706e05b8a1b68ad5b993bd873e47fee558c540b7f6a58bdffa68544e880
 DIST prog-modes-2.34-pkg.tar.gz 874544 BLAKE2B dd1c2dbbf9d775eb725894ec3f57a31496f7554923cd551e8ca3b49d360b943926f6f84ea9f6680e2d062ae60a08ef67ad5c2cd72e983215422d5732b73d6ca2 SHA512 8879850b19129617ed6dba24cd4194df28df06c4adeb2b7156bc83920992ab6745ffbf0c94051be2130fc3a8b021f2faf9dd81001e647322e034455339e94d29
-EBUILD prog-modes-2.33.ebuild 608 BLAKE2B 1d0f02f70b2aa937ec10d77dcfd8ee1ec35313ce6ba5411dc236efb6698462e29fc379f9ef5cf24c522ca79fa6e179db80c40d89389ddf47bf166aae631ed839 SHA512 679df11f44cd5452770247e50d3533a065aab7aa86410429b89bda06085351b866dc07872c9713450e2a58d3a036f64f38076ab3b891ba3d9b2c110f403570f9
 EBUILD prog-modes-2.34.ebuild 643 BLAKE2B 363dc868f68ed82b647bcfe626546e3ab774ceb0053a3ab830232e5556b4079a534947dbf29b83a528b0867bb2a7cc116af2646b88407b7c5dba3453afd316c8 SHA512 75bbed85ea2709abd7a3d1f03fa0a1fa9af9506f1f734aa197c3e97dea3711c1e5faf33218c58ad4a5edcb4dfc181a89775f3e896238b29092eeb4e8ef5e5ae6
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
diff --git a/app-xemacs/prog-modes/prog-modes-2.33.ebuild b/app-xemacs/prog-modes/prog-modes-2.33.ebuild
deleted file mode 100644
index c9211fc3269f..000000000000
--- a/app-xemacs/prog-modes/prog-modes-2.33.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="Support for various programming languages"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/mail-lib
-app-xemacs/xemacs-devel
-app-xemacs/xemacs-base
-app-xemacs/cc-mode
-app-xemacs/fsf-compat
-app-xemacs/edit-utils
-app-xemacs/ediff
-app-xemacs/emerge
-app-xemacs/efs
-app-xemacs/vc
-app-xemacs/speedbar
-app-xemacs/dired
-app-xemacs/ilisp
-app-xemacs/sh-script
-app-xemacs/cedet-common
-app-xemacs/w3
-app-xemacs/gnus
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/w3/Manifest b/app-xemacs/w3/Manifest
index d6549670112a..1e8a378e6a44 100644
--- a/app-xemacs/w3/Manifest
+++ b/app-xemacs/w3/Manifest
@@ -1,5 +1,3 @@
-DIST w3-1.41-pkg.tar.gz 683044 BLAKE2B 4e00bf669ec3208771c08333e9231ad596b54727277d10b0dbad8e053dffd1269c1d8559621786b4a8e9c07f598ff564d9379212cc5a1ee8a8871e08cd17e953 SHA512 e050f51644f08f8a17976c118e4dcb1a70b1b91bf26c56d7a48a0f65e1076bbb6ba54e4c36c027ede8fade2f12542cd785dc0b876247523bb4933c4e89a6ce60
 DIST w3-1.42-pkg.tar.gz 683362 BLAKE2B f8d6f550d3e3c85d39881fa91205d43b8911ea6a2ba430e9595807473defdf13b0fd9ddd8b1fbc50acee4e1c4fc24e47174fa267716a8c587c32a82adba3312c SHA512 4a3ea84adfb19e9d86469b07aafa9b78d44a66512b5d86218503a6a143ece501d1d8fab01f9b1bd22fe4bdb2f9f5012a1442cb4b3a1caa5001d05b402a0f4a21
-EBUILD w3-1.41.ebuild 423 BLAKE2B d6ccca65a5e5147652e5f7648e3cb42af82892abde1e4eca0eaf9d46a7562dd618963f484df1d179e97bc6e583c8e82dd570459e9202dc1f031a302a91c60166 SHA512 567068872e64cff8ca316e7d6362b2be873d4d46395e27477eaafc5b2076ed91033bbe42461f5f86e4e580434d486b407f60a282dec97b74dfc12cec57b4e3da
 EBUILD w3-1.42.ebuild 458 BLAKE2B 0287d6f92514e12261285c78b4cbf7afeb015e77600ea4fc678e183b70f3a61a3cba4aa89e08baed85b40eb972b50a3bca4eeb5e75cd62f39edec43916f9b02f SHA512 4047d48c1a7c8cc48b20cde74f88ca55e43a8d9815130453d2a280adef0298ec045c9d0358bd571f538444daa030fa451750e9ec470ee95d2315852af0a54ac2
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
diff --git a/app-xemacs/w3/w3-1.41.ebuild b/app-xemacs/w3/w3-1.41.ebuild
deleted file mode 100644
index e03df20fb340..000000000000
--- a/app-xemacs/w3/w3-1.41.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="A Web browser"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/mail-lib
-app-xemacs/xemacs-base
-app-xemacs/ecrypto
-app-xemacs/gnus
-app-xemacs/net-utils
-app-xemacs/sh-script
-app-xemacs/fsf-compat
-app-xemacs/xemacs-eterm
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/app-xemacs/xwem/Manifest b/app-xemacs/xwem/Manifest
index 8beffa7c3ef8..fc092bf9e815 100644
--- a/app-xemacs/xwem/Manifest
+++ b/app-xemacs/xwem/Manifest
@@ -1,5 +1,3 @@
-DIST xwem-1.26-pkg.tar.gz 649043 BLAKE2B b644127e233b0c93816687d992f54a2c3cbbb822100d4e56ca088ee9d05306a1a14ff602ddfdf5ea1ed822813df4df6bd6dc802d5f27b670bae86ea61eca742a SHA512 00783faa899bd2f3da8128339c54b677843bafb30b8c1a5fca29709de31448aa29a91bf62affbbe42981a97a8ec7ab807b8ee0b64642c73e6a2fda412213eb0a
 DIST xwem-1.27-pkg.tar.gz 648980 BLAKE2B e4170d56e52f5cf46b314ace4c53fde5b38c64e385411b0011b6168e6ebc26fbde1e616349eb499cc5ff816862f4cf30e9663f9dffbdb01910a0fcd4eb44cc9c SHA512 0b6029f659ae1150c74b93d654e1ab01823386336796fe18eb4f542e9de0ceb2a171a6ed32cf941b2a872a6422e9842f44ae2767550bcc3bbd19f08fa4bbdabe
-EBUILD xwem-1.26.ebuild 455 BLAKE2B b45884cb39d00ef7994e61caaa39ab74b4bb574b75f6ee63bf213ffece8961e92b9fa03353c8aa9c0bd7de8f33eda80af83cfa1fc37841ef5be8b99b0ac07e51 SHA512 e8338aeba68575a2ce2990d67e0a1d3db281c043c3f8ae95c5640560edf889e580480929fbcecba54d4c3a83c8a73871608f42dba82321e3284bcaf2c3e6afa4
 EBUILD xwem-1.27.ebuild 506 BLAKE2B a0bce5b0cfdd9078816ffb1cf37228778b4cbc15db08a16d63d6179b14d552a9569320648dcb7af6686d7fbe5752c00c53e5f8d05a20cfe8c12c51d7d3bb3a8b SHA512 b943ea496237e1bd70eaa1f5a77bbe2f86a112ec7c46cd7873894190eb434ebec7765982b5ecd9fd41279421382e2c01f4b590d8595b2d435ddc4d6205143c87
 MISC metadata.xml 287 BLAKE2B f2b2b248cb812702d316f276593ff003c70142e8d3d00d5c94487f8114480922bfb214577c49717f432b85babe833be882cd88506e4bc4cca7542ff20beb6a1a SHA512 f05901aab0aaf50d6092e7d0483da9db035931fcb86e59ce27359d9276924173c000fd745e4fa072718e49f8848150530d8ca99a6877b4f5d0a6a35a45bd145d
diff --git a/app-xemacs/xwem/xwem-1.26.ebuild b/app-xemacs/xwem/xwem-1.26.ebuild
deleted file mode 100644
index a1cac1881167..000000000000
--- a/app-xemacs/xwem/xwem-1.26.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SLOT="0"
-DESCRIPTION="X Emacs Window Manager"
-XEMACS_PKG_CAT="standard"
-
-RDEPEND="app-xemacs/xemacs-base
-app-xemacs/xlib
-app-xemacs/strokes
-app-xemacs/edit-utils
-app-xemacs/text-modes
-app-xemacs/time
-app-xemacs/slider
-app-xemacs/elib
-app-xemacs/ilisp
-app-xemacs/mail-lib
-"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-inherit xemacs-packages
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index c38c4f25dd0f..7f887cb99836 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/opentelemetry-cpp/Manifest b/dev-cpp/opentelemetry-cpp/Manifest
index b0dc0cb58da8..b46ee6c4c561 100644
--- a/dev-cpp/opentelemetry-cpp/Manifest
+++ b/dev-cpp/opentelemetry-cpp/Manifest
@@ -1,9 +1,10 @@
 AUX opentelemetry-cpp-1.3.0-tests.patch 2937 BLAKE2B 179c6828a429d8d16ea8a8ff38044da8377922e74422b0a2df8d66e5648ddc8eae87e66ed2ccd8bbd6d4a356a37867c406988568aa8ffd538a2ca26161ab07b9 SHA512 fe8eae72b984bb5730fe095fef2a07a6e5dfdaa4c9b752e7ab5b3170f1c1054b1e888335e51257c52d2955b0a4d5ed80fc206c875fbb80990fa13f9f4ad1759d
 AUX opentelemetry-cpp-1.5.0-tests.patch 2102 BLAKE2B 8bf862ce9efe502cfe79924301a11de6d29a3d9c304caa09af5855bf2639152a36d4901db9477778f62756cdfc3a413df559e7514463e7ee5019db52d5122c70 SHA512 33e68b88a79d1f902ee23327147092b189068def115572d1c088e97dd29aa13aa138af87c9ab1bb0b6599026a9db16c60f72b8855e9f3ec43ce3b4ed69406438
+AUX opentelemetry-cpp-1.6.0-dont-install-nosend.patch 632 BLAKE2B 4da2cd8238f4bc86258f073963a04b9994020cf7538af3fdb50329dcfe398d8973daa902b5ab476f90ab611ab642a58a67f27c8b6f0851de747b25d74527274e SHA512 c628cb76b6fae9d790328debb5b0b83223840a2b08dd7fc6c4ef21284305d96966fb306362810d8285224f61c289c24628fbdfc0154bc56a8cc4f6d70a91c6ea
 DIST opentelemetry-cpp-1.3.0.tar.gz 710030 BLAKE2B 56aa3213fd9c9ac5266197c2ca417f5ff181ca28016033c9320e63122eaf9a53bdb265e1778227a9036bc42f8837755a3009cb23610268bc03b9fb24b3844c82 SHA512 38f613c208ec847c8bf7765732d8198fcc427c293a929945d72c2f739e89d2a0ad36be4d94cc3c1b77fd7b1f1d1e5d8bdb38094a493ba3da3125281cd1016836
 DIST opentelemetry-cpp-1.4.0.tar.gz 722520 BLAKE2B c34867846708218e5ffcff9cdaa275e0c43201f681a68ad697d9f83ac04b7fdc6cdb69d942274cbe200b241e407ba11218c7e92da4f9adf4490e89c06388347f SHA512 a2339c0f9b2dc0d4f1964536a844241436bd68774445a0eab6e89e51965e01d3c40d2aa776d751eb497c50e9fdaa4e0023095efb14c8abbd6bbe23a2596eb3c9
-DIST opentelemetry-cpp-1.5.0.tar.gz 782336 BLAKE2B 11153dc8a219d3916c3d8aeb7575c2a98d5e8e094cbada096bfa03dd465a08a4fb09139ad22400e4b5693a5d740b8095618858256a2c5679ae080e4e3db16005 SHA512 a506973223c49531d4b0c3febf5734dfe2e44c22f8854ed96935cda0783a14d0819cc3dbb2d3f8373f960f27acf78aafc777ee76aeb14828df9c4b4434e4fe6f
+DIST opentelemetry-cpp-1.6.0.tar.gz 790774 BLAKE2B 9512c092bfe49c9da82eff3950204c1f2eb654df2ed428e58ceb8877d15d80d9978fa6da37f7780352538c74de04bac69660528b255dfbce743f89b9d4020dd2 SHA512 ae0777451a3d2d676afd9f3142ab78c7afb08474f6038bd810ff0ee30fee6695e10100c901e7ffadf3faf16c7d19622acdea414cd720be8572f7720f2d528628
 EBUILD opentelemetry-cpp-1.3.0-r2.ebuild 966 BLAKE2B 256f46f7225b64a79a3e13e9582e0bfb275c5a22cb79f8f6ff619735dfe7a5ef6d4e6a8f2406fce71adb93ec546822c1366e9baa556f7e6e6322f168fe46c776 SHA512 83996a9639d03457037372443af6b48e4d0c75ec60cb8e9e4e9a29223d9b0081c1e9ec2150431e407290f22ee31cb5fcfe111eb9ca0b29c0988eff6eb3af7bfe
 EBUILD opentelemetry-cpp-1.4.0.ebuild 966 BLAKE2B 256f46f7225b64a79a3e13e9582e0bfb275c5a22cb79f8f6ff619735dfe7a5ef6d4e6a8f2406fce71adb93ec546822c1366e9baa556f7e6e6322f168fe46c776 SHA512 83996a9639d03457037372443af6b48e4d0c75ec60cb8e9e4e9a29223d9b0081c1e9ec2150431e407290f22ee31cb5fcfe111eb9ca0b29c0988eff6eb3af7bfe
-EBUILD opentelemetry-cpp-1.5.0.ebuild 966 BLAKE2B 6a8223d7565c5d5ddfa394a14455645f055c3afb911c98c7429b98d785658518bafe1bc93fe8429fa45d001d97c61417e5cb4e176b55a2cac8abf89fc31e1591 SHA512 3146c21d6da4e76c4fa8b3d17a9c52fb4e9b64657f7f1e03dbf19ea3a767554473aaff7eaeee7089d2e4a9e2c2202f4cc2090c816323a54420e6c4113f79da47
+EBUILD opentelemetry-cpp-1.6.0.ebuild 1046 BLAKE2B cb86b4a44a71b6a6baf45e6f569f98d0d8fd0623d8ee1619508b18f04d975b37fbee2394621c1356b51011d05955a77c033c8d89aed6784aac7fef057fcf1980 SHA512 aa19910c1509533e5d4b9c54e046f84cebb06136e90d2995010ce4d7f5ff51acba2f8cf9f4c55e50b9059da6ed411166439cc64ac2f37eeb1343f03c92584d78
 MISC metadata.xml 396 BLAKE2B 4f1e0d0edd6e3c57c5e01d8428a4203113e0bbabb1c9e02c03c99998ce839edf422bb058c28fc0b1adec6655114fd89ef11dec4897cbde4fef61d80bd11fbaf9 SHA512 f56f523cb2b99bb75162d06a0be09e662cfd64b5b58b5f92f61d4384319285f0614965ee3d585e16067249b4b17f01bef566b34e5bbfd6faf5ba2574c233b982
diff --git a/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.6.0-dont-install-nosend.patch b/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.6.0-dont-install-nosend.patch
new file mode 100644
index 000000000000..f3d757f2c5f4
--- /dev/null
+++ b/dev-cpp/opentelemetry-cpp/files/opentelemetry-cpp-1.6.0-dont-install-nosend.patch
@@ -0,0 +1,15 @@
+diff --git a/ext/src/http/client/nosend/CMakeLists.txt b/ext/src/http/client/nosend/CMakeLists.txt
+index 497daeb3..949bfd36 100644
+--- a/ext/src/http/client/nosend/CMakeLists.txt
++++ b/ext/src/http/client/nosend/CMakeLists.txt
+@@ -27,10 +27,4 @@ if(${BUILD_TESTING})
+   target_link_libraries(http_client_nosend ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIB}
+                         opentelemetry_ext)
+ 
+-  install(
+-    TARGETS http_client_nosend
+-    EXPORT "${PROJECT_NAME}-target"
+-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ endif()
diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.5.0.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild
index 2d70f1cdbd83..d007ad4f6418 100644
--- a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.5.0.ebuild
+++ b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild
@@ -35,6 +35,8 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	# remove tests the need network
 	"${FILESDIR}/opentelemetry-cpp-1.5.0-tests.patch"
+	# bug #865029
+	"${FILESDIR}/opentelemetry-cpp-1.6.0-dont-install-nosend.patch"
 )
 
 src_configure() {
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 236e6e139d9e..537d43757358 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 854ee41c1358..dedee30e8db3 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -2,10 +2,8 @@ AUX logrotate 119 BLAKE2B 7ed90c0272410e5a37411f78aaa446d1688ceb5a5a0cfa652f8ea3
 AUX pgbouncer-1.12-dirs.patch 804 BLAKE2B fba4fbc1a9c01b2d43f74719cbc4b285817c301ec7f0fbe1b59871d9121a507d35e8059f8d74f69645fd4dc25dac5c22bae2841cf8f3ad448ce3513b2e70d404 SHA512 5d3f9bae8789d9be376b897396ffabc94fd13fa50abad811abd9195f75cad46315465e90a843579552ba53bc17d2c53a52211c824de97b1905babd1e51cd35f7
 AUX pgbouncer.confd-r1 457 BLAKE2B 0b2e33b57ee33eac42742a8f9fe7c0f090bad53c5d7c29d86fd3047307bd05d62f922fc66a0805ba3396934f6e2e7060f810f1c71c5b07d887edf2763cc0f40d SHA512 0642b12236e944b6b5086b593dfd4a5d7c04c8347fc286835381945a50a421e87805900d63d84d12dcb1fad667fc81f21c8644c63af33388a71048ec6e024ab5
 AUX pgbouncer.initd-r2 2204 BLAKE2B 9c417188d4a762906c7631f1ae8fc7c7b8f6c52805acf6bfc12d580c53b2faa4e36b7c0662852feaf78aebcc29498bb8ae441d749a710793508c6950a448862f SHA512 dd9e8f7487affcc46b359e6d07a4c2fd698626d7360d2b2929389bbd7a340059eb27f0e0e9a648b7005c446d65762edbb02b865fa68194ebb822c01fba19fd7e
-DIST pgbouncer-1.15.0.tar.gz 588042 BLAKE2B 3dac09303e1c86126dd9cb44823c6f3fca4195e3155b360719c736c6e1327cc10d05e7f1e45c08d14c1dd0cb5c074b32263eee3be9e6350db9a8c5cbdfe61aa1 SHA512 5f78018ab80ab8d81f20ef3df1314ffc9557f1c6469d485d11ac822f596e3d4b554743fd9e9fe19b008a8aaf93bcf3673b42a8fb82bbd9611bd735cd2cbb98c6
-DIST pgbouncer-1.16.0.tar.gz 592136 BLAKE2B 752d5cfa18dacfdb72e9e9f12d5a1ac5346649e3a0c49ef530dd29ca16039949af0993d54080a7cf558c6eb6a919254c1dc4a36ab22f38992e790469ecd973bf SHA512 3b6f23052ca3b8af40a618da6bed2577b92ffe27b627f8980cda2d645991434bf298f720c1d423a272961c9f3f52a9d1b28154ed7f355d539f71dc68c028b617
 DIST pgbouncer-1.16.1.tar.gz 591450 BLAKE2B 137193ad614586d708598fd7003af4dee69f03f88a7235ba4074b63d57ffc3ee1c41fbccb49c5df7c23a2272b33810f8c2a9084d98e2e695a3b5f5ec317e0227 SHA512 9ecb7c7ae136d85e3da434094909df3a6ff06ce8586a1848c0c00914d87a877aecbb26ea30ad8230062160f3177621cc16deb4a490e9a2a649c8032dacb86341
-EBUILD pgbouncer-1.15.0-r1.ebuild 1934 BLAKE2B a683d31bd0b0a2a002d37fae0f728862050b7a785fad1041ea1eb1da9ef06ad4df23289ab65bb4cfe900ea61be1325a929018ae12fd916b5eaf9a16cf008ba98 SHA512 720770f595979da91cebc28ebbccca227ccca566911f5edd3ebd8e929c4cc63ff9d2f5737d213dfeaba16e1ea45655b39a538c03a231c3581bfa1441f51d2159
-EBUILD pgbouncer-1.16.0.ebuild 1933 BLAKE2B d816654f8131ad65f2b9facd969bf61caba16840fa3a4dcdcdc7824839c47875c0790d59583d4664a99d9d32565eda6d25079bdfae818a3b9b0ba6c92ce0395e SHA512 1c0debc00034e017f235ec2414988b0b7307494da759b9065b1ca637542d902a63f0e415f61753379b6defe7f69755aeb807bf1cb9b43d5a945d736a1f092d67
+DIST pgbouncer-1.17.0.tar.gz 598294 BLAKE2B 697411c612b4d53c779c3170692e49afd250c28a1674a835403aa6e0ee27f1e52627b97d0ed478868f8658be7ce2323fdfd1604e5a00d739f3152c55332479b2 SHA512 5913ce542f0f694f114db8a2f339e536fb2b5887efb160b7ce3c708ae3d638bee95943104eafb9fbc4fc225649bd5625da2ccf1b56489afe33ebf8aacac48863
 EBUILD pgbouncer-1.16.1.ebuild 1933 BLAKE2B d09d7a345f3d7778b619360a00f108a059b56e61daa886791c6bc8bc6c8dc568beb05220082c9a2615fdaaef05d05d9d6db67cd02a96ab8f79634b759fe42316 SHA512 b8baab03f60c5798fb63b9772089c89ae983dbb7950de8035df46225c580eb11e78b3c01a146276cb704a00b465b3def3943a524c26ab4695481949dcac9ddb3
+EBUILD pgbouncer-1.17.0.ebuild 1935 BLAKE2B df15abddb24bbc5f17a8375297f00557c8f3f3780b9931c0e0f535a1a1ae3ef49ef66d6762d0ac8f917682e620ab89a0bcdf705fb21b7231612ba76f61fc9303 SHA512 ae1b3a509999ea02c929d40236c7f8d7b367cc6fc8969ac3d87130b5bbd489e4bd556e46fc3b473a17e9904bce6e0dc12be8991f33fee4f1a6a1df162109a4cc
 MISC metadata.xml 473 BLAKE2B 9a55701f54f80f87559e57543574c98ad69eb8af4f6f93df3f115d55f3f3a8abf712a42e6f7b36dccb9813ec37d03924f001f4dce2b626f80658d29618068bbe SHA512 82f8d497578074d070bd0ee269ad49f58809524e17f444fb557a7a2dfd7f143d40700208a66c074d508d33be94efa4c021486642624fb416e6da735855ecd66e
diff --git a/dev-db/pgbouncer/pgbouncer-1.15.0-r1.ebuild b/dev-db/pgbouncer/pgbouncer-1.15.0-r1.ebuild
deleted file mode 100644
index 347c11f2b936..000000000000
--- a/dev-db/pgbouncer/pgbouncer-1.15.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Lightweight connection pooler for PostgreSQL"
-HOMEPAGE="https://www.pgbouncer.org/"
-SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+c-ares debug doc pam ssl systemd udns"
-
-# At-most-one-of, one can be enabled but not both
-REQUIRED_USE="?? ( c-ares udns )"
-
-RDEPEND="
-	>=dev-libs/libevent-2.0:=
-	>=sys-libs/glibc-2.10
-	acct-user/pgbouncer
-	c-ares? ( >=net-dns/c-ares-1.10 )
-	ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist(-)] )
-	systemd? ( sys-apps/systemd )
-	udns? ( >=net-libs/udns-0.1 )
-"
-
-DEPEND="${RDEPEND}"
-
-# Tests require a local database server, wants to fiddle with iptables,
-# and doesn't support overriding.
-RESTRICT="test"
-
-src_prepare() {
-	eapply "${FILESDIR}"/pgbouncer-1.12-dirs.patch
-
-	default
-}
-
-src_configure() {
-	# --enable-debug is only used to disable stripping
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-debug \
-		$(use_with c-ares cares) \
-		$(use_enable debug cassert) \
-		$(use_with pam) \
-		$(use_with ssl openssl) \
-		$(use_with systemd) \
-		$(use_with udns)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS
-	use doc && dodoc doc/*.rst
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}"
-
-	insinto /etc
-	doins etc/pgbouncer.ini
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate" pgbouncer
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		einfo "Please read the config.txt for Configuration Directives"
-		einfo
-		einfo "For Administration Commands, see:"
-		einfo "    man pgbouncer"
-		einfo
-		einfo "By default, PgBouncer does not have access to any database."
-		einfo "GRANT the permissions needed for your application and make sure that it"
-		einfo "exists in PgBouncer's auth_file."
-	fi
-}
diff --git a/dev-db/pgbouncer/pgbouncer-1.16.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.17.0.ebuild
index 1214ffcf2b4c..3103f9c999c7 100644
--- a/dev-db/pgbouncer/pgbouncer-1.16.0.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.pgbouncer.org/"
 SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+c-ares debug doc pam ssl systemd udns"
 
 # At-most-one-of, one can be enabled but not both
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 2a845e5384cb..11f74a192ccb 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/j2objc-annotations/Manifest b/dev-java/j2objc-annotations/Manifest
index 32db48fc2d43..274ad4409ff2 100644
--- a/dev-java/j2objc-annotations/Manifest
+++ b/dev-java/j2objc-annotations/Manifest
@@ -1,5 +1,5 @@
 DIST j2objc-1.2.tar.gz 9719149 BLAKE2B 8d5b9fd5b1e9356edf0e9021537c45d74f6e666de7a5fc85eb6a619b0616475bea6ef65e030e0e4023049123fba07793243af8299b8e4e24b224f252dafd8eda SHA512 2332eedcca42c936044f39ca5cf457995786beea140eb2e621d5fc7804d63aae961ad89f0f31b56afe32f8d852ecb6e73e576aaa85290135b87b762848f28c25
 DIST j2objc-2.8.tar.gz 29383083 BLAKE2B a2d288b95fac5d5fafbf5e3c8c7c862e41ba9562f6a3f367ee03574db0f07e030f7812de7d0cf63c97acdbbf8ddd8128fe14e89e97623d6d3cf7b85071e160b3 SHA512 f93a77db3a672691666de317010e455aceb20313a40217270cf4cfd082a0443f7f5cf6f53f06a1006d0a2788c199685a574b0acb435dccdc4e419a2340451860
 EBUILD j2objc-annotations-1.2-r1.ebuild 604 BLAKE2B f89ef5a8c49a6669abd3e1402f8c5b5a2ff89f210ef424e1659ddcdac116cffdf8735cb111e8a1e1b08028496b5c51bbdf6de4e2e52669dbd608755c31c850cb SHA512 780fe50fd29bd85779f9b88c73432b183a63363c6d946073b97f52c8db38ac698f1a738fed45d860a376508e08ceb995e1573a0f54c7334a809744daf3f4695c
-EBUILD j2objc-annotations-2.8.ebuild 851 BLAKE2B 25e0694300fd4d4597c16aeb68ed0a4885b9a7b5d2a8de4158facbdc376c65ba03e2f818628832efcb17337bf3079aeb37c4d43a000756f9f10542383af7004c SHA512 8d636df9a9ad46d4e188896ef0e39b7ad2e1760b3c3b8391adfe0fab0deffa71893aba638aa0658a8ed3668fc9a8751929e7c667d61cc05d6c7958df1af6c1a5
+EBUILD j2objc-annotations-2.8.ebuild 849 BLAKE2B b07b5ce27b53e3625abaffa68943535d798c282b8a91e25569092944f430de725cbce5958fa0db1a7ef1512feb569d1c2dd7f4a6eb6a4a3d85d74436a23d85ca SHA512 741976e58c092e249cf9edc90709e09e6d6679beb6c3f8125b87e7afcd5b824cf0eb3fb55d2f7dc5d8180cf1aef1b8620659fda2f865fc10c0559b500df6a7c1
 MISC metadata.xml 315 BLAKE2B 5403ef9a3b61aa4b5bef35fe46ff921be35190630f344563cdd60c8ca0fa6e3f8b1e612ad05df478f69257d85f30c36cd265e2f9664cc41d67e05fc47622f784 SHA512 fd176c272bbae6a6c861625828e363bebee5d92298540a8ec0bd9574d8adbc3f44f273ccb9ac576ac097a9d1c9deb8ff28c9f59ae001e951b030d5276f3a95ec
diff --git a/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild b/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild
index 0cca338a648a..3d69f0171861 100644
--- a/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild
+++ b/dev-java/j2objc-annotations/j2objc-annotations-2.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/google/j2objc/archive/${PV}.tar.gz -> j2objc-${PV}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="virtual/jdk:1.8"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 2a952f3d5474..dae22fc08b88 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,5 +1,5 @@
 DIST javassist-3.18.2.tar.gz 1179428 BLAKE2B cc7dfebca2e47576f902e6249c1efb65c18823e75ba3698c2d94541bdc910b9b7547e8619c1f19a84c158771230ddd112ddb0445ed97cd64810beacf3468a1ba SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca
 DIST javassist-3.29.0.tar.gz 1290728 BLAKE2B 21543fe4d81cc46fa8d6530e8b5b821df64af31404831d15255fe7d362fe40de39451f4e6a264986ce7b8fdb16116c3266a522caf24a2df6a91cc7203354e070 SHA512 9487d4b6e1d7981360f768f2ebe7e8313c103752cc458eb454fffcf6714f62952cc772e920ee663e89cd51cd6a2669993f5595e682ec74313799eff32144541c
 EBUILD javassist-3.18.2-r1.ebuild 1028 BLAKE2B 9bc9eccea4e5d896eddbbad826a95504d54cc4b352189b3dd0ad6a56dfc34641e3e800dc99aa2348c565e03fee46534b3ad19633283670380a0bdf44a635cce0 SHA512 75eb795cd8a27728e57fc168c78fb1b2aaa5d2666432690e1e20690b64a955a6471aacba04101dc2c80f1dd4afd68ebe00e9c176d1b6bce412032ff173cefbb3
-EBUILD javassist-3.29.0-r2.ebuild 1921 BLAKE2B a09c9acbe911910a687d4c8a331622c0bd12724b09985e9907896a95b943b24b1f7fb356f8bee2fc92f09e4a428308306204f645ea985100f5444b70069d076f SHA512 27d42535046feaaba8e1d898f5649f4f16f7a72301734c6261b1c22ff46d6bff555e902be6ee79bfbc91d68e89e6f1306c138d05a9b99d13f6294aabe5adf935
+EBUILD javassist-3.29.0-r2.ebuild 1919 BLAKE2B 21202b1fc59b585ed2e079627dcfad10e65f785319673829d90df723b900a0a6faf3101e26e17dd38e12340f9b3b557602f2c48836d783ee3dd17642e4122466 SHA512 5e1e997c9d9605bc9004672c699b936c4f0349c05960330f40141476099dba2359c2d4f34e4d9332d396688c3b39dec09ea63f3f2cd5fc368b8b222601b41dd8
 MISC metadata.xml 551 BLAKE2B c2f226813733db484e082189bb9420fa19eea8d5f95f751cf42305f110dc6b8a6e07370d9e3bca4be9dfac71333c86e95fb5e3f48543ca0041c2e2a4d96808b0 SHA512 b6b193720397459d3133bed6d0e93973084375684f1df77f93703f9cadf06e0a23e2798a13edf70c67642a656d5e5ef24aef2c032c71b65bc215622dbe42c1e2
diff --git a/dev-java/javassist/javassist-3.29.0-r2.ebuild b/dev-java/javassist/javassist-3.29.0-r2.ebuild
index ed1584c26207..c34576b87f4b 100644
--- a/dev-java/javassist/javassist-3.29.0-r2.ebuild
+++ b/dev-java/javassist/javassist-3.29.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.
 
 LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
 SLOT="3"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 # Tests run: 431,  Failures: 6
 # Cannot solve those test failures. Using "mvn test" they all pass.
diff --git a/dev-java/metainf-services/Manifest b/dev-java/metainf-services/Manifest
index f4caad7c7386..74ab4c7eaeaf 100644
--- a/dev-java/metainf-services/Manifest
+++ b/dev-java/metainf-services/Manifest
@@ -2,5 +2,5 @@ AUX metainf-services-1.7-build.xml 8356 BLAKE2B a9ee4ed2d959885fd2cb81a827f70915
 DIST metainf-services-1.7.tar.gz 5301 BLAKE2B dabb2229e5123b535c81f5796d92365eba609e696c0c513666c105534eb1430420b71768436ed53078dc72a2261ed821010ffea0098a4a65f81c5f1c2c118a6e SHA512 d6162e94ff5efcf61e56e0c1e1d22c51854fa7f98662b6ac0cc7d230b7f11b0d3c7c7238b640693d8d6f5e6e6f508bf5116ea22e73487d00145cd5a87853b3df
 DIST metainf-services-1.9.tar.gz 5353 BLAKE2B a2d72b886169f6697033c56fa581e4fed9f69236a335397b0480111959e87e1d25ee16b96c6449b37b467aa68f0b4997873346416d8a09e3b14b911ffe37ffd4 SHA512 6d666c2582944e824cc66dd58c09474775e475146af7f8edcb4abce45eff6573481f550d8c37b854addd81825201207be7855b9bbc21f539559395a63e9fa261
 EBUILD metainf-services-1.7-r1.ebuild 579 BLAKE2B 204d9b2856a31b0b0b8132e5ddfeaf4f07f81e7920a4ddd41d09802ef94fb804d92b682736c7dd1d7b2b4ff6b2c8547ab63a085e05cb6f20a2a96b37ba1fe4f9 SHA512 30b4b933a1648cc356335df4005d820fa1c7b040452aafcf5f5cc2386d350a2bc8480c6961173ce95a31ed3926898c42b4be98cc002f7a078981bceb04f2c0b0
-EBUILD metainf-services-1.9.ebuild 527 BLAKE2B 4eef153ebbad5e37518444dbe90272b3435098e1858c2a82c05ffc63fd79802ed354090cdc229c7e1e8c2f02e1888c8b188c2c2de48489c94ef29f301ca6ffc1 SHA512 4f8338a348cf0129bf5b1f25c2dc7ec9b35ce5b407bc6a600960bbcaee71c3c6bac815196a95bf99c8b54d017bd6cab30431cab11bdf56b5b1b299ba1a8caf57
+EBUILD metainf-services-1.9.ebuild 525 BLAKE2B c3f17d33b8127fcffe1ea11c0fa8de867b1416c1339f8db5746b18f6489378f322556877762ebe4d016d5f839a26a9c8e3aeac1fde6b56ccfe3f235c2e4adfd7 SHA512 8459cce7243048a77d7166cacb613fd1e06b1fc609630b2445b46ed22d8f320ef2e50b59b348466b141754e70a84ee5f5f9ee92d09d3a08371945244d3a23f4c
 MISC metadata.xml 336 BLAKE2B b113ab8fbfc9b92ca28ffd74d92fbea63d51e156566c0cb5292186efe18e8cc6b1e4c8d53efa1bade7d7ffacfed5780e699838805ac7ec6e2dd6684067fa9297 SHA512 1e1092dca56408b2ea5d09537f33d685c6ee97d59e62b1894f2fa24255d699b82c6aeb6fe7af90045bf4498035a6f45be93b843784ee1e89fdcf7ce165aeccc9
diff --git a/dev-java/metainf-services/metainf-services-1.9.ebuild b/dev-java/metainf-services/metainf-services-1.9.ebuild
index d8d62e7083e4..bc65997190d7 100644
--- a/dev-java/metainf-services/metainf-services-1.9.ebuild
+++ b/dev-java/metainf-services/metainf-services-1.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kohsuke/${PN}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 73cd2a61e684..71df848cf071 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libcpuid/Manifest b/dev-libs/libcpuid/Manifest
new file mode 100644
index 000000000000..98424dcef939
--- /dev/null
+++ b/dev-libs/libcpuid/Manifest
@@ -0,0 +1,3 @@
+DIST libcpuid-0.5.1.tar.gz 166522 BLAKE2B 3471c11bbe4b0eaac7b00ac20a27556a95991f1b678269ae6f142a0fe2db066ebb756722ae2e76f95158742c93e29a35da6e735226d32b746034acae3ec2a5b7 SHA512 d725bc82e5aa2db69cea7b3590afbe11d6028cf4802fde8d498b4f1cc6d823e73d71b89a453d81bf996d97b36a71f6c00d0f6e8292b72f2be8a64b5d59c01861
+EBUILD libcpuid-0.5.1.ebuild 753 BLAKE2B d01fe11a825a7e708f94c0f765921317d1364c535e080848d76581d868a7c383fbacad54a6cd8ce0eced41115ed5db383060d2460b948075fd092bb4b1075bbe SHA512 df249ef974f257d4908b7c770781001903ad83698d02d910d09ceb3d644c89abe90a743861077d5b24b3c00dd26522400c33669778f6f9e3759a3873bd269a06
+MISC metadata.xml 2130 BLAKE2B 68d843e15bd594b8c8444049acf5f5c08b21c4e72e3fe554ec72e254293bf8e19524318603af6fbe4ea8d236c2f34ae02d49289a2e3294479ef479f736fe8847 SHA512 22e24ed8291c4be11f087fb596c5ba78f5d84a3579080dc088c8ef390dcd9477f9903ed9b9dab36d43ca7f2b35878405bb08d1e75ecb64d9e253139f0e4d94fe
diff --git a/dev-libs/libcpuid/libcpuid-0.5.1.ebuild b/dev-libs/libcpuid/libcpuid-0.5.1.ebuild
new file mode 100644
index 000000000000..5226c31da62b
--- /dev/null
+++ b/dev-libs/libcpuid/libcpuid-0.5.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=(python3_{9..11})
+
+inherit autotools python-any-r1
+
+DESCRIPTION="A small C library for x86 (and x86_64) CPU detection and feature extraction"
+HOMEPAGE="http://libcpuid.sourceforge.net/"
+SRC_URI="https://github.com/anrieff/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0/15"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf "$(use_enable static-libs static)"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/libcpuid/metadata.xml b/dev-libs/libcpuid/metadata.xml
new file mode 100644
index 000000000000..fd09e47dd7c1
--- /dev/null
+++ b/dev-libs/libcpuid/metadata.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+	<longdescription>
+		<pkg>sys-libs/libcpuid</pkg> is a small C library for x86 (and x86_64)
+		CPU detection and feature extraction. Using it, you can:
+		- get the processor vendor, model, code name, etc.
+		- get information about CPU features such as: number of cores or
+		logical CPUs, cache sizes, CPU clock, etc.
+		- check if the processor implements a specific instruction set such as
+		the SSE2, 3DNow!, etc.
+		- execute the CPUID and RDTSC instructions.
+		- have this all in your commercial application, without getting into
+		trouble.
+	</longdescription>
+	<longdescription lang="fr">
+		<pkg>sys-libs/libcpuid</pkg> est une petite bibliothèque C pour la
+		détection de CPU x86 (et x86_64) et l'extraction de fonctions. En
+		l'utilisant, vous pouvez :
+		- obtenir le vendeur du processeur, le modèle, le nom de code, etc.
+		- obtenir des informations sur les caractéristiques du CPU telles que :
+		le nombre de cœurs ou d'unités logiques, les tailles des caches,
+		l'horloge CPU, etc.
+		- vérifier si le processeur implémente un jeu d'instructions spécifique
+		tel que l'instruction SSE2, 3DNow!, etc.
+		- exécuter les instructions CPUID et RDTSC.
+		- avoir tout cela dans votre application commerciale, sans avoir
+		d'ennuis.
+	</longdescription>
+	<slots>
+		<subslots>Reflect ABI compatibility for libcpuid.so</subslots>
+	</slots>
+	<slots lang="fr">
+		<subslots>
+			Reflétent la compatibilité de l'interface binaire-programme
+			(A.B.I.) de libcpuid.so
+		</subslots>
+	</slots>
+	<upstream>
+		<maintainer status="active">
+			<name>Veselin Georgiev</name>
+		</maintainer>
+		<changelog>https://raw.githubusercontent.com/anrieff/libcpuid/master/ChangeLog</changelog>
+		<doc>http://libcpuid.sourceforge.net/doxy/index.html</doc>
+		<bugs-to>https://github.com/anrieff/libcpuid/issues/</bugs-to>
+		<remote-id type="github">anrieff/libcpuid</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index e905bd65e174..c3018c593815 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/ppx_import/Manifest b/dev-ml/ppx_import/Manifest
index 332d0d0832e6..34a0f989d3a4 100644
--- a/dev-ml/ppx_import/Manifest
+++ b/dev-ml/ppx_import/Manifest
@@ -1,4 +1,4 @@
 AUX ppx_import-dune-ounit2.patch 282 BLAKE2B fa927ebd180a00201f234589ede38afce69817507d731aa1c849ddd3c42fd5beb7aaf67e6b57902800311556f0cb9c0436c81bd718a4b5c12fbe4a1aefec903f SHA512 7e62dc441cfed1f2a10ef9f539f35caeef0faedc1e752eec23e8a3c9248ae607ee77600d270bcb9c9be8244ce7b8f3991c7cbff9f82522f2472f9aed514bb861
 DIST ppx_import-1.9.1.tar.gz 13820 BLAKE2B 295796041ecad89c95bd6a6fe14a9d9bb969f7d984388cca5181c31b8358affeb92a4d200bb9e11449a0216995a8477b809acf251b049e8331eea9e6bb918cb7 SHA512 37bd54bc477b91a3aa4b2433a9817c6d939f1e4a1d950b83b05964d22540296582cec6513a0959fd036f738dbd6ef9df13430183b8bdaa9425c7640a5fddf4b3
-EBUILD ppx_import-1.9.1.ebuild 628 BLAKE2B 2377a2c1beacbbae88ab99b2aa4ee3e51962ad8002951e3445afa5d32d3fe6e288594250db0d8e1a1b4b586b286e512d661dcc8c7bc5b514a05ce680aa2a6b0c SHA512 9f76b5d437f675e383cbb3f985991b75c32a14475e1fd61cca61447df02339f12075eb0debcbd9843b46135af482785e761a0507996f9a3d5ffe42ff96340251
+EBUILD ppx_import-1.9.1.ebuild 635 BLAKE2B a87a4481874ed181269bc593ce5189e9ab0752468de415a41597443d547274add0da03732353ff49448cf4d3a270dcc996b9a5519e7ffce483622c8bd0be10cc SHA512 dbecdc368bbbb75b8ac94c956b94ac027dcec6b153de23fe703e485e3c62f6c10ac216de8aff7cfbbc76e16aeaf60ce47013365d6977c1ab62853f09708ac939
 MISC metadata.xml 477 BLAKE2B 81cb703335066a9351b72b455943e55bf3f00d0ad3c3d096aed78f1ce32fb55abd7c125b660fb6f10ff106bd90c1b7e75a2a2826cafe0c5b2e7aae032fd51a0f SHA512 b1f653123da2a260e4b426d459f3b2578c9f24d8c4e387560b6a4dba9f5ffeee8ebff8e5561d343e734b87aee0734d86dad27dc4062d4519f398a3a306ab2dfe
diff --git a/dev-ml/ppx_import/ppx_import-1.9.1.ebuild b/dev-ml/ppx_import/ppx_import-1.9.1.ebuild
index 19b0da3ed57f..715ab4e1fd80 100644
--- a/dev-ml/ppx_import/ppx_import-1.9.1.ebuild
+++ b/dev-ml/ppx_import/ppx_import-1.9.1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-ml/ppxlib:="
+RDEPEND=">=dev-ml/ppxlib-0.24:="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	test? (
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0d5af4384267..e7254047426f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index ba6735863a2c..9911092710e0 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,5 +1,3 @@
-DIST abseil-py-1.1.0.gh.tar.gz 219274 BLAKE2B 96848e3a738c295b3396b2eb45a6a2428f02ca7d325f24629d7ef8b87bdb19c8c2a33c95dcd716e286034f24d669bea27dc5470b92fcb3df437266e98a08ae6c SHA512 75e017399d28e38a5229b95b6372ad05b9d6067c3fef1cf7a64b5123399377025654dafaf6a1debc5664440efa8d26b76610629ad440e472faefd4f99b3bc685
 DIST abseil-py-1.2.0.gh.tar.gz 219456 BLAKE2B ec7d878692dcf0cbe879cd7df51bc1b8ceeae945b053419b4a024a637e726064128af69fe077a26413f8562dd4a35830b340d000a6c9d520c7674b81a7e417ae SHA512 f363814ed65a68ae4bfd833dc095491349349e70327c0a87ad68ddc3b8429dacc78aaa16d2ff0d733487a12a2ab09094d4ccd1c1133981f65c12d3715cee410d
-EBUILD absl-py-1.1.0.ebuild 2536 BLAKE2B 3fd768fb4b4f8433319cb2d267b45e5da25f09f364aaa0294a71375611fc369d8ea41b0ff30d7c3f40526c54d65480fd298c0faf6184371501ec5537b1b3d1e0 SHA512 90de813f8ad07d3e52f97154d2711320a70f3475d74d0826b39b9f4a3070ca4a994e30af89d8cf65878c97594dac7d1ce3b7d47fa573c52b26e0e5e967d0cb4e
-EBUILD absl-py-1.2.0.ebuild 2538 BLAKE2B 07e79c2e65e728df1c81972b505975127d9086fe5f9cf7ea5a2283a71d7149d70470d714704f5f8c9f2fd95fff42a668c545e80d3113d9274e48ef4dc3bcbe93 SHA512 141ed49a0170e908159684339c22fa7a439e248fd5c87fc9a1172e16a5cce4ba61aeab38262adb5c21820b822af15497fd1587b84d9e51bab3957d22c98974d7
+EBUILD absl-py-1.2.0.ebuild 2536 BLAKE2B ff9ab15c76803b9e8d3cb9430ef9cc997a53ece91f5c7d5450539c3f5dd944a4dcb74912366b97d9ba7c58ac5254f85af877cd4f2c82835af2d01ed2fc72068f SHA512 123344240820b4130be23f8097a89dbb80952ad003c39d7c7c58e05abac2300d7ee7f55002a6396c7fe20f6fab3acada974af4b41addd82d8cf21689b600cd15
 MISC metadata.xml 577 BLAKE2B dd0e02b24bdb42f24bd675cadf13e99f861a6dc9be2879f671b9bc4e9e078ef81759909e81e3063cb54c71ff71d6609624f0cf2645bf6ec055c643fbb0f3ab5c SHA512 7cfa86cac5d38b10aedacdb4bafc7acbd11cf4a98a873a2435ef5761d5186c5128171eb286b2d2568a1a353eb4de815303eae225cf5823a5292ac362633b67c7
diff --git a/dev-python/absl-py/absl-py-1.1.0.ebuild b/dev-python/absl-py/absl-py-1.1.0.ebuild
deleted file mode 100644
index 815933daf1d7..000000000000
--- a/dev-python/absl-py/absl-py-1.1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=abseil-py-${PV}
-DESCRIPTION="Abseil Python Common Libraries"
-HOMEPAGE="
-	https://github.com/abseil/abseil-py/
-	https://pypi.org/project/absl-py/
-"
-SRC_URI="
-	https://github.com/abseil/abseil-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# what a nightmare... well, we could have called bazel but that would
-	# even worse
-	local helpers=(
-		absl/flags/tests/argparse_flags_test_helper.py:absl/flags/tests/argparse_flags_test_helper
-		absl/logging/tests/logging_functional_test_helper.py:absl/logging/tests/logging_functional_test_helper
-		absl/testing/tests/absltest_fail_fast_test_helper.py:absl/testing/tests/absltest_fail_fast_test_helper
-		absl/testing/tests/absltest_filtering_test_helper.py:absl/testing/tests/absltest_filtering_test_helper
-		absl/testing/tests/absltest_randomization_testcase.py:absl/testing/tests/absltest_randomization_testcase
-		absl/testing/tests/absltest_sharding_test_helper.py:absl/testing/tests/absltest_sharding_test_helper
-		absl/testing/tests/absltest_test_helper.py:absl/testing/tests/absltest_test_helper
-		absl/testing/tests/xml_reporter_helper_test.py:absl/testing/tests/xml_reporter_helper_test
-		absl/tests/app_test_helper.py:absl/tests/app_test_helper_pure_python
-	)
-
-	local x
-	for x in "${helpers[@]}"; do
-		local script=${x%:*}
-		local sym=${x#*:}
-		sed -i -e "1i#!/usr/bin/env python" "${script}" || die
-		chmod +x "${script}" || die
-		ln -s "${script##*/}" "${sym}" || die
-	done
-
-	# i don't wanna know how these pass for upstream with wrong helper names
-	sed -i -e 's:\(app_test_helper\)\.py:\1_pure_python:' \
-		absl/tests/app_test.py || die
-	sed -i -e 's:\(logging_functional_test_helper\)\.py:\1:' \
-		absl/logging/tests/logging_functional_test.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTHONPATH=.
-	local fails=0
-	while read -r -d '' x; do
-		ebegin "${x}"
-		"${EPYTHON}" "${x}"
-		eend ${?} || : "$(( fails += 1 ))"
-	done < <(find -name '*_test.py' -print0)
-
-	[[ ${fails} -ne 0 ]] && die "${fails} tests failed on ${EPYTHON}"
-
-	# we actually need to clean this up manually before running the test
-	# suite again...
-	chmod -R u+rwX "${T}"/absl_testing || die
-	rm -rf "${T}"/absl_testing || die
-}
diff --git a/dev-python/absl-py/absl-py-1.2.0.ebuild b/dev-python/absl-py/absl-py-1.2.0.ebuild
index fb3119e6e3ba..a3f82b27933d 100644
--- a/dev-python/absl-py/absl-py-1.2.0.ebuild
+++ b/dev-python/absl-py/absl-py-1.2.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index d070083b3c28..64bca2304145 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,5 +1,3 @@
-DIST bitarray-2.5.1.tar.gz 102533 BLAKE2B 655bf2f01d99a60efb84115190397f24b8a9a907f68270a7b310b2f20685616c69c41995a4090c8f4643b844da71045f3bee4e0d48aab6230b4aff04f045a3a6 SHA512 76efa732bb33d34b5b990958ac03d0038e29677808e64c0c6585661ff1d7f6a9511c9337a7aa3adb119ac68dcc676df49b7765a7e38cdab90d8e68af3b83380d
 DIST bitarray-2.6.0.tar.gz 102780 BLAKE2B aaabaa2e59f54970087224a569e793705d8753901b0fc93e9a40a0ae2466940768e8f547fe25b32c0194893bf5baa77851bcf1608d3f18d9b1d5c11f70579dec SHA512 c4deeee54af884dc9200ffe80a7788db64478383f1210ab7e3aa2adf94809d2e38ae817bf11611f49373b12ebfe23cbe5287786da08475cf9761fd8345c554d7
-EBUILD bitarray-2.5.1.ebuild 571 BLAKE2B 402619c838f7e57a9a210b3b5eb6b265f2448b0480136f039368cc06a61266282aacbc9cdeaa225e792fed3d9516b60e66f2fe202af974c2fc881d7c33624fd9 SHA512 2099c86f8dd2084594ef049313a270d721d9ff9073d8c28b5695dd860b1ca0cd1f893e425b54d20bd18e32020e8d1e69c1083a938b5b5659e3e653c3049ff515
-EBUILD bitarray-2.6.0.ebuild 573 BLAKE2B b1a8b6d1b82b586f3c793aa8b0a0efea85be12fae579e265082c0a7fa77dd2e726a0bb06b9f534d4708e41fe8a0fd2a522550e5ec84027c2512a6a7359e31bb6 SHA512 144467a43cab10b1104df66713f4e254c7116598c7c7785d55202c0cc43bd17eafe9e62d8285fe5dd8eddbf5ef40ea5b1be703af3e97405da771a8344d488ba2
+EBUILD bitarray-2.6.0.ebuild 571 BLAKE2B 402619c838f7e57a9a210b3b5eb6b265f2448b0480136f039368cc06a61266282aacbc9cdeaa225e792fed3d9516b60e66f2fe202af974c2fc881d7c33624fd9 SHA512 2099c86f8dd2084594ef049313a270d721d9ff9073d8c28b5695dd860b1ca0cd1f893e425b54d20bd18e32020e8d1e69c1083a938b5b5659e3e653c3049ff515
 MISC metadata.xml 1195 BLAKE2B 4b6e3f2c8304d9a1af4382a876987ea116ae62c369b70468e9791a075c343a6901c0642ca76826577a8ba85480915e7297e1476aff0295188904c016cdeaa5cb SHA512 4943b61fa1dd60662510f27d3ff5d8ef135c327be620c1eb948e8a1e9e4ccbd5e386be7af7e5c7b04614ac9a11e7c14f4a0a8c35a9580d631b41df09b5033f19
diff --git a/dev-python/bitarray/bitarray-2.5.1.ebuild b/dev-python/bitarray/bitarray-2.5.1.ebuild
deleted file mode 100644
index 7f20ddf0cdf8..000000000000
--- a/dev-python/bitarray/bitarray-2.5.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.6.0.ebuild b/dev-python/bitarray/bitarray-2.6.0.ebuild
index aa55ad485325..7f20ddf0cdf8 100644
--- a/dev-python/bitarray/bitarray-2.6.0.ebuild
+++ b/dev-python/bitarray/bitarray-2.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 8a2926cd85f9..f0579cfc74ae 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -8,6 +8,7 @@ DIST boto3-1.24.51.gh.tar.gz 526840 BLAKE2B e796ee5c68260b1b125e658b80b74e2f76e6
 DIST boto3-1.24.52.gh.tar.gz 527776 BLAKE2B 301c8c8fe2a5b75af1aa34d72df8e16ecf9f547428f42dfda9c25d19f29fb6f955ea457cf5b61cced45f36e008073bab02a93e955dea2749a2dcaa881e1f2b79 SHA512 1a7fb5aa77f7bccc1a9f58c3d4149ff653b0e4cb22dd2a47bf255d09ba09ccba2dabba32d444c85b78762d1b140b538da5b274546e2883a00f849d6fca0a1a91
 DIST boto3-1.24.53.gh.tar.gz 527969 BLAKE2B f0075c531876176c11a874398f2935a7ced0e42b233941825e1d926d8ad0ab76f594edc14eaafc80a47c9f6b030df5ea04a555d57de101b28096d67eda693409 SHA512 b1186ef0f1d9c3f1f7b0bd651882c0f771c2de280a66ba2b2d03f4ef0cb8e9c2d0c7544fad2cb72706d0576a3871bc26b42ea4a711647fac3837a6f1e1fc3d9f
 DIST boto3-1.24.54.gh.tar.gz 528596 BLAKE2B a34f5bdd4a72aecaa40b9235696b502702c39a14fc4dc23fc03d4abfc2fe763c278e00b20f04b1167a5acedb77c6c149cdd053eb7ed2dd4ed4333790b4fc0ab7 SHA512 82f77416f0ae1bfadfe59764ec2e956e1533359c4cd28ea82d955c1b909d8057e5cfb2588ad14d8edf54ad44b623ce17fe7bdbd976e1928bcd8f8cdf6d7a9489
+DIST boto3-1.24.55.gh.tar.gz 529245 BLAKE2B 02a5bdbabcabc7019728da0be14d02c3e64a28e996f656664b329499668a064a13eeb4d9504a609b0ede0ade188bbd96f2b1c758e05da4e0ab67d5b70e5408a1 SHA512 539375585f93b699032755eda36bbba99364ff68f49898656cebcddd99ebead4546a01f28b1f81473d7a7eea01196832345a0b3a99a460f20ba4d4c081768bbf
 EBUILD boto3-1.24.36.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.41.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.46.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
@@ -18,5 +19,6 @@ EBUILD boto3-1.24.51.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd536
 EBUILD boto3-1.24.52.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.53.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.54.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.55.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.55.ebuild b/dev-python/boto3/boto3-1.24.55.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.55.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 808c3f63e88d..ed63e0954023 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,6 +8,7 @@ DIST botocore-1.27.51.gh.tar.gz 9525092 BLAKE2B c38085ca15f4dfef1853ef40cc7fe09a
 DIST botocore-1.27.52.gh.tar.gz 9525783 BLAKE2B 272b7b36f51b4048bbf75b426826ce5c60fb7fd2b9fbd714b1aaf02fdb99da6b522ae5cecea0468755a9edb2cd4d82a8fc6794b9f4a6e64d3c129a436f6a8397 SHA512 cb231a0dff10c55212ce013daa686b96da59b226ef545911a6dc535ce29565aca317e300d6a8dbcf2de1e3c97f761a6ad46f66d17aad2980be7e7f45166e3365
 DIST botocore-1.27.53.gh.tar.gz 9527747 BLAKE2B 9b5d2c01af6692bac0e105fbb2283741aba21894a28270d6f3d57fd59b9f72cb6552361ed2a07392980a3921cdccd151aa62f378099028e8ae25c3a4cbd32e0d SHA512 78602aea42ce262f5e8552708a4e93a5a49dc2de61e83e6d2ad63627cc6aa0dd236992adaa22613098346f0d042ee572ee40de01794518cb7db443a92b5c3d58
 DIST botocore-1.27.54.gh.tar.gz 9535763 BLAKE2B e1797243102043564a369c519397a609a4b8b6dcc9b8362f2b05961279b4b858e4f1d81ba6f4898039812a87729e0c9e9b880abe6cb509ba0fce442933aaf563 SHA512 714d70cd2d86add4c34a8ffbba3e89305928a614013bc56214dad25eeb1a7766805e737d9fb54ee96e8df81892d2faebeaa6639adea6d1f4cd50c5ac9b589c6b
+DIST botocore-1.27.55.gh.tar.gz 9543620 BLAKE2B cf9d20e5725276318578362e596bc73ed0b37c0fc0ecbba20c8de1740135fee87c93d7b849384ca34fa521f16de497fb4f2050f52bd04beddfe66b1c8ff4390e SHA512 1eea888ff68344943f0604d030c0c9f6d087211ef3338023693eb51e6dc92fcf6d32ebd14e9073e0ce7e1d44338c7a535a88a55286dcbaf7684a6617effdf14f
 EBUILD botocore-1.27.36.ebuild 1610 BLAKE2B 19f47b6c38de4ffc3a0623bc006b257260abb255ab63d084bcea3552b403d504ddfbe7191494aa8dba8d19a445b55c9dc6c977bf5f0877dba72a3ca69cdbff43 SHA512 fcc38a1393610e2eb729cfbf3a9f579ca840a8e712fe2123235cec4aefc68c96b099821282a68de737bef5e2d1f1f4b00e64e1665985f718201909e1b56994bb
 EBUILD botocore-1.27.41.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.46.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
@@ -18,5 +19,6 @@ EBUILD botocore-1.27.51.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f
 EBUILD botocore-1.27.52.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.53.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-1.27.54.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
+EBUILD botocore-1.27.55.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 EBUILD botocore-9999.ebuild 1617 BLAKE2B d33413fa74479d5ca72e82609b4b1c57a33f6953d5acb82db1e2f9de7599190c69d8e633ac0da8417121a9959346723f509d5bb8945d1de63689046756ba303a SHA512 20aeccea53aa2e5d294739c9256fb590d21a89c216411383b1bc8c1ee25528ce4ac94fe3a210a1a6ff173b81c1d97b0972d611772963592a9c8be8039c12717a
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.55.ebuild b/dev-python/botocore/botocore-1.27.55.ebuild
new file mode 100644
index 000000000000..6558cbe56a50
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.55.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 92acf043aa09..9179715405bc 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -4,7 +4,7 @@ DIST fonttools-4.34.4.gh.tar.gz 3555013 BLAKE2B 0e4149321cea89fb9ec63a52a127f657
 DIST fonttools-4.35.0.gh.tar.gz 3560204 BLAKE2B d79bbd2e4cca6fc5dd9fd301d29c10e2ff07348be6b57f00744b23ed4b00bb5e10b2415b83477827c0c2dc65262f578c6b6dd90de1243d84d4e83e46537ea804 SHA512 d7919eae04faa61fd3ef8996349239db2a0d5dbdd743dd41a43d1664f0524c0554d314a6d5d0c9aa4468badc47018843b2810ea61996c1bb56906ecd3bb9a4bf
 DIST fonttools-4.36.0.gh.tar.gz 3567028 BLAKE2B 45c2481680a314e101ed3a14915585b503a15853937846a5ceadd15e524f053663e0c6876bb105b0f2593ac790029da48cbede8139be98809764e5a6e3e2b11a SHA512 48a07548f72e9818292c1552675fce94b8ecb876172cd7adb429426c1d987f54a6e0482b7847e48c3b9854821567023cce402c613488d9e17277eff8a615d3c2
 EBUILD fonttools-4.33.3.ebuild 1565 BLAKE2B d3b083da6c8c824946781f04c525201cf812e2d28b0cb6c3e74e776556924ea714d2b1257f27c3131c6a5f6d14cb6f3ac73f78382621854b937e8760c920ca70 SHA512 cb9907623ae7fa88199994daf0f0551e0c7d45474411888a2a2c357c5671c59e8232ce745ca40a69cc792a7490b9a48a2f4262bb0e2743aebe56f6e890f84388
-EBUILD fonttools-4.34.4.ebuild 1518 BLAKE2B bf9a8f08a0a51b7ec3ca5bad26a0adc1bc6745bbd2db427211384c11357bd834e936fb9447fd4ed39a4a6d5311fb06738a46e84273fcb2f9d7ff17227698b536 SHA512 18ed7ea7f361ca0cdd2f046ada26051e313ec23cb2e2cb5c8faa3937b438b4a7da79e8f00d49867f36a26b2588fd3ee0642d1df03a5f9f33a7efece35b5ba4f7
+EBUILD fonttools-4.34.4.ebuild 1517 BLAKE2B a32d0c8df5a627584c60dc6e937f05d8d8a7e0cf203954186aca0f85410725c4dd70213211fd793918bd6292ef5393d2c55dcc100b34a7ca476cbe0bba18222a SHA512 dac902272983ba43e012d32e962115fe15cfdb45f2ce3d6a691a7998fc117ef072e24df38de7fff739ce456f253bc5b170e52a60a39fb1c06f8bf147c54becd7
 EBUILD fonttools-4.35.0.ebuild 1524 BLAKE2B 006a2e378c259889001bb01a0ef51350d34fbc3c59d9445d3669317e66916f6d546ca7be3dfffab3b56505bad8bf9a738f6e093829eedbedde2162e5cfda798b SHA512 30d8c62dc7dc26a9218f1cf7e0a4c9553299b4268bdc6a68556d565598ceda574ba194a090390e46a88606ade224c96ba5f49d4143f6ac79074fdfcb1bba97d0
 EBUILD fonttools-4.36.0.ebuild 1524 BLAKE2B 006a2e378c259889001bb01a0ef51350d34fbc3c59d9445d3669317e66916f6d546ca7be3dfffab3b56505bad8bf9a738f6e093829eedbedde2162e5cfda798b SHA512 30d8c62dc7dc26a9218f1cf7e0a4c9553299b4268bdc6a68556d565598ceda574ba194a090390e46a88606ade224c96ba5f49d4143f6ac79074fdfcb1bba97d0
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.34.4.ebuild b/dev-python/fonttools/fonttools-4.34.4.ebuild
index da9e8fb093cf..87b599ef3a1b 100644
--- a/dev-python/fonttools/fonttools-4.34.4.ebuild
+++ b/dev-python/fonttools/fonttools-4.34.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.gh.
 
 LICENSE="BSD"
 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"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index cdeb5a89a88f..7f4f82c8d2b7 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,11 +1,7 @@
-DIST google-api-python-client-2.53.0.gh.tar.gz 32251370 BLAKE2B 880024a220bb793b53042c8b2192dee666b7f5ad6dd8b0b68d51ff7b18ebd2ba220974f86656ac13b4c421c191ec66b269007a3f68a1992b0672623db046ef6b SHA512 1cb251d8abbec0b33b62b661ea8235224e94f807571b47e8422b6908b6636f844c639328cf0c07b4820a083b265e71f54dc3f6c48447f0cfd20bca738d7ab86a
-DIST google-api-python-client-2.54.0.gh.tar.gz 32389268 BLAKE2B 568ff657ea5093ff927208cd38d0125bf4aea8b725c5ded0a232c4de77f59c97f639b7f2b0ab8cf0e121bafd4512c23f9ac4c3c6cce6b6ab407c6ad2bb5a4983 SHA512 f33525bee9b6cede8955af4e208b64d1c82185cff08173d9ae30a704c3239b9a2ee9972e083fd4a823091b76669a7df02bf60cd950a3e20ddf21c6fd2e5ee18b
 DIST google-api-python-client-2.55.0.gh.tar.gz 32614590 BLAKE2B f7344903e4782940cb277b0b4ebc48b36c5b3403ea7f309205c4b27bee3488ecc5cd83b0487989da56b840dda7b0661f598c21307ba9afc9b52137f3b155737d SHA512 c674c038e911140e3ad64426be629d1498db382d96d18a5a51a4c2d5cb4375ad84e21e5dd68aedfa29b4bdc017d7996351f42ff34bff293a4d2c8cfb26820f0d
 DIST google-api-python-client-2.56.0.gh.tar.gz 33165501 BLAKE2B 5b4d72404f15c211cb01ca5291a74c83e9551b28c2e9e268462d481a3b05f557998fba8ed14c1233a023f60813be5b702f88371d47499a18cef152a52577f2ce SHA512 3ea968d11eda34d7807469c1651e8685ae695faed2772acbb23964468fa0cf9036fe468f427cd3f5bccd7c69746729858838446cbd320f0db7edff4add554d81
 DIST google-api-python-client-2.57.0.gh.tar.gz 33298709 BLAKE2B 6c50bdcfc38180ece5f8202b0f3adcfc446cc0b057122aee7f706401248b7d860d9227c444b26faea49de5e4147010765edc5e54271907f6490e6f0d9fe0ac1e SHA512 f96c40b21f4191e5a06a4068b65c952d9d2bef3849a6aa821232c60dfc8b6c6598606b596c750cc87928871367cbbcb24af46b5626d602915ccf7a7f316988ba
-EBUILD google-api-python-client-2.53.0.ebuild 1442 BLAKE2B f386901776c1845ec0815ba4254b5e6cdbeec0c7dab8a3928bb60a6259ef1140bd4e3ece4287fc3ea0e1833a69cb8432fa973447f83846e60b6a6b2038bfbb20 SHA512 828e71b82de37f6d50f980e897c0cf5a46df036dcfa005906aed6772455c8f5059c1fa6bcf0b2340fb9307df08df2789e6421e26b5c0ff28774844c3a36c828c
-EBUILD google-api-python-client-2.54.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
-EBUILD google-api-python-client-2.55.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
+EBUILD google-api-python-client-2.55.0.ebuild 1442 BLAKE2B f386901776c1845ec0815ba4254b5e6cdbeec0c7dab8a3928bb60a6259ef1140bd4e3ece4287fc3ea0e1833a69cb8432fa973447f83846e60b6a6b2038bfbb20 SHA512 828e71b82de37f6d50f980e897c0cf5a46df036dcfa005906aed6772455c8f5059c1fa6bcf0b2340fb9307df08df2789e6421e26b5c0ff28774844c3a36c828c
 EBUILD google-api-python-client-2.56.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
 EBUILD google-api-python-client-2.57.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.53.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.53.0.ebuild
deleted file mode 100644
index 1c528a1a0c2d..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.53.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.54.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.54.0.ebuild
deleted file mode 100644
index 7e8aaa05d6d4..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.54.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.55.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.55.0.ebuild
index 7e8aaa05d6d4..1c528a1a0c2d 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.55.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.55.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 9083f432b48a..7373d8875a2b 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,7 +1,5 @@
-DIST identify-2.5.1.gh.tar.gz 101393 BLAKE2B 8586721838c427b00a7c70e842d2ab1a2f0437909d84d5cba6614aff3f8265f17b5137628bdd78e5f324fbf6a0fef8b5ca0246e6861af023c2d9a1a323cc43f6 SHA512 8b61dd03bcdb8908a1a7f3b13d66121bb4f4bb3aab57672bff55a84232dcff310214ed0a90cfcf79846da9abc111bff08761ec9dd40c8b9b183bfbbf365efac4
 DIST identify-2.5.2.gh.tar.gz 101399 BLAKE2B f0ef048c6543b32016ad47a84e4b4b049a88424e496b159ce6ec1a1358172a87849e132b045a7345e818b02aee359e6d9458c458430a4d5d2b9f918cba685ed7 SHA512 72aaf406e5aa7acc83189820c389e82e90cf775541013e4ad91e5d25abdecd8526d1c47d203baa8ab8e5e028836da755a7045e74fded7e8e3167397557d4b1f0
 DIST identify-2.5.3.gh.tar.gz 101397 BLAKE2B 8782a4dfcea2d84facec9fefac8c7241c978ca1f494aa3e0602171dc017b41d24545ec7a3537b07a5e9962edcc4813fa4f45f76d807ba8ba69243041bc777d1b SHA512 d6cc5737b119498af5fb3cc9478881960b4d9532eec552622e942292ec3f1c75182f50ccc94fe7e1bb8993525c5e50fcdfd58881a9226da52fbe5feb3b83a8c3
-EBUILD identify-2.5.1.ebuild 588 BLAKE2B eff914d7f68c76704a11dcdbfef21c51f52f0abcb6d29f669ba173106369d2eaedc818e9d89ed2d35e765184b07fe471c3d9c86db84f0093ebe87e46bf951152 SHA512 2ff5036390cf415ad56c87cc4bc7e1c2fbf0992ebf92ef3cbdf44ed40832a0326bb5f946e4fa432d4e429f8b224c7e6b37fb3ebac56d2388201df754205bd42e
-EBUILD identify-2.5.2.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
+EBUILD identify-2.5.2.ebuild 588 BLAKE2B eff914d7f68c76704a11dcdbfef21c51f52f0abcb6d29f669ba173106369d2eaedc818e9d89ed2d35e765184b07fe471c3d9c86db84f0093ebe87e46bf951152 SHA512 2ff5036390cf415ad56c87cc4bc7e1c2fbf0992ebf92ef3cbdf44ed40832a0326bb5f946e4fa432d4e429f8b224c7e6b37fb3ebac56d2388201df754205bd42e
 EBUILD identify-2.5.3.ebuild 590 BLAKE2B 9903b2478df4f9ce56ff68e2877d9b8e5d86a814e3c021b0533f3db6a1aabc5709c5cda6a719e47126c1ffac7ef34bfac74531395e035055a856a9427b9ca179 SHA512 b9c852d73351dc0386609a4db9072467a47fcf768205fbcfdc7798d0acac40de383315a734547acf4b3fc46cc1c21c66fabc0d97583c2fa0ad946ad89551be03
 MISC metadata.xml 501 BLAKE2B da95534590927f7290f78f47e30484e3349c9058048c15522e7346a74d9a2c96141a18897b10b230adf966d3c237217ef1d2dcfe59814ccfffd58ab4c38c1ebf SHA512 8d78245bbd2e14016eb70f1d8f8d6129e6b265084f7da95bd915f01ce5af94f86bd69c33c1514195de70d0f834332d9ca968a18afb59a7016c8cb58681d04d24
diff --git a/dev-python/identify/identify-2.5.1.ebuild b/dev-python/identify/identify-2.5.1.ebuild
deleted file mode 100644
index e32e6d8d482f..000000000000
--- a/dev-python/identify/identify-2.5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.2.ebuild b/dev-python/identify/identify-2.5.2.ebuild
index 8ce2bd5b0e7d..e32e6d8d482f 100644
--- a/dev-python/identify/identify-2.5.2.ebuild
+++ b/dev-python/identify/identify-2.5.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index e8ae97a64475..c957d7876afa 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,6 +1,7 @@
 DIST jsonschema-4.10.0.tar.gz 286110 BLAKE2B b59e425df6a8d747424ff938de6cbd0eceaa16a1b16b795847f86662a5cbc7953f052f7aaac10109a4c75e69e227d29f3dbfdcd50197be0436f6e36ea02df29a SHA512 765ed96fe086feda9604d3079e78f62e35ab883e8826be57112bd8f7c4fedc385c4e2436b5224a171b3a7c0d18b22162ff0973448b339a8f13043532e52eb06d
 DIST jsonschema-4.10.2.tar.gz 285395 BLAKE2B 2e40fc5e8b93922c12110f1983f933a07455d9f5d1388fc2c1ee8f07e042f3840573553f709ab7f373c8f5be0651996ffd203696bd0ec1356e90163dad8f4eb4 SHA512 1328af7b4bc70ce43aec6e27b75c9ebe1c2745eceb3b794aeb41eb430362123f9b40dda26e90e62f23d5733ff4fd21407b05569603ee1e2a4941c2009e1855e7
 DIST jsonschema-4.12.1.tar.gz 287475 BLAKE2B 78f4e6fa120eef9ac3fead84fa28b16a8f4c212c570785f0f6f08fcec1a58c51f7cc756ba9a7272e71e3877e80e5e17e2e4d8fbcf503a20c27232dcb4b918085 SHA512 ae95bf3dccb7365af1814255a5aecc11044c3ee579921e935e7c3f955596fdf8d32bbdd0fa2693ea701792a8a29053cf25ef3ab9b08ffb66a6859059a877888f
+DIST jsonschema-4.13.0.tar.gz 288024 BLAKE2B 1d3a08626c2c24b5a35f69500fdafcb7acdda1f6c4830b0e601776118c760774626c85516e0e4b99e31cfedab6b6e2ac7dde9b1ff57f726b236aa45daff34701 SHA512 11de8bbdd0723f7ebf8dacabcdb9ad59e909ebf096c3864259cbd151281f3306cb1cd2b76a74c84e84cdb8cb5263e62d7e63e2b0f4d55065dc50e7e2c7de29ad
 DIST jsonschema-4.7.2.tar.gz 278495 BLAKE2B 55c25847e210e0bdd3bec672b4b6a4eb1a2e2ec5167c115c34a2d0b2de079a00eaff8d901386b475fc26660887090896e78e3a38c1805f5b767fa1eece740e3b SHA512 c624d7bf317ca20fd8cdd248ec7d7679fde907ab304f1a092fc7a172464f43e41904d3f88df57e1351043b978448f51166a09af3625f00a9ad4d7353033b80af
 DIST jsonschema-4.8.0.tar.gz 279424 BLAKE2B 9e8936bde13841f9edf42ffe214ce8d1aaae8b9be4c3040871f228399a31b4292e8cfbf4bf4261822ca1b88622cb69cdf0d55bd2cc51bf191f6e364e9bfb94f8 SHA512 75a7593eb8b0163ba428f507ed4fd9fa6d51567f284776af96f4d79cb507a69666cc048034bfa3a401f960295779e935562dde4e97cf3f7b3b4571bc28b9dde7
 DIST jsonschema-4.9.0.tar.gz 281100 BLAKE2B 5a1c387fc33735ffd39342f3e62600aea721a51be0995d10aa1726e8e4c3bf93694a7844410c0b245c699880d6642a6903525b3637883f5e662086b53deb0948 SHA512 73fc9958f37802c4558ea6893386810784d2b577c04423b7090fce4cd052e3af078f0b0c46b2b16f96bb49820047f1ec5d96cf6c6cb822fca1d988cf1d70209f
@@ -8,6 +9,7 @@ DIST jsonschema-4.9.1.tar.gz 281177 BLAKE2B 210308d140b39f5a5506a3561b8eaa211fbc
 EBUILD jsonschema-4.10.0.ebuild 1581 BLAKE2B 5367c715bb5a95a1fe41b14db8feecf81bc090716cbdf60dc11f348aaf929cf1d8d3716c256b98342071c6883d9bbb9792dcb0df8437e8bfdcf7c46172b1df41 SHA512 824306432bf9ce72ec55dc736092d440c074395b01f5e975beb5aaea6dd19b64ff49ea05cffd6cd0a385fe1062c2f52a928215c38dd1c1b09a9d11486f0a3d8e
 EBUILD jsonschema-4.10.2.ebuild 1581 BLAKE2B 5367c715bb5a95a1fe41b14db8feecf81bc090716cbdf60dc11f348aaf929cf1d8d3716c256b98342071c6883d9bbb9792dcb0df8437e8bfdcf7c46172b1df41 SHA512 824306432bf9ce72ec55dc736092d440c074395b01f5e975beb5aaea6dd19b64ff49ea05cffd6cd0a385fe1062c2f52a928215c38dd1c1b09a9d11486f0a3d8e
 EBUILD jsonschema-4.12.1.ebuild 1597 BLAKE2B 8c683db7166917b40283069726e3fbeee0bd7377cdbc653f9fa78c54d11e1fc38423da5c2da0f56cc6851029a14d756f8b44b6adde5657e6494d58a22d306b00 SHA512 7c261b89468f12bc7e5f8c3ce38ed437d5fb7c1fc0847b26ccd65764c0244a0c43c58c6e9c9fb49703c7858bbf22c28bd66c8699adf3fe2e4249eb08200b335c
+EBUILD jsonschema-4.13.0.ebuild 1597 BLAKE2B 8c683db7166917b40283069726e3fbeee0bd7377cdbc653f9fa78c54d11e1fc38423da5c2da0f56cc6851029a14d756f8b44b6adde5657e6494d58a22d306b00 SHA512 7c261b89468f12bc7e5f8c3ce38ed437d5fb7c1fc0847b26ccd65764c0244a0c43c58c6e9c9fb49703c7858bbf22c28bd66c8699adf3fe2e4249eb08200b335c
 EBUILD jsonschema-4.7.2.ebuild 1470 BLAKE2B 83d64bd08bf75a1a8a37dc993658b3f235a6a83ec0c35b5ab25ac165cafc4a8e5d70855fdecef07b40d788ca699d9a01514a2e1a3050d7d457ea71c2527fdcb0 SHA512 16dfb19e0f76c4895172f529ed19c1e467fc7101543c913f467832c2cd45fbd23f7e8e59a07301b07381c3e8e86f68b0930555dde52973af3622e7b3e65862cf
 EBUILD jsonschema-4.8.0.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
 EBUILD jsonschema-4.9.0.ebuild 1504 BLAKE2B aa9b279331f3b6a70a45689ae877831c2fc4adf91faa5322fb67807bd2bb2181f74ce0de649da5e7df813934409b5d9b0ead05af3c4eba4d7f52cf98b295dfd8 SHA512 e13292a358daf85b43d82abe65a0123ac4971dcaaf50f70cde560a62e93d2227ec6064f97088a2c112cacb8ad18a3b636c000b54897e4e1ab3de0ab475362f60
diff --git a/dev-python/jsonschema/jsonschema-4.13.0.ebuild b/dev-python/jsonschema/jsonschema-4.13.0.ebuild
new file mode 100644
index 000000000000..3286ab0bba04
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.13.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema/
+	https://github.com/python-jsonschema/jsonschema/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390"
+
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+		dev-python/pkgutil_resolve_name[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+"
+
+# formatter deps
+RDEPEND+="
+	dev-python/fqdn[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/isoduration[${PYTHON_USEDEP}]
+	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3987[${PYTHON_USEDEP}]
+	dev-python/uri_template[${PYTHON_USEDEP}]
+	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires pip, does not make much sense for the users
+	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
+	# wtf?
+	jsonschema/tests/test_deprecations.py::TestDeprecations::test_version
+	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
+)
diff --git a/dev-python/mdx_gh_links/Manifest b/dev-python/mdx_gh_links/Manifest
index 47868674a273..6e23a20f5915 100644
--- a/dev-python/mdx_gh_links/Manifest
+++ b/dev-python/mdx_gh_links/Manifest
@@ -1,5 +1,3 @@
 DIST github-links-0.3.gh.tar.gz 6756 BLAKE2B 6b9f7e86d2ec96a6b1b9fd21f20f1964e5fbf4b3ebb33bcd6dccd2e8b811acff7e39606acbf8f48a602afb21733dbd6375e2d1ef30a2a551547fbf9582b525c6 SHA512 8f738298d8a1512e2757a3a7fed091e3a90d59b20b3d03f1a75e087b30b9f9d4876d46ced04994f98a4454a9bf4ebabc305ebf28b4441eb93e5df87822c35459
-DIST mdx_gh_links-0.2.tar.gz 4961 BLAKE2B 02a391d3a0dde532cecbd4f025a7624a90aea698815ddb797cc4f74e2be80f5b55013b9cb3d358f92dcdb43fa9a160880c881ed3ac2a4f2c306f16dad06e1f3b SHA512 0a6be387e4b3d5f31601a365679733647f9669d61537ef3b630321d61f1d645f633098b92cf2fbd61faeb8469094bd89a5df8a561d15b8908645314ded4dd42a
-EBUILD mdx_gh_links-0.2-r1.ebuild 510 BLAKE2B bfdc30f7d2cec5cffa912f1c8d2b959403192e1964f5c005ee51fdb949eb0573a26aaf5f8c167cd7dfcc29dfda78d941e96a87a1ddecfa61c3128338300ccd1f SHA512 2aaad6dbc060672ada382da070ad8d8bb7a7d7040cce970debd0b61f6f7341830b13bb5c06f0f9bd7fb8546acceb50deaae671dd0be5f5e5b84599d823e9539e
-EBUILD mdx_gh_links-0.3.ebuild 696 BLAKE2B 1cab58f817b054921708e9f2cf840954f5edff7e3447d10510bda847fb0af13de920bd2283b9c26a5cf88a4a49475237e06bcfbc87f1fd5c45627ed2bf27f81e SHA512 57429e7466e899c705398d4f1f875b0b600fd26840f66128debf8022a3003d6811f2840377d829e8b9e2720f873e6bd81d598934fe95a6f1939578ca99ed8d8b
+EBUILD mdx_gh_links-0.3.ebuild 694 BLAKE2B ddfed05827935dfed9d1ac3aa4eda8d1c2aa9b29fa9542e119e59938db7a19c048e0c74c94d48c824d5e488f8997d5b339628b0f49b6620a0fb1bded8155e73e SHA512 8889840fc08184fde8c0b2a489fd13e9600d7543ee30f5e68a5cd600e0aa174a29e6a8419ac993b85228c043e56cde7249a0d2283aeca17bc179e3261c07102c
 MISC metadata.xml 527 BLAKE2B fd0fbd400cbabddd3fb3ad5c22334729a10c7c4ecdec4419a4a5b4c2c6b0e9aa1a247bcc851eb0166bbe949d17b392f09e626c3ca0cd4b526756e6bb13c29b0e SHA512 b23ac9dfaf271b12d96d8f336b21795fb189ba2cbb89d36549f4ad0447f8faf63bfb2d7dad7ea5513d9b417c307cb49d3b8e7714dc24292010a74125b63f82c0
diff --git a/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild b/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
deleted file mode 100644
index b64e20480cfe..000000000000
--- a/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="An extension which adds links to GitHub users, repositories, issues and commits"
-HOMEPAGE="https://github.com/Python-Markdown/github-links"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	dev-python/markdown[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mdx_gh_links/mdx_gh_links-0.3.ebuild b/dev-python/mdx_gh_links/mdx_gh_links-0.3.ebuild
index 91a3a8bef9dd..d65aac5e02c3 100644
--- a/dev-python/mdx_gh_links/mdx_gh_links-0.3.ebuild
+++ b/dev-python/mdx_gh_links/mdx_gh_links-0.3.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 42acc89c699e..2fbad4b33fb4 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-1.3.0.tar.gz 4085674 BLAKE2B e34605c2d1122ff86ed5cfb6134cdda67450e8f32d7628626ff4ac8c36c45b127312ad693efe35237b714adb9efd244f12f90cf8ecacf6009b75786db30ebb1b SHA512 d33d728eaff4e39106c1187cf04f579706ce28af364852c67706ab85f6b9ccdcd26ae84cd4d5ea7572e52fde1d1137eb3e424679dd4c8ef043c9637aac062270
 DIST mkdocs-1.3.1.gh.tar.gz 4088396 BLAKE2B b54d0090318fef205d84c4e914f916f91309bdfe6857cd2592fea24e6fb68baaa2eede6dc768681c85ae37adf794546a6ac82dd34d300f421969991f9a796cae SHA512 6eb041f9d0a628eb3a2e6585fde0959f5ef35501edf2c69db640059d98523e2cfa723bc49aedfac1dea4804dcf3c51791e4a052b77ef97bd85a0f4ace2a4d9ad
-EBUILD mkdocs-1.3.0-r1.ebuild 2288 BLAKE2B 8a7422e0e7ee24f4af1a3a789cbb07c6d69b396d568d803efe932098af4bd74315e5701b1c8347d60fa050362bd580509f3c21d6861c735ca31b87c281de382f SHA512 82903c70c5aba1a350deebde695dbe48a2e8bbd3eeb12cb53ca30508edb412e899e34d07e82b1d38fe898384a009b3a7eb0ee963d5b4b6435b0768c4a082aa2a
-EBUILD mkdocs-1.3.1.ebuild 2336 BLAKE2B 2dff7e1ad7fdb261c848e4b1e58e1f7533a592df711d8613d81f668b75771b82e593430ff9ed0a2e8dfb954a70bfd29923d5074ddcb48b083074f31309806c69 SHA512 9e2b3fa2edd3a0cc6b4e481032b2ed6d72f190c7c97d5b22f957b155a97c548cba3fd9b03465a29098279bc0885e9a8523e48d29a98da30b0633ca11db282081
+EBUILD mkdocs-1.3.1.ebuild 2334 BLAKE2B 58d905956b9c7cd92c64f4c82401cd8c7b93bd0581699c725f67ce7612703fabe6908b73ab0cf156b5ff2dfcfc921e8f9bcada912d6df4e229b6b75823fd05e2 SHA512 8e1503b2fb27c7cf4833b0c2c00fbf3cec0bdab8a990265d91705d81bb202d6eb8377f41e1cef0decafdb4b10d24d0c9b0e494f053f6c01bb7104c1abacc7341
 MISC metadata.xml 405 BLAKE2B de9dd789fea13afc3622c6961674d046806db1025e9d0475c0ff8bfe1c6d91a741b6112ccaafb46cb19b9dac971c50095ac89b13353c7c0e1571961a19a90387 SHA512 7a19785dbacb67aa5679d6e7c9617b52b25f724430fa3471b645e31df04157efc4060dbd4fccbfc37b5709138164d8ec89c2e94cddfd727b3ee4c705ddd38dcf
diff --git a/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild b/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
deleted file mode 100644
index 41fd1b9bcc69..000000000000
--- a/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Project documentation with Markdown"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-IUSE="doc"
-
-BDEPEND="
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
-			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/click-3.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.2[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.10[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
-	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Tests fails if additional themes are installed
-	sed -i -e 's:test_get_themes:_&:' \
-		mkdocs/tests/utils/utils_tests.py || die
-
-	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
-	sed -i -e 's/test_IP_normalization/_&/' \
-		mkdocs/tests/config/config_options_tests.py || die
-
-	# livereload has been dropped in this release, this test is a remnant
-	rm mkdocs/tests/livereload_tests.py || die
-
-	# fix apparent typo in test (importing wrong thing)
-	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
-		mkdocs/tests/theme_tests.py || die
-
-	# Does not work in emerge env
-	sed -i -e 's/test_paths_localized_to_config/_&/' \
-		mkdocs/tests/config/config_options_tests.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-	if use doc; then
-		# cannot just do mkdocs build, because that fails if
-		# the package isn't already installed
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
-
-python_test() {
-	epytest mkdocs/tests/*
-}
diff --git a/dev-python/mkdocs/mkdocs-1.3.1.ebuild b/dev-python/mkdocs/mkdocs-1.3.1.ebuild
index 02a4adfa756e..f983b35fa552 100644
--- a/dev-python/mkdocs/mkdocs-1.3.1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 IUSE="doc"
 
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index c30509c6fb49..0919cbc77b15 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,3 +1,5 @@
 DIST Paste-3.5.1.tar.gz 637755 BLAKE2B fc5f4afc064ced52322f7c2cb20c84d24538bdd3a5dadf7b47f62dd8b64ed62a2925102b785e366bc9b9257835529ae226a4d291bebd40d70bda16be781613c6 SHA512 7ae39691bb6067309a12bf76e2a110913c7be6ddcda6215eaf0228144ff26a1c7b50500729b65e27652dc7a7edf6fe26bd144d261e8754d7af8bac495d4613f9
+DIST Paste-3.5.2.tar.gz 638207 BLAKE2B 98d9f508923836e41657b653b1cd70d3cea13121dee375c6cfaf28e6f82ebcc36ba74658ade927fd6802f09bf9d9ca566d2b9bbf3eed5122aedd35ed0ac9d5ec SHA512 a1920dbd7ebea137ca33f8f8c33aad563329d1eea193d84e6aa7fc57690f706c1969e3ba76bbf21a73c59a0fe0f732daa4db15705914ac359814b4332a01bc75
 EBUILD paste-3.5.1.ebuild 1129 BLAKE2B cc83c624249833832ec65e8eea0b41a1b8e5d9a95647fb55ee7608b4b008f2fe2044c9d8c5ac3bf537e6e6489987b3389f2c50da7aedc39b4c1c8074a9daa442 SHA512 715d5f4702ba53ef80606c8fd2ea4f5dae037b46da95903fcf3349a4615de4feb78ba69f156d65b54455e02d679f014e8907e36be4e073cf6cca1631f8aecd66
+EBUILD paste-3.5.2.ebuild 1137 BLAKE2B ae967d398946834c054145bb949c0716e09de1caa810ec66b58f18798988cdeca2da1841863ad58391e1d91b9c4e4a0af961d7ecf746259d60a76304e5b796d1 SHA512 d2511625b0f3278f964362ed87ee77cfeae7a7a2790e7fbed21dcb059804186b8af80e236e6be891a0494a7d02ec2d7d244961eb3f3eb0b6a9846435400310ec
 MISC metadata.xml 628 BLAKE2B 96690448ed95a0b6794142c3641a2e5baa5618926df08f8b25850f67cbd05fdf8ec165f7b7db421d2b96b156fb1f7ce123388d7d70769e777acde6d15c88b955 SHA512 a33c225ca164a23e44820e92bc94cff49383bf792c91e8d432f9bc0a0de537b0e4b01a1b99097df1d2e8984554b78be5101db556e1c37e00e9b5002d0729e6b9
diff --git a/dev-python/paste/paste-3.5.2.ebuild b/dev-python/paste/paste-3.5.2.ebuild
new file mode 100644
index 000000000000..7b27623d9a37
--- /dev/null
+++ b/dev-python/paste/paste-3.5.2.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+MY_P="Paste-${PV}"
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="
+	https://pythonpaste.readthedocs.io/en/latest/
+	https://github.com/cdent/paste/
+	https://pypi.org/project/Paste/
+"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
+
+RDEPEND="
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-paste
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_proxy.py
+	)
+
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# fails due to cgi deprecation warning
+		tests/test_cgiapp.py::test_form
+	)
+
+	epytest
+}
diff --git a/dev-python/pyupgrade/Manifest b/dev-python/pyupgrade/Manifest
index 4de5f58c22cc..37979e223181 100644
--- a/dev-python/pyupgrade/Manifest
+++ b/dev-python/pyupgrade/Manifest
@@ -1,3 +1,3 @@
 DIST pyupgrade-2.37.3.gh.tar.gz 64041 BLAKE2B 531ac8038c7084a4e46bac15d8da056d04496d979beb1fa98ab0832fab50425f412e3b17de3a52a24264acf489af9a9dde6094dd8a5939877269b38d1997d9ad SHA512 dd7e31c2e586d412902d25f30102dc7d229f76f4735e61ad9c77ad59642c2c2ed65d937cc5c6cde9bd50a1a2dad99d06a97c88fb6b0bd034cbc139685045f738
-EBUILD pyupgrade-2.37.3.ebuild 579 BLAKE2B 23b27bcceeed4c3a8d94bdeb3eb5ad97bed4d02e2c0bfb2b5c0811e72d3d5085eb35fef8adb6cfee14e8528479935898d36612e23ff1e7b13ac41b6d45aec32e SHA512 cba4069b225a210287bd79ade8bf89836a95d85a94c9dc1dffdcbf18f1573eab55f3d4bead5ec90b0c0448e9718f41a7c596b26d4a2d8a34faf3ad8fb449ca1e
-MISC metadata.xml 598 BLAKE2B 0efa6bc0c32378e116c4c1a37458be82add617d76b8b11e41947d26fc6eaa08c7c0069e05f2fc67f7903f580d6915d7b973657ed5bc186ef08533da958cc0070 SHA512 c220e724cf228be4ffad4c5f20d2cd58a084dc0d1483111a4250ddd3798b19b6074a829e8cd75cdc8b82e97b8b7e1cf02c7ba19da133c507953dc5f7166a267a
+EBUILD pyupgrade-2.37.3.ebuild 555 BLAKE2B 46e3ea0d4ddcbee0f27f1754f29eca45cac1cc219f599b5b5eecdf50e924f5ef5fff6425785c046942a1e98185066d6b6b703090dc7b9e917bc6da617751a51a SHA512 79027c18626cca68143da7fa0b88a1f14f5f54cdc5108386a33541eddc49aa891e3483eb354c5c7a94a03c8f36893fde3d55e7b4cf7b54bbbdd5faa28c60037e
+MISC metadata.xml 603 BLAKE2B a9513a08115930ae37b1a3dc5bd2c0649e646bfdad961f10478b9575c597ffad2847b13642e9433ed7ffa41a2ffae0410616e7eb1cc2a00dfdc181f98639419a SHA512 f9da5ac513c1ee7e1411642119344abf4d409bffc2b1cac997bee625add8ceb5982931d9cddeee082d1943f405a70bea617b06b3bbc6f3787ea987b8e43554b1
diff --git a/dev-python/pyupgrade/metadata.xml b/dev-python/pyupgrade/metadata.xml
index f072f4d85273..03057765b9ea 100644
--- a/dev-python/pyupgrade/metadata.xml
+++ b/dev-python/pyupgrade/metadata.xml
@@ -15,7 +15,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">pypi</remote-id>
+		<remote-id type="pypi">pyupgrade</remote-id>
 		<remote-id type="github">asottile/pyupgrade</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild b/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild
index 568af18a9d08..eb59646e97ec 100644
--- a/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild
+++ b/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
-DESCRIPTION="A tool (and pre-commit hook) to automatically upgrade syntax for newer versions of the language."
+DESCRIPTION="Tool + pre-commit hook to automatically upgrade syntax for newer Pythons"
 HOMEPAGE="https://github.com/asottile/pyupgrade"
 SRC_URI="https://github.com/asottile/pyupgrade/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0d39a9351d54..165c344db5b2 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 7253fb591105..ce98f9b3aa82 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,5 +1,5 @@
 AUX idea-community-jdk.patch 379 BLAKE2B ac892a7e52d5c592b193d80a7933529f15e21982feb4c4a4b5c8286c7479a342a0121e5b464922cac68e9b7c8e3f7a4293df42d30e6907365116e736d9c862b6 SHA512 f984855440d2d4b495d8bf1b1c3172c9842c096e8fda148d8b2d1980bc3d03061954db06f73513998e52bc161c35abdcec2b88e3b31b4e36605714cb85a66fa4
 DIST ideaIC-2.1.222.3739.54.tar.gz 683283861 BLAKE2B 00c61adc4518c83197ff5c7fd125824feff2e733359114cb1a39cad6dd9e7102263a4c1a6d0d0f125e47dc86ac4bf4bd45f139718529102b9de33908de86d8b5 SHA512 e87e8b686e9e3bdf2d7f7c93e476a5cbd9460bab61872abc7b8d61139a1580a9f6b0e30e4c302e0adb3b1cd06176bc3bc13fee8ee1fe33f87606756fd8fc677e
 DIST jbr-11_0_13-linux-x64-b1751.21.tar.gz 295860296 BLAKE2B cd6edd69fa34896a388ec929d5f53ebc1f078ceebbed8d4e414a19eb91e004e8f53cbae95c2e3b191c39aa89b307bc8a1854b8a86ca2129eb3997c62705563bf SHA512 7d97e520b67197718951609370e90a1e08ef1daca1433373ff6e34fc9c6f4f005478b142190ef5dab46f14e85440f9daca5c662348bbca5207fc2f8d7892361f
-EBUILD idea-community-2022.2.1.222.3739.54.ebuild 4180 BLAKE2B 97faca10f71afaddeefa02d1447cd164b5a4050f16dc82220b3b05179a6829a166c2928f06df62c8a0dba40091dd6a1d1f7f0eb58ca6cea9e9ae574c144f7a6a SHA512 573f344418f3909a16e702bd5d50dde8c7c8ab6565a8817df613d9355451c4122d70655f735bbef5e8808c3c47f6ad0d881b1c681d39f2a1429d1af796bdc9d4
+EBUILD idea-community-2022.2.1.222.3739.54.ebuild 4179 BLAKE2B 56ce1184c63359012587dc05e2e263b05a49c7d02c560d30a04c676297a0bd31488090b1f34383d559a7ec0af8ca6a3f1762aec54f9d344350400dee5abc0545 SHA512 43100df6dfba2cf18a22341f496839b24c7b09d09741d9c65a6828b747f2a8ce19da044d3fa3ff9477f0fc28d7ac40ecad9a91334665c02a730afd17ad519bcc
 MISC metadata.xml 454 BLAKE2B 297cfd8c543bf216cd45b66b5284f310659422e91f12af3d0bbe2ff689d94c96988d4c125c75a95526135b2c0f54a004ee43e1c1c4dfe4d1d68e86af5f75ab0d SHA512 5ca382bcbc51ea5400cbaeb067bccfcb4a245e208a2769d800cbd80fc7151310f895d410e5828c9a32223ab93345716ba4a2ebce521092631a4b7c0858519ef2
diff --git a/dev-util/idea-community/idea-community-2022.2.1.222.3739.54.ebuild b/dev-util/idea-community/idea-community-2022.2.1.222.3739.54.ebuild
index f80ddd7b3aae..c2c898b77b91 100644
--- a/dev-util/idea-community/idea-community-2022.2.1.222.3739.54.ebuild
+++ b/dev-util/idea-community/idea-community-2022.2.1.222.3739.54.ebuild
@@ -15,7 +15,6 @@ JRE11_BASE="11_0_13"
 JRE11_VER="1751.21"
 IDEA_VER="2.151348410.2082789468.1660859635-1531039212.1660859635"
 
-
 # distinguish settings for official stable releases and EAP-version releases
 if [[ "$(ver_cut 7)"x = "prex" ]]
 then
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 8f0651d1e920..7225a5f71f1f 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 309d44a9e6c5..57e8beb46c07 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Aug 2022 12:39:46 +0000
+Fri, 19 Aug 2022 18:39:44 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c93615da4079..1cc572cd2473 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 523682 BLAKE2B a866720fe3384cb354d689c52dc2eed547ab55e37608dcb637780fcc52106c8f5b1ad8a84b41fe53778860d6ace908fc8c4af0faa17e457054d95d23aee6e6b7 SHA512 8cd7653583d003af73b72c5887e3bbb7c5321dc87e14d08d6283a4c633685378b7922f0cd4552eeb523a7d2aca7c675e2fd4704a62d96cc574355d98d5158f89
-TIMESTAMP 2022-08-19T12:39:49Z
+TIMESTAMP 2022-08-19T18:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL/hJVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL/2PRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCjPRAAp1+k0KQt+5NhMF/ehxfz/EShVmGIQL9miQBfrAsji6B23s1EA3rRusQ0
-PLY1QBcAIaWptiEGskA/cYtWaort2TrY8YSQeB7gDxuE5KTvroSGu3+JiMJlp4QH
-WQOtDPMfV+C2XLT4UUjzuReAd03HsA4gqBEblloU5XMxf/UH2V57VPLo8nDTu7jD
-Vva5vCXMMoRqJkG5UBsMnTvWufN9ywQ7l+GHBN8Jj4Mqb35r/O51T2d7badFzdUB
-imWMX6z5KfB79UaasXcvVY08Xds+2PPSjfawxog0TdTLUypfOu/b9uDqtWVvYD/H
-4PgIajokYnwcfRi3LkuLC/s6zYRM6Jssuruj8Kv1XNnyOcKrzZW5gXvQljtV3WYn
-mgNiv2tiHLF5dkeoxTgXeihaJi9A0K2cr4QdF95dBIeKaeh8SGvgSsz+M4+0pDYf
-TPd0TtDnPgyvKrLLZj45Ej+08PNTEi4KKPY4y5l5iW6EnGct58LUePzapC1GzOPG
-gBj7+Mzx0hcdhgV1CojMwO5re9HfCE3GKJ4//eD2JIzzwJyA7my0ivyZedUu+4Yf
-+GRtk8klqOR1K57yULoB0MQZOKGjHsxZkujHq4NvcEJpmZENAEAJXm6xbqMV8Rej
-K56NkfW8uMOfnFTFGbh9UDzJM6jAPTJLicDSNJT476fcoED1SjA=
-=f4/7
+klCMURAAnNEWtCXQLF2PaBQ1Q1WVyglEKTMPO6u8RmHAUB1RMfuM46NVN17IDg+Q
+qSQ/J5HwHskaU1LmlysO5/flxOcbh0zrgpCMaE34ugyNOWzbiwmpLxnHELmq7Jj7
+KcatKv/E0/MK0K4wC69IQ37l51002v5vRz2kD3ogE63bWivTLhBU1h7IiwusrFf1
+EKAc4ynOqPFYt6PJoZ+IsgJIVv8EMjVmY9i3oviLanRnXMPqbYsYp1N0zsSiPo9s
+cX7jNk2fpmQQbhokc1Dw1W6Y9mwZVGaaCQX7ENZyPqzlkb2Qu2F2qXsWpFfrFJzo
+cfaWEeV8qwA3bUWULlgsONsuUt7UAv6jvsJLYgczr2RCfatdvItau9WzEWCmVPa9
+WQEV3s4TGRwxqol4q6esV6jiFqgr/FEbYTzjdndWGyTv0q8uL7s/5Vnh1NgTHGgR
+1FRKJRgorf/SuWQKMl4NO3hgtzWPAQTlW9qofcSiwYFWTTxK3GXoZACXkuqUhB1H
+8NsznFtO0e//0XjH2rrq+SvHKSPCq1h4o4K7EN1aTMUqQmLxcxkZJI83mCDXzIXb
+EN7zHr14YJHFW14rsIu+3Mov+d/4XSCP/JYV1669bhdaKg+DLe/bT7XW0oyBKxXs
+ve8Qx9J8fQmaYyr8Uad87O4zWicKd2IlmTikWVgR0fO7cYCAkNM=
+=ZpGF
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 309d44a9e6c5..57e8beb46c07 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Aug 2022 12:39:46 +0000
+Fri, 19 Aug 2022 18:39:44 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index fc430c21ad64..7fa756b0daf3 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 78b7cdec797f..da8e8389c819 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/speechd-el-2.11 b/metadata/md5-cache/app-accessibility/speechd-el-2.11
index 0e9ee230241b..2be67d58fae5 100644
--- a/metadata/md5-cache/app-accessibility/speechd-el-2.11
+++ b/metadata/md5-cache/app-accessibility/speechd-el-2.11
@@ -4,10 +4,10 @@ DESCRIPTION=Emacs speech support
 EAPI=8
 HOMEPAGE=https://www.freebsoft.org/speechd-el https://github.com/brailcom/speechd-el
 INHERIT=optfeature readme.gentoo-r1 elisp
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-3+
 RDEPEND=>=app-accessibility/speech-dispatcher-0.7 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/brailcom/speechd-el/archive/speechd-el-2.11.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	optfeature	1a2157392a869265b2afcb63a26c12ac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=a5c04c5daa1c01c22c6d920192552466
+_md5_=7484d026cb103cdb9ad1e2be070ee22c
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index f1e2d93e3c8f..03c772946dc1 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.55 b/metadata/md5-cache/app-admin/awscli-1.25.55
new file mode 100644
index 000000000000..c1b407916f5b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.55
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.27.55[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_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=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.55[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.25.55.tar.gz -> aws-cli-1.25.55.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0fd6a2cdd4f5b854d8449e5fd0580e2b
diff --git a/metadata/md5-cache/app-admin/awscli-bin-2.7.24 b/metadata/md5-cache/app-admin/awscli-bin-2.7.24
new file mode 100644
index 000000000000..27d980836aa1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-bin-2.7.24
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=command line interface for Amazon Web Services
+EAPI=8
+HOMEPAGE=https://aws.amazon.com/cli/ https://github.com/aws/aws-cli/
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception openssl PSF-2 BSD-2 GPL-3+ public-domain
+RDEPEND=!app-admin/awscli sys-libs/glibc
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.7.24.zip ) arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-2.7.24.zip )
+_md5_=e3301d657fb32d0d035502ac4c356635
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index ede067bbd7fa..50757fd11f96 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-28.1-r2 b/metadata/md5-cache/app-editors/emacs-28.1-r2
index d521969cef6e..507e59c189c9 100644
--- a/metadata/md5-cache/app-editors/emacs-28.1-r2
+++ b/metadata/md5-cache/app-editors/emacs-28.1-r2
@@ -7,11 +7,11 @@ HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=28
 SRC_URI=mirror://gnu/emacs/emacs-28.1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.1-patches-1.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=552ccfb18ba61ab723aa4fb706452c02
+_md5_=082cd09c503105b43c2143ff8051fcea
diff --git a/metadata/md5-cache/app-editors/emacs-28.1-r3 b/metadata/md5-cache/app-editors/emacs-28.1-r3
new file mode 100644
index 000000000000..4a6b0b265583
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-28.1-r3
@@ -0,0 +1,17 @@
+BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IDEPEND=app-eselect/eselect-emacs
+INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RESTRICT=test
+SLOT=28
+SRC_URI=mirror://gnu/emacs/emacs-28.1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.1-patches-1.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=5a54709d2ccd782c7c2c4298b8eff59e
diff --git a/metadata/md5-cache/app-editors/emacs-28.1.91 b/metadata/md5-cache/app-editors/emacs-28.1.91-r1
index e67db688dbd6..d35fc06a67eb 100644
--- a/metadata/md5-cache/app-editors/emacs-28.1.91
+++ b/metadata/md5-cache/app-editors/emacs-28.1.91-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=28-vcs
 SRC_URI=https://alpha.gnu.org/gnu/emacs/pretest/emacs-28.1.91.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.1-patches-1.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b54d9288acc97164a7dddd4058a55eb5
+_md5_=c3a1b15f58c427d5ae7b4435718cd134
diff --git a/metadata/md5-cache/app-editors/emacs-28.1.9999 b/metadata/md5-cache/app-editors/emacs-28.1.9999
index 796ffab586c3..daabe43f3cee 100644
--- a/metadata/md5-cache/app-editors/emacs-28.1.9999
+++ b/metadata/md5-cache/app-editors/emacs-28.1.9999
@@ -13,4 +13,4 @@ RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtua
 RESTRICT=test
 SLOT=28-vcs
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1d04ddbbe5f338ca282fc62d210dff3d
+_md5_=cc26da92826175485ccb9911b9b2e1f2
diff --git a/metadata/md5-cache/app-editors/emacs-29.0.9999 b/metadata/md5-cache/app-editors/emacs-29.0.9999
index 03a0dd923227..980dcde589a8 100644
--- a/metadata/md5-cache/app-editors/emacs-29.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-29.0.9999
@@ -13,4 +13,4 @@ RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtua
 RESTRICT=test
 SLOT=29-vcs
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6c2bda1215c044d189e2f335854702c2
+_md5_=7e2bb7d3362a63b693a48aae583c3106
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index e770bb72b0aa..55fbf2f5bc89 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/eldev-1.2 b/metadata/md5-cache/app-emacs/eldev-1.2
new file mode 100644
index 000000000000..6891828a7589
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/eldev-1.2
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24.4:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Emacs Lisp Development Tool
+EAPI=8
+HOMEPAGE=https://github.com/doublep/eldev/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-24.4:*
+SLOT=0
+SRC_URI=https://github.com/doublep/eldev/archive/1.2.tar.gz -> eldev-1.2.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=248b21ab3868a0f8d85d2cea4d8cc553
diff --git a/metadata/md5-cache/app-emacs/spacemacs-theme-0.3 b/metadata/md5-cache/app-emacs/spacemacs-theme-0.3
new file mode 100644
index 000000000000..1a5e725fdb94
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/spacemacs-theme-0.3
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Emacs color theme that started as a theme for Spacemacs
+EAPI=8
+HOMEPAGE=https://github.com/nashamri/spacemacs-theme/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-24:*
+SLOT=0
+SRC_URI=https://github.com/nashamri/spacemacs-theme/archive/0.3.tar.gz -> spacemacs-theme-0.3.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=c465358a5663d77f47ba88efa42197a8
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 6e8184e223b8..bd789bf9b612 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/virt-viewer-11.0 b/metadata/md5-cache/app-emulation/virt-viewer-11.0
index 9397d9a0d373..d4d8f68d8a12 100644
--- a/metadata/md5-cache/app-emulation/virt-viewer-11.0
+++ b/metadata/md5-cache/app-emulation/virt-viewer-11.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://virt-manager.org/
 INHERIT=meson python-any-r1 xdg
 IUSE=+libvirt sasl +spice +vnc vte
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.6 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango libvirt? ( >=app-emulation/libvirt-0.10.0:=[sasl?] app-emulation/libvirt-glib ) spice? ( >=net-misc/spice-gtk-0.35[sasl?,gtk3] ) vte? ( x11-libs/vte:2.91 ) vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )
 REQUIRED_USE=|| ( spice vnc )
 SLOT=0
 SRC_URI=https://virt-manager.org/download/sources/virt-viewer/virt-viewer-11.0.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=384106686d4d323e9e1c906dbed90c9b
+_md5_=7112c0965ca5c09d7e6dc336c6d9fcc1
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index e58c0b4596d9..d2a3bcc51981 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/pandoc-bin-2.19.1 b/metadata/md5-cache/app-text/pandoc-bin-2.19.1
new file mode 100644
index 000000000000..14971ca65003
--- /dev/null
+++ b/metadata/md5-cache/app-text/pandoc-bin-2.19.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Conversion between markup formats (binary package)
+EAPI=8
+HOMEPAGE=https://pandoc.org/
+IUSE=+pandoc-symlink
+KEYWORDS=-* ~amd64
+LICENSE=GPL-2
+RDEPEND=pandoc-symlink? ( !app-text/pandoc )
+SLOT=0
+SRC_URI=amd64? ( https://github.com/jgm/pandoc/releases/download/2.19.1/pandoc-2.19.1-linux-amd64.tar.gz ) arm64? ( https://github.com/jgm/pandoc/releases/download/2.19.1/pandoc-2.19.1-linux-arm64.tar.gz )
+_md5_=8605264e7484ba0ab9e1f80524d628d4
diff --git a/metadata/md5-cache/app-xemacs/Manifest.gz b/metadata/md5-cache/app-xemacs/Manifest.gz
index 5157aeff703d..26d62a3c897e 100644
--- a/metadata/md5-cache/app-xemacs/Manifest.gz
+++ b/metadata/md5-cache/app-xemacs/Manifest.gz
diff --git a/metadata/md5-cache/app-xemacs/debug-1.20 b/metadata/md5-cache/app-xemacs/debug-1.20
deleted file mode 100644
index 10570f4c4249..000000000000
--- a/metadata/md5-cache/app-xemacs/debug-1.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=GUD, gdb, dbx debugging support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/debug-1.20-pkg.tar.gz
-_eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=ef1ac885e0b69448c5aba668929c6055
diff --git a/metadata/md5-cache/app-xemacs/ecb-1.25 b/metadata/md5-cache/app-xemacs/ecb-1.25
deleted file mode 100644
index 3730a3b7e184..000000000000
--- a/metadata/md5-cache/app-xemacs/ecb-1.25
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs source code browser
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/semantic app-xemacs/cedet-common app-xemacs/eieio app-xemacs/fsf-compat app-xemacs/edit-utils app-xemacs/jde app-xemacs/mail-lib app-xemacs/eshell app-xemacs/ediff app-xemacs/xemacs-devel app-xemacs/speedbar app-xemacs/c-support app-xemacs/os-utils app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ecb-1.25-pkg.tar.gz
-_eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=67b69498e0af94da2e3ac9bff1e599db
diff --git a/metadata/md5-cache/app-xemacs/edit-utils-2.58 b/metadata/md5-cache/app-xemacs/edit-utils-2.58
deleted file mode 100644
index dc49b5629d8e..000000000000
--- a/metadata/md5-cache/app-xemacs/edit-utils-2.58
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous editor extensions, you probably need this
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/fsf-compat app-xemacs/dired app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edit-utils-2.58-pkg.tar.gz
-_eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=977892c32eae306855ae8d322af067d0
diff --git a/metadata/md5-cache/app-xemacs/eudc-1.43 b/metadata/md5-cache/app-xemacs/eudc-1.43
deleted file mode 100644
index 9d8bba6dfa7c..000000000000
--- a/metadata/md5-cache/app-xemacs/eudc-1.43
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs Unified Directory Client (LDAP, PH)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/bbdb app-xemacs/mail-lib app-xemacs/gnus app-xemacs/rmail app-xemacs/tm app-xemacs/apel app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eudc-1.43-pkg.tar.gz
-_eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=9359a846c1a93d232012072e7b49e0b6
diff --git a/metadata/md5-cache/app-xemacs/general-docs-1.10 b/metadata/md5-cache/app-xemacs/general-docs-1.10
deleted file mode 100644
index 16c68ce33dad..000000000000
--- a/metadata/md5-cache/app-xemacs/general-docs-1.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=General XEmacs documentation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/general-docs-1.10-pkg.tar.gz
-_eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=9010cc2627b3966102ddf89d264fd9f4
diff --git a/metadata/md5-cache/app-xemacs/gnus-2.04 b/metadata/md5-cache/app-xemacs/gnus-2.04
deleted file mode 100644
index 2a5703ac5e80..000000000000
--- a/metadata/md5-cache/app-xemacs/gnus-2.04
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=The Gnus Newsreader and Mailreader
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/os-utils app-xemacs/dired app-xemacs/mh-e app-xemacs/sieve app-xemacs/ps-print app-xemacs/w3 app-xemacs/pgg app-xemacs/mailcrypt app-xemacs/ecrypto app-xemacs/sasl app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/gnus-2.04-pkg.tar.gz
-_eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=5f4edc53f6d359308619b52d8481c1b3
diff --git a/metadata/md5-cache/app-xemacs/hm-html-menus-1.26 b/metadata/md5-cache/app-xemacs/hm-html-menus-1.26
deleted file mode 100644
index a868511c5967..000000000000
--- a/metadata/md5-cache/app-xemacs/hm-html-menus-1.26
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=HTML editing
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/hm--html-menus-1.26-pkg.tar.gz
-_eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=5841dd4b0425374d1b1080159527c568
diff --git a/metadata/md5-cache/app-xemacs/mail-lib-1.84 b/metadata/md5-cache/app-xemacs/mail-lib-1.84
deleted file mode 100644
index e58c7529b831..000000000000
--- a/metadata/md5-cache/app-xemacs/mail-lib-1.84
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Fundamental lisp files for providing email support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-eterm app-xemacs/xemacs-base app-xemacs/fsf-compat app-xemacs/sh-script app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mail-lib-1.84-pkg.tar.gz
-_eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=067075d26d4045edf7fdebc8e79be481
diff --git a/metadata/md5-cache/app-xemacs/mmm-mode-1.08 b/metadata/md5-cache/app-xemacs/mmm-mode-1.08
deleted file mode 100644
index 05e6555d9f0c..000000000000
--- a/metadata/md5-cache/app-xemacs/mmm-mode-1.08
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Multiple major modes in a single buffer
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/fsf-compat app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mmm-mode-1.08-pkg.tar.gz
-_eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=bd93fb289d05b2ccb24e2b636773ad26
diff --git a/metadata/md5-cache/app-xemacs/prog-modes-2.33 b/metadata/md5-cache/app-xemacs/prog-modes-2.33
deleted file mode 100644
index 485d3e174266..000000000000
--- a/metadata/md5-cache/app-xemacs/prog-modes-2.33
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Support for various programming languages
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-devel app-xemacs/xemacs-base app-xemacs/cc-mode app-xemacs/fsf-compat app-xemacs/edit-utils app-xemacs/ediff app-xemacs/emerge app-xemacs/efs app-xemacs/vc app-xemacs/speedbar app-xemacs/dired app-xemacs/ilisp app-xemacs/sh-script app-xemacs/cedet-common app-xemacs/w3 app-xemacs/gnus app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/prog-modes-2.33-pkg.tar.gz
-_eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=dae4c897bbb9ee34b992e7e9f3a0c5a3
diff --git a/metadata/md5-cache/app-xemacs/w3-1.41 b/metadata/md5-cache/app-xemacs/w3-1.41
deleted file mode 100644
index dff9951874bc..000000000000
--- a/metadata/md5-cache/app-xemacs/w3-1.41
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A Web browser
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/ecrypto app-xemacs/gnus app-xemacs/net-utils app-xemacs/sh-script app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/w3-1.41-pkg.tar.gz
-_eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=3104a132d56466d2763d440aa1b615d0
diff --git a/metadata/md5-cache/app-xemacs/xwem-1.26 b/metadata/md5-cache/app-xemacs/xwem-1.26
deleted file mode 100644
index 504aa19a359c..000000000000
--- a/metadata/md5-cache/app-xemacs/xwem-1.26
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=X Emacs Window Manager
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xlib app-xemacs/strokes app-xemacs/edit-utils app-xemacs/text-modes app-xemacs/time app-xemacs/slider app-xemacs/elib app-xemacs/ilisp app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xwem-1.26-pkg.tar.gz
-_eclasses_=xemacs-packages	cb4ff18a62915c943d86310c8df19d60
-_md5_=24847621a36a9af342e849ef65fb2a08
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 9b5938d33948..e1eaad2503a8 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.5.0 b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.6.0
index 9836f82b44cb..ba1ae0ff9906 100644
--- a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.5.0
+++ b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.6.0
@@ -11,6 +11,6 @@ LICENSE=Apache-2.0
 RDEPEND=net-misc/curl:= dev-libs/thrift:= dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.5.0.tar.gz -> opentelemetry-cpp-1.5.0.tar.gz
+SRC_URI=https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.6.0.tar.gz -> opentelemetry-cpp-1.6.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bc5063919703d41e3d1c7e6aa09dbcd1
+_md5_=f9d43996600667c9bea3c3402298fcc6
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 084cb0283813..352acfa612e7 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.16.0 b/metadata/md5-cache/dev-db/pgbouncer-1.16.0
deleted file mode 100644
index 49e6256047aa..000000000000
--- a/metadata/md5-cache/dev-db/pgbouncer-1.16.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/libevent-2.0:= >=sys-libs/glibc-2.10 acct-user/pgbouncer c-ares? ( >=net-dns/c-ares-1.10 ) ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist(-)] ) systemd? ( sys-apps/systemd ) udns? ( >=net-libs/udns-0.1 )
-DESCRIPTION=Lightweight connection pooler for PostgreSQL
-EAPI=7
-HOMEPAGE=https://www.pgbouncer.org/
-INHERIT=systemd
-IUSE=+c-ares debug doc pam ssl systemd udns
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/libevent-2.0:= >=sys-libs/glibc-2.10 acct-user/pgbouncer c-ares? ( >=net-dns/c-ares-1.10 ) ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist(-)] ) systemd? ( sys-apps/systemd ) udns? ( >=net-libs/udns-0.1 )
-REQUIRED_USE=?? ( c-ares udns )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.pgbouncer.org/downloads/files/1.16.0/pgbouncer-1.16.0.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=259b0384e8fed0bfa40e94da57e043cc
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.15.0-r1 b/metadata/md5-cache/dev-db/pgbouncer-1.17.0
index ef054c84cbbb..312c97e42d8b 100644
--- a/metadata/md5-cache/dev-db/pgbouncer-1.15.0-r1
+++ b/metadata/md5-cache/dev-db/pgbouncer-1.17.0
@@ -6,12 +6,12 @@ EAPI=7
 HOMEPAGE=https://www.pgbouncer.org/
 INHERIT=systemd
 IUSE=+c-ares debug doc pam ssl systemd udns
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-2.0:= >=sys-libs/glibc-2.10 acct-user/pgbouncer c-ares? ( >=net-dns/c-ares-1.10 ) ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist(-)] ) systemd? ( sys-apps/systemd ) udns? ( >=net-libs/udns-0.1 )
 REQUIRED_USE=?? ( c-ares udns )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://www.pgbouncer.org/downloads/files/1.15.0/pgbouncer-1.15.0.tar.gz
+SRC_URI=https://www.pgbouncer.org/downloads/files/1.17.0/pgbouncer-1.17.0.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=92adaf8a3857617b66d5369a746e9f7c
+_md5_=eaabd884e6ffb37d7dc8e3f15a385e43
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index adb9a8ae420e..04deb2097917 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/j2objc-annotations-2.8 b/metadata/md5-cache/dev-java/j2objc-annotations-2.8
index 12019c498f2f..685d4b79bbb7 100644
--- a/metadata/md5-cache/dev-java/j2objc-annotations-2.8
+++ b/metadata/md5-cache/dev-java/j2objc-annotations-2.8
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://developers.google.com/j2objc/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/google/j2objc/archive/2.8.tar.gz -> j2objc-2.8.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=8accd880c287d1fab2830d70ef718367
+_md5_=f9c8f7f050feb6ce0924b131ebee4d5e
diff --git a/metadata/md5-cache/dev-java/javassist-3.29.0-r2 b/metadata/md5-cache/dev-java/javassist-3.29.0-r2
index 03358e38d9bc..5fae9d6459cf 100644
--- a/metadata/md5-cache/dev-java/javassist-3.29.0-r2
+++ b/metadata/md5-cache/dev-java/javassist-3.29.0-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.javassist.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_29_0_ga.tar.gz -> javassist-3.29.0.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=5aaf63a93a8cb04969fcb6da2a39f3fa
+_md5_=16837afb85a69419ccc5df0e7d615658
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.9 b/metadata/md5-cache/dev-java/metainf-services-1.9
index 8abd17933fee..5f8371a5509b 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.9
+++ b/metadata/md5-cache/dev-java/metainf-services-1.9
@@ -4,10 +4,10 @@ DESCRIPTION=Generates META-INF/services files automatically
 EAPI=8
 HOMEPAGE=https://metainf-services.kohsuke.org/
 INHERIT=java-pkg-2 java-pkg-simple
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.9.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=a5b94efff61162bcc2d739ca1ebbc990
+_md5_=a863b6624348b4e4434b9b84a7a7c4cf
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index fe9128041ede..101f3bcba6e7 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/libcpuid-0.5.1 b/metadata/md5-cache/dev-libs/libcpuid-0.5.1
new file mode 100644
index 000000000000..5571a5c76ec3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcpuid-0.5.1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup
+DEPEND=test? ( || ( >=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 ) )
+DESCRIPTION=A small C library for x86 (and x86_64) CPU detection and feature extraction
+EAPI=8
+HOMEPAGE=http://libcpuid.sourceforge.net/
+INHERIT=autotools python-any-r1
+IUSE=static-libs test
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RESTRICT=!test? ( test )
+SLOT=0/15
+SRC_URI=https://github.com/anrieff/libcpuid/archive/v0.5.1.tar.gz -> libcpuid-0.5.1.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4d8aae7690179251d28bcaa3edca6e38
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index c3fc5b88707d..fe5a93ca8685 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/ppx_import-1.9.1 b/metadata/md5-cache/dev-ml/ppx_import-1.9.1
index 22a1c63fac00..491ab55bf3c5 100644
--- a/metadata/md5-cache/dev-ml/ppx_import-1.9.1
+++ b/metadata/md5-cache/dev-ml/ppx_import-1.9.1
@@ -1,6 +1,6 @@
 BDEPEND=test? ( dev-ml/ounit2 dev-ml/ppx_deriving dev-ml/ppx_sexp_conv ) dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=>=dev-ml/ppxlib-0.24:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=A syntax extension for importing declarations from interface files
 EAPI=8
 HOMEPAGE=https://github.com/ocaml-ppx/ppx_import/
@@ -8,9 +8,9 @@ INHERIT=dune
 IUSE=+ocamlopt test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=>=dev-ml/ppxlib-0.24:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/1.9.1
 SRC_URI=https://github.com/ocaml-ppx/ppx_import/archive/1.9.1.tar.gz -> ppx_import-1.9.1.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=b431200b3faf1898e2f7f7025eeec1ed
+_md5_=64203e3eefe4388f80de040d767e07bc
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 7fa133185611..41eafffc89a5 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/absl-py-1.1.0 b/metadata/md5-cache/dev-python/absl-py-1.1.0
deleted file mode 100644
index 53d2bfc71cae..000000000000
--- a/metadata/md5-cache/dev-python/absl-py-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-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=Abseil Python Common Libraries
-EAPI=8
-HOMEPAGE=https://github.com/abseil/abseil-py/ https://pypi.org/project/absl-py/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[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/abseil/abseil-py/archive/v1.1.0.tar.gz -> abseil-py-1.1.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_=8b9c4b6744f085374664b07bac2c9748
diff --git a/metadata/md5-cache/dev-python/absl-py-1.2.0 b/metadata/md5-cache/dev-python/absl-py-1.2.0
index 06a13aaa54bb..2e5e7f610c06 100644
--- a/metadata/md5-cache/dev-python/absl-py-1.2.0
+++ b/metadata/md5-cache/dev-python/absl-py-1.2.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/abseil/abseil-py/ https://pypi.org/project/absl-py/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=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 )
 SLOT=0
 SRC_URI=https://github.com/abseil/abseil-py/archive/v1.2.0.tar.gz -> abseil-py-1.2.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_=741ef31f04b98d62953fe3bb5ea225f3
+_md5_=7ad2fcedb648117e99dd1a45f014ed57
diff --git a/metadata/md5-cache/dev-python/bitarray-2.5.1 b/metadata/md5-cache/dev-python/bitarray-2.5.1
deleted file mode 100644
index 0d760d4e51c9..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-2.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-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=Efficient arrays of booleans -- C extension
-EAPI=8
-HOMEPAGE=https://github.com/ilanschnell/bitarray/ https://pypi.org/project/bitarray/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-2.5.1.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ff0a89f150701c0276f8d1c6199cacac
diff --git a/metadata/md5-cache/dev-python/bitarray-2.6.0 b/metadata/md5-cache/dev-python/bitarray-2.6.0
index fd32eaf1a160..85cbdea7bbbb 100644
--- a/metadata/md5-cache/dev-python/bitarray-2.6.0
+++ b/metadata/md5-cache/dev-python/bitarray-2.6.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ilanschnell/bitarray/ https://pypi.org/project/bitarray/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-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 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-2.6.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=625c6f2df449f891bcd54f82f90f7837
+_md5_=ff0a89f150701c0276f8d1c6199cacac
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.55 b/metadata/md5-cache/dev-python/boto3-1.24.55
new file mode 100644
index 000000000000..5681e55fdc69
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.55
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.55[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.55[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.24.55.tar.gz -> boto3-1.24.55.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.55 b/metadata/md5-cache/dev-python/botocore-1.27.55
new file mode 100644
index 000000000000..5134563ee650
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.55
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.27.55.tar.gz -> botocore-1.27.55.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b81d1890717c7eec6242fb986ac35277
diff --git a/metadata/md5-cache/dev-python/fonttools-4.34.4 b/metadata/md5-cache/dev-python/fonttools-4.34.4
index f11ab2c882e5..b92b1fe6779f 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.34.4
+++ b/metadata/md5-cache/dev-python/fonttools-4.34.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fonttools/fonttools/
 INHERIT=distutils-r1 virtualx
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-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=BSD
 RDEPEND=>=dev-python/fs-2.4.9[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[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/4.34.4.tar.gz -> fonttools-4.34.4.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=7542399fbda87e5eb335a92c89e89b3d
+_md5_=378c4f67ceb40c5d861b4c305f9aabac
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.53.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.53.0
deleted file mode 100644
index de4fa46a5685..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.53.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/uritemplate-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=Google API Client for Python
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-api-python-client/ https://pypi.org/project/google-api-python-client/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/uritemplate-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/googleapis/google-api-python-client/archive/v2.53.0.tar.gz -> google-api-python-client-2.53.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_=8eb0e11a5228a2a366d15bca47c8214a
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.54.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.54.0
deleted file mode 100644
index 41dd01af364d..000000000000
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.54.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/uritemplate-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=Google API Client for Python
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-api-python-client/ https://pypi.org/project/google-api-python-client/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/uritemplate-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/googleapis/google-api-python-client/archive/v2.54.0.tar.gz -> google-api-python-client-2.54.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_=30baed68af227d8d50e2ff1fad823f5c
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.55.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.55.0
index eff233c0d4e8..c099f5ea2876 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-2.55.0
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.55.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/googleapis/google-api-python-client/ https://pypi.org/project/google-api-python-client/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/uritemplate-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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.55.0.tar.gz -> google-api-python-client-2.55.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_=30baed68af227d8d50e2ff1fad823f5c
+_md5_=8eb0e11a5228a2a366d15bca47c8214a
diff --git a/metadata/md5-cache/dev-python/identify-2.5.1 b/metadata/md5-cache/dev-python/identify-2.5.1
deleted file mode 100644
index d3425204ef4b..000000000000
--- a/metadata/md5-cache/dev-python/identify-2.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ukkonen[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=File identification library for Python
-EAPI=8
-HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-python/ukkonen[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/pre-commit/identify/archive/v2.5.1.tar.gz -> identify-2.5.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_=ba2434f5e594aefab887e7a591b247f8
diff --git a/metadata/md5-cache/dev-python/identify-2.5.2 b/metadata/md5-cache/dev-python/identify-2.5.2
index 172a71e9467c..579a87f14412 100644
--- a/metadata/md5-cache/dev-python/identify-2.5.2
+++ b/metadata/md5-cache/dev-python/identify-2.5.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pre-commit/identify/ https://pypi.org/project/identify/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/ukkonen[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/pre-commit/identify/archive/v2.5.2.tar.gz -> identify-2.5.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_=29defb420bf1f95c1a449e7e67cce4c0
+_md5_=ba2434f5e594aefab887e7a591b247f8
diff --git a/metadata/md5-cache/dev-python/jsonschema-4.13.0 b/metadata/md5-cache/dev-python/jsonschema-4.13.0
new file mode 100644
index 000000000000..514e29992d7b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonschema-4.13.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hatch-fancy-pypi-readme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_resources-1.4.0[python_targets_python3_8(-)?] dev-python/pkgutil_resolve_name[python_targets_python3_8(-)?] ) dev-python/fqdn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isoduration[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpointer-1.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3986-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uri_template[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webcolors-1.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An implementation of JSON-Schema validation for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/jsonschema/ https://github.com/python-jsonschema/jsonschema/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390
+LICENSE=MIT
+RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyrsistent-0.18.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_resources-1.4.0[python_targets_python3_8(-)?] dev-python/pkgutil_resolve_name[python_targets_python3_8(-)?] ) dev-python/fqdn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isoduration[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpointer-1.13[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3986-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/uri_template[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/webcolors-1.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jsonschema/jsonschema-4.13.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=09ad57f772c2aa2b0f687f34493086cd
diff --git a/metadata/md5-cache/dev-python/mdx_gh_links-0.2-r1 b/metadata/md5-cache/dev-python/mdx_gh_links-0.2-r1
deleted file mode 100644
index 288ab06e550d..000000000000
--- a/metadata/md5-cache/dev-python/mdx_gh_links-0.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-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=An extension which adds links to GitHub users, repositories, issues and commits
-EAPI=8
-HOMEPAGE=https://github.com/Python-Markdown/github-links
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/m/mdx_gh_links/mdx_gh_links-0.2.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=002d1d936344b36623b2612b1bfacb19
diff --git a/metadata/md5-cache/dev-python/mdx_gh_links-0.3 b/metadata/md5-cache/dev-python/mdx_gh_links-0.3
index cda18004e58a..29c5c80e164d 100644
--- a/metadata/md5-cache/dev-python/mdx_gh_links-0.3
+++ b/metadata/md5-cache/dev-python/mdx_gh_links-0.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Python-Markdown/github-links/ https://pypi.org/project/mdx-gh-links/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-python/markdown-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=https://github.com/Python-Markdown/github-links/archive/0.3.tar.gz -> github-links-0.3.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d8b81fe439ba4e3b1afc4c8631f67267
+_md5_=d0a3585b68697a43bfcaeec86f67ecab
diff --git a/metadata/md5-cache/dev-python/mkdocs-1.3.0-r1 b/metadata/md5-cache/dev-python/mkdocs-1.3.0-r1
deleted file mode 100644
index 8096bbfefa6a..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-1.3.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/mdx_gh_links[python_targets_python3_11(-)] dev-python/mkdocs-redirects[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/mdx_gh_links[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/mdx_gh_links[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/mdx_gh_links[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/Babel-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ghp-import-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml_env_tag-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mergedeep-1.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Project documentation with Markdown
-EAPI=8
-HOMEPAGE=https://www.mkdocs.org https://github.com/mkdocs/mkdocs
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv x86
-LICENSE=BSD
-RDEPEND=>=dev-python/Babel-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ghp-import-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml_env_tag-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mergedeep-1.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mkdocs/mkdocs/archive/1.3.0.tar.gz -> mkdocs-1.3.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=779416f05e7682287d3e8cec14015a64
diff --git a/metadata/md5-cache/dev-python/mkdocs-1.3.1 b/metadata/md5-cache/dev-python/mkdocs-1.3.1
index 97308a5b5600..b0cb4732a8ae 100644
--- a/metadata/md5-cache/dev-python/mkdocs-1.3.1
+++ b/metadata/md5-cache/dev-python/mkdocs-1.3.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.mkdocs.org https://github.com/mkdocs/mkdocs
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-python/Babel-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ghp-import-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml_env_tag-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mergedeep-1.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mkdocs/mkdocs/archive/1.3.1.tar.gz -> mkdocs-1.3.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_=5587ac740225529c51925c58d44ab134
+_md5_=8a3cae37da61b7ac5e7794e4d5f0858f
diff --git a/metadata/md5-cache/dev-python/paste-3.5.2 b/metadata/md5-cache/dev-python/paste-3.5.2
new file mode 100644
index 000000000000..d2689726ee36
--- /dev/null
+++ b/metadata/md5-cache/dev-python/paste-3.5.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-paste >=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(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) 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=Tools for using a Web Server Gateway Interface stack
+EAPI=8
+HOMEPAGE=https://pythonpaste.readthedocs.io/en/latest/ https://github.com/cdent/paste/ https://pypi.org/project/Paste/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/namespace-paste python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/P/Paste/Paste-3.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_=6cc2ee14f71c28be320da9856cffecee
diff --git a/metadata/md5-cache/dev-python/pyupgrade-2.37.3 b/metadata/md5-cache/dev-python/pyupgrade-2.37.3
index f9282c7a16d5..8c2f8d5121cc 100644
--- a/metadata/md5-cache/dev-python/pyupgrade-2.37.3
+++ b/metadata/md5-cache/dev-python/pyupgrade-2.37.3
@@ -1,6 +1,6 @@
 BDEPEND=test? ( dev-python/tokenize-rt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A tool (and pre-commit hook) to automatically upgrade syntax for newer versions of the language.
+DESCRIPTION=Tool + pre-commit hook to automatically upgrade syntax for newer Pythons
 EAPI=8
 HOMEPAGE=https://github.com/asottile/pyupgrade
 INHERIT=distutils-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asottile/pyupgrade/archive/refs/tags/v2.37.3.tar.gz -> pyupgrade-2.37.3.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=37d4e1334253f4a2172ab0847c56b02e
+_md5_=12844e66cdccf3b6f62b240c43f895f5
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 41f8ce91eda7..61d61f6ef06e 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/idea-community-2022.2.1.222.3739.54 b/metadata/md5-cache/dev-util/idea-community-2022.2.1.222.3739.54
index 4ff7470cabc8..19b084c203d7 100644
--- a/metadata/md5-cache/dev-util/idea-community-2022.2.1.222.3739.54
+++ b/metadata/md5-cache/dev-util/idea-community-2022.2.1.222.3739.54
@@ -12,4 +12,4 @@ RESTRICT=splitdebug
 SLOT=0
 SRC_URI=https://download.jetbrains.com/idea/ideaIC-2022.2.1-no-jbr.tar.gz?_ga=2.151348410.2082789468.1660859635-1531039212.1660859635 -> ideaIC-2.1.222.3739.54.tar.gz amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-11_0_13-linux-x64-b1751.21.tar.gz -> jbr-11_0_13-linux-x64-b1751.21.tar.gz )
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=09bd2b537baa8054e97175275c060451
+_md5_=fdddb7990da6fb6a050dd58e4c6e6922
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 5ddffb406d46..460bcbc96ee4 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/pdns-4.6.3 b/metadata/md5-cache/net-dns/pdns-4.6.3
index 88e7ab18ecd5..92b4f2fead07 100644
--- a/metadata/md5-cache/net-dns/pdns-4.6.3
+++ b/metadata/md5-cache/net-dns/pdns-4.6.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.powerdns.com/
 INHERIT=flag-o-matic lua-single
 IUSE=debug doc geoip ldap lmdb lua-records mydns mysql postgres remote sodium sqlite systemd tools tinydns test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) dev-libs/openssl:= >=dev-libs/boost-1.35:= lmdb? ( >=dev-db/lmdb-0.9.29 ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4:= app-crypt/mit-krb5 ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) elibc_glibc? ( x86? ( >=sys-libs/glibc-2.34 ) ) acct-user/pdns acct-group/pdns
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) mydns? ( mysql )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.6.3.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0237aba15b8ca58e4f3b33f8b2a55694
+_md5_=573441dd3cb674aca1b9b0b8c1c7cecc
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 59edc44ad54b..afa89172f893 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/irssi-1.4.1 b/metadata/md5-cache/net-irc/irssi-1.4.1
index ac590c13b0f3..f4dfadfc9904 100644
--- a/metadata/md5-cache/net-irc/irssi-1.4.1
+++ b/metadata/md5-cache/net-irc/irssi-1.4.1
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/glib-2.6.0 dev-libs/openssl:= sys-libs/ncurses:= otr? ( >=dev
 SLOT=0
 SRC_URI=https://github.com/irssi/irssi/releases/download/1.4.1/irssi-1.4.1.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=682c5dc001eaa5939c74ab3f3ad4b224
+_md5_=52dcdb7114607a0eef210be517501376
diff --git a/metadata/md5-cache/net-irc/irssi-1.4.2 b/metadata/md5-cache/net-irc/irssi-1.4.2
index dd1c55ca77be..f4ffafa85a24 100644
--- a/metadata/md5-cache/net-irc/irssi-1.4.2
+++ b/metadata/md5-cache/net-irc/irssi-1.4.2
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/glib-2.6.0 dev-libs/openssl:= sys-libs/ncurses:= otr? ( >=dev
 SLOT=0
 SRC_URI=https://github.com/irssi/irssi/releases/download/1.4.2/irssi-1.4.2.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=72127a677edbdd39073cbd2ea178dea9
+_md5_=ace17ac99e7fe768366cd87151c2765f
diff --git a/metadata/md5-cache/net-irc/irssi-9999 b/metadata/md5-cache/net-irc/irssi-9999
index 7176d7c96592..b270bcb99e30 100644
--- a/metadata/md5-cache/net-irc/irssi-9999
+++ b/metadata/md5-cache/net-irc/irssi-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.6.0 dev-libs/openssl:= sys-libs/ncurses:= otr? ( >=dev-libs/libgcrypt-1.2.0:= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) selinux? ( sec-policy/selinux-irc )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=36eefe85afac9a80d9eef37e7ea7afbe
+_md5_=12971c58237094a6f1e776857c4d2008
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index ef4cb737ea60..83564c0d51c5 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999 b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
index d1ac1fb65257..99aa8d56d4b1 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
@@ -13,4 +13,4 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_s
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c331ba7a2470c39a9789747a85f85b69
+_md5_=ed395602b576e8ad5891e2255e74bb2e
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index c07ff353eea7..9da382752816 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/z3-4.10.2 b/metadata/md5-cache/sci-mathematics/z3-4.10.2
index e1fded9aadb0..ff2de666b409 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.10.2
+++ b/metadata/md5-cache/sci-mathematics/z3-4.10.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/Z3Prover/z3/
 INHERIT=cmake-multilib java-pkg-opt-2 python-single-r1
 IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 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 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/4.10
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.10.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	877c17770372bcf902ac9f0525cfb7f3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=36fe653cc35c3a78ddd157d1b5f42b96
+_md5_=e30f14d021fb7808317e2882d775b394
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 9bb247ee110c..6fca207ec4ed 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/cpu-x-4.3.1 b/metadata/md5-cache/sys-apps/cpu-x-4.3.1
new file mode 100644
index 000000000000..24a07b5374a2
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/cpu-x-4.3.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/nasm nls? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=test? ( sys-apps/mawk sys-apps/nawk ) dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango force-libstatgrab? ( sys-libs/libstatgrab ) !force-libstatgrab? ( sys-process/procps:= ) gui? ( >=x11-libs/gtk+-3.12:3 ) cpu? ( >=dev-libs/libcpuid-0.3.0:= ) gpu? ( >=media-libs/glfw-3.3 media-libs/libglvnd ) pci? ( sys-apps/pciutils ) ncurses? ( sys-libs/ncurses:=[tinfo] ) opencl? ( virtual/opencl )
+DESCRIPTION=A Free software that gathers information on CPU, motherboard and more
+EAPI=8
+HOMEPAGE=https://x0rg.github.io/CPU-X/
+INHERIT=cmake gnome2-utils xdg
+IUSE=+cpu force-libstatgrab +gpu +gui +ncurses +nls opencl +pci test
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango force-libstatgrab? ( sys-libs/libstatgrab ) !force-libstatgrab? ( sys-process/procps:= ) gui? ( >=x11-libs/gtk+-3.12:3 ) cpu? ( >=dev-libs/libcpuid-0.3.0:= ) gpu? ( >=media-libs/glfw-3.3 media-libs/libglvnd ) pci? ( sys-apps/pciutils ) ncurses? ( sys-libs/ncurses:=[tinfo] ) opencl? ( virtual/opencl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/X0rg/CPU-X/archive/v4.3.1.tar.gz -> cpu-x-4.3.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a5cb1902f604b344551db70c8bdc16e0
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 7ab3f13975ea..7ea764b6ecfb 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/gcc-10.4.0 b/metadata/md5-cache/sys-devel/gcc-10.4.0
index b2fcf1af87f6..917800514ab8 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.4.0/gcc-10.4.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	ad6e469016886d2517e3b0657a242b97	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=43c41e67316bf58e79a60c2672964204
+_md5_=8ded4476848050d6717b77434f27d59c
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.0 b/metadata/md5-cache/sys-devel/gcc-11.3.0
index 952735698c62..48b5357e0b91 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.3.0
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-musl-patches-1.tar.bz2
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	ad6e469016886d2517e3b0657a242b97	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f8b099c70e03ed961c5412b82b92e2ea
+_md5_=e92e3f0ab39afae6388eafd0ab361ea7
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.0 b/metadata/md5-cache/sys-devel/gcc-12.2.0
new file mode 100644
index 000000000000..2391acaaee97
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.0
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=12
+SRC_URI=mirror://gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-patches-9.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-musl-patches-6.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	ad6e469016886d2517e3b0657a242b97	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e42bd29dec19de950ae8689a947f0702
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.9999 b/metadata/md5-cache/sys-devel/gcc-12.3.9999
index 8e3a215f3019..8e3a215f3019 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.2.9999
+++ b/metadata/md5-cache/sys-devel/gcc-12.3.9999
diff --git a/metadata/md5-cache/sys-devel/mold-1.4.1 b/metadata/md5-cache/sys-devel/mold-1.4.1
new file mode 100644
index 000000000000..88aa91450492
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/mold-1.4.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=sys-libs/zlib system-tbb? ( >=dev-cpp/tbb-2021.4.0:= ) !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
+DESCRIPTION=A Modern Linker
+EAPI=8
+HOMEPAGE=https://github.com/rui314/mold
+INHERIT=cmake toolchain-funcs
+IUSE=system-tbb
+KEYWORDS=~amd64 ~riscv
+LICENSE=AGPL-3 Apache-2.0 BSD-2
+RDEPEND=sys-libs/zlib system-tbb? ( >=dev-cpp/tbb-2021.4.0:= ) !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
+SLOT=0
+SRC_URI=https://github.com/rui314/mold/archive/refs/tags/v1.4.1.tar.gz -> mold-1.4.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3dbc75153527a36ac926615d4325aa2d
diff --git a/metadata/md5-cache/sys-devel/mold-9999 b/metadata/md5-cache/sys-devel/mold-9999
index 965c03e6c164..4b4ac80741c2 100644
--- a/metadata/md5-cache/sys-devel/mold-9999
+++ b/metadata/md5-cache/sys-devel/mold-9999
@@ -1,13 +1,14 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install prepare pretend test unpack
-DEPEND=>=dev-cpp/tbb-2021.4.0:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare pretend test unpack
+DEPEND=sys-libs/zlib system-tbb? ( >=dev-cpp/tbb-2021.4.0:= ) !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
 DESCRIPTION=A Modern Linker
 EAPI=8
 HOMEPAGE=https://github.com/rui314/mold
-INHERIT=toolchain-funcs git-r3
-LICENSE=AGPL-3
+INHERIT=cmake toolchain-funcs git-r3
+IUSE=system-tbb
+LICENSE=AGPL-3 Apache-2.0 BSD-2
 PROPERTIES=live
-RDEPEND=>=dev-cpp/tbb-2021.4.0:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
+RDEPEND=sys-libs/zlib system-tbb? ( >=dev-cpp/tbb-2021.4.0:= ) !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=cbe3b26e2672c8a662bd9ecebada9421
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2fe055942ebbe308864c64038421bf2b
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 14c59e24ad31..380042316781 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.2-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.2-r1
new file mode 100644
index 000000000000..77ebfd463786
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.19 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.19.2-r1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-4.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-4.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-4.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-4.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-4.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-4.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-4.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-4.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=699cea6703591f1e867ac40be2074f35
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index df21eff46341..23be49c9a57a 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-19T12:39:49Z
+TIMESTAMP 2022-08-19T18:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL/hJVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL/2PRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDSXA//bMx3T+z6OxTrshbIfrm7656sHp4exHMFH1/N4uQqsOdfxQaTI2SF1GT+
-5kB/rFFjr68UQ4B6qz7G50v829wbKJkcZHclYYLB7Jj9uHFwdN+p+o2FGtLfdbOD
-6rN1nDOPXcCsIa/b4ZIWRs4sN0JhHa9VMRpBndxQA6Ppr9G9ubLMNX2g358+PGMO
-KLAUlUNDSgvjRxGx9lF9+FAfI6d9m5ah72G8kxrBrz7UJEzrRzX+rCHbmdWNRhLi
-g+orxhOQ/h2+3KoBypm4j8w4ZRICQW5Z/pO/Bps2C4QbWR6UUyKkYtv/H3vHlaJ0
-5KgrJqL25eXAnY1oDzglfg3LTOrsPPDDANW8CAsfai77f4X4amQE1mv3SCggmJ28
-bFNX0zqDKPMQcb3zJFU7uitPNOi+upmFt52lSUrxcSOqz8v5eOllWv5E06G7wqnO
-IWWCVPXbBt5KIvR5rwGM3d2rUWkNjN16gupE/NFTDyV5Oqdo/s2F/2CBH3nbdNld
-loxRLozOEx0TNtp5EUQi7w03FMJn1eyomBRYxM6veaVlkMN5T3C82+Yzw7qr+0R0
-TtT2XznDVh/TwC4JAxLDfAbe3aWGpH3CkXtnZMpN9q1MGHwyEvObouxtOup3AG/J
-6kCoy66RA17uL/woXRM+Ugnr1F8dDNkGlQ2HdosaCgzy6Y6sV2g=
-=l7ff
+klCubA//UZMKbeV0Ro2l8hplP0GxMxhG4Kk/BR1rv1dFPhUtQyyX5RONXVndiFSh
+nIJRe2y0F97UET9aN7AeP3sIkpIIamDsJRmngjzWMF1HrDd1F+FLA92SvFtagdr7
+QMRBBYXTwGp30aJHZSzfBDfwnDaFulkdDPsJ7sXfKyb0eZZNYTQ0121i1jq5mzqE
+UVRjy5y8Qk14HHNIRYClC49cwEn6PsoKU5MRZz+vgDNNNMp84dcYoGSycqtCD7vA
+sjbeI0vTcbzvJq8zeql2Vnq4cvBygB250Ldglswp4vUkLBynW/U0NpJxwVJDq+7y
+BCc08esodMOnSEM/a6ONMabg2+qW8XEYYagca+ja9f7cG6Z9GKbnFDkKXJ9aWTT/
+hh8JKDX6G59FEXL7/LrncDsMTIKugw4vKgmatZGBKWB0TgOvjG+N6YBmfpofDf/M
+BWOXn0ujuZOhBdjwIVAlyNW0LWdgbB3GxjveVti/8X5bYMufdqylPSvSEKfqd98V
+Iz74+Gt7uRKEGlr5QyngPfHY94eYQsdQGioeZOmzkATexQFCIaP67ZJEuSQ5vkt6
+FjsfU6ZTiHTpH+8lxyPC4Bog1WXVMZHyWsYupXhIA3SQuqbNwB3sYjWPu9BD1owA
+gnW+GpanJLznO0xU9hO9DPnR8w1FTisPtmjdXFRsYxpUT9CwW5Q=
+=zXNQ
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 309d44a9e6c5..57e8beb46c07 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Aug 2022 12:39:46 +0000
+Fri, 19 Aug 2022 18:39:44 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c2d20e62d7e5..5dbbab4a4b08 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Aug 19 12:39:46 PM UTC 2022
+Fri Aug 19 06:39:44 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4b9eacba6bed..74f085cc3313 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Aug 2022 12:45:01 +0000
+Fri, 19 Aug 2022 18:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ce128f6d423a..224435a8fa8a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ce952d0b8e0c5ff4df4e939f51ca85d1daf1649d 1660910244 2022-08-19T11:57:24+00:00
+0df47e74c92b5858ea15a80a77796f1b8378d2d9 1660933882 2022-08-19T18:31:22+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index aa0634b43b65..3a132ad66992 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1660912801 Fri 19 Aug 2022 12:40:01 PM UTC
+1660934401 Fri 19 Aug 2022 06:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 309d44a9e6c5..57e8beb46c07 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 19 Aug 2022 12:39:46 +0000
+Fri, 19 Aug 2022 18:39:44 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 5687963119d6..5df0b1df7f43 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index e18ce838f274..126b856276f6 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -3,5 +3,5 @@ AUX pdns-r1 2815 BLAKE2B cd607cb30a94540eca9cfa2defb7c996f6e151875fcaad8ad335726
 DIST pdns-4.6.2.tar.bz2 1302527 BLAKE2B ff4e7f5ab0d0cd176e6c714d5bdf0b231ee05f092c91b19309b62b4d638d2fd1149e426ae98e153b1f64aca1f972f69c3475ee672936b85cc810f305ce899f90 SHA512 10e7f4338f99f063ca8d694c148d468e66dd1b9feb2cf8dba04861396addb138b9335908d666e7e2701424d1fdb3c29e40b596098f19b1443643b9e6ab356c0a
 DIST pdns-4.6.3.tar.bz2 1302651 BLAKE2B 58a66952293bd5caf7b03d114e11f4d6774f5f2aab969b33c1c510b745790f7276b9913cc03e3e4565e5b1de6f61decf338a3b6430d0429c2b87cc9690d9388d SHA512 ea44a0c929e36bf9002d8db7bf1e06ec372a08b31b60c74bbc3ea5600073fb745151f33798a0a4bd151ce17ad7efb07be30f7ddcf620d5bdaab6de4f37f4296f
 EBUILD pdns-4.6.2-r1.ebuild 4490 BLAKE2B 37b6f170b2d5c318ba767846fb86a3d0664dc09bacfbaeac520c3a27d7525a9261a266dcdf8eda4f64743e44043141dd8e988bf043c72fdf8244548892380fbe SHA512 9db486084857a7c94d412721a01946f53d540d461aad5135e196e86971162ef81cb081b1c27b6dc006fd8f739a9bbdb0ebc4008687fe94025e1b9734d42ed882
-EBUILD pdns-4.6.3.ebuild 4492 BLAKE2B 132886602c1452baa51d42101165e7e9b3e44990724f11bbeb51f72d6f794ff034627afcadd0f1cb55594ee543b9d6e5d34024fe64000d70def5e70d35f53a97 SHA512 ff28891dca3cf06a95be03b3f207b7ca4701deac266e209b54aab20b0aec80f250a39786008381dc6542fec5f824db9551408acefd077f4e04ca8dbe152a3f96
+EBUILD pdns-4.6.3.ebuild 4490 BLAKE2B 37b6f170b2d5c318ba767846fb86a3d0664dc09bacfbaeac520c3a27d7525a9261a266dcdf8eda4f64743e44043141dd8e988bf043c72fdf8244548892380fbe SHA512 9db486084857a7c94d412721a01946f53d540d461aad5135e196e86971162ef81cb081b1c27b6dc006fd8f739a9bbdb0ebc4008687fe94025e1b9734d42ed882
 MISC metadata.xml 1080 BLAKE2B 536be9df9d0d9f8ec3f267740ad37da3bcd854ffe12582d9355bf04a75e5620eaf87483d4bed61bee8c20fd1ac2a8a7fa280585f94400472c5b374c84042dc1a SHA512 437aa6d097f9adce27acd8ae5b1a49ed048d58fd49ca9203d6d73df4728448b2d00299ce0d9e98656dca64b1f70f124c811cd435461e65dbeb1ff23fca00ae19
diff --git a/net-dns/pdns/pdns-4.6.3.ebuild b/net-dns/pdns/pdns-4.6.3.ebuild
index a33ae91689aa..4bf6be5ad8f0 100644
--- a/net-dns/pdns/pdns-4.6.3.ebuild
+++ b/net-dns/pdns/pdns-4.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # other possible flags:
 # db2: we lack the dep
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 11abae8e7389..7a86d06a040d 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 648a41b82892..d3b35fe81a17 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,7 +1,7 @@
 AUX irssi-1.4.1-no-werror-decl.patch 486 BLAKE2B 8999e9e015c642cb79007e419882f59f51ff1faccc32b285fb7b179e2f2d2d54632707fe70fc66d03174590635439e21390c98e0455b4df382a48c4e445ca95d SHA512 b74cc0b10d0d4a138f4f6098e967a27b9c1ada5f1b5159129b7885fb9c736f1766e4a6421eae34cfc1232efed705b26b6f40d712a518a149d987f8b29706baed
 DIST irssi-1.4.1.tar.xz 1210772 BLAKE2B b02dfeae1e3ac5d52c5d22f8d2284e0314d9c39628e5389eed2a90d22904754869567750909b65315472068113f1efa8e304696564e2c2517b7a17219cf92dda SHA512 e0c53c456bd92af60e8845dba6d338bc0f880639ba19118c22324a5044101a16f7a387377f2a15aa74364f75fe9ed0d5fac0f353c3ea2158190f76ed89dfdd22
 DIST irssi-1.4.2.tar.xz 1211740 BLAKE2B 916028948640d264707bf4c8405fe63ee2781b0990abc40c4d60c5fd34bebe38de7d35cf6856c69dab39121ba5d72c962b763fda408cb81326392edc8447d3a8 SHA512 428157b85226b5299f55679d9384d3ae8b1e61f50a528bf21ffdf2f4b56014e0a86bdcf9ce05cf4dedd59d53829323bb62029a570f90ebf3243a06c3ce220caf
-EBUILD irssi-1.4.1.ebuild 1622 BLAKE2B a8ea26cced365e4e6b024a25ff01c394f8f2daf1f997583c7c3314e1998f2c4326e662c767ad803ce0e1089b0bc5b75fe0b6a2bcb11187c9e7ccb1ef231bbc08 SHA512 6e54115a71295ea1bd1844d292ec611b189026214fd345c8e77e7cbe813d1f08ebb64e7043e58201c42d3c96f4e0747ce0aeeff66cf6ed15aaaef087577125ac
-EBUILD irssi-1.4.2.ebuild 1562 BLAKE2B c9975ddf162573041c8f3af2613120b15cee3c55225a4a783f129365ab8aef57d09bd032b75a128b3ca54f3cc452d6b6b6f59a63b750114c861ea199ec22c7ef SHA512 95142590e8849229737b9db3e7f34f8696d28cdcc0f0c7667ae5c81412e9447a087638b38ff2fa280b6b060f4fcecb4e58661ca6ddd95584012ee6c26cff18f9
-EBUILD irssi-9999.ebuild 1572 BLAKE2B 68ec2faff2ae5ace3b78f304092d3e0de378f8553ef32e0a4490bb0d4d687c7c6cafdff4a7cf8f9a4a9c4cd7e7b1b389fd5cb319f43159d76d3bf23f806ffcf3 SHA512 1eadd661f4f0f407e5e4e15900ee7a9a1117321c7a441ff30c1f03738de8f89bf492745f136b2a0a5c346b029ea6731ea2caa703d5612c54c74cf27f5d11e4dc
+EBUILD irssi-1.4.1.ebuild 1576 BLAKE2B 9d9095d410aeaf258b8e16e3614e1e1aa72f0b1337baeea61229742de2c0fac806c0a6040be6af95a6b618ea7afefba7a20453714fcc6afcedfd98efe9c1429e SHA512 57a5b65e52e12671af3d49cb4601a8aef3041bd7fcc7b8b48b418c82640306ae66230e7583042be1ecbd4f53f5fcf7ae3a4490ced67054e978fa20decffe749c
+EBUILD irssi-1.4.2.ebuild 1516 BLAKE2B 82984cb2658d9d06c5f353873c7ec33c19140fe1ee3a6ba0bab7cd404704818373590ae038625b6aca0ab22f42c87dc5a3373b1ffb0818fade37b513cb5ce093 SHA512 a57744282f61d2f465ddca7f7e9356408227caca14c74f34fe941e8d3315a172d9fcbf7744cd2e18801ebbc683f92d45c28616be74d4032dd91667ad02728d59
+EBUILD irssi-9999.ebuild 1526 BLAKE2B 0799cb63e399eb5120ed488b19a7e8072b135e0825bf0028844111395a640864b92a3e86487914221a76d085c7d14456d5d3385b20617e5a788e7c8c23da7e2a SHA512 23223f7af4cdf94e97ab927856ca526ebb1564a717bc6cbe0b43c86586054e31af144f052f71bf0c7e2fae0fe1453838278ffaebdb10eea7f5a353745b24c9c7
 MISC metadata.xml 701 BLAKE2B a337d1efcdc3f02d98639cf52c0c878408b1675aa261d708fef301ba34734eb296469662c6df53941829af915579cb9b4730e15b5c157839d4633ed940e5a532 SHA512 b9ee2b27c9d3482c29e4960fac77062cbbb9a593eb8576483b49e31e04b941119a5ce56b679da4377f8e488d188061272c25cb8270d948996faeb7b77e7b2a64
diff --git a/net-irc/irssi/irssi-1.4.1.ebuild b/net-irc/irssi/irssi-1.4.1.ebuild
index cd3cd5bffa2d..02f6a6136342 100644
--- a/net-irc/irssi/irssi-1.4.1.ebuild
+++ b/net-irc/irssi/irssi-1.4.1.ebuild
@@ -69,6 +69,4 @@ src_install() {
 	meson_src_install
 
 	use perl && perl_delete_localpod
-
-	dodoc AUTHORS ChangeLog README.md TODO NEWS
 }
diff --git a/net-irc/irssi/irssi-1.4.2.ebuild b/net-irc/irssi/irssi-1.4.2.ebuild
index dc9a92911dc9..6f9aaf190067 100644
--- a/net-irc/irssi/irssi-1.4.2.ebuild
+++ b/net-irc/irssi/irssi-1.4.2.ebuild
@@ -65,6 +65,4 @@ src_install() {
 	meson_src_install
 
 	use perl && perl_delete_localpod
-
-	dodoc AUTHORS ChangeLog README.md TODO NEWS
 }
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 833dab6c2a40..5f30465fce93 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -67,6 +67,4 @@ src_install() {
 	meson_src_install
 
 	use perl && perl_delete_localpod
-
-	dodoc AUTHORS ChangeLog README.md TODO NEWS
 }
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8aedd79b186f..08488be2b5b9 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 349d75049ba3..c1cdde4e768a 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Matthew Smith <matthew@gentoo.org> (2022-08-19)
+# Upstream recommends that tbb be built with a patch to avoid bugs.
+# https://github.com/rui314/mold/releases/tag/v1.4.1
+sys-devel/mold system-tbb
+
 # John Helmert III <ajak@gentoo.org> (2022-08-14)
 # libaacplus is last rited
 media-sound/darkice aacplus
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index d65d2af88238..4e4658d644c1 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7789,6 +7789,16 @@ sys-apps/coreutils:hostname - Build the hostname program
 sys-apps/coreutils:kill - Build the kill program
 sys-apps/coreutils:multicall - Build all tools into a single `coreutils` program akin to busybox to save space
 sys-apps/coreutils:split-usr - Enable this if /bin and /usr/bin are separate directories
+sys-apps/cpu-x:bandwidth - Intégrer bandwidth
+sys-apps/cpu-x:cpu - Use the dev-libs/libcpuid library for CPU info
+sys-apps/cpu-x:dmidecode - Intégrer dmidecode
+sys-apps/cpu-x:force-libstatgrab - Use sys-libs/libstatgrab to instead of sys-process/procps
+sys-apps/cpu-x:gpu - Use the media-libs/glfw library for GPU info
+sys-apps/cpu-x:libcpuid - Utiliser la bibliothèque dev-libs/libcpuid
+sys-apps/cpu-x:libglfw - Utiliser la bibliothèque media-libs/glfw
+sys-apps/cpu-x:libpci - Utiliser la bibliothèque sys-apps/pciutils
+sys-apps/cpu-x:opencl - Use the virtual/opencl library
+sys-apps/cpu-x:pci - Use the sys-apps/pciutils library for PCI info
 sys-apps/dbus:elogind - Use sys-auth/elogind for session tracking.
 sys-apps/dbus:systemd - Build with sys-apps/systemd at_console support
 sys-apps/dbus-broker:launcher - dbus-daemon compatibility launcher
@@ -8293,6 +8303,7 @@ sys-devel/llvm:ncurses - Support querying terminal properties using ncurses' ter
 sys-devel/llvm:xar - Support dumping LLVM bitcode sections in Mach-O files (uses app-arch/xar)
 sys-devel/llvm:z3 - Enable support for sci-mathematics/z3 constraint solver
 sys-devel/llvm-roc:runtime - Builds the compiler runtime libraries.
+sys-devel/mold:system-tbb - Use dev-cpp/tbb package instead of vendored copy
 sys-devel/parity:vc10_0 - Enable support for Visual Studio 2010
 sys-devel/parity:vc11_0 - Enable support for Visual Studio 2012
 sys-devel/parity:vc12_0 - Enable support for Visual Studio 2013
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 03cde7567749..fc15f4ca2bfc 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 77d02ba279ef..f01b0a449328 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,5 +1,6 @@
 AUX osm2pgsql-1.4.0-cmake_lua_version.patch 344 BLAKE2B 4edd5c655166104086c18cce8a33e8ef46adb94ce381a210f6d0d241af17acbe7cd27b2a4d5c28985faeae472f828f95fe11854c18db787f89f0624b4bf7c36b SHA512 47184a4cd60cd63dc4f2f72263cdc9c84a5f2e2d4b4f9e567fe3249113590f78894ec11ccab52d762611750e8cd331b56cb7ceeec5bd4dcde5c72ea53e20335c
+AUX osm2pgsql-1.7.0-cmake_lua_version.patch 366 BLAKE2B 66515e27d294ef2730481498a31b7b3d2f7980163f75d8470131026a255fb81576f2931214c2c6725be536216ae249ee7b498c133e0fa56d1a0ac16321e22232 SHA512 a98cc6b2c273784b1f6039f8de55a0e2b886e8d908f6e54369d5e1041f03c8113180dc3027efe85a9ed314c642bf6b2574b0f96ad8323e195791ce0d6d50e438
 DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e
 EBUILD osm2pgsql-1.4.0-r100.ebuild 1276 BLAKE2B 62ebe35d5f761d43885bf4409a40e2a4eea93274b70598587fefd3479f12c964d0b9aba08a96deb644d11087bee90d935f23b5e689bef43a8f783bb8f05f4944 SHA512 3dcbd987148d24255f0286d572065d46052c94ae0e917b0fde44e17b059cc6f771fa1867e3f258d56479a1f45fc7a81f4799d6b337b90f0209590b42127d1d7b
-EBUILD osm2pgsql-99999999.ebuild 1260 BLAKE2B 9c819d63461a64fe1c001b794ec68bf21741595f0ab4526a16dc5f950156ff7a91de2dd2930d9cfa549ea05319b096aa5cb6ecfb209b03c72fb9c3e9c4845230 SHA512 a0da16ab7e13805d4ad8a84a3ef4e292baaee6e92eaf6fc8adc413c8871286d77f377e90bb7634da4337c212ad253b99159cf174eb750cd04e792d45ce80cc91
+EBUILD osm2pgsql-99999999.ebuild 1260 BLAKE2B d9ba30cb416e2125d11817ea5b7d0cf316f67632aa75eceee45b93ced9a510b43db53074010dbfffcef55fb51054c9ba01f27f75fee642bff4d5b624356fe7ca SHA512 b5c3038921a9c08d7a984a1a81086f5924eefe9c6f71f5b5638a857f58f1dba686f6d659fd4efbe9f716d11c2af7d51ac7db23c9169f7fad84b8312e9c21c606
 MISC metadata.xml 794 BLAKE2B 4f79008b159c609d7727d64873db8a0912933af66c8c78521e43e59f5e1a6c6072ad1f6819fbd107a6491bd46629f2f9e48d57df6546bd1abb3647737323b493 SHA512 7fb0748e5b053f8e646a9d7883440eddec6cf3a6cc80ea78216f7bd376f17440c667c5a6fbea0649f2fd22e0742de106595fad1730ab64e8a43a4a9510369f41
diff --git a/sci-geosciences/osm2pgsql/files/osm2pgsql-1.7.0-cmake_lua_version.patch b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.7.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..054624d02d62
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.7.0-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -193,7 +193,7 @@
+         add_definitions(-DHAVE_LUAJIT=1)
+     else()
+         message(STATUS "Building with Lua support")
+-        find_package(Lua REQUIRED)
++        find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+         include_directories(SYSTEM ${LUA_INCLUDE_DIR})
+     endif()
+     add_definitions(-DHAVE_LUA=1)
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
index d9f18aee8602..767664197f02 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-cmake_lua_version.patch
+	"${FILESDIR}"/${PN}-1.7.0-cmake_lua_version.patch
 )
 
 src_configure() {
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index eeb737979830..6159a47c45b4 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index cf325d280f55..d499996c9878 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -4,7 +4,7 @@ DIST z3-4.11.0.tar.gz 5392300 BLAKE2B 5b59efdf74d5d358daf23f877a090b240909eab14b
 DIST z3-4.8.17.tar.gz 5232392 BLAKE2B 80dbb5d48811eb6022c0d0117d1e954bae7b27ff984f24cdfbc9158eb548349f817f30ea231d1119aadeedaec63765834bff6f6d21276d0bf61c30212444f224 SHA512 95517014ec1798c2552253dd5cde6f955896ab297a4f56294f4bc6f2c5428069015f513c6eb9a090a809cfcf4cb1cc38cc83818f19b5b1051e4e6c06f973747d
 DIST z3-4.9.1.tar.gz 5358020 BLAKE2B b707084424b615a43dcefbc395d6cf0519f3d6ea3ab1cc8b34b1810d5eb241afa22eae694e4dfc756fff42179a5dabe10052f88aab02953154ada8334f7e0b64 SHA512 0c44e10d039c3bf16591a7b94e3a3209bc334635106ac7ae4afda95541d13d4fc39214646662683c26b4874846e0d83813215e189ce5422d13f8ce7c2ac4db51
 EBUILD z3-4.10.1.ebuild 2597 BLAKE2B eba2a719e5ec43add7ebcb3919ce9c315a0d5a36bb5cfc0bb2d72b65b7f0c51c99d9e2daa980d887526fb5f112b4285ad849c5962ef3ed6fae061ca6fb44293e SHA512 9ea78fee2dd63521e56bed98b565a785da1a27efab83f0e2d16e707d1cef48b6bdd268aa215a87a24958ebd7c4bca1416e302cbb26a8aff5bbe127abdffdea03
-EBUILD z3-4.10.2.ebuild 2595 BLAKE2B 0e1054cb7de62c9a92eeea11c401089d51e0e9dfa98d1101dfc30cfa7d48e81f07df138771b8525190428301d51bbb295ce77f270014706c40ddca263b8b033d SHA512 6bc189c77452eecdfe1fb9a320317ab63ad389eccc07dfe1f75eecc41d3b7ec7493b377d54ad42b10169a7f8908fdda6a48d3cde14f2986a8dce2945b0217392
+EBUILD z3-4.10.2.ebuild 2593 BLAKE2B 80eedc9d3aefea51c06a81bfd18a58005c83385f093fe6cfeafc2a5a5f442e67fff70fa43d2030a07894b6a0d5b272c21052699c6620bea1d240d756f2ce62fe SHA512 74c36a1ad1c41951a0a12e453eabf8da4a5d78d21a988fe94b5544478d2f4545394e5629b8087577d51f7593d7dbf2fb3e601fd01aa912ba2f22432d84991ac3
 EBUILD z3-4.11.0.ebuild 2597 BLAKE2B 08065cfcdf7bf9e38d272c8820e74c2f658f5043463f28bdd5fb726a892fabfd40401c6cbd731f13f14321b0a6ea1b30623918c2c47c4984a3f0e166a0f85910 SHA512 53f817c5131a4a9632720a06efd167dd716ff873f7672d74c5e69aa0e45eaa064c4e1829045dc6143756af447856bb77aa963bc1068490efd3fd8f3406a3f2cf
 EBUILD z3-4.8.17.ebuild 2594 BLAKE2B a9b14f2abe00c69252c4b66621f804c3e29a423bea51324cb03cb618f2f42b8762ebffc44f0cfe0cfa35f2c7f5baa615a07d3d8170a2c5f9a2ef40762ae38e2b SHA512 d548f50364c08cbc14c6c966535882286042c538c3a2119951fbe4ce2c3c9dd1f244d955b0060e28045ea89c7199a7a9617c65d1cace66e146de392f5a4d724d
 EBUILD z3-4.9.1-r1.ebuild 2597 BLAKE2B eba2a719e5ec43add7ebcb3919ce9c315a0d5a36bb5cfc0bb2d72b65b7f0c51c99d9e2daa980d887526fb5f112b4285ad849c5962ef3ed6fae061ca6fb44293e SHA512 9ea78fee2dd63521e56bed98b565a785da1a27efab83f0e2d16e707d1cef48b6bdd268aa215a87a24958ebd7c4bca1416e302cbb26a8aff5bbe127abdffdea03
diff --git a/sci-mathematics/z3/z3-4.10.2.ebuild b/sci-mathematics/z3/z3-4.10.2.ebuild
index d4972d9d9071..16e3a209e6d1 100644
--- a/sci-mathematics/z3/z3-4.10.2.ebuild
+++ b/sci-mathematics/z3/z3-4.10.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/$(ver_cut 1-2)"
 LICENSE="MIT"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c37204a77ce8..9e89773c3c78 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/cpu-x/Manifest b/sys-apps/cpu-x/Manifest
new file mode 100644
index 000000000000..e05f8b1906d5
--- /dev/null
+++ b/sys-apps/cpu-x/Manifest
@@ -0,0 +1,3 @@
+DIST cpu-x-4.3.1.tar.gz 1846968 BLAKE2B bcf13a302ad108f76d3c170993385178e7b44123af6b6f3192960f69d8ee493719a408ef4e95ee82e4cbf3f151fe4dcb91a9fc9d4e53c1170c95a9ed2ad3417b SHA512 43e7bc4b82a15545e4c2f69f598a94706ef2c5f5594ff50763f71722d1b98e6dd56e907a4f35917500debf11522c5908dbebf51f515fe5a51af7282254210bc1
+EBUILD cpu-x-4.3.1.ebuild 1677 BLAKE2B 2883a2b87640bbdafd2f56054a3e5c32154a95471b859abb39c7488be71d0efc5273066b19bc1d56e4b34c28cb07a6a90bd5416f4bd5bc64806c7a3e47990223 SHA512 7f9565d7d6b8a7992f415bbe8d58202cd98b402c270bbb7db4d0d48642c1dd86b5e6b97dc32e8421075b7c6b963ad53d1ab56084dd4602feccaf56f105b51d41
+MISC metadata.xml 2370 BLAKE2B edf7d35e28a2c5b60f8b6d6d7d616146c72fb937f07fe16e8d89f5e0522a4a8dfdbe838dcc1b9e57dea30f267e6e7e51b200a11f60b67ca528eb7851ad1b0a28 SHA512 026acb991c7a80c6ba84fe24b14ec7686ba9d389c94e9f6d2e25ff8c9cb8cd36fe795b571ccb02a0ae1335604d5074bf43373fbaa8388f9e6a446c326385f4a7
diff --git a/sys-apps/cpu-x/cpu-x-4.3.1.ebuild b/sys-apps/cpu-x/cpu-x-4.3.1.ebuild
new file mode 100644
index 000000000000..61d96cc1ce04
--- /dev/null
+++ b/sys-apps/cpu-x/cpu-x-4.3.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="CPU-X"
+
+inherit cmake gnome2-utils xdg
+
+DESCRIPTION="A Free software that gathers information on CPU, motherboard and more"
+HOMEPAGE="https://x0rg.github.io/CPU-X/"
+SRC_URI="https://github.com/X0rg/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+cpu force-libstatgrab +gpu +gui +ncurses +nls opencl +pci test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	force-libstatgrab? ( sys-libs/libstatgrab )
+	!force-libstatgrab? ( sys-process/procps:= )
+	gui? ( >=x11-libs/gtk+-3.12:3 )
+	cpu? ( >=dev-libs/libcpuid-0.3.0:= )
+	gpu? ( >=media-libs/glfw-3.3
+		media-libs/libglvnd )
+	pci? ( sys-apps/pciutils )
+	ncurses? ( sys-libs/ncurses:=[tinfo] )
+	opencl? ( virtual/opencl )
+"
+
+DEPEND="
+	test? (
+		sys-apps/mawk
+		sys-apps/nawk
+	)
+
+	${COMMON_DEPEND}
+"
+
+BDEPEND="
+	dev-lang/nasm
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFORCE_LIBSTATGRAB=$(usex force-libstatgrab)
+		-DGSETTINGS_COMPILE=OFF
+		-DWITH_BANDWIDTH=$(usex bandwidth)
+		-DWITH_DMIDECODE=$(usex dmidecode)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_GTK=$(usex gtk)
+		-DWITH_LIBCPUID=$(usex libcpuid)
+		-DWITH_LIBGLFW=$(usex libglfw)
+		-DWITH_LIBPCI=$(usex libpci)
+		-DWITH_LIBSTATGRAB=OFF
+		-DWITH_NCURSES=$(usex ncurses)
+		-DWITH_OPENCL=$(usex opencl)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/cpu-x/metadata.xml b/sys-apps/cpu-x/metadata.xml
new file mode 100644
index 000000000000..52d661f4aca7
--- /dev/null
+++ b/sys-apps/cpu-x/metadata.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+	<longdescription>
+		<pkg>sys-apps/cpu-x</pkg> is similar to CPU-Z (Windows), but, unlike
+		the latter, it is a Free and Open Source software, written in C and
+		designed for GNU/Linux. It can also be used in graphical mode by using
+		<pkg>x11-libs/gtk+</pkg>, than in text-based mode with the use of
+		<pkg>sys-libs/ncurses</pkg>.
+	</longdescription>
+	<longdescription lang="fr">
+		<pkg>sys-apps/cpu-x</pkg> est similaire à CPU-Z (Windows), mais,
+		contrairement à ce dernier, c'est un logiciel Libre et Open Source,
+		écrit en C et concu pour GNU/Linux. Il peut être aussi bien utilisé en
+		mode graphique en utlisant <pkg>x11-libs/gtk+</pkg>, qu'en mode textuel
+		avec l'utilisation de <pkg>sys-libs/ncurses</pkg>.
+	</longdescription>
+	<use>
+		<flag name="force-libstatgrab">Use <pkg>sys-libs/libstatgrab</pkg> to instead of <pkg>sys-process/procps</pkg></flag>
+		<flag name="cpu">Use the <pkg>dev-libs/libcpuid</pkg> library for CPU info</flag>
+		<flag name="gpu">Use the <pkg>media-libs/glfw</pkg> library for GPU info</flag>
+		<flag name="pci">Use the <pkg>sys-apps/pciutils</pkg> library for PCI info</flag>
+		<flag name="opencl">Use the <pkg>virtual/opencl</pkg> library</flag>
+	</use>
+	<use lang="fr">
+		<flag name="bandwidth">Intégrer bandwidth</flag>
+		<flag name="dmidecode">Intégrer dmidecode</flag>
+		<flag name="force-libstatgrab">Utiliser <pkg>sys-libs/libstatgrab</pkg> à la place de <pkg>sys-process/procps</pkg></flag>
+		<flag name="libcpuid">Utiliser la bibliothèque <pkg>dev-libs/libcpuid</pkg></flag>
+		<flag name="libglfw">Utiliser la bibliothèque <pkg>media-libs/glfw</pkg></flag>
+		<flag name="libpci">Utiliser la bibliothèque <pkg>sys-apps/pciutils</pkg></flag>
+		<flag name="opencl">Utiliser la bibliothèque <pkg>virtual/opencl</pkg></flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<name>X0rg</name>
+		</maintainer>
+		<changelog>https://raw.githubusercontent.com/X0rg/CPU-X/master/ChangeLog</changelog>
+		<doc>https://github.com/X0rg/CPU-X/wiki/</doc>
+		<bugs-to>https://github.com/X0rg/CPU-X/issues/</bugs-to>
+		<remote-id type="github">X0rg/CPU-X</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 839c2db4972c..8a9169799882 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index a8a918c5e74b..898b85c50cf0 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,4 +1,6 @@
+AUX gcc-10.4.0-glibc-2.36.patch 1682 BLAKE2B d9e36e0821d55d98ac6e82594b9aae4fbf6f45a986dbbfa967ad288f83679fe234559bbfb4534d3c45ec26f5759e3b201ffd25264cf2dbe266bd27c53deb8e51 SHA512 19b820e4d7d068beca8ebecc8039b3df2945ad7e37a2097f2aa70a915808980a811140673d468bd23e7ec137362db2538740552e0b8ee4463dd7e131298f62f8
 AUX gcc-11.2.0-cross-compile-include.patch 875 BLAKE2B 92ed84f2b75dd88c73ca115a9faf454ff51a445fb7939ba51ac2b2e7bf6847cacd699cf4a147f056563b0b50b2ac4a0f907cec5bf0b411ec6a8b8b02ec1f410e SHA512 1195825ce57a43ea3826f1f3bcdb4ed17ce849887419960ab79d49e75117586ffcadb0363d6fd845e79417dc6186d6e93100e20c5d24961b5d827cce5ee85635
+AUX gcc-11.3.0-glibc-2.36.patch 1704 BLAKE2B c13ac093909fae3e1176e036b32f740ec8ad4d5efdf433bdaa54b169b9f13c6f6e9fa55ecf356b8f88e6aab4498a1a5937ca9d11db1fcf2e2e638d8b7fe9bc2c SHA512 cee29a2ff199329b92a644a610a69ed028e5dc76975916f652a25a71ef89ddddd0fb1b99c1fb0e424b8ac60e26711b5cf7a1b720249d7681a28550be370b9ae8
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10-20211126.tar.xz 71674848 BLAKE2B 81f4a572e973db7a3701601e66ea58c8e535a55d4d4ac164de00bdb06f7f265585f45d46171cf40d42ebcd3fb02ac81b643398c560912698eb6c008ac6e09518 SHA512 db887184c649ebeede5a1b9f13c00fe425012434cb93ec960c3ca50c0bcdeab04a1cc13b20de21b940e5d6a09c3b1c7fc415110a0e990ec1d938627bf97b9342
@@ -33,6 +35,7 @@ DIST gcc-12.1.0-patches-8.tar.xz 12020 BLAKE2B 6138ef4d76a682ecfd05ba7c80d8f5db7
 DIST gcc-12.1.0-patches-9.tar.xz 12536 BLAKE2B ceb045b2a5c5a2a3047d73296fa1057421ef58c7f793d1f031f43dbd1a6faf49bdf1956e96a4f8e34c4d3fde2c26fcc9b146c223d8b1b3e1f944c2ec8574b786 SHA512 b899ec2d6da65df0f32838be3c89dbb1dc6b423133aa5121635547a1aa18b5d52b920e62522143682c0818baf185ebacb75ab84383ef0ad9768ba567807da5f4
 DIST gcc-12.1.0.tar.xz 82701928 BLAKE2B dca5df8fea680dbeda721742cce5c97de7eb4be490a32a158e06b88e2b9dd092150b7cfe490bb69e48e2f75d8bba231c8a54cd46b48ddcdc01bf9553ab57019d SHA512 2121d295292814a6761edf1fba08c5f633ebe16f52b80e7b73a91050e71e1d2ed98bf17eebad263e191879561c02b48906c53faa4c4670c486a26fc75df23900
 DIST gcc-12.2.0-RC-20220812.tar.xz 84732336 BLAKE2B de38eab480965e44d64ccda40070aadb0e892732b6fd4cd80feb5636aff2b14ee0ca2fb0ed38fb1ba46d83c6173a60069a9335cc0f321451edaac387c832056d SHA512 74d6f7c9cb1070920ae85533b6db986c3a784f74a3f5eac113c483230b78737c33bc6f10a2221ace7f9c8af0e3824390241da73d367dd77e5832205a47a47940
+DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
 DIST gcc-13-20220731.tar.xz 79440792 BLAKE2B c7b6e8113c5c858b0e348ce930ca71c3386b91d62f4a3355df38e899dff26f9e02d44673ad1d57a93a5edb3f8633b9f8fc74b779059b9fdb54ebc0f73c95ef36 SHA512 58e320f19cebe4d7364a64a2ded60ef6fb8f68d6abcd3a3c13b0a23ab016d4f40cd9e0e12f665b713314c34b46a65c263a4f04bfac01a7f476755987365aa4e0
 DIST gcc-13-20220807.tar.xz 79472584 BLAKE2B d23ad0d06414c0e7dfc11473641abb63585c95a07b1da50f3c9d6ae6ba3f365b7bd17297914670468e8b26e4146c8de2dc35c0b96ddc752a07c1dca3a0227dce SHA512 03aed1aa6a73b4aaa5318e456334132576036ee859a26eba3d49826a03da554cec22739cc4fae441f72eb5ea53449e75b73e8f3a41192e09a6e00d4fc227a4ee
 DIST gcc-13.0.0-patches-1.tar.xz 11064 BLAKE2B 82a7ad193dac00475931840bcee82ef7a51718a74af224b03a41f8349e34c2a64a3eb29985b4e2bffde958c58782242eccaedaa54d950e8d51d8bb6f45868e0e SHA512 e04b510f529dd3187a08ae9cb9a894a3d3d30af81f13c43cc082fda7d26c44a3bf19d36ec02024b2ade8b8c193e9730246abeadee603c41b5873c5b785709921
@@ -42,13 +45,13 @@ DIST gcc-9.5.0-patches-1.tar.xz 13772 BLAKE2B 2e2e84a28a729cd271a23716ff3fe08b72
 DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f732c6d3f2b14d9382750b40c4f14b5d3051225b81f936ef8297b0ba8cb5439512e961dae5815d3bee2b0bfdb SHA512 cdd144ce4f747e051480410afc8506c90a57cb45da89071ddae377b1453bca3014422455ade9fe4563ebe51f4b6348cbc0c61905a9b8801cd597d51ad0ec62b3
 EBUILD gcc-10.3.0-r2.ebuild 502 BLAKE2B 2fefeb929c4dd64837a4d27549624bc5c11a10f89ea29e73873f60506a332c220aa70dde76ce29a17ef023fea82ea6a7b3548f14b1a38f22adc028a09bd98d31 SHA512 7cfd3be4e22142ff7abb2a63c0eedfa42994a25753f45e47ad74a6bc266a467b25f072600a3578c12fbaae17110d957161e164623d31f5a3496447187e6e46ff
 EBUILD gcc-10.3.1_p20211126.ebuild 542 BLAKE2B 43170f8b81699ab102c389f42313ab6d448ee8097cbaa940cfd10eec884c3223b1569635169e6285b5810f07bde4d9d40d78003ebf6dbe07e32e60a80469cc97 SHA512 dfc4cd1ab39af930d37ff7d14bee89a92a575624e159223be56d2c695ee384afdc6ea84797d468c3b736992db8befe379c5cee04833772fe259d16d6965d58a1
-EBUILD gcc-10.4.0.ebuild 1446 BLAKE2B 8b28b55283e30c6524f5aed8e73ef7d80cac8a7f7aab3bd93a85b36d0c7f36ff112fdb821855425c08c57b07822024cd7e497d7937abc8cc10cc3c06a11f5ab2 SHA512 f4e100e43056317ea0bfcc50ded0c7a1a0d54b98e9eaee8ea1691de8ca920d3e414d5ae76715609eeccb8c13c25d072244090537868d4b91ea0da072b6b2887b
+EBUILD gcc-10.4.0.ebuild 1491 BLAKE2B 1c4d7ae91891781f44718a85814f88f73939fb3805ab947043049fcabe3531f43f20a23292aa675814f0e8832322eda29624355d97c5b169e48c7dc0d215b0be SHA512 edb504f45460b0ee58a1af6c9ce7b82a36b41aa5ae701b80dcddaa80d545d7a87db259b27eefb8683cd4622e02870a95f67835b51937fa74041898c4b7bbfae3
 EBUILD gcc-10.4.1_p20220804.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
 EBUILD gcc-10.4.1_p20220811.ebuild 1456 BLAKE2B 10e4d926dd4555636a040655834bcae3260fb5177c69cb7242c7dbba29123a1fa8570e31c81996e0e01a409c61bc02a1ce2d3bb836b37d88c915b122209baea8 SHA512 ad64e2e13b4f8f4c96a6670e9f4cd8986e81769fa879be4419347bc4ada6092daa09fcf3bb9c2c177f44d4e4d426dba105e94b50497e7ff30be707d81da906ea
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B af5f165e046455efaaaca747c1deb018b0f43dad720129f72821879fe61790b9d2c233ae9ac0e8d11911b92d390c7a8b082b5dba5a771716f7d9b0aeeb1c6a3b SHA512 905b1f6108ac0608c077e940570829bf9c1e5bde5d852cdbae2b5fddaa304df76dd5bd4499dfb5d26667ced09b3a772567dd850169cec8799731d1cc0abb125c
 EBUILD gcc-11.2.0.ebuild 495 BLAKE2B 122998d820667dbf776aaa7f48a79b3c127f1558f8ec811543e83d3f8534be368749e388254ff14139076baabdcc7ead4be8c5d8f23b3c764ad721cf0478265d SHA512 65a1c11c97d4bde439abad6cd68ee97dd04e8750f4728c3588e923f32eb56b61afa0243570b8c66599e6fe9f6d122113c00c5c1cdf9b7869f01c1564a6c21707
 EBUILD gcc-11.2.1_p20220115.ebuild 688 BLAKE2B c85314316bd63ceae85eaf1ae501932be00c2f5b80092ec4a894aa221e015daceb6687dbf962089b39195ae6470665e7faf09fe9600ae0c74e4d94fcd903e789 SHA512 59d147c88bf9e2a3779320ee89145f01f2acd1110efffc9f967a0c7fee3d910218424b48bf2166c06662a0b1b545b996869f5060ee23da54e8a10f1a0afc3477
-EBUILD gcc-11.3.0.ebuild 687 BLAKE2B 0fb753c50afc9734b65abcb5fff76b029fcf4b2e2a969540a849b4700fe80a95f889fec4e327600e49bb77d1c0297dd02423e41c89f5c8669023463922244cab SHA512 4cf43f6f5ac8b0c386faaad247596bc7b551490c2402b20fc2aadf20ad355fb6a847212d11089c737fac3e230cd4785dc8b03737a2b0e3cd92e91ebef5707ae8
+EBUILD gcc-11.3.0.ebuild 731 BLAKE2B 6118f89eb22e36893ab646baba3c5688911dcea96b5e36f366246dd68b25102c3bf559aee46cb12e4db4af808ed88f277f95a7211bdfa580b0d984d2631cb822 SHA512 f2cee305ea1b6401f7fc446e9b60b1fb659af7f5fb9739b2dfd4a10b66640cc6fa76e6c605b87c51481a9c55f8b9c86bb25d6ed51db6808cabefdc9f8c515e7d
 EBUILD gcc-11.3.1_p20220805.ebuild 1304 BLAKE2B edb9cfd2518e934014e6c6a7966b86a3d4fd83bd1f733a86428ff094e9aa5868e2dbcaf046e2a83483c77afd50ce5d778ee2ab03eb0216f404721242b231251a SHA512 4e4c92e175879fb813c26b910d3d9d8571e6dd96505e99e8f3127799b0f2dad5dba47b32b5a3cee502c9340efb11c417b7559d2118d49a212c5ad5f6e05b8691
 EBUILD gcc-11.3.1_p20220812.ebuild 1304 BLAKE2B edb9cfd2518e934014e6c6a7966b86a3d4fd83bd1f733a86428ff094e9aa5868e2dbcaf046e2a83483c77afd50ce5d778ee2ab03eb0216f404721242b231251a SHA512 4e4c92e175879fb813c26b910d3d9d8571e6dd96505e99e8f3127799b0f2dad5dba47b32b5a3cee502c9340efb11c417b7559d2118d49a212c5ad5f6e05b8691
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
@@ -56,7 +59,8 @@ EBUILD gcc-12.1.0.ebuild 819 BLAKE2B edb479f30802d9ac62555dc535d388f7630572f44d4
 EBUILD gcc-12.1.1_p20220625.ebuild 799 BLAKE2B 82f30877d60dd0c8b9313c46e1b790748e920ea1e05ce6b9e76d33b6d9539f09ed37687265aa752fc496e61890ce5acba7765b16c793708a7564bea6df144d23 SHA512 818bea94f67785be1f2a390afcaf1550167c508cc4546047c4823189ce1b58111314c78cb13c91cdcd18463cfaec2aa882d738bd32367e43840d3c1bffdcbd8f
 EBUILD gcc-12.1.1_p20220806.ebuild 802 BLAKE2B f78bd580d137107e9a6fed22e3e4183c4d5867b0627ec70df7fa96094b44b4ec3a6c4af18f2801cc5f01bd6f1dc9ed6d2241bcc683b9e61b80dd99a7f49f6f60 SHA512 9673c3167e071e94d8cf4953d1fe63cc5af88c55deb69a7b5fc45bc8b6452ec79205637cc24e5dd15520a7f9f6c5a548cdbd4ab86973c06fe0c9a59b1e275ec8
 EBUILD gcc-12.1.1_p20220812.ebuild 1456 BLAKE2B b982de0e09a698616c42c4a4d72356dfc189a72d99b3a41a6fb864bb71383cda2a7099c41c88f0463020ae7cc29339bc5cf8d3e15eb6f6a55e6a74fb2c4ed6e6 SHA512 40cfe8d732b9a62b55e3a2bdec56188f4e70edb72ab981ba3a4ba3ca35862bd92d948ed48201f91e8188e52c87778da8bf334bafff2e00cbccb7c98c2614fdca
-EBUILD gcc-12.2.9999.ebuild 1545 BLAKE2B 86594191729256f3c5541b09461feaf6a5e3afa7ed2f0fa43739ca3225eb6974f996f4702c8eb51ba7e64215a2fce313ef4e010556bf9389aa3543fe34e27d44 SHA512 0f7d29dab9c8b376b2d5abdf5f0a2c889a2fb28bd37f6c897609b9c222215215a18c0a1e858b1688e3a601acb0c8f896b8a89783aafa05eb0f022e42c657a9ed
+EBUILD gcc-12.2.0.ebuild 1434 BLAKE2B f41ce3195499c81a18a96a41028fd2f0f850c1adda9e77ffadea5176729b9b415ab6ed9953d851952fe723a9c64857035dae14a180f791a9455f84f4e1415275 SHA512 96077a54de03bca8bb9065d8708545c9b50998b93e78d8b3c01362c9dabb785174eb642f6154e8564abc42b5f0d2696bc0e1ea7b7684d0bf7034593acffed3eb
+EBUILD gcc-12.3.9999.ebuild 1545 BLAKE2B 86594191729256f3c5541b09461feaf6a5e3afa7ed2f0fa43739ca3225eb6974f996f4702c8eb51ba7e64215a2fce313ef4e010556bf9389aa3543fe34e27d44 SHA512 0f7d29dab9c8b376b2d5abdf5f0a2c889a2fb28bd37f6c897609b9c222215215a18c0a1e858b1688e3a601acb0c8f896b8a89783aafa05eb0f022e42c657a9ed
 EBUILD gcc-13.0.0_pre20220731.ebuild 1282 BLAKE2B 03e7f5b4c1434905797713910db534e33e9ccd97e7b931a3980222412b48d3daeae62f259a6f4445fccb4fcb510f92ef39c30e0c91930ec333f0af544b38ab84 SHA512 6cc09fc3d0736469630089056c8c79ec3a4751311201f832826be7c6782598b8efa110b23c45fd187006a5911eb7c0d132d478ccbd1c5817ebc123d10c807aa3
 EBUILD gcc-13.0.0_pre20220807.ebuild 1288 BLAKE2B a2281da17b96d44850dccf6a6420d66cf163a8f53ea755f1414911fcffd71b504273f3010b6a6c3cb796bf763d8da5b8fa64efb7e107b3e5a8bb1ab767704d05 SHA512 8108432caffabab640a472344adf5660a005436790d31f287f1e72109dd69b5831ea0f3e956a822439862da6a24b78daa7c4253fe51ce9b47457de3b83d80b5d
 EBUILD gcc-13.0.9999.ebuild 1252 BLAKE2B dbc0cdcbb6bae2177185c41fa014a0c98e05a8101f33e12975e2af951e25539117b9279573770b5d17261032b0c51d80864140417a13b152aa34739c28c0f0c3 SHA512 96e940c83f9e58b7b929c5293ca44582c266d3e10615f6aded5cd0b11cb1d46306382fea04227040a7d7cbfdc0f042e3b1c89a0e617193bbfadea50a4732e9a2
diff --git a/sys-devel/gcc/files/gcc-10.4.0-glibc-2.36.patch b/sys-devel/gcc/files/gcc-10.4.0-glibc-2.36.patch
new file mode 100644
index 000000000000..e773071188b7
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-10.4.0-glibc-2.36.patch
@@ -0,0 +1,39 @@
+https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=6bd956e31b2fb6fe1eee4eb1bf309247dcd19b23
+https://bugs.gentoo.org/864717
+
+From 6bd956e31b2fb6fe1eee4eb1bf309247dcd19b23 Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Mon, 11 Jul 2022 22:03:14 +0200
+Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream
+
+9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
+
+(cherry picked from commit 2701442d0cf6292f6624443c15813d6d1a3562fe)
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -72,7 +72,9 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
++#if SANITIZER_ANDROID
+ #include <linux/fs.h>
++#endif
+ #include <linux/hdreg.h>
+ #include <linux/input.h>
+ #include <linux/ioctl.h>
+@@ -822,10 +824,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
+   unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
+ #endif
+-  unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
+-  unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
+-  unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
+-  unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
++  unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
++  unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
++  unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
++  unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
+   unsigned IOCTL_GIO_CMAP = GIO_CMAP;
+   unsigned IOCTL_GIO_FONT = GIO_FONT;
+   unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
+
diff --git a/sys-devel/gcc/files/gcc-11.3.0-glibc-2.36.patch b/sys-devel/gcc/files/gcc-11.3.0-glibc-2.36.patch
new file mode 100644
index 000000000000..7907223248ae
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-11.3.0-glibc-2.36.patch
@@ -0,0 +1,41 @@
+https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d2356ebb0084a0d80dbfe33040c9afe938c15d19
+https://bugs.gentoo.org/864717
+
+Fix build w/ glibc 2.36.
+
+From d2356ebb0084a0d80dbfe33040c9afe938c15d19 Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Mon, 11 Jul 2022 22:03:14 +0200
+Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream
+
+9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
+
+(cherry picked from commit 2701442d0cf6292f6624443c15813d6d1a3562fe)
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -72,7 +72,9 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
++#if SANITIZER_ANDROID
+ #include <linux/fs.h>
++#endif
+ #include <linux/hdreg.h>
+ #include <linux/input.h>
+ #include <linux/ioctl.h>
+@@ -828,10 +830,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
+   unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
+ #endif
+-  unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
+-  unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
+-  unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
+-  unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
++  unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
++  unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
++  unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
++  unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
+   unsigned IOCTL_GIO_CMAP = GIO_CMAP;
+   unsigned IOCTL_GIO_FONT = GIO_FONT;
+   unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
+
diff --git a/sys-devel/gcc/gcc-10.4.0.ebuild b/sys-devel/gcc/gcc-10.4.0.ebuild
index 31a46b613160..311d04b1e636 100644
--- a/sys-devel/gcc/gcc-10.4.0.ebuild
+++ b/sys-devel/gcc/gcc-10.4.0.ebuild
@@ -43,6 +43,8 @@ RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
 
 src_prepare() {
+	eapply "${FILESDIR}"/${P}-glibc-2.36.patch
+
 	local p upstreamed_patches=(
 		# add them here
 	)
diff --git a/sys-devel/gcc/gcc-11.3.0.ebuild b/sys-devel/gcc/gcc-11.3.0.ebuild
index a90a5c1bc452..93499169999c 100644
--- a/sys-devel/gcc/gcc-11.3.0.ebuild
+++ b/sys-devel/gcc/gcc-11.3.0.ebuild
@@ -23,5 +23,6 @@ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
 src_prepare() {
 	toolchain_src_prepare
 
+	eapply "${FILESDIR}"/${P}-glibc-2.36.patch
 	eapply_user
 }
diff --git a/sys-devel/gcc/gcc-12.2.0.ebuild b/sys-devel/gcc/gcc-12.2.0.ebuild
new file mode 100644
index 000000000000..c2a70e93db66
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="9"
+PATCH_GCC_VER="12.1.0"
+MUSL_VER="6"
+MUSL_GCC_VER="12.1.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-12.2.9999.ebuild b/sys-devel/gcc/gcc-12.3.9999.ebuild
index cf4fddcdf19e..cf4fddcdf19e 100644
--- a/sys-devel/gcc/gcc-12.2.9999.ebuild
+++ b/sys-devel/gcc/gcc-12.3.9999.ebuild
diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index a7448ca46c5e..2393d61aa249 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,10 +1,13 @@
 AUX mold-1.2.1-install-nopython.patch 1178 BLAKE2B 62092d363291f640567e334a7d16e90640b5e98a972729340527eb1a10f7febd77b6ae6a71e82c93c4d8c3ea04812893b1a42cd7404b3d6aba6bd35ede308567 SHA512 c22cd13018472ecf84fbd9a192c7072e4d7cd263e9bb19a94b1997014b110790266c7ae62977ce716aedb659a5d40be4bc95e8c0dbb2b8b5cf8e1d799fff4887
 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
+AUX mold-1.4.1-glob-tests.patch 5512 BLAKE2B bade33580bb63e58541dc1bafe4dc0fd0592e752e6f6003e67e210899ac3f4ee31490d40ee00c8af6ffd222744c56f74c677ba9e4aec2f3c2f4a9fc117846287 SHA512 712c878a649c13808509454fd65c10810777f1ca655365aa7fd3cf25e79247b88367ab454e6508e13f3f932ccc71ae25e4459fb6d3d107efcbe30e943e2f4bfa
 DIST mold-1.3.1.tar.gz 4692379 BLAKE2B e34e9416cfc65d2097c4659ddc205a0c4492e50a1c6e4560006757e5c371d27410e38131f353cd0ee60b124e5fe42b0a1c50cdc3a7bed9f666596e608340e4fd SHA512 f576d2fcfee5cb3bade5ba24dcdd3020a16131ce7d4c3a00c3f92b94785ed86f3f040a6f5814b9c975c4c3d90a2b8c36a8101d5fbf1bc0a4be316f4a4a6dcefa
 DIST mold-1.4.0.tar.gz 4722082 BLAKE2B 65ac52724018f5df82ca40b287a5f3b2c3e4b6b313ef2573bfd0ed6d03054d92b9e1e52cbdad1930406cff232c4b952c33a16979968502c439b860bd782726a9 SHA512 7b7c4a7bac6bbc6e22372d93d94a6cb804c7017eba16b90e9bbc42b9608108c724ef55337aabdd9ce2f5244b94c8fd64311e70e18b5f8cf5f68533c2639e550d
+DIST mold-1.4.1.tar.gz 6280266 BLAKE2B 60d0a876e0bcc8f644e4b6fffe0de14299bf2bd6e382869c87761d725dca6efa874cac37aaf94ad85038c5a24521ed3582782be943236ab81c2e4b66e6002f5e SHA512 304caf4e9d9b24170a9442a84036790407bd02609a5d07c31e5f0f6285128099cbc962571804636a5da55afda59b447c12218f9e4d402fbfa55ebc354814bdda
 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
+EBUILD mold-1.4.1.ebuild 2523 BLAKE2B 918cacb29b353bffe93f6b8164608aad604c8677b266c208913578daec2ee2ce95d619611b7601cd37f5db7e16f84d2929cd759f13c9ccec151243802fc40faa SHA512 a5d56159205814b4148faf68a9945d1915386472b2c42c4c2041a0ca3f78146a8ca3649a0a565af5d05d30d9d1fdb76aa6b6db60e2b0bd1a071255d60c6956a3
+EBUILD mold-9999.ebuild 2390 BLAKE2B 4ec131858d22054500485e7b534f571cc313b2ad8f223825508939c74f075e47e278ab5e5b5f01c42d33a1a784a087bbc35439d768004ee0a661174648ad94da SHA512 e85c79d6670bc86f20448e389c7fb60d59fa0e0ef24bb5bc740bde50ba7f9999e70352cbe1017d3b26f0b69a95f679603e2fccf3230c957314d29cd0018af498
+MISC metadata.xml 521 BLAKE2B beb00b6a0cf0b062e5ca97aaf42cc39dfd35459159b9b84c894909dd19ecf5e7bf22aea234de31b9deddbeb26b8b64e0cef306f606a78b279b915c0c20cb4e33 SHA512 ca5c1bd9e7fbb02b79607133e28a00b44e4dbebd815b6a4f4c6e96514c43e744eee4a8485d6aaa5a34438dcc928a9082bfa07c392caf4fe1290a584ec69efa58
diff --git a/sys-devel/mold/files/mold-1.4.1-glob-tests.patch b/sys-devel/mold/files/mold-1.4.1-glob-tests.patch
new file mode 100644
index 000000000000..ad9dda565323
--- /dev/null
+++ b/sys-devel/mold/files/mold-1.4.1-glob-tests.patch
@@ -0,0 +1,296 @@
+From 60070e0c1352a1cc6b02a0d1a30c657368a033c3 Mon Sep 17 00:00:00 2001
+From: Rui Ueyama <ruiu@bluewhale.systems>
+Date: Fri, 19 Aug 2022 20:05:26 +0800
+Subject: [PATCH] Simplify
+
+---
+ test/elf/CMakeLists.txt   | 265 +-------------------------------------
+ test/macho/CMakeLists.txt | 100 +-------------
+ 2 files changed, 6 insertions(+), 359 deletions(-)
+
+diff --git a/test/elf/CMakeLists.txt b/test/elf/CMakeLists.txt
+index 5d15d6cb..138e8205 100644
+--- a/test/elf/CMakeLists.txt
++++ b/test/elf/CMakeLists.txt
+@@ -1,269 +1,12 @@
+-set(MOLD_ELF_TESTS
+-  absolute-symbols
+-  allow-multiple-definition
+-  ar-alignment
+-  arm32-thumb-interwork
+-  as-needed
+-  as-needed-weak
+-  as-needed2
+-  auxiliary
+-  basic
+-  bno-symbolic
+-  bsymbolic
+-  bsymbolic-functions
+-  bug178
+-  build-id
+-  canonical-plt
+-  cmdline
+-  color-diagnostics
+-  comment
+-  common
+-  common-archive
+-  common-ref
+-  compress-debug-sections
+-  compressed-debug-info
+-  compressed-debug-info-gnu
+-  copyrel
+-  copyrel-protected
+-  copyrel-relro
+-  dead-debug-sections
+-  debug-macro-section
+-  default-symver
+-  defsym
+-  defsym2
+-  demangle
+-  demangle-rust
+-  dependency-file
+-  disable-new-dtags
+-  discard
+-  dso-undef
+-  dt-init
+-  dt-needed
+-  duplicate-error
+-  dynamic
+-  dynamic-dt-debug
+-  dynamic-linker
+-  dynamic-list
+-  dynamic-list2
+-  dynamic-list3
+-  emit-relocs
+-  empty-file
+-  empty-input
+-  empty-version
+-  emulation-deduction
+-  entry
+-  exception
+-  exception-mcmodel-large
+-  exclude-libs
+-  exclude-libs2
+-  exclude-libs3
+-  execstack
+-  execstack-if-needed
+-  export-dynamic
+-  export-from-exe
+-  fatal-warnings
+-  filler
+-  filter
+-  func-addr
+-  gc-sections
+-  gdb-index-compress-output
+-  gdb-index-dwarf2
+-  gdb-index-dwarf3
+-  gdb-index-dwarf4
+-  gdb-index-dwarf5
+-  gdb-index-empty
+-  glibc-2.22-bug
+-  gnu-hash
+-  gnu-linkonce
+-  gnu-retain
+-  gnu-unique
+-  gnu-warning
+-  hello-dynamic
+-  hello-static
+-  help
+-  hidden-undef
+-  icf
+-  icf-small
+-  ifunc-dso
+-  ifunc-dynamic
+-  ifunc-export
+-  ifunc-static
+-  ifunc-static-pie
+-  image-base
+-  incompatible-libs
+-  incompatible-libs2
+-  incompatible-obj
+-  init
+-  init-array
+-  init-array-priorities
+-  init-array-readonly
+-  init-in-dso
+-  initfirst
+-  interpose
+-  invalid-version-script
+-  large-alignment
+-  large-alignment-dso
+-  link-order
+-  linker-script
+-  linker-script-defsym
+-  linker-script2
+-  linker-script3
+-  linker-script4
+-  lto-archive
+-  lto-dso
+-  lto-gcc
+-  lto-llvm
+-  lto-version-script
+-  many-sections
+-  mergeable-records
+-  mergeable-strings
+-  missing-but-ok
+-  missing-error
+-  mold-wrapper
+-  mold-wrapper2
+-  no-quick-exit
+-  nocopyreloc
+-  noinhibit-exec
+-  non-canonical-plt
+-  nostdlib
+-  note
+-  note-property
+-  note2
+-  now
+-  oformat-binary
+-  omagic
+-  pack-dyn-relocs-relr
+-  package-metadata
+-  pie
+-  plt
+-  plt-dso
+-  pltgot
+-  preinit-array
+-  print-dependencies
+-  protected
+-  protected-dynsym
+-  push-pop-state
+-  relax
+-  reloc
+-  reloc-overflow
+-  reloc-rodata
+-  reloc-zero
+-  relocatable
+-  relocatable-archive
+-  relro
+-  repro
+-  require-defined
+-  response-file
+-  retain-symbols-file
+-  reverse-sections
+-  rodata-name
+-  rosegment
+-  rpath
+-  run
+-  run-clang
+-  section-alignment
+-  section-name
+-  section-start
+-  shared
+-  shuffle-sections
+-  shuffle-sections-seed
+-  soname
+-  start-lib
+-  start-stop-symbol
+-  static-archive
+-  static-pie
+-  stdout
+-  strip
+-  symbol-rank
+-  symbol-version
+-  symbol-version2
+-  symbol-version3
+-  symtab
+-  symtab-dso
+-  symtab-section-symbols
+-  synthetic-symbols
+-  sysroot
+-  sysroot-linker-script
+-  sysroot2
+-  thin-archive
+-  thread-count
+-  tls-common
+-  tls-dso
+-  tls-gd
+-  tls-gd-mcmodel-large
+-  tls-gd-noplt
+-  tls-gd2
+-  tls-ie
+-  tls-large-tbss
+-  tls-ld
+-  tls-ld-mcmodel-large
+-  tls-ld-noplt
+-  tls-le
+-  tls-module-base
+-  tls-nopic
+-  tls-pic
+-  tlsdesc
+-  tlsdesc-import
+-  tlsdesc-static
+-  trace
+-  trace-symbol
+-  undefined
+-  unique
+-  unresolved-symbols
+-  verbose
+-  version
+-  version-script
+-  version-script10
+-  version-script11
+-  version-script12
+-  version-script13
+-  version-script14
+-  version-script15
+-  version-script16
+-  version-script17
+-  version-script2
+-  version-script3
+-  version-script4
+-  version-script5
+-  version-script6
+-  version-script7
+-  version-script8
+-  version-script9
+-  versioned-undef
+-  visibility
+-  warn-common
+-  warn-execstack
+-  warn-once
+-  warn-shared-textrel
+-  warn-textrel
+-  warn-unresolved-symbols
+-  weak-export-dso
+-  weak-export-exe
+-  weak-undef
+-  whole-archive
+-  wrap
+-  z-cet-report
+-  z-defs
+-  z-ibt
+-  z-ibtplt
+-  z-max-page-size
+-  z-nodefaultlib
+-  z-nodump
+-  z-now
+-  z-origin
+-  z-separate-code
+-  z-shstk
+-  z-text
+-  z-unknown
+-  )
+-
+ option(MOLD_ENABLE_QEMU_TESTS "Enable tests for other targets" OFF)
+ 
++file(GLOB MOLD_ELF_TESTS RELATIVE ${CMAKE_CURRENT_LIST_DIR} "*.sh")
++
+ function(mold_add_arch_test NAME TRIPLE MACHINE)
+   if(NOT ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL ${MACHINE})
+     set(TEST_NAME "${MACHINE}-${NAME}")
+     add_test(NAME ${TEST_NAME}
+-      COMMAND bash -x ${CMAKE_CURRENT_LIST_DIR}/${NAME}.sh
++      COMMAND bash -x ${CMAKE_CURRENT_LIST_DIR}/${NAME}
+       WORKING_DIRECTORY ${mold_BINARY_DIR})
+ 
+     set(TEST_ENV
+@@ -280,7 +23,7 @@ endfunction()
+ 
+ foreach(TEST IN LISTS MOLD_ELF_TESTS)
+   add_test(NAME "${CMAKE_HOST_SYSTEM_PROCESSOR}-${TEST}"
+-    COMMAND bash -x ${CMAKE_CURRENT_LIST_DIR}/${TEST}.sh
++    COMMAND bash -x ${CMAKE_CURRENT_LIST_DIR}/${TEST}
+     WORKING_DIRECTORY ${mold_BINARY_DIR})
+ 
+   if(MOLD_ENABLE_QEMU_TESTS)
diff --git a/sys-devel/mold/metadata.xml b/sys-devel/mold/metadata.xml
index f8a85299d5bb..20ae5863a76b 100644
--- a/sys-devel/mold/metadata.xml
+++ b/sys-devel/mold/metadata.xml
@@ -12,4 +12,7 @@
 	<upstream>
 		<remote-id type="github">rui314/mold</remote-id>
 	</upstream>
+	<use>
+		<flag name="system-tbb">Use dev-cpp/tbb package instead of vendored copy</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-devel/mold/mold-1.4.1.ebuild b/sys-devel/mold/mold-1.4.1.ebuild
new file mode 100644
index 000000000000..1aac8ca1098e
--- /dev/null
+++ b/sys-devel/mold/mold-1.4.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake 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
+
+# mold (AGPL-3)
+#  - xxhash (BSD-2)
+#  - tbb (Apache-2.0)
+LICENSE="AGPL-3 Apache-2.0 BSD-2"
+SLOT="0"
+IUSE="system-tbb"
+
+RDEPEND="
+	sys-libs/zlib
+	system-tbb? ( >=dev-cpp/tbb-2021.4.0:= )
+	!kernel_Darwin? (
+		>=dev-libs/mimalloc-2:=
+		dev-libs/openssl:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# Allows us to rm the tests as before. Will be included in next
+	# release.
+	"${FILESDIR}"/mold-1.4.1-glob-tests.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() {
+	cmake_src_prepare
+
+	# 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
+
+	# Don't require python
+	sed -i '/find_package(Python3/d' CMakeLists.txt || die
+	sed -i '/add_dependencies/d' CMakeLists.txt || die
+	cat <<EOF>git-hash.cc
+#include <string>
+namespace mold {
+std::string mold_git_hash = "gentoo-${PVR}";
+}
+EOF
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMOLD_ENABLE_QEMU_TESTS=OFF
+		-DMOLD_LTO=OFF # Should be up to the user to decide this with CXXFLAGS.
+		-DMOLD_USE_SYSTEM_MIMALLOC=ON
+		-DMOLD_USE_SYSTEM_TBB=$(usex system-tbb)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/${PN}
+	dolib.so "${BUILD_DIR}"/${PN}-wrapper.so
+
+	dodoc docs/{design,execstack}.md
+	doman docs/${PN}.1
+
+	dosym ${PN} /usr/bin/ld.${PN}
+	dosym ${PN} /usr/bin/ld64.${PN}
+	dosym ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+}
diff --git a/sys-devel/mold/mold-9999.ebuild b/sys-devel/mold/mold-9999.ebuild
index 2a7faac5052d..b170b570b827 100644
--- a/sys-devel/mold/mold-9999.ebuild
+++ b/sys-devel/mold/mold-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit cmake toolchain-funcs
 
 DESCRIPTION="A Modern Linker"
 HOMEPAGE="https://github.com/rui314/mold"
@@ -12,28 +12,26 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~riscv"
 fi
 
-LICENSE="AGPL-3"
+# mold (AGPL-3)
+#  - xxhash (BSD-2)
+#  - tbb (Apache-2.0)
+LICENSE="AGPL-3 Apache-2.0 BSD-2"
 SLOT="0"
+IUSE="system-tbb"
 
-RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+RDEPEND="
 	sys-libs/zlib
+	system-tbb? ( >=dev-cpp/tbb-2021.4.0:= )
 	!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
@@ -46,7 +44,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	default
+	cmake_src_prepare
 
 	# Needs unpackaged dwarfdump
 	rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die
@@ -64,34 +62,36 @@ src_prepare() {
 	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)"
+	# Don't require python
+	sed -i '/find_package(Python3/d' CMakeLists.txt || die
+	sed -i '/add_dependencies/d' CMakeLists.txt || die
+	cat <<EOF>git-hash.cc
+#include <string>
+namespace mold {
+std::string mold_git_hash = "gentoo-${PVR}";
+}
+EOF
 }
 
-src_test() {
-	emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		check
+src_configure() {
+	local mycmakeargs=(
+		-DMOLD_ENABLE_QEMU_TESTS=OFF
+		-DMOLD_LTO=OFF # Should be up to the user to decide this with CXXFLAGS.
+		-DMOLD_USE_SYSTEM_MIMALLOC=ON
+		-DMOLD_USE_SYSTEM_TBB=$(usex system-tbb)
+	)
+	cmake_src_configure
 }
 
 src_install() {
-	emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		STRIP="true" \
-		install
+	dobin "${BUILD_DIR}"/${PN}
+	dolib.so "${BUILD_DIR}"/${PN}-wrapper.so
+
+	dodoc docs/{design,execstack}.md
+	doman docs/${PN}.1
+
+	dosym ${PN} /usr/bin/ld.${PN}
+	dosym ${PN} /usr/bin/ld64.${PN}
+	dosym ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
 }
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 738e78554b98..d69122234fe6 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 3a586ab56d8d..9c1f3a523983 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -94,6 +94,9 @@ DIST genpatches-5.19-2.extras.tar.xz 3772 BLAKE2B 73839fd5ad6aa8bf128a3350009815
 DIST genpatches-5.19-3.base.tar.xz 478968 BLAKE2B 25068c570a53be6102a0b32c0da57589368adf14d3dfdc964bfb375ebc2ce5ff007206e23647e6e6775ef5d7e129198861324a4fcdd0a706cf2ef635ef224c31 SHA512 ae9f96092898e374e987799087165f1ba1d3ba7dc6d1fa9792808e45fb8c875cdf4cf3fe94b121e67e96f357f22cf1d48f2d1d14cf439710173ac2cad3d44a03
 DIST genpatches-5.19-3.experimental.tar.xz 70236 BLAKE2B cc33e27b7b0ae60ad5ee7655f8a0e57cdc040ab0681d97ccb36ae7e19e544fd6e2fb76347cd0c963d872d8641f72fad48112c71cbd9989c6efba0b38c1eef8d0 SHA512 4e9bf78af510d0974496cfeb03aff3f8eea283fdb68e0cd5a00e13d90b454b90842ea478d8d54a41c084f7f5d2cf7a624cb3a2bf6f7d21abef9b35325e6ee00f
 DIST genpatches-5.19-3.extras.tar.xz 3772 BLAKE2B 4706120698ddf259e586d0284b5939bb64a83625a1e540f398bb95605e39ac0686b783f0d18aab9751f2acd89ce44d25961d9cf3318feba4cefdff30d887a63b SHA512 f90472cac5eabeb53c6cffaa928215c1c45c4491402ec7f9917f03a2184aad80862ff3358f7c8586e2e8b6259021c586bc59ad917da110a6592486e9fae478a3
+DIST genpatches-5.19-4.base.tar.xz 478976 BLAKE2B 264890c7d60d756d4307ac7b2ae31d6ca32fff745e720c9963ccf0a635200e697b7d55d3a0698b9ff102846aefaf5624766e6f78ac07ec12cd7a85b83d5b11bf SHA512 51bdcf8d737b0f71b5c73f610de21c26df06144c075d51d2d18967f8630c1efd255ff4587fc00e0d5a7749733cf82956036f8506345f333cb5bcc9889161cfc5
+DIST genpatches-5.19-4.experimental.tar.xz 72056 BLAKE2B 113cc07034cf0df294826a147faf5d3fa48005cc852d762e0aba3b576dbe77d42d34ff013ee5798e3adb1a59f8009474519db4f2db605aac21e2c23627f71a99 SHA512 c2ca5c0577f29c5d0acc8c5a2fe37e7ac9c6b603cf0290fafb65ab1d98d9e6b4de41405c5850a2f4d966b4fae2b22f56c59a8208d490434ca8c688964a464c3e
+DIST genpatches-5.19-4.extras.tar.xz 3776 BLAKE2B 5f9ec16f79be3706d19c348d27960a3e9d26d9fd42800a67c8607af12c652975b7fbd019c8a948115c89e45cdd375eba89715b9588a1d09bd877e314f975eee7 SHA512 700c08e80c552829d7a13f4d8bc291d2271fd37049c8968aa827715c7ae58c19a32dc8c7c4a20d0a734ac21923137d856601253c26c2211be91a6db15c409e4c
 DIST genpatches-5.4-199.base.tar.xz 4683396 BLAKE2B e1e66ce10c436bb196a5890e08d5beb8d0a1ece7f19f8fb3b1027747509cc7b6102ace634abdbd299dd48fbc8750f3bc127abe55014410b1d558b4aec497f475 SHA512 8a16d67794e864749fdcdbf413ec0fe996d3c4fb5f04f8c8a2d3001377c8b5d4d7007a96efaa3590fd4b595cccdea36d83c6dc292629566e5398f322658d80f4
 DIST genpatches-5.4-199.experimental.tar.xz 16904 BLAKE2B 496602e26da272a8b58a61402eba0fc9871a96e78005014bd49b4e4354336269e17eeb6828a393c74f0d0cded080247f561a1bae7f6ed22c22d575cc12659ed6 SHA512 fb23e903b297b7660df9aed9aa3a7c94e100c2aa8061e7591823b4abbca82c898f2775b42e319908e4380bec45138acb44972e1f2d09927c96c141a4ba6deff6
 DIST genpatches-5.4-199.extras.tar.xz 1812 BLAKE2B 03b9ebf9d306256e58c895006038f4bb3d908590ef2f603487d9b970963c24acfbe78fbe862b2b493ab477e6e901aba332dc69916eb881fc42a79a62d7f81da4 SHA512 d100e876a9b64d662331d4a78b8531a71144bb70b789e0ab0b76e6957c368ee3a88025e040cd622dd4cf6e4da358a3636571ddf55b94e42dbc250a62a629baee
@@ -148,6 +151,7 @@ EBUILD gentoo-sources-5.18.17.ebuild 742 BLAKE2B 33a5e3ff1b062becc93ac08bcae7473
 EBUILD gentoo-sources-5.18.18.ebuild 742 BLAKE2B 5f422ce7bbd3f74f7976aa081edb54ea051c55b68dbf5d824ba87cbf66d75fdea79475e48437465cd6fb8604ce3c52f1ed200557cc08f0d202c6eaa0206c08f8 SHA512 834426664f3766c1997cb216adaf7c0c840ae35056b303d6d3eb903c3c75d53959e916964579b2a11ff9bbae9cf8442552921318b6e402ffa72744b1606e2de1
 EBUILD gentoo-sources-5.19.0.ebuild 741 BLAKE2B 173a99711cf7e2f80832dead06826d0a5196bf35d364b5445b0da5f60901cde8c4f71757c68780a2768d344dd516fc77a6136a0f3c8ab1639fcfec24b8ef49a7 SHA512 fab36547339b5d28de0b9553b1997a4159099a9b2959539d842e3afe88ff3bde955b4babbcf566ec0baffd06fb636b553aca59cf9f7aad5d0a4d5c4a687c466d
 EBUILD gentoo-sources-5.19.1.ebuild 741 BLAKE2B 850fb58340c7bda3854cc22131fa1c3e294255fe09dced4b9d7a177c2b451ee7a447ec397d05c15d86592a58c59ed3e83c45870b7c85391064dd03f77c11b672 SHA512 557b739782cff1984ffdac9a947f15bbfac6d5e8e455ab92635ad9d40ad8b5d2fefd6c47777e9aa93af35cdaae2a69106498776ac6c33d1de4161200560e51d5
+EBUILD gentoo-sources-5.19.2-r1.ebuild 756 BLAKE2B ce8922193b4ff8f64ad4662767512eec2309a5c6c06a5e58af903e70a669c9578d72157b3e7f4fac1803fe754b0c20ae7b0b2a86fbebb2d38ff689f10a46fdd3 SHA512 b276c7ed78aa8785b891a8bc7de4f1eb94cd12cee72ee9b9a72099e107e33b99a3f4a86d5b37342341c1edb757c2b7ed10bdb965a65741eea313717eb2ec84e8
 EBUILD gentoo-sources-5.19.2.ebuild 741 BLAKE2B d7cc73a7e5bd4a201e540683366f944b5e6da10f5502b73717871b6da04c552b9a8c4191bae054b9285ab2508b6f7d7e450ce70ad5896a6e7d271c20be410085 SHA512 8fbb04ab8751f268974607acba538391a68df12f9db90b32c99770efd3690acc042ff5fabad499d2cba894e6cd8b2c14819e4a51b73bce5ba300d685b96b3745
 EBUILD gentoo-sources-5.4.195.ebuild 667 BLAKE2B fcdafc6d942cb657315e9de05f6b8f479bcfadadfd7427fea2dec8459e440d0b32363ef70564a62be1f9368d3c666b30cdb9307ce430f58b23e41ab606e46fd3 SHA512 1bc0f17971e9a6335299b27c0841bf56b3b82369ddad474ddaf762a373cf4f66f47a7f2b9bc5bec01197da4bdbd21845825a802fe1afba134eb5b454e276557b
 EBUILD gentoo-sources-5.4.203.ebuild 734 BLAKE2B cbdc51576f4a3664855b3d730018512ca638f6dfbf131569b29b57d845f283c22a9d289fc22645722993f1fbd1e0101b027c1b3ea59097ac2b1727951141c602 SHA512 d79c8b3b10534a0fd6b2be858ea6c5342a7854a1cec6b630c8d543fe1ae598112bb55d62d43df9b2e66f468ddf104ced826ce73407d1e8bfde0255495a997b58
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.19.2-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.19.2-r1.ebuild
new file mode 100644
index 000000000000..965827780359
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.19.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="4"
+K_NODRYRUN="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-08-19 20:37:19 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-19 20:37:19 +0100
commit	343082998723d09c7b354eb21ff4793c6d4fda3e (patch)
tree	1ac116f7e87117a78651da3a40230efefd5bf847
parent	b1f2cdf56e5eea363adc4c1ea1bd418f65733a7a (diff)