gentoo auto-resync : 26:10:2022 - 03:54:55

author: V3n3RiX <venerix@koprulu.sector> 2022-10-26 03:54:55 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-26 03:54:55 +0100
commit: 2ecd7994be1409f2a65bfca700904d2a78fd7bbe (patch)
tree: 0248ea4d4f411ea88c27470c15ebc725bb04baa1
parent: c22e93ab35a8cb604c41623a7b2cda059c462b70 (diff)
154 files changed, 3309 insertions, 570 deletions
diff --git a/Manifest b/Manifest
index a8179b5b25e0..a0cb6765f478 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29601 BLAKE2B df32373a40ece09796b3527c81f37b55e5cae0cf46dd291c9b37a5e5c8c1a6c9ea015140d16b7f498837d91c85551fd1fb57252c5519f3226b876ad0ff197239 SHA512 537e4020c253190553a53a61b2b2dd83c383fc43351c7cc693ee092471bc479426d5056464b4fc3b656220d1a02e7a49df12cc90169f8c6db5f485d28b8d5323
-TIMESTAMP 2022-10-25T20:09:47Z
+MANIFEST Manifest.files.gz 29595 BLAKE2B fd9c299bfa50f34e51f470912d23685c0a8a26f9a64047140ceb7de3459ac016564f3b0efae62ce4159c42f0bc12800e225e014159494ee2f4c97eea5d0d28d3 SHA512 c33ce08607f77d4c46186e60ecfd16ed20de3dd86e8f4621050514c8457297579b5c2d9674d0f89662e5a8c724bc075affd90457994cb5df80f35be2e875af4f
+TIMESTAMP 2022-10-26T02:12:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNYQotfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNYl5NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAMRg//aMR7OSBDzAevppbare2DstL9+/c4fK0ffT+tRNJtzJouicSrYYTgbJ2v
-aqOKn71/BJPvMvLl8A/UgC6pzG2SdM7lCmxSYNHXUx7KxyouVvgjzLi0yBkVcdWD
-+4Q4XAqeUBEjfPrNZ+Jx9bcBBICj04Tj/TDEiAAw4wav+SMjnMuhN9UxVyv6uwxN
-aBZ0bE0GdKSWfLFq1j0el8/uKTo0S9UBH7RkpRLN3uMVToRCzD04r74h2mzVG43q
-IKtUeAG5MabZxEtE/hYl+y15NVJMWIzPPW9caMYl+Dqbt6ZiMnf5XTZpI3Hzo8p1
-P6WKbBrsPUQ/+6Xolc3LPvZ1uu+ld2KRxZpQLbae7vCGGRXKeT8PIaBX2bv4cKAV
-mwBccH8m4bImouv8hLq8BXxCfD+c8SaippDaz83BRo9s02dnyuzdqmj1ikznqUhZ
-22b5evPKiv0CRbs5ciCGZpJvU2yl1nJnxMVXGGJnYo412YvisxGSwpoVDEfdIvLv
-avm38exAEM0rdeBAHhf4pr0AkZWhJAj2FGS2NxWgrgo/nEnxEzjFAH4C4CeDTHmy
-959MqBxO1tSaTpHoNYooQBKF2vcWLur0Pj+5WsWlL2XM0/yipPKXZDojSJTuR+To
-fNCd58df5jzVChqdqXslGxFN5xo2FWE+tMk14gPyVhvQuPx+jOQ=
-=wLpi
+klDxhBAAl1BeAR/2YrbcPhwbxKue1UvJlugsAkskF6wCc1E1hcpnffbdcp5WOGfJ
+cCrLOo/PRBtq75XPhqIyTVxtEROHWSj2jAVyYhWgs2358g6P1e8WtlwJG9clh10r
+VcX1n+O3QS9c9Ia274BdOg0rKsR6lIDsv/x0QNT8yvmsG3eK02hStg0XRDm/tk16
+Suw3z3IXF+83WTyWG3KRo1pkc+PZ+QeUnMfBQpLmgaKeMFVDkX0Xj2tcD10DeOSa
++u9z8G6TW7HihJCBraVLMlRODjNy8JBWWzMafeg1tt+lf75lsnbTc+2uLuVCTvH1
+OMFRbork11+ltCuYi/FyLwEflmFuYpGV3aELCQxmNBTzHqR0gvtU8j/4O0XcBvva
+1WYEiybNXVV3HIJLGrznjkXDXOlBcxjarTkBUZb5slm8Jv3D53k8HxENqWtZUsgI
+QcpAWzfuuEOIVn/w6qRQNEr71EenzJY15pYfZUGKbV+0sddwmYGEqOAWTAVqNubN
+Oy1LbVJQzDxjMmKzzAfNbwcCOYZLrdv+fMlnzGjK1dH8dsYiQmpz3rGdX1sUZAwV
+oUH5KEkUWMSCTmYLl9M0fxc1TqIKSOHP3yBomKafUtmJ4hrp6MYCUxxb+ULONpXD
+4LsDVNPn+zqur1ePJ2JjEWPF5uiiG585Ig/aH0G3dczGWBhspvA=
+=TnYb
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 0929a6415e79..d5be054d738a 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index af8c4c417538..06994dcdd9a8 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 832e15aa330d..305a3680d316 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,7 +1,9 @@
 DIST aws-cli-1.25.89.gh.tar.gz 2285887 BLAKE2B 1da21b1e314b187ee105d2bf256ce2fea42fec8d1e5cf0de39c8371a93a588e24e5415b2e50ae314d39613a4ae55963bd544cc7ab3e08d0e38089c5c609454f4 SHA512 39087e269a0318777af73d010d7c6264fd595fc5d27f24bb66da07763165729526bd8a60f4225241eb5172d879d6f562c5bf64ad5979d7ac3be40b7d8cf33486
 DIST aws-cli-1.25.97.gh.tar.gz 2290672 BLAKE2B 4fbff8d9747b615f7b8633ce2a1c7a68880d50d3a22c5bcdfe2e352a8ea84f8b9d0d1c94d514be3e871beeba5c2cc69853fb40daaa4fa4bfd3409779ca2713b5 SHA512 a27dab95240036158d2dc331a3b1768e7c705b52cb1fcf7f5d0bbc3f40bed62838565493c463e22cf2b249981b0fca255ce65d64b7cfa45df24621cb788171e7
 DIST aws-cli-1.26.0.gh.tar.gz 2291209 BLAKE2B ad2b9380d45d986b2cc4219a93ee30fdc1e86e35e66dc095c76f29e6062601d0e443a96fa93edbc65562580eb9815a8d3f31a59a0c850513793df3870e809be8 SHA512 5b7e87b4fe02d7fbca0482cb93616b8f78f0bb074ed779ca553532be54f914c827a30b8458e209e6fbd23d22b5e734dfe14fb79e8833c3055c771a1766153d2d
+DIST aws-cli-1.26.1.gh.tar.gz 2291902 BLAKE2B 04df153b4b7608ab3c2e86c230065f7b935a911e88e1a5b788dee545d328d9839ba9aba44b334522f2afafef8fa613aea6e749a2a7f9089f40993544f3cec9e9 SHA512 418257a8e4c92a6d21c89f7725cd70f463f4dd53c798783b29c4166daac644501e4a03a180257dfe356bf30228dedcf7a672ad46ff6f36afd40a8efd9ad786f9
 EBUILD awscli-1.25.89.ebuild 1856 BLAKE2B 554e1053c19d16d4e0aeccddbd3a49b42ab412ba342ddd888b11552f1abede7a405f743edbabbda0cb4d42dfc95c0f29da64aab08d09c0cf3b24b0771438f23b SHA512 563c00bd712002ea3b3771e7f6c2f27b478fb78cd91b1009cf498e487b81c8abe04e754873f77f625e56594f34e282307c325cc6609bee2f6e856d0e461aa252
 EBUILD awscli-1.25.97.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 EBUILD awscli-1.26.0.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
+EBUILD awscli-1.26.1.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.26.1.ebuild b/app-admin/awscli/awscli-1.26.1.ebuild
new file mode 100644
index 000000000000..7bff39ee809a
--- /dev/null
+++ b/app-admin/awscli/awscli-1.26.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# botocore is x.(y+2).z
+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-arch/Manifest.gz b/app-arch/Manifest.gz
index 8483d2e48811..b0ef9597a7de 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bzip3/Manifest b/app-arch/bzip3/Manifest
index 16ffe77ef1c1..b1190ddad3d0 100644
--- a/app-arch/bzip3/Manifest
+++ b/app-arch/bzip3/Manifest
@@ -1,7 +1,7 @@
 DIST bzip3-1.1.5.tar.xz 265340 BLAKE2B 0226a97d564f1c9d9d1089b43ae79a9e43d0b77628298ef953c45505ad8d62caaf17bf6fa357857f123cf072b8ccd3003bfe138f25284baa5a5a5cdd8a555f71 SHA512 589c2e8e675a61014c7c4e82d0f2067201e3fb97bf7cfa6b7aa23690dc739824226089ac710509cc085b22eeb671ed5e23c6493967a433d3b284cb638af71be8
 DIST bzip3-1.1.6.tar.xz 265708 BLAKE2B 9429dcb3e9deef8aafdf890215ba95669dbcb135d6d2896f18cc70b482bab321497d3a26f36be59700ad0da879578b7c906f20629c72642aa15fc3b1507a788a SHA512 19120d3a850495a5bcc43b124e4a8eddf41bac55119d0898bf1e7c5b744f4bcc84c41b9018615f577fe3bfdceab8dd2ab6f2722cb9fbf86bf1c0a2da9ca32916
-DIST bzip3-1.1.7.tar.xz 266436 BLAKE2B 46ca29e0632fbf12fc61c4d9e7c55d2f571a4e882c17f4535e54b7448bb01bd120e0ee518f2c0aa4dc97dd878fe772d5a63562469a77984b2aec5e5c875ccbdc SHA512 3e92a7cb70850fead28df7209185c5c468308acc3d8a75af2906fe85fd81efedc856ad151876f64a01fc3b7f5f9a724838d32c9ef19fc7182e8b3b632901a6ba
+DIST bzip3-1.1.8.tar.xz 269668 BLAKE2B fe85ba2ecca8e2433501c13e57856720da731b6c959340a68dd4654a516c12e034a90ff6cd6aed55dd2160c3860fdc3e60cddd47ffd00737a657a2e6c73704af SHA512 36141a48f0d5b35de4b06117ceca3c5d5cdc3df6be187856f1436751984b0154942e0eece531ee7b191cc0cd7056960de6a1ca3ec0fc2bcc7ff1d50444cd1e3e
 EBUILD bzip3-1.1.5.ebuild 780 BLAKE2B 40c5d480da40010a89acd6f33a35048bdf5983017b9701840b917ff2fc56ffff93da2189cc783f1009d2de3063a41892bba33d3a59bf5a1d9d0c4104075dc71b SHA512 2b3d5355ca469a43563a54ffc1bc8f3e1378955e955e5e603659f7367296c68cbf0392550df77c2ae29f919b01ab33505371ed0a871e98ede7174eb7bf15c6f5
 EBUILD bzip3-1.1.6.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
-EBUILD bzip3-1.1.7.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
+EBUILD bzip3-1.1.8.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
 MISC metadata.xml 879 BLAKE2B eacb925ae4939be72ae25f0f333d8c8e1c08b2fd7946e27dfadd214b8fd5f27eef3f141f9ca911cf89151245f2fa11c7a8c5459c63badbfaf71e62aaca6d67f4 SHA512 963eae34b110b883993959f97a84c5fbaae914e009d024379d8b83ad02b335f3d7404ecd9020e291a38e78cb358dd4d0ff1b4b8f3604a2cc719e9d82ebee1e50
diff --git a/app-arch/bzip3/bzip3-1.1.7.ebuild b/app-arch/bzip3/bzip3-1.1.8.ebuild
index 0d9329da48ca..0d9329da48ca 100644
--- a/app-arch/bzip3/bzip3-1.1.7.ebuild
+++ b/app-arch/bzip3/bzip3-1.1.8.ebuild
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index cf8f1d66fe6b..d124aaf433eb 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,7 +1,5 @@
 AUX rpm-4.17.0-libdir.patch 855 BLAKE2B 81a2daf0577c8dc3feac190764125da7a616e24ccdd38c3715c3c68f7fc831cf2662e629f23ed88f7d133961a40ac7f63acd6c7f52e99f17abe53442b2a5f14e SHA512 68d884cf9d57d89138ee7d6882869b0560aa9cd3dc82b837c47732f2d0248b42fbdafbbcc1f3f04322cd750744d97e4512491fb0591eb0622b2a5d1918391c46
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
-DIST rpm-4.17.1.tar.bz2 4642016 BLAKE2B d82926845e523c82fcf6a985d8de00f7a5bcc981e15d3115c310260713c482dc43e23b43f887644415b5a51ee382297d6d3569b6914595c91b9b89cc813af8e8 SHA512 d0429510140f25a25b6c9441abe2027d27c485bbd4969752f69e1c843435c9508b9f85e5bb68085dd64b7da533801aa5c04d8c9d962e08d2ddd3199d0265cc85
 DIST rpm-4.18.0.tar.bz2 6600013 BLAKE2B 127c3b1427884d04c3db4fc73eb73a978a58241bc740620e3e46c7557d99833092866b5d9c8b4fdf72cd106668d9e5f5cb8c4b918decf1513a82d10258975116 SHA512 c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec
-EBUILD rpm-4.17.1.ebuild 3995 BLAKE2B 5ad79dd4b80820a3c96bc16389fa5d84bfbccb611576e7b000d315c0dd821965c3679a783112a3f36e4861a4c9793ef31c993846647effdfd7aa897829d6c34b SHA512 902704fe5fd184f14769dbb42ec6c4e3fd139f49fa869bd6552e0817d06515cf4d6f95a9b3b2ba29d9d3369de4036b4a18ceb6fc8a8d01362efcf1d415381c69
 EBUILD rpm-4.18.0.ebuild 4089 BLAKE2B 9cad446a7e55ca5f2c1a993edbd42c7ebfd551ab4e416d18dc6400469fbbbbca4297d39e9f1291983f6f3181fa6c9293ad6b2c87e630c9dbda1714e652c08e75 SHA512 9b9c89bf06e70f6f2c163fad313856b48905608ffb64de134498bf2825af494816d4637d6058ed7a6017bd17f511fa70316276471e06f57f6a92fc4296005cb4
 MISC metadata.xml 260 BLAKE2B 00f83151d62c157bea18101b36007f01e6da9d16d438671c37b929b1e19cfc202f379816a1b0d9e3faea99c44a43f97a5d43100266c683487dabba09f1378eea SHA512 d6fc386bd5be91d5dff3d7aa514f4d72e7301a47f888db95573d72505ee86987ae6412fdd8aec82842c006abe831d99f6178b1ac78a04a7dbf9e5bce1d249cb7
diff --git a/app-arch/rpm/rpm-4.17.1.ebuild b/app-arch/rpm/rpm-4.17.1.ebuild
deleted file mode 100644
index a4ee4d202c0d..000000000000
--- a/app-arch/rpm/rpm-4.17.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{3,4} )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools lua-single perl-module python-single-r1 toolchain-funcs
-
-DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="https://rpm.org
-	https://github.com/rpm-software-management/rpm"
-SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2
-	http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# Tests are broken. See bug 657500
-RESTRICT="test"
-
-IUSE="acl audit caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="!app-arch/rpm5
-	app-arch/libarchive:=
-	>=app-arch/bzip2-1.0.1
-	app-arch/xz-utils
-	>=app-crypt/gnupg-1.2
-	>=dev-lang/perl-5.8.8
-	dev-libs/elfutils
-	dev-libs/libgcrypt:=
-	>=dev-libs/popt-1.7
-	sys-apps/file
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/libintl
-	${LUA_DEPS}
-	acl? ( virtual/acl )
-	audit? ( sys-process/audit )
-	caps? ( >=sys-libs/libcap-2.0 )
-	dbus? ( sys-apps/dbus )
-	sqlite? ( dev-db/sqlite:3 )
-	python? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	zstd? ( app-arch/zstd:= )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
-	test? ( sys-apps/fakechroot )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rpm )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.1-db-path.patch
-	"${FILESDIR}"/${PN}-4.17.0-libdir.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	lua-single_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-
-	# Added USE=openmp and this check for bug #779769
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	# bug #356769
-	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
-	# bug #492642
-	sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
-
-	# Prevent automake maintainer mode from kicking in (bug #450448).
-	#touch -r Makefile.am preinstall.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# rpm no longer supports berkdb, but has readonly support.
-	# https://github.com/rpm-software-management/rpm/commit/4290300e24c5ab17c615b6108f38438e31eeb1d0
-	econf \
-		--without-selinux \
-		--disable-inhibit-plugin \
-		--with-crypto=libgcrypt \
-		$(use_enable berkdb bdb-ro) \
-		$(use_enable python) \
-		$(use_enable nls) \
-		$(use_enable openmp) \
-		$(use_enable dbus inhibit-plugin) \
-		$(use_enable sqlite) \
-		$(use_with caps cap) \
-		$(use_with acl) \
-		$(use_with audit) \
-		$(use_enable zstd zstd $(usex zstd yes no))
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #657500)
-	if has usersandbox ${FEATURES} ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	emake check
-}
-
-src_install() {
-	default
-
-	# Remove la files
-	find "${ED}" -name '*.la' -delete || die
-
-	# Fix symlinks to /bin/rpm (bug #349840)
-	for binary in rpmquery rpmverify; do
-		ln -sf rpm "${ED}"/usr/bin/${binary} || die
-	done
-
-	if ! use nls; then
-		rm -rf "${ED}"/usr/share/man/?? || die
-	fi
-
-	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
-
-	dodoc CREDITS README*
-	if use doc; then
-		local docname
-		for docname in librpm; do
-			docinto "html/${docname}"
-			dodoc -r "docs/${docname}/html/."
-		done
-	fi
-
-	# Fix perllocal.pod file collision
-	perl_delete_localpod
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
-		einfo "RPM database found... Rebuilding database (may take a while)..."
-		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die
-	else
-		einfo "No RPM database found... Creating database..."
-		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die
-	fi
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 0026850266f2..0783fc53288a 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/amqp-cpp/Manifest b/dev-cpp/amqp-cpp/Manifest
index d21f1205eea6..9df3452ed472 100644
--- a/dev-cpp/amqp-cpp/Manifest
+++ b/dev-cpp/amqp-cpp/Manifest
@@ -1,5 +1,3 @@
-DIST AMQP-CPP-4.3.16.tar.gz 158954 BLAKE2B 175c5c22a88e20ca5d123fbf808a354a0b3048a0127ba75170b61e8c8822ba8d8b78cb4247cb26cfeebff92c0ca74213d6fb254afbc74e9f92a88751137e8c97 SHA512 bdce6a93f3b88a0ab26dae66e289f98194d0f1a3e2eb03e0c858111275a02ebec042dfe9d757989a1c0cbe1b15652346f86008bf4248e366d1896c4750d9194f
-DIST AMQP-CPP-4.3.17.tar.gz 160729 BLAKE2B 963b32e4736627da3eece481168565136ad6fd387e71a04de9d08664b6877a38e084e27f482c2c24886bff5c78dcdf266fab88189dc2eef85f3b50d15d020565 SHA512 763e9a3d6565584753a5bcd8f4e8b174327f206e01f001ae8b4b7d1728ccebf195cd2d4463a8b65badc1a91010978360f6f5c25fd3acf70116b5ff7eba2db7f6
-EBUILD amqp-cpp-4.3.16.ebuild 834 BLAKE2B b2d244cb41c8741b987c20fc197b8d5bdd4c61118e960873dacedf8d7d632d0e3a8972d3c1c7d600aa6d9ca445a32dd07b577c99ae19019ee451f6fe1cb61ca8 SHA512 053f40f13197b584bc96049ab3095d077d236770d34c635ca86703b57192c07cbf5d87b1ce4c6637b26fe3d1245bf186fee117d7c32151ca8b3b6a149fb743b8
-EBUILD amqp-cpp-4.3.17.ebuild 834 BLAKE2B b2d244cb41c8741b987c20fc197b8d5bdd4c61118e960873dacedf8d7d632d0e3a8972d3c1c7d600aa6d9ca445a32dd07b577c99ae19019ee451f6fe1cb61ca8 SHA512 053f40f13197b584bc96049ab3095d077d236770d34c635ca86703b57192c07cbf5d87b1ce4c6637b26fe3d1245bf186fee117d7c32151ca8b3b6a149fb743b8
+DIST AMQP-CPP-4.3.18.tar.gz 160732 BLAKE2B 3c3d77772c21dcd461cf92b67d7e8cfac5a2052a81aade2fd00eca75d4991f9cfc6cfa397924361a7a8a28accb98153c2a50bda259726e81513a1d910390f3d5 SHA512 950d84a769ccbbf146be617297e81d8f036096bcbe5ca520d4b909549bf8d74fc576eec90a1fafb164b86c9eb693c3ae29d884c3a30749f04440646549ffe5ce
+EBUILD amqp-cpp-4.3.18.ebuild 834 BLAKE2B b2d244cb41c8741b987c20fc197b8d5bdd4c61118e960873dacedf8d7d632d0e3a8972d3c1c7d600aa6d9ca445a32dd07b577c99ae19019ee451f6fe1cb61ca8 SHA512 053f40f13197b584bc96049ab3095d077d236770d34c635ca86703b57192c07cbf5d87b1ce4c6637b26fe3d1245bf186fee117d7c32151ca8b3b6a149fb743b8
 MISC metadata.xml 349 BLAKE2B 509cb064b08453cac6096be89d5a07a198a62983cb186d146872a97f9543f615dbb3039c606fb4bcdf877c0d10c1ab4654d1019d7dca2920c48645553ee556f1 SHA512 792290af273069d20eeae7b21409d31aed2b3f9c001dcb72fdceba58150eae68791e832ebe8747bb11a0d31da62922cd46e22eebd95a46c6329492e3ad6a487c
diff --git a/dev-cpp/amqp-cpp/amqp-cpp-4.3.17.ebuild b/dev-cpp/amqp-cpp/amqp-cpp-4.3.17.ebuild
deleted file mode 100644
index 33a052a82f5f..000000000000
--- a/dev-cpp/amqp-cpp/amqp-cpp-4.3.17.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN=${PN^^}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker"
-HOMEPAGE="https://github.com/CopernicaMarketingSoftware/AMQP-CPP"
-SRC_URI="https://github.com/CopernicaMarketingSoftware/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-src_prepare() {
-	sed \
-		-e "s:DESTINATION lib:DESTINATION $(get_libdir):g" \
-		-e "s:DESTINATION cmake:DESTINATION $(get_libdir)/cmake/${PN/-/}:g" \
-		-i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAMQP-CPP_BUILD_SHARED=ON
-		-DAMQP-CPP_LINUX_TCP=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/amqp-cpp/amqp-cpp-4.3.16.ebuild b/dev-cpp/amqp-cpp/amqp-cpp-4.3.18.ebuild
index 33a052a82f5f..33a052a82f5f 100644
--- a/dev-cpp/amqp-cpp/amqp-cpp-4.3.16.ebuild
+++ b/dev-cpp/amqp-cpp/amqp-cpp-4.3.18.ebuild
diff --git a/dev-cpp/argparse/Manifest b/dev-cpp/argparse/Manifest
index 3c0de07fc721..5a2e6f57660d 100644
--- a/dev-cpp/argparse/Manifest
+++ b/dev-cpp/argparse/Manifest
@@ -1,5 +1,3 @@
-DIST argparse-2.1.tar.gz 72452 BLAKE2B eece3f1cf6a2e58f5bec99f0223b31ba92147964053d98122099dd806a0ab62c6039ee8741281d1eca28b9d0e3aa02d7d076e8bcc64bbd5dd03c777f8e460531 SHA512 35746e0b526bd4406c954ab315f191abc57b08b48a047f108ddacc7baace406d3ddddb1af23d41caff565afecfeb41dfedd27a08cdba8d11b59dbe7c78b7e9b0
-DIST argparse-2.6.tar.gz 93865 BLAKE2B 5ab49a1e9d85e1252b4066fb3278b6c34c0e813f6b49063196cb294544a3adaf45930295834786d41ebbe483b4704be45e90e3a1d53e5085529e78e0b07fad0d SHA512 778e405b7790906794506a2175279465c7d7efa905d0848807fcbddf5ff827e9556a3f2660ee0207a70195a8e9e652ba37ba4df2a038d8646339525cec0f1784
-EBUILD argparse-2.1-r1.ebuild 362 BLAKE2B bb3a1df0edfab8253250f85f4a217c226b4bf027abf43c683e7e5157c4434ee6aeeb1b4353d5e3d6072e54a058884f011b7c0e964dc93a6719a2ef0e07374823 SHA512 44248666587c9e25b4593829de629f401831c6b5ef160c212ced47b6ed4212ddcf340fcab89b8e488e99409fa6b32acedf43acd329bcfb16fa27e60bba58254b
-EBUILD argparse-2.6.ebuild 569 BLAKE2B c4378b69b06072bc37879d6555a594c5fd0ba0eb75969e42c034d629e34e7d7c0eda02b930d344d72eab52ba84ce0abbc49ee204bc5305730411523ea6cf055b SHA512 5fcef85bc8807a208c087d847deed4861fdf5ff1586c5f7bd2247c22f8c56e2021afa7c00f5cf5706e108d6a3c31499d286336aa4173250180cffb88cda64161
+DIST argparse-2.9.tar.gz 103147 BLAKE2B 2862acd7dc43dea0f7a7a1e6c9541ec8e7b7ecc70ce72ad327b34f72a330799475490e7da4e3a07c9ab28ddec4f88911514690c8b438f36d7c02704fe26b0f08 SHA512 fa471e7d8c448510376e79927496f62775e6ed37e1dffefd607839e6005dfbc61125d0e18bfc1ff20f86cef7efd75339d7bb143dc6574d988f83c7c96896fa5f
+EBUILD argparse-2.9.ebuild 569 BLAKE2B c4378b69b06072bc37879d6555a594c5fd0ba0eb75969e42c034d629e34e7d7c0eda02b930d344d72eab52ba84ce0abbc49ee204bc5305730411523ea6cf055b SHA512 5fcef85bc8807a208c087d847deed4861fdf5ff1586c5f7bd2247c22f8c56e2021afa7c00f5cf5706e108d6a3c31499d286336aa4173250180cffb88cda64161
 MISC metadata.xml 330 BLAKE2B b2116c014f0385ca1a4d617dcb6c48ee60e39d82630fb716230c27f4de79ec6cd4611f9194aa9d8555cdb54e2cc22ab0a96cd755231ef99e272877a490226e5b SHA512 ef007277e64f992e40944f540606c9908ac87284d73dfcf252caa885da6c381bb33640544e841b857483c24dfcc5250a6e59a082cb463a02c059afd23069d686
diff --git a/dev-cpp/argparse/argparse-2.1-r1.ebuild b/dev-cpp/argparse/argparse-2.1-r1.ebuild
deleted file mode 100644
index 67e32ea4d3d2..000000000000
--- a/dev-cpp/argparse/argparse-2.1-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Argument Parser for Modern C++"
-HOMEPAGE="https://github.com/p-ranav/argparse"
-SRC_URI="https://github.com/p-ranav/argparse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/dev-cpp/argparse/argparse-2.6.ebuild b/dev-cpp/argparse/argparse-2.9.ebuild
index e273fd49b506..e273fd49b506 100644
--- a/dev-cpp/argparse/argparse-2.6.ebuild
+++ b/dev-cpp/argparse/argparse-2.9.ebuild
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e7234666cf66..ff86c418db40 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-text/Manifest b/dev-java/commons-text/Manifest
index d041000b442f..62add9d90a22 100644
--- a/dev-java/commons-text/Manifest
+++ b/dev-java/commons-text/Manifest
@@ -1,5 +1,3 @@
 DIST commons-text-1.10.0-src.tar.gz 342224 BLAKE2B efed282c9fed7dae5766f7158136a4d7414ba0610e16a52fa2d12ee04e43960d47ec7c62f220c2ab881a13afa8a81cf85e453364e37c67550e15c314122ebf25 SHA512 6bf2dc7dda4429cb1b9ba3a4d383c1d9ffabd5ff35a0adc55216e7cf4c532e51b2b012c9b0f3ea859cd32aef75e05547d892301f34f304a0bfd27c39a28fe04f
-DIST commons-text-1.9-sources.tar.gz 312764 BLAKE2B 44b628c418a910ff38b5a1fb3b4c9f14a1f9818afd12540f8c8cf8b1a99fd7abd365e704142bcec901e5e067b303ff44f9c992f8714eae68b94819780a270dd2 SHA512 53f993e79aaa6789d3388aa96b6b2a14cf646b27ff3774524390e511241a85288947cc929519eff61a8734578f25bdf3d9969d84da20c1a749b19d90a55da8ae
 EBUILD commons-text-1.10.0.ebuild 1944 BLAKE2B 0ad39c8569085b4deadfd703b8d4c0996a5d8a249c2895b253092d5ce66f9292635f2d782582a941b4927622f296044c7c04ce5b2583ec1448a1db6288fceb2d SHA512 6229c7492d11147e33f4311d0497c9e5cc9da0fb9a69f62333c18f2e39d481a7695b0d912d80147aa6a35ee50e760335c61c2659e0f73317c8c95a3b24a76ccd
-EBUILD commons-text-1.9.ebuild 1142 BLAKE2B 0beeef324dac52e6201d090bf55e4d1d090d88d82ccf3a6beaa2b7d1cfb7670295cf294c0c071863583f3512dcd4bf38f24e53f94fa972f1f82e14d9262f947d SHA512 658d2fd0186f9dded92492d975f2262f35c2a618a25dd85a6c2e1d82a4663a7f833703675ad1bedebeae4234fbe90269bf28f61d2c1e2d0bc659faa6ab36a6c1
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/commons-text/commons-text-1.9.ebuild b/dev-java/commons-text/commons-text-1.9.ebuild
deleted file mode 100644
index 530b720f0f19..000000000000
--- a/dev-java/commons-text/commons-text-1.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://downloads.apache.org//commons/text/source/commons-text-1.9-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-text-1.9.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.apache.commons:commons-text:1.9"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings"
-HOMEPAGE="https://commons.apache.org/proper/commons-text"
-SRC_URI="https://downloads.apache.org//commons/text/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# org.apache.commons:commons-lang3:3.11 -> >=dev-java/commons-lang-3.11:3.6
-
-CDEPEND="
-	>=dev-java/commons-lang-3.11:3.6
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ENCODING="ISO-8859-1"
-
-JAVA_GENTOO_CLASSPATH="commons-lang-3.6"
-JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index acb75b553cd2..763ff5455368 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,5 +1,3 @@
-DIST jakartaee-migration-1.0.3-sources.tar.gz 38243 BLAKE2B e1c05c05dd16ec6d54f0eb3523aed14a3fcbc9c0999b54e7c240c5ebfbb968a8cc3025855485318c19f0e85931ea239f4f08efbd0d042c7ad163c1fe5d3819f9 SHA512 79947fe47d55e4e93a417118e7a41fd79614b3fe3bfad967bfdcc865121c9247f92ecd99231e08abb2187036cdb1dceb85b8f2bc695c5bd2ecbf48a84bdd3b2a
 DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f SHA512 a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644
-EBUILD jakartaee-migration-1.0.3.ebuild 2945 BLAKE2B da19a875db924748ac6c1ebb6cbf25ff48419a447683be29af3a893764b1a51ebd0258c019f5af292b3b006417c907257004e6431d66269a534b9536b5efee71 SHA512 5f96ce048739dc89191d22756eee6086bcc4da74a61435a999374fa72961bf7bdad8a374b8165575b0929690f1b13abee0dddfd8d90ec85a7ecef8eae4c7cb63
 EBUILD jakartaee-migration-1.0.4.ebuild 2979 BLAKE2B 1213e1b55b6822382c81fe9d8643b6ad6c55a5ef1ad204f732fafabec6d914f9b2b04c70ef6ec4af26e9e39026f96a67a64f0f23ff2bf81d2b3c4a43e582a1b8 SHA512 9740c0f632d1c6d9102806bca98eb87ee8728aff425515af033a5c6cb895af7ca500a347a51a943ae52dcfe5f3955bbc7a181b916c399336761f87ac61a2918d
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
deleted file mode 100644
index f4e644bdec92..000000000000
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.3/source/jakartaee-migration-1.0.3-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.3.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
-HOMEPAGE="https://tomcat.apache.org"
-SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
-# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
-# org.apache.commons:commons-compress:1.20 -> >=dev-java/commons-compress-1.20:0
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/bcel:0
-	>=dev-java/commons-compress-1.20:0
-	dev-java/commons-io:1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1"
-JAVA_SRC_DIR="src/main/java"
-JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
-JAVA_RESOURCE_DIRS=(
-	"src/main/resources"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
-	"src/test/resources"
-)
-JAVA_TEST_EXCLUDES=(
-	"org.apache.tomcat.jakartaee.TesterConstants"
-)
-
-src_prepare() {
-	default
-	sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
-}
-
-src_test() {
-	# we need to create jar files for the tests the same way as it's done using pom.xml
-	local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
-	mkdir -p target/test-classes/META-INF || die
-	pushd target/test-classes || die
-	echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
-	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
-	jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
-	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
-	jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
-	for enc in rsa dsa ec; do
-		cp hellocgi.jar hellocgi-signed-${enc}.jar || die
-		jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
-	done
-	popd
-
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index fd3f0cd0bb6f..c699495997ad 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,6 +1,12 @@
+DIST protobuf-21.8.tar.gz 5110670 BLAKE2B 3c1b0c857a86e9586481d63896341d0cb11290dbd710d87a6f7889d34f5f262abe2986a29ed19a730f8fa5df0b5c62d77a4db6aa415a72b239f7483ae8d6380c SHA512 cb17be759311e91172801add1f88fe7a0291b547170c40d2e3303f5c248570dddeade96bd48740edd628215f55269c97475e2f4c4a41c50f1018d525f52036cb
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
+DIST protobuf-3.19.6.tar.gz 5299501 BLAKE2B 3121f76b95f83c5309ce49ce296b738eff7be9d3a5093c564fbe2339fb5f3729e406f1b44bfcc05feb0d31ab63838bb4f54685017977c73a33b91215a6776072 SHA512 8f92242f2be8e1bbfba41341c87709ad91ad83b8b3e3df88bb430411541d3399295f49291fd52b50e3487b0fce33181cb4d175685fd25aac72adfaee26a612d4
 DIST protobuf-3.20.1.tar.gz 5368262 BLAKE2B 1ce1aef2e4c4f3ea4863629cc75d89fe17d0c7ac0c342ac641c787456fd4a12756c2892a27ddadedc94a7201494ec84566638ce33a03cb0c867b04e9eee0edb3 SHA512 fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0
+DIST protobuf-3.20.3.tar.gz 5374320 BLAKE2B fb51f2a0ecf5b83235f5252051f8192ae377bb7a5e030c3f3e9435ccde25919c059830cf476e840fa6c970928a32c0075e213c9d5d4d9e3d3b24732c39a9fbfa SHA512 01d6703bdbe769a1200ee6e4ebcdcb99688ec21f576988c60d82ec36e0822820fb245fcb4ca53293143d53e666d748b5a0c6937bc659fb3cdc4cd9b05ed12a1c
 EBUILD protobuf-java-3.19.3.ebuild 1451 BLAKE2B c0bad09302e1e52cff018223c055939e2d4335874f2be95e913705368926106c6967b5a98d7f0a392037060c040fd3116210f0d1de567dc17e66bfc252202e4b SHA512 a74e044d91db564a682f8d9b82fa73608fc10f2b0a917b1eb696375f5993e62cf03289a31b7e28aa27cbfdf027bf62160083ff39186d1f8333b52633ba5ed0fb
+EBUILD protobuf-java-3.19.6.ebuild 2852 BLAKE2B b131c6753d9af1c5038d449e40476455256905f323cad1eaa9c0378e5b0aaf132e11dec4e2622e5f51edc2952e1ab6de2de25cd0b8d5e5d205b7be9ae3c56a75 SHA512 2b5c46eab2b9b9fa398cdfbb4a2bb12a7f0dcdce4a977b9bc63a955a54283da548f8921231349a89442d7222708afb803335518bafe2ddd6f424e7fe5866dc2a
 EBUILD protobuf-java-3.20.1.ebuild 1430 BLAKE2B 8625de036d5ed22f587b922cd69620ce7e8dd1a0a30e77bc2154937156c2d1686c2ba27efaa1d55fc68720c420f16b14ba3520175791cefe99a754425d496a0a SHA512 e78e00cb7584d7d909b64feea2dc430819f63558ed124b86cdc2e518106a0e288638db14919286947fb86db15bbc47668398ca0081245a61e8294d56c5963d85
-EBUILD protobuf-java-9999.ebuild 1365 BLAKE2B 6d6876bc2cd65b0e17e4dfdf4de0fe4cde077a3f040ea1318511ff6da9915331a3f0686b132fe893aeda8d31c0f8031f338efef43c9f6e7e92d7ce75c1c8dc5a SHA512 f7c9ac0f8f37fe746aa3a0febd35d176e51600250ef512b2f7f28e17f6225fcd550b9bd708eb5eb5540f841b3e5116d18b011ef6bd75ee1a8e319124157df53c
-MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
+EBUILD protobuf-java-3.20.3.ebuild 2852 BLAKE2B c214278702be2c18ff5637fcc80171f34b8993a0369e6d01a142c365b53f281a81cdfbe4b834f7a58a1502608fc0a3b672a4c975d73be7a24b999d7ff56bb878 SHA512 ea67fa3fc66d97bcd6e95621c79ba7747a396d48d68689715a23c1dbcd03d71e4e2897a4d7418b49152af94c43f69876ce31b2e866647b037faa1e7dbeeb75e1
+EBUILD protobuf-java-3.21.8.ebuild 2854 BLAKE2B c9ee0042e0550d67b211360f9f37bac37b7ca592f20cc6cf8830279f1d22f91b571e1100e19f3158b757bff969575705bb52f26b8ebb56b753be98fcecbd8c7a SHA512 c60a2a04a9601a3d7afff24de4dafd48121c771c8aa92818f44c0a6a7de468e797d6287787969be546d744b1b8ddaa9e73e3121c115ba25b39fbb988dbb91ff9
+EBUILD protobuf-java-9999.ebuild 2995 BLAKE2B e1538e1a635ba897a9c2f75db235384cb4122c4390ed8bab3a9f46c57f74b1db58ef54e6df65e328df6458067e6b671b3dda4a08226c94e9929388aaa8efe386 SHA512 94b01edfaee931cc4a5944940429e89cf8837f74c25efe026c3ad7fb3a637da21f794b68d7fda90e9bbef58251bab3f3b0271fc4a50ea29c4389578fa3597e16
+MISC metadata.xml 625 BLAKE2B 13394b9a2148b9117ce719954591e79088f845ac1ceb667bbdd2645b989daadcfea09525f9dde68c405e3f1cce5cc1af32de9fb4dff629e4745e13fa92727dd7 SHA512 47f693db57dbde04f419ed65494d81b0a800c9ac49d790c9b794baef34fb1f876da29c5a0662c45aa3c01cecd34af648e196fb76110fcc0066198c59543049b3
diff --git a/dev-java/protobuf-java/metadata.xml b/dev-java/protobuf-java/metadata.xml
index 7fc9e27ef82d..5fdb33c1c7c3 100644
--- a/dev-java/protobuf-java/metadata.xml
+++ b/dev-java/protobuf-java/metadata.xml
@@ -9,6 +9,9 @@
 		<email>cjk@gentoo.org</email>
 		<name>Cjk</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
 	<slots>
 		<subslots>Soname version number of Protobuf</subslots>
 	</slots>
diff --git a/dev-java/protobuf-java/protobuf-java-3.19.6.ebuild b/dev-java/protobuf-java/protobuf-java-3.19.6.ebuild
new file mode 100644
index 000000000000..6adff3a717e4
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.19.6.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.protobuf:${PN}:${PV}"
+# Tests not enabled, depend on com.google.truth which is not packaged
+# https://github.com/protocolbuffers/protobuf/blob/v3.19.6/java/core/pom.xml#L35-L40
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+PARENT_PN="${PN/-java/}"
+PARENT_PV="${PV}"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
+LICENSE="BSD"
+SLOT="0/30"
+
+S="${WORKDIR}/${PARENT_P}/java"
+
+BDEPEND="
+	dev-libs/protobuf:${SLOT}
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+	)
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="core/src/main/resources"
+JAVA_SRC_DIR="core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_RESOURCE_DIRS="../src"
+JAVA_TEST_SRC_DIR="core/src/test/java"
+
+# Same than PATCHES but from repository's root directory,
+# please see function `src_prepare` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "java/" subdirectory.
+PATCHES=(
+)
+
+src_prepare() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	# Remove bundled jars
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+
+	# There is also compiler/plugin, but not in this list because in a subdirectory
+	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
+
+	# Copy resources from ../src/google/protobuf according to
+	# https://github.com/protocolbuffers/protobuf/blob/v3.19.6/java/core/pom.xml#L45-L61
+	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
+	cp "../src/google/protobuf/${core_protos[@]}.proto" \
+		"${JAVA_RESOURCE_DIRS}/google/protobuf" || die
+	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
+
+	# Generate 146 .java files according to
+	# https://github.com/protocolbuffers/protobuf/blob/v3.19.6/java/core/generate-sources-build.xml
+	for proto in "${core_protos[@]}" compiler/plugin; do
+		"${BROOT}/usr/bin/protoc" \
+			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die
+	done
+}
diff --git a/dev-java/protobuf-java/protobuf-java-3.20.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.20.3.ebuild
new file mode 100644
index 000000000000..2e58b824d118
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.20.3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.protobuf:${PN}:${PV}"
+# Tests not enabled, depend on com.google.truth which is not packaged
+# https://github.com/protocolbuffers/protobuf/blob/v3.20.3/java/core/pom.xml#L35-L40
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+PARENT_PN="${PN/-java/}"
+PARENT_PV="${PV}"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
+LICENSE="BSD"
+SLOT="0/31"
+
+S="${WORKDIR}/${PARENT_P}/java"
+
+BDEPEND="
+	dev-libs/protobuf:${SLOT}
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+	)
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="core/src/main/resources"
+JAVA_SRC_DIR="core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_RESOURCE_DIRS="../src"
+JAVA_TEST_SRC_DIR="core/src/test/java"
+
+# Same than PATCHES but from repository's root directory,
+# please see function `src_prepare` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "java/" subdirectory.
+PATCHES=(
+)
+
+src_prepare() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	# Remove bundled jars
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+
+	# There is also compiler/plugin, but not in this list because in a subdirectory
+	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
+
+	# Copy resources from ../src/google/protobuf according to
+	# https://github.com/protocolbuffers/protobuf/blob/v3.20.2/java/core/pom.xml#L45-L61
+	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
+	cp "../src/google/protobuf/${core_protos[@]}.proto" \
+		"${JAVA_RESOURCE_DIRS}/google/protobuf" || die
+	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
+
+	# Generate 146 .java files according to
+	# https://github.com/protocolbuffers/protobuf/blob/v3.20.3/java/core/generate-sources-build.xml
+	for proto in "${core_protos[@]}" compiler/plugin; do
+		"${BROOT}/usr/bin/protoc" \
+			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die
+	done
+}
diff --git a/dev-java/protobuf-java/protobuf-java-3.21.8.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.8.ebuild
new file mode 100644
index 000000000000..abe81a5bcd1d
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.21.8.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.protobuf:${PN}:${PV}"
+# Tests not enabled, depend on com.google.truth which is not packaged
+# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L35-L40
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+PARENT_PN="${PN/-java/}"
+PARENT_PV="$(ver_cut 2-)"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
+LICENSE="BSD"
+SLOT="0/32"
+
+S="${WORKDIR}/${PARENT_P}/java"
+
+BDEPEND="
+	dev-libs/protobuf:${SLOT}
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+	)
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="core/src/main/resources"
+JAVA_SRC_DIR="core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_RESOURCE_DIRS="../src"
+JAVA_TEST_SRC_DIR="core/src/test/java"
+
+# Same than PATCHES but from repository's root directory,
+# please see function `src_prepare` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "java/" subdirectory.
+PATCHES=(
+)
+
+src_prepare() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	# Remove bundled jars
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+
+	# There is also compiler/plugin, but not in this list because in a subdirectory
+	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
+
+	# Copy resources from ../src/google/protobuf according to
+	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L45-L61
+	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
+	cp "../src/google/protobuf/${core_protos[@]}.proto" \
+		"${JAVA_RESOURCE_DIRS}/google/protobuf" || die
+	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
+
+	# Generate 146 .java files according to
+	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/generate-sources-build.xml
+	for proto in "${core_protos[@]}" compiler/plugin; do
+		"${BROOT}/usr/bin/protoc" \
+			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die
+	done
+}
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index 43fa605b496c..ab4856250e05 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -3,52 +3,103 @@
 
 EAPI=8
 
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="doc source test"
+# Version based on value in (java/)core/pom.xml from main branch
+# Please update me when new release
+# Maybe find a way to automatically change it?
+MAVEN_ID="com.google.protobuf:${PN}:3.21.7"
+# Tests not enabled, depend on com.google.truth which is not packaged
+# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L35-L40
+# JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-if [[ "${PV}" == "9999" ]]; then
+PARENT_PN="${PN/-java/}"
+PARENT_PV="${PV}"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
 	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-S="${WORKDIR}/protobuf-${PV}/java"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
 
 LICENSE="BSD"
-SLOT="0/31"
-KEYWORDS=""
+SLOT="0/32"
+
+S="${WORKDIR}/${PARENT_P}/java"
 
-COMMON_DEPEND=">=virtual/jdk-1.8:*"
 BDEPEND="
-	~dev-libs/protobuf-${PV}
-	${COMMON_DEPEND}
+	dev-libs/protobuf:${SLOT}
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+	)
+"
+RDEPEND="
+	>=virtual/jre-1.8:*
 "
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${DEPEND}"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="core/src/main/resources"
+JAVA_SRC_DIR="core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_RESOURCE_DIRS="../src"
+JAVA_TEST_SRC_DIR="core/src/test/java"
+
+# Same than PATCHES but from repository's root directory,
+# please see function `src_prepare` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "java/" subdirectory.
+PATCHES=(
+)
 
 src_prepare() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
 	eapply_user
 	popd > /dev/null || die
 
+	# Remove bundled jars
+	java-pkg_clean
+
 	java-pkg-2_src_prepare
-}
 
-src_compile() {
-	"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
+	# There is also compiler/plugin, but not in this list because in a subdirectory
+	core_protos=( any api descriptor duration empty field_mask source_context struct timestamp type wrappers )
+
+	# Copy resources from ../src/google/protobuf according to
+	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/pom.xml#L45-L61
+	mkdir -p "${JAVA_RESOURCE_DIRS}/google/protobuf/compiler" || die
+	cp "../src/google/protobuf/${core_protos[@]}.proto" \
+		"${JAVA_RESOURCE_DIRS}/google/protobuf" || die
+	cp {../src,"${JAVA_RESOURCE_DIRS}"}/google/protobuf/compiler/plugin.proto || die
 
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
+	# Generate 146 .java files according to
+	# https://github.com/protocolbuffers/protobuf/blob/v21.7/java/core/generate-sources-build.xml
+	for proto in "${core_protos[@]}" compiler/plugin; do
+		"${BROOT}/usr/bin/protoc" \
+			--java_out="${JAVA_SRC_DIR}" -I../src ../src/google/protobuf/"${proto}".proto || die
+	done
 }
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4d3c9f66c100..be9ac9025bed 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 0c0c681c72d5..07f2341a7ca7 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,5 +1,5 @@
 DIST expat-2.4.9.tar.xz 459284 BLAKE2B 105fef732e26b691f6c212341b7377b518d693aa67f106d0ff2f0fbccd798b7526473ed21e22b6d2b6f1ca8aa7d0eb0adc62ffdefc3c2cb81a6af5a379e64de9 SHA512 8508379b4915d84d50f3638678a90792179c98247d1cb5e6e6387d117af4dc148ac7031c1debea8b96e7b710ef436cf0dd5da91f3d22b8186a00cfafe1201169
 DIST expat-2.5.0.tar.xz 460560 BLAKE2B 670298d076ff3b512a0212170d40cb04c601a11d6b152f215a5302ad3238c69c2386393d7a6c70bc284be35ce97bf27d87115c3391f4bc17406e509d739d3e31 SHA512 2da73b991b7c0c54440485c787e5edeb3567230204e31b3cac1c3a6713ec6f9f1554d3afffc0f8336168dfd5df02db4a69bcf21b4d959723d14162d13ab87516
 EBUILD expat-2.4.9.ebuild 2284 BLAKE2B 2f75d5b3709f2891725858a1b4f0f3d357288453653c40e32fcc599caedc1e0d6e0755ce497d00a535f2ac6ebc925c7ad4b9703bb6e88c58ee6f6a45f49dbb52 SHA512 216cf850735cbd4d992b7163dd2fe921f368876af70fa9d84229bdfb81f54d61078937ad007645d6b4578f4262f6ad963a19d13546d0d28aa5ae87cfddf6ff00
-EBUILD expat-2.5.0.ebuild 2287 BLAKE2B 6aaf18e354de25bef3a6518f7d0fe6c70e1bb9d9a6250d5f9b37ae96bb6dba5d869a4cd909466456d6643afa0f004b3ff72d57e5bc8a8253d0c3de6dcc403bb1 SHA512 12576ae1a01300538e50815b2c4cb70095307da2fbc1f68dac0f647fa51199f693c02fd6c70e7c103c9864956bc206e8c1388e03920f51f9ab8c59813fed6d9a
+EBUILD expat-2.5.0.ebuild 2286 BLAKE2B 45efa0ba0630d4c47c0ff04983a336a8b6cd8103d2b6825f548505de8ec257911335b7604454af14d62138bf18160f85d4f2858b261d608a7137b30b62cfac19 SHA512 c5528277997a98557fbd6136c20e385579181b83110dd03563ae3e886ba357c4028714a6d261c77305c304351d1139a4a22c1bbedf9e092fb64bcad9308b6fa8
 MISC metadata.xml 571 BLAKE2B ebefe11eb4a54dda87048089930a051a629fd99a6983b3c804dfd033eee4017c3b1871cbdff56c8659cdf74b19651cd7f2134721a9bab3e8a752d4a1694c6266 SHA512 8d726b1dee71528e43c8693bd4b08cf33a94f43470126aa18a51ed248b032c5e8b9d801c5b2d5f58c2fd7896b32ee9e6eb3953395e5a6004cdf00569d114ad1d
diff --git a/dev-libs/expat/expat-2.5.0.ebuild b/dev-libs/expat/expat-2.5.0.ebuild
index b5ed6a6218ea..a28cd0e2ee08 100644
--- a/dev-libs/expat/expat-2.5.0.ebuild
+++ b/dev-libs/expat/expat-2.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/mmtf-cpp/Manifest b/dev-libs/mmtf-cpp/Manifest
index f6c5f24656bf..c234d955c66e 100644
--- a/dev-libs/mmtf-cpp/Manifest
+++ b/dev-libs/mmtf-cpp/Manifest
@@ -1,3 +1,5 @@
 DIST mmtf-cpp-1.0.0.tar.gz 59363 BLAKE2B afcb03ce1f83e10348b148bd6218e5e10ab3e425b0f8105d292f9e265800ea6ca4562dc11fa4453df05d8a698576fba9dfe982aa91a8dcc1983480c0c52dbcf7 SHA512 0e502ae76e31689d440bff2fbc90fdab7ff62d5369e26f7ab2836966a30bda72625d6d5da33bc0770cf471a1549a02f7478ea16a01dd6be2809568d8daecb073
+DIST mmtf-cpp-1.1.0.tar.gz 106527 BLAKE2B 46f7b44ca6d9096b1f6c7911121d54ab50889c884156724229912bb125492682435d05d93b55b0c8c8025f293eb23f537da4f01a42fe65f4f89270e49429fce7 SHA512 91f30ac1031d71a5358fd83bf864afdac1d1ea758d775811b94a2609be286fcbb7dcfece097c6959afb4f8f9d237b7372183424d4ef211364cc69c08f2cd6e52
 EBUILD mmtf-cpp-1.0.0-r1.ebuild 476 BLAKE2B 41ab5557ca52751a77aab013709b3e9b0897e248b902b36c3f3acccfc38b1c49a2ad2f039969275208f40d7bf767c4b904adbdb401fe1cfb7fe939506e7bdae2 SHA512 a1099655707c9c1d6eb24b812bab09b379f86a7cf649510977daf33f9d8d17d31facea0ab7926b112a5f6c3236259a12bf8b2bfa2df3db3a2c66c18d1c1b2f9d
+EBUILD mmtf-cpp-1.1.0.ebuild 476 BLAKE2B 41ab5557ca52751a77aab013709b3e9b0897e248b902b36c3f3acccfc38b1c49a2ad2f039969275208f40d7bf767c4b904adbdb401fe1cfb7fe939506e7bdae2 SHA512 a1099655707c9c1d6eb24b812bab09b379f86a7cf649510977daf33f9d8d17d31facea0ab7926b112a5f6c3236259a12bf8b2bfa2df3db3a2c66c18d1c1b2f9d
 MISC metadata.xml 441 BLAKE2B b55284cf0df7ee0750b0a2058b95ee0e83b556cacf506d41f8c58c5f4ae6e283f61b288bf2b5f00d86f4636e1ea2f9c1824524db83d3ddcc77c10e0fb0452ec7 SHA512 c7d481aa61f4a5fa627e72bc2307eec74e1bbfcc70efa6b1ff6132ced2df8d9b55d5710a78bac639c09375d2314a74dd9e46e20a9058aceb2b7e3b85cf8c3f35
diff --git a/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0.ebuild b/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0.ebuild
new file mode 100644
index 000000000000..c31d0595eb2f
--- /dev/null
+++ b/dev-libs/mmtf-cpp/mmtf-cpp-1.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="The pure C++ implementation of the MMTF API, decoder and encoder"
+HOMEPAGE="https://github.com/rcsb/mmtf-cpp"
+SRC_URI="https://github.com/rcsb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND="dev-libs/msgpack"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 55ce29cda734..ca615f0231e1 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -4,9 +4,16 @@ AUX protobuf-3.16.0-protoc_input_output_files.patch 10060 BLAKE2B e91d2e60ec9a90
 AUX protobuf-3.19.0-disable_no-warning-test.patch 1620 BLAKE2B e4f324ed59b2c31662cc625e9d3f1fdb20ee2a25769dbf86093e5000f73a01e11f05459989aaefeaf0414648cd52f1f1025b9d4f1423cdca4844e42e96f54836 SHA512 8c4bc72976a7eb3418b51e7a1c45b49d7ffaeb91a86f440008e6f162773b1db7afed4a6ae1d0b3510d49361c369b6552a9ba4976d104d804d825227aa7113d95
 AUX protobuf-3.19.0-system_libraries.patch 7514 BLAKE2B 1ff5c226232c325ed48cf16e2c47652615c4bd1503f1be8560e7f2e8658ffefeffeef72a6baf4368f758e30a4a81d582769b61dd0b3e383c8188cd03bf409c01 SHA512 b6a58e483dbb1f6151c2f7c735fbd55f34bcf98d6370eabb425dbd96e10cb87e8dfbf5024ad8f888cb80a095bc26598aceb55d576d37166550ee62db41c51a44
 AUX protobuf-3.20.1-protoc_input_output_files.patch 10066 BLAKE2B 1a5c045cc1c30ddf520ce6f68495f373a2dc4265ae3629b2e2deb6abb37935aea4c17267977442b5fe4e5b81d1c9467fddf5ca5e9045b444a4212a28e31ffab1 SHA512 7ca9fa2d602d0a11eea35e8284cd11f12e4e3ad3e6b0bba99f8e2c47a804f3f196810f0507806fb8d559c44f73b87a771f8fa9e9ce2c0acf4405f44894f2d13a
+AUX protobuf-3.20.2-protoc_input_output_files.patch 10080 BLAKE2B f52ea613b1104aa703e5e10eb5f968e33e46f05523e13fe84369a24ccbc16cecbcce3221b64b1acd624500864d224ccb59d1ce626157a0d0d77870f79ea64bd8 SHA512 dcf5dbd7be4a025d9ee96ed9be4566452ae4f946d0e1ae4c411a0dc3b7071fc156aca796497c0f2b67563a8ee884bded1a931d712cd7a3727301bbe37ec646f0
+DIST protobuf-21.8.tar.gz 5110670 BLAKE2B 3c1b0c857a86e9586481d63896341d0cb11290dbd710d87a6f7889d34f5f262abe2986a29ed19a730f8fa5df0b5c62d77a4db6aa415a72b239f7483ae8d6380c SHA512 cb17be759311e91172801add1f88fe7a0291b547170c40d2e3303f5c248570dddeade96bd48740edd628215f55269c97475e2f4c4a41c50f1018d525f52036cb
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
+DIST protobuf-3.19.6.tar.gz 5299501 BLAKE2B 3121f76b95f83c5309ce49ce296b738eff7be9d3a5093c564fbe2339fb5f3729e406f1b44bfcc05feb0d31ab63838bb4f54685017977c73a33b91215a6776072 SHA512 8f92242f2be8e1bbfba41341c87709ad91ad83b8b3e3df88bb430411541d3399295f49291fd52b50e3487b0fce33181cb4d175685fd25aac72adfaee26a612d4
 DIST protobuf-3.20.1.tar.gz 5368262 BLAKE2B 1ce1aef2e4c4f3ea4863629cc75d89fe17d0c7ac0c342ac641c787456fd4a12756c2892a27ddadedc94a7201494ec84566638ce33a03cb0c867b04e9eee0edb3 SHA512 fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0
+DIST protobuf-3.20.3.tar.gz 5374320 BLAKE2B fb51f2a0ecf5b83235f5252051f8192ae377bb7a5e030c3f3e9435ccde25919c059830cf476e840fa6c970928a32c0075e213c9d5d4d9e3d3b24732c39a9fbfa SHA512 01d6703bdbe769a1200ee6e4ebcdcb99688ec21f576988c60d82ec36e0822820fb245fcb4ca53293143d53e666d748b5a0c6937bc659fb3cdc4cd9b05ed12a1c
+EBUILD protobuf-21.8.ebuild 4124 BLAKE2B ae66579a111e158ecb2d37f8190943c33e3f29eeb2a1806915423d88229b9f388b10a0d4baf055948344c89bfb16a7bc62f37d9acf96841d1372a18d2e95d994 SHA512 e70c0f5aecce8d0220d3a1d538c23ecbeef78539dc36f8f7f4e5a74e55b1e221a3366ed2ecad8cb300ed56a0bcf849c8eb9a5d85e386d6c1fc2e12a6db482c7f
 EBUILD protobuf-3.19.3.ebuild 4138 BLAKE2B b37b99abbd41acfb2299e1a054d3c36547bdd63542ecc76d03d69344d7e89a03870eda97bba1ae6ae3284c33abdfca6930e74b6ab7109d93cd588c522d6d52f6 SHA512 2eadab6fd0f4b30338a294b69c866ff945e98f05549403484700b2e44314433736a682ab033bc4c2eb0a802934cba92567e6c9bad4d30d79a67d671f88e04591
+EBUILD protobuf-3.19.6.ebuild 4331 BLAKE2B 0672fb5ecbd4080811f6c51f18accbaa1665d2e63ba5e9d6d422531638ac17ac475ff094cb59313c8c6ea0bf232b071b875091e15e033284e9f74f35fcaf194d SHA512 7ac1389f1895200c9c6d5067b03bbd95ee428ce6cbcee334eb23ec81102b9e0c24b548b755e5c26c5afbf72603e92600ab8118504f8e9127b288d33cc0b308fe
 EBUILD protobuf-3.20.1-r1.ebuild 3930 BLAKE2B 3ac2d80c6391f9147445a23fa39576ed5158bfde601f4a38f80784c9a29523c0749ec8572bd1910412bbae402237539f5ba3fa4fe5a16b188d9fbceb0babc3dc SHA512 3dfff6e4a92afb0707398ab58f00051269cbb8c70ac73ef1bfe532baa0ae59ea47fec2131f797f7fe4750929b966c2878676c235339762d8c447cdfd4bfa1c47
-EBUILD protobuf-9999.ebuild 3938 BLAKE2B 35b8a868ae096c0f74b5037051278e79ec8f0cf869b9effb038015ec11ff4775d04d13b6ffa8978066111e86d9387b23d2872ddc5991f3f9f71f11f2aebac064 SHA512 8edbd0f333611fdc9590369339cd68bff7e32a7f193c3cba72ccc3e923a970b205147accc430a4fe0df3e1edc0a0970f2857782728b82a6e78d4a631109e3849
+EBUILD protobuf-3.20.3.ebuild 4124 BLAKE2B 63f38b9330d49ae36131aa934e5b38cf87e10408370d92a59720b103ea499f00af61a4d22935ea361655349fcf6e584fdff45663b0d521bbc358d1039a1372b5 SHA512 511aad6e3a7af19a3f207657e9f9c6f20ef8c283e673d17f5ac1237f34bef615ae29b04a1461c0b743afbf9aa110007bf7fba847b2448c0eef3ba93c72fe970a
+EBUILD protobuf-9999.ebuild 4124 BLAKE2B 80612d28804cb40f5dd36e014ffc996cae88c7a29f7da51654df768c938f5f91c736c7bba53a4dd4ed80dc7de460a48aeecba695312e63c9814e244053fa1b87 SHA512 57a1305fbe4500c43cda4bb6408a43e8b9e3e9cb9c0210a9f59ed3094f2f58bbbd21818c436f091918864e682ff8314b0aa8d30cddae03efccc58a5d06ccd2f7
 MISC metadata.xml 595 BLAKE2B ba1b916e26b1e53f68e660f03d2e53fea8d22db04e8241ebec3ec20fbb251c2b164cf25d5fb6118423ce7721a822ae2302aab137b0748730e9a6860bf8e65668 SHA512 785e2550621b79b6350e1a6b52ed9992610769885fb29a9e92ee45a35158cc08707a3590dfcbece9ee9a5e16e1abfb614e8186132da7b942f2761b5e6ecfa827
diff --git a/dev-libs/protobuf/files/protobuf-3.20.2-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.20.2-protoc_input_output_files.patch
new file mode 100644
index 000000000000..e4bf6858974a
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.20.2-protoc_input_output_files.patch
@@ -0,0 +1,240 @@
+https://github.com/protocolbuffers/protobuf/pull/235
+
+--- a/src/google/protobuf/compiler/command_line_interface.cc
++++ b/src/google/protobuf/compiler/command_line_interface.cc
+@@ -1112,6 +1112,28 @@
+   }
+
+   if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++    bool success = false;
++    int in_fd = STDIN_FILENO;
++    int out_fd = STDOUT_FILENO;
++
++    if (!protobuf_in_path_.empty()) {
++      in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++      if (in_fd == -1) {
++        std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
++        return 1;
++      }
++    }
++    if (!protobuf_out_path_.empty()) {
++      out_fd = open(protobuf_out_path_.c_str(),
++                    O_WRONLY | O_CREAT | O_TRUNC,
++                    0644);
++      if (out_fd == -1) {
++        std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
++        close(in_fd);
++        return 1;
++      }
++    }
++
+     if (codec_type_.empty()) {
+       // HACK:  Define an EmptyMessage type to use for decoding.
+       DescriptorPool pool;
+@@ -1120,13 +1142,20 @@
+       file.add_message_type()->set_name("EmptyMessage");
+       GOOGLE_CHECK(pool.BuildFile(file) != nullptr);
+       codec_type_ = "EmptyMessage";
+-      if (!EncodeOrDecode(&pool)) {
+-        return 1;
+-      }
++      success = EncodeOrDecode(&pool, in_fd, out_fd);
+     } else {
+-      if (!EncodeOrDecode(descriptor_pool.get())) {
+-        return 1;
+-      }
++      success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
++    }
++
++    if (in_fd != STDIN_FILENO) {
++      close(in_fd);
++    }
++    if (out_fd != STDOUT_FILENO) {
++      close(out_fd);
++    }
++
++    if (!success) {
++      return 1;
+     }
+   }
+
+@@ -1165,6 +1194,11 @@
+   for (int i = 0; i < proto_path_.size(); i++) {
+     source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
+   }
++  if (mode_ == MODE_COMPILE &&
++      (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
++    std::cerr << "--protobuf_in and --protobuf_out are only valid with "
++         << "decode operations. Ignoring.";
++  }
+
+   // Map input files to virtual paths if possible.
+   if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
+@@ -1888,6 +1922,12 @@
+   } else if (name == "--deterministic_output") {
+     deterministic_output_ = true;
+
++  } else if (name == "--protobuf_in") {
++    protobuf_in_path_ = value;
++
++  } else if (name == "--protobuf_out") {
++    protobuf_out_path_ = value;
++
+   } else if (name == "--error_format") {
+     if (value == "gcc") {
+       error_format_ = ERROR_FORMAT_GCC;
+@@ -2021,22 +2061,38 @@
+   --version                   Show version info and exit.
+   -h, --help                  Show this text and exit.
+   --encode=MESSAGE_TYPE       Read a text-format message of the given type
+-                              from standard input and write it in binary
+-                              to standard output.  The message type must
++                              from input protobuf file and write it in binary
++                              to output protobuf file.  The message type must
+                               be defined in PROTO_FILES or their imports.
++                              The input/output protobuf files are specified
++                              using the --protobuf_in and --protobuf_out
++                              command line flags.
+   --deterministic_output      When using --encode, ensure map fields are
+                               deterministically ordered. Note that this order
+                               is not canonical, and changes across builds or
+                               releases of protoc.
+   --decode=MESSAGE_TYPE       Read a binary message of the given type from
+-                              standard input and write it in text format
+-                              to standard output.  The message type must
++                              input protobuf file and write it in text format
++                              to output protobuf file.  The message type must
+                               be defined in PROTO_FILES or their imports.
++                              The input/output protobuf files are specified
++                              using the --protobuf_in and --protobuf_out
++                              command line flags.
+   --decode_raw                Read an arbitrary protocol message from
+-                              standard input and write the raw tag/value
+-                              pairs in text format to standard output.  No
++                              input protobuf file and write the raw tag/value
++                              pairs in text format to output protobuf file.  No
+                               PROTO_FILES should be given when using this
+-                              flag.
++                              flag.  The input/output protobuf files are
++                              specified using the --protobuf_in and
++                              --protobuf_out command line flags.
++  --protobuf_in=FILE          Absolute path to the protobuf file from which
++                              input of encoding/decoding operation will be
++                              read.  If omitted, input will be read from
++                              standard input.
++  --protobuf_out=FILE         Absolute path to the protobuf file to which
++                              output of encoding/decoding operation will be
++                              written.  If omitted, output will be written to
++                              standard output.
+   --descriptor_set_in=FILES   Specifies a delimited list of FILES
+                               each containing a FileDescriptorSet (a
+                               protocol buffer defined in descriptor.proto).
+@@ -2347,7 +2403,9 @@
+   return true;
+ }
+
+-bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
++bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
++                                          int in_fd,
++                                          int out_fd) {
+   // Look up the type.
+   const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
+   if (type == nullptr) {
+@@ -2359,15 +2417,15 @@
+   std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
+
+   if (mode_ == MODE_ENCODE) {
+-    SetFdToTextMode(STDIN_FILENO);
+-    SetFdToBinaryMode(STDOUT_FILENO);
++    SetFdToTextMode(in_fd);
++    SetFdToBinaryMode(out_fd);
+   } else {
+-    SetFdToBinaryMode(STDIN_FILENO);
+-    SetFdToTextMode(STDOUT_FILENO);
++    SetFdToBinaryMode(in_fd);
++    SetFdToTextMode(out_fd);
+   }
+
+-  io::FileInputStream in(STDIN_FILENO);
+-  io::FileOutputStream out(STDOUT_FILENO);
++  io::FileInputStream in(in_fd);
++  io::FileOutputStream out(out_fd);
+
+   if (mode_ == MODE_ENCODE) {
+     // Input is text.
+--- a/src/google/protobuf/compiler/command_line_interface.h
++++ b/src/google/protobuf/compiler/command_line_interface.h
+@@ -294,7 +294,9 @@
+       GeneratorContext* generator_context, std::string* error);
+
+   // Implements --encode and --decode.
+-  bool EncodeOrDecode(const DescriptorPool* pool);
++  bool EncodeOrDecode(const DescriptorPool* pool,
++                      int in_fd,
++                      int out_fd);
+
+   // Implements the --descriptor_set_out option.
+   bool WriteDescriptorSet(
+@@ -429,6 +431,13 @@
+   // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
+   std::vector<std::string> descriptor_set_in_names_;
+
++  // When using --encode / --decode / --decode_raw absolute path to the output
++  // file. (Empty string indicates write to STDOUT).
++  std::string protobuf_out_path_;
++  // When using --encode / --decode / --decode_raw, absolute path to the input
++  // file. (Empty string indicates read from STDIN).
++  std::string protobuf_in_path_;
++
+   // If --descriptor_set_out was given, this is the filename to which the
+   // FileDescriptorSet should be written.  Otherwise, empty.
+   std::string descriptor_set_out_name_;
+--- a/src/google/protobuf/compiler/command_line_interface_unittest.cc
++++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc
+@@ -99,7 +99,7 @@
+   void SetUp() override;
+   void TearDown() override;
+
+-  // Runs the CommandLineInterface with the given command line.  The
++  // Run the CommandLineInterface with the given command line.  The
+   // command is automatically split on spaces, and the string "$tmpdir"
+   // is replaced with TestTempDir().
+   void Run(const std::string& command);
+@@ -2626,6 +2626,17 @@
+               std::string::npos);
+   }
+
++  void ExpectBinaryFilesMatch(const std::string &expected_file,
++                              const std::string &actual_file) {
++    std::string expected_output, actual_output;
++    ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
++    ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
++
++    // Don't use EXPECT_EQ because we don't want to print raw binary data to
++    // stdout on failure.
++    EXPECT_TRUE(expected_output == actual_output);
++  }
++
+  private:
+   void WriteUnittestProtoDescriptorSet() {
+     unittest_proto_descriptor_set_filename_ =
+@@ -2749,6 +2760,19 @@
+       "Can only use --deterministic_output with --encode.\n");
+ }
+
++TEST_P(EncodeDecodeTest, RedirectInputOutput) {
++  std::string out_file = TestTempDir() + "/golden_message_out.pbf";
++  EXPECT_TRUE(
++      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
++          " --encode=protobuf_unittest.TestAllTypes" +
++          " --protobuf_in=" + TestUtil::GetTestDataPath(
++              "net/proto2/internal/"
++              "testdata/text_format_unittest_data_oneof_implemented.txt") +
++          " --protobuf_out=" + out_file));
++  ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath(
++      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
++}
++
+ INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
+                          testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
+ }  // anonymous namespace
diff --git a/dev-libs/protobuf/protobuf-21.8.ebuild b/dev-libs/protobuf/protobuf-21.8.ebuild
new file mode 100644
index 000000000000..523c763c265c
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-21.8.ebuild
@@ -0,0 +1,148 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
+LICENSE="BSD"
+SLOT="0/32"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.19.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.19.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.20.2-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/9433
+	sed -e "/^[[:space:]]*static_assert(alignof(U) <= 8, \"\");$/d" -i src/google/protobuf/descriptor.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}"
+		die "Please update SLOT variable"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.19.6.ebuild b/dev-libs/protobuf/protobuf-3.19.6.ebuild
new file mode 100644
index 000000000000..8784499c1fd7
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.19.6.ebuild
@@ -0,0 +1,151 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
+LICENSE="BSD"
+SLOT="0/30"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.19.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.19.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/9392
+	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/9433
+	sed -e "/^[[:space:]]*static_assert(alignof(T) <= 8, \"\");$/d" -i src/google/protobuf/descriptor.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}"
+		die "Please update SLOT variable"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-3.20.3.ebuild b/dev-libs/protobuf/protobuf-3.20.3.ebuild
new file mode 100644
index 000000000000..cade7f688a49
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.20.3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
+LICENSE="BSD"
+SLOT="0/31"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.19.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.19.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.20.2-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+	default
+
+	# https://github.com/protocolbuffers/protobuf/issues/7413
+	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8082
+	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8459
+	sed \
+		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
+		-i src/google/protobuf/arena_unittest.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/8460
+	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
+
+	# https://github.com/protocolbuffers/protobuf/issues/9433
+	sed -e "/^[[:space:]]*static_assert(alignof(U) <= 8, \"\");$/d" -i src/google/protobuf/descriptor.cc || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}"
+		die "Please update SLOT variable"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index 0e620717ec44..9f84c789877f 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -5,24 +5,23 @@ EAPI=8
 
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 
-if [[ "${PV}" == "9999" ]]; then
+if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
 	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
 else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+"
+
 LICENSE="BSD"
-SLOT="0/31"
+SLOT="0/32"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
@@ -116,6 +115,12 @@ multilib_src_test() {
 multilib_src_install_all() {
 	find "${ED}" -name "*.la" -delete || die
 
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf.so.${SLOT#*/}"
+		die "Please update SLOT variable"
+	fi
+
 	insinto /usr/share/vim/vimfiles/syntax
 	doins editors/proto.vim
 	insinto /usr/share/vim/vimfiles/ftdetect
diff --git a/dev-perl/GD/GD-2.760.0.ebuild b/dev-perl/GD/GD-2.760.0.ebuild
new file mode 100644
index 000000000000..f722bb933ed8
--- /dev/null
+++ b/dev-perl/GD/GD-2.760.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=2.76
+DIST_EXAMPLES=("demos/*")
+inherit perl-module
+
+DESCRIPTION="Interface to Thomas Boutell's gd library"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="animgif fcgi test truetype xpm"
+
+RDEPEND="
+	>=media-libs/gd-2.2.3[png,jpeg]
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng
+	sys-libs/zlib
+	truetype? (
+		media-libs/gd[truetype]
+		media-libs/freetype:2
+	)
+	xpm? (
+		media-libs/gd[xpm]
+		x11-libs/libXpm
+	)
+	fcgi? (
+		dev-libs/fcgi
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${RDEPEND}
+	>=virtual/perl-ExtUtils-Constant-0.230.0
+	dev-perl/ExtUtils-PkgConfig
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=dev-perl/Test-Fork-0.20.0
+		>=virtual/perl-Test-Simple-0.880.0
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.760.0-respect-libdir.patch
+)
+
+src_configure() {
+	local myconfargs=(
+		VERSION_33
+		GD_UNCLOSEDPOLY
+		GD_FTCIRCLE
+
+		JPEG
+		PNG
+		GIF
+	)
+
+	# The following flags do not work properly. This is why we force-enable
+	# at least some of them. See bug 787404 as tracker.
+	use animgif && myconfargs+=( ANIMGIF )
+	use truetype && myconfargs+=( FT )
+	use xpm && myconfargs+=( XPM )
+
+	# Per line 284 of Makefile.PL
+	local myconf="--lib_gd_path ${ESYSROOT}/usr/$(get_libdir) -options '$(printf '%s,' ${myconfargs[@]})'"
+	use fcgi && myconf+=" --fcgi"
+
+	perl-module_src_configure
+}
+
+src_test() {
+	# The 'GD' format itself is long-obsolete and gone in >=media-libs/gd-2.3.3
+	perl_rm_files t/z_*.t t/GD.t
+	perl-module_src_test
+}
diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest
index f2b41ca89398..e6b40e6edce0 100644
--- a/dev-perl/GD/Manifest
+++ b/dev-perl/GD/Manifest
@@ -1,3 +1,6 @@
+AUX GD-2.760.0-respect-libdir.patch 1416 BLAKE2B 63ee4ce7af705624e7e52f5ccd36d521de5f78d4bb079a79661106d31a726eb64fd5069d6888dcec1e3ae46d83bb44ef88ae6c2fd5ad95a97c92d51d7afd8d07 SHA512 93bced05b6643681a9e566fa12fe259e7345a4de4101b2d9827bf81602544178dc7b17f0918d827ba5135c9e055a92707c802b8989e9518e8ed94e1482aa8df3
 DIST GD-2.73.tar.gz 261203 BLAKE2B 088cb4d3c846d61e89631c7fef6b0273489297f0613e1ebb98c33b404a613431c79a5e72c2b757450496ef8d86aabe387b102a4c8d22d69532b8d8e989bac9bf SHA512 0c360c86307c8a2484bd8e1fb4cf24e27f7976bcfd830d9070fdc3775d233845734c59796082d498276aa715f30c9452c492b0d5bd75e488c1e9c5fa76490709
+DIST GD-2.76.tar.gz 264364 BLAKE2B 4cfe36f74aae50141f00cd8d3a6eddbf819dafd76ecfc1fbf219c3ae40009b9e4c1e6b94a33416842846dead17bfc1f883324757fd66124aae8e2cbae2bcfef3 SHA512 31c2d61440a7fef9804aed677ee5568f6c237e678cf5a2b7f48e98326ef7cddbf3624ce3965e6711ef9cec4148881a0cb4352c19b91ead4b78835fafaeefbe4d
 EBUILD GD-2.730.0-r1.ebuild 1601 BLAKE2B 8c92e9a553a1af58731441adc324e3c751370b3aec5182b57c6d1731152a277c1d0d4888bdcdc573f1252108b8fa9ad72836c99ee66d59755ae2f2482e011578 SHA512 1f962ebe6a9a9e1d499ad4fe298c57997913fc7a1594d7f54b3df1ad1ff6e6eb5e6b6c14f7261c9fd8119e075570c60a9cfd0a3e23af422531bf15d20e41119c
+EBUILD GD-2.760.0.ebuild 1648 BLAKE2B 064964e4ca345b09107f0d5dc1f2f07d867082fe6b3a2a38077fd530c3904f43c73caf4a0bca3279c7b7187e3c22cc938b59004a150ea2e7e40e37880505e456 SHA512 f76e5b4d2e7bb72e32407dfe24110f03e33cf818a599c6cd23714d2cdb6a625485c3951f9087387f3dc1436ef5d4b81abcab62cfab2f6e2e76a51cc581153e86
 MISC metadata.xml 853 BLAKE2B 4332a510e17993dbfe948ad2ab9bd2a87fed7336a9fb536e933ea81d595674b019a4fc4312e61306ed224996fdcc9e9131ced244ede1823d19270b72e7d0e43f SHA512 e96e747f74b628c306f4a28b36d40da109bf6b580c2dcf09426717a77e77620e63f3c559f83662f221e2ba95c9d317856c80e5e0f438edb82ef89b6d1d9879fa
diff --git a/dev-perl/GD/files/GD-2.760.0-respect-libdir.patch b/dev-perl/GD/files/GD-2.760.0-respect-libdir.patch
new file mode 100644
index 000000000000..3651cc3283e2
--- /dev/null
+++ b/dev-perl/GD/files/GD-2.760.0-respect-libdir.patch
@@ -0,0 +1,39 @@
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -56,12 +56,6 @@ END
+ 
+ @LIBS    = qw(-lgd) unless @LIBS;
+ 
+-# support for AMD64 libraries
+-if (-d '/usr/lib64') {
+-  my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH;
+-  @LIBPATH = (@LIBPATH,@libs64);
+-}
+-
+ #############################################################################################
+ # Build options passed in to script to support reproducible builds via Makefiles
+ #############################################################################################
+@@ -219,12 +213,6 @@ if( ! defined($lib_gd_path) )
+   $PREFIX = prompt('Where is libgd installed?','/usr/lib');
+ }
+ 
+-unless ($AUTOCONFIG || $PREFIX eq '/usr/lib') {
+-  $PREFIX =~ s!/lib$!!;
+-  unshift @INC,"-I$PREFIX/include";
+-  unshift @LIBPATH,"-L$PREFIX/lib";
+-}
+-
+ # FEATURE FLAGS
+ 
+ ##################################################################################################################
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -514,7 +514,7 @@ sub try_to_autoconfigure {
+   unless ($config) {
+       my %config;
+       require ExtUtils::PkgConfig;
+-      %config = ExtUtils::PkgConfig->find ("$prefix/lib/pkgconfig/gdlib.pc") if $prefix;
++      %config = ExtUtils::PkgConfig->find ("$lib_gd_path/pkgconfig/gdlib.pc") if $prefix;
+       %config = ExtUtils::PkgConfig->find ("gdlib") unless %config;
+       return unless %config;
+       $version  = $config{modversion};
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 42b44296d0c4..d48695a2e8bf 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Net-AMQP-RabbitMQ/Manifest b/dev-perl/Net-AMQP-RabbitMQ/Manifest
index 1e84fb533387..561dc98ed7c7 100644
--- a/dev-perl/Net-AMQP-RabbitMQ/Manifest
+++ b/dev-perl/Net-AMQP-RabbitMQ/Manifest
@@ -1,3 +1,5 @@
 DIST Net-AMQP-RabbitMQ-2.40009.tar.gz 198363 BLAKE2B 35aea3ba96b6b9cfaf8b8fa14d2a00326e4d64cc74d438ab59b6773f7ce67fd2ea7ded91a487eb20cdbe174c68825434839a8d7afb8e764e4a228e7088bba875 SHA512 2c0f53d59858e777fbc712c3bd06e3464783559dd9424c58a8fe586747e1d43aa4a607268484ec8bf4f10e979788ed5ea9558208096187c6e0c12a473e465459
+DIST Net-AMQP-RabbitMQ-2.40010.tar.gz 206449 BLAKE2B c7b3e8b9841fb10519da063088dd1f8b2aa9791d459ce88198610394d284c182147f22bf260c7291e36a9b56903499bc43991d029e02ff009709b38557b43bff SHA512 1e0256a3903379031059723ca0d11182ed4ef5a4ae4053d47f57ae1d4c5f42b3a9c48b7fd3dceb057c492c179bc01484651bb063fb5bca4542185fdca7471b06
 EBUILD Net-AMQP-RabbitMQ-2.40009.ebuild 1095 BLAKE2B ce8e7ceb5812cfe232811635a38a187a1d141bc5ef2195e85e73c82ad29049cb080f9e1fbdb4dddc9aed55e92ae9f4765b799c9ed9a9b706177edd0a9c8a02d7 SHA512 9f13b847d0a2615ed0095ea1cd5eb48764894d0741dcaa55f5d007028217df349d2ac1031a6bbcdebd2ccc14d8e441a85d139c7444816d81092d535de4e5d810
+EBUILD Net-AMQP-RabbitMQ-2.40010.ebuild 1095 BLAKE2B ce8e7ceb5812cfe232811635a38a187a1d141bc5ef2195e85e73c82ad29049cb080f9e1fbdb4dddc9aed55e92ae9f4765b799c9ed9a9b706177edd0a9c8a02d7 SHA512 9f13b847d0a2615ed0095ea1cd5eb48764894d0741dcaa55f5d007028217df349d2ac1031a6bbcdebd2ccc14d8e441a85d139c7444816d81092d535de4e5d810
 MISC metadata.xml 505 BLAKE2B d62dec2c43dbdb447305841145f339f353322e4191b3c9c88683013db6a734a53479dea77de1c6dd086a3bd81c0b80d70489460a2c278b17f4dec1a8c985302d SHA512 fc9e8ca0552cc6c5f638afaa918602f5fbd008c6a88afea0fc21366b3f2fa7289f1fef57a91111376bdb14566a826474dd0765ee9a9a88fa8e1bbfd3c9ba435c
diff --git a/dev-perl/Net-AMQP-RabbitMQ/Net-AMQP-RabbitMQ-2.40010.ebuild b/dev-perl/Net-AMQP-RabbitMQ/Net-AMQP-RabbitMQ-2.40010.ebuild
new file mode 100644
index 000000000000..dc9f888eecc1
--- /dev/null
+++ b/dev-perl/Net-AMQP-RabbitMQ/Net-AMQP-RabbitMQ-2.40010.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR="MSTEMLE"
+
+inherit perl-module
+
+DESCRIPTION="interact with RabbitMQ over AMQP using librabbitmq"
+
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/Math-Int64-0.540.0"
+
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.660.0
+	test? (
+		net-misc/rabbitmq-server
+	)
+"
+
+src_test() {
+	einfo "Starting rabbitmq"
+	local -x RABBITMQ_LOG_BASE="${T}/rabbitmq/log"
+	local -x RABBITMQ_MNESIA_BASE="${T}/rabbitmq/mnesia"
+	local -x RABBITMQ_LOGS="${T}/rabbitmq.log"
+	local -x RABBITMQ_PID_FILE="${T}/rabbitmq.pid"
+	local -x RABBITMQ_ENABLED_PLUGINS_FILE="${T}/rabbitmq/enabled_plugins"
+	/usr/libexec/rabbitmq/rabbitmq-server -p 5672:5672 &
+
+	einfo "Waiting for rabbitmq to fully load"
+	while ! { echo >/dev/tcp/localhost/5672 ; } &> /dev/null; do
+		sleep 1
+	done
+	einfo "rabbitmq is ready"
+
+	perl-module_src_test
+
+	einfo "Stopping rabbitmq"
+	kill "$(<"${RABBITMQ_PID_FILE}")" || die
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index eacf54098cde..09525c7a3a9a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index f1ee9402b9b5..5bc60fe787db 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,10 @@
 DIST boto3-1.24.88.gh.tar.gz 543896 BLAKE2B 9dd2a18e3fb8d0a9f3a3a1fd7d0cceb491765690f99c7bd4200f37c66cbdb1e86dcdcdd09669d3175b97e762e6faabac3a2e5cba49136f42cba459e45f3ab67f SHA512 676528ca180c23834d1666b69292754e551a339914362da2708ff3f937c2eb04fe3b3dd1d4c6960eb8f5f7f58b1e0bcf13b1f52cc16a7c8d3bd025e9ea4ee109
 DIST boto3-1.24.96.gh.tar.gz 547933 BLAKE2B 63c347b3abb383f36e4109b2695014dda6b4dd159b8f0e878ea17bcd24c9605dcf403a120b15f63e9a335065a1e3254813998a435d5eb1663f0066f2e7797be6 SHA512 9c3ac6dba99904a54e4b06b02531c2388d235b1926cb5bd7b767c679632b613db4a0d453030295e5f4101efdb7a3df8aca08e3c2e92a6725dc3df733cef37d72
 DIST boto3-1.25.0.gh.tar.gz 548321 BLAKE2B 46371869420a12b067594efbaa0d0f6b8003e813c5c85511fdead9841489bd333fe1207cc5310fd663628560a3c570ce495f0234ecc72eb93dfa20b79532390f SHA512 7cd6443fdb67a7e2df440c9b1ec84f7d37040549ddcdfaf5ca41fbee3d47e99d995f0be8690f22c25422391734d664746d00c88bd59aa269285f8c0e038836f9
+DIST boto3-1.25.1.gh.tar.gz 548647 BLAKE2B 84a6560e39ea526d1a4fa744bb4cb8fc2f934254c5949a08e0f40f34c363b6cf077dec4f6325da61fd06f5e2d2e021494bc29bf5993213fedc43f5914e18f062 SHA512 dbd0606e2aa4bd4eb3a836fe8e6da20eec97f5c62b5b43009f7296d1a51eaf7eaec7ca8246be8e3db2181e574d5672d72ea18deb4fc73a7cf3f0fca64ab1dacc
 EBUILD boto3-1.24.88.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.96.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.25.0.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.25.1.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.25.1.ebuild b/dev-python/boto3/boto3-1.25.1.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.25.1.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 8405b2463081..0da366fb294a 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,8 +1,10 @@
 DIST botocore-1.27.88.gh.tar.gz 9703393 BLAKE2B b7152546ffd44fccc3607ce4fb0df586e192a68431d68f40063d6397d6005507118c49197e3bb0215ccc4ce6b075a2e95919dc0b2352da3562ba8b5675274ca4 SHA512 0cca62a8e357c8c345afa2ebfa8fa931aa75e323b93ecd63857db05fac7fcd83118012ee7f93921a31895721189995af3179f6ae62ee61cef68eda84edc88132
 DIST botocore-1.27.96.gh.tar.gz 9792299 BLAKE2B 7d4b388e0dd45a41c794ad8527287fb326c5e828c15998393936b817333055dfbc59f85365f074f6b3017715341d30fed4ea0de8e1ee24ee08d13eff36b369bf SHA512 1050c23a207d089af16e86404db0367936d186c23b8e1fcfa8ebb07737ad411c2771344d535edd5dde43f8473e45ad85c8e5c39f2ddb03449ead3c9daa746a22
 DIST botocore-1.28.0.gh.tar.gz 9815905 BLAKE2B 40c7a5eb9aaa851b682c85d4045f4e3fbdbf34f2933e5a97cd84109e71d6b442c1075122b83870da20cba79a84dfeb213e1df62bf761efbc60d729d672e9224f SHA512 a9700867564d07024527a27c13a9a1fc5a014865afe9fa2f39401abbefeb16fae753fbaf97e81536de946fbb515724d6bdde864868077fd40b4fdfa2b7a35b9c
+DIST botocore-1.28.1.gh.tar.gz 9820975 BLAKE2B 76e578cb3b41e923ced56b12b79b36c589ad64324b6057168c4e0d92c7165f7df3709a2ba968e593d004b43320ca94c3a4a118f91ae1ce8420703c5c6bcd1100 SHA512 8a7ef4a209f145f39f6305fb5ed118849d46dc1bd10be2d0ef9dcd066f4b3dd78e2b3d391903b3d1db3f8ef3c8bc880c40dc3f7a02b4555845fb20f2ceb75ef4
 EBUILD botocore-1.27.88.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
 EBUILD botocore-1.27.96.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.28.0.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.28.1.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.28.1.ebuild b/dev-python/botocore/botocore-1.28.1.ebuild
new file mode 100644
index 000000000000..d1a6948e70e5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.28.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 90309cbd773a..c3ee340d0a9e 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,5 +1,7 @@
 DIST cfn-lint-0.67.0.gh.tar.gz 9787161 BLAKE2B 5299c956e7ca7c63c0c7608d51b01487cf4669f7af54c33f3d9917feae85565a2ce73a96a8d0a5d32cfe1c0a6db6d61b118f2994bb66700145787b650eefe6ea SHA512 35d4686da1f610a970dc1976d7a72ff58c884446f5967b069cc4826b2d9a1b75e2b8a10e676585009c918317186b4dac1c6dc78bf26215eefd5aadd4dce03e0e
 DIST cfn-lint-0.68.1.gh.tar.gz 9858724 BLAKE2B 469a23daa717add95140913d85861df44445464d80291430ec42aa2a83c2e125fc395428033c5b82c571297200b28412cc8531bf8e26a0491acfbc5536037cd6 SHA512 a81a1877b9efea411b71d485e66965ca6427998ea13d088c67849a2e8c3f9dd1c125ba0531cb48a27ad75638bde54270654b6da8576fc2fdb15088a0bfb543fe
+DIST cfn-lint-0.69.0.gh.tar.gz 9862506 BLAKE2B 68e6e5e93d7f07bda3eedda71d79943ef97fd0c2e972f475380f7943f88d843effa8cd23b4534bcf4ce0918ca7a634ecf32cef7c309711f9dbc6f899324f3f97 SHA512 9972fb1be897451116e269245d7302af31a53e54c1615daa65bd6b71b9a0ff3f62c1068d86c239510737ac95a6ab3ba2746838792680f701a404008f35857c64
 EBUILD cfn-lint-0.67.0.ebuild 1638 BLAKE2B a439d73d2d83ca8489c2bcbf2c1034f650ad4216d6600e2163c60976ef0133fba36316e9cb263dbb7c3d12d756d8cad188c762732952d0392371a8e74bb58743 SHA512 1426c30e2dc1d63b765a109ee707fa8d466046789694cc1d3afa111c3263b3da11560c72ec6fdd180f213bd5619d9bc5f9b23bd0e9d230eef66d24b647fd2acf
 EBUILD cfn-lint-0.68.1.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
+EBUILD cfn-lint-0.69.0.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.69.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.69.0.ebuild
new file mode 100644
index 000000000000..0916420e1790
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.69.0.ebuild
@@ -0,0 +1,54 @@
+# 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="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.53.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index 5efa1ccf70e5..2e9b5c5a5f40 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,3 +1,5 @@
 DIST deepmerge-1.0.1.gh.tar.gz 15004 BLAKE2B bc1d972f40485d02665fb6cd53875fa0f35e387192a9b0cc65f092966dc760a3ccc7eae6515693f39e58d7bb0a071aaac970873738a99b6962561eed641ef48b SHA512 689c9cc99c3770e27ae131bff65486ca02555840ae3fbeec1e36d08e425842e50ac7005d63ccf053627806c39578b2c9fb84fb10ca76731d17136cea61b87bbd
+DIST deepmerge-1.1.0.gh.tar.gz 15533 BLAKE2B 30fc1cdd7a5ce81783fa0804c20f44d4d7d62a1a6481a6defab3a2b5f542596fb4ab0d4ede5a7d4d128d188b56d17f260c67690deb89b55fb2fc76e1fbcffebc SHA512 f658518c11e0ea8b4e59a686e2e6ce90916c5e798c3521ef91a1fc09ec59badd9cddb74f51973cfe50891c5e8d054909e7a8acf2156cbb884492a059196a8d97
 EBUILD deepmerge-1.0.1.ebuild 741 BLAKE2B dde49f26d06074d3c2e7fec238037a16b8ffbf5c63e11ed0f1791fbc85a7c978dd7320ebd5da77efe874ea18cd71af028db99ca0f018d50f8bda2d07c6c520a9 SHA512 19618c67c3b74f790d5c563a6563446caa59a2f0dd49f4133239de219e0c72a8e496141f63d94201e304074e0696c2d200e70cc0ec72e57a7df8f0cb493be5be
+EBUILD deepmerge-1.1.0.ebuild 749 BLAKE2B df2a43abbee2fde3a9153b7916623bad0d758d120bfe0a503bb93b0e736cb8dd9e8a247c9b63e1a19726634d82c5254de502c7a2a4c0de7e2a5cf6ca51a5a3d5 SHA512 96d65427d01665d0f63428f8a6c44ca073f47f583d30548c04c955a7a893fafcebc3a7eece059a722a7224fd6c1c8695da5cf605a0ea208ba334c4aff38ae5b2
 MISC metadata.xml 337 BLAKE2B c9bffeb85e875d5beb45ed90ef00be6e559be49d8a7a8f437394b111d9a0d352b95ddb8925746a8de5fc68b27ddb72d382bf5fbdb25876efc4e2c657102d9d4b SHA512 5dd47098dff36f4b698b9ee5d1aeb2cd963bd099d4a256bc08ad7354967457310f4c316ccb3524576b751b0f26193752d8a7f31b67e70de1bfaed038d5ecacf5
diff --git a/dev-python/deepmerge/deepmerge-1.1.0.ebuild b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
new file mode 100644
index 000000000000..92cc1a6e03b4
--- /dev/null
+++ b/dev-python/deepmerge/deepmerge-1.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to handle merging of nested data structures in python"
+HOMEPAGE="
+	https://deepmerge.readthedocs.io/en/latest/
+	https://github.com/toumorokoshi/deepmerge/
+	https://pypi.org/project/deepmerge/
+"
+SRC_URI="
+	https://github.com/toumorokoshi/deepmerge/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 6cadbc7a14a2..eb67249415ad 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,7 +1,9 @@
+DIST fakeredis-py-1.10.0.gh.tar.gz 88305 BLAKE2B 71ffec7f872c8021914e24ee83f250e1e27bf2117fabb3513b54ad635692f43cefaf565090d3829ee189844a83ccc517016d8a4f9c31da82b2188d8d951c4dcf SHA512 8fb32917c70931de50ef90526854ee7c0d888c04582a284864c19956868961cd689db0a7b3ad39e783f53741efde5a33cc600faf09fdeac7046fe29e9cd75933
 DIST fakeredis-py-1.9.1.gh.tar.gz 86742 BLAKE2B aa3f0b05f486219cb6eb560f561ab3e39cc32286cdc3f4f9aba667e256528b9338dcc03f3ddb00c0db30ddb181afe535e209f6ee0e98c56a0cad445e2181ec67 SHA512 27b4c95e596fdd69cecc737897edfedd6f55e7c5610394b1532e4b2aededaed6ad15763582ce6cc20821ac7ea096f60204f7080d247359d8e8d0d360a61c8e39
 DIST fakeredis-py-1.9.2.gh.tar.gz 87038 BLAKE2B 89ae3059d58fc9649979b787339a98eaedccd2b29814090e1bf0cb2c54836ed722d829b9965d3d0a92ff4d8ee714f6a455b85f68b383a5ba6a67aefd20f70410 SHA512 6a4d90c0c327787b7505542a3615f383735bffb021cbfc0a2adf2cfb87326c517d67c1df2f318cd84b60b8d0f1dcb20faea05529a856bf81b0f3ae6cc16823ed
 DIST fakeredis-py-1.9.3.gh.tar.gz 87068 BLAKE2B ee657bd0b04f5701c9e6445ca646fcc510dc3235407372fec9891f7d1adc5cacbd7a52e2d520c930f53491c2a18f5578d1b5186337953439f93fbb69a5e65ef8 SHA512 5255a75bae15ac325a41a273c70a467c8622d5992d40967e4ac21920c0563dbad808e9b82af203e72e3404f74a7bbfd2c12f5d854f9d353defec5b0333843266
 DIST fakeredis-py-1.9.4.gh.tar.gz 87232 BLAKE2B b02b14960071ed38f6144b60d845d31d0d102f4d061dd2f156610f90385f35ff3128ab293fbf24049fd1f18a7558e9e13cc2f7179230a9837313acb2a7121053 SHA512 2fe74c5cc798edeef391136f8b09a651381faa04b7dd1e5a07007e6f89596e45970977b435e6fbdad03b73e9826a439da2e105ca9592fb3733547789d106182e
+EBUILD fakeredis-1.10.0.ebuild 2004 BLAKE2B 67f4176b7ce6141071c05d4f2ee007eb006c3c0a672e37980f56e027b0983effe2f317b2d03d8bdc35a680f5b274007ce9e0a18a40d409c4a9c2d35a045966fb SHA512 0e3f8edc71ce23ce6b28b63b80861eed4fec6f3c8ed8d627f9b6873b2a99af62c5e5c37796eb8fb7c46183a49311db21dcf6936bfee710ca4eda96eba8c4bae6
 EBUILD fakeredis-1.9.1.ebuild 2043 BLAKE2B c0b6eae42e2772b56ae73167087ee821aaa4c0631ec1d75feff85c5beb75148419185113f6ab98374462cb8336ebb073823490ff72b3a41d36da1fa6a3d6b7db SHA512 3e14b07b470537ed4b5ba6532fa183512ff138fd79bd357be43d5dbd7cd2939f18fe6caf4dd6e290a925328a1261f619d5bc8f1abc7eeb3f7ebbdc4b89886e7e
 EBUILD fakeredis-1.9.2.ebuild 2047 BLAKE2B 9ec125cf45e65b8c3ed480aec2cd6a2b86b192d053a0891e7b383aae488edb33f73a9361c51fceb7dd2c36d2fcdddc6be4b22867e8b12d7aaf34d0ea99cf6cf9 SHA512 9eb14c9878866aa8e2cbb3de940e5c694e5229855857ed72b488679d327e935800688ca54f47098ba59d7b28685ae96d5fd80c8eb3047e5976a892d2ec5ee89c
 EBUILD fakeredis-1.9.3.ebuild 2004 BLAKE2B 67f4176b7ce6141071c05d4f2ee007eb006c3c0a672e37980f56e027b0983effe2f317b2d03d8bdc35a680f5b274007ce9e0a18a40d409c4a9c2d35a045966fb SHA512 0e3f8edc71ce23ce6b28b63b80861eed4fec6f3c8ed8d627f9b6873b2a99af62c5e5c37796eb8fb7c46183a49311db21dcf6936bfee710ca4eda96eba8c4bae6
diff --git a/dev-python/fakeredis/fakeredis-1.10.0.ebuild b/dev-python/fakeredis/fakeredis-1.10.0.ebuild
new file mode 100644
index 000000000000..315d3ed64771
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-1.10.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
+	<dev-python/redis-py-4.4[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin redis
+	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/gssapi/Manifest b/dev-python/gssapi/Manifest
index cb80b7cbf13b..525554d85be5 100644
--- a/dev-python/gssapi/Manifest
+++ b/dev-python/gssapi/Manifest
@@ -1,3 +1,5 @@
 DIST gssapi-1.8.1.gh.tar.gz 114888 BLAKE2B c3e56d00c2266e16eca05262d513e62f30cece88aaea8cd6f0d65059777f55bc1d5218990698855dc2069c6c7d8ca93972a033554d114dce608201404f7f46b4 SHA512 baea4e5cc123006c77e23f6bf2e30bb755df70761a0e5af711594fad6fdbf1b8747cfce45810aa24336f7f7d2171404e9ec137984cb48c59f5df302711f1b185
+DIST gssapi-1.8.2.gh.tar.gz 112521 BLAKE2B d7e14c73c346066a58ae3b3cf1faeec2ef7df3d4da3f2c9e3198928225d81d99466185a9dfa06a59ae50beeeed58d4e73f8a668e1ac605e5b9806ed7a0019831 SHA512 6587f1947dc396bf608ba71e77388e6f7d161753005b9b82ea9f3b174c898bb18409a27e9aa035fc782e15fcd2efe7ca5c497d4687d69023034cea59d6a003df
 EBUILD gssapi-1.8.1.ebuild 896 BLAKE2B 144d1b92ada4591c1c71e2235486d2be1136266a207910f466569e049aa5437ad10f1e9ced23cdcbc036cc8c850f497f6738465aa18d1e4beea5e06feb5e090a SHA512 31287de9c66ede1f592936929f204c0bc5bee23b688be52bf73c13025c65db04c2c9a24a7071dd20fc1f89b37a8062f53eb082813f5d6ca098cabc82045d4dda
+EBUILD gssapi-1.8.2.ebuild 899 BLAKE2B 88a797b2eba3e406f2d882dd246cadca9472daee1e29a6e42bc3c2f1760ad9f35e47964e5a2ce1c35ca6f2f65a1ede078b624623afe4696c8158efb1b295f127 SHA512 b0c2d38c124364b64ab8b5eab5b788a83187204e905dd80ed8745592311e414b33d763e1499b7ae6cf8453b5bb0af46295bac8de8772f8f881cf981abe63ae0a
 MISC metadata.xml 508 BLAKE2B 546d1ff6df79f22a0cde8d19a5718f834301630cda7700c73f2e6943c1634662bb216f79e290d6efe681e96f24f791785e104a2fbfe4af4d7632899db33edde4 SHA512 3ed7272bbd046d2ca4f8e0b67d005a7a676e4998acba2f7fe70d8f9022d3bb0bdc3c845ed666db3c23e4bd118fb4d762af21d94b47ae664de568fb277b7da033
diff --git a/dev-python/gssapi/gssapi-1.8.2.ebuild b/dev-python/gssapi/gssapi-1.8.2.ebuild
new file mode 100644
index 000000000000..1c7d320855eb
--- /dev/null
+++ b/dev-python/gssapi/gssapi-1.8.2.ebuild
@@ -0,0 +1,42 @@
+# 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="Low and high level wrappers around the GSSAPI C libraries"
+HOMEPAGE="https://github.com/pythongssapi/python-gssapi https://pypi.org/project/gssapi/"
+SRC_URI="
+	https://github.com/pythongssapi/python-gssapi/releases/download/v${PV}/python-${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}"/python-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	virtual/krb5
+"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/krb5
+	test? (
+		dev-python/k5test[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+	epytest --pyargs gssapi
+}
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index c3f6e3fbc17b..b5b5e68e9e1b 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,3 +1,5 @@
 DIST hcloud-python-1.18.0.gh.tar.gz 99047 BLAKE2B c32b048653bea1910ed8a82d0e08603a154dc89208c0cf8b9e046078277460fedffe6568c7c3cf56a8408bb0423d38464c4fd57dded4523886560823e3ee65da SHA512 8339b5da4df7f5e1f38fbd7a3f205387bfd7a65a7c4eaa757c4c35056b70c06230fe9b8a597b54bac082af975184bd5ef33a6e2747b60a67cc34d6771435452c
+DIST hcloud-python-1.18.1.gh.tar.gz 99042 BLAKE2B 159b2fb29021ca7993f75c4731867ed1bc57e2c9a3cf68a45acf43bb45e9a0862717907d1dfce45c960064ad82b71422e76b290db3516ea3744be95797db5e1e SHA512 6d172c214d25ae846b5561e4caa6b70d4f4e765e064ae971d5b216ceb743ab269f735e2c9adb68f1cf99ef429621b6998a34c8c7befa6d527dc3b774c0639bae
 EBUILD hcloud-python-1.18.0.ebuild 942 BLAKE2B 273b6e0a3dbb1d2d6d58d76a47e15c91f4bbd308f5229b50d108507541fb4dd2e15529356600e176e3050a9342820b785bd934c749514e0a9ad18f09e5bdaee1 SHA512 3b9854433067aa9e4835def83e102a2c49b58ccfc8420ba5aa23392e8964a3fc6195d702f5d452d0d0bd7faaace877a6cbd58ee26465132700743040f32edb5e
+EBUILD hcloud-python-1.18.1.ebuild 955 BLAKE2B 323d181fd16af30b73a5d63217c87a23fd5d04bb6cd537d639a5300a597ede9ea7707a6c23ed2dedabf39913fdf6bceaf4a178fb881764bec91c97c48415e546 SHA512 f827c2ce86dfbeda231fe73cc784e16f5aea37678713a79e0dfdf5b4a39a98153402273c88494ea881af919b782da7c5b7f2aa0b798027ee18e17bd229898ea8
 MISC metadata.xml 483 BLAKE2B c945a22b776b5bf73deabf93718a1dea3a9b98f7257467e845106f71910347a803f96ef969227d7c10a119f1e35b904bcb7501b9672bf3ce5a2bef112d903e56 SHA512 4a6540a06d57eb3bc8c455d982531427157fbf1a85abf4b909032b0880c9e2847b295b3c9b02378be35e88f74876357503dd04bbe544ff9a9612df2b1c321b1c
diff --git a/dev-python/hcloud-python/hcloud-python-1.18.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.18.1.ebuild
new file mode 100644
index 000000000000..aaae59edb2ea
--- /dev/null
+++ b/dev-python/hcloud-python/hcloud-python-1.18.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Official Hetzner Cloud python library"
+HOMEPAGE="https://github.com/hetznercloud/hcloud-python"
+SRC_URI="
+	https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# Integration tests need docker:
+	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
+	tests/integration
+)
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index eeeafe107b37..719187ac0d64 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,5 +1,7 @@
 DIST mkdocs-minify-plugin-0.5.0.tar.gz 3387 BLAKE2B bce05582eab831976b430d5c331c0e51cecf790f4db6f3bd089ff6f0f5421c0b824c9bf6637a6b00555eee203b23cbd5fc3a0e81fcb5a8697ab7c06e94a9d2e0 SHA512 a31770c9de39439ba5eb4e35acd088aa7df2d7fa39f7942819c0b25429abb7b2b0626765f26f4d4fc77fd11e48dfdf90f9eb93e999cf7b641bb630c852eec50a
 DIST mkdocs-minify-plugin-0.6.0.gh.tar.gz 8069 BLAKE2B 7b2860ecdd1778cc51fca7357fd699578d6805176e9aa21013aec3650b40fa28381350d6690c2188cd04e25259ac71e3c9ca4e005fcc81c33182eb898a218aef SHA512 ad045fe6643de1d979051c58f89ffc5e98eb2063152a3301073864fb2bf3e5a0c183b4362ee175b8fc14be0335d0e76c509b9b6b721cdb78d9add632a46d72e9
+DIST mkdocs-minify-plugin-0.6.1.gh.tar.gz 8346 BLAKE2B 130495cc2dcc2b71c6dd715c1ed277df0d8fac5aef8fc49094bf05b324d692e41e3db85175df5455eed21f2cf413d57225a1baafe14770a77ffd3c2bb77ff3d8 SHA512 f1611b1a8f946e27450c9825f65e77e798200b22d08b5957417ae060cc2d6cb40c6edd2a6ace08eff2b32b59c9aca3020e26da35917aaddae293047d9cc8f86b
 EBUILD mkdocs-minify-plugin-0.5.0-r2.ebuild 709 BLAKE2B 0fe20ea91a73c81c4a6fc218fc04fe1306bc56d640e5d238638aa2b84ed5605d31db6f100b808f61d8acb37bf31839f3b7f3997c8228d5e8df94f97bcf138cca SHA512 6f39651d52c31858271aeb4478c201ac6fa16a4de6ea78170fb83b23cffcb606c06571bb3e34abe5a265dbf7b42b36ab5699476e22062be93ab9ba3d28c00989
 EBUILD mkdocs-minify-plugin-0.6.0.ebuild 879 BLAKE2B bf92429873eb8e01ddc0f863a6f8c83c34690e26c9fee36450a3a7969ae76c8d6760e3eaef2e77ad2e895d53133321229d0242cedfe9a4ab2ae74ed2ebd4bba3 SHA512 b032eb9698c365c53f4916f880890390e4847c4cb1611e3f3a51df5db177a01c3641ba0d49f67f8ac8615217a747c9418227a3bf1208cf421b76ad1bfe34d0e0
+EBUILD mkdocs-minify-plugin-0.6.1.ebuild 879 BLAKE2B bf92429873eb8e01ddc0f863a6f8c83c34690e26c9fee36450a3a7969ae76c8d6760e3eaef2e77ad2e895d53133321229d0242cedfe9a4ab2ae74ed2ebd4bba3 SHA512 b032eb9698c365c53f4916f880890390e4847c4cb1611e3f3a51df5db177a01c3641ba0d49f67f8ac8615217a747c9418227a3bf1208cf421b76ad1bfe34d0e0
 MISC metadata.xml 437 BLAKE2B 0b089b896a3b9458b03573a6f2870ee98c194a76969cb730508582aaae75cd5ae3fc46739ba12850a2388cf588aa68c6a45e31a59a8f1894e7eb02fe78d74992 SHA512 f238ac7d118776d582d880a4355d0786dc5d9b3f82e9139d5668fa9be009eeb7228a0bc0b2d5254e76b167ec30457241b808917a910b8d2037c781e46a871946
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild
new file mode 100644
index 000000000000..c439b9402e5b
--- /dev/null
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.1.ebuild
@@ -0,0 +1,36 @@
+# 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 MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
+HOMEPAGE="
+	https://github.com/byrnereese/mkdocs-minify-plugin
+	https://pypi.org/project/mkdocs-minify-plugin/
+"
+SRC_URI="
+	https://github.com/byrnereese/mkdocs-minify-plugin/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.1[${PYTHON_USEDEP}]
+	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
+	>=dev-python/jsmin-3.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		~dev-python/mkdocs-minify-plugin-${PV}[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 00112ba55fdb..25ad3bd0c713 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,8 +1,15 @@
 AUX protobuf-python-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch 1743 BLAKE2B c21d80a6cd218068d2a910ccd12c314810bd2eb679b59f79ba8d4d694948841d0fd8a56e921fed6f347ae9235f33903d79a038e8ae8659ea65bb59dbf7d7d9ea SHA512 7822b826d62585c48acebf04083546a3ebf8f6570854da8bddac3cc40554e71eaf57e9579c314ada33cf5bd0837cae23a3ef1057e44f6234d1d4a591c8036678
+AUX protobuf-python-4.21.8-python311.patch 3717 BLAKE2B f3a0b1b06bdbc2222fd3817b87f9b80cf609e9eb410770af31a069396eb68417f37c06603229ac8fc6aca958a9f8c0deec6b5f0812df6d7dac214b3f8622da29 SHA512 dd03b34b06e67aa4dc16281902e4676ee55169343d062b9515195ff9c92fc9cca4aaa24f83309b7f150f67a49356c41e22380bd68231dab7df04ac1c127f096f
+DIST protobuf-21.8.tar.gz 5110670 BLAKE2B 3c1b0c857a86e9586481d63896341d0cb11290dbd710d87a6f7889d34f5f262abe2986a29ed19a730f8fa5df0b5c62d77a4db6aa415a72b239f7483ae8d6380c SHA512 cb17be759311e91172801add1f88fe7a0291b547170c40d2e3303f5c248570dddeade96bd48740edd628215f55269c97475e2f4c4a41c50f1018d525f52036cb
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
+DIST protobuf-3.19.6.tar.gz 5299501 BLAKE2B 3121f76b95f83c5309ce49ce296b738eff7be9d3a5093c564fbe2339fb5f3729e406f1b44bfcc05feb0d31ab63838bb4f54685017977c73a33b91215a6776072 SHA512 8f92242f2be8e1bbfba41341c87709ad91ad83b8b3e3df88bb430411541d3399295f49291fd52b50e3487b0fce33181cb4d175685fd25aac72adfaee26a612d4
 DIST protobuf-3.20.1.tar.gz 5368262 BLAKE2B 1ce1aef2e4c4f3ea4863629cc75d89fe17d0c7ac0c342ac641c787456fd4a12756c2892a27ddadedc94a7201494ec84566638ce33a03cb0c867b04e9eee0edb3 SHA512 fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0
+DIST protobuf-3.20.3.tar.gz 5374320 BLAKE2B fb51f2a0ecf5b83235f5252051f8192ae377bb7a5e030c3f3e9435ccde25919c059830cf476e840fa6c970928a32c0075e213c9d5d4d9e3d3b24732c39a9fbfa SHA512 01d6703bdbe769a1200ee6e4ebcdcb99688ec21f576988c60d82ec36e0822820fb245fcb4ca53293143d53e666d748b5a0c6937bc659fb3cdc4cd9b05ed12a1c
 EBUILD protobuf-python-3.19.3-r2.ebuild 1521 BLAKE2B fa114bf35d495311e22ba3c14c5ddb7786b0841f490eea785e7f9d74b3106e9163d7f257a7807f02322391d467bedac1553b677ff6f6902d72731246bf6a8c8a SHA512 c018c87e6c104d9c30fa6aa8088bf67d241580dab165b3a7da1443ee715d372a2371e76741863310e85cb225cf23f42b468b1b1c46cae3c3d60409012d9702ff
 EBUILD protobuf-python-3.19.3-r3.ebuild 1598 BLAKE2B 081d83d76faa14c2937203a3aaa66c326b3d495ab5679e749ea4bcf55418d93da7eb80c98082930e539ea46afcfd118e9542f129f280b0d011990d5d262dfbff SHA512 d0d714420b8598fce1300d463c71c5455b1fe9afb14119527614bdb51ee4ff5665064dd918303acb636d548696de55ede2cf273be3d5988b8abfd925b714c45a
+EBUILD protobuf-python-3.19.6.ebuild 1745 BLAKE2B b4a48882580da78eb0544d211fb950be7da985b70bf906d81fefe3dcd7991d46ce937735261e64e7560153e13e524dbc2445409a987d9c0ec5bcb6bbdbe5ee43 SHA512 80c550e72d84f897189b9f3b97c466bbb2732976b2485ea20b5fe39b68eb9aee0e44aceed8a6956bcdb06da9e465dfa750531e31ec34d7c42f2a61060327e395
 EBUILD protobuf-python-3.20.1.ebuild 1512 BLAKE2B 9826dc63b7dd36a16b5ff21431466386dd7f853d19ea4ad20399ce4a1b9855f03ebc06cdc9c90b5270ac4919b4919832a520729e0c1db3df2e53f80383e7e4f4 SHA512 7a2047e3c7e2fb3ab24764deb24a0fd9cdb2343ed7d53a42a0aa5ac5e365590699477616a2e2961467872ed1951a1422d4d41a6d6ddff521c2ca8c4b5ee92afb
-EBUILD protobuf-python-9999.ebuild 1403 BLAKE2B a3212b6bd2f93ae71951e9ec8978394e660423d83cf937a3703e10ab6dfde0ebf2d5676b981c96d9dba5477a0d862b66a69cdde2ab3275134f12fc925301d1ee SHA512 6cf1111e3d591acd3642ee225d448e7887549e0a396cd94b3edd76b368a35b28b1d25ae5a946998c087309117890810b9ede95d6a170ad9926d8948d9819fc74
+EBUILD protobuf-python-3.20.3.ebuild 1662 BLAKE2B f8c5468fa201273c2ad2b28a6f6bf72b1bc1a037b84362495ac4aca6761229e8a708cdfc4507e7e34a0f85966973b5552eb9c956ce70abe9cd12997fc3ae451a SHA512 13df3aeb24a661ed515faa085cfc1d55a19291d2b529c2388ffa566e64a0fe836bac68aea1db60fa8c3424ccb522727776d8828c8b106a2b1d00d546b8214489
+EBUILD protobuf-python-4.21.8.ebuild 1706 BLAKE2B 867e59c78fde17bc29be66af090835bd6f6550619005ac35b196631036353a22711f97d167628138636ef78df484e279c979297e3255bd3ef985f3d98d858792 SHA512 1250ad6e565da0ee24774d1610cf6012b9e03f6b10d641f458f7a0c668629082474a4bba1bbec717a450654042b41c9cfa126032d37d304669cb976a02f919e9
+EBUILD protobuf-python-9999.ebuild 1723 BLAKE2B a09d187382486e66c363b03a441e45168f4bd9d57e83e1c3cae81874da623c70a67af9de4dd09d7405b9b95c6cad757087c53ca6739714831386a0e0eb921a6f SHA512 dbc65d2d16248ead6e9cdba28cf19afa509286cf3759cc2fa7285c66c025523219f0845e7fbefad0b6cee9ab2d1091d279bcc0ab89b29f9f5a0c31619e7660d3
 MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
diff --git a/dev-python/protobuf-python/files/protobuf-python-4.21.8-python311.patch b/dev-python/protobuf-python/files/protobuf-python-4.21.8-python311.patch
new file mode 100644
index 000000000000..b9aca40776c5
--- /dev/null
+++ b/dev-python/protobuf-python/files/protobuf-python-4.21.8-python311.patch
@@ -0,0 +1,132 @@
+https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519
+https://github.com/protocolbuffers/protobuf/pull/10403
+https://github.com/protocolbuffers/protobuf/issues/10305
+https://bugs.gentoo.org/844184
+
+From da973aff2adab60a9e516d3202c111dbdde1a50f Mon Sep 17 00:00:00 2001
+From: Alexander Shadchin <alexandr.shadchin@gmail.com>
+Date: Sun, 14 Aug 2022 21:13:49 +0300
+Subject: [PATCH] Fix build with Python 3.11
+
+The PyFrameObject structure members have been removed from the public C API.
+--- a/google/protobuf/pyext/descriptor.cc
++++ b/google/protobuf/pyext/descriptor.cc
+@@ -58,6 +58,37 @@
+               : 0)                                               \
+        : PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
+ 
++#if PY_VERSION_HEX < 0x030900B1 && !defined(PYPY_VERSION)
++static PyCodeObject* PyFrame_GetCode(PyFrameObject *frame)
++{
++    Py_INCREF(frame->f_code);
++    return frame->f_code;
++}
++
++static PyFrameObject* PyFrame_GetBack(PyFrameObject *frame)
++{
++    Py_XINCREF(frame->f_back);
++    return frame->f_back;
++}
++#endif
++
++#if PY_VERSION_HEX < 0x030B00A7 && !defined(PYPY_VERSION)
++static PyObject* PyFrame_GetLocals(PyFrameObject *frame)
++{
++    if (PyFrame_FastToLocalsWithError(frame) < 0) {
++        return NULL;
++    }
++    Py_INCREF(frame->f_locals);
++    return frame->f_locals;
++}
++
++static PyObject* PyFrame_GetGlobals(PyFrameObject *frame)
++{
++    Py_INCREF(frame->f_globals);
++    return frame->f_globals;
++}
++#endif
++
+ namespace google {
+ namespace protobuf {
+ namespace python {
+@@ -96,48 +127,66 @@ bool _CalledFromGeneratedFile(int stacklevel) {
+   // This check is not critical and is somewhat difficult to implement correctly
+   // in PyPy.
+   PyFrameObject* frame = PyEval_GetFrame();
++  PyCodeObject* frame_code = nullptr;
++  PyObject* frame_globals = nullptr;
++  PyObject* frame_locals = nullptr;
++  bool result = false;
++
+   if (frame == nullptr) {
+-    return false;
++    goto exit;
+   }
++  Py_INCREF(frame);
+   while (stacklevel-- > 0) {
+-    frame = frame->f_back;
++    PyFrameObject* next_frame = PyFrame_GetBack(frame);
++    Py_DECREF(frame);
++    frame = next_frame;
+     if (frame == nullptr) {
+-      return false;
++      goto exit;
+     }
+   }
+ 
+-  if (frame->f_code->co_filename == nullptr) {
+-    return false;
++  frame_code = PyFrame_GetCode(frame);
++  if (frame_code->co_filename == nullptr) {
++    goto exit;
+   }
+   char* filename;
+   Py_ssize_t filename_size;
+-  if (PyString_AsStringAndSize(frame->f_code->co_filename,
++  if (PyString_AsStringAndSize(frame_code->co_filename,
+                                &filename, &filename_size) < 0) {
+     // filename is not a string.
+     PyErr_Clear();
+-    return false;
++    goto exit;
+   }
+   if ((filename_size < 3) ||
+       (strcmp(&filename[filename_size - 3], ".py") != 0)) {
+     // Cython's stack does not have .py file name and is not at global module
+     // scope.
+-    return true;
++    result = true;
++    goto exit;
+   }
+   if (filename_size < 7) {
+     // filename is too short.
+-    return false;
++    goto exit;
+   }
+   if (strcmp(&filename[filename_size - 7], "_pb2.py") != 0) {
+     // Filename is not ending with _pb2.
+-    return false;
++    goto exit;
+   }
+ 
+-  if (frame->f_globals != frame->f_locals) {
++  frame_globals = PyFrame_GetGlobals(frame);
++  frame_locals = PyFrame_GetLocals(frame);
++  if (frame_globals != frame_locals) {
+     // Not at global module scope
+-    return false;
++    goto exit;
+   }
+ #endif
+-  return true;
++  result = true;
++exit:
++  Py_XDECREF(frame_globals);
++  Py_XDECREF(frame_locals);
++  Py_XDECREF(frame_code);
++  Py_XDECREF(frame);
++  return result;
+ }
+ 
+ // If the calling code is not a _pb2.py file, raise AttributeError.
+
diff --git a/dev-python/protobuf-python/protobuf-python-3.19.6.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.6.ebuild
new file mode 100644
index 000000000000..dc9a76ba6458
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.19.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2008-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
+
+PARENT_PN="${PN/-python/}"
+PARENT_PV="${PV}"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+	https://pypi.org/project/protobuf/
+"
+
+LICENSE="BSD"
+SLOT="0/30"
+
+S="${WORKDIR}/${PARENT_P}/python"
+
+BDEPEND="
+"
+DEPEND="
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${BDEPEND}
+	dev-libs/protobuf:${SLOT}
+"
+
+distutils_enable_tests setup.py
+
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+	"${FILESDIR}/${PN}-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+)
+
+# Here for patches within "python/" subdirectory.
+PATCHES=(
+)
+
+python_prepare_all() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	DISTUTILS_ARGS=( --cpp_implementation )
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}/install" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.20.3.ebuild b/dev-python/protobuf-python/protobuf-python-3.20.3.ebuild
new file mode 100644
index 000000000000..80c782e2fbdc
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.20.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2008-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
+
+PARENT_PN="${PN/-python/}"
+PARENT_PV="${PV}"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+	https://pypi.org/project/protobuf/
+"
+
+LICENSE="BSD"
+SLOT="0/31"
+
+S="${WORKDIR}/${PARENT_P}/python"
+
+BDEPEND="
+"
+DEPEND="
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${BDEPEND}
+	dev-libs/protobuf:${SLOT}
+"
+
+distutils_enable_tests setup.py
+
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "python/" subdirectory.
+PATCHES=(
+)
+
+python_prepare_all() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	DISTUTILS_ARGS=( --cpp_implementation )
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}/install" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-4.21.8.ebuild b/dev-python/protobuf-python/protobuf-python-4.21.8.ebuild
new file mode 100644
index 000000000000..572a571542c6
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-4.21.8.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2008-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
+
+PARENT_PN="${PN/-python/}"
+PARENT_PV="$(ver_cut 2-)"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+	https://pypi.org/project/protobuf/
+"
+
+LICENSE="BSD"
+SLOT="0/32"
+
+S="${WORKDIR}/${PARENT_P}/python"
+
+BDEPEND="
+"
+DEPEND="
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${BDEPEND}
+	dev-libs/protobuf:${SLOT}
+"
+
+distutils_enable_tests setup.py
+
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "python/" subdirectory.
+PATCHES=(
+	"${FILESDIR}"/${P}-python311.patch
+)
+
+python_prepare_all() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	DISTUTILS_ARGS=( --cpp_implementation )
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}/install" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index 3541dfec56fd..21144493ec0e 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -4,57 +4,66 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
-if [[ "${PV}" == "9999" ]]; then
+PARENT_PN="${PN/-python/}"
+PARENT_PV="${PV}"
+PARENT_P="${PARENT_PN}-${PARENT_PV}"
+
+if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
 	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PARENT_PV}.tar.gz
+			-> ${PARENT_P}.tar.gz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Python bindings"
 HOMEPAGE="
 	https://developers.google.com/protocol-buffers/
-	https://github.com/protocolbuffers/protobuf/
 	https://pypi.org/project/protobuf/
 "
-if [[ "${PV}" != "9999" ]]; then
-	SRC_URI="
-		https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz
-			-> protobuf-${PV}.tar.gz
-	"
-fi
-S="${WORKDIR}/protobuf-${PV}/python"
 
 LICENSE="BSD"
-SLOT="0/30"
-KEYWORDS=""
+SLOT="0/32"
+
+S="${WORKDIR}/${PARENT_P}/python"
 
 BDEPEND="
-	${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
+	dev-libs/protobuf:${SLOT}
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
 	${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
+	dev-libs/protobuf:${SLOT}
 "
 RDEPEND="
 	${BDEPEND}
-	!dev-python/namespace-google
 "
 
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
 distutils_enable_tests setup.py
 
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "python/" subdirectory.
+PATCHES=(
+)
+
 python_prepare_all() {
-	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
 	eapply_user
 	popd > /dev/null || die
 
@@ -62,7 +71,7 @@ python_prepare_all() {
 }
 
 src_configure() {
-	DISTUTILS_ARGS=(--cpp_implementation)
+	DISTUTILS_ARGS=( --cpp_implementation )
 }
 
 python_compile() {
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index a86a5ff8f5a1..14c3df9fe142 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1,5 @@
 DIST pylast-5.0.0.tar.gz 39868 BLAKE2B 0cb6d96ac74a2e62325b8a91cc3601ab4ea7ea629ef40c02ce1afe13fd067abc48f24092138fc4584382c9c7f8c62eb070f1a3173b39768ac4ff8e3904c255d2 SHA512 ebad77e66d39b5625d0afae3bba346769159f39dfbbca0fea6aa0e6ad683fea6ea04093dd4738e378ac419edcc9970e8070d7ff912cc08110a5f41f7993489ce
+DIST pylast-5.1.0.gh.tar.gz 40178 BLAKE2B f290afa72d71cb2f88793aaa31aa059a603375e91b310c3ca9180ed5626c589f3d91ae1961db15e256b01bd019b8e59dd48be45ff96683707c05ee9170dfed84 SHA512 64c71f5365638f3bdb435ac2d7405bd1e7a3ebe95fee97469c64bee63ad9850d45781756ebd59942c70780830fbb0519874908d2894e227acadedb5120c3b9ab
 EBUILD pylast-5.0.0.ebuild 773 BLAKE2B 4689bd56b0a492bbe89a755d170fd26ac093eba8e6188e82ccea5beee9ce01826c1805700d5a1d621d920efb31195c1b0d6ec437a32669da33be7cb736078012 SHA512 289710ed082564ca66a389bb2ecd226172a94b1431e4fd9209759fb58ca2c1032087d45aa1340e975c138254599de524dcf979a714e0a0288a7ae38558f91dfe
+EBUILD pylast-5.1.0.ebuild 776 BLAKE2B ecf5ebd5763f00837b3158438c556ba68f2dcc381347d2c821f72177d77d801a962fc91f4a67ff87be551cf0159a08c5a30cb2501802f86257efad4d8ceb7f0d SHA512 ecfe86f13d7b0ab5902f570d0e3d3f981b8fcb7cf084e6dea4a00e5a04ee91531f8c840f2023910cb70f5ba6c64ffac42dfed1723954d7961441cd4c4d0c9e6b
 MISC metadata.xml 907 BLAKE2B a4a6aee5b2e805d27d001b7c51dfb2a26b935c38380e85027059b02e75057fc02f9ad311fd21326f6f16e7528a15c0577aae31f695f8a74ac42d274c10e7ca17 SHA512 1d0b7327a4e9a24940cff7a27b64bf5a27d5e2a1391d31a99d3473fccd54e534722ba826a64bcfc5f0da7a505241e617d23aa1f7490218f1d39af4cd3aa29357
diff --git a/dev-python/pylast/pylast-5.1.0.ebuild b/dev-python/pylast/pylast-5.1.0.ebuild
new file mode 100644
index 000000000000..07ac0a967207
--- /dev/null
+++ b/dev-python/pylast/pylast-5.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to last.fm and other api-compatible websites"
+HOMEPAGE="
+	https://pypi.org/project/pylast/
+	https://github.com/pylast/pylast/
+"
+SRC_URI="
+	https://github.com/pylast/pylast/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/httpx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 0348b4aa534c..a0307f81b645 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -2,4 +2,4 @@ DIST pyopencl-2022.1.6.tar.gz 455424 BLAKE2B 03c46bebc4d6093489b0a1501267d5d67b7
 DIST pyopencl-2022.2.3.tar.gz 468218 BLAKE2B d747014c4cdb4d4303aa03fa16606f032b193497cf20909fd9e449f3c02e3d61dce55e44e93e769e4ec8f9c5f859c8d0a0f13bca1f1350dd7a29f6d92bcc3429 SHA512 b16feaa6d8a00cebb4f8c87d2aabed3472c45484eb5ecd530cb8e3478cfc9a41386203ab8cac0450b211f3330c36b3c52846e73a31e346784182f2ca9e6f4123
 EBUILD pyopencl-2022.1.6.ebuild 1819 BLAKE2B af8e6793bee7f165fe7d2914351363c8202207d47a353055b320cd58ba0f8f08bf53c457007bf45e2e3bd7b13eb25b8c51e3f8abfa446d3be85a47b472e3aee8 SHA512 d686767bc8ba8b39e82465e2c10379f6f9e2704786a443177278091fe55c93856c126d1729fd92bf8da605942a94bb0b91cd63b215164b1649ad0ffba5281236
 EBUILD pyopencl-2022.2.3.ebuild 1773 BLAKE2B 99a8d3b18daf9a531726e30fd8d21b4bd201356485c4db5c7bd873e60d549bcb1539d14236d5f790581c40f082195577e9c0ad55bee49146d443eb7e0081eb89 SHA512 74134b7f2206b1e8ba38bcf68118e0c796e9ffacce652fd7b0a176425f74329f4c663896489e392eab03233fd4861b4483eb6d26c1a37d60c60586b991ad9325
-MISC metadata.xml 317 BLAKE2B ba532c522d5fd599dfd41180c9813f8124dc64cd3bc7a3a7b1ecdc121b216db4b43f6cae9c32c52a430fbf6e9a22c0cf27ffaf0041ca372d81666991bcf0e979 SHA512 845a8b83a5d7729ea0fca8b704de297b8b8c0d8f315fad0bea7c0c645bc79dd993209e9ca5e89ec9c8ddbe6db2b1f142c3e1f7e5b8e4b6259fe927527ce6a919
+MISC metadata.xml 373 BLAKE2B 0de89cb91a5dba1c34bacf04a95d4e2eb9e903bfb55e291f2ed20d579b9736a9a25f27620eed05d19c903c117e0dfbf410f408e9ff4008ce8c93f7b1b004141e SHA512 4ff5643089e5590d1ae4ef413a1ab0fa2772f71922a9da2c8b43ae375ba2e6e3d95ab90a13d51d22fdea49663c112c36352df609eceebd520fdc06590907b0e7
diff --git a/dev-python/pyopencl/metadata.xml b/dev-python/pyopencl/metadata.xml
index cd62150444f7..e86864baa3fd 100644
--- a/dev-python/pyopencl/metadata.xml
+++ b/dev-python/pyopencl/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyopencl</remote-id>
+		<remote-id type="github">inducer/pyopencl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 091eadc552f8..a52c73c1bf51 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,5 +1,6 @@
+AUX pyproj-3.4.0-proj-9.1.patch 1995 BLAKE2B 0ce5cbf73d8d231dc07a0c764787d9aa9da6b15b925d136bc6b9012b6d170fc7d9e13e6f206c22ef826a56ee6a770e0745eb7969207f346a33125569b3a15888 SHA512 09cd051caec9ac5dfdbf181ce626ded3cdaa5e8d643becefba52c43d399739deefda2abb1939fc41042756166475aa35b2aa1d05b8c1df2b1bdf7a43e312fcf2
 DIST pyproj-3.3.1.gh.tar.gz 238373 BLAKE2B 7996d253a35e3d64a343141179a88d2ab97e88f96447f3daf14c9f8d731099b506228c163fe460d3be30ae69c87e908879b3c0fe31eb7624c3bb8da157838337 SHA512 7175479f4ec526ada830d178bea77552d66aace4c7f6cde584aebef5fc4c6b7a46272eea2bd95f71910411c9ac8d8832d350891ffffda8a86eabb5449177a5eb
 DIST pyproj-3.4.0.gh.tar.gz 231365 BLAKE2B a62e02a33424583ffec1e1de603a0162ea187b4eb093be51b957fb720b3625c7e4b65162f1272fb4a057edfd92f8146d74c17f1ad68a3beb0ae199df8641e03b SHA512 d0e9425ea5a10ce1620c2a2b3279be786741e75ad698a2430e38237acb73e2cd7dbd16dbb4cf952f52c38810526f4528c08f9bb0795a34fdab2f39686e6914c9
 EBUILD pyproj-3.3.1.ebuild 917 BLAKE2B a68f8b2ae45515fed681b2e17f510187753e9b34fef78122f1d08ca541e8ec1b9139fffb61a80a97cc3b513a86268336a53046c05768ebd36fb4a14eb497ead0 SHA512 50e98ad158e47af5488161d92c8feb90e2a30888c341df9f2a251407495b702cee5b75c5503f8f9591cf0e495351814e1446115bd6ed1e7ebf53a01ba0de11e4
-EBUILD pyproj-3.4.0.ebuild 947 BLAKE2B 7557c6f8522e525e6eafb9175f8196889b1d560a11f6f7d2be44f061bcb255af62dc772f7c54d920952a4901a990860b0ced10a402b65066b1b7c1832adbc92d SHA512 be28c92f6ac6122bc92eaf65e1bc631eab53a10f1d2f651859511640e4014d32fd3b280845e2ec64357509b9007c7e5eda79b2098bc85f1862d48dcf261f24a1
+EBUILD pyproj-3.4.0.ebuild 995 BLAKE2B e36a786037940f5cc6d9d35d5991eae3f31856757cd1af288253294ff5e5378d9e926e7e0461511f65ca64b7d6936ed958ad9a8ac0cbc57de8a3cd0434980cc9 SHA512 57ff52b4667e8c3051a7706d8bd46ad647b75b7be7235f5d301eedc87c318295b878f2cd8c99012d8dea66c4521ec67ca2b06de0315014f3acd7d311d2a61c30
 MISC metadata.xml 415 BLAKE2B 4f3ab70bc72ca97a428c357257d3a59591b410f12276a42e141cd0a43072b79107529c95c6a313906129e8893c75b63a6ef11ddc2f3842a7f5e5e7f7349ec38e SHA512 7ca8a01534471dff67c42a96c524d166278e26da309b2c4d766045e38086cc0e52ccc990881ebed7ca81219d705d9e4a9c16e86b052a50867bb032457e354903
diff --git a/dev-python/pyproj/files/pyproj-3.4.0-proj-9.1.patch b/dev-python/pyproj/files/pyproj-3.4.0-proj-9.1.patch
new file mode 100644
index 000000000000..a2be9f58850b
--- /dev/null
+++ b/dev-python/pyproj/files/pyproj-3.4.0-proj-9.1.patch
@@ -0,0 +1,54 @@
+https://github.com/pyproj4/pyproj/commit/831209477286f55b6c3ac777e1df3e947cfb12be
+https://github.com/pyproj4/pyproj/commit/2c0abe3d8d2c1632751f093baf421b93f65783a8
+
+From 831209477286f55b6c3ac777e1df3e947cfb12be Mon Sep 17 00:00:00 2001
+From: "Alan D. Snow" <alansnow21@gmail.com>
+Date: Sat, 17 Sep 2022 11:23:10 -0500
+Subject: [PATCH] TST: update test_get_transform_grid_list__contains expectd
+ output (#1147)
+
+--- a/test/test_sync.py
++++ b/test/test_sync.py
+@@ -82,7 +82,7 @@ def test_get_transform_grid_list__contains():
+     source_ids = set()
+     for grid in grids:
+         source_ids.add(grid["properties"]["source_id"])
+-    assert sorted(source_ids) == ["no_kv", "nz_linz"]
++    assert sorted(source_ids) == ["nz_linz"]
+ 
+ 
+ @pytest.mark.network
+
+From 2c0abe3d8d2c1632751f093baf421b93f65783a8 Mon Sep 17 00:00:00 2001
+From: "Alan D. Snow" <alansnow21@gmail.com>
+Date: Sat, 17 Sep 2022 12:06:32 -0500
+Subject: [PATCH] TST: adjust test_transformer_group__get_transform_crs for
+ nl_nsgi_nlgeo2018 and PROJ 9.1 (#1148)
+
+--- a/test/test_transformer.py
++++ b/test/test_transformer.py
+@@ -695,12 +695,19 @@ def get_transformer_group():
+ @pytest.mark.grid
+ def test_transformer_group__get_transform_crs():
+     tg = TransformerGroup("epsg:4258", "epsg:7415")
+-    if not grids_available("nl_nsgi_rdtrans2018.tif"):
+-        assert len(tg.transformers) == 1
+-    elif PROJ_GTE_91:
++    if grids_available(
++        "nl_nsgi_nlgeo2018.tif", "nl_nsgi_rdtrans2018.tif", check_all=True
++    ):
++        if PROJ_GTE_91:
++            assert len(tg.transformers) == 2
++        else:
++            assert len(tg.transformers) == 6
++    elif not PROJ_GTE_91 and grids_available("nl_nsgi_rdtrans2018.tif"):
+         assert len(tg.transformers) == 2
++    elif not PROJ_GTE_91 and grids_available("nl_nsgi_nlgeo2018.tif"):
++        assert len(tg.transformers) == 4
+     else:
+-        assert len(tg.transformers) == 6
++        assert len(tg.transformers) == 1
+ 
+ 
+ def test_transformer__area_of_interest():
+
diff --git a/dev-python/pyproj/pyproj-3.4.0.ebuild b/dev-python/pyproj/pyproj-3.4.0.ebuild
index aa7eb95785a6..70379b19b4dd 100644
--- a/dev-python/pyproj/pyproj-3.4.0.ebuild
+++ b/dev-python/pyproj/pyproj-3.4.0.ebuild
@@ -39,6 +39,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-proj-9.1.patch
+)
+
 distutils_enable_sphinx docs \
 	dev-python/furo
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index 51a8f405db98..c6e58da9b364 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -2,4 +2,4 @@ DIST pytest-env-0.6.2.tar.gz 1693 BLAKE2B b303b8b2b486cd5f6c6273fefe709e3986183a
 DIST pytest_env-0.8.1.tar.gz 6926 BLAKE2B 1d993947c5d67a57832e170e2cc2cbe56f5f1eef37d96790ec3965e5d7b9489771d1890ef7c6f4ae504e1d6d22845cf9b1b3fccf3caeacb3e6ff33d5f86b9279 SHA512 0c99db9c5467f5fe6f8655e540fff4b91884cef3553daf455298d2dc7bb51439418f3149b941d37a777199f28d82eccb2073fdd5e09bfb97cdf24d3ddb1d21bc
 EBUILD pytest-env-0.6.2-r1.ebuild 492 BLAKE2B 83b45fa4c8799fe025a6c1fdddee4ce7f695f03fc35e8e8677c9380ab7a56cd4c924aeef79e6d5c5197da8944ce650218b5681996bbe9ea3d274ed615169365d SHA512 4e80b35540a58eb1149a56c4c99f78d3e2eb2d0234b152a0aaf8c9b5feb66e66d8387e3f69a98c205ab2b5567fe9e9e36907c2d2f31e969746b0a0ba72e5f47e
 EBUILD pytest-env-0.8.1.ebuild 598 BLAKE2B cef8adb2f051f0666e4371195df5e96353c5d690ecb1b14ada126bb60ee20c22a14e1a4224760fe874942dda4e62f3670a232278e804e8e59aab64e2d3a43026 SHA512 729cd4ff5721094e6ce69e2f603ce199506d2d693fb182a4e6ccecf786348e203209199af2a861c6b3beaba6f9986a98f7e59c8f98b0e9bd77ca6cec26e89872
-MISC metadata.xml 404 BLAKE2B 1bb7ed998c97dd5ca315474f49ee320c50edf73b12407da2245e7da097ded44b009f69b2c99590aaecd5d45642c9664b78bf5399b66809007011180590f9013b SHA512 1e9474e482fc0833e3d2d399c431d3ad7a0232a21190ad8c6e533e66f2e902f30c4b0bd6182fe0825738a0ff85f97b258ff9871451f557765086dec90e351f9b
+MISC metadata.xml 505 BLAKE2B 00369d63ea894a5d1b493461b41f5a211219dba4aee1e53a5bfcd4e37fb181ebb7f4934e721c186a5d631f3f03a8bbea2b1d732a1206b2347beb71b03f0c84a0 SHA512 78e7bf0e52d709686f0302ee3ffb2d11ff85860586a42aa23e974f60bf675de919d9d78fa0aa80d66b779b1575936686bf2846830ef4bea25e4ed87d2ce05835
diff --git a/dev-python/pytest-env/metadata.xml b/dev-python/pytest-env/metadata.xml
index 49fee13e6537..8995e4d03d6e 100644
--- a/dev-python/pytest-env/metadata.xml
+++ b/dev-python/pytest-env/metadata.xml
@@ -5,6 +5,10 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">pytest-dev/pytest-env</remote-id>
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index a7b48e9a344c..2f4217714501 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-xdist-2.5.0.tar.gz 72455 BLAKE2B 4d7427e8a7d85d7b0dcae2697fae0f51913a3a2414fabbb192a8e3938431f5f121677dd43adecfb1fc7f3dd6feb94901e28b0a96787a2c2eadc1504aac55068f SHA512 22da4db7cdd6173fb8377b6adc30b5617ccb0bb308cb5d30980484dd7ddff87cf2a485ae8522c7957d8954dd2f8a5542b9f63b0fa7184cc44e50dbafc3f4e909
+DIST pytest-xdist-3.0.2.tar.gz 69590 BLAKE2B b7e471e1888f78e1c91a867cd1d06f373c255018f63daab4af30fe47df816721954f484006b59bb38d58f9525712a5bc7bb6f00d190bee3580b82baf9b2cb55d SHA512 8b03dd156b7ef82b3b0c78f8aeb83410ce3014e3764aeca4161d57fe2ad557f0316ca86dbf06ac79ddc677df3dc838161fe427b0d1d9ba9446612360eb99fbf2
 EBUILD pytest-xdist-2.5.0-r1.ebuild 1123 BLAKE2B 79d4a01654de1c96d9f12581b221e68b519e1e860858e9d836e2d636b6b93635f8b24f3ff8fb26034a55d6dfc799391a508e90dfeb2e420bbbc7f652de6f2ff7 SHA512 7a92a6e4eb4399a4837ca7453d8a4c9c56a9a05863c01bbce39e632b11d2e66ccec6f650a4c86df96a22b6a4bac52185f3bd93ce4e94261c2291cc9b10e001f5
+EBUILD pytest-xdist-3.0.2.ebuild 1131 BLAKE2B c7d846c8e378993ae77dd0f67264658ce09f748ae45eb0504afca76b0ef9bb4e91760ec4dd7c57ae4e55828b6e72941ac56ccd620a9528c115f4bc39bc7e81e8 SHA512 53dfa89a39676e42a3db1cdf785e45dba00cf8bd842f09a65fb67e8ed2f19e6bbb42061eaed90efe9ca49ff2e5da65a289e19f5fa427e4894b7c33cb147684c1
 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.0.2.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.0.2.ebuild
new file mode 100644
index 000000000000..1079a190886e
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-3.0.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="
+	https://pypi.org/project/pytest-xdist/
+	https://github.com/pytest-dev/pytest-xdist/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6.2.0[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# disable autoloading plugins in nested pytest calls
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# since we disabled autoloading, force loading necessary plugins
+	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
+
+	epytest
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index ab602483ac24..fd423baac7b9 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 7cf2f00437d3..9fe578e78914 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,5 +1,7 @@
 DIST gtk-4.6.7.tar.xz 22885556 BLAKE2B ff3647fbb87fb7743c6aaf84f4de463275ff5816ccdba7f29425ee5268677e53ef56507ddd71447def5a1707e7509958068d5b8a7c64816cc3a1541691d7a262 SHA512 7f9068f66b472e796c1611625a34466b13aa51bce2dfc7661928e6d8087ed39ed0f6adf47a6691609b85540c588621bebc5951e81435277071abe7d2facf28bb
 DIST gtk-4.8.1.tar.xz 20502844 BLAKE2B 2e60b4a1985c2faa6990f0a2512a14f06ee30287ee8c4cb6cabd2100a4425c8e441879dd5b6d95b1f99ad49dd07909832ccfc4cb2738a467b32dad16074bee36 SHA512 26201c2ef0de24e0a530b0cb03af5c131a85d068ecb4dcbe22c1faaedf1d5c1555ebe2bf2da794ccfa24bea7de810179957d48474fa951ae691ac957bbdfd61e
+DIST gtk-4.8.2.tar.xz 20210736 BLAKE2B 0595ee5b497cdf1b0fff3bc468a7e79d9665f5552213b3bd794f9df6354e280f3d4747820bf3cd83ee903b8709e2902f70f6c3721322573b204447017a9c0ebf SHA512 400cdde53a4b76a912f52b1300286b2198d47195902ccfc034fbc518be7bc4c5817fe6df6386d764c95686083eede2e4582cc555fb38b0bce455942ea6c5fcb5
 EBUILD gtk-4.6.7-r1.ebuild 5748 BLAKE2B 080ccac9ef219938bb0e44a670f67c635f3d9e8c58e5a3b202135a886df5c6406e374fe20914dd0929b4dba4a878d6bbebc08a5fe5b919c144e0cc4f5b65f584 SHA512 b1968a046d5e1b55dbf6c3519693da2d5b15778badca08af89ccadadb1427fc9c94f527e616e24a0dd1c38e055ec169b7e4cdc202b96db0f5fedf39c57f9c928
 EBUILD gtk-4.8.1-r1.ebuild 5650 BLAKE2B 9dfbb8bf31bdb96e56bb66e64ee7c8a79f6bd92b7b67a109b019802f1fb6ce4ef1f07e05dc0e93f5bd16ee710d4ad63f76ffa790756b3a795cfe86f0992e63ce SHA512 646ba31067e385340dfbd6636806a2e1d15bee48e7078ad52852429a0d7e3825189ff603b83029431f89d453aaebd1e94fad986cffb78b3b6a4dc56cde1bbd57
+EBUILD gtk-4.8.2.ebuild 5712 BLAKE2B b1f6c540fea752fc386d947fc684fbe3be2e27c1f2f042be1d9347092a728997828af9b048a8c01dc767ee521f4182278a37479c610848d4af9dcbe75db56654 SHA512 dd43f35e36df20015b331386eae6bbe89b0b581c9207faad5cdf2546968af69b659a991e9ecca9643ac8d4c12bd10c0cae8e1e1966fd1a105bccb634444bc896
 MISC metadata.xml 690 BLAKE2B 4ae68aa63a0aea931c3584ac288ac62226bc1a78395dad3e7401f1988d4ab45d3895eb8149f1c06a849e1e27926097d8aa09dd5a33a2bf8b4ce52e4e1694b1e0 SHA512 ff6bd9799fe0f9e3e922744ed78cc9db278801e6e2d309fbf146535b061670f5f9162946ddf76cdf3d0e4defca16657ba39b3af81e5bcf2423385c74fc299779
diff --git a/gui-libs/gtk/gtk-4.8.2.ebuild b/gui-libs/gtk/gtk-4.8.2.ebuild
new file mode 100644
index 000000000000..f8de8f482c10
--- /dev/null
+++ b/gui-libs/gtk/gtk-4.8.2.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
+
+DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
+
+LICENSE="LGPL-2+"
+SLOT="4"
+IUSE="aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	test? ( introspection )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/fribidi-0.19.7
+	>=dev-libs/glib-2.66.0:2
+	>=media-libs/graphene-1.9.1[introspection?]
+	>=media-libs/libepoxy-1.4[egl,X(+)?]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
+	>=x11-libs/pango-1.50.0[introspection?]
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	media-libs/libjpeg-turbo:0=
+	>=media-libs/harfbuzz-2.6.0:=
+	x11-misc/shared-mime-info
+
+	colord? ( >=x11-misc/colord-0.1.9:0= )
+	cups? ( >=net-print/cups-2.0 )
+	ffmpeg? ( media-video/ffmpeg )
+	gstreamer? (
+		>=media-libs/gst-plugins-bad-1.12.3:1.0
+		>=media-libs/gst-plugins-base-1.12.3:1.0[opengl]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	vulkan? ( media-libs/vulkan-loader:= )
+	wayland? (
+		>=dev-libs/wayland-1.21.0
+		>=dev-libs/wayland-protocols-1.25
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
+		|| (
+			>=app-accessibility/at-spi2-core-2.46.0
+			>=app-accessibility/at-spi2-atk-2.5.3
+		)
+		media-libs/fontconfig
+		media-libs/mesa[X(+)]
+		x11-libs/libX11
+		>=x11-libs/libXi-1.8
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.5
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg
+	>=x11-themes/adwaita-icon-theme-3.14
+"
+BDEPEND="
+	dev-libs/gobject-introspection-common
+	introspection? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+	)
+	dev-python/docutils
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	test? (
+		dev-libs/glib:2
+		wayland? ( dev-libs/weston[headless] )
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+}
+
+pkg_setup() {
+	use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
+	sed -i -e '/gtk4-update-icon-cache/d' tools/meson.build || die
+	# Workaround RWX ELF sections, https://gitlab.gnome.org/GNOME/gtk/-/issues/4598
+	sed -i -e 's/^ld =.*/ld = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
+	sed -i -e 's/^objcopy =.*/objcopy = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		# GDK backends
+		$(meson_use X x11-backend)
+		$(meson_use wayland wayland-backend)
+		$(meson_use broadway broadway-backend)
+		-Dwin32-backend=false
+		$(meson_use aqua macos-backend)
+
+		# Media backends
+		$(meson_feature ffmpeg media-ffmpeg)
+		$(meson_feature gstreamer media-gstreamer)
+
+		# Print backends
+		$(meson_feature cups print-cups)
+
+		# Optional dependencies
+		$(meson_feature vulkan)
+		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
+		$(meson_feature sysprof)
+		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
+		$(meson_feature colord)
+		# Expected to fail with GCC < 11
+		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
+		$(meson_feature cpu_flags_x86_f16c f16c)
+
+		# Documentation and introspection
+		-Dgtk_doc=false # we ship pregenerated API docs from tarball
+		-Dupdate_screenshots=false
+		-Dman-pages=true
+		$(meson_feature introspection)
+
+		# Demos and binaries
+		$(meson_use examples build-examples)
+		$(meson_use examples demos)
+		$(meson_use test build-tests)
+		-Dinstall-tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+	if use X; then
+		einfo "Running tests under X"
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
+	fi
+
+	if use wayland; then
+		einfo "Running tests under Weston"
+
+		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
+		compositor=$!
+		export WAYLAND_DISPLAY=wayland-5
+
+		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
+
+		exit_code=$?
+		kill ${compositor}
+	fi
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional
+	doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}}
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+
+	if use examples ; then
+		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 60cee79b7761..3198397f3c20 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e733ae899bfc..a8191b693a4d 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Oct 2022 20:09:42 +0000
+Wed, 26 Oct 2022 02:12:31 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 7d3e273cc76b..4973917d46a1 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 530688 BLAKE2B 1384754019a41108cd5a577394c6aafe7ddaa1600e86ddd30f667b8ffcd2a271d1d63c110dd32bcc5d2cdf57213dc2ed2ad65288c00d7dd764fc88a2a5ad121f SHA512 08bf73bc99a66d9fbe7dcf764826772bf00488ab216fa1e39298dffc1fef683f7a82d65031193ede26cf629f7bb21ac7a709099a37a9c6772e7b4eacbf503986
-TIMESTAMP 2022-10-25T20:09:46Z
+TIMESTAMP 2022-10-26T02:12:34Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNYQopfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNYl5JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCuCxAAhVFLDldI2WV4TBXaYRrfFe4SpK2kZlTGK5LxlnC7NbfmR8NC0AuBI1hW
-9dZyOdU+Qk0aR6F+75BEnIkTQwo5DrNKgQvSywFn8AhHte4QAnJn9pWCeLRktuZL
-LcvNEGM4EEXqRjB0vRur6wBRRC27L/+Ai7tipkNar2ACu5I4uFcRlaRZxjllULqd
-sRHiJa1fSdEb5Qe3mYk/b+CSutNKXoPOpW7kXzNoir3iG1jAFqPGBfB9bnhMS2rv
-uKYuJdgIwkn6BWY5gSCwcbf1COqiRgOnkwqat7AR1YIk6alO44stkE2bMdymjQCW
-/idTuFY8qC66WKjhQpHwzLVjfWrvNM7kXBYwH4qNCVlzwU9Wf/23Ap+I0u0RLTcI
-Rs8sIuO6niZqKlMi6Vw86j2+AWJtVc/16xJrc6pX79CUuDiBdpfWPbnsqJdVTQeb
-j0Su0xq1O5TxtDofiSRO4KNOR6fFzcuf0+I1pg8ojG9fYQR+YhIBp48RMeXDVrXL
-Yi5Smpxs7gLbtwFph+J/fpxMuc6Gm07URp480/EzhT0JRyxJOox1YQtYj2O6NFrb
-Gm2rOgXsWjB+4Thl2J4Wf5Cub1bRnOj9GzkcJjEmHOWcCJ1VEpmQPMI4gkNletUl
-hy9MOwLPB+gglSQSCSVREL2fR3K+Ldb7+laTWMtRXPsmQ+p8QnU=
-=wRCi
+klAAVg//SUDe1f61QiZZMxqwnZEmXa4r/f5Bdh/Cfmr2OakzLs5yFOu7kBR2Ci3f
+NW9/eK/+mXpO0sLGKr5YNCO/fqZ/FNvNj1QqiBnhjdXO6cN/nalwBG8zxgrPXLsj
+3hpcI9xZoIfHGmseTP9sne6J2cL4r7uysm7PxyAjQvceDRLFuwmLK5zLHA+XlsYl
+DlPK3Gu1zsesX7pphNeJvA8YRpyXbZjunool882vdiQ0qMda7eAPMs6+NkN2KuHs
+1cEQg+9Z3giLOcDDv4Zcz/9a0rJ0N2stAKEwyRMIfLtNTpp61Ww9OltoOouhhTtl
+TayZ3B3MLLQOTiutAx4nVSWnvp0FKeLB9XnBKLOa1b/dr2++X2IRiyzVFXqMVLA8
+xCZve88O6m/3dHTAxSWjztfyFv7raKtuNJnjesnHa+M1RU8T4nIwncQ+AL5FhEPE
+0+KAjsRin+V6g352Wm5s7JKSfj+0jqGdSHnxDkb9LkBpkCHM7bd5ZUIXk93cQyPE
+dOoxogqsZaDoH8jqsi7kOmmd5GfisBr1l/GYog4dgVVw4iBVN4+NybH+nSeWjVk/
+kHdYXU4aVaL46S2Fk49sNi2RZtTRZTKkIVWwxl8riViyVtVFVt9ws2lqJEmXDQmY
+m2PRKgfq6TrqvgSV+vJguO8yZZbtwZOqFD0jmjLN8mC/9JgKIEU=
+=sHDT
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index aee105bfb5e5..a8191b693a4d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Oct 2022 20:09:43 +0000
+Wed, 26 Oct 2022 02:12:31 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index c6967b9c209c..c0f0b7147e92 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index bf4cfc16872f..91da562de7d4 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.26.1 b/metadata/md5-cache/app-admin/awscli-1.26.1
new file mode 100644
index 000000000000..ca48d50f41e8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.26.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.28.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.28.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.26.1.tar.gz -> aws-cli-1.26.1.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=3d0c469e2cf6687c02cfec2685e84498
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index e8e69335dcfd..22ad2816884f 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/bzip3-1.1.7 b/metadata/md5-cache/app-arch/bzip3-1.1.8
index 56bb32025f3b..4f58fc1b0aa9 100644
--- a/metadata/md5-cache/app-arch/bzip3-1.1.7
+++ b/metadata/md5-cache/app-arch/bzip3-1.1.8
@@ -6,6 +6,6 @@ INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm64 ~loong ~x86
 LICENSE=LGPL-3+
 SLOT=0
-SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.1.7/bzip3-1.1.7.tar.xz
+SRC_URI=https://github.com/kspalaiologos/bzip3/releases/download/1.1.8/bzip3-1.1.8.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=49e77d16744f08d232de972e545a4559
diff --git a/metadata/md5-cache/app-arch/rpm-4.17.1 b/metadata/md5-cache/app-arch/rpm-4.17.1
deleted file mode 100644
index f4a5c2dce928..000000000000
--- a/metadata/md5-cache/app-arch/rpm-4.17.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) test? ( sys-apps/fakechroot ) 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 dev-lang/perl test? ( virtual/perl-Test-Simple )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=!app-arch/rpm5 app-arch/libarchive:= >=app-arch/bzip2-1.0.1 app-arch/xz-utils >=app-crypt/gnupg-1.2 >=dev-lang/perl-5.8.8 dev-libs/elfutils dev-libs/libgcrypt:= >=dev-libs/popt-1.7 sys-apps/file >=sys-libs/zlib-1.2.3-r1 virtual/libintl lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) acl? ( virtual/acl ) audit? ( sys-process/audit ) caps? ( >=sys-libs/libcap-2.0 ) dbus? ( sys-apps/dbus ) sqlite? ( dev-db/sqlite:3 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) nls? ( virtual/libintl ) zstd? ( app-arch/zstd:= ) dev-lang/perl
-DESCRIPTION=Red Hat Package Management Utils
-EAPI=8
-HOMEPAGE=https://rpm.org https://github.com/rpm-software-management/rpm
-INHERIT=autotools lua-single perl-module python-single-r1 toolchain-funcs
-IUSE=acl audit caps +berkdb doc dbus nls openmp python selinux +sqlite test +zstd lua_single_target_lua5-3 lua_single_target_lua5-4 test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 LGPL-2
-RDEPEND=!app-arch/rpm5 app-arch/libarchive:= >=app-arch/bzip2-1.0.1 app-arch/xz-utils >=app-crypt/gnupg-1.2 >=dev-lang/perl-5.8.8 dev-libs/elfutils dev-libs/libgcrypt:= >=dev-libs/popt-1.7 sys-apps/file >=sys-libs/zlib-1.2.3-r1 virtual/libintl lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) acl? ( virtual/acl ) audit? ( sys-process/audit ) caps? ( >=sys-libs/libcap-2.0 ) dbus? ( sys-apps/dbus ) sqlite? ( dev-db/sqlite:3 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) nls? ( virtual/libintl ) zstd? ( app-arch/zstd:= ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
-REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://ftp.osuosl.org/pub/rpm/releases/rpm-4.17.x/rpm-4.17.1.tar.bz2 http://ftp.rpm.org/releases/rpm-4.17.x/rpm-4.17.1.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b37ca2adc3c7f7fe9e988de273b45aa5
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 3d02e3c2d58c..5d51a7b0fb24 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/amqp-cpp-4.3.16 b/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.16
deleted file mode 100644
index a9879b61dd42..000000000000
--- a/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.16
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker
-EAPI=8
-HOMEPAGE=https://github.com/CopernicaMarketingSoftware/AMQP-CPP
-INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/CopernicaMarketingSoftware/AMQP-CPP/archive/v4.3.16.tar.gz -> AMQP-CPP-4.3.16.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=14b45a91747b1384ae27d03d2597eed8
diff --git a/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.17 b/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.18
index 69e97330973b..bdd8cea5a762 100644
--- a/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.17
+++ b/metadata/md5-cache/dev-cpp/amqp-cpp-4.3.18
@@ -7,6 +7,6 @@ INHERIT=cmake
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
-SRC_URI=https://github.com/CopernicaMarketingSoftware/AMQP-CPP/archive/v4.3.17.tar.gz -> AMQP-CPP-4.3.17.tar.gz
+SRC_URI=https://github.com/CopernicaMarketingSoftware/AMQP-CPP/archive/v4.3.18.tar.gz -> AMQP-CPP-4.3.18.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=14b45a91747b1384ae27d03d2597eed8
diff --git a/metadata/md5-cache/dev-cpp/argparse-2.6 b/metadata/md5-cache/dev-cpp/argparse-2.9
index 39a819b744e2..6bdb268b8708 100644
--- a/metadata/md5-cache/dev-cpp/argparse-2.6
+++ b/metadata/md5-cache/dev-cpp/argparse-2.9
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/p-ranav/argparse/archive/v2.6.tar.gz -> argparse-2.6.tar.gz
+SRC_URI=https://github.com/p-ranav/argparse/archive/v2.9.tar.gz -> argparse-2.9.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c2892910faf2784f26084d2ae47c7b28
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 3db103672f96..4fbb955cf005 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/commons-text-1.9 b/metadata/md5-cache/dev-java/commons-text-1.9
deleted file mode 100644
index 917e42fa33b2..000000000000
--- a/metadata/md5-cache/dev-java/commons-text-1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Apache Commons Text is a library focused on algorithms working on strings
-EAPI=7
-HOMEPAGE=https://commons.apache.org/proper/commons-text
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/commons-lang-3.11:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://downloads.apache.org//commons/text/source/commons-text-1.9-src.tar.gz -> commons-text-1.9-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=7bf149e50a545940e82cce31351cbf86
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.3 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.3
deleted file mode 100644
index fba1d9de1b8e..000000000000
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 dev-java/bcel:0 >=dev-java/commons-compress-1.20:0 dev-java/commons-io:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9
-EAPI=8
-HOMEPAGE=https://tomcat.apache.org
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 dev-java/bcel:0 >=dev-java/commons-compress-1.20:0 dev-java/commons-io:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.3/source/jakartaee-migration-1.0.3-src.tar.gz -> jakartaee-migration-1.0.3-sources.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=ca2a8fdd4f82c22c01e7dda5c287ce25
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.19.6 b/metadata/md5-cache/dev-java/protobuf-java-3.19.6
new file mode 100644
index 000000000000..770d69277f1c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.19.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/protobuf:0/30
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Google's Protocol Buffers - Java bindings
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0/30
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz -> protobuf-3.19.6.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=af4d4fb158481967ce14638867c3d7f6
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.20.3 b/metadata/md5-cache/dev-java/protobuf-java-3.20.3
new file mode 100644
index 000000000000..c045ece6dc20
--- /dev/null
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.20.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/protobuf:0/31
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Google's Protocol Buffers - Java bindings
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0/31
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.20.3.tar.gz -> protobuf-3.20.3.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=6b0b3ca80a3094fffb40a070bafb1d3c
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.21.8 b/metadata/md5-cache/dev-java/protobuf-java-3.21.8
new file mode 100644
index 000000000000..e8207baa9ffe
--- /dev/null
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.21.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/protobuf:0/32
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Google's Protocol Buffers - Java bindings
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0/32
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v21.8.tar.gz -> protobuf-21.8.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=48722d974c81cb1a3213d2515466da20
diff --git a/metadata/md5-cache/dev-java/protobuf-java-9999 b/metadata/md5-cache/dev-java/protobuf-java-9999
index d6b8c77213a4..b37dfc827fe6 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-9999
+++ b/metadata/md5-cache/dev-java/protobuf-java-9999
@@ -1,14 +1,15 @@
-BDEPEND=~dev-libs/protobuf-9999 >=virtual/jdk-1.8:* >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-libs/protobuf:0/32 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava:0 dev-java/mockito:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 DESCRIPTION=Google's Protocol Buffers - Java bindings
 EAPI=8
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+HOMEPAGE=https://developers.google.com/protocol-buffers/
 INHERIT=java-pkg-2 java-pkg-simple git-r3
-IUSE=doc source
+IUSE=doc source test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/31
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0/32
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=4a3f061025934395a5049a5a8c1bf866
+_md5_=52846d34defc03b2b5570b2c113207f8
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b0f8cbb0dab8..dd3434d92d8f 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/expat-2.5.0 b/metadata/md5-cache/dev-libs/expat-2.5.0
index c7823896abe8..6112565e6271 100644
--- a/metadata/md5-cache/dev-libs/expat-2.5.0
+++ b/metadata/md5-cache/dev-libs/expat-2.5.0
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://libexpat.github.io/
 INHERIT=autotools multilib-minimal
 IUSE=examples static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=fd7d388ea17b55e8e70bff609503cac1
+_md5_=37bf885f2764e55a53ef20cf37fc67b9
diff --git a/metadata/md5-cache/dev-cpp/argparse-2.1-r1 b/metadata/md5-cache/dev-libs/mmtf-cpp-1.1.0
index f4a10f552ea7..1f9cd885da67 100644
--- a/metadata/md5-cache/dev-cpp/argparse-2.1-r1
+++ b/metadata/md5-cache/dev-libs/mmtf-cpp-1.1.0
@@ -1,12 +1,14 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Argument Parser for Modern C++
+DEPEND=dev-libs/msgpack
+DESCRIPTION=The pure C++ implementation of the MMTF API, decoder and encoder
 EAPI=8
-HOMEPAGE=https://github.com/p-ranav/argparse
+HOMEPAGE=https://github.com/rcsb/mmtf-cpp
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
+RDEPEND=dev-libs/msgpack
 SLOT=0
-SRC_URI=https://github.com/p-ranav/argparse/archive/v2.1.tar.gz -> argparse-2.1.tar.gz
+SRC_URI=https://github.com/rcsb/mmtf-cpp/archive/v1.1.0.tar.gz -> mmtf-cpp-1.1.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=175b12f7b393001a7c0d0cba6ad793a0
+_md5_=fd19388229b99fe598d545f115cd75a5
diff --git a/metadata/md5-cache/dev-libs/protobuf-21.8 b/metadata/md5-cache/dev-libs/protobuf-21.8
new file mode 100644
index 000000000000..2e6ee9630f0d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-21.8
@@ -0,0 +1,16 @@
+BDEPEND=emacs? ( app-editors/emacs:* ) 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 prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/
+INHERIT=autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/32
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v21.8.tar.gz -> protobuf-21.8.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=0b8d6ca8672fc810504244a779d8cdbf
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.19.6 b/metadata/md5-cache/dev-libs/protobuf-3.19.6
new file mode 100644
index 000000000000..59e792e26253
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-3.19.6
@@ -0,0 +1,16 @@
+BDEPEND=emacs? ( app-editors/emacs:* ) 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 prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/
+INHERIT=autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/30
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz -> protobuf-3.19.6.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=abb84b2b30995453282b9aa02d86db48
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.20.3 b/metadata/md5-cache/dev-libs/protobuf-3.20.3
new file mode 100644
index 000000000000..b33714cb1a9e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-3.20.3
@@ -0,0 +1,16 @@
+BDEPEND=emacs? ( app-editors/emacs:* ) 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 prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/
+INHERIT=autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/31
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.20.3.tar.gz -> protobuf-3.20.3.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=b35ca7f812bf689dba5de80a12eaa3e2
diff --git a/metadata/md5-cache/dev-libs/protobuf-9999 b/metadata/md5-cache/dev-libs/protobuf-9999
index 96852dee62ca..b2e001a48f52 100644
--- a/metadata/md5-cache/dev-libs/protobuf-9999
+++ b/metadata/md5-cache/dev-libs/protobuf-9999
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
 EAPI=8
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+HOMEPAGE=https://developers.google.com/protocol-buffers/
 INHERIT=autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs git-r3
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
-SLOT=0/31
+SLOT=0/32
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4bf5ed86f7338bf29dbc342b5e259939
+_md5_=80f580efbec0d633db1b9f98cd0e3b79
diff --git a/metadata/md5-cache/dev-perl/GD-2.760.0 b/metadata/md5-cache/dev-perl/GD-2.760.0
new file mode 100644
index 000000000000..5026b6003c32
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/GD-2.760.0
@@ -0,0 +1,16 @@
+BDEPEND=>=media-libs/gd-2.2.3[png,jpeg] media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng sys-libs/zlib truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) fcgi? ( dev-libs/fcgi ) >=virtual/perl-ExtUtils-Constant-0.230.0 dev-perl/ExtUtils-PkgConfig virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Test-Fork-0.20.0 >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/gd-2.2.3[png,jpeg] media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng sys-libs/zlib truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) fcgi? ( dev-libs/fcgi ) dev-lang/perl
+DESCRIPTION=Interface to Thomas Boutell's gd library
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/GD
+INHERIT=perl-module
+IUSE=animgif fcgi test truetype xpm test examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=media-libs/gd-2.2.3[png,jpeg] media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng sys-libs/zlib truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) fcgi? ( dev-libs/fcgi ) dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/GD-2.76.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=3ddc619d823d234bcad29747a705a995
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 9394b0d1093c..157e39a9b729 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Net-AMQP-RabbitMQ-2.40010 b/metadata/md5-cache/dev-perl/Net-AMQP-RabbitMQ-2.40010
new file mode 100644
index 000000000000..905420b3377f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-AMQP-RabbitMQ-2.40010
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-perl/Math-Int64-0.540.0 >=virtual/perl-ExtUtils-MakeMaker-6.660.0 test? ( net-misc/rabbitmq-server ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=interact with RabbitMQ over AMQP using librabbitmq
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-AMQP-RabbitMQ
+INHERIT=perl-module
+IUSE=test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=>=dev-perl/Math-Int64-0.540.0 dev-lang/perl:=
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSTEMLE/Net-AMQP-RabbitMQ-2.40010.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=e681e71cdfea3a53db4a17e0b7057e7e
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 37fea0f35cc7..492b047fd0e8 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/boto3-1.25.1 b/metadata/md5-cache/dev-python/boto3-1.25.1
new file mode 100644
index 000000000000..f5d4349c9c91
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.25.1
@@ -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.28.1[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.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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.28.1[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.25.1.tar.gz -> boto3-1.25.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.28.1 b/metadata/md5-cache/dev-python/botocore-1.28.1
new file mode 100644
index 000000000000..4007adce9586
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.28.1
@@ -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.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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.28.1.tar.gz -> botocore-1.28.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=bb152b00283104522fdf392996d7badc
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.69.0 b/metadata/md5-cache/dev-python/cfn-lint-0.69.0
new file mode 100644
index 000000000000..ce9a2cdb57c5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.69.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/aws-sam-translator-1.53.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.53.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.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/aws-cloudformation/cfn-lint/archive/v0.69.0.tar.gz -> cfn-lint-0.69.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=f12595e66517ca4b94e1ba776190f17b
diff --git a/metadata/md5-cache/dev-python/deepmerge-1.1.0 b/metadata/md5-cache/dev-python/deepmerge-1.1.0
new file mode 100644
index 000000000000..879f3fbc288a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/deepmerge-1.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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=Tools to handle merging of nested data structures in python
+EAPI=8
+HOMEPAGE=https://deepmerge.readthedocs.io/en/latest/ https://github.com/toumorokoshi/deepmerge/ https://pypi.org/project/deepmerge/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) 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/toumorokoshi/deepmerge/archive/v1.1.0.tar.gz -> deepmerge-1.1.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=2aab3e879eece8a553bc876820ef492f
diff --git a/metadata/md5-cache/dev-python/fakeredis-1.10.0 b/metadata/md5-cache/dev-python/fakeredis-1.10.0
new file mode 100644
index 000000000000..102981c1f603
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fakeredis-1.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-db/redis dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/redis-py-4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/redis-py-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[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-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.2.0[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=Fake implementation of redis API for testing purposes
+EAPI=8
+HOMEPAGE=https://github.com/cunla/fakeredis-py/ https://pypi.org/project/fakeredis/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/redis-py-4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/redis-py-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cunla/fakeredis-py/archive/v1.10.0.tar.gz -> fakeredis-py-1.10.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a23e159300c84d99f138bbbdade90102
diff --git a/metadata/md5-cache/dev-python/gssapi-1.8.2 b/metadata/md5-cache/dev-python/gssapi-1.8.2
new file mode 100644
index 000000000000..d34802dd9cf2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gssapi-1.8.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/krb5 test? ( dev-python/k5test[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/krb5 >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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 and high level wrappers around the GSSAPI C libraries
+EAPI=8
+HOMEPAGE=https://github.com/pythongssapi/python-gssapi https://pypi.org/project/gssapi/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/krb5 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/pythongssapi/python-gssapi/releases/download/v1.8.2/python-gssapi-1.8.2.tar.gz -> gssapi-1.8.2.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=293f01bd25683b9def9936b2b04ff139
diff --git a/metadata/md5-cache/dev-python/hcloud-python-1.18.1 b/metadata/md5-cache/dev-python/hcloud-python-1.18.1
new file mode 100644
index 000000000000..f1c6b041413b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hcloud-python-1.18.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/future-0.17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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=Official Hetzner Cloud python library
+EAPI=8
+HOMEPAGE=https://github.com/hetznercloud/hcloud-python
+INHERIT=distutils-r1
+IUSE=examples doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/future-0.17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20[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/hetznercloud/hcloud-python/archive/v1.18.1.tar.gz -> hcloud-python-1.18.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=86b2ebc0e4902e59c2fdb7f097547b36
diff --git a/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.1 b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.1
new file mode 100644
index 000000000000..f55e96952d4a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-minify-plugin-0.6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ~dev-python/mkdocs-minify-plugin-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/csscompressor-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-text/htmlmin-0.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsmin-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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 MkDocs plugin to minify HTML and/or JS files prior to being written to disk
+EAPI=8
+HOMEPAGE=https://github.com/byrnereese/mkdocs-minify-plugin https://pypi.org/project/mkdocs-minify-plugin/
+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
+LICENSE=MIT
+RDEPEND=>=dev-python/csscompressor-0.9.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=app-text/htmlmin-0.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsmin-3.0.1[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/byrnereese/mkdocs-minify-plugin/archive/0.6.1.tar.gz -> mkdocs-minify-plugin-0.6.1.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=16b7cd73431601cd267352e94fc9cee6
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.19.6 b/metadata/md5-cache/dev-python/protobuf-python-3.19.6
new file mode 100644
index 000000000000..ef4c3ab27480
--- /dev/null
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.19.6
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-libs/protobuf:0/30 ) 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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.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
+DEPEND=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 )
+DESCRIPTION=Google's Protocol Buffers - Python bindings
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://pypi.org/project/protobuf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=dev-libs/protobuf:0/30 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/30
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz -> protobuf-3.19.6.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=b3ebe05610b19b1a713b3d1cf7c174a2
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.20.3 b/metadata/md5-cache/dev-python/protobuf-python-3.20.3
new file mode 100644
index 000000000000..5fa58528fb8e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.20.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-libs/protobuf:0/31 ) 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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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 )
+DESCRIPTION=Google's Protocol Buffers - Python bindings
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://pypi.org/project/protobuf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=dev-libs/protobuf:0/31 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/31
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.20.3.tar.gz -> protobuf-3.20.3.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=42038fcb324dab3a0cee79ff893dc393
diff --git a/metadata/md5-cache/dev-python/protobuf-python-4.21.8 b/metadata/md5-cache/dev-python/protobuf-python-4.21.8
new file mode 100644
index 000000000000..6514b9a39bc9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/protobuf-python-4.21.8
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-libs/protobuf:0/32 ) 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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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 )
+DESCRIPTION=Google's Protocol Buffers - Python bindings
+EAPI=8
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://pypi.org/project/protobuf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=dev-libs/protobuf:0/32 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/32
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v21.8.tar.gz -> protobuf-21.8.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a5bcab57b6dcd1808c2badedd3d12d0d
diff --git a/metadata/md5-cache/dev-python/protobuf-python-9999 b/metadata/md5-cache/dev-python/protobuf-python-9999
index 4989ad5ae6fa..8266efd9d8af 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-9999
+++ b/metadata/md5-cache/dev-python/protobuf-python-9999
@@ -1,16 +1,16 @@
-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-libs/protobuf-9999 dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( 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-libs/protobuf-9999 dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google ) 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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-libs/protobuf:0/32 dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-libs/protobuf:0/32 dev-python/six[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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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-libs/protobuf-9999
+DEPEND=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-libs/protobuf:0/32
 DESCRIPTION=Google's Protocol Buffers - Python bindings
 EAPI=8
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf/ https://pypi.org/project/protobuf/
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://pypi.org/project/protobuf/
 INHERIT=distutils-r1 git-r3
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=BSD
 PROPERTIES=live
-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 ) ~dev-libs/protobuf-9999 dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-libs/protobuf:0/32 dev-python/six[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/30
+SLOT=0/32
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1712b39d1a0b2d901aeb3313e775b48d
+_md5_=0f4a0180d7bd71df70d0631ea18f94f3
diff --git a/metadata/md5-cache/dev-python/pylast-5.1.0 b/metadata/md5-cache/dev-python/pylast-5.1.0
new file mode 100644
index 000000000000..2f9e770f51c0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylast-5.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python interface to last.fm and other api-compatible websites
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pylast/ https://github.com/pylast/pylast/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/httpx[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/pylast/pylast/archive/5.1.0.tar.gz -> pylast-5.1.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=4c7903f331f34d30b6eee668c05094b5
diff --git a/metadata/md5-cache/dev-python/pyproj-3.4.0 b/metadata/md5-cache/dev-python/pyproj-3.4.0
index 43ff3f4d49fb..7a004e8159d1 100644
--- a/metadata/md5-cache/dev-python/pyproj-3.4.0
+++ b/metadata/md5-cache/dev-python/pyproj-3.4.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyproj4/pyproj/archive/3.4.0.tar.gz -> pyproj-3.4.0.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=949c44e871cbb56872491203c984dc76
+_md5_=c52d3caad62acd8077bbad4d782bf223
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-3.0.2 b/metadata/md5-cache/dev-python/pytest-xdist-3.0.2
new file mode 100644
index 000000000000..46bbab543116
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-xdist-3.0.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[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-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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=Distributed testing and loop-on-failing modes
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-3.0.2.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=9a9547d0d5a7febff74399843478692b
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 41b405caf08b..ef3182fed271 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/gtk-4.8.2 b/metadata/md5-cache/gui-libs/gtk-4.8.2
new file mode 100644
index 000000000000..2a1cd6e51e86
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/gtk-4.8.2
@@ -0,0 +1,19 @@
+BDEPEND=dev-libs/gobject-introspection-common introspection? ( || ( >=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 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) dev-python/docutils >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig test? ( dev-libs/glib:2 wayland? ( dev-libs/weston[headless] ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0 media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.6.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3:1.0 >=media-libs/gst-plugins-base-1.12.3:1.0[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.25 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( || ( >=app-accessibility/at-spi2-core-2.46.0 >=app-accessibility/at-spi2-atk-2.5.3 ) media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) X? ( x11-base/xorg-proto )
+DESCRIPTION=GTK is a multi-platform toolkit for creating graphical user interfaces
+EAPI=8
+HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
+IUSE=aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+
+PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
+RDEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0 media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.6.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3:1.0 >=media-libs/gst-plugins-base-1.12.3:1.0[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.25 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( || ( >=app-accessibility/at-spi2-core-2.46.0 >=app-accessibility/at-spi2-atk-2.5.3 ) media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) >=dev-util/gtk-update-icon-cache-3
+REQUIRED_USE=|| ( aqua wayland X ) test? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=mirror://gnome/sources/gtk/4.8/gtk-4.8.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=30ec818d2d2a9b91df85ed7aa5e1fe65
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 2216d9e02b33..7c9c6f8d3789 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/portage-3.0.38.1-r1 b/metadata/md5-cache/sys-apps/portage-3.0.38.1-r2
index 22be1bba7b1d..22be1bba7b1d 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.38.1-r1
+++ b/metadata/md5-cache/sys-apps/portage-3.0.38.1-r2
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index ac16443ffdbc..8fb4c9cfaab6 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/k3s-1.25.3_p1 b/metadata/md5-cache/sys-cluster/k3s-1.25.3_p1
new file mode 100644
index 000000000000..eff02cc62432
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/k3s-1.25.3_p1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare setup unpack
+DEPEND=app-misc/yq net-firewall/conntrack-tools sys-fs/btrfs-progs rootless? ( app-containers/slirp4netns )
+DESCRIPTION=Lightweight Kubernetes
+EAPI=7
+HOMEPAGE=https://k3s.io
+INHERIT=go-module linux-info systemd
+IUSE=+kubectl-symlink rootless
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=kubectl-symlink? ( !sys-cluster/kubectl )
+REQUIRED_USE=|| ( amd64 )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/zmedico/k3s/archive/refs/tags/v1.25.3+k3s1-vendor.tar.gz -> k3s-1.25.3_p1-vendor.tar.gz https://github.com/k3s-io/containerd/archive/refs/tags/v1.6.8-k3s1.tar.gz -> k3s-containerd-1.6.8-k3s1.tar.gz https://github.com/opencontainers/runc/archive/refs/tags/v1.1.4.tar.gz -> k3s-runc-v1.1.4.tar.gz https://helm.traefik.io/traefik/traefik-12.0.0.tgz https://github.com/rancher/plugins/archive/refs/tags/v1.1.1-k3s1.tar.gz -> k3s-cni-plugins-1.1.1.tar.gz amd64? ( https://github.com/rancher/k3s-root/releases/download/v0.11.0/k3s-root-amd64.tar -> k3s-root-amd64-0.11.0.tar )
+_eclasses_=go-module	15312495dc4fd84f8c37bbe228ea2abd	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=2f97f4554637d6472b5589f7ad8a45d3
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index f432b0f0fa86..90341e68cfc2 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.10 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.10
new file mode 100644
index 000000000000..8c61c67622cc
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.10
@@ -0,0 +1,17 @@
+BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 dev-libs/glib:2 dev-libs/libxslt dev-python/docutils dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.56.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( media-libs/libjpeg-turbo:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+DESCRIPTION=Image loading library for GTK+
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gdk-pixbuf
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson-multilib multilib xdg
+IUSE=gtk-doc +introspection jpeg test tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.56.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( media-libs/libjpeg-turbo:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=77b14a739fc83bfbca88806c1e82be2b
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 41b022572438..c5dab9bf45ac 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-25T20:09:46Z
+TIMESTAMP 2022-10-26T02:12:34Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNYQopfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNYl5JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDytg/9HpdKeaGRXANKhIQDtBpV3scReVvuuDrYnAQDHC/E0uWQ+KpVFqzqJUgQ
-SxzAXYn5K2HKcTdoE7ELyDQwh+bPzBG1IW+hEAEUbn6G3ucOgWw3oDUiIu8Qz4hj
-nOsOVRykVqGj0QLafSl1jqms7wgjChri11JItFlkyq2VjsoUK+7GR7novqsENlDe
-DRcQer+VI8u+8isDpX/Uap8KgGy9jxkrnecnXGO41SVtZL/CZRMoDZoqslSKh5+S
-jaSyLi6OMlvtuTWwu5lqxfFQtK9XdvEdKt+tv+tMlylgEO15pZWx+UFBixnMTf37
-UI3pQKS2YHGPgQPAJxwpFQgUkVK1rQHgiw0ybErbKF6QOpgnvwt9gn2PRNA92NUy
-oAVvC4HEQzuRIrOryvbvwjcf+Dlxmo3yKhnTLQdyMPp46ZfJMekKfCRW42BVYGEM
-TBtfG5MP2GkOEHxgNFPSz/XVuaKuLAzwD94WxWkOpJ3ShYQTnkDJDGEoWzS47ExL
-Bz9TLWZ1PeY4jVpDFMwltO+d+k8WGgWhDhToZSWWG0zqMry0gz0RUP4udleqNl3q
-HzZKQ0V5xjcqSFYjUYdff1fsp7o32Fj4Zga0a4zRMBg/+LxqN56xsR8255GOsR4o
-WhJfGPSiZe/1453fzR7OWIKf6Q5PKSlVws9fkaITv1ATzhQcBZ0=
-=nThz
+klCxTw/9GBVidt7rOKOK+E9zIUt99PsiEj24mNTeDtIpcg7uzbqsOMwFMGJijdnZ
+dAgvZusb3cDKs0Bj9oPz2TsgXehi6rWwjJMvs4m1Bago50appsH3Span2FbeBX5P
+rHE1LgsRTdqpaTLk/cbW4VCSlXob4BKpkACV0ETgjfAXFRJrwk9MLXEpmGPXOUqw
++1CxGYgRMoYstUD2m6HGUHUCejAEEQ8i5IoH64GWHjdNv5/UBMOld3OcIWSis/jl
+ROFia22Pay9HgC0JfE/FjSs1AzlA8CU0HOEyfAphtV28sMYkJYorSjyJ+mdo4iRo
+f1uSLgHBeKjBPTELqNaoDWJAGqCOWY9MI5a9uZX3yhqRg40Ej7pv1EdJDYREjxC/
+OWXHTg88ZDX09PF/PelZTYiuPnDXnrY86F2B98F7QljPq2NjyhVfUYTKBh1UUlc9
+uqSiIo4bs+rO0kt6Yheco719yQ9+tFKQrOwVlyZbvFSr2EmKFfGWG59OMrlGf7d7
+wq1EbgFOLLM5KZ/SrQWQvTrzHJIWziBfy/e2CeNhaRbWCrOgDModQqKTV9oREIRN
+0sS/Olqjnk/I+OlwOyLpFCjKkSMliSVv1ljxdYYsmoQJdtetXW72AbXNeVhAC6kO
+fUXVdPp80Ywr7QjaV7J2ReYLtnOhTS6sb40il6LqiNziNnUOaJ8=
+=uPwZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index aee105bfb5e5..a8191b693a4d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Oct 2022 20:09:43 +0000
+Wed, 26 Oct 2022 02:12:31 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 907a9d1234b6..e035fd54c6f0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Oct 25 08:09:42 PM UTC 2022
+Wed Oct 26 02:12:31 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2b602cfbe65d..73605e22dcc0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Oct 2022 20:15:01 +0000
+Wed, 26 Oct 2022 02:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 625ecffcd0c6..fcc4369284d3 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-124ed39003471ee89663c8cb993d29d8728f9953 1666728277 2022-10-25T20:04:37+00:00
+c046ee45bcc9d2e6164b70f73acf7074e03d31f1 1666743624 2022-10-26T00:20:24+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index bff3da91cc01..df560f5e6ecd 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666728602 Tue 25 Oct 2022 08:10:02 PM UTC
+1666750201 Wed 26 Oct 2022 02:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e733ae899bfc..a8191b693a4d 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 25 Oct 2022 20:09:42 +0000
+Wed, 26 Oct 2022 02:12:31 +0000
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 1412290ee4fe..febbfb4440a6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ab877f9c4c0d..e048b5c1709d 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,7 +1,7 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-AUX portage-tmpdir.conf 40 BLAKE2B fb03a5dcce146168c991d81d9e0988b3085c8fdc7fae00c20988a58d9b7a0583a15f42747533b29e84fac312d19265e0bcc27088ba50dbf48336522843518f01 SHA512 722aa68625a5fa4f9e60d10b69ec42fa7b6c51aac10b247420bfce69d2cfff50ffa6d0ecd359af6adf409c4681854852421b868ddcbd6f9fd6d9be9b23989a44
+AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205b40a0a0640ce2a7ae553a84d7aa8d8c11a776cac44b7573b842951ec11f8ab393145edb1786d6837e79 SHA512 4810d8ae1f8291d34b756897972841d30d5f50b48597a430cb8ddb102dab07a7f0d78c3901b6fdd6763180e92b5ae90a3cb88ae5a5c1cae845b23b49d03a87fd
 DIST portage-3.0.38.1.tar.bz2 1116216 BLAKE2B d1cb4cc1924673d07ea7174ad0a84b3af977dd28ca659695d3e4014e4aa83b054acba82a160e7c0a8d3d4fbc3514bea619c3d720e450cb4890818e4b1bc1e43a SHA512 1375565e936276fd6cfd2a4f6f782b91e234e973d6a998f2276a076dd165272bcf12067fd01e77b238f194eac69edf967bbe3ac62edc3701fe9375c693622ab9
-EBUILD portage-3.0.38.1-r1.ebuild 8779 BLAKE2B a8ddc97040cf50ead0242077badd51673e8ddf2e4daf8169858d71985e34eb03e79a2aac8ecb08130e3cb313365c37e1a48f3025c176a06f764ab80405ef6de9 SHA512 1aa325bfb8d92f97400750fba1675507a3a39bfe20bafabb1c9c46f1e27e5328cfa8d1e54af8891754025b50824099c0ef011347de6896df893b8b92dc679321
+EBUILD portage-3.0.38.1-r2.ebuild 8779 BLAKE2B a8ddc97040cf50ead0242077badd51673e8ddf2e4daf8169858d71985e34eb03e79a2aac8ecb08130e3cb313365c37e1a48f3025c176a06f764ab80405ef6de9 SHA512 1aa325bfb8d92f97400750fba1675507a3a39bfe20bafabb1c9c46f1e27e5328cfa8d1e54af8891754025b50824099c0ef011347de6896df893b8b92dc679321
 EBUILD portage-9999.ebuild 8027 BLAKE2B dcca51396bb7f1b4239ef6ac4b9ef5b0dab1f5066311d64e452582c277e93cead914ab454a4ff8eb0673ad031a92a4994f15fa6a5219e611eb07b9d84af2a277 SHA512 ddbb34220d7f62756eace84ebd6b41382218a66ae992748ac99e76128016423342a0c5cfb972513805d204180ba69276434060a29649fd035d7aee1817f70574
 MISC metadata.xml 1487 BLAKE2B 5b9833e8bfc2c38e4db95f2368a65d85623aa8dd166e4e09bed4cbe3a7e59d47da69a9dff1e6615fd64f349cc05f57217ee61ebfd23e3e13622a7573ea135659 SHA512 b22f8c1f3a4dce636d0f823f1303f60d32fd570b484e93a64dfbdcbe145534b3472ae94c1ac992a478c9e2930fbc8a5311e0080b4722f9b5dc29dff59ddaa7c8
diff --git a/sys-apps/portage/files/portage-tmpdir.conf b/sys-apps/portage/files/portage-tmpdir.conf
index 63a9bcf07097..4f6e20ccb521 100644
--- a/sys-apps/portage/files/portage-tmpdir.conf
+++ b/sys-apps/portage/files/portage-tmpdir.conf
@@ -1 +1,2 @@
 d /var/tmp/portage 0775 portage portage
+d /tmp/portage 0775 portage portage
diff --git a/sys-apps/portage/portage-3.0.38.1-r1.ebuild b/sys-apps/portage/portage-3.0.38.1-r2.ebuild
index f7e3c208d20d..f7e3c208d20d 100644
--- a/sys-apps/portage/portage-3.0.38.1-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.38.1-r2.ebuild
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 2a37e6eabbfa..6f1f7d0f1d66 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest
index 39e0d7436bc0..568eb44f779e 100644
--- a/sys-cluster/k3s/Manifest
+++ b/sys-cluster/k3s/Manifest
@@ -3,10 +3,13 @@ AUX k3s.initd 976 BLAKE2B 155d1598f307b613b0aab30098105551860048ae17f783920976c7
 AUX k3s.logrotated 37 BLAKE2B 8e106b2ae826d1724adb3cf6970cb46b53247ce77a8206ce9ffdaea372ee36f164f38ae8044afe814f9a3aa24d1f3c8d8d75452949ffaee0644948a6ae92fb52 SHA512 f0732ad9d003df155ab9f919909db8c62024c546412f77b3fc6c1a94faf150c532de61e73421a880b7be55edaa4367e01084f59b6f99211a3dcaac1a38f28d68
 AUX k3s.service 597 BLAKE2B 067ea095d2ad948a59e6fcc6ecc569d3f8fa4e802e381e5ccc48988c70c5e8e9e4335afc7cf5a2e830d22bd89cabffbc6fb9161da73599be75b305eb28bea14a SHA512 9741575f844da8ed96e230c443ec6662bff22be8602b420eb74fc6a72d09f36a5fddb8426894e63b7a8c2918a36fc717a38dfbcf003b56f47c13c06c4fc96825
 DIST k3s-1.25.2_p1-vendor.tar.gz 31890900 BLAKE2B 9a60ed25d4df0f8e2c90fe06de5b68656ce177dc5480a91272ecddbb75686ba86e61d600088a0fabeed37c1c28ec3d1ad46c514b8a248b1d0770f686da567a7a SHA512 c31098710c30b81cffbf1fd86084637c2563124e3415b8a83d428ced5e2bf81eb023de9b05a6990a2b8c236f1dab538a8f7fae6ef3105c266c40dd89c426c93a
+DIST k3s-1.25.3_p1-vendor.tar.gz 31914962 BLAKE2B 6c392ec4988f5c875dfe892f9f032c90936a032f4dcaefca6da304c5495c079969b9bdc8f42f888ac0d922e81b965a3b074e3e5a18a960701ca6ec96e39cdc7e SHA512 6610d5660c403ef2ec04c2d35f796e8cb7cc4f3fcf65d209c9ff5e986da14f4d8c594f60eb9e02cc873d210f69af82a41681731e2586945f6bc44bd3cc364ff8
 DIST k3s-cni-plugins-1.1.1.tar.gz 3122345 BLAKE2B 270283ffb746ca97ad147b368143c56bd9641b7ebcb1b2b61f80ffea3336b240b28c9b9496bd2f6eb6d7e5382da4979c26e37eca30ac19fd362ed822ba94f300 SHA512 53dcd363231325553a5c9e804fc9005471fe5c05c87aae0340214c146eba66a3761d73976ba0145d86a663a2b0a1941e6cc5823b6d05e002a9ef18e41e10ac3c
 DIST k3s-containerd-1.6.8-k3s1.tar.gz 10344676 BLAKE2B 18b236d61c710234fc6feefb4b08e36950c02a3a74d92a7bae5286ddf2916d29f636d1c9fb4307ccb6c6f1c7a77441096b0db9c892d5745f32815f4016af7b54 SHA512 b85c5e73c9f6c66c229888d93b3796c3fa4b362ee2ee4f7fb37f760ff241223820c0bec4995e73e9c3d20b81a8fc3676e7b0ed170239c8cb43194aae2701a6b5
 DIST k3s-root-amd64-0.11.0.tar 11878400 BLAKE2B 6227ba08e305f062ed814a6b997313415c08e469b05f0501c86f7df25e8a3c9ecb43675613337f6d038faa5153aae98eb44cad9bc170967e0a216ba5ec27559e SHA512 d181117230ad941b40173c3b7dc3d2bb0f3d44a28e9715d85c752193c6058bb6be4a4b8f061df73fed690629a7b2b330185b38bb90ce7fcc9c808096516cb0a3
 DIST k3s-runc-v1.1.4.tar.gz 2334639 BLAKE2B bc7eb7de29e8ebb9ce146bc77bf6cfc116f4af3e28c0344059183cf0c8082c629ccb235531c368cce99915991b25df0b50b7cbb98b9c6a7d141ba6cc15958651 SHA512 c8e79ad839964680d29ab56a4de255f91192741951673025da6889c544a232d4d392db2da8005d8e22999a37bfbc9c9fe7f6043b165bc4edc2f2a29261d8a3d6
 DIST traefik-10.19.3.tgz 25287 BLAKE2B c43a5e066d78e066bc4449ad1d7a3796c99c5f029244dac5494a452592424a9be057b6a3d8eddd174d8daab2b322c4f54e39eae53fba67e97e1ebdb92ce2fd65 SHA512 6df4b186c4caad09abf47469757c1d26d3b593531704af53eb262208f1efa27b5b09b178c6dd6721e78362877e6ba3b2c8c3bfbc91fe152ce090b53ac283acf9
+DIST traefik-12.0.0.tgz 36268 BLAKE2B 9332e30d593c2c73cf06be8d7813807f6880e40d7f1c78f314b77e2fd2342e91f232f5288d2946eff586fc58c27fa182da30a50f37b91046d37a4aad6d3bc452 SHA512 5cd661ab609fc17c1fb52460c3d1e6ff3ee294f6dc8365b68e8a35a3e4b321b7ca75037eda2869ab72ca14836ba1c72b76d3cd92021dba56dd163b2678448dfc
 EBUILD k3s-1.25.2_p1.ebuild 4065 BLAKE2B b84b43937e5211584bfcdba1c7881904831956e9be40892d4957e5d69cadf499b2457f1ee88138ae7cf5ba68e2a1749c8119328228ceb3bafca59921bb816125 SHA512 5c1602435fbcbd60edd69759811d5d192d2c34122a3c448c5864a14ea658fabf070886e5aec16837b1991debd8598c0a1cf2935a9886c9943c33e12ff9312518
+EBUILD k3s-1.25.3_p1.ebuild 4064 BLAKE2B b69f5b849c04841bcdb44c85e8beb94b3a747a7c0a4093e36d9fd3a1ce4fec79eab523bd9b8e41863408a0a8bbcf5f500e51b41462896c401fd61c473e543391 SHA512 3364faff5571638e171388cfe7bedd7759d8db6b951f7408fdaa80c0af11b83efa1d9f10428c24ae163cddd6ea3001e2a995fa75e069dbfc4b74500d475f37ff
 MISC metadata.xml 515 BLAKE2B dc5e9d23a7b4d84ec392036cd87975b9117133b3a68eb1a69a38637dfca36f4e721be42dbd1ee0dd73585602800ef49d4255ff736be7cdc97e7f2d07b59af99b SHA512 8ee732afdfd59151faa18dbc68075d0c528113b8ea3f9939d0a83fbf7f06deefe2dee27079b7317ee98ea165e81cf4514f1d305564e21b3e1fc4760d2350fd46
diff --git a/sys-cluster/k3s/k3s-1.25.3_p1.ebuild b/sys-cluster/k3s/k3s-1.25.3_p1.ebuild
new file mode 100644
index 000000000000..edd90a3d1c4e
--- /dev/null
+++ b/sys-cluster/k3s/k3s-1.25.3_p1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module linux-info systemd
+
+DESCRIPTION="Lightweight Kubernetes"
+HOMEPAGE="https://k3s.io"
+K3S_CONTAINERD_VERSION=1.6.8-k3s1
+K3S_RUNC_VERSION=v1.1.4
+K3S_ROOT_VERSION=0.11.0
+K3S_TRAEFIK_VERSION=12.0.0
+K3S_TRAEFIK_PACKAGE_VERSION=00
+K3S_CNIPLUGINS_VERSION=1.1.1
+CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
+
+MY_PV=${PV%_p*}+k3s${PV#*_p}
+SRC_URI="https://github.com/zmedico/k3s/archive/refs/tags/v${MY_PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
+	${EGO_SUM_SRC_URI}
+	https://github.com/k3s-io/containerd/archive/refs/tags/v${K3S_CONTAINERD_VERSION}.tar.gz -> k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz
+	https://github.com/opencontainers/runc/archive/refs/tags/${K3S_RUNC_VERSION}.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}.tar.gz
+	https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz
+	https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
+	amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+kubectl-symlink rootless"
+REQUIRED_USE="|| ( amd64 )"
+DEPEND="
+	app-misc/yq
+	net-firewall/conntrack-tools
+	sys-fs/btrfs-progs
+	rootless? ( app-containers/slirp4netns )
+"
+RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
+RESTRICT+=" test"
+
+S=${WORKDIR}/${PN}-${MY_PV/+/-}-vendor
+
+src_unpack() {
+	unpack ${P}-vendor.tar.gz
+	cd "${S}" || die
+	mkdir -p bin/aux build/static/charts cache etc || die
+	cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/traefik-${K3S_TRAEFIK_VERSION}${K3S_TRAEFIK_PACKAGE_VERSION}.tgz || die
+	cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
+}
+
+src_prepare() {
+	local filename pattern replacement
+	default
+
+	local CONTAINERD_DIR=build/src/github.com/containerd/containerd
+	mkdir -p "${CONTAINERD_DIR}" || die
+	tar -x --strip-components=1 -f "${DISTDIR}/k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz" -C "${CONTAINERD_DIR}" || die
+	if has_version -b ">=dev-lang/go-1.18"; then
+		# https://bugs.gentoo.org/835601
+		sed -i -e "/github.com\/containerd\/containerd => .\/.empty-mod/d" "${CONTAINERD_DIR}"/{go.mod,vendor/modules.txt} || die
+	fi
+
+	local RUNC_DIR=build/src/github.com/opencontainers/runc
+	mkdir -p "${RUNC_DIR}" || die
+	tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}.tar.gz" -C "${RUNC_DIR}" || die
+
+	# Disable download for files fetched via SRC_URI.
+	sed -e 's:^[[:space:]]*curl:#\0:' \
+		-e 's:^[[:space:]]*git:#\0:' \
+		-e 's:^rm -rf \${CHARTS_DIR}:#\0:' \
+		-e 's:^rm -rf \${RUNC_DIR}:#\0:' \
+		-e 's:^rm -rf \${CONTAINERD_DIR}:#\0:' \
+		-e 's:yq e :yq -r :' \
+		-e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \
+		-i scripts/download || die
+	sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die
+	pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR'
+	filename=scripts/build
+	grep -qF "${pattern}" "${filename}" || \
+		die "failed to locate plugins clone command"
+	sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf \"${S}/cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz\" --strip-components=1 -C \"\$WORKDIR\"|" \
+		-e 's|rm -rf $TMPDIR||' \
+		-i "${filename}" || die
+	sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die
+}
+
+src_compile() {
+	mkdir -p build/data || die
+	"${BASH}" -ex ./scripts/download || die
+	./scripts/build || die
+	./scripts/package-cli || die
+}
+
+src_install() {
+	dobin "dist/artifacts/${PN}"
+	use kubectl-symlink && dosym k3s /usr/bin/kubectl
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	dodoc README.md
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index d29c88a6aadc..2517df506570 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 7f3e32f0ab86..9e6096795f00 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,6 +1,8 @@
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
+DIST gdk-pixbuf-2.42.10.tar.xz 6519776 BLAKE2B b6bec388b70a971ea5b336001920fdf433bcbc539d54e62c7b6198e968f0bd3560ef9adc94215b64b01e7d5db69c95d5a1d32654b38b051fceb75e93666b3385 SHA512 ad64963b61ef8cc84ae450328ec8c90a852f974e29ffdd42263ed32de47af93c058f3ffdf91c5d6e9bba815f4e8e8fe5a19422ac1bfb079666339814ac059b3a
 DIST gdk-pixbuf-2.42.8.tar.xz 8503020 BLAKE2B 39960043c5aa980f311d2705c868c170c90c7b580ac9ae849a3fdfc6a5faffcc24be23b82ca8fefb1cd5c28d2a02bfb87b1c5c5d1eab7b897f5e551a57577f7c SHA512 994a1374becec6235d347f4980afcc8b85f43ac373e4d7e00b7445880d0a51932e63b54429b28ab5af09e7c4437f9d6008e1c25b2d44a2c9ef7cc9821b478387
 DIST gdk-pixbuf-2.42.9.tar.xz 6596068 BLAKE2B f464a6b326aee185b30b24f66267ad7eacd12e8b3bd07e7cebfb42a496791561cdd71cd937282d72f1fc55ee1e86b531f7e737a2dd00f2187d705865be177919 SHA512 032869c98d22cc4add05198baec5a64d29af247a99a084d7c498f82f467fb2a2008a8d0d4564ee5d963f6965dc9b3ff61b6c07377f67fec70ddf14e5373abfb3
+EBUILD gdk-pixbuf-2.42.10.ebuild 2680 BLAKE2B 120cc3dc25f7312b6275102ee0ded8f7ba20d24fa7d0c1f8c12e6ba52b7829e82359d71f938567c0c005d065b187b802b33e0edba0535b33fb66e8c6e1d389c5 SHA512 ed38bfe5b15cfae2ea20c7e5b2d16399fc13f8b2646fe8520cc84fb8ccae213983dee27e49cba6fe98248b48640329adc0d25f5a9876d874b832e46aa2f71ba6
 EBUILD gdk-pixbuf-2.42.8.ebuild 3459 BLAKE2B 76c75c89dbaf850cb2943962ccf72eaab6c2ebb5bd78f4f3f214f64be80adf41f3204167aa2e6ce2be2cfb46d5917d50676f0a3ee54320956b914786cfc8e5dd SHA512 293bf38a0ca34fd3c9669e56631e0823aca22fd48308f94961c7acb32de7d7670d7302b43f486d3f93c49a86190a3fcc2df942342dc2d27d108103bbd732cf6b
 EBUILD gdk-pixbuf-2.42.9.ebuild 2801 BLAKE2B affdad5c20e4106b9e21c61b697f524f3f5e4a849db5e5a564339fd18faefe9e0055394900f1dfa5650ee320a2a157c340b34df7352e0fd27827d5970b46bb5b SHA512 58138905a87ac0d673d37585bd52cbdbf55c868ed327bda4025a09888b65048a3836d507b4316d3ee46ec94b1d8f717809dcc875ca273b37b5505e84f2b5166f
 MISC metadata.xml 332 BLAKE2B d11021f9889f64b977816523c2ed8f4b122b3f510e9649ef1548584f99b97e28f782d6fa753e92042bfefc8da4d1c9694949559660d99bdcdaa648af0bb01c4d SHA512 9bfa76b3e49cc2038dfa8af478bd12ec1832c4cf073987a88d6c1b0da791496d45f20b7a411e08c89bcffa1ce207fa07c08da244f93a2534175e0b80079965af
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10.ebuild
new file mode 100644
index 000000000000..265bd38a9b6e
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.10.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson-multilib multilib xdg
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk-doc +introspection jpeg test tiff"
+RESTRICT="!test? ( test )"
+
+# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
+DEPEND="
+	>=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	jpeg? ( media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/glib:2
+	dev-libs/libxslt
+	dev-python/docutils
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpng=enabled
+		$(meson_feature tiff)
+		$(meson_feature jpeg)
+		-Dbuiltin_loaders=png,jpeg
+		-Drelocatable=false
+		#native_windows_loaders
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dgio_sniffing=true
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_feature introspection)
+		$(meson_native_true man)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/gdk-pixbuf "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/gdk-pixdata "${ED}"/usr/share/gtk-doc/html/ || die
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}/${cache} ]]; then
+			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+	gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-10-26 03:54:55 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-26 03:54:55 +0100
commit	2ecd7994be1409f2a65bfca700904d2a78fd7bbe (patch)
tree	0248ea4d4f411ea88c27470c15ebc725bb04baa1
parent	c22e93ab35a8cb604c41623a7b2cda059c462b70 (diff)