gentoo auto-resync : 14:10:2022 - 07:43:49

author: V3n3RiX <venerix@koprulu.sector> 2022-10-14 07:43:49 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-14 07:43:49 +0100
commit: fe8b106bd60ab72e98ab836f5c702070805e197e (patch)
tree: 44016d57867c58de87efd4b028c171d352bbf3be
parent: 30737dc88991519b90363c2c7bae8fd049098d13 (diff)
333 files changed, 1925 insertions, 920 deletions
diff --git a/Manifest b/Manifest
index 75294f562afe..4c1e13991927 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29600 BLAKE2B 8ae32c8bf0eedfa3e38af4e4a9cdd23edec1fed993d973a9a88d958e6d11eed9230d0646941439f28bce4fda51c51656c4602a1326fd4890422e6dd3d5ae03d2 SHA512 c4e929ae530dcc06a3950e0ef12f2a63d745e37796d16550f0929af7776a9d3f7bc3c6b9e31557806edbf0aa2c64f3d74ddbe87ced85a2ebcedd12faa729aa5e
-TIMESTAMP 2022-10-13T23:39:54Z
+MANIFEST Manifest.files.gz 29615 BLAKE2B d61a0049b0e2f283e46278b24d056dd84bebf0edfdc7c9f15af06d0378f69cb50d192b40da58df65e639b0399a64cb1d923dccf9c4f68765aac5a3e2c0ca4e8e SHA512 34ecf85b094b579f0d5840af833fa9bad19be8d0240a1a3929933b7fcb7e25d65d7891daadc7f5755d6600454dcd375df5668485bd5e7c238f6699aec64e7161
+TIMESTAMP 2022-10-14T05:39:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNIocpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNI9ixfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAzng//c07tipMuuq4q1jUeXnENY6KBK7BQocLdKVclybNCOgf7I4KL/jR9GK02
-2kPlUTqqcjOpCZrZx6DW3p4SSFvmdX4M/tE8GCAK+/R0LIixYvbUhRi7pq67esLE
-ewPMW2uSsuFYAMNkFiX547CdYph0UGU+stQMhrQBtuAmyRDnQPhN0RgmKsCMCQbc
-Ur86V8GsSsXx/nL9z5fm/MeAiVvqc8pTucG03yLh2RoPo/mWJS3CWRd12zb4Z1cV
-UVcwTQB3vy/5v8NxIClkeujf2aeqeqG4J0a3CbGnK2dbRyILL+v4fJPE1rak1vD4
-+c1SGrmNvOf0cGNiPrIGw2+DpYZ97lUge1ndryr/p0ZG/gGZATtfZ6JUI8Oprp7/
-yszjUMR3m47X4s4YDHvN4R3HGtjp6uj1EO2/knHODzQaKlGhUMeHS0OQ75C+ZeaQ
-YrefGpoAsh3OFb/yYpIaAm86ABYTE2dBWbbZIl8uEK43xerP820010n2NHEngkRU
-TY6rzCnPEAPSRZ01WWUbTIVLXZxyRJr+ZLtLXIr0+dZFtIhdGdVjh22uA8lrYJqj
-NqKxPyucanTjEh3MIRrlZBq80FEAmeEjFbdSIefw7kkVAKkpqfK/+hpGX99qB2C/
-u/kuIqJ2rVOUI03mtPcHxkf4fRoWu5EMTITNd9cJnPvC13IYKr8=
-=5/fW
+klAEwRAAk+IrJWL8lmMKRpYRzYibGyaIbvaDJQuRnHFQF1Xw+ydnA1dWb0NJEqLr
+U6SKOjnIvgcvtmOm4efGfeksna1ENJALMRzIQpmWG1b9rLdxgB8iQkYPPnjQ8rtZ
+xAaAeYpbl56zIOXLCO236NF59te5IRX1pxsjmd89N8N5RIbG8M+fKOrsqeeno5Gq
+0WTVccVbZPPR3nLyrkrSSfO9W1r7B28O6JfQcvLVW+njhiKHsQgxqcfRODCh1f73
+B0u5QeNkvkClI6jsY4iGVkq5LmC0yWNcMzt8a+LYxbriIJSHX4d/zm4t3Yq3lo7Z
+y47QWGT6K1c6bnm2/jWoRYzkEuzIgj9RedbgK4xPgKCbQ0WhQ+Qed6Yq/u1LORS9
+Pb4DCc5Awo3BvZayVwC+oiPlnR0mD4ayNk5hs0MWEscOOGnbSKjPJpCi+Bf4M29K
+A9I3Cx01OIixkXd7LoprBNLkeeHRFLfOI7maiGjgciV9NsGmEk11PM7DtO9c9SQH
+4GBKqEYXOTcbgS1PemCfPjiThE5UcRMPPDO2jkh+ugP2i5kBCs3OUpjAse+Ba/rf
+QaML/aNlNUbKf9ga2vFtm3g3/OZmTp35AVjUSNdkav1kdAQYVs0zkJEGjSlYt2VR
+33K18AAVk6oAQREn27JJky+2FhpGeu/NkP/zvAcGzziqBhgrFJI=
+=Zn6S
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 3c8a8706bb60..31dfa36674a9 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index ff5315603ec2..112358551fad 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index bd288457a324..ab32963c9162 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,7 +1,9 @@
 DIST aws-cli-1.25.81.gh.tar.gz 2273195 BLAKE2B 3bf3ca742b08c0bf4367ae1bfabcf8c2626010d60cc11ff66250753f62609eba80053c1d8696cc3184ba9f947f995a8bb95489b01f60a3fa7e1a8cbb4961652c SHA512 4f10de492a56b158d88671c149d4ed4171fbbde8fe84de15a446e31a7d8003a4562439eabd369cb80dcf91987caab6aef05e5b3f5684aeea47ba0d323883c53c
 DIST aws-cli-1.25.89.gh.tar.gz 2285887 BLAKE2B 1da21b1e314b187ee105d2bf256ce2fea42fec8d1e5cf0de39c8371a93a588e24e5415b2e50ae314d39613a4ae55963bd544cc7ab3e08d0e38089c5c609454f4 SHA512 39087e269a0318777af73d010d7c6264fd595fc5d27f24bb66da07763165729526bd8a60f4225241eb5172d879d6f562c5bf64ad5979d7ac3be40b7d8cf33486
 DIST aws-cli-1.25.90.gh.tar.gz 2285948 BLAKE2B a664e70e7367e6cf6fbaf62ab4dbbf649e92f3184793cb0f444c520b947cfc0845e075a44025b48a02b431e237d835de23aba6f83fdea5810d759690368ce069 SHA512 f42b0125cddc35314a675f84672fb5716300d9625eac7338b36b6f501d412a5e932f1d75566a9cdaca84b9f7cd65cc354199e5138675d48a0f52ace9a1ab126b
+DIST aws-cli-1.25.91.gh.tar.gz 2287481 BLAKE2B 6cc39905deee332187249124bedc14ef7f2bd82c8a54ee56c6156e767f811a8d26070040f64a059b1bf9a6c46e64cecf82be3d94434f6fb3e0c16dca4cbd94d2 SHA512 531985f71aea2c7eafeba61a214a7f19dfd84912b3c25c47d5c4c44b2e2fae25510a57027fa9a79aaee9a417cbcea1a6d222c7a0f0233ee0afee844a2d99dbe1
 EBUILD awscli-1.25.81.ebuild 1856 BLAKE2B 554e1053c19d16d4e0aeccddbd3a49b42ab412ba342ddd888b11552f1abede7a405f743edbabbda0cb4d42dfc95c0f29da64aab08d09c0cf3b24b0771438f23b SHA512 563c00bd712002ea3b3771e7f6c2f27b478fb78cd91b1009cf498e487b81c8abe04e754873f77f625e56594f34e282307c325cc6609bee2f6e856d0e461aa252
 EBUILD awscli-1.25.89.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 EBUILD awscli-1.25.90.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
+EBUILD awscli-1.25.91.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.91.ebuild b/app-admin/awscli/awscli-1.25.91.ebuild
new file mode 100644
index 000000000000..511be374181c
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.91.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# botocore is x.(y+2).(z-1)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index fb70f49e85ad..87a1d9b2a223 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index ad4f83e28488..445ef3ad4340 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -4,6 +4,6 @@ DIST rpm-4.17.0.tar.bz2 4514138 BLAKE2B e2618f7ac59189fb880d6be853aae99080b50088
 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.0-r2.ebuild 3993 BLAKE2B 5679659f233757cfe4a346402dd5c0b5cb691ca3bdd2898f937ba50396d1980ba08cb8347bd866d579f2ae220fb0351aff0972830b6f15c16e3bfc3f8b92cf23 SHA512 3b6620c0cc78145ba2433571339bf997a9ed9ead43879e697d40979f670b72ccbdd09921130f67c080353979f1d5b50de29ed2668d16463ca5b14ef383a8376e
-EBUILD rpm-4.17.1.ebuild 3999 BLAKE2B 22cc1f09e80b499a8982e45cfbff1eaca0ab38f477f303af20ffd0c853f5c6e239682c8bffc6b421527f3805016afe8f8d4113ce25e79c6594de62a17c3c6e39 SHA512 88040e8b6c2d7b5772da0f52fadd29100f57210ff756b540080285caf7677bd813229834492324d61da2fbb9ee1eb2c2361dbd26bf3fb4e356058fcfada7e106
+EBUILD rpm-4.17.1.ebuild 3998 BLAKE2B 8f41a67ac809bffa1331cccfbcc812ee5d56916464a1f1766d84d13608f111514b3b4c1cd959397b9569bb906cb7971cb45fbd0938c6b91cdb538fb164dd556c SHA512 f3c0f2e5ccd26487c390aeb1ed39405f71b1e3013ca1c13704754d81c8f706b0e75b05d7d6891f1892ddb6b1b4612856e8cbd8a8dda44ddf75b1b1169d6d5bd5
 EBUILD rpm-4.18.0.ebuild 4095 BLAKE2B c97cb6e3aae7c923b96a25218ea437592813f8cfca894083c699666cad48bde1e2534362ff3a59ed90e35c5b01e7ec76eba01b93fa7de8e6ab121f2243590dad SHA512 a1a4a996ab370a37cb3c68346c011322697f4087809300fa528d6b35cd26fcc0a79908170c44f2ec2713f786589c4f70dfaf5481f9e20ab1ae8f6d9a0290be29
 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
index 7a3734e73030..333fec8977d1 100644
--- a/app-arch/rpm/rpm-4.17.1.ebuild
+++ b/app-arch/rpm/rpm-4.17.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://ftp.osuosl.org/pub/rpm/releases/rpm-$(ver_cut 1-2).x/${P}.tar.b
 
 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"
+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"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index c33937c49efd..b1adbe0e9743 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/deja-dup/Manifest b/app-backup/deja-dup/Manifest
index 3a56c3b5ad8a..878317765b79 100644
--- a/app-backup/deja-dup/Manifest
+++ b/app-backup/deja-dup/Manifest
@@ -1,5 +1,5 @@
 DIST deja-dup-42.8.tar.bz2 1467818 BLAKE2B 6f02fc458890f076bf0a8e1ffdc9d72880fd9f1a692d439ecfa5d8b08234472f3ae27aa801144b3e42e9c8b67b550c0882dc93c23d27e6e428ce1eddd80a912d SHA512 76c98e8635ffae076008efa73a92860c6d4e67d39339d452c253269bb3ed032b819ac40d65c2d8fbf195ecaf304796f516e861b0552be972838f95bf59af0a5c
 DIST deja-dup-43.4.tar.bz2 989830 BLAKE2B c67056b4498dbdb8f1346d682449e4a23070f052d6c4b3e205bd10da63148a6327666de79d163bd6450b34c130fedcdccc2053fabf7578a2d7d68decb325f510 SHA512 2413a3b1ef891e0151d61ee6fcec00f609f209da0faebe387dc8dba4abb55aa4ed925bdfee5768c7e8e8794bc9a793fb0769947030102aed57ac56983cd78943
-EBUILD deja-dup-42.8-r1.ebuild 1220 BLAKE2B 26da6a7e2aabc83be1a60e143d0c27757c2fea62f3de39cfa18d353325030cfe7cf4b9c11bf9981f18506c63dddc317fa94f1898c0950ef59822ea5a51ff7302 SHA512 27c81ab23c08956e866f631730e295dbcca3fcb2f3d3d84a9dbda60fde14129bfcd702c13d689e7cac24b54f4b9c22174e6d11f91e3543fa022a09608e5d09bc
-EBUILD deja-dup-43.4.ebuild 1209 BLAKE2B 89f3e5dfd5af9157a1c9dc9637d560b2a1fb15c91aa2134266c931f3079b0258087f8fb37f87db7ce0a2cfc1da9d0c00cfb16e3d8b8cd4e480db338be672fcba SHA512 98c440b1c3645b0a93c6383642cb764a82d708d07e66b05cd0a652b00987db8f6c4e9bcb6ade471d74020a8e7ee7b7952eb65a2ad0f7a02284270d40679387eb
+EBUILD deja-dup-42.8-r2.ebuild 1071 BLAKE2B 6fa0455867c974453b8f5609820c7656114d4165f7ff4b5ac7ae48aad969c13ceeca41add900108910b6a06c1abc6d59dc52bada8fbf30e179164967839591c4 SHA512 4f2a07b53ff8eaa316600006bf31d6eb23f1c7a64a7fd128f68547afc2f9ead22af676f6d380b62a9165b88df6ef67b28e8c8a649e85aa7c03ca86f8081da76a
+EBUILD deja-dup-43.4-r1.ebuild 1060 BLAKE2B 204c899685f9372ec4c4a02a5af2735d575661f68bc81a208e3fcc811d98578ae1ec1a086f33a3a2454c25e9a8b4ee4d28c739317ccc3e9818c66390d89751fa SHA512 b2bbea67ea72f7a2119757e98fa4265d561e07928a2adbccb3836a37f5017d5d33d2a68f6867da6b215f5b02de6227f1db5798fbb9e60703b60aec0ec527852e
 MISC metadata.xml 1118 BLAKE2B e56ff39a4eb5290c056fbf39b8c34d56c62b63cd65c317786b9e2a14f0c850edc3102db7908e106a9b94c642f8a34dcbbead2fe08e20f8a44fac16a3dfc3afee SHA512 1b2b8c04079a2c6d08c14722b235ef106c4711156ed147b9ace5da0aa29cec362903adb27d13835e32cfb955b688428dffc2593ce7e4202e93233b879c07dd6e
diff --git a/app-backup/deja-dup/deja-dup-42.8-r1.ebuild b/app-backup/deja-dup/deja-dup-42.8-r2.ebuild
index 19087d6d3c7d..6ddd8f92fabb 100644
--- a/app-backup/deja-dup/deja-dup-42.8-r1.ebuild
+++ b/app-backup/deja-dup/deja-dup-42.8-r2.ebuild
@@ -24,12 +24,9 @@ BDEPEND="
 	test? ( dev-libs/appstream-glib )
 "
 
-# deja-dup can not recognize duplicity-1.0.0 and throws an error
-# https://gitlab.gnome.org/World/deja-dup/-/issues/334
 DEPEND="
 	dev-libs/atk
 	>=app-backup/duplicity-0.7.14
-	<app-backup/duplicity-1.0.0
 	>=app-crypt/libsecret-0.18.6[vala]
 	>=dev-libs/glib-2.64:2[dbus]
 	>=dev-libs/json-glib-1.2
diff --git a/app-backup/deja-dup/deja-dup-43.4.ebuild b/app-backup/deja-dup/deja-dup-43.4-r1.ebuild
index b05a0347fbcb..53f1ed16bfed 100644
--- a/app-backup/deja-dup/deja-dup-43.4.ebuild
+++ b/app-backup/deja-dup/deja-dup-43.4-r1.ebuild
@@ -24,8 +24,6 @@ BDEPEND="
 	test? ( dev-libs/appstream-glib )
 "
 
-# deja-dup can not recognize duplicity-1.0.0 and throws an error
-# https://gitlab.gnome.org/World/deja-dup/-/issues/334
 DEPEND="
 	>=gui-libs/libadwaita-1.0:1
 	>=dev-libs/glib-2.70.0:2
@@ -36,7 +34,6 @@ DEPEND="
 	>=app-crypt/libsecret-0.18.6[vala]
 	>=net-libs/libsoup-3.0:3.0
 	>=app-backup/duplicity-0.8.21
-	<app-backup/duplicity-1.0.0
 "
 
 RDEPEND="${DEPEND}
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index a170f0edaf54..b174abec9a29 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -4,10 +4,10 @@ AUX duplicity-1.0.0-fix-docs-cmd.patch 642 BLAKE2B 50a0f501d852989c153f6dd3653ee
 AUX duplicity-1.0.1-fix-docs-cmd.patch 642 BLAKE2B 02fc2a2efcfbd6cabe6da997efbf02401df0560edc239b949f89357c66735b6a7282c356fd93ce2b1163543e1fb95ab17332a4ac9f0aea16ae5ec92f232c6c8b SHA512 410515e48aa5c64aa72bb6930bedc5542f57265d31c80bca1c95244d2e87bcf74a822308d27263f48726349a8271db6663b14159c6c3f4b10d25869078fdce6b
 DIST duplicity-0.8.22.tar.gz 1408482 BLAKE2B 3a8b6eb79d5f67e8f274bdaaaf0bb5b6c9f0ebf91a3b6a849b876cdf2c9af0f5435946150b5db6ab5e524cedc5b98b40c456b1de0fe8c6e33c024fe3c7d881fa SHA512 474237e3ca9876fb124baf9871f781b8347c85e76b7b4191d6993a76fb4728500091c74ed0943c6c22d69651c08094b6d155eca742d1711bebe676734c84d12a
 DIST duplicity-0.8.23.tar.gz 1385252 BLAKE2B 63042486e6e17d2d93af72f617990c879763d5921e230302f406b4f9e7c57a67284130f9f57849b9ffc8638614b55f0f8abdf6bb20201155b33b72bef952ec9f SHA512 083cf0060a8c7a8472c6ee4ffbb87e85edf0fcdaba95862a9f272cc03d8ab3d18b584a8d256473e6cfab9eed6f993382b846b692a8c0dd46fd3a2d8215e54e45
-DIST duplicity-rel.1.0.0.tar.bz2 802941 BLAKE2B 7b5f33b2b8b0f938a86688ea68838fd45a1405e69cc59e9cc082035253d123258f6a30239ecc470e9210b5bafeda556909fe94887517be8c75a2c18641de66b0 SHA512 a3a0a8eee8f2555f275676c24c3e0933ef0ba267b64eccb7765dad751e58aae3ed0ffac4c4cee3acd3dd76c93bb799edb7fe1430ae159389174cc37ab646f339
-DIST duplicity-rel.1.0.1.tar.bz2 900987 BLAKE2B c298b436aff054d4c0eb389047257586fb0f4b0d9b08c47ddcedbfc539f99c27f1af1e434bd409f7a3a14c5ef24d293cc96fe174ba3338a9d54a5ec8337de231 SHA512 691e093025a8f9c3802588d8ecb9e946efe1637a117a46f3c51d8fa40848c2a7d8899574009a4b0486488719af5c8fd49cab180fac12e94657480a95e26af391
+DIST duplicity-1.0.0.tar.gz 1381405 BLAKE2B 5de886ca767c01097bc4954c2dc5e6c222c7f9a70f03476d3f8b749cd2d2c25a93458f656e9847cdb0a5cba27bc9466fd825f9b28cbdb593e602cec62876eb9a SHA512 27601f1e83fe685b94caf3703bf8001111efcf0e0af371f3c5434354c55bffba9d3dbd9b48b11808557154c61acfa7c19700dd1f45b10c471c570d85f145b7dd
+DIST duplicity-1.0.1.tar.gz 1928618 BLAKE2B f7ffdd488e42219b66b6174dbb944283d02910f57cae9fcf849e8f5363986664a49ba7e316d6b3efdce89deec7e4c6a65a95bcb365fa23b928244b5e8f29d48b SHA512 dab8341b990b1899de6080f2539681f0a84f1875fabf04ccd68908e8dcdf55cd31f26d1431488b49ac6b048a1e7ff2e0a0afa27f6eccfd6a20f47dd7193b4563
 EBUILD duplicity-0.8.22.ebuild 1198 BLAKE2B 14b7f2881e24e0c6df0210106aed3bff676d5cc1ca3b6d94a9ba0244d116dbc062935da3ebd6f7cd9d76aff3d56a491f6dd29491b2cc037e1144066e0b5d73d4 SHA512 a969b0c486327c11fa6aa17416ef2e42f6ac379d8969a8da46d7a498dca12c0820740aee58dfd15b6b736f599eb07c2ba38869fd4b345605cba09feba234a1b0
 EBUILD duplicity-0.8.23-r1.ebuild 1200 BLAKE2B 75599f9de3f25c79a4cef0469da0cea55df513b7ddc63101bbb984e32002ef2d6a5f0af88d7f6875b013b2dac643e1ab0a89b83d1ab48597961bcad9ab213c0e SHA512 05c1a684a6fede46426f8ef8c65aaa017079c9127e39fcf75b83d0b5ccbde7573693d55462a1404b21367b6e8d2be5555267c11888d98c2469a321a6e718afe0
-EBUILD duplicity-1.0.0.ebuild 1243 BLAKE2B 3ff8313b3a117cd747d91e07f34d0d403a2579a81867578e80752f837f704363e92d976e7624043be505628dfda3b6eb674de08d9a707886f40032841b244044 SHA512 3ec6aaa0c37cc286d79a1ab0df2bbc5182800b09dbb5d33c86ddf1d495c61f644fb76945e4e0f5c52f1d8ee4bd2b23d81f0100e66a78ed9e409fab62427f9075
-EBUILD duplicity-1.0.1.ebuild 1243 BLAKE2B 3ff8313b3a117cd747d91e07f34d0d403a2579a81867578e80752f837f704363e92d976e7624043be505628dfda3b6eb674de08d9a707886f40032841b244044 SHA512 3ec6aaa0c37cc286d79a1ab0df2bbc5182800b09dbb5d33c86ddf1d495c61f644fb76945e4e0f5c52f1d8ee4bd2b23d81f0100e66a78ed9e409fab62427f9075
+EBUILD duplicity-1.0.0-r1.ebuild 1162 BLAKE2B a99bc6dd88c6a8cddb023f20280844e1fdc9598726187e615b1217f3c85196bf1659fb5c7001d1a4d83410353647dad5b6bec7791b056ea61846bdd22cf1c2be SHA512 12dfa2ee409776950f7e9ac6922450b6c466757c5a81d4d09eb28e157879d90d96181e3f21b35ccda584c80633fd9abfd7fe2909ae3fc2b51bdea573d642c165
+EBUILD duplicity-1.0.1-r1.ebuild 1162 BLAKE2B a99bc6dd88c6a8cddb023f20280844e1fdc9598726187e615b1217f3c85196bf1659fb5c7001d1a4d83410353647dad5b6bec7791b056ea61846bdd22cf1c2be SHA512 12dfa2ee409776950f7e9ac6922450b6c466757c5a81d4d09eb28e157879d90d96181e3f21b35ccda584c80633fd9abfd7fe2909ae3fc2b51bdea573d642c165
 MISC metadata.xml 455 BLAKE2B cc38c235e02397d73b26aaddfdbbd872cb7dbe1a777302618e44769e1895b7d7c90e7de7d7cf8a63388e20283fe0f9937da3ed0ffec21d960543220c253fff33 SHA512 0fb009ecd0b771bc8e04980cb1aa49a872193cfa59a0e10966322a9764c1c08d859504afd78f839e7a98a6224e4d1fe20dd6dff549cadda5c7e31b74ed0a82b8
diff --git a/app-backup/duplicity/duplicity-1.0.0.ebuild b/app-backup/duplicity/duplicity-1.0.0-r1.ebuild
index 2d2b3174a000..5d96b440a67c 100644
--- a/app-backup/duplicity/duplicity-1.0.0.ebuild
+++ b/app-backup/duplicity/duplicity-1.0.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Secure backup system using gnupg to encrypt data"
 HOMEPAGE="https://duplicity.gitlab.io/"
-SRC_URI="https://gitlab.com/duplicity/duplicity/-/archive/rel.${PV}/duplicity-rel.${PV}.tar.bz2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -41,8 +41,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-docs-cmd.patch"
 )
 
-S="${WORKDIR}/duplicity-rel.${PV}"
-
 python_test() {
 	esetup.py test
 }
diff --git a/app-backup/duplicity/duplicity-1.0.1.ebuild b/app-backup/duplicity/duplicity-1.0.1-r1.ebuild
index 2d2b3174a000..5d96b440a67c 100644
--- a/app-backup/duplicity/duplicity-1.0.1.ebuild
+++ b/app-backup/duplicity/duplicity-1.0.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Secure backup system using gnupg to encrypt data"
 HOMEPAGE="https://duplicity.gitlab.io/"
-SRC_URI="https://gitlab.com/duplicity/duplicity/-/archive/rel.${PV}/duplicity-rel.${PV}.tar.bz2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -41,8 +41,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-docs-cmd.patch"
 )
 
-S="${WORKDIR}/duplicity-rel.${PV}"
-
 python_test() {
 	esetup.py test
 }
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index c1fa51f9cc40..58ac9f5cef5a 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/emacs-aio/Manifest b/app-emacs/emacs-aio/Manifest
new file mode 100644
index 000000000000..aecdf9eb4555
--- /dev/null
+++ b/app-emacs/emacs-aio/Manifest
@@ -0,0 +1,3 @@
+DIST emacs-aio-1.0_p20200610.tar.gz 9825 BLAKE2B f7d536b5ab603ec0506cf437e9819c00a84678dd1176ea83ac537c112767768a49bf6c95cc135255b252f83b1ecd47b6f195d5c812535f6c3c9843269e2c8750 SHA512 ac4b956a067d52130e57adb8c92bcd733b9566a1f8bfd03f721d7cb1479236346d8c65cf3c6d8475f9f5bb234f0fc766e2954d24af9feff891e1ece6a833c5d9
+EBUILD emacs-aio-1.0_p20200610.ebuild 560 BLAKE2B 887cd042cd6ede6fe145f89d2a2567426b2be1fae97274414d9cd6d4a4bd08e9102127488ba426fcd326dfd71d57794a980feebec70d9cbb65fc3318fde40858 SHA512 a002be3c0a8d3da800df1c703144ede7b2550b08e9d0aacb0c530c638e22c78776d26b790775b53f5a00a9e4767fcf114d885bf8b62075ad6c5225583f8e0a49
+MISC metadata.xml 1206 BLAKE2B 7a99fe205d238c47c5a813a5c969ba9c7271e3f674f5bf7b2a3ac04b57f9f73fd1e84d0bf452de3ef2c43d917af5f18968ed8cc069cbdc30b04aba5cb6125255 SHA512 41318d9ac989e097000da4997730ec842eb6c7434f6c9955034cee0759b23f10730de4ec572df68df0f9e18a602245273fc663eaa5e0a13d3aa1ab209d77591b
diff --git a/app-emacs/emacs-aio/emacs-aio-1.0_p20200610.ebuild b/app-emacs/emacs-aio/emacs-aio-1.0_p20200610.ebuild
new file mode 100644
index 000000000000..50a5d7e23baf
--- /dev/null
+++ b/app-emacs/emacs-aio/emacs-aio-1.0_p20200610.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=da93523e235529fa97d6f251319d9e1d6fc24a41
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Async and await functions for Emacs Lisp"
+HOMEPAGE="https://github.com/skeeto/emacs-aio/"
+SRC_URI="https://github.com/skeeto/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+
+src_compile() {
+	emake EMACS=${EMACS} compile
+}
+
+src_test() {
+	emake EMACS=${EMACS} check
+}
diff --git a/app-emacs/emacs-aio/metadata.xml b/app-emacs/emacs-aio/metadata.xml
new file mode 100644
index 000000000000..07a12f84c7c6
--- /dev/null
+++ b/app-emacs/emacs-aio/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    aio is to Emacs Lisp as asyncio is to Python. This package builds upon
+    Emacs 25 generators to provide functions that pause while they wait on
+    asynchronous events. They do not block any thread while paused. The main
+    components of this package are aio-defun/aio-lambda to define async
+    function, and aio-await to pause these functions while they wait on
+    asynchronous events. When an asynchronous function is paused, the main
+    thread is not blocked. It is no more or less powerful than callbacks, but
+    is nicer to use. This is implementation is based on Emacs 25 generators,
+    and asynchronous functions are actually iterators in disguise, operated as
+    stackless, asymmetric coroutines.
+  </longdescription>
+  <stabilize-allarches />
+  <upstream>
+    <bugs-to>https://github.com/skeeto/emacs-aio/issues/</bugs-to>
+    <remote-id type="github">skeeto/emacs-aio</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index eaed9127379a..7ad147f58cf9 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest
index aaa2695f1a57..67b70cc048ab 100644
--- a/app-emulation/punes/Manifest
+++ b/app-emulation/punes/Manifest
@@ -1,4 +1,8 @@
 AUX punes-0.107_ffmpeg-configure.patch 798 BLAKE2B da041283394db3a436478025fe3c8f5919f368bf00a5947fc688110d86691e987a52653e21215e05aab9d9861e7346fb526031c560da363570e6aeba11e4255c SHA512 443ad57c8659597f1beab1e5bb0a560f053986a6021785e24107463aa2351c1d6e26ee760cb1ec4a9913d8e01002a31f41d21a0b878e8925a66f02a858cebaa6
+AUX punes-0.109_ldflags.patch 1476 BLAKE2B 7bc1bc06ec5f55d6a0146396cfed22d46381d2e471f8cc8a3c1261528e67dc8b36e3bde786e8cf8426d0357a0fea51ae4c90a124fb8e5cf31e1cc3b0638cca8e SHA512 30ee7ad570e43f0b303a8c6ed6131fe2b1e6359c024f213b1f064712a23a4d743ed055c321726a4b585dbf4dda6934690fa45c84ef86e18eebf2561353730cea
 DIST punes-0.107.tar.gz 44024138 BLAKE2B 048df5bc9b019bafcd4eec75dc027de7cde9f8aa0d484ef96e5c41b091ba55c13b84ef7c7c36987b53206b1b7027758534479d0cc9fde63d89a48092c3f9d26d SHA512 eb3b7aa1c18765402e1e57e23dd4b019255320b795c0f578a4d5ae9f4e0c163613da07280e2a5abed80b9ba90e74c80b53b5fdd80e405103f0063ca55d0ee7bd
+DIST punes-0.109.tar.gz 48695769 BLAKE2B cc5a86b2f99dc3c97bc04386568fcb926d2a9c83f8c6dcaf28c022a136791ff481610ad578c996c643e0c0b107acb2be9a0fbfda0950435aad984f3506ec1983 SHA512 13cf3587c9936ff9f933d3394516d25fbd664fc2fd510af724c3bbbc6fefb12a019e8fe27cd52cd326ef8fba3721f4e1816ce5d3f3935f701081a142f04a3bc2
+DIST punes-0.109_musl.patch.xz 5520 BLAKE2B ea1c36d510303dd67b7e2005a3f099e328583c9762f74ccf9457a5f04268c44243b4fe18fc6498c176a999318f40c9a34ca2a3ed7de2d4dea953ab055901ad42 SHA512 507163d40849bbf782725f71409432a0cb4a79f5c3fccfaf78786322539a1bce0608b731a75c817b72f8a4e814d0cb21019cb23f621176042fb946754a4a9292
 EBUILD punes-0.107.ebuild 1241 BLAKE2B 5df5b93a315a152425c1bbeeb612b3a173d8682350d5b2f13740699752efeb9d96b99e57b578103e78b13edc3929344962dee8585a337fe5bc95bcdc036a39cc SHA512 149e4797185ae7d906ec4ef5ec29314eee21084829272379fdbf79d29519715d7e329174ef0485ab1a6448943e72781a2b6314b096a200ead2237e5a5138c2df
+EBUILD punes-0.109.ebuild 1368 BLAKE2B 6e9393022703926d914ad970fb11aa14d3c0917a91e1b73951422a9f021b1dcd1b9cfe6f92a6dc056690059ac8726bf145eab0b3f8e8f2de0a1807e7ebfb8c66 SHA512 d9f6c512abc4c0637fdc9e3996ffbfd95f1d1d3eea765934f9b8cc8a957bfe7b25f22d46880fab9bfd0318cdda80d1c14b04af626e19a2bb42d38c1d80a01a7e
 MISC metadata.xml 560 BLAKE2B ea221c8fefa3fc3e9f8942ae7cfd642384cde9ec10949bc148e17727e0633f718140fa15675a3268674c80e6b55177ff5573460abd687bc76420673f76aecc8a SHA512 7676ca51eb1d02c6564dfd9ef47975f349856ae9536e3f1d9771bf4c56a2aebe86622461ae50b5989c56fffa1cfa92fc6185f1d62d933c4db5016acc4c280a8f
diff --git a/app-emulation/punes/files/punes-0.109_ldflags.patch b/app-emulation/punes/files/punes-0.109_ldflags.patch
new file mode 100644
index 000000000000..ada9b28f137b
--- /dev/null
+++ b/app-emulation/punes/files/punes-0.109_ldflags.patch
@@ -0,0 +1,33 @@
+https://github.com/punesemu/puNES/commit/b79efed1b6e350076ea7a459dafd6c2f995bcb51
+
+From b79efed1b6e350076ea7a459dafd6c2f995bcb51 Mon Sep 17 00:00:00 2001
+From: fhorse <punes.development@gmail.com>
+Date: Tue, 7 Jun 2022 09:16:59 +0200
+Subject: [PATCH] https://github.com/punesemu/puNES/issues/213
+
+This commit allows compilation with Flatpak's build tools.
+---
+ src/extra/lib7zip-53abfeb/configure | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/extra/lib7zip-53abfeb/configure b/src/extra/lib7zip-53abfeb/configure
+index ca28ab144..504c02f6e 100755
+--- a/src/extra/lib7zip-53abfeb/configure
++++ b/src/extra/lib7zip-53abfeb/configure
+@@ -344,11 +344,11 @@ fi
+ 
+ # Unlike CFLAGS/CXXFLAGS/CC/CXX, LDFLAGS isn't handled by CMake, so we
+ # need to parse it here.
+-if [ "x${LDFLAGS}" != "x" ]; then
+-    for varname in EXE MODULE SHARED STATIC; do
+-        CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_${varname}_LINKER_FLAGS=$(quote "$LDFLAGS")"
+-    done
+-fi
++#if [ "x${LDFLAGS}" != "x" ]; then
++#    for varname in EXE MODULE SHARED STATIC; do
++#        CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_${varname}_LINKER_FLAGS=$(quote "$LDFLAGS")"
++#    done
++#fi
+ 
+ #eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DCMAKE_INSTALL_LIBDIR="${LIBDIR}" ${CMAKE_ARGS}
+ #eval "${CMAKE_CMD}" "${TOP_SRCDIR}" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_SHARED_LIB="OFF" -DP7ZIP_SOURCE_DIR="${P7ZIP_SOURCE_DIR}" ${CMAKE_ARGS}
diff --git a/app-emulation/punes/punes-0.109.ebuild b/app-emulation/punes/punes-0.109.ebuild
new file mode 100644
index 000000000000..76d44deed992
--- /dev/null
+++ b/app-emulation/punes/punes-0.109.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg-utils
+
+DESCRIPTION="Nintendo Entertainment System (NES) emulator"
+HOMEPAGE="https://github.com/punesemu/puNES"
+SRC_URI="https://github.com/punesemu/puNES/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}_musl.patch.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cg ffmpeg"
+
+RDEPEND="
+	ffmpeg? ( media-video/ffmpeg:= )
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	dev-qt/linguist-tools:5
+	dev-util/cmake
+	virtual/pkgconfig"
+
+S="${WORKDIR}/puNES-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}_ldflags.patch
+	"${WORKDIR}"/${P}_musl.patch # 830471
+)
+
+src_prepare() {
+	default
+
+	# src/extra/lib7zip is not autotools, but
+	# is contained within AC_CONFIG_SUBDIRS
+	AT_NO_RECURSIVE=1 eautoreconf
+	cd src/extra/xdelta-3.1.0 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with cg opengl-nvidia-cg) \
+		$(use_with ffmpeg)
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 137c211158a2..a8dc945a4038 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-sh/Manifest b/app-eselect/eselect-sh/Manifest
index 14ccc0c57a50..8d3bad46f286 100644
--- a/app-eselect/eselect-sh/Manifest
+++ b/app-eselect/eselect-sh/Manifest
@@ -1,3 +1,4 @@
 AUX sh.eselect-0.4.1 341 BLAKE2B 9f1723010505a9a364c83799af6ae4a354bf40e31c911a47cbd93b79362bfa255c8cd7eb1e1a50c3e10dbd02cbb22b53c8727571f63a362fa55c4c76afc2029c SHA512 610078d4c889708ba00a3c6cc6185b6d395b64c680e2da0dfd72a4e9debdbb3b001a089d8bddf0e7d8bb92175a80be823867331661e9b7b3e66a0bf754c4cf8c
 EBUILD eselect-sh-0.4.1.ebuild 614 BLAKE2B 5e65296c5a0299134203376c6cf0943c9a8b523801ad9a6b0bd545734f223906fd91ad218954a8787d418dbda68b117313b2094a7b20c03169177e99a01e0082 SHA512 4c0a1ca7bac51c2067ebacf02fb31fb27b44cb26965a24c11c44eb7764e712439ebbee35ae449d8ff054cb5bce629caf07e7f23aedea463e1062ceca6431c290
+EBUILD eselect-sh-0.5.0.ebuild 963 BLAKE2B 33073b3e65e83da7b317ea07efb117f27db49e0bf9c246dcc2d951b604806be60747c829f09f3f861ecff242c60c2bbd18298b3e2791c20ab207c91832d9f7c6 SHA512 a8f61370c2736c85198360f85ea045d8c7d66d0cdfbedd467f55ce5d11a68082e689b53bd34c50e12b19ed48c92e6167a439026b9302551d7a48a6e67ad1b7a9
 MISC metadata.xml 272 BLAKE2B 583272860b0b9615e8d57fed7ced1a93035bf0c25285d230412ac7af2e48a8156c2e9d9c0581da80f913a2748eb76579b64648fd1e22ce0bc89da66aafa30809 SHA512 19c90c888b76564e32674364a753ba2d6a0b9ce6f3a97f45bb876c32f83c8206e6ec318e0960747b2003a4c3a426994f25c6b83da8b294d575f45e80c6105d89
diff --git a/app-eselect/eselect-sh/eselect-sh-0.5.0.ebuild b/app-eselect/eselect-sh/eselect-sh-0.5.0.ebuild
new file mode 100644
index 000000000000..6a89133477cf
--- /dev/null
+++ b/app-eselect/eselect-sh/eselect-sh-0.5.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Manages the /bin/sh (POSIX shell) symlink"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI=""
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="app-eselect/eselect-lib-bin-symlink"
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins - sh.eselect <<-EOF
+		# Copyright 1999-2022 Gentoo Authors
+		# Distributed under the terms of the GNU General Public License v2
+
+		DESCRIPTION="Manage /bin/sh (POSIX shell) implementations"
+		MAINTAINER="mgorny@gentoo.org"
+		VERSION="${PV}"
+
+		SYMLINK_PATH=/bin/sh
+		SYMLINK_TARGETS=( bash dash lksh mksh )
+		SYMLINK_DESCRIPTION='POSIX shell'
+		SYMLINK_CRUCIAL=1
+
+		inherit bin-symlink
+	EOF
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 04af4e95fa6e..fca65674eb87 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calcurse/Manifest b/app-office/calcurse/Manifest
index 9fb3bd6d4263..9a8ec02b1f12 100644
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@@ -1,5 +1,5 @@
 AUX calcurse-4.2.1-tinfo.patch 644 BLAKE2B e304953d56dc8891138e909f0b7b31b85b89a16800a1e8efc64a199cb884b730c3123f902ffe2095d392c41cbf0f65b88d440fff2133816b2763ea74a5e44770 SHA512 099ead1b288717e9d9eff331c2fbb9ff8deb19b1843109549ebdab30e8e59cc9cbb01a89c87e84e9283003ce70fc595e2305936a8a0918b0996b5fab1854cb5f
 AUX calcurse-4.7.1-respect-docdir.patch 332 BLAKE2B cde6ea64dfc6d6d12935f6b26a2ee0b3c49dbd04a7f2c834bdfacacba024a1d3b45094c2d82671cacd6253830950fe64ad3c98ec381d594d77dadc33a936dc65 SHA512 c7d9779d9509ece7743113d9520b11672956d78fd4e6b389016772186bad081317c4cbd2cfb68fbf7e5ec78c9d7a7c641e26c58b7888c4b9819b2b8b80409cb1
 DIST calcurse-4.7.1.tar.gz 701563 BLAKE2B 438741b9e0f61438d235fa60d13816d83c19f7d1b612619fe20a78812e77657b003ad0b9416bcc766f0e38e7868b3543972ed65eee43d8f9d6b1d80ba1872091 SHA512 8b5574d2909128c745b2d6367b517c5fb04a1c451e666dc9ee0652b3793b519576af5700d4fd073de0ccd5e5dced6b69c45dbfaf98b35a99784093208512b68e
-EBUILD calcurse-4.7.1.ebuild 1009 BLAKE2B 8c0470044c159018aa9b860e7abd8383d2ef1267d85a52b2e9b385430e167b7fbd51bd4e424d21c8460afef3a7e660bd2ecc9b68fa17301ff5f5402dcbfacaae SHA512 c317005ed878ba1eac9ff170dba7b913cb1da12019bc72cc45d4322637c8a2765ca89da218588c73c964083e2632a192a78ea967190e3492fcdccf46fe6fa63f
+EBUILD calcurse-4.7.1.ebuild 1016 BLAKE2B 134980c582eabaace73c956a0044de3ffa16e1410484006523564480486437db7978ef18a55c41cfa52bff716caaadd27054fdab15475c5bdb74184393550020 SHA512 390df37f0e2fb94c23dbd034f3a88e9dd107b5c43bb112bced136f3b2d95cc18af4bbd551c57cc579091280dd5584d4cae3b0195fccd202cdc2d11bab8ce18f0
 MISC metadata.xml 543 BLAKE2B d83f1f3ebe848644b56d33a11e4269faef06f9f44536e04e4e12de3fe3bef6a204ccc11f6de7c6c00ecda876870bc46422800092005396cdb9f79b2f717e97c1 SHA512 a5104bbcb1514d86cd7e476de48536d933148d09837fe3312a5ccc07bb0a4db8f9d3d780322516976f7d875929120ebab7aac9301d7771ebe686736eda3d94fa
diff --git a/app-office/calcurse/calcurse-4.7.1.ebuild b/app-office/calcurse/calcurse-4.7.1.ebuild
index 8030f5ce34ea..7c04a8439b20 100644
--- a/app-office/calcurse/calcurse-4.7.1.ebuild
+++ b/app-office/calcurse/calcurse-4.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://calcurse.org/files/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/app-office/endeavour/Manifest b/app-office/endeavour/Manifest
index be85a4067abd..d8bfd1abbf07 100644
--- a/app-office/endeavour/Manifest
+++ b/app-office/endeavour/Manifest
@@ -1,5 +1,5 @@
 AUX 42.0-build-Generate-enum-headers-first.patch 1889 BLAKE2B ce11acb08003adf6bc4cc240213f3134a0ce021a720e201ef18177097cc1953db3be0d3eb2509eeab4e9e4afc9c1f8e2246338442b5a089d3ff698a4394dc90a SHA512 3c7344205f9e71201affa162c9d9bd788054434975ac523f36330f3724628567dbcc6e04cceb199b847b58e03090a83316885af58ecd6702ce25c4cbb201e02c
 DIST Endeavour-v42.0.tar.bz2 606645 BLAKE2B f9575eeaa67f837e465cbf8e8790a477c299bea12410ceda3c1f9ab5df69948087c7c8679cee5651eac828b69fe64f2b22ff759c2174f044166b94a25270668c SHA512 6312bad832f864adc3e4e01112efccb9c867b31485460791a1d1cf0d515586e7fdb7dd9dca3790201f764b72c39cff69626794f7020b4b084034fdbd0e07d94a
-EBUILD endeavour-42.0.ebuild 1838 BLAKE2B c8cfbf404831eab92949f8d684da6c145b5dec1bfab423cc259bb35b04a92db8219229129729f2212b4495ae02fc7e21011ab98d71bebb0f1c499b60e28f894b SHA512 37bbf0eea96166febace957caf486f4da4ee0cfb9dc7cad44c0cbfeb82cb448cabedf388d82043c92e5ee64a136438a7cce61ac681716d1a7607f72ecaeb81ea
+EBUILD endeavour-42.0-r1.ebuild 1799 BLAKE2B b501bf977fbc447e1c6636a3646a00fa99e74abd813a6a2adf5c9cd6dab02a75cd2388006186946c0e6a1176253f9e5750b3c473012d1323e798b77c84e77278 SHA512 81d23bbc417ee486dbda6208e1d8dd48818e64392b987d1d73417e388a66f813f55c6541dba98b59a9765d927267893ab7885cd4b6503d0cbcdce05b577a900f
 EBUILD endeavour-9999.ebuild 1492 BLAKE2B e48f749e13ad4de817fba6ce0c7e2865adca4451e125555f4507a320112e89e91ab8e1c235772fe22cdb8c45be5383f2e12449e0bb711594d9970a1be92d86d9 SHA512 c5633a21897e5bb5e4e35679fee6e321875b084f30146847418413446419db7043719fbb946e78871e88140ced369e7c14ca1863cad432a0f8c644e8165b4614
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-office/endeavour/endeavour-42.0.ebuild b/app-office/endeavour/endeavour-42.0-r1.ebuild
index cb393edc681b..9c8762fa09a2 100644
--- a/app-office/endeavour/endeavour-42.0.ebuild
+++ b/app-office/endeavour/endeavour-42.0-r1.ebuild
@@ -31,8 +31,6 @@ RDEPEND="
 	>=dev-libs/libpeas-1.17
 	dev-libs/libportal:0=[gtk]
 	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
-	net-libs/rest:0.7
-	dev-libs/json-glib
 	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 "
 DEPEND="${RDEPEND}"
diff --git a/app-office/sc-im/Manifest b/app-office/sc-im/Manifest
index ba02e2b6af15..8350e3998c37 100644
--- a/app-office/sc-im/Manifest
+++ b/app-office/sc-im/Manifest
@@ -1,3 +1,3 @@
 DIST sc-im-0.8.2.tar.gz 1619617 BLAKE2B 1957b79749012b5e8b24e26f3cde63c84bf971d2183791f986c98ec823a9ab74bf8a126dcdb2a58920af07e068520ebd7efe9c9394235c5a58670f120495e980 SHA512 ae02fd31eb7254208de26802ed6d8b21d77ce2d6997f4a2de5bd2f0a002c763f67f53e6c8e49d66ded096ecd8bf50b1117015e9a0356eaf11c3caef22cf4552c
-EBUILD sc-im-0.8.2.ebuild 3960 BLAKE2B 4aafd50d8576ceed91e491d620953d3e7aa525fd57d51271a53b78c498872a7283629969954547714b3a05421b4a18eb5994c6db55b21c2c1e2caee38b408458 SHA512 e10ece28c2683d1d51af1a0efdc8d565a9159f3c01bb5980c96b605db74653cf0fa80291bf384bd0934f155adba2923b0231bf2f1b898fd69e9ea42190d7eb1c
+EBUILD sc-im-0.8.2.ebuild 3967 BLAKE2B 573e824ce43d3b50db01ab9c602d572c150ecd8566193cb01fa401ed1040401bd7fb220bc873df080b69c9658d81b28232be52c3d14685eb1406a66b199fefc8 SHA512 5390dcf231b89514b73cebf09556c663ef2a49dbe6c79915e356b3995fbd907063265db3c15ed48c1abb96665e4c3c50a5e32467bd7884de1b1a74fcf6b42872
 MISC metadata.xml 974 BLAKE2B 2e46ac845ba9978e8b646007003dcf2b53844e5dd2a86f4cbdf812d58850e41f3636ba2807503aa56d6c69a8e04033d868534415c7fd71d424444af1eea392a9 SHA512 1f66c4340b79c43daca9d66be2b3e20e59405fc501a793d0159cbe40e7f541af79b036f53905bca0ea8001a14a9f4d17cb3fd060ce95cfbbc0b0ef9c8e521dff
diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
index bed8ce296550..f3564a67db53 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="X plots wayland xls xlsx lua ods tmux"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index c6f17cb6b238..98094c9447c5 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index 2bd74a4cb466..7affb31121f5 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1,4 +1,7 @@
 AUX gtranslator-40.0-meson-0.61.patch 865 BLAKE2B 79db4e5cc4f08822ce3a0f2237cc8216e763cd2de4f2383815062c6e1f4dea33298b04d56e18f5930962098f68fde1447bd96515f993a3ebe018809d92cca235 SHA512 6774f3a43e892e871b47ac6f44d6c4e32b03c72acf36419b757b1e3f029445b9c6d9aadffca8ad8c8cdb6a8a1d2f9396e73c6043379b58b4d0f74d3a6b0ea0cc
+AUX gtranslator-42.0-Revert-Add-GDA-6-compatibility.patch 802 BLAKE2B 9df62e77c9ef15ca038c6b4665a7738da7413020bcbcbb523d94fff1269c6cedc7007cb6818334850c569f5d08a2b65ca0ae8643842d9d904e9f06bdee2c2bd4 SHA512 2b582f943bed6f19fbe7124e814e366e58e63585d96eb79303410a0a92afa15e0866d103b290ef8920acf21592394f8eeb0a4b8231f6321438dbf110e19871d7
 DIST gtranslator-40.0.tar.xz 1509940 BLAKE2B dbf4c4a8765167177959c058b29563a2c3190e103a9f462a976bfc416c7cd995c649b549a40aa6f7c9b26502c5d56f3e4252a52919de979167f7adb5381604fc SHA512 214c5360ada6c98e9e7cd6a653bdc9a1dc5dd6cca995295369f8f9aac7261680fa521f2d2528f275233479d55ef1b03ee9ddc4a4e734e27a25bb24172c855a47
+DIST gtranslator-42.0.tar.xz 1526376 BLAKE2B 3d6834c201601415a1fb761bcef471a6c63aae311d22cb1ef5d615e20d124d05b165abb92590da2502b79456c9130e14dd7733746f5006a3c219aaf7f0505ba7 SHA512 785f2757360425b735948faca9eb8ef5f4433394f4fd99ff6e1f78f41d382c7769318ad8d329906910bcdd5a64b4ee0aa2df2e218a3c4b7576938e3d870077b6
 EBUILD gtranslator-40.0.ebuild 1132 BLAKE2B d18a39afdffb04a671590c994422457ea050c78e7024dd59338b7c8638ef6b4da6297eb6ebcebd542d93ed039177fd2e4ce4b8e0da495922246b735b5181a3e4 SHA512 a463faa8b570d2de8d13662c2ce5ed0b55f15bac63074fb44c2e6f54adbd1a0155c467353897a048186ce6705644130faee6b50ed1a4c3e75534114e2ada488e
+EBUILD gtranslator-42.0.ebuild 1151 BLAKE2B b5e8ffa355792a90399c40adbe9df3650e39f90370f316a66382ce128cb09ab3bf916258d65aa1109af17ba62ce925773eb4ebfd7687844958214eeb4ae20bb1 SHA512 577c730e615134352cf556d803a1296e9a7e2659ced17b44f5f01a0f78800bcae80893f9177f3736a423eb95746101203f962f48313feeb0b69bd146f6aa525d
 MISC metadata.xml 813 BLAKE2B e88f712bb4475618b3f4c55a56becdb271752ce7c14a870893a243719124100e4d95dbc090fdb8069132f7b6d024738568ed6ff1c649486ae054302b73bd213e SHA512 e8b69861262d570c05ad69f30891ac979d5860d34de4aa85531111c6c8cad321dad8a395325c687a459e2e72b83374a9a986304e081ae93afa985d8b06c07364
diff --git a/app-text/gtranslator/files/gtranslator-42.0-Revert-Add-GDA-6-compatibility.patch b/app-text/gtranslator/files/gtranslator-42.0-Revert-Add-GDA-6-compatibility.patch
new file mode 100644
index 000000000000..5aa8047c58e0
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-42.0-Revert-Add-GDA-6-compatibility.patch
@@ -0,0 +1,28 @@
+https://gitlab.gnome.org/GNOME/gtranslator/-/merge_requests/127
+
+From 9d8f92d37a7af3eca6985de72f52b45a21f9c91d Mon Sep 17 00:00:00 2001
+From: Daniel Garcia Moreno <daniel.garcia@suse.com>
+Date: Thu, 22 Sep 2022 08:20:11 +0200
+Subject: [PATCH] Revert "Add GDA 6 compatibility"
+
+This reverts commit 27c3f164422c193246aa4f71facf77d2a97ee94c
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 076812bd..f734e496 100644
+--- a/meson.build
++++ b/meson.build
+@@ -111,7 +111,7 @@ gtr_deps = [
+   glib_dep,
+   gtk_dep,
+   libhandy_dep,
+-  dependency('libgda-6.0'),
++  dependency('libgda-5.0'),
+   dependency('gio-2.0', version: '>= 2.36.0'),
+   dependency('gsettings-desktop-schemas'),
+   dependency('gspell-1', version: '>= 1.2.0'),
+-- 
+2.35.1
+
diff --git a/app-text/gtranslator/gtranslator-42.0.ebuild b/app-text/gtranslator/gtranslator-42.0.ebuild
new file mode 100644
index 000000000000..298b32be7eb3
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-42.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME Translation Editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk-doc"
+
+DEPEND="
+	>=dev-libs/glib-2.71.3:2
+	>=x11-libs/gtk+-3.22.20:3
+	>=gui-libs/libhandy-1.5.0:1
+	gnome-extra/libgda:5=
+	gnome-base/gsettings-desktop-schemas
+	>=app-text/gspell-1.2.0:=
+	>=x11-libs/gtksourceview-4.0.2:4
+	>=dev-libs/libxml2-2.4.12:2
+	net-libs/libsoup:3.0
+	>=dev-libs/json-glib-1.2.0
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.28
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Revert-Add-GDA-6-compatibility.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		-Dprofile=default
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index fda32ca3caa7..9742f39044f1 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -4,5 +4,5 @@ AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb3
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
 DIST hunspell-1.7.1.tar.gz 1074306 BLAKE2B 55b82ece0ca73fb8823fc2efaafa25dd317fb62a3f593f582049244374b7c8254fa570f86909f93ae68bcf43a625db6eec74efa2669f360a0e634f2c24bc6121 SHA512 e177fadd39e89abf47c6cec7d12d1976d21af5c924fb62402433af202c07db50156cd9f60ceae44952b05740e76a98548afb7ac12b666a9fa170ef52e6f8e808
 EBUILD hunspell-1.7.0-r2.ebuild 2316 BLAKE2B f470ea41b0e9c2993eb68bc8351ca737e209d44db4f5af1f712980d7806238abe1172ed5d12c92b316be77ea67f52824df76d801b2af7dea056a83287cec0427 SHA512 08f2bf11f5e6130e476cf05429d59615aae37c726aa2033a2da13c6b9a7ce13436dce070025fe73e44f2f5b1e996b66e4475f6ade2c3f6b66225a5da18bfe52a
-EBUILD hunspell-1.7.1.ebuild 2268 BLAKE2B 0ecdbf525cffa3f906fc9d2b714359c5aeb1b29cdb21617e7eafc4abc66d102a546cf6d0d6a372b09fa293efc9a4ec3284f4cbf47ebadf45bba4217e11b4a7c1 SHA512 6bc621ca5efee55422a03e87f52dd187b16d4bea36e5542ba5119b32449f86be433ff2b4c3c99e594d9cb321967e1cffce097e02a4a35c3effed997fb30839bc
+EBUILD hunspell-1.7.1.ebuild 2265 BLAKE2B 68cc8b03df9eba1f4fcbb66063ecc49157cd1c30acf0cc4dd2e6eca03d8eaa1490009281f474670a777d4479e3b1c9f21ce8e17b364e5f3990c085992290b0e4 SHA512 97b9896e07c3e004af7ed252968b21da15a626ebd4e2ad08c4bea1da61638f9c3d16a5be924c339e1d7d3164f9d13067ad53834fe2d8ffa61b8c5f82b62c4826
 MISC metadata.xml 301 BLAKE2B b51f61b0ee48d57bc3cb55e7b82b28395877d7c5b4b715f1e79330da95cf6874c1361341a0ac85ab0ecdc1420b2046d278913571ed69604142cf0cd73181099b SHA512 c83f8543e28a964670c59474527d3866c941e211c60c14b23a2c950ac8b9fad35983af5303820ad96920931ddcc676c0d7201ede9fc56f1b41e7c63e15b8a261
diff --git a/app-text/hunspell/hunspell-1.7.1.ebuild b/app-text/hunspell/hunspell-1.7.1.ebuild
index 2fc077c72c50..e9b14d2c4b84 100644
--- a/app-text/hunspell/hunspell-1.7.1.ebuild
+++ b/app-text/hunspell/hunspell-1.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:= )
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 4a157ddd3535..f42484b9f781 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index 272d59036dec..42622d4f931a 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -2,6 +2,8 @@ DIST rqlite-7.5.1-deps.tar.xz 82045440 BLAKE2B 795e99463d803620ff9a0b98462b60a3b
 DIST rqlite-7.6.1.tar.gz 468911 BLAKE2B 3d39bc4ea499c38566a8fc65f16fafaa83709e34193014cf4015c4d7343ff1d00fcdf7621e76298c32f00343fac61d5bfa0369a9e1375ab1d19007fe7f05693e SHA512 487e5656b8ad0dc24db5fb450baeaf22802e4200c79eb8ed67d2acf80304d3bc5837ba1501741c43005b26892cc5e7e18d0026ee45467eb76adb27b898dfaf45
 DIST rqlite-7.7.0-deps.tar.xz 84015200 BLAKE2B 2b6863e51adc6dd4f09b92e7f4a3e6b5fea32fc2ec5ff91c33837557d327f2c1a4ce7cddf330bf66074300d37e81f1a192ae5613d03cbda7e2a54966d593722f SHA512 5304900f25d0bf952dcecf759a2ffa08deb7bfdddf93386ef37f24505def35189ab67b37041e10c270c30c51cd8e1898797f0d973e40944980dfe4098cb8d25d
 DIST rqlite-7.7.0.tar.gz 472839 BLAKE2B c9278ba0dd6ab2fe81ccaa3ad49eede4773b873ac0452f21801d77413068dd27c746ac90b38b6c3785860cacaa9c7590cda7e19306ede0edae3f14d554d5a6a3 SHA512 60e602f23853ddb7ba083ad9a394fb7d0659c0560ce31a455b29c982c5b2ee94b57d94ab4ba0449901de7b50a43b1d356ff3964151e4d901c46b7fe19db8a2c8
+DIST rqlite-7.7.1.tar.gz 473402 BLAKE2B a11f2fa24ca4b11749b8d789b81b4b6143533106364e984ec7d654c7597bfe9f7615edd36b99eb04465084a60b8cc8cca1c6fa3f3f973b37911ce44fd7766919 SHA512 1922b5280a0d5cc80a9b3192a22a44dd287a585ff1bdd13511d9ed4ba29388adc10feccc27e28a7932acec0ae1d676705a6e7997c5ddbc4a03abf8226f0995a4
 EBUILD rqlite-7.6.1.ebuild 892 BLAKE2B 7e668c3d3bf69d7e40742d854fe21f443ce1c157046c1578cc7503d162103b4a597b80244f379ea6660dd1390bfcd76dc479c0f18daddc2dafdf10559369af34 SHA512 704d8176e1e2b7e7e6a11363071623fc1e2520ba649a11de666fa78367a04c2b4e3b3688d3f3c02fffcc4510307f1d55ab17cd915e90d0f343d7c9470032c9cc
 EBUILD rqlite-7.7.0.ebuild 884 BLAKE2B 491e1e038ab2d9f7af33aff83723a0c23426bf41d52f4ab7bc6daf214521357bfabdc2e1711ea5d1004d56d9ca518d6bfd1dcebb83f7004b98812e4167123864 SHA512 659d4dbfda225e833b6fec741ff5a136bf6c79033937ec8ad3cbc82318d2fea9d970808b36b2a4f29cee9bf9edcad51757e142ab8f6ffcd2a65f67df234f6bec
+EBUILD rqlite-7.7.1.ebuild 892 BLAKE2B d1f27d45c66c3810cc0d7f8f44a780e3c0f14e6875ff33a7cacb509d399ce6b9c757228bc84aab68bf4d8721114665d9d22ff7d16db2bd799d4f36191c43f919 SHA512 9fbaef1b0509ddc29fef73808113762c8f293cb7a3d3229c06b93c5d9be763c0fc26af28697a3e69d40f4d24dd7c79618d9cfa0401d4de99239bac187b1deee5
 MISC metadata.xml 305 BLAKE2B 43bc299dae9450677761bfaeaa02ac649ac4ecdbb35e3242c8525db13ef0471397a352b2a8aa751ec725ff8e9c86c2a8a19caf71bbe0de206f266d945f287561 SHA512 3dbddc6b5e4e6d8cd82beb722b5b45af6621e8fb84a1d3a1ec5c444026f595fd14babadc92084afe122202c9b940be21b2e1af145d24846de4225582e5e4d5de
diff --git a/dev-db/rqlite/rqlite-7.7.1.ebuild b/dev-db/rqlite/rqlite-7.7.1.ebuild
new file mode 100644
index 000000000000..c250417b35d1
--- /dev/null
+++ b/dev-db/rqlite/rqlite-7.7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+EGIT_COMMIT=d4e8d7e67fde807e9fca178e56a386eca2ab5cf3
+
+DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
+HOMEPAGE="https://github.com/rqlite/rqlite https://www.philipotoole.com/tag/rqlite/"
+SRC_URI="https://github.com/rqlite/rqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/rqlite-7.7.0-deps.tar.xz"
+
+LICENSE="MIT Apache-2.0 BSD CC0-1.0 MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	GOBIN="${S}/bin" \
+		go install \
+			-ldflags="-X main.version=v${PV}
+				-X main.branch=master
+				-X main.commit=${EGIT_COMMIT}
+				-X main.buildtime=$(date +%Y-%m-%dT%T%z)" \
+			./cmd/... || die
+}
+
+src_test() {
+	GOBIN="${S}/bin" \
+		go test ./... || die
+}
+
+src_install() {
+	dobin bin/*
+	dodoc -r *.md DOC
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index a63368a69a3b..fb101bb61f35 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 0e22062382d0..a5957833dfa1 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,5 +1,5 @@
 DIST javassist-3.29.0.tar.gz 1290728 BLAKE2B 21543fe4d81cc46fa8d6530e8b5b821df64af31404831d15255fe7d362fe40de39451f4e6a264986ce7b8fdb16116c3266a522caf24a2df6a91cc7203354e070 SHA512 9487d4b6e1d7981360f768f2ebe7e8313c103752cc458eb454fffcf6714f62952cc772e920ee663e89cd51cd6a2669993f5595e682ec74313799eff32144541c
 DIST javassist-3.29.1.tar.gz 1291658 BLAKE2B 4064401ad01c1e1c9aa4a219a81f0fc2e67b1d4cb85cb98b4a996dd2bf789ee1feb790e5bb332205ef2fafe1c7ac0ea82e5e25afff4d9960c54dfe2cb895d0fd SHA512 5788a4a50b803b2a4520340ceae9fd47466d2004cce4138fd861b57fd760109c61c375a28bd907bb9dfeb56bd44734f003ddd1b550571f101a7d1bc04096b5f8
 EBUILD javassist-3.29.0-r2.ebuild 1919 BLAKE2B 21202b1fc59b585ed2e079627dcfad10e65f785319673829d90df723b900a0a6faf3101e26e17dd38e12340f9b3b557602f2c48836d783ee3dd17642e4122466 SHA512 5e1e997c9d9605bc9004672c699b936c4f0349c05960330f40141476099dba2359c2d4f34e4d9332d396688c3b39dec09ea63f3f2cd5fc368b8b222601b41dd8
-EBUILD javassist-3.29.1.ebuild 2073 BLAKE2B 331884f9911939bed5c936f236f56879898882dede982dcf7fd159e418125ae84caf22d5a4f72ebee48da5eb3d4b482b5965e9adc22bda5047976464d884a78b SHA512 5d830a7a854cfac7a188ab6fd5963f9282ad0cfce269003cf69b1a3c1127c507fc47a5405f0b467ffa8d0c5560ab7bace17e843c53a49c59074226e6b1f870ae
+EBUILD javassist-3.29.1.ebuild 2072 BLAKE2B 61ba2d0d93672979234c09fe36e610fd0c58015516458367d7995bbe0a985068d4216effdc01d8363105716513bf448e56f0432435f26cdd8a3b185390dbeda5 SHA512 fd4911cafbbe4e528a2610e72bf438cfc592a9d0f0f164d1547c80863522b624d54991ffe5cd2077dca6c71dda66a2c9f3f4f74ddb7288d7e430785514022de1
 MISC metadata.xml 551 BLAKE2B c2f226813733db484e082189bb9420fa19eea8d5f95f751cf42305f110dc6b8a6e07370d9e3bca4be9dfac71333c86e95fb5e3f48543ca0041c2e2a4d96808b0 SHA512 b6b193720397459d3133bed6d0e93973084375684f1df77f93703f9cadf06e0a23e2798a13edf70c67642a656d5e5ef24aef2c032c71b65bc215622dbe42c1e2
diff --git a/dev-java/javassist/javassist-3.29.1.ebuild b/dev-java/javassist/javassist-3.29.1.ebuild
index 1f9c98cfbdc9..30332016b6d5 100644
--- a/dev-java/javassist/javassist-3.29.1.ebuild
+++ b/dev-java/javassist/javassist-3.29.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.
 
 LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 # Tests run: 431,  Failures: 6
 # Cannot solve those test failures. Using "mvn test" they all pass.
diff --git a/dev-java/reload4j/Manifest b/dev-java/reload4j/Manifest
index a250bd47b50f..79ca3ad4ee10 100644
--- a/dev-java/reload4j/Manifest
+++ b/dev-java/reload4j/Manifest
@@ -1,3 +1,3 @@
 DIST reload4j-1.2.22.tar.gz 574985 BLAKE2B f3dc5c360665de8eacf49ab34e684becbe80882db3675045a2bd971f03c32352a958e0ca4d5b5c92d18835320409832dcc14fc49c6f67eef487dfb9ee2ff4dfe SHA512 542e935cf55c0008a2d49c20e8a30f072090999168f5bcc056e67e306e2ddf87bf864fbb1fe9c3e03f436e8dcc6a0f22135f82d9a33706282bd9f3caace0f1f5
-EBUILD reload4j-1.2.22.ebuild 3114 BLAKE2B 87535c33875c8d87844673f788f4cff936df531c6a5b221d03bd64536fc507d582c898d5488c0e51bd5cc67acaf2621f9ce55336470e1bb7d742cf8d90f0ed2f SHA512 e1cb63e1ae3e28f896868dda28a1b5dade5687df027dbc9347479d512b038d2b648730a8c805dde547ddbed6691c228d1dae276238e010acbd7dbb5f96e96363
+EBUILD reload4j-1.2.22.ebuild 3126 BLAKE2B 8f1d73e54fd5d1a4f9d98cd98e15d87e2021ccbc902d2259686072e4e397c3dc571ac4c23ea42d57e49e38eccb99b29ed45a7a3fcd2e753c729dd7e8160c986e SHA512 7f33158de37a0b184ff8908a03946952db81bcbc957958292b892dd2fadbc2fe16327e1fd70ca4ca593d1d6bc65d6218709a492df85865cb17a76283c07b1c95
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/reload4j/reload4j-1.2.22.ebuild b/dev-java/reload4j/reload4j-1.2.22.ebuild
index 95cb44cfc007..5debdb16b716 100644
--- a/dev-java/reload4j/reload4j-1.2.22.ebuild
+++ b/dev-java/reload4j/reload4j-1.2.22.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/reload4j/archive/v_${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 # There are unresolved test failures
 RESTRICT="test"
diff --git a/dev-java/slf4j-ext/Manifest b/dev-java/slf4j-ext/Manifest
index 1e7b566e9a53..616e6fa9b96c 100644
--- a/dev-java/slf4j-ext/Manifest
+++ b/dev-java/slf4j-ext/Manifest
@@ -1,5 +1,5 @@
 DIST slf4j-1.7.36.tar.gz 2276203 BLAKE2B 930de76047c694b4e566ba743ee90a2efb062358b03209137f686c4bf4ead122aa84c18b79615e5a67f1a890abdc1b8f70f62b7803f7b8e45c766ff8254836d4 SHA512 1384c771aa04d9d351854cf8ddeef66ee9f43df53890a05413c48c14cf1cb78a457bb4b2a6e2f064f1c1ab68b2eaa1d326fc03bb6b7c145915660a2c873692d0
 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6
 EBUILD slf4j-ext-1.7.36.ebuild 1885 BLAKE2B 2c2a73ab02c8d1aae8cd883b68020a6ce156dd8ee39bf456fed56131a3bfca476334fb1641e605b8d7c9b6be70103a8bf0e61ad8fc281d379afa94c0882c7066 SHA512 12cd4f52ca331c0c09b25c4ad1e4f6bf0f615bf04b8b6e49253e2307a361c3251e6acb2f0f49175d8c23d81a50db3eb81f8e901de83cf59cc50101c0e9693f83
-EBUILD slf4j-ext-2.0.3.ebuild 1593 BLAKE2B bfe8f2af4586cc601337ffba8888ef14ee981918a821eba5e40f1eae1f5a59a7456b16ff3b546169932419e2af924b3e61884898d06cc7efa4a066762001cdaa SHA512 f66ce931fb8deafea20e81f18dac8905e298e803ab9fc9feb4a8aff8c2577448871435fd033362dced68fecde75355c7aa490e03b1a8ad0fc4708beefe79bb17
+EBUILD slf4j-ext-2.0.3.ebuild 1605 BLAKE2B fd65336ede02eade0f0ba3b0ab66028aa325f300ebcecd39d1621db1bb456fe0f4d17b2d82dcc817e90adbb036279d40b027da8302ec52203881d2e5fa7f8dab SHA512 5b4e0991b799e6b32e12302d3d00c9ec173745a4ba217fd694765e1bdb630ab4509d5d98780a1df419181dbe0f1b00f82243f5f5f8e32f3c88d8f634072b4a56
 MISC metadata.xml 369 BLAKE2B 9192191ce858eb2aae3d3600cf8214bcff21f386895b1a554c688d2e0e5d2632daec9e853afee31383819df09915f29bd6a5458aa888672c77a2c683258d1b94 SHA512 80db3e0ebb417b64355f1d8c72de25dceda46fe80d5614e255b6e59c0d5751207e9ade961dbe1f065e3cf162ca402e67d2b8ce597e0a4253a7eedfc27d35ae00
diff --git a/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild b/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild
index 18a0130d9c9d..275489f80d7a 100644
--- a/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild
+++ b/dev-java/slf4j-ext/slf4j-ext-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/slf4j-reload4j/Manifest b/dev-java/slf4j-reload4j/Manifest
index 19d316f7e1b9..8cecf68323e0 100644
--- a/dev-java/slf4j-reload4j/Manifest
+++ b/dev-java/slf4j-reload4j/Manifest
@@ -1,3 +1,3 @@
 DIST slf4j-2.0.3.tar.gz 1435478 BLAKE2B fec1a47882d3bbf508f4faed9cbf9448a23e9749c6c41f241c7e80654e0ce55211cec9228fcf0e666c997a4f24c5b96ad57dc076910e7f05704b02d0cf7db709 SHA512 0fb295f7942c2af8aebe2ecf544ef8326b8cc88de397ee6b37a10249b38150a506f62dcec614eee13519a299b30c6d2481dec3ea235d4b3e6a5241d12639bca6
-EBUILD slf4j-reload4j-2.0.3.ebuild 2171 BLAKE2B 1e327be72402681a0362bd0533dc70a7228de91e722b2ff60b1a63b150d51a9ae80f69c6d7ca988fc5485529234cae7eca316beb9431da818106701654c605b6 SHA512 f9cd70bd1a2fdc686c98e17941a31680b0a02b04c8d0c0b75a40f4b0a43ff1067f219c0caf771ec4d07ef0abeec877fda9cfbd42029b6e6ebbcbbd9a919af9bb
+EBUILD slf4j-reload4j-2.0.3.ebuild 2183 BLAKE2B 8fbedebcdef7a30e4f6bed19e0abde69139c74560f3547b38e40b4b24534a81b8759eeafaa597bb94200c85861ccf2f0644734b768a5325cb597f8bd4b89c177 SHA512 5792dbb8ea5a97ca6ceb991f8031d69ab3de16c7eeebcc31f0b3c2b4dd86730646a4bbb683e47a18077ad2f189f73b56fa3d4645b8dde2a50cb94964ffd3b9ac
 MISC metadata.xml 369 BLAKE2B 9192191ce858eb2aae3d3600cf8214bcff21f386895b1a554c688d2e0e5d2632daec9e853afee31383819df09915f29bd6a5458aa888672c77a2c683258d1b94 SHA512 80db3e0ebb417b64355f1d8c72de25dceda46fe80d5614e255b6e59c0d5751207e9ade961dbe1f065e3cf162ca402e67d2b8ce597e0a4253a7eedfc27d35ae00
diff --git a/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild b/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild
index d3316ed6d6e7..b4ba9b28a618 100644
--- a/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild
+++ b/dev-java/slf4j-reload4j/slf4j-reload4j-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/v_${PV}.tar.gz -> slf4j-${PV}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 73e2d118d893..b9a512af3e60 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 5785cd80c941..7617f56f43bc 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -6,5 +6,5 @@ AUX apr-util-1.6.1-mariadb-support.patch 4929 BLAKE2B 9f8a06e657386f5f773642f36f
 AUX apr-util-1.6.1-my_bool.patch 311 BLAKE2B c0fdf523983dc75ff977c8f602678cdd7d0b3e539fc266891e2266fa3b60e0971e93d77f2e28ed95959d8ca62bca4f9f566fefea525c845d49ce545ee6b5a99a SHA512 ed7d7857be8b5d29cc17a7216c1b06134798eb5129d50389bb0d5484a46e19e3169f8cea80cab7f845548e528a2cd9909b72016a7216b402092ae15879db792c
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
 EBUILD apr-util-1.6.1-r8.ebuild 3787 BLAKE2B 1e4f8ec847da2607556c7cf58773ee5e5a94793d9231168eff0f96eb4ed359a18d87a19c193ba55b8753c123de75e194ef9fad797d60e6808b0a181a9ec8341b SHA512 1c85cb121e872b923188db6fc568ae7f7fa240a051caaa2b8df871deb2012c316402f7457547a3ffaba4d7e477427ccece507978bdba0508bfa232ba4c1fa566
-EBUILD apr-util-1.6.1-r9.ebuild 3841 BLAKE2B a8a9baad59219e33b349cdaab303d267c42139dc3f172bf5081ca4a1b9b1f0375a2679a32628447ad9899fd189d08c65a3986335ce4249f5113b524cac1b6f00 SHA512 5de3bebdff14405388f983d014db9d21eebbb00f97c722c4dc3f8dde6ce3bfd7539557f4319e709020ed79f4ce7d296fcfaa55627160169ea220578cc1d48895
+EBUILD apr-util-1.6.1-r9.ebuild 3840 BLAKE2B 763177753afad1ecf26eabf352aca7f1d6bec739a9ffdb0ac05758461ce8b956289d74c9eb344635e4a28f022afc62f6da8718f0df68af349c8057ae24085c66 SHA512 ee77a7b479d45e307acd20d946a17d89f4f3a93ac3c2fc31b9252cb8a4f17a4d400526bece2e2628f8c2adc8680c4bf75f931b6e917b4dba9b34a2276dba55ab
 MISC metadata.xml 469 BLAKE2B d4ef8b9223183a322e324290e26e78fd291bfd3e60b48a18d1345f0aaf467302cabb62ae330ee5282bf38fcdf84a020dcca1b32a8351e3494d9fecd723196031 SHA512 727443f6ab071b3c657287a698ccaccea336a3b861f199dd07c4472cd61e1252e2a25f24a86dcdd72cedcfb73fb6cb0ebe0cbdc93220223dab5501e9626ecb4e
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
index 8825cc7bea9a..b418bfc7f546 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~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"
 IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index b8231c73dc02..68697a0fda43 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -8,5 +8,5 @@ AUX apr-1.7.0-autoconf-2.70.patch 1970 BLAKE2B b552e2bb1be932a692e2d1fad5124b5db
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
 EBUILD apr-1.7.0-r4.ebuild 4511 BLAKE2B 74ea0dd4227e2785e1a45eff3d1293d9fe937b57917107e736c0a1b056623eca5524e2bd3fe6c4f53c807e41394beca57513fed1318cf34c2b96abe8dede4c40 SHA512 dcf4320fe8c7ac38b3e89fe32a94fa9f4150d2269fc0e49822a9f488c9de485449f1ffa9e4d370b2f2c8ed1aecf46eea5313dfe779c1b08f55f4baa13bf0ac51
-EBUILD apr-1.7.0-r5.ebuild 4571 BLAKE2B 468faf492c26e303f06a2304ffa9d092588a51c4dce1804d1afb7b38717803a5b461c51a99f3be2b611efd6a4d8271aa0011b067ba93168bad7965e53aac6ab4 SHA512 560daf44c919e11a4c644fd109c095946afdf3d951cddf578959e91da4c5ac992f5635410ce736370484d65b78bfbcd6c02b7413d5225b92f801fcb2bd30213f
+EBUILD apr-1.7.0-r5.ebuild 4570 BLAKE2B 8c0a999779d2b0aa7242483cdca2bf1a4a99bd861ea1eac237ab4f932855d08c1b224ee418f79945f64a14e32a0ed2e949def6d9dfce31486736233dbaae5d04 SHA512 a57724ce3b525cfc94b632d71303b128da9bd585077408f7f329c166dea9348a072cc60ea03859a9265746baf3bdd6ee1f189b32f2efe2c8dbbd4c4074edb7ce
 MISC metadata.xml 511 BLAKE2B 5b4f31f74a9e3fe93b63bb337b5e0b7396c18439c269de0ec6c8308becf69ac8474d72dc921c80c06321bcaf708d49c9e26ec282036e84a9b03c08858c942980 SHA512 82063beddf8ce88d5f151ddeb8b3b69c10124af1c7b727b4c73885b4b14a427e93cd4164ddd4e3dfcdf7175727a8dffa357f1f14c3daee192a255f8995e6b0b5
diff --git a/dev-libs/apr/apr-1.7.0-r5.ebuild b/dev-libs/apr/apr-1.7.0-r5.ebuild
index 398c08e06dae..4d5d4eb4be38 100644
--- a/dev-libs/apr/apr-1.7.0-r5.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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"
 IUSE="doc older-kernels-compatibility selinux static-libs +urandom"
 
 # See bug #815265 for libcrypt dependency
diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index 5372a1a27715..7cc6991fcfba 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,4 +1,4 @@
 AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
 DIST libxls-1.6.2.tar.gz 443736 BLAKE2B 46f875613caa423dcb3acac0c38a68c7274993b25cc9be891266b8cf59e8eb0f17580e399305cf927854e090f34fa34f57f7fcbdceb75dffaf04c3362fa63095 SHA512 55e5cb33ec63484063d0893eee7352b89f993363762cd5ef42b5f918b09d1eafcf933fba076255267d9413c963481eb07c7054a2495d2d529db2e1d626353d22
-EBUILD libxls-1.6.2.ebuild 594 BLAKE2B 4d3e9079928a66e7e52d9487e522d3f24aa1197de7c5a9e236010db82bce5279ad98edd50fbe3512a9863fe5f8dcd1b9682c7e7bec999e34017e3d0feb73d0af SHA512 ce1d6a2f8f55f1df600c8a1365e23b42f8b7e0ea0b5320dfcf43a7372422405d2e873b027dff52e06d930a83027042de9454343a0012220fa24582c93122e45b
+EBUILD libxls-1.6.2.ebuild 601 BLAKE2B 5b9e22e4b583ff674f141feced3d805e7089c87bb4272158b820f74154f2ec6b26372e729506ad4eedb27e3ab8db866e2950e1d2b9c9d577686c4343aba0d772 SHA512 37b95fd45ab535e10520a3b7f99d44f3c631d91eaff05e629f469720fc08a3775613d473cd833e3131bd9ef31f868a3a0b1e8770de6423a7f0f195e44ce524ac
 MISC metadata.xml 304 BLAKE2B b1b6c500fe0d22b04f956c8adeeefaf3fa1a9776f485c8285b6c4774d6e8c32868c7f056b10ab743dd3a003fd833ce6df05e31b64ba7f496cd5061a9c9ad4f35 SHA512 5ee99e9cc9769d406b48e2f44895d1066bd02df0547df172fd08edfe8d614f56f97829645ede881f7dc65fbb03fb9cabd22e42b526222d21cdaa7db532ba7231
diff --git a/dev-libs/libxls/libxls-1.6.2.ebuild b/dev-libs/libxls/libxls-1.6.2.ebuild
index 2127c6427b32..42867c0d7710 100644
--- a/dev-libs/libxls/libxls-1.6.2.ebuild
+++ b/dev-libs/libxls/libxls-1.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/8" # libxlsreader.so.8
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-libs/libxlsxwriter/Manifest b/dev-libs/libxlsxwriter/Manifest
index 3f6e715c0d7a..2cb1d5ccfa51 100644
--- a/dev-libs/libxlsxwriter/Manifest
+++ b/dev-libs/libxlsxwriter/Manifest
@@ -1,4 +1,4 @@
 AUX libxlsxwriter-1.1.4-fix-pkgconfig-version.patch 675 BLAKE2B 19771b0b921a613191695ab0dfc65dabf3941678df01e7241cc37b5dcb9544c59f917d9d0090781e525708b4e1fa314cd49b6887c9915e809f4111b3fe0d2831 SHA512 dd43e9b8738298dbf568f9fe7cc518ff44ecd352a01554af776506be6c815e51c954195f4bcd046dfeb35ced4d590824f4dc26881f03a70639486f8fee768797
 DIST libxlsxwriter-1.1.4.tar.gz 20442200 BLAKE2B 38308dd8e954820b6debf15bc884effd583c0e0fa1667ed4451085ff8cf1bf4101807110873a501617785763886c107c19ab30c16390b5fb608f52b2736465be SHA512 fad36f7882fcb21b87e13cf603022cfad3f14e6f955a06e2771712facd0fe12f83f4d1655dc1a744724bda1ac83af7e7bf1393457c5507d8983f63002ab294b5
-EBUILD libxlsxwriter-1.1.4-r1.ebuild 1104 BLAKE2B 8d8af2a9e607ed73d0252872c63d488bdfa4fae17d14264f50551fbc5911a751d634d028d384d6b6a0af714eb0c0a3112d1b30032a5462f85f14cc6bed523b38 SHA512 bea6d68ae84c21b7c829f8476a0093265a160c18bcf959ed296dccd8db85997b42066f37b10f2130290cdd84b9ac574391ab86e1e7729f586fc8d9e6f525b4bb
+EBUILD libxlsxwriter-1.1.4-r1.ebuild 1111 BLAKE2B eec3645c297df0c215dd1510c205671f7b2c33effefbde7f117a55ce341eee9ea5974feb3477dbf2954facd6774961893377412aea4d51263b7ee9c1dca06b17 SHA512 ed6ecef414dceb917c9f6d367e7faab3358f5c8a11d1df479a59cf0f928fd3e5d01557dabf7a23acc8e93f61f392300376824a61839ad2747c1f20d24e052691
 MISC metadata.xml 579 BLAKE2B 0c3294a1f69d9cc7e3e95a37f2708ce4672cc931f28cdded82aadc9cdffb323ac4bd7518c61fee57ad30022617acb572625f3b6b0972fd903a1ae3afcf98aee1 SHA512 83d288575e27337692c3cd94bad56d8e2882240343b739eeed72742bd82e9177c45a81ef94ebab9e035b99431ecc2cf21723e408a90fa6b5f551e8a7f1f17a0d
diff --git a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild
index 3006dcf4e7cd..1f5575723644 100644
--- a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild
+++ b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-RELEASE_${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="openssl"
 
 DEPEND="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0f8b960ea36d..050dbc7ff676 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/SaltTesting/Manifest b/dev-python/SaltTesting/Manifest
deleted file mode 100644
index 6a4583c55607..000000000000
--- a/dev-python/SaltTesting/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX SaltTesting-2018.9.21-python37.patch 1213 BLAKE2B 82257c24956fa9af21b63ca5c356219efb36d89371ec473bc9fe77aafd637d5310077db0312c7c594d3569821d12524c0ff30710018f9d481ac12706df246b0f SHA512 5ffd4e6bc726633a0957796ab531bb3a566a6a8cc39fc59df888afa7ce53c4b2b7fbbcf5e64dc111e5a603ecda3d7c5920f436b986f11df0ae4fdf9ad042b81e
-DIST SaltTesting-2018.9.21.tar.gz 459708 BLAKE2B c0c6d853ab335432464140b6db8939ae87b58f50c0ea63a547a09ab3e1899b52053e3f9ea90b183268b807db5d7f323f09f9b6d4186e1b4214d6984486f37139 SHA512 9ce79aaa0fd90fd75fa2a64112563751837d441518426cbdb5df93721fd186e9fe33609341a75bc173781cd9a97b477809a4c2e2d4fdd29a5331f0d096983db8
-EBUILD SaltTesting-2018.9.21.ebuild 818 BLAKE2B 64467e8db3421e702a8c59ea2c7f1e1cd540fe05d2c3b8f21c4b6cdaf8dd1f0d9659de3b0a48e9c57bb6a64b27aeefc96a5445910cbc7b44c98e66194bc0f7d2 SHA512 1e84628032fe1e37b975b347fee7c9b166aae7bfeb720edfbb9f1cbd0a8639cac25e62d2bb0bacb75e4f629d14d8f5f978b230df28a4bf06813f6f444a8ff905
-MISC metadata.xml 334 BLAKE2B fbf5c3d58046c5d3ac9d20ab9fab54cb50a2d1447b6b99884a7655705adc96151ef5541d09f721b4e7662c78cabeacbe4c9f264f81f1d959dc2b617c7c0f665c SHA512 c4051fffa5b50791a4cab13ab41c8d9c01062b892c1e4d13faa2e86a4e6e72a945c0c47325c5e4736f0ba578c67bd64b53b3c311291d42abea2c6f67e013c1d5
diff --git a/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild b/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
deleted file mode 100644
index 78e0db8dbe62..000000000000
--- a/dev-python/SaltTesting/SaltTesting-2018.9.21.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Required testing tools needed in the several Salt Stack projects"
-HOMEPAGE="https://saltstack.com/community/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/saltstack/salt-testing.git"
-	EGIT_BRANCH="develop"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/saltstack/salt-testing/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/salt-testing-${PV}"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}/SaltTesting-2018.9.21-python37.patch"
-)
diff --git a/dev-python/SaltTesting/files/SaltTesting-2018.9.21-python37.patch b/dev-python/SaltTesting/files/SaltTesting-2018.9.21-python37.patch
deleted file mode 100644
index b12d4231bbd8..000000000000
--- a/dev-python/SaltTesting/files/SaltTesting-2018.9.21-python37.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/salttesting/case.py b/salttesting/case.py
-index 4918915..19e47cc 100644
---- a/salttesting/case.py
-+++ b/salttesting/case.py
-@@ -140,14 +140,14 @@ class ShellTestCase(TestCase, AdaptedConfigurationTestCaseMixIn):
-         )
-         return self.run_script('salt-ssh', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr, raw=True)
- 
--    def run_run(self, arg_str, with_retcode=False, catch_stderr=False, async=False, timeout=60, config_dir=None):
-+    def run_run(self, arg_str, with_retcode=False, catch_stderr=False, async_flag=False, timeout=60, config_dir=None):
-         '''
-         Execute salt-run
-         '''
-         arg_str = '-c {0}{async_flag} -t {timeout} {1}'.format(config_dir or self.get_config_dir(),
-                                                  arg_str,
-                                                  timeout=timeout,
--                                                 async_flag=' --async' if async else '')
-+                                                 async_flag=' --async' if async_flag else '')
-         return self.run_script('salt-run', arg_str, with_retcode=with_retcode, catch_stderr=catch_stderr)
- 
-     def run_run_plus(self, fun, *arg, **kwargs):
diff --git a/dev-python/SaltTesting/metadata.xml b/dev-python/SaltTesting/metadata.xml
deleted file mode 100644
index 2894eec2d1ff..000000000000
--- a/dev-python/SaltTesting/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">SaltTesting</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 9911092710e0..64d1e4ea2236 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,3 +1,5 @@
 DIST abseil-py-1.2.0.gh.tar.gz 219456 BLAKE2B ec7d878692dcf0cbe879cd7df51bc1b8ceeae945b053419b4a024a637e726064128af69fe077a26413f8562dd4a35830b340d000a6c9d520c7674b81a7e417ae SHA512 f363814ed65a68ae4bfd833dc095491349349e70327c0a87ad68ddc3b8429dacc78aaa16d2ff0d733487a12a2ab09094d4ccd1c1133981f65c12d3715cee410d
+DIST abseil-py-1.3.0.gh.tar.gz 224655 BLAKE2B 7f5c329c159a3b8d3fd7fc37ab36649d7711120ab41a2c052deb383aeae115b8ffe22e0f9c933e6cfe83e19013a2733d037954411f0f6d4acde1a7ecb3131973 SHA512 5631368b1f86dbc73d5261dc07a2693c8effb2534745fe4f19db26f908c7afff9f440a1545f16d1356092ac9a9fda2fdde97fc8977100e162765d9c224d7a66d
 EBUILD absl-py-1.2.0.ebuild 2536 BLAKE2B ff9ab15c76803b9e8d3cb9430ef9cc997a53ece91f5c7d5450539c3f5dd944a4dcb74912366b97d9ba7c58ac5254f85af877cd4f2c82835af2d01ed2fc72068f SHA512 123344240820b4130be23f8097a89dbb80952ad003c39d7c7c58e05abac2300d7ee7f55002a6396c7fe20f6fab3acada974af4b41addd82d8cf21689b600cd15
+EBUILD absl-py-1.3.0.ebuild 2538 BLAKE2B 07e79c2e65e728df1c81972b505975127d9086fe5f9cf7ea5a2283a71d7149d70470d714704f5f8c9f2fd95fff42a668c545e80d3113d9274e48ef4dc3bcbe93 SHA512 141ed49a0170e908159684339c22fa7a439e248fd5c87fc9a1172e16a5cce4ba61aeab38262adb5c21820b822af15497fd1587b84d9e51bab3957d22c98974d7
 MISC metadata.xml 577 BLAKE2B dd0e02b24bdb42f24bd675cadf13e99f861a6dc9be2879f671b9bc4e9e078ef81759909e81e3063cb54c71ff71d6609624f0cf2645bf6ec055c643fbb0f3ab5c SHA512 7cfa86cac5d38b10aedacdb4bafc7acbd11cf4a98a873a2435ef5761d5186c5128171eb286b2d2568a1a353eb4de815303eae225cf5823a5292ac362633b67c7
diff --git a/dev-python/absl-py/absl-py-1.3.0.ebuild b/dev-python/absl-py/absl-py-1.3.0.ebuild
new file mode 100644
index 000000000000..fb3119e6e3ba
--- /dev/null
+++ b/dev-python/absl-py/absl-py-1.3.0.ebuild
@@ -0,0 +1,79 @@
+# 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
+
+MY_P=abseil-py-${PV}
+DESCRIPTION="Abseil Python Common Libraries"
+HOMEPAGE="
+	https://github.com/abseil/abseil-py/
+	https://pypi.org/project/absl-py/
+"
+SRC_URI="
+	https://github.com/abseil/abseil-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	# what a nightmare... well, we could have called bazel but that would
+	# even worse
+	local helpers=(
+		absl/flags/tests/argparse_flags_test_helper.py:absl/flags/tests/argparse_flags_test_helper
+		absl/logging/tests/logging_functional_test_helper.py:absl/logging/tests/logging_functional_test_helper
+		absl/testing/tests/absltest_fail_fast_test_helper.py:absl/testing/tests/absltest_fail_fast_test_helper
+		absl/testing/tests/absltest_filtering_test_helper.py:absl/testing/tests/absltest_filtering_test_helper
+		absl/testing/tests/absltest_randomization_testcase.py:absl/testing/tests/absltest_randomization_testcase
+		absl/testing/tests/absltest_sharding_test_helper.py:absl/testing/tests/absltest_sharding_test_helper
+		absl/testing/tests/absltest_test_helper.py:absl/testing/tests/absltest_test_helper
+		absl/testing/tests/xml_reporter_helper_test.py:absl/testing/tests/xml_reporter_helper_test
+		absl/tests/app_test_helper.py:absl/tests/app_test_helper_pure_python
+	)
+
+	local x
+	for x in "${helpers[@]}"; do
+		local script=${x%:*}
+		local sym=${x#*:}
+		sed -i -e "1i#!/usr/bin/env python" "${script}" || die
+		chmod +x "${script}" || die
+		ln -s "${script##*/}" "${sym}" || die
+	done
+
+	# i don't wanna know how these pass for upstream with wrong helper names
+	sed -i -e 's:\(app_test_helper\)\.py:\1_pure_python:' \
+		absl/tests/app_test.py || die
+	sed -i -e 's:\(logging_functional_test_helper\)\.py:\1:' \
+		absl/logging/tests/logging_functional_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTHONPATH=.
+	local fails=0
+	while read -r -d '' x; do
+		ebegin "${x}"
+		"${EPYTHON}" "${x}"
+		eend ${?} || : "$(( fails += 1 ))"
+	done < <(find -name '*_test.py' -print0)
+
+	[[ ${fails} -ne 0 ]] && die "${fails} tests failed on ${EPYTHON}"
+
+	# we actually need to clean this up manually before running the test
+	# suite again...
+	chmod -R u+rwX "${T}"/absl_testing || die
+	rm -rf "${T}"/absl_testing || die
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index a85e01ecfa0d..520be0eb8b0a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,10 @@
 DIST boto3-1.24.80.gh.tar.gz 539716 BLAKE2B ccbbfa84e4e2274eb0275b9b2dcc0a4a78b139007829c4e3f880909f71e404be22c4461b687596bf12675c1212c6cf5b59c4383a042f60cb7919a10581fdc612 SHA512 aa3340e4bb9ae80f02fc70cf2be49d245e3dcc941b0b682c2827c1b8bb51d02e72ab7bf561e7d39397af8ca7ead7e115766fd4fd2eca18db2c551f55afb3e3b6
 DIST boto3-1.24.88.gh.tar.gz 543896 BLAKE2B 9dd2a18e3fb8d0a9f3a3a1fd7d0cceb491765690f99c7bd4200f37c66cbdb1e86dcdcdd09669d3175b97e762e6faabac3a2e5cba49136f42cba459e45f3ab67f SHA512 676528ca180c23834d1666b69292754e551a339914362da2708ff3f937c2eb04fe3b3dd1d4c6960eb8f5f7f58b1e0bcf13b1f52cc16a7c8d3bd025e9ea4ee109
 DIST boto3-1.24.89.gh.tar.gz 544293 BLAKE2B 53854b91c1c4c677eee743776a67e552bd2e11947839c442d81c1983930d6ff16d6bc5483c29b9a14b99a7cef09f3b9cd74cea9edb1cb76ff5458be3c9743164 SHA512 ef3b503b1313b8b7d84f5e4afdbe4e3d9e95ce3fbba81d400191295c71d4237e764f87ab6ebf2b29536248a520ab1273bee43bedd746596224f7400ce04c2c02
+DIST boto3-1.24.90.gh.tar.gz 545802 BLAKE2B 04148b878266a9d541a6fe8a4b4e8088fa2af11fd88b0fd9bac064bf493a9e787958d61c721254c1cf72edea72d761cd3583370f587c925f70c099027e94f72c SHA512 92c9da4559fdef7a7ee68eda9f1e9f70d652ec383471b9d1fafcf260b1456e84b7cc86347c3a0c44990f38aa87632885b1df65aafdae3c7f5948c0223ffe6981
 EBUILD boto3-1.24.80.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.88.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.24.89.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.90.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.24.90.ebuild b/dev-python/boto3/boto3-1.24.90.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.90.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 bfb3f042e21e..c31d140a5864 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,8 +1,10 @@
 DIST botocore-1.27.80.gh.tar.gz 9643079 BLAKE2B feec0b34c39b358eaff7f947fe83fc6dcd9926771b465c092e8071c334382d07d51a88fda775fc9fadae2544ac2f3e37c814bc9b8729730955b95d3efdf16b7b SHA512 f38ee5b252051a8208964387ff1550489c5900605d2aa5c69dc2d1229411015af1edaa51e9df4d56895c3fd2b4a56cca5179c1fd5aecbf5032ab80ce4c8f8b8e
 DIST botocore-1.27.88.gh.tar.gz 9703393 BLAKE2B b7152546ffd44fccc3607ce4fb0df586e192a68431d68f40063d6397d6005507118c49197e3bb0215ccc4ce6b075a2e95919dc0b2352da3562ba8b5675274ca4 SHA512 0cca62a8e357c8c345afa2ebfa8fa931aa75e323b93ecd63857db05fac7fcd83118012ee7f93921a31895721189995af3179f6ae62ee61cef68eda84edc88132
 DIST botocore-1.27.89.gh.tar.gz 9704257 BLAKE2B f7c0f34d93940aea72337c1cfb229ba79b06c15c99c7c1b719fcad9c2131cc98e084a14f8988e77e0627fac994bd4bfe539bcbcedd318b9bc861311772a5e99b SHA512 ddebfa73a4fee423ee7ead3e7d28ff9e8160f8459ea7cc341b1194759894aee24b07cec25030dedc4570416146d96159f532b7ec2e22d5279e4390bef3330a13
+DIST botocore-1.27.90.gh.tar.gz 9712235 BLAKE2B 3140dd97ed33b368bf605ff77e15ada2b0ace21d8816f7ea0b614f822a4f6ab1fe7640c52c08087cc3d12a8a6a2e15cde0895eb65d643441398b743800ed8296 SHA512 4ba1d0cc82ee0f0d77da2613b8dae20aeeb49d0ce6c87c074800e4887fa341948292a4fb9eec605c5a3f9ed9ff7773e4c8b46ff286d8b2d9588b125f5d3fcac9
 EBUILD botocore-1.27.80.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
 EBUILD botocore-1.27.88.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.27.89.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.27.90.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.27.90.ebuild b/dev-python/botocore/botocore-1.27.90.ebuild
new file mode 100644
index 000000000000..d1a6948e70e5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.90.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/hvac/Manifest b/dev-python/hvac/Manifest
index 98d97ea13ee8..49d5430d2f04 100644
--- a/dev-python/hvac/Manifest
+++ b/dev-python/hvac/Manifest
@@ -3,5 +3,5 @@ DIST hvac-1.0.0.gh.tar.gz 308971 BLAKE2B 02bcb5bcdcd209187464b9e95ea04c4c21717fe
 DIST hvac-1.0.2.gh.tar.gz 309384 BLAKE2B bb492de18a6041b9a478554c1f750540195f8476f74ccf1c9eac3ca04812dfa9c653263b523d0b34efdf1e4cfffebb64ca110023c840abcc97ec7b5534a7d1b1 SHA512 e0f81682be5308a418c2246b03573f0001b9e619e1dc6435b9c9bb608e496a6406b862e28c337afe56cd2d2432d9a0240af5529841d3d6b1b60b662b9b56b668
 EBUILD hvac-0.11.2.ebuild 1261 BLAKE2B 729651b9c8f474e89cc07585d98a8c9928cfd9aa0b79fae5c743331d0a6e2f70568cb13a86c18ee1f4eece4a9793167dbfe488a29b0e61e0a683bd0c141c90d8 SHA512 f6b7784235ef3f80336a7699bd297258039d562eb67b2406ca3e89664fbf699860e7dc5f40520840dd8b09245a01a09625bd10e9b2eaca19b3c823cb94618f28
 EBUILD hvac-1.0.0.ebuild 1089 BLAKE2B f0739bc3cdc8852048ae29821a300b5388123afbd43b0e8d916358babb135704c1d0bdabdc449ad4d9888f253cafdbb277830defede200813a344a47f094ea6b SHA512 d5f6957d8e90cf13e32ea9fac4cd5780f0c2ef94247c74ce7e51979528696cb666b26637cd8c091a2607230c804f4170e26bfdb732de720021c59e135706ee81
-EBUILD hvac-1.0.2.ebuild 1089 BLAKE2B f0739bc3cdc8852048ae29821a300b5388123afbd43b0e8d916358babb135704c1d0bdabdc449ad4d9888f253cafdbb277830defede200813a344a47f094ea6b SHA512 d5f6957d8e90cf13e32ea9fac4cd5780f0c2ef94247c74ce7e51979528696cb666b26637cd8c091a2607230c804f4170e26bfdb732de720021c59e135706ee81
+EBUILD hvac-1.0.2.ebuild 1096 BLAKE2B 20d55394033a79fc50543621fcec0e79e72b222bc4adb77725a2485462d6ae1923493967d1c6fe776bf5d28cef42081149ba41cb6b192b271f65446ab1031c57 SHA512 23e02695780d3d8202ac59fd6651c639ee269f8ba7bf02d376b02e933614d12f1f6e22e333c19fa543729ae0ead638efef2c33cab151bab7aac5e4a24b62cdeb
 MISC metadata.xml 600 BLAKE2B 476b3248fc61afcdc6e5c2db811f27218a7fe070744226289706412ae895c46224d179fc5dd3883d5ff08b1b5c21c86fb649641d4a7fe5edfcebf7ae58c75c7f SHA512 f2136ab711c25905347a774cb63471f3308267d102cd2dbae0a69ba50ef2728bb3cb3b4d0dfdc5d079d40e712332f4e62ef014eeaac5523cf47ad03133d02f1b
diff --git a/dev-python/hvac/hvac-1.0.2.ebuild b/dev-python/hvac/hvac-1.0.2.ebuild
index 50300776b3be..be10761ae69a 100644
--- a/dev-python/hvac/hvac-1.0.2.ebuild
+++ b/dev-python/hvac/hvac-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hvac/hvac/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	>=dev-python/pyhcl-0.4.4[${PYTHON_USEDEP}]
diff --git a/dev-python/pybtex/Manifest b/dev-python/pybtex/Manifest
index 4bfc794430dc..aa154fe2108b 100644
--- a/dev-python/pybtex/Manifest
+++ b/dev-python/pybtex/Manifest
@@ -1,4 +1,4 @@
 AUX pybtex-0.22.2-fix-test-installation.patch 410 BLAKE2B 6c9addde727e5e1c0001a92ad39c307399331e6ff6e1b5aa9cd691e4c8d6381f0d911fc8e622e8a2dd76736fbeb24513751651886a9db0b5e790a509b9043755 SHA512 d357f3f0566fb67b1ce2abb8669429b344f8d6f4bc8651ea913fba3337bfb33a1a7f6a6e1361b42b42cdf92ec09f60c42262f5c41f12da6b34593a1033c732db
 DIST pybtex-0.24.0.tar.gz 402879 BLAKE2B 0cbb74360ebb4e9598543b17a46f21fab037d83a50ee46eae50dd385b981789d72c8cfb0b6c9983a3721565cdefb0df7ca15c120683e33204c591863be79d23e SHA512 caa3480b82012d1db5e44ca7fb5a4082e9aa27e892364de22bd05b0b589da3b1bd41eacd3cda8f86ce567b32ab9a22765d2d8d89c21936d4149d4511349c556e
-EBUILD pybtex-0.24.0.ebuild 674 BLAKE2B 157ee91603c1e84fdc5d480093bd945e8dc2952bde779d40edd99f672b95d96df8022ed13ccbd16668a5fb243a56584f225ab899a25e60f9415a43f7f378ca82 SHA512 5aa6a07630121ec465af1b8288ebe08705122a2d2772bc8335e5176603306493c84d447c3b6a1ba221e3a3921da27ced967f854c14f67e6f1270a624244ca7b4
+EBUILD pybtex-0.24.0.ebuild 649 BLAKE2B 8e7e4aac3c6716e4d9a75e6dcc436fa27f15954a24fc5b4b34448001d513d3c6e3a9285a4af2f60f1d63bdf1297836c0070b45f98bde621fa348eec74e64f32f SHA512 7875e14c5709df65d18c983265493c38f042b0001b650ac5593c0bed619f37ab4f7bb4d55e2ed31eb9aac999a2d62e332916f05de2187c361bcf9fe586e273a7
 MISC metadata.xml 660 BLAKE2B 8826995a0460980941d9bea150fe0291e4b268e23fab6fa6b88271986d9b5c7b1d3b269c2993e049087fe976f45a51ec28100df577ba1f9fca00900346486b65 SHA512 94dfd5376d5820467394d4c9fbf31dccdb36688de2296960a8318604a1bbf54746a68da0f7ba2f6018df71f95e1e69b5055aa4ddcb16d6977835752628b9932a
diff --git a/dev-python/pybtex/pybtex-0.24.0.ebuild b/dev-python/pybtex/pybtex-0.24.0.ebuild
index 5349f40ab8f5..e577bcb0c3c4 100644
--- a/dev-python/pybtex/pybtex-0.24.0.ebuild
+++ b/dev-python/pybtex/pybtex-0.24.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="BibTeX-compatible bibliography processor"
 HOMEPAGE="https://pybtex.org https://pypi.org/project/pybtex/"
-SRC_URI="https://files.pythonhosted.org/packages/source/p/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pyhcl/Manifest b/dev-python/pyhcl/Manifest
index 71d1dfa1f516..7ebd798f8e03 100644
--- a/dev-python/pyhcl/Manifest
+++ b/dev-python/pyhcl/Manifest
@@ -1,3 +1,3 @@
 DIST pyhcl-0.4.4.tar.gz 58400 BLAKE2B 89ce8ba1eff577d9b4c7a86931e305f94ad7633b83c27f44352658ec2a12e48fd0cb05619e4afd97e4f2d78a9f4dba5c082a0d5703060b629880a3d193d9b4ee SHA512 7c5e2b611d1198a0e6c667b8fda868231bdd25da822d634a34c076fea655a7ea2999fc827de8484992efcf52b6b843871713a83e3be7787003c90f05e3e7ddf6
-EBUILD pyhcl-0.4.4.ebuild 802 BLAKE2B 6c09db1a22a32c78a20341b530ca539f493f0ea6d96e805f10c149f01a7298f289e28efea8ec316c9381dfa362d5975e0e18b379e7e0918d51aa13cf13a72cb3 SHA512 2a33dcfdb7a153d95fa190aac7fd478d51c7b89d9330c57c781ebac570ef13259e81dfc8c880f34e8a702b43fe7704f547357cf21558db1dd6be91c7d229cfd5
+EBUILD pyhcl-0.4.4.ebuild 809 BLAKE2B 95d7438b073ddebef8c1ed26997ff0eb75277abf33af13d0cac1c70bdecf96de767aebffeb85a1d86392040478ff96391c102e5d59a615a7d66ab2731dc2d18d SHA512 7588a65704b44c4c6516231a61a23e303a544baabb1f7e7149ef3b6880f1f6f6150770d7899a3498fe356efeb7c21f945ff19a9da586da75a0c3d02fc7284928
 MISC metadata.xml 505 BLAKE2B 83658ee21302c885aae91af9c83ba041a4884ddabf718987c5b41fb7b1d8aaf0808e6413fc5bd0a829267c7498d83f2461329990d6d7e01c7b5cf5189067063f SHA512 d3120947df45964f58852355058c9ac23dd306466ef785b8115f6fc9eef91ee7ae6634fa1e1732f0f99e84961af942f3e319b51d7a380bf5835fe05c25ab6ee5
diff --git a/dev-python/pyhcl/pyhcl-0.4.4.ebuild b/dev-python/pyhcl/pyhcl-0.4.4.ebuild
index 62857bcba53e..2c0c5cdb3244 100644
--- a/dev-python/pyhcl/pyhcl-0.4.4.ebuild
+++ b/dev-python/pyhcl/pyhcl-0.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/virtuald/pyhcl.git"
 else
 	SRC_URI="https://github.com/virtuald/pyhcl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="MPL-2.0"
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index e041ade7c860..98ab1b1ebc5e 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1,5 +1,5 @@
 DIST pyotp-2.6.0.tar.gz 15687 BLAKE2B 9e1b97c5fd5a3d9b335c173d44922a0427f9f49f4fb27579ee528d1e6f4776b33db31a1664a9bd6295bbec331458e17ac380c1fcd9860bc200577051f2af2e7e SHA512 8d650c6840dd243c4dcb522745ae80b462c1819bcafef226923d13be6a2b096cf5f2146829fd553d5e096d82b67725706d69d0cbb15a5d6586ea234201671bcd
 DIST pyotp-2.7.0.tar.gz 16709 BLAKE2B 83b565afe4b718185274682540ad41591913a710d6683c0131dd7a47c100514e6dfea20d432aed39ab80ec232122329206841c3e024290160a86c74e3e8b3f65 SHA512 e2d67de9a7e4a711d4d0037c2a52c05be5b0ecb5fc85f942a1b9a14b261300dff0058be2fe2d2829d351cf665a0d238d3602c27184f56f7886a9049120c4e44f
 EBUILD pyotp-2.6.0-r1.ebuild 498 BLAKE2B a92ee36c0ac76c38474112f47997f483fa5002e23557c95d30bb7a9aaa47d61df6dfde7e20626aa305cf7d40195abbf30c45179d3539260c53c5c2d4ab87804c SHA512 113c6d95e962461f8f3ef9e901aefadc6bfbf3e8befb1ce5dca18f3eeb9a7dc8cf99b6d89af667129d66000f235ae4a66b162165248e9ed0a9450779246a287a
-EBUILD pyotp-2.7.0.ebuild 498 BLAKE2B a92ee36c0ac76c38474112f47997f483fa5002e23557c95d30bb7a9aaa47d61df6dfde7e20626aa305cf7d40195abbf30c45179d3539260c53c5c2d4ab87804c SHA512 113c6d95e962461f8f3ef9e901aefadc6bfbf3e8befb1ce5dca18f3eeb9a7dc8cf99b6d89af667129d66000f235ae4a66b162165248e9ed0a9450779246a287a
+EBUILD pyotp-2.7.0.ebuild 505 BLAKE2B 85db704b096d11319d4e2e13ae44556f462adc0e76f5205e1f7a4c054d79828cd36af11d06b62446452f7b951d4f8cb390570fe7d2643428cb2042b90012496d SHA512 897f04905d0ec825f862cbaf496eff73ae5bbca04e6388fda5c93113b9e0c2fd14ee9cb61a2a80ae3cfccf1e2801bec81894b5209f53a8c9a8278d08ff79691a
 MISC metadata.xml 385 BLAKE2B 9f2d57ca90c859506181e9960deef6e0bf83854cc35066a18cabfdd1c49ea9019123f1ba3edef1d94c45c826ca0064d9a390a62e758fad87120813ee014dee76 SHA512 0f42bd43b2ef566bfc8b2a7ddb858dae6fe92d5fba0f19d6c0ba6cd38b010b6ba927f87c171327665af0a9bff541381d3b3ffe500988ca15d19da40188e06e77
diff --git a/dev-python/pyotp/pyotp-2.7.0.ebuild b/dev-python/pyotp/pyotp-2.7.0.ebuild
index 7491d02761fa..421acf493542 100644
--- a/dev-python/pyotp/pyotp-2.7.0.ebuild
+++ b/dev-python/pyotp/pyotp-2.7.0.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pytest-httpserver/Manifest b/dev-python/pytest-httpserver/Manifest
index a113f130e59a..b37912f39af7 100644
--- a/dev-python/pytest-httpserver/Manifest
+++ b/dev-python/pytest-httpserver/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-httpserver-1.0.5.gh.tar.gz 80395 BLAKE2B 68c075032c57f25854d390f73bf61b7efbe18f78d7f0b2a2a3be10d586ca9cc3ce4a1b390a2ba0da1e88558513782388069c419dae4908a0581e8d583f452bee SHA512 8275475bb044d54769e906571520fafbb9f6fa32fc003f4a00f72b9ff9930e4b80ee84564df1521569cc2a15f5d371c6315129263bc167d0621141004d509a25
 DIST pytest-httpserver-1.0.6.gh.tar.gz 83737 BLAKE2B d0db97227bcb3336a4bd944cf26e2d3e96132baee5991cdff901a1f546174e977b6472458911fc6b92bb13b6d3dae499e0bf3507be265385601e838c4781f0a3 SHA512 5eacfbf159f3a09d73f54da8f3ff885b8d2138e430af27df6039a30e63d7ebcbcf088efe8e7fa56ed50b66ea5b7e3ad7a61c0e8a57d5cb100c2a063df7b6f5c4
 EBUILD pytest-httpserver-1.0.5.ebuild 771 BLAKE2B 28e023ec39114a662c965a349ce49497c3d5728ed7135acdfcfc7ea4374ef273670d83ad46a94e4bb61d70d8eb121d2b8b7b8d3c6486c9e192f87f6d90b29c2e SHA512 d56a4522d74cc97f7521b59fb4e291ff987538582d00c7b96a9d0352416ab6bc483fcfb8552fde5e72542ff70bf97594ca8f46e617c5ee195d6d6c3eace898b3
-EBUILD pytest-httpserver-1.0.6.ebuild 827 BLAKE2B 8f84368923c552a5f4aeacc73bfdcfae62038754e23af9fb3815d6d56d3e7e1e284b1fc61270edd87faf23c723a0168fd7eca0ee3022e8b23ab7838788ef79be SHA512 0ff31fac5bf5b17711631cb6b3fa107e8cb0bf6cd50adf68d468479b18671b5fedce5d5fe15b7bda1e1421dc533600b2fa6423f005b737a518f497233673716e
+EBUILD pytest-httpserver-1.0.6.ebuild 852 BLAKE2B 0320ede25f1055d2d926cd476a686fe7a95a6233c2fd2d2e48f785a0baf207f1e3ef4830f6cf8d3bb04108b4b99ca6529ead99c4e1116693ad57901155a3578b SHA512 8a37a0058c37f1e0d0c05eceb33b78947250e1d8d69a9acaac73fc1e824ed8dce08b7bd3610ae3092eb196bdeb5f7ff62f22ae61e84dc384fd6b3fe0a48bdda0
 MISC metadata.xml 411 BLAKE2B f74c6327167acc706faa9d9e60e2f964e476f33cf33b525287850dcd46e1fd35d6a770d495c929b36bc288c6e2a08d32077bd5265c522598477bb61c4abdd367 SHA512 a536367a8872d3d722f7671d6824d05d1912e9ba53a25ade91bab5cfa4dca3cb2e3f669c7a70416c68a200f1272c5709509b37133886f0d64816b096918fb4f0
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
index 95e6ee261353..041d42cbc468 100644
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/werkzeug[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-pylint/Manifest b/dev-python/pytest-pylint/Manifest
deleted file mode 100644
index dccf21883796..000000000000
--- a/dev-python/pytest-pylint/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-pylint-0.18.0.tar.gz 12448 BLAKE2B 9d0cecb08fc87d7e2aade47af3f2677431776a425726c281e9abc5fdeebb84f38ab4a97e405ed407b1cd241eb97a8cd90e878af61f818b46cab5f9fba5ca3d5f SHA512 a0716104d288774d4c3ab596f30a33cf439df5031647912574c31eefc3a84e69e82fc362f77e73b437c7566a596d2ff8bf51a332626a7fa7468cea3b916e9ad9
-EBUILD pytest-pylint-0.18.0.ebuild 828 BLAKE2B a21b8e989827bbe4447a82c70e956cd19860b44f5e14329812d801a40fd1626fa7a530c21bb5132b1e0ef355713fa8cfd5999b4c02170850f736440b8a369387 SHA512 f2a4961a484bcedbdd5794c46bdd78185f1872d5686a9c6cdea9d5fd6296bfa4608178aaf781af014a9fbf76c6da704762989aa7c71a3ccc90131e5e78aedf4b
-MISC metadata.xml 475 BLAKE2B de0705d225f09df06d9a42516c17f4f4bfdaef5900f905a8631f6abbbc8f97d4745b2a6bce73763a827ca87ac7d5ed03e334546daa613a30b8749dd4de76009d SHA512 7b6e5a04ff56019fd87cfeb3a24c5f2a0d660d635c0163a4cdf8febee6279149417a624332c081008b923474b16ac0a4f41f31a8060e7170e9a38c21f247f142
diff --git a/dev-python/pytest-pylint/metadata.xml b/dev-python/pytest-pylint/metadata.xml
deleted file mode 100644
index a78469cff8a8..000000000000
--- a/dev-python/pytest-pylint/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">carsongee/pytest-pylint</remote-id>
-		<remote-id type="pypi">pytest-pylint</remote-id>
-		<bugs-to>https://github.com/carsongee/pytest-pylint/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-pylint/pytest-pylint-0.18.0.ebuild b/dev-python/pytest-pylint/pytest-pylint-0.18.0.ebuild
deleted file mode 100644
index 65cb8817b95b..000000000000
--- a/dev-python/pytest-pylint/pytest-pylint-0.18.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin to check source code with pylint"
-HOMEPAGE="https://github.com/carsongee/pytest-pylint"
-SRC_URI="https://github.com/carsongee/pytest-pylint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pylint-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# Disable flake8 and pep8 options
-	sed -i -e '/^addopts =/d' tox.ini || die
-	# Remove pytest-runner requirement
-	sed -i -e "s/'pytest-runner'//" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-twisted/Manifest b/dev-python/pytest-twisted/Manifest
index 6cc50ab9ba5c..f8236724185a 100644
--- a/dev-python/pytest-twisted/Manifest
+++ b/dev-python/pytest-twisted/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-twisted-1.13.4.gh.tar.gz 15687 BLAKE2B 8e1024da02a5a1c9c33df96c18a355b9be5757446d9f5495ba1f043c15a2e44efd6e59693986a0684d77b8518393ce9f382d62e3d1e5b903876e8cff34efb427 SHA512 99899ad73f87582023a0e639986a287b4571638be4f1ae134078a15a4d4bebd24153f813c993382603edc14306c12931e2daf517d7998e48d3d19b8469c0b7aa
-EBUILD pytest-twisted-1.13.4-r1.ebuild 1182 BLAKE2B 1a6f2067eff0f2749fd81474ff026b89ee1886018d54b0508dad107929f6c99167885a0568e1c2f7bd395e3112c2073d30bb555afeb109c87069041cb57d6b84 SHA512 1df7e8c746b2297f3641cbde120239d2bcadc57c6d657b8233b8f5bc3d3b66f1d81da01d996192524cb6d5e9e328cde4035207987ec97510fdcb86c22f256f9b
+EBUILD pytest-twisted-1.13.4-r1.ebuild 1181 BLAKE2B 043ecf09f445371d29f4d85bfc9592a83b9b4e7a8ed9ed4c3f2d450f6d1c53bd2fd417372886790051d2067f20fdbb0611bcad78e827b4418f6eae30b3ef8b3f SHA512 d83c8cdd2da1214f74eb18b9e45c5bc2eb2a353c7de52162b2cfa5c1ffd1d48c64d7d834b4d6e75222bcfb886b51da34334f5280a175a2b9d83aa689f5eb5828
 MISC metadata.xml 642 BLAKE2B c081296008b9003b05ba94fa6942b41818d3b68a8ca143437fc134b44c39d392f5cb05f2c65ed8a7b7d4f0115ae68c986bc6bf60d9a7d624919e20a9d2cc06d6 SHA512 4abfad276da1a0915bab78a189519900b71d5e87a71ca93332381d08af734128fe8cc1a325945ab33b3098a51a7d62ba53525615a6345419b5f94bb4c8f59438
diff --git a/dev-python/pytest-twisted/pytest-twisted-1.13.4-r1.ebuild b/dev-python/pytest-twisted/pytest-twisted-1.13.4-r1.ebuild
index 0e3f54c6b683..a7aa4640189a 100644
--- a/dev-python/pytest-twisted/pytest-twisted-1.13.4-r1.ebuild
+++ b/dev-python/pytest-twisted/pytest-twisted-1.13.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-twisted/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 
 RDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/python-etcd/Manifest b/dev-python/python-etcd/Manifest
deleted file mode 100644
index 13f07718bdb4..000000000000
--- a/dev-python/python-etcd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-etcd-0.4.5.tar.gz 37270 BLAKE2B cdeae8ef7d668c7737f48a8f1513b5e0177b074d25d7f9d522051585699f11beadc26e9588209561f37a20ac0b4c9793f675bff07634ccdadf9720443e318582 SHA512 c59d7a67492a2e4e72b1ae3ea73ac85a073b9d4516d1ebc48601ba67ac9609fbc45574d97e8dfae3ed4f511f090343ff980160043676252125ce2e2edc7bd154
-EBUILD python-etcd-0.4.5-r1.ebuild 717 BLAKE2B 837202262f6d5c8e98fcb88290fc56eb7a1575748547e60628c7e1eab94ff52e3bb7e6ffaa0af9b5574654e3bf65828ac8dc6c8a247ca2a2e0f342d606a45087 SHA512 6b66fbcf791e93603d6828957b3aeccc2c75af96d2abbc8e924ebb7b4dac00bb81258f89d40579f85c44882f6caf1bd4888c62d81e3e822f5a20ce452eb49eb9
-MISC metadata.xml 560 BLAKE2B 8e19a87e52c5fcc36b6c70c813176c8690067d748e56aea5d0ad54ea6ecd60676fdbf8f0f3d7d01d1721beeaffbbb44ceab94f2cc849ee635c51a62a277cd165 SHA512 7b0a605a8e45d1c792925fdf2a864308390099d65cc20b99747c764cf35486c048f162e52481cbcb97e1b9295e35bb035c74f79c84944b0aa27c4c3e38ffc37a
diff --git a/dev-python/python-etcd/metadata.xml b/dev-python/python-etcd/metadata.xml
deleted file mode 100644
index 9f4ab9d0dcbe..000000000000
--- a/dev-python/python-etcd/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<bugs-to>https://github.com/jplana/python-etcd/issues</bugs-to>
-		<changelog>https://raw.githubusercontent.com/jplana/python-etcd/master/NEWS.txt</changelog>
-		<doc>https://python-etcd.readthedocs.io/</doc>
-		<remote-id type="github">jplana/python-etcd</remote-id>
-		<remote-id type="pypi">python-etcd</remote-id>
-	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild b/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
deleted file mode 100644
index 7f26661fb33c..000000000000
--- a/dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python client for etcd"
-HOMEPAGE="
-	https://github.com/jplana/python-etcd/
-	https://pypi.org/project/python-etcd/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.7.1[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-db/etcd
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 054bd52e88a9..144d3f500895 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,5 +1,5 @@
 DIST responses-0.21.0.gh.tar.gz 49551 BLAKE2B 3796fd29353f80a04b26a7348153902d959038e072bf512ee4ba8ffd434157c0ce5c37073d114e0d2865c827d82166ee1fcefe2f250c895c23c53664ab919903 SHA512 9e82f0fb7d2a2a4ea071a6384584ba58ebde13504408f8bac351d24df206f0f6815ce3b6d7e013fb87b04d3a1cdccbe7a5287f56f4f9bfb3d4567ad2eeafa778
 DIST responses-0.22.0.gh.tar.gz 54094 BLAKE2B eacb1ba4fcae10d3a4e29fe1516da3f1d3ff07eacbaf65b0dd3f86ecfb36aa51527c0d89547a1480064654c49fd1233d2c3491d9afdf4eff34a4058e4f89ec0d SHA512 361e59e02df36fac0fb0ba2a070b730e485ec94fe90490c271e4ac86fae7954a551bf2486714d95c91e9d0b011f06a9d10b0d6408fd4d03234e1224cca1e9d0e
 EBUILD responses-0.21.0.ebuild 806 BLAKE2B f05944f803ee4b3f8edef401fe5d67817b4f3a9946c7ae7d51539a68a79f83589b429d21fbbabbfa90fbc975e09c0c4e717b290b4c632dea353cf987daa86a11 SHA512 c18b3742a16d17962286e4d7a092319b0fb4e49fd5923cc23b3b9fb5503924d373bdad131b73b22c186f7d6a7651acdee4b27ac30550b17bfec30c9e04f8201f
-EBUILD responses-0.22.0.ebuild 828 BLAKE2B 8782f74683abc7a5061e511a1bb42ed0282ce3e1522a1a5cfd072cbe5fb76f993b64ab736d4c35d56b93d4f82a00e4aedf8f66ffaf78272f08cf16484f2e2841 SHA512 814a1a058196c72210dd7b45bed1a5875e1f61c2b1336eadddad33e059902952f1354e2d95bd570012943aee07d9ffa0af105fd9a418ebed521e8fbc8bba0662
+EBUILD responses-0.22.0.ebuild 853 BLAKE2B b1deceb35a117b4f4b9e0ad7603e03b3816e7e3eaff9e5e0ba74c9d7715215e74bd28739d4f45ec3844c02a8b3d6a53211c6b992a653c5386b59b231c3621f69 SHA512 8d62c430ff24288219640aeb87d95f6ddf6f97da1387022e39fea1208928dd558045464789156eb686416dd6f689e516696455512f4d55cfb888d17fdcbf7c3c
 MISC metadata.xml 463 BLAKE2B 64d3c7be57863ae6088ce746fbfcc68a8eefc37c6d8fbe1bc6866d4c24ad18e75215158d89217d13f0e5b9db2e82d1aab86fa2ff664098239440bfd3fa3e7cd1 SHA512 546de31e1cde62b866673aedb4d3c1278213b36cc75fe86a8e759eaf16471cdefe91d6b0005b4ec4caf4316f8449717d672ede4181f1c1912f5647d50557eca9
diff --git a/dev-python/responses/responses-0.22.0.ebuild b/dev-python/responses/responses-0.22.0.ebuild
index 3fd3872a9be4..02ff161185c6 100644
--- a/dev-python/responses/responses-0.22.0.ebuild
+++ b/dev-python/responses/responses-0.22.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	<dev-python/requests-3[${PYTHON_USEDEP}]
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 769d94c3a937..9be42660b38a 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -2,8 +2,10 @@ DIST trimesh-3.14.1.gh.tar.gz 11961899 BLAKE2B eab37c94da03cfdefa2f4bff78a1a1cdd
 DIST trimesh-3.15.2.gh.tar.gz 11956076 BLAKE2B 4ec701056efd29eb24eaf4edc82d07af4b8e02713697f658ea86eaef6f94916d51c3b21873b3da720705f281054ab5564f4331dc3ee9614d37774bdc03dd1c77 SHA512 9ae3917f2485f5eba089fd04029187be356bbb032d8afa57801a5c19a897550a34bd6734848a47c937b42745fd4563a5a05352928f5e31a7146a3b002d6c765d
 DIST trimesh-3.15.3.gh.tar.gz 11955970 BLAKE2B 050a1330ff0d3d308f3f54bee9080907b839e8cfcc9bdc831d3c5033225a9868aefe2ceb39313949288c779a1af577911a7e43fe2745f50c4983c178dcf02742 SHA512 e01192496af519be7f4d04b6268f82227a0d00c2feebf294572cdd6cce151d10d271cb8b8558c48200338d2f6ea4137fe75d92d115ea8b42f0117ad135566d05
 DIST trimesh-3.15.4.gh.tar.gz 11956349 BLAKE2B 5d67b4e7ce0183fb9031c4cf032caf56e366b0ff05713a22d83258d13283b5bca5b08174044aa29af1d02112717c21be668315d99ea3ce203f318416b9eff583 SHA512 98e2711d46f8299132f0fd32b347393a4fc300f08c93f81e6e82b662bac57044678c425455549899ef839467d9a0dc249a4a03c14c816f0377545b74e6523e00
+DIST trimesh-3.15.5.gh.tar.gz 11956403 BLAKE2B 5e36a7fd57689f5151ee710a707bf44ff4c9538c3f541cd3d29bb08722b4bfeead7f138dab02a58a80d18b4831044d1ac674e3defd0e378420540976c422fc22 SHA512 4433480ff96be561d32412870c71420699713c53d34b2f84eabb1fa1eaa9e70d74940674e62a547c31e22dd941bb036179785a35ff2c8d27288300033497d5ac
 EBUILD trimesh-3.14.1.ebuild 1863 BLAKE2B 7b8f0fc5c878d18b0ac6ff779474555e6ce2eef6f86fdf2da2e8e547351de67485d6d7c0092bc19e0e0be29ea9e0eb9c9180fb387c3075b8ee3f38869d4848d2 SHA512 f015e4269fa2282a8827c764d5d23c5fbbf5f1de5c509e651e29fb91983157114b13fb832c80a3600b6ae2ccf48a0e9b1ac15dd0880d56443c24632980e2b3e7
 EBUILD trimesh-3.15.2.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.15.3.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 EBUILD trimesh-3.15.4.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
+EBUILD trimesh-3.15.5.ebuild 1864 BLAKE2B 6342098e247117e1d01b4709787765b5a12c9ae1e74fc0b7f028f397bb72ce8478ffa7364add4d5886ac1dd1a9d1e2e167f25d55cf9109dcc0d11148bed89e2e SHA512 7518ddb6538df22b9b56e1e097e597f276d12b8e333051c88fc5c9370b745e72feaf355495268003ee9001a8c57f88aa7822cf80635525ff295f1e3f241ca7e9
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.15.5.ebuild b/dev-python/trimesh/trimesh-3.15.5.ebuild
new file mode 100644
index 000000000000..11e1a73dfac5
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.15.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index d470c069764c..d1d26c770364 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,5 +1,7 @@
+DIST xarray-2022.10.0.tar.gz 3035596 BLAKE2B f42df85bdfa66403826fc7d2fa811419898134723ee24afc6b77a320b23c9b5b95fcfd25520f74abf0a3b7bf009fdc33655eebf0ff9703753872072515deee58 SHA512 ecfc92c68ea7ba02b673c6c317e68daad23b6882b4ed316ad1dd733f179c643411d3ee5902954dbd62f2eb7ad591d8ba1a5f0c1b2c7f6873e733df2f22b6650c
 DIST xarray-2022.6.0.tar.gz 3013166 BLAKE2B 4f2c17595ec904508e5f9c1d6ffead45be527b7f2ab73383126d57c7894712e924b605a86f890b0fec4ff45d1a263ce27fa324febf83f703ad36079e68f69663 SHA512 415bd84246d6d2b8aebf316ac9ef82ca7afeacce718349b75479c0aa693e2866dfe236e6dcaf41cae68afd7a99408f5027c938e6b7f447f5323e076b804f5165
 DIST xarray-2022.9.0.tar.gz 3030815 BLAKE2B 71bea98d49fa9ce2e8e881bdcba7872293e1cd9fa4bd23e6cdce40220d87550fade52a7b7c25ff5d0b11b8a729c57ed219031b1f13d1f375c5278ecc611dfbc5 SHA512 57383cfc809b26d743c06eb5a158d318c65aedfa374e62b0a5fdc99708632a364b2efb6275fbc728e441effb7c695635a443cf141d69fa742216a677f4168b3b
+EBUILD xarray-2022.10.0.ebuild 1113 BLAKE2B 7c6c9efa34384aea2c7bbcc0f263d2b5fd4eff771a5e3eeca5bced653384d635e22863da38011c6f3875e6eee169cb1e75e52d689b2a42b810e6ccc4b16b9709 SHA512 20a3143028e3c8d42e881cc9bf0c286df66f5a79e1f30b8d956b7579ffaef5a13064e9ec61737ea45689fc779ae51377bbf9e81692fa57182cece4a7c86aee8f
 EBUILD xarray-2022.6.0.ebuild 1100 BLAKE2B 69026f76a222a1c1f6f4a52dbadd28d70154c6355fa8b21541697a9859716b566264d44f9ff8819705251556337dbb84588859e4f18ceb474e72b0502ef11006 SHA512 5ad0633eff44291cacb14c40477944ddbcdbcee1ad7d618c5b677bbc409912b4be064c00814b2ce21f542dfd1056050b7f4384b38d45fa395f0d6c0ce42b40bd
 EBUILD xarray-2022.9.0.ebuild 1106 BLAKE2B 42f7907525a13a7051e1d7d801df654b04b696a4bcc54254898bd3e4a70d8892d8ca1747e63e1c67ee1aae50142219d3f15c2cff97f92d7af61f919f8d0b824f SHA512 f11c67003d20f5e6dcd9990773653c9baf9fe6ca00d65b462f7e01055186a1352fd7fc5eb9fb968eb889b36cd83fb1ae680fae0740c6f119360ed7a2950084ff
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/xarray-2022.10.0.ebuild b/dev-python/xarray/xarray-2022.10.0.ebuild
new file mode 100644
index 000000000000..5ce78ec96b6d
--- /dev/null
+++ b/dev-python/xarray/xarray-2022.10.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="N-D labeled arrays and datasets in Python"
+HOMEPAGE="https://xarray.pydata.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
+"
+# note: most of the test dependencies are optional
+BDEPEND="
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# warning-targeted tests are fragile and not important to end users
+	xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
+)
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 793df97a4899..baf962dc19c9 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index a680b26533e5..8494abf07301 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,3 +1,4 @@
 DIST byacc-20220128.tgz 896513 BLAKE2B a5dd491702274ed84fdddc8b2d2d240d8ddcc9350db82eee067978297ceda012ab99d7c8f53102f8190ce6e6bb3feb8d9beb62969ddf222b4ba967041b746c00 SHA512 e8ae4c56f5be4cc0ef1d281c43f02c6296fdc40f630269f2a61af511f270ae059ad185b9718190b8133018f7b74b7ca6f84ced5d63a359960b52ea2a3ef562ea
-EBUILD byacc-20220128.ebuild 727 BLAKE2B 1b1fbbb42c7bf997a68eee9c5cf4fc380e9ca3862d78f51be377a17aebdeb400c732fe6748a9e9cf29380b1d9e12a75b3191e50dc8f66f10d499adfeb80d1eeb SHA512 c2cfbfe878a06d2db90cf83e5cbfcb46f73b2a495ca0cfc500c26647b7e08801c9631dee3041e94b20607bf33c580af36bf944c2f62cc28e635311489611a15a
+DIST byacc-20220128.tgz.asc 729 BLAKE2B 7e43d182d06419fdfc925f078535163cf1bba49c7ec05788e2268adc34fbca8ce368516cbd46605bfe2c700950e3c9a202ed120f8a9ff507599a1a2acf6998dd SHA512 84140b9aa4aaada776c580be7adb265bf281decd1d24661b1368e0ffdaf52257751931e61ad0bcc59977e966c32125f751f889d5bfa806b7e0bdeaf96dd629e3
+EBUILD byacc-20220128-r1.ebuild 857 BLAKE2B 23568cb5640c370af78fa38d50661e7ca86f10e98271414f958aec50923a50d4b094e26c6d9417172d74923e86618f3d5d17ad2289b5851ca5d7b8b81f54631c SHA512 5cf4477919d18b5e1146ebe85f2b7333b4956cbc7dbd03a485e44be80734d868975633d11310d251f56cf0cd7ddc7513e397986616830d77944874e430e91fd0
 MISC metadata.xml 424 BLAKE2B f7c1172e12c784d254658b3743db6fec9d6ef008891fe84114c71c1d0edf24a37f00ad61a1705716bbaf6c912b763756995185f2cffd95c831b8ca57abec6d68 SHA512 8bbdcf35f0499db09f1d55d038d93f8c3aa516e0baa74ec078c7a3032d4885110530be47cdd309de1a44b8c92e6dca3f4353d3ff1d3da04b052d492c91549067
diff --git a/dev-util/byacc/byacc-20220128.ebuild b/dev-util/byacc/byacc-20220128-r1.ebuild
index cfea2d0919d7..891cbd09f9b3 100644
--- a/dev-util/byacc/byacc-20220128.ebuild
+++ b/dev-util/byacc/byacc-20220128-r1.ebuild
@@ -1,18 +1,22 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
 
 DESCRIPTION="The best variant of the Yacc parser generator"
 HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
-SRC_URI="ftp://ftp.invisible-island.net/byacc/${P}.tgz"
-# Seems to be unreliable (unstable tarballs): bug #820167.
-#SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
+
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
 src_configure() {
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index 27c59b5d8afc..532843a05ad6 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -1,3 +1,4 @@
 DIST cproto-4.7t.tgz 181095 BLAKE2B 60e8fc26acab8a7475d08c413b85bfc68b1fec877845f6302f741665eb3f779faf313d5463ec08f6a41a04737a9c280d3f8d5247bed819a21ea30a3c2d11f197 SHA512 ad5abddeec7e92ec85ac5d19f025a1d3362ed0a082e3a00fbc64545e3ef6e34fbd9cfff36be01276836d1d834c481927d12f747b0904dbc644d43f2e879bd82f
-EBUILD cproto-4.7t.ebuild 422 BLAKE2B 699c94d1629d4e627e0ed1ef5f87f805f558f46cfc93f83ddeab3122949cd4f574e448f1df4299a3ad104fd1c6865ee9face7bd5f9259ed9741c2c382176ad6d SHA512 3d014e139c204a450b8eb39de27d829177c0e6b91f1dc6b562bae70daea6875624c1a65d013ad705993f53f7d28c3c156d1a10f02aa2235dad22a9b160bf4785
+DIST cproto-4.7t.tgz.asc 729 BLAKE2B 9b668a41374d273263d535fb4dba5038a72f3ee3d0f44a2bc5f6fa85a426f1c2209dea4655639b772f6d5d036af1131dec476c1e2e9dbb808a18a734ff538ede SHA512 d3874a04159a092322097c254a2a855db55409eaa7d529eaee973a4763bf71c525f8b40e9d5fbdf5028108713a8e891f45b26e31bd5c879d3d4e5249c8dcae3f
+EBUILD cproto-4.7t-r1.ebuild 676 BLAKE2B f95778bdb6886633ad6da30650bb804484f54794f20b27717a4c6f69b93b32b5eac1a78f0f0ec27c1155faa6c3725cc15d198d47d421ecab39e0890a4ffa7612 SHA512 03e19ae46769f46aad33932a456ec8871d61e7a16d5ff3bfb773a3ae211d46f2660dc1f94695a691a0144a02dc77a716256628a2e10f285803a24e6498725e68
 MISC metadata.xml 336 BLAKE2B 45d3b05d925b08b4b9ba679e197b059295c82cfe43bdae1e99739c0f6887c0639845a78d889327f736aaec542fcab50c415f8711b64db58affee810088eefb0b SHA512 7284fa1ca3610bbbf0ac1ed50a23c1b09155ce124eb8d70dce99bac08bafc56f2396aa06e085ffc559ddc0153e94d1e9e6c7c6e5e01a2ee8d392ef1af0a279e6
diff --git a/dev-util/cproto/cproto-4.7t-r1.ebuild b/dev-util/cproto/cproto-4.7t-r1.ebuild
new file mode 100644
index 000000000000..770330e2dde8
--- /dev/null
+++ b/dev-util/cproto/cproto-4.7t-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="Generate C function prototypes from C source code"
+HOMEPAGE="https://invisible-island.net/cproto/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
diff --git a/dev-util/cproto/cproto-4.7t.ebuild b/dev-util/cproto/cproto-4.7t.ebuild
deleted file mode 100644
index b2f55586ea3e..000000000000
--- a/dev-util/cproto/cproto-4.7t.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Generate C function prototypes from C source code"
-HOMEPAGE="https://invisible-island.net/cproto/"
-SRC_URI="ftp://ftp.invisible-island.net/cproto/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="sys-devel/flex
-	virtual/yacc"
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 72a21950dd02..1d8a08900ccd 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,8 @@
 DIST dialog-1.3-20220414.tgz 566701 BLAKE2B d3fba0e896d51048876cd1c393d1f2183e47c5307d218dea0bf8c9cbaaed198bfc39e40e1f52b12c978dda10fa61be75d2527c293da652d2f83b80a2237d9d2f SHA512 53b7bc64bb6406c5828f2d023e7db457eee970ade2077bc64860ef12f06c254b4a13706eee068ffe44055ec6b0576ecfe33153438660a5a54f78ea1be00091ee
 DIST dialog-1.3-20220526.tgz 567657 BLAKE2B 1b46c0310e54f26cf5efcd8c84d9b8ef3d7ba7b58292c0967559e4bf281a0312185d3f9dea090e01a95a096ee1781bcdcbab11552175c8d6154ac9268654b6d8 SHA512 619d52b8123264bf586f5325443c3b85863166119c6fbaa91571a57454d761f01a53ebeb2203ea725c83dc88f2abf886c64c6eac5b56c126e4f3939eb1d24d62
 DIST dialog-1.3-20220728.tgz 568086 BLAKE2B 086d946f2a8d298f1d26a193b5e99c00991a7f25fb032efef77109b20deaf08d54562673132bfa458d0c28360b2271e7ec50611ebe00e0c1584f178c0d8d7254 SHA512 dddceaf00bfec4b53f2cf67e51d4c54841d9db337536657c21bc8f324a0eb9c6d621f00e09bfb741bd263f171dde38cfea87568f86daf04a9e88575a0ed61218
+DIST dialog-1.3-20220728.tgz.asc 729 BLAKE2B c317713cae1abe26471c005f033a8ebb406a2a741d67865f90c8a356e204b468fda1349247dbe42e84d434434d202938b55321a22ad0e048eedca93f59a7b547 SHA512 fe0e3559c1c6cbd6ac24cd5da96cde4e4780c6a804f1ed3c96c1ee93dc8f434336cb5cf27c9ac420338c8491dfa9beead48761f07152b2cae9f2d2f7d482eb8b
 EBUILD dialog-1.3.20220414.ebuild 1290 BLAKE2B 690ab3410effd792a305509ea6e87005f2982a04d13bb5354fae2b9952d0f2e49cb37805f1ce318c7430a28a5fc56b3d7a776461ff761fb05b347902426ee141 SHA512 816bd5d804ac91ab2b1297116cf9a5a8d180dd6c6dddbe9542016fb54fcb7a17f63e39b35ac6811a4f5fd88874fc2718380cc6b6076e6212358f0026712a2f4a
 EBUILD dialog-1.3.20220526.ebuild 1298 BLAKE2B b572d1d099d9ecf5d425dbf8a7b9a10b2f708fc264954c91623a8b0ab4f2bd015ab8118d621b8651208f34e1f01df62e6aa2ef9ef85690d65d6048b58d55df69 SHA512 96f582e1c3ea2296c9f5ab984db020c1745965bd48811920a8f3eb4e45079b5b271737836005cb1bc41dbaa1264ea1d735aa381dff58658f88bf94adb7850f3d
-EBUILD dialog-1.3.20220728.ebuild 1298 BLAKE2B 27aaed922d5bba6d53475aa9c52309e0dcbe98b4fe255579f58d592cc451dd2fce771737811c9eaed574609ac87993803b403938a8e714672dd08d4a2e016ab8 SHA512 d52e80acf62a7e2f0078620af5c516d82d8a46434337af09bee0e2d6105560889e27f12440172edb7c3fa71cdf2f66fc86601160379ef9583451fef1790f5a71
+EBUILD dialog-1.3.20220728.ebuild 1537 BLAKE2B e265bddb8cef47d557e76b085bf43a632135fd8cea9f01ecff1530e987e17b3fc5563ed3cd75b47a1840e26b14a407d7116a545e815b1e828cbd3b817a303715 SHA512 32ef04a8c1e4a86aa734e5103ffcaab1164c7e81710ab80ae49535955c4a4365b182b0a80d8f43332a0366165f12ffad3debedfdd3a80d58173a21acd31e50c0
 MISC metadata.xml 530 BLAKE2B 018162b342a7a0462f5087ead1bfaf931a299a2934220afe0d1f2736951b66d05b9985dcae0b3a9039ccbf2df21f3a20271e5718a4f8cc8391daf23f16c0b1cb SHA512 e49c5b6feeabf720469a5d34e7c40b26cec9800eea1cdd54c103407d653b45c22de4fe341d1264d516fa00d8706c6a969ded915f2df24f463b0a8d40072afd40
diff --git a/dev-util/dialog/dialog-1.3.20220728.ebuild b/dev-util/dialog/dialog-1.3.20220728.ebuild
index 8e2f0156722a..6004b7fe674f 100644
--- a/dev-util/dialog/dialog-1.3.20220728.ebuild
+++ b/dev-util/dialog/dialog-1.3.20220728.ebuild
@@ -4,22 +4,30 @@
 EAPI=8
 
 MY_P=${PN}-$(ver_rs 2 -)
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
 
 DESCRIPTION="Tool to display dialog boxes from a shell"
 HOMEPAGE="https://invisible-island.net/dialog/"
 SRC_URI="https://invisible-island.net/archives/dialog/${MY_P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/dialog/${MY_P}.tgz.asc )"
 S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples minimal nls unicode"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-BDEPEND="!minimal? ( sys-devel/libtool )
-	virtual/pkgconfig"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	"
+BDEPEND="
+	virtual/pkgconfig
+	!minimal? ( sys-devel/libtool )
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
 
 src_prepare() {
 	default
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 448f30bd01ee..fbf6ebb42a31 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -6,4 +6,4 @@ EBUILD pkgcheck-0.10.14.ebuild 2197 BLAKE2B 3264c08a19b574db9f9808dd1f81838b83fb
 EBUILD pkgcheck-0.10.15.ebuild 2205 BLAKE2B 7713a52128cbf038209461aac056bffb666f4ee75cbff1d04b9fa1d98d6de38459273a2cac4eca9883b410dd4da8cea69c6e6d41089eda0cbfd5ba993a8c0378 SHA512 4a6ac693f2dab601f503ea175c807dec0039c87b77fa2753cde0578948e62b2dce13bc9853d0cb93ec4d1219ed2e6f676db684f83326e24fe8630525c0d50038
 EBUILD pkgcheck-0.10.16.ebuild 2205 BLAKE2B 6d7fb1512f29d14f6d87137c49ac7b7395d732b23b2e70df51f9e2caca8ac49999a9dcf4cb0def6922572543aa898ebf44d6ed50f2bac530e2eef6a6f458464a SHA512 c709720d97857d95533b9f913b3c5183d9b6384d23f7b2f77c4e6ec340e8559da1bba71cc2de2741b2a9861f5fe1980ec869f279f550c659433a3081e659bbc5
 EBUILD pkgcheck-9999.ebuild 2264 BLAKE2B 1040f9ec9cc5b36662518827219056f3c3d0f5fd1644cc572ed7746bc6ae6f57dd8d5afbe8fcc4da6e669a43a82df6add14a756d4c527ef493fe2c8e93b6fe82 SHA512 38c1942f3361a9e63f147f4051e3df9b93507351b2717c4a8aac42a570cc1a107ec543a5c48271767109220f57b41ef1c57124a3e2cb419669bf4df4173fa168
-MISC metadata.xml 486 BLAKE2B 3fbd43c40601e7edccf11e4335b82d90bd42c9144436529dd6a0c2ffaccbf5febf018c55a336d07c2a86271b43e8da4dafa228a6d2afa7dfd8215eeda5e415e8 SHA512 98c0803dd08976c0f1be543c052a49647d3ec3dbb02667053fee22baec3a05723350cc02d3c0090ff128ba795ed4802b8b73161148f2b790519bbcb881b31105
+MISC metadata.xml 431 BLAKE2B d7d5cd3611d661ef181be38b7087169cd7a73351e54a5e5630915666a81e62761f6b797e255fb7e3172d0135e1a076045ec3727ed6bc9f6d741b5dc63090307c SHA512 8635c9e2b28a5477209d5c3d3a4daf8bbe7a876d1d43bcd0cad30d28155e2cb98c9ca3880418f58bd9ff536e210ae379c3477f2ccdfa3cae409b2b978eb14c64
diff --git a/dev-util/pkgcheck/metadata.xml b/dev-util/pkgcheck/metadata.xml
index c9ba26ab8907..8d75f65262e8 100644
--- a/dev-util/pkgcheck/metadata.xml
+++ b/dev-util/pkgcheck/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>arthurzam@gentoo.org</email>
-		<name>Arthur Zamarin</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
+	<maintainer type="project">
+		<email>pkgcore@gentoo.org</email>
+		<name>Pkgcore</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="gentoo">proj/pkgcore/pkgcheck</remote-id>
 		<remote-id type="github">pkgcore/pkgcheck</remote-id>
 		<remote-id type="pypi">pkgcheck</remote-id>
 	</upstream>
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 87bb43690e79..7714d33ecde6 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -5,5 +5,5 @@ DIST pkgdev-0.2.2-docs.tar.xz 5496 BLAKE2B 46df2c14370dbe1312e43e08388aa9a3f13e9
 DIST pkgdev-0.2.2.tar.gz 66977 BLAKE2B 50b7c06339438ada28ffc9e8e8ba0c472342cbe447790ec7df7506979a1865ebdcd317071833b05091e3749f78857867729e905c1a971bf04e44137337106abe SHA512 f154c7442c40fb1ef5fe9917079db4ddf5bfda4b4d7ca964b9a11fad2a273e79971455142e99905e2293babf73b45d26974480faf0c5c1b25057afc6d658bdc2
 EBUILD pkgdev-0.2.1-r3.ebuild 2441 BLAKE2B 99cdd71ce398fc02d96ae8cdae0cced060e3854aaa802dd3fa118166f60726d26181ee8a76c191c8b8c8daa4e2028600e92e5f257ff7d93b5626aa59e8897261 SHA512 632fbc60b508672044e7981f9fcb9e9b9df64a187bb371fc2f7e579f5a7e1f21ccb03794288e1808b395b5e6b949fa4824240f85add9210453cb39ae529d5bb8
 EBUILD pkgdev-0.2.2.ebuild 2398 BLAKE2B d226f59a1674e3726c7b4cfb162470243e5435c5d23711381e359ac7687f55faaa7fd0d5913a23a07e8372ac2e7034ec8d29ab1c001fd7a0f36b2e9689597010 SHA512 dc3026258c5f3f9bf84cfa05a9322bc797bc49c90b22c0adeef4c0604a6af3e39c2034e772c6637024c287525842fe98835bc18f280f67fadac336a9fc312bac
-EBUILD pkgdev-9999.ebuild 1633 BLAKE2B 3f13b2a4108d5005cdf614ecb8b394c4014f4a4e18d0ef77f0d792d2d3608e66186b345abf4fc5b77240af1168f9a3b5e08fa6389f6f6f9f7588fd10abfe3bc5 SHA512 348e552b87ed615fbc73c8dbda0259804715c76fd0f8b509ec0302b52bda60a4fd5d4f6bda4f1f16fbe5ea016f19b8bb3d457d4f80de62004cc9d7954a93b989
-MISC metadata.xml 606 BLAKE2B 9c87b0b058df2a15ad455e54499d6a52e31e5c8f51187d36a42a775f1fa03745c69c99179a21f8c44f64562f78ddade051a2a4568b7984600fc529f35e36811a SHA512 5c7151cd72132faf4d47837a58812aefb919edca3fb613a6751de265994bff327515a07d80dfe175069bde7097581f10cb453dde1545383e300735dfcac09bec
+EBUILD pkgdev-9999.ebuild 1690 BLAKE2B ff55c939c65b5461f98cea4a18225f3107b41929821aa1d1c738ca61370520d44cff73bf0ca03ec796629f13a0de070ca503f77f03c2edf329a2bfe2490089c8 SHA512 8a1a0e0b03155ebbf3e517c0c257e029e8494aeca9ef03740d83cd51f751d525ec0d32ecbb575990ef7ddcc82d74e38d5852930157bddd7d95f59bf5fae0cb01
+MISC metadata.xml 449 BLAKE2B f440d395e5453394e7bcc857ccd07b6735bce1b68b3e4ce9d33068c28c5794f6ba65d7394ed6f585dcd3e58ccd3f49ecee4d001ff4e40893db721b5ac869f7ae SHA512 a07c315d071af0ad53ee79f9db3cfd1a8acbdbabfad960cf64025eea1a3759f1ef7d5dcf71bf07b17cbfb6f912513edf118c28d3c24de06223a7a3420cc4438d
diff --git a/dev-util/pkgdev/metadata.xml b/dev-util/pkgdev/metadata.xml
index 84522b26edf2..f4ef74297fd8 100644
--- a/dev-util/pkgdev/metadata.xml
+++ b/dev-util/pkgdev/metadata.xml
@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>arthurzam@gentoo.org</email>
-		<name>Arthur Zamarin</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>sam@gentoo.org</email>
-		<name>Sam James</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
+	<maintainer type="project">
+		<email>pkgcore@gentoo.org</email>
+		<name>Pkgcore</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="gentoo">proj/pkgcore/pkgdev</remote-id>
 		<remote-id type="github">pkgcore/pkgdev</remote-id>
 		<remote-id type="pypi">pkgdev</remote-id>
 	</upstream>
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 7fdd98f7203c..736ac5eb9f9c 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -10,7 +10,8 @@ inherit distutils-r1
 if [[ ${PV} == *9999 ]] ; then
 	PKGDEV_DOCS_PREBUILT=0
 
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgdev.git
+		https://github.com/pkgcore/pkgdev.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
@@ -34,9 +35,9 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
 	RDEPEND="
-		>=dev-python/snakeoil-0.9.12[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.15[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.14[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.16[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.16[${PYTHON_USEDEP}]
 	"
 fi
 
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 6988677730ce..70d3f6b745d0 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,4 +1,4 @@
 DIST umockdev-0.17.13.tar.xz 489728 BLAKE2B 0bb4d912aa924c91ff1f4e2cd5ca4ddf81eea1db55ddf9e4cd9a7e9683ed92a268063601a38f7f0a6fb669b301fa9ace94c413e5958ad5587db0097acb2f066c SHA512 77863ad67be0995869b35d12dc43a809d2e67e95f727312ffd9f585c5bb1598c4d31f4909fcff5035dfccdbde8c36819daa633cae53c57ea2d9c3ede3587ec4d
-EBUILD umockdev-0.17.13.ebuild 1137 BLAKE2B da0ae2f908518e68e78df3b629f10b8997995434909919ff289076339190347c56c99f40c212eb61e7ca9f80f6da60a85576c4afa5b68e645ef1f042ed91c2a0 SHA512 d5dfbff1e21d09e51553904ebf432382f64105424203e0f82a793278af75a5d74b887d8acc8a6bda3839716a060ab9ba72e6202beb93161e615d3cb90d372cd8
-EBUILD umockdev-9999.ebuild 1257 BLAKE2B 758117375c6e89af59a15b67b83f9cdd69b06b4b5bcf53b2517cfce543b6adc125b22fbfa5bda7762618024f18adadb5f89e716b454f78d6fc5d986465ed58be SHA512 21d2afba94086dbbd4fc048b02f35f36320316bc5597ed73b146cfeeef6da73133e73916b28725da365f904a330847443eb4f9baaba5ab765b56e7a830735b36
+EBUILD umockdev-0.17.13.ebuild 1250 BLAKE2B 2ecd27e301fa8e28e8c03db4f6c7644a0490404a9773fd6d6ca3d25d98e4ba46f7f77e2e8ed916c53e6cefa1a6b82be1a8fc895bffa8ba092ebccfc01791d01b SHA512 5bb160f21af26aafae9845c40bb6e7d9e4a222d6e7d12ed35dc483be18c44a4099b5a706a2f6d23e906c0733ef9ec561968426e470c09023af79128e416b5dda
+EBUILD umockdev-9999.ebuild 1257 BLAKE2B 19d58ec0f691fea74bcc95630ece7d34296b2e7472121f64933ed052d967054bfec118ccb6d42db36dd334410653572b1beded3143f32fba1194d00316113863 SHA512 4709d411f6792a51077caa75c638dec6ea764d9c59bc75f4d7442ada8455e74f9add0e584a4740c1fde979109de1b41a05b4a070d4219b4665f5979821190822
 MISC metadata.xml 389 BLAKE2B 83313795741d7a5ece22e39de4d8b138c484a7f298f64d7e87bf44a9c04b6733c80f407ca15eb2b4bd71205eaa51b6b814227f4df730ba77e3b54a27735e7484 SHA512 6aff7de0eb974f8ddc4a7190b06b8e3ad406a410f618935cb0b757fa2bc22b6a33ecf33510ae9fc2d4a03f676905faa5561d030fb5e5065f8dc3e7320820cda1
diff --git a/dev-util/umockdev/umockdev-0.17.13.ebuild b/dev-util/umockdev/umockdev-0.17.13.ebuild
index 828c98c13e9e..5e679a5c7ee1 100644
--- a/dev-util/umockdev/umockdev-0.17.13.ebuild
+++ b/dev-util/umockdev/umockdev-0.17.13.ebuild
@@ -6,13 +6,19 @@ PYTHON_COMPAT=( python3_{8..11} )
 
 inherit meson-multilib python-any-r1 vala
 
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/martinpitt/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
 DESCRIPTION="Mock hardware devices for creating unit tests"
 HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/umockdev/umockdev-9999.ebuild b/dev-util/umockdev/umockdev-9999.ebuild
index bc20bf311552..8015f3762895 100644
--- a/dev-util/umockdev/umockdev-9999.ebuild
+++ b/dev-util/umockdev/umockdev-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit meson-multilib python-any-r1 vala
 
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 998b85a3db90..d3e00de28e13 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index 671ab6473f00..db846aec5257 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -13,5 +13,5 @@ DIST bsdgames_2.17-28.debian.tar.xz 58464 BLAKE2B 3f5a70322341b153a8b3cb8df81fea
 DIST bsdgames_2.17.orig.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f
 EBUILD bsd-games-2.17_p28-r2.ebuild 4702 BLAKE2B 7faa77df14788ff42f52b9473093153739c88e234ec3aeeecb9fadfc5bde63ff22bb5c469ef339818762a57103f01b78b9039331fb4d500889e41785bbfbce1c SHA512 8a4df2632ea05bd48bd5e261f1d08907caa66880e7a26163b2ca6e6a8a30c4b3ea2c5355e32a2131e9db5ad130317c35b432535b25821a6115fb3b51dbfba837
 EBUILD bsd-games-3.1-r2.ebuild 4668 BLAKE2B f4f760e9239a68139469ebcc4456795d07831f36aa5b89113017fc65209f3505a5959dfa4d938386240f43f672d069e7687eb4db860bfbb12b279ce61dbf6b66 SHA512 0d964cfdf826320471801519ad61e50ad2e6aa0488a77ee5877b180be957632b2b1cbdbed4c2967e6d71ddaea7b1da48162071f6ecae4da5bf30df36e6e9df67
-EBUILD bsd-games-3.2.ebuild 4778 BLAKE2B 9d14e6646eb9a052a39b83d03af53b81ac109380f6be85c31759b9eaca233d3928454008269893aebe4c78e6dc00999e97f665efe79be32ea6d41b7c6f166da0 SHA512 c717297e6d3e1a490b080ef5aaa2efa53c7ba4467eec67a381cdfd7534c0fccd2c4a6f1137612db9ed45d71b7acb30b2efc810cda8440f8a5a08de6753dba01b
+EBUILD bsd-games-3.2.ebuild 4785 BLAKE2B de1eff1d14086dfe68f962701c680bfb91ff9c5666a4ac35991e7e58d7c9107b63289cded260a20b9b13ed78cb4d4b2ce235221f895a74d19577784d2c1ef8f8 SHA512 2a476e3d4905077fb80c03c6d6cfd0004a108281d5419c8fb9b3d2ac4481507a6647c1735836d98983e5f10ff8d97c5a5bf330cea5cccc2d6a8392b40d23ada0
 MISC metadata.xml 327 BLAKE2B 89325403c47583b762175ec639c9183287ba2c38b14238a38536ab2084412efadb28bd89d0bee8fcada3b55f8691a096965f8fff0add08f157d4a2d723206045 SHA512 710f729c47be0e809ba982ed6d1845b8ccc374705e60ca7a85145d439e130496c7cd9ebcbe70fc0d4770bad5b420f815eb57cae25734d399bd93c38d61fd9352
diff --git a/games-misc/bsd-games/bsd-games-3.2.ebuild b/games-misc/bsd-games/bsd-games-3.2.ebuild
index a4e1f68fde8e..b78cb479b87a 100644
--- a/games-misc/bsd-games/bsd-games-3.2.ebuild
+++ b/games-misc/bsd-games/bsd-games-3.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 # Subslot indicates the fork / new version
 # 3 doesn't include the same games as the classic variant, etc
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~riscv ~x86"
 
 # 'check' target doesn't exist, nor do any actual tests
 # bug #779649
diff --git a/games-misc/bsod/Manifest b/games-misc/bsod/Manifest
index e425c30c836c..5a709dd08244 100644
--- a/games-misc/bsod/Manifest
+++ b/games-misc/bsod/Manifest
@@ -1,4 +1,4 @@
 AUX bsod-0.1-Makefile.patch 464 BLAKE2B ff9a1653fbbdde19337b5bfc1ba19467917acd9107ca62ed42def5cfb1262092b46e1e5de70f105ae3fc9d5a7199449f677651a909f81f7b7dd4c7fe84e986c7 SHA512 f5cb0912a1b851a7f6bd7d4cf861b11a1832a47674d67632343474f5a7c6e5dbde7c2a1f4e217e2df293c8ea9c780d7de6aa14fa6ce5d07a2b5704d57edbe2a3
 DIST bsod-0.1.tgz 10128 BLAKE2B e0869bd21beb38f369bb010b5a7d73bd3182a8531c9460cb279cedb498ce37830f39f97a30dfad567a14b12be5d50743a097720e3665306f2bef43085d339be9 SHA512 2b3087ee495c83f41c2c582dc1c391ce5b73600244b6183abbcd36a3f88caf16987250d4ad23eb3a556b014669ddd84947e6cddeb8d4c89e12c9bacc545299c8
-EBUILD bsod-0.1-r1.ebuild 602 BLAKE2B ee3294929ccc994c1be4fe796cd4058b02fdafc888456a80faab4e463661aa8b34577eb406fc4c8d6ece8449814154dbb8531f8b7e88fa042fc0875d0a70e781 SHA512 68e17598076fa333af1a0edfb255dd99543819a120e9cfba2423befd76819ebe25ca87c82417976819ce5d76dd96cea24291f4eab590c346dff83ecddd4a34a0
+EBUILD bsod-0.1-r1.ebuild 609 BLAKE2B 79ccd2c9157bcf7a6bb5973f933335b7efc81db6e5c6d1a0b23ef6e0d5a1da9ce2fc3ef2d93e41ca5a8798d0af2daebf25250c873df390db5a1687d3c04e3e73 SHA512 31f83fb0107d04107193b4b5ad88f1a7aab8ec7797d69720685ce3b13e3be0d731fd51783876a3b993e804cffe27e35f8df93d941a23118b75319e4b531c8102
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-misc/bsod/bsod-0.1-r1.ebuild b/games-misc/bsod/bsod-0.1-r1.ebuild
index dfeb9584c8e8..ec48156a903c 100644
--- a/games-misc/bsod/bsod-0.1-r1.ebuild
+++ b/games-misc/bsod/bsod-0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/games-mud/Manifest.gz b/games-mud/Manifest.gz
index a2d4e09f8e83..4eab5064d981 100644
--- a/games-mud/Manifest.gz
+++ b/games-mud/Manifest.gz
diff --git a/games-mud/tf/Manifest b/games-mud/tf/Manifest
index cb6b720e0017..33a30089bc88 100644
--- a/games-mud/tf/Manifest
+++ b/games-mud/tf/Manifest
@@ -5,5 +5,5 @@ DIST tf-50b8.tar.gz 719553 BLAKE2B 3218878cdc4a2049fd7f2a8e0426ec589bf304e0bb24a
 DIST tf-allrootpatch.txt 3349 BLAKE2B ca57b7ddfdbaa377c69ad07427185a3952368d35231f4bca77c78a5ed7b5c1c362f4ef1512e23c248b96810739056e8f53c4d41320a1c1dc320b1fd22d965199 SHA512 3fe44e7291d133abd04040f0f8258da6a2b7f67cab79cb1628897a4a483a0998495b6cf97eaf29ee447a650fdb16a48c846599807e570f687a256bb58179495e
 DIST tf-allsrcpatch.txt 10392 BLAKE2B 9a24f99d6bdaa835b4cc2588d87824ea07a12fee38d576ec63f48493f5b92c7155ad959fa80599edf28a39f76d85ba8a2a19e1ff2b03c7893fe4d7b4b7d9af97 SHA512 3ac2447e05911d156509bb44e8809c06c4b1a92cbc8067d196c7e5f688fccd5186a9073001958ca0e757c9db20e9f96889fe7a5b6255495539f23208f72ec613
 DIST tf5_5.0beta8-8.debian.tar.xz 12732 BLAKE2B f663283d571c272e0c159c7175967a206ab30e95fb64b935c73fa1952a3e7ba559af104bf7d4640218bf5748968059f0f9e180cd1d1191beef4d8b0c472eefac SHA512 dcc220d7bec11dd3760104502c51aba320e7b6701b7b295ed188fa32edec7d23ac287995da6d08d34a55f937ccc53b6f02186afe4bbde02e934d90a57c7f52b1
-EBUILD tf-5.0_beta8_p8-r1.ebuild 2026 BLAKE2B 112bec7ee9995f6bdb0eaa273d1901cc0250de4e0b8a9813db012e34373e9f42281510f5352ff87c76bfe25bbcbd84356f4b0cdc5adff298b188cb1da3d37d68 SHA512 ec42024dac6cab1f14acfd505152a0e2c1a01c42f5268ab79326faa7721ad6e275e18ef921c1427f962b3da6c1476ac526e2e81b5339640df2d5cbdf8f9e3120
+EBUILD tf-5.0_beta8_p8-r1.ebuild 2033 BLAKE2B c6ef5a716482a3bf972d52ab2b4c0e8054030aadc8df2396ef33a4d7f40d2a2200051c75cdc8bb9b1ef885ff8428875d67b789611259abffe2be4d08a8b95c30 SHA512 faa13149e17f76e58af6a9a639f8ee57cf08ba347082ef7c43f5ec50c39b206470ae3d85d098fd3c30f3e6526f28eb7b4a12b6204e3d8f6258b12b7e335e209a
 MISC metadata.xml 528 BLAKE2B df96a35a5bbfc92e5df53ceb47d6f2784687c994469a8aadcca651677432862ce2913ab0540abd43d324f4a356416b64bba23ea26afe976dd936ec5f0b6ad8c9 SHA512 b13066571a24c8731e3d6ce75c7beb1448fed961cad2c957f178996e11be7e8435c04d7cad26bfeb26534f906b96aa1e104529d75c3ec20b131361623c3b08f8
diff --git a/games-mud/tf/tf-5.0_beta8_p8-r1.ebuild b/games-mud/tf/tf-5.0_beta8_p8-r1.ebuild
index 753307b19424..9dfaa27948d4 100644
--- a/games-mud/tf/tf-5.0_beta8_p8-r1.ebuild
+++ b/games-mud/tf/tf-5.0_beta8_p8-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+atcp doc +gmcp ipv6 +option102 ssl"
 
 RDEPEND="
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 4af5604152c3..2e95040b1de5 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest
index 7c65d05e2675..5cfb0a2657ca 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -2,5 +2,5 @@ AUX meson-0.61.patch 921 BLAKE2B d05988ee5c86a22c64c296f76f16a8f1fd69484652bcd1f
 DIST dconf-editor-3.38.3.tar.xz 594544 BLAKE2B 0455fc01be96bccec9a9799c5bf23e9fe58cb34d32899a119753f58f5bc2f03acb96ff0eeba131cd8c0ea130e3afad16e4fadb23601510b618bf7a3d5a1664a3 SHA512 cf00705c1e11eab980777b9696fbaaa0f5f8a8118276f2add4f4fcefe5aab46844a539539418ce61f285e65623179a9d63cc18a91339b70b5e7c9408c697e9d1
 DIST dconf-editor-43.0.tar.xz 598496 BLAKE2B 16b39289f822075a951514c44c5b5d673dd5c6d7e4f043f8005098a51209513c88a16846a7bb8988696775ad4f44162080edec59e3dfe2402a814573ff4efe85 SHA512 d13d32a982164e6991576039dda54d51508fc56e1119def9b89ca498ac111c98f144309cab42e45d5b77130d4d7d8fa23168865c604cbaf55da4e6ed3d451953
 EBUILD dconf-editor-3.38.3.ebuild 864 BLAKE2B cfd492ce813a681acb09cb42330ebcf85a02cc964d2d083bcc07b7ae40c33e62ea011244b8f2c0ebaafa30ed3af0f95f965034c75d419812e43a8afc7b16aa39 SHA512 3728d5aba19a33b3fcd59bbf3fb59531bedb5ba1b318a0ab6568d8a95dbe7cefcb5f98307031ea1553f234db6a7f451ed83b1cf4c0e378e943a27d97c4b766f7
-EBUILD dconf-editor-43.0.ebuild 825 BLAKE2B 553739731dcd5af605a4a7a25df7514cb80dfdd92b86d9b0b36920ff705e7815b5dffd4bfd110d63853c79e03fe2274cb0696a622ede5516eaa27675fc8f77b3 SHA512 6412d36b1ed5e7aea59c0d6dd27efdd287eefa40f9910e9dbeca774c1f17199fe5f4d775a465d90e4d7a041d154597ab3fd31033860e0745a016d88f204dc3db
+EBUILD dconf-editor-43.0.ebuild 831 BLAKE2B 9e4eda7811a9029fe251772b3a7c76fa12470eda08c32244365bcb4410d906dfd770e5af2e6b38f402212b0e0277f78efff6d158d595576dc0b12e31b9c553bb SHA512 c11ee7af870834c98c746965c2fb754dea0550c737b0319d439f9c62e7db4c0ed76d6e6a87c176de1a1fdeb1e092636b3999c5a718a39d2da2dd44136e32f6e3
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/dconf-editor/dconf-editor-43.0.ebuild b/gnome-base/dconf-editor/dconf-editor-43.0.ebuild
index 7aa2e48fda04..184e48045c53 100644
--- a/gnome-base/dconf-editor/dconf-editor-43.0.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-43.0.ebuild
@@ -17,7 +17,7 @@ RDEPEND="
 	>=gnome-base/dconf-0.26.1
 	>=dev-libs/glib-2.55.1:2
 	>=x11-libs/gtk+-3.22.27:3
-	>=gui-libs/libhandy-1.6.0:1
+	>=gui-libs/libhandy-1.6.0:1[vala]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index bc7860499fd2..3b736ede8e89 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index db992ab7c3d7..765c6a1f96d3 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -3,5 +3,5 @@ AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020
 DIST evolution-data-server-3.44.4.tar.xz 4784388 BLAKE2B dd5b7094af9c66b710d61de282ff7e223fd87524f0135b7fc2c962d7829a8ed25a90a5fa73d155b692e28d9d18807f8c8731efbfb32613e2e1a020008739beae SHA512 385137f1e412b5c5bcd496d493da4657f8bb6e72519f6e62ab1a683c729082ea0ddcf7b5dae8c0cdf37cb279a1cf59ffb6dd61009c693001d03a0d54264e979a
 DIST evolution-data-server-3.46.0.tar.xz 4817048 BLAKE2B 5c07137659132fca4e2e42d616d3b7e26317f44009de1c9582105a65036884c5b1f7521ac325e2a74a6493362a38b6761d78dabd00b9e64b51a352bcd1d225af SHA512 3aef4ef51e5be2c5e392a2b2781283bb75d8e7d08a3a0daae6be488d14e998779b992095d12889d2d6afe5c732394090f99fa9a866e8825eecdcde2bf6b24ec1
 EBUILD evolution-data-server-3.44.4-r2.ebuild 4510 BLAKE2B 6c70a5ced1a2c2a815898b45728162a852771f9e2dfa2b77decb8844ae7a48b3a05ac1770862136bf0b5e104365254c080ff1c66bce10dcbb6d6b30860b5f81f SHA512 2cc50e79bbaf8ba95b8cdac5a20b20aa13a89db78cb99c7fd5cd67cfd2753cdc1e6fd275a253acd1b337ab77d5295b8755e5d1edcd2830ce10498ee551831c7c
-EBUILD evolution-data-server-3.46.0.ebuild 4003 BLAKE2B 34c1ee710136cc26d836866679379a9711998a05fbad88a7150f27cb4980b5dcf7fce25caff1540d8cbcf4a1f2ef822eb35d0d878b6ddc737a59292268d98b63 SHA512 fb641ed524e8c1b3e523d96b52eb70d101a6e8e7cf91303775db11042c5c2c1b2cf0281ec51374729d135a42b6668759f0bc558a4ef0572b06bbfbfc7c681501
+EBUILD evolution-data-server-3.46.0-r1.ebuild 4064 BLAKE2B 19c0bc2cd9167ce2907adaa9d6e6dca2daf81f17045eb0c4e0a9b4d7f545301280088453bc83bdeaa958030f38ea79bc76074d37260f408437c753210e88a27c SHA512 0ed0a208c7750f5600f623e0fe1219430315972d4a68e1956bf610170d597cce482807ad9e41a693fee10737a0c6064357ed5bbdf496bd7e1d1aed5a765782a0
 MISC metadata.xml 850 BLAKE2B f3e730c63794d5890e76c1f2c7e388b1d6320fc6ef64fa405365a27e7d3883fd09b9cfd875ef0d774bdd51eae5237fff0fd7bd1e6be81a2e0d9252e0b1263afe SHA512 8657f87116f9ad70c24711f270f7b71a57e48bb4f9a8780900f9f6d3da550d0f7b6ae2da453ff6bb76ffd948935f534fdb4b3545a46b0129fbae68a8d1fcecdb
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.46.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.46.0-r1.ebuild
index b68a4f11c621..54af15fb111a 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.46.0.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.46.0-r1.ebuild
@@ -13,7 +13,10 @@ LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
 SLOT="0/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
 
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth vala +weather"
-REQUIRED_USE="vala? ( introspection )"
+REQUIRED_USE="
+	oauth? ( gtk )
+	vala? ( introspection )
+"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
@@ -37,10 +40,13 @@ RDEPEND="
 	berkdb? ( >=sys-libs/db-4:= )
 	gtk? (
 		>=x11-libs/gtk+-3.20:3
+		>=gui-libs/gtk-4.4:4
 		>=media-libs/libcanberra-0.25[gtk3]
-	)
-	oauth? (
-		>=net-libs/webkit-gtk-2.34.0:4.1
+
+		oauth? (
+			>=net-libs/webkit-gtk-2.34.0:4.1
+			>=net-libs/webkit-gtk-2.36.0:5
+		)
 	)
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
@@ -103,8 +109,10 @@ src_configure() {
 		-DWITH_PHONENUMBER=OFF
 		-DENABLE_SMIME=ON
 		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_GTK4=$(usex gtk)
 		-DENABLE_CANBERRA=$(usex gtk)
 		-DENABLE_OAUTH2_WEBKITGTK=$(usex oauth)
+		-DENABLE_OAUTH2_WEBKITGTK4=$(usex oauth)
 		-DENABLE_EXAMPLES=OFF
 		-DENABLE_GOA=$(usex gnome-online-accounts)
 		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
@@ -113,10 +121,7 @@ src_configure() {
 		-DENABLE_WEATHER=$(usex weather)
 		-DENABLE_LARGEFILE=ON
 		-DENABLE_VALA_BINDINGS=$(usex vala)
-		# Explicitly turn gtk4 off because gtk4webkit is not available yet
-		-DENABLE_GTK4=off
 	)
-
 	cmake_src_configure
 }
 
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index d4bf1348969a..9e474f39db08 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-calendar-42.2.tar.xz 578276 BLAKE2B 44684f7c1b6db6865bf0b9bc7096a990212b086d7c2e748cb41e4ac6ced4a1bec0e14f5ed3d6253f49006f4e736666578ded9cd6cd84533fcc03316c5a437b4d SHA512 6ab72017dc0230dc396c7c19cdeab633744b6a44ac4a5c2183389cadca1507bf696c5cdf39def1c0158fb0be5f1988f2a30a6fc2ea0090d6fc341adc45daddbe
+DIST gnome-calendar-43.0.tar.xz 422052 BLAKE2B 08f11b309087c80090f364fa569738a0348d609fa5c0a32b5c5ea4f32681bf53c54248fc7fc3b755f2d01f382b3a8c27511daef9f0bd59faaa148b1f6d253add SHA512 33c77b37e53132892665a44547974c44b7155e673bff27f438fcd30ee68b16b4bbabd9e6a287f3680b39e5032b19409278bc1c63ae46b1ea1191e32f81a55e32
 EBUILD gnome-calendar-42.2-r2.ebuild 1180 BLAKE2B a74b9e76b24b3ac1166faf349097a02647aaf29292f4ef7b4b4cb03ab01dde3b0b734b2f5ff2fe849b941da81ec93b56e4ee191ea6d59b6786207c82b7a89839 SHA512 88f104ded09ca692e6b39d8a8a824051c406cc3456fb868bd6aa9f1f4ff6ea2fe56fdeafecaa5552ab34d397a3f378ec37f1b03ecaf71c9d6031fcee6baa1134
+EBUILD gnome-calendar-43.0.ebuild 1025 BLAKE2B 0732428e10f170301216a57ee562123ef58dd044d9c943e6d179ff4b05253c55b33427a731f364330fcb4015a2903ba527d28aff40ab0d26b54b0b4d87ada653 SHA512 f9fee92b332d847f479fc834837b205992ddaf7fc2242502ca6f2564cd7efc39ee5e4db7be90e860b7707b4fc180d8ac99990eed3c951dccb4e45ef6d45873c7
 MISC metadata.xml 523 BLAKE2B ac729de842a6c4af26151fe8a6325fd880715ef5bdba87af11d3fa8b39673c13a32d9cfcaf8c13c246640bd63af8391eed13d775840a337b4e5cf85acc779df0 SHA512 0e87a27fdbccd8d5b71a2b0c57a0b1af281f8f4c64da1a7d091825d03ed3bc4897995f705bb2210800c549aee7d038742edcb3874db0fabe2be1e918483f91b2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-43.0.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-43.0.ebuild
new file mode 100644
index 000000000000..c9bb9e966775
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-43.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/libical-1.0.1:0=
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+	>=gnome-extra/evolution-data-server-3.45.1:=[gtk]
+	net-libs/libsoup:3.0
+	>=gui-libs/libadwaita-1.2:1
+	>=dev-libs/glib-2.67.5:2
+	>=gui-libs/gtk-4.6.0:4
+	>=dev-libs/libgweather-4.2.0:4=
+	>=app-misc/geoclue-2.4:2.0
+	>=sci-geosciences/geocode-glib-3.26.3:2
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index b71ff2b082bc..501013764145 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 55e0d50b7ac9..b9e9f4a5652e 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -5,5 +5,5 @@ DIST gtk-4.8.1.tar.xz 20502844 BLAKE2B 2e60b4a1985c2faa6990f0a2512a14f06ee30287e
 EBUILD gtk-4.6.6-r1.ebuild 5748 BLAKE2B 080ccac9ef219938bb0e44a670f67c635f3d9e8c58e5a3b202135a886df5c6406e374fe20914dd0929b4dba4a878d6bbebc08a5fe5b919c144e0cc4f5b65f584 SHA512 b1968a046d5e1b55dbf6c3519693da2d5b15778badca08af89ccadadb1427fc9c94f527e616e24a0dd1c38e055ec169b7e4cdc202b96db0f5fedf39c57f9c928
 EBUILD gtk-4.6.7-r1.ebuild 5748 BLAKE2B 080ccac9ef219938bb0e44a670f67c635f3d9e8c58e5a3b202135a886df5c6406e374fe20914dd0929b4dba4a878d6bbebc08a5fe5b919c144e0cc4f5b65f584 SHA512 b1968a046d5e1b55dbf6c3519693da2d5b15778badca08af89ccadadb1427fc9c94f527e616e24a0dd1c38e055ec169b7e4cdc202b96db0f5fedf39c57f9c928
 EBUILD gtk-4.8.0-r1.ebuild 5783 BLAKE2B c1423587281fb456eecaa33c6ecf840220f1e2d105c1daa1fcc8e0a66d3b91cef230c2f33b44139d9e3140d117d0892fd894038bd5809fb7e3a0282aa9f3378f SHA512 30b11a89da8550e326041f1fce4f38cb5e7214234be97a3d6ca10760525848e6cf39ae745a07aa04ab6767a5650fb8de71926adb599c2abacdc9c50f51e680b3
-EBUILD gtk-4.8.1-r1.ebuild 5783 BLAKE2B c1423587281fb456eecaa33c6ecf840220f1e2d105c1daa1fcc8e0a66d3b91cef230c2f33b44139d9e3140d117d0892fd894038bd5809fb7e3a0282aa9f3378f SHA512 30b11a89da8550e326041f1fce4f38cb5e7214234be97a3d6ca10760525848e6cf39ae745a07aa04ab6767a5650fb8de71926adb599c2abacdc9c50f51e680b3
+EBUILD gtk-4.8.1-r1.ebuild 5650 BLAKE2B 9dfbb8bf31bdb96e56bb66e64ee7c8a79f6bd92b7b67a109b019802f1fb6ce4ef1f07e05dc0e93f5bd16ee710d4ad63f76ffa790756b3a795cfe86f0992e63ce SHA512 646ba31067e385340dfbd6636806a2e1d15bee48e7078ad52852429a0d7e3825189ff603b83029431f89d453aaebd1e94fad986cffb78b3b6a4dc56cde1bbd57
 MISC metadata.xml 690 BLAKE2B 4ae68aa63a0aea931c3584ac288ac62226bc1a78395dad3e7401f1988d4ab45d3895eb8149f1c06a849e1e27926097d8aa09dd5a33a2bf8b4ce52e4e1694b1e0 SHA512 ff6bd9799fe0f9e3e922744ed78cc9db278801e6e2d309fbf146535b061670f5f9162946ddf76cdf3d0e4defca16657ba39b3af81e5bcf2423385c74fc299779
diff --git a/gui-libs/gtk/gtk-4.8.1-r1.ebuild b/gui-libs/gtk/gtk-4.8.1-r1.ebuild
index ea6f87056ab6..48045b86652e 100644
--- a/gui-libs/gtk/gtk-4.8.1-r1.ebuild
+++ b/gui-libs/gtk/gtk-4.8.1-r1.ebuild
@@ -105,8 +105,6 @@ src_prepare() {
 	default
 	xdg_environment_reset
 
-	# dev-python/docutils installs rst2man.py, not rst2man
-	sed -i -e "s/'rst2man'/'rst2man.py'/" docs/reference/gtk/meson.build || die
 	# 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
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ce9d21d255ff..2adad35247f2 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 061d3ca159b5..8a504e976545 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,3 +1,3 @@
-DIST gphoto2-2.5.28.tar.bz2 797600 BLAKE2B 78a89eaf5f68f3b902751792404702fa656680e904bc750e6a51934b5cefd8458c95ffd553024e16977270f4b4806c5dc68d9e3accd8759b1357e0619a0dc6a3 SHA512 ca83c677bdaf7c16ed2bc22865bdcc24e1c5721dbcd36a76e2ebe8bb992d46614fd012cd8f38b37598b30b6b57e6bf533318f6a0d490e186f3026676249735c8
-EBUILD gphoto2-2.5.28.ebuild 1044 BLAKE2B 2b009db41989892a376436e08d9bc273d2cffa032e9387db0c3fca148e5b3fee9550a6de5bd825f17cea5995eee4aa393fe8316c35fff7918c87b1398f1eec1f SHA512 e7e25610b51f6d03cc5f30c4e2ed001fb35d640fe94e1830d45e7adbada7ef16ebdab59e547b9e4895d85c51f796120ff757e0caaeb15f33d7d1f4f75659d43a
+DIST gphoto2-2.5.28.tar.xz 575816 BLAKE2B 4f919349d435cdb8e2cc4602ef57cee5e9ba5c7117e9d9e0dc0cec48f8820e8fb56204e7b4eb96105015c603fe83eaccd1ce8a240780a258fe7e56eef06f0665 SHA512 f5e23fd559b3a272441556323b9eadbce11e73bdcfe94ee027d58e51d5396ee6e2c12f0b7675d5017c140db329354de775ad619fcd6f19e3252659e0cbc4baa8
+EBUILD gphoto2-2.5.28.ebuild 1043 BLAKE2B 9f0dcf2681310f7d8a19f644be40475fe99a8f78463b40d67b767b618d04714a71008925773469908dde477078ad1eec825ae401e26877ce5656a4587ea7f402 SHA512 7e07f895327ce03d233e8700d8592c2bdc1a1da41a62cf42359055c40f81819934effe72946722310af40cb68a8bf644771b64d777498a8d11f8fafe945096fe
 MISC metadata.xml 384 BLAKE2B 1577d799609489e1e29078aaa779e019b01622aed8322d23aea0b3203f620d123c3bb0b2e5a3696ba89422c52695882253524c2104b47456e2b2a66f782ea9c4 SHA512 96f5267ca8b7ca6a0b22a82c3b386a1094db45056ade223cc3c24e52ef6a37117e283c0bcf6eb89e6a2a47347916ffdcfd5bdffd9049fda1717f2fd044fff9b5
diff --git a/media-gfx/gphoto2/gphoto2-2.5.28.ebuild b/media-gfx/gphoto2/gphoto2-2.5.28.ebuild
index 1dd02fde6838..6dfb229aafc2 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.28.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.28.ebuild
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="Free, redistributable digital camera software application"
 HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 78bab1c31cb5..86d482635540 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,5 +1,5 @@
 AUX imv-4.3.1_p20211221-animated-gif.patch 504 BLAKE2B 8d2dd70e5b73efa82bc18976b1b51494d87402e7722393f8b53482ab0bfb775daec259b56e2250687228c7c5591925dbab66378c598008a1c6ca6dc977334f4d SHA512 df0f2ab81b1d2f41f9b03a89af6c3bb5688017e74874203b5109554a66e647b11c26798f1112cd4068702bcdf238a68ceef75ce1f90cd12496de4588d6227a83
-AUX imv-4.3.1_p20211221-libgrapheme2.patch 480 BLAKE2B 7253fa89af3c9d130f00450e389325600d4866355c9556b8a7d0798e1c6daa50a4d3b85c66314a7070f69cff221ff1b953c5f2e32b7983f1019cf59c6f34faae SHA512 322cc5fc20285edbd501750388b1d4e07fd2297a4e20c3a8582ca31ec59c82ced85e2038afe8411126f6a0a091a88a2cc453fafc492009c09e8d09522b5d2c23
+AUX imv-4.3.1_p20211221-libgrapheme2.patch 532 BLAKE2B 1a40b9478c4e47f4cf70e7f8d25aa322ac27a2bea68783416d4ec2a53f18922a9b02f4c89415471a73519b6eeb011a06099df363f9ef49309e829e9e859d8e36 SHA512 f6687331577e4b970ef0e7726d0f8c37b8dfb8f6564067051e87046ee82fa26548931abdddf3d5cffd093c00adcc6c4672583d28f776f6b01d8c81b2e0f4be9b
 DIST imv-4.3.1.tar.gz 79123 BLAKE2B 9c818a5a29457313c3d0ed1a8558555b2069aec837939dc1d2b71668ec2fd39867c8ad4fcf8605243ded96e27d346af4307d83c8854538981b62c968e9ec0ede SHA512 f70b95f3f99d7d6a9276370650cef0885938464e3a40ab1768231292ba35d9040f7196a5853ea1268fe6d47cf08d129b3fbae1ca215df96d12ccd85b7efd1ee6
 DIST imv-4.3.1_p20211221.tar.gz 80082 BLAKE2B 2b4f3cdb0b7123b978cdbc588cf686c38d65053e3fadb6532da45be3e24b35a297639ca8ddb7d05945f92763cc014a232eb0ca0af0da059b2dac48d2b3c9939d SHA512 7579930a406d2ba1dca7f043d635ea89301606d06ca5ebe5779fffd1410789bb07ef8228beb2ef08af2783e64deda8b67aa991fc56333c0e60051f7666fbb19f
 EBUILD imv-4.3.1.ebuild 1900 BLAKE2B 146b313c036db579c8f7f817946d245c2b119aefb1f4de5d6d2cb7676bcea56029379e9164a69d89765cf22c03f24a77d15868e580a59ffe7edd941113acec8c SHA512 faaefb3f7e21a566f8285ae6ae0a759a53fa318bf5bc8c2297f22f00f78afa6623eeae2ece9ac615e7b758cbf3b2ae29c2b349518413b71b8d3db3e731b1431e
diff --git a/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch b/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch
index cc467e9eb55d..d71067130c27 100644
--- a/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch
+++ b/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch
@@ -1,3 +1,4 @@
+https://lists.sr.ht/~exec64/imv-devel/patches/35908
 --- a/src/console.c
 +++ b/src/console.c
 @@ -54,3 +54,3 @@
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index cf7a535f42f8..4991d45e3576 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/tremor/Manifest b/media-libs/tremor/Manifest
index cd4503cedcaf..9fa092dd2489 100644
--- a/media-libs/tremor/Manifest
+++ b/media-libs/tremor/Manifest
@@ -1,5 +1,7 @@
 AUX tremor-0_pre20130223-autoconf.patch 829 BLAKE2B 8a1577f8a9350dab208ed9ea051b52fa9f30f0080504b6a3477ad3e6d3506fe7b2ded25d34d164a0b04385e5e010144f1c4136c5fffeec19247feb795c2fd309 SHA512 5e0d4efa7193bf7f3cd4a381616032f8e42d6b26ec85399eb406a0a753b0f6a321e968fe16d96645e3a52832279663362587b0bb93e28dd911b535a2dd496f30
 AUX tremor-0_pre20130223-out-of-bounds-write.patch 2721 BLAKE2B a9d254873d08d261c72197fbe44875aefe9f48f97464ccc5653e88e50fe3546d2426d80e62a67c0a595695737fb2b7c95df1a850b612688c02b2574a3b986fcc SHA512 022a8e813f42e3e9a0983cd2e948898dc36689433cc76d292b8b24bb3c7318bbe71a2618022a16025ee25dea0dab063266212499e5d84669603414b6c769f74e
+AUX tremor-0_pre20130223-pkgconfig.patch 950 BLAKE2B f4ee913b722ce7af3e11f5a40d2a5dbec1ffcd11a0427f8f683fc80f4bd37ddd369521fce1850b105e83a826ab40de226e53b0c4f61f7fe1b53e70dac098b582 SHA512 f7a10d6d47086b6ffd7889891bfd6d9be7adcab37324809493f7001ee893fec2e6c0a7e10d08c9c3787a54d75e9e163a2848ac1ca391579af1ba07cb7373f17d
 DIST tremor-0_pre20130223.tar.xz 110096 BLAKE2B aec25548c971d2021a3b5f81469d3bf74434f2bcf215601e79a2663fd044085519fde449736f0513c949de5a79e297cac65a7abd50f5fcd8b940f655b966b164 SHA512 3fc109dfc6f9f33da9d2da7d5c1708d6fe4b22179048c4acd5b4b037eafbdda392d5ba74ffec5d8a225d56ebd860f67d28e4460f0b54cb170152a0b9fd89c514
 EBUILD tremor-0_pre20130223-r2.ebuild 891 BLAKE2B 5408a682a3e3923f353eac39a77a3fb0d55c15792cb8ba6440f27a005b2af7d819e783da3665c9fc776816f3b92d266f56999718d9b5561c8209cf002c14c081 SHA512 4b1756cc81271618cf113f22b46ba8576153c1cbdb532e4f6c5f9e2cd70782d3e402bbd81da88730469265ddc0f9f4316445dc39cd98f943714887d6d5780c35
+EBUILD tremor-0_pre20130223-r3.ebuild 934 BLAKE2B 43baf09d25e2e0a2f5047eea34d4217d2c00f05eedfce1ae72522caec0d93c752d101fe3defd86942ca2ec62761fd1904d8dfcda4ea0b887de1b416ec03f0254 SHA512 9370f65a3df311aa86305f92a8f80b5862dcf7f126cf839e4c6686f06d11f891f6c78e8c9d968d0f225560b7330cf453c3391ee205a665d734773455b92f35d1
 MISC metadata.xml 342 BLAKE2B 5f8cb1f46d849f476969a68aa612cb89eac3b7d3b3de918cc6b472c7847b19cc703f16d4784f1931a57f5c64d0edfc80abf3b7c37d20562e03c5798b869d9c9e SHA512 39920a8902f374459188e7981b0930ee2d108ac944c24cfc6cb577e8a0e310753620996a51d3882d9550dbbdec768b2927f4a7aca4f858dae26e9ceef11c6ba9
diff --git a/media-libs/tremor/files/tremor-0_pre20130223-pkgconfig.patch b/media-libs/tremor/files/tremor-0_pre20130223-pkgconfig.patch
new file mode 100644
index 000000000000..e28e818de830
--- /dev/null
+++ b/media-libs/tremor/files/tremor-0_pre20130223-pkgconfig.patch
@@ -0,0 +1,30 @@
+Upstream-Commit: https://gitlab.xiph.org/xiph/tremor/-/commit/a733870e048fc139f696f1c57b50e0145d1ab6c2
+
+From a733870e048fc139f696f1c57b50e0145d1ab6c2 Mon Sep 17 00:00:00 2001
+From: Tim Terriberry <tterribe@xiph.org>
+Date: Fri, 5 Apr 2013 13:20:31 +0000
+Subject: [PATCH] Update pkgconfig files to reduce overlinking.
+
+Patch from Brad Smith.
+Reviewed by Ron Lee.
+Fixes #1943.
+
+git-svn-id: https://svn.xiph.org/trunk/Tremor@18906 0101bb08-14d6-0310-b084-bc0e0c8e3800
+---
+ vorbisidec.pc.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vorbisidec.pc.in b/vorbisidec.pc.in
+index 9c09524..56fa656 100644
+--- a/vorbisidec.pc.in
++++ b/vorbisidec.pc.in
+@@ -8,7 +8,7 @@ includedir=@includedir@
+ Name: vorbisidec
+ Description: vorbisidec is the integer Ogg Vorbis library
+ Version: @VERSION@
+-Requires: ogg
++Requires.private: ogg
+ Conflicts:
+-Libs: -L${libdir} -lvorbisidec -lm
++Libs: -L${libdir} -lvorbisidec
+ Cflags: -I${includedir}
diff --git a/media-libs/tremor/tremor-0_pre20130223-r3.ebuild b/media-libs/tremor/tremor-0_pre20130223-r3.ebuild
new file mode 100644
index 000000000000..2b454838d599
--- /dev/null
+++ b/media-libs/tremor/tremor-0_pre20130223-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A fixed-point version of the Ogg Vorbis decoder (also known as libvorbisidec)"
+HOMEPAGE="https://wiki.xiph.org/Tremor"
+SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="low-accuracy"
+
+RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-out-of-bounds-write.patch
+	"${FILESDIR}"/${P}-autoconf.patch
+	"${FILESDIR}"/${P}-pkgconfig.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable low-accuracy)
+}
+
+multilib_src_install_all() {
+	HTML_DOCS=( doc/. )
+	einstalldocs
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index e6e7bd4f97fd..b198d7051908 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/tcmplex-panteltje/Manifest b/media-video/tcmplex-panteltje/Manifest
index da660768c08f..3d674b32766a 100644
--- a/media-video/tcmplex-panteltje/Manifest
+++ b/media-video/tcmplex-panteltje/Manifest
@@ -1,3 +1,4 @@
+AUX tcmplex-panteltje-0.4.7-clang16.patch 118 BLAKE2B 09bdf007b849bd470143837fea48a65b9cd1f976754d93063cffcf6e429261ce2e9346296a6136f42b673deeff58d3ff41d5e310d9b98d9b5224be2c6f1ab742 SHA512 eb1c78da1079e1ff0b3b9d16ce0318f622d730a3a044b256656f7201ec00630278961d29df2938c737270d5069a5c86d65bc941d0e4b9e44cf1c7859836350e4
 DIST tcmplex-panteltje-0.4.7.tgz 81185 BLAKE2B 048958f4544c0f0212a740e25ce27527ebf69b1510421cbc5cb752f52f3608cd498514f0ff6c45a4430cda45abc1ca5594bb7e1e3205294c16af658a8c166a96 SHA512 d8e9d802ff9d6a9df5ae9d0c0f5392cbaddcce4dc0977ff587406dd8449903941bd60ceda6b48df812f66f51e2e8cf451f9b23a006eebc736ba64b21bd0d293c
-EBUILD tcmplex-panteltje-0.4.7-r1.ebuild 549 BLAKE2B cb160d8e88dcc331a0dd7fd771cfee755cd774e2c8ecac0730579aab187712d8421715a3d3a3d8ca5673689b7e600145804404bf4ceefb4b62ed70edade7414a SHA512 0378d5dcdd58651e42315543c42c1abe7f441d3e7c95f3eb036b06111475057c43c1158eb013076f16e9bc567e41ec4a2a73497dbd587792b5b21af81061c5e5
+EBUILD tcmplex-panteltje-0.4.7-r2.ebuild 728 BLAKE2B 7f3058b2684c2062c6fc0ff184e15c86fdc745223679f71e1e4cea2420d96d54cc93c42d81984fea6e3cb4a574325c8502687c47a6fe6b014a7d1595da82e2e1 SHA512 e422193c97ac8c0e05f8e3cff88cd0f2b819801584e882b194a42ab105fa24450383c8a8f170814c109322859eeda68a024b35d766dcc352e142620e68885b0a
 MISC metadata.xml 258 BLAKE2B 20a290ddbc62a5b59a54019b4ccb149256812a520d33f2f03de34139400a78ecaf3f72fbba87eeca3ea278701f01f607dc9d7d8d50776966c2e72f69cc616743 SHA512 9e4f14e6a62ddd65cc2c5f196886b1e06b1b3cd21ad13b7acf46064c897008c36faf4b353fa087a5d56c4b13d9614e01f88eaea3b44e1abf9bebbfeb46238330
diff --git a/media-video/tcmplex-panteltje/files/tcmplex-panteltje-0.4.7-clang16.patch b/media-video/tcmplex-panteltje/files/tcmplex-panteltje-0.4.7-clang16.patch
new file mode 100644
index 000000000000..ffd06af6992a
--- /dev/null
+++ b/media-video/tcmplex-panteltje/files/tcmplex-panteltje-0.4.7-clang16.patch
@@ -0,0 +1,7 @@
+https://bugs.gentoo.org/871534
+--- a/main.h
++++ b/main.h
+@@ -11,2 +11,3 @@
+ 
++#include <ctype.h>
+ #include <string.h>
diff --git a/media-video/tcmplex-panteltje/tcmplex-panteltje-0.4.7-r1.ebuild b/media-video/tcmplex-panteltje/tcmplex-panteltje-0.4.7-r2.ebuild
index 2d0a5c45d5fb..d2ee480f2230 100644
--- a/media-video/tcmplex-panteltje/tcmplex-panteltje-0.4.7-r1.ebuild
+++ b/media-video/tcmplex-panteltje/tcmplex-panteltje-0.4.7-r2.ebuild
@@ -1,25 +1,37 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Audio video multiplexer for 8 audio channels"
 HOMEPAGE="http://panteltje.com/panteltje/dvd/"
 SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16.patch
+)
 
 src_prepare() {
-	sed -e "s:CFLAGS = -O2:CFLAGS +=:" \
+	default
+
+	sed -e "s:CFLAGS = -O2:CFLAGS += \$(CPPFLAGS):" \
 		-e "s:\$(LIBRARY):\$(LIBRARY) \$(LDFLAGS):" \
 		-i Makefile || die
-	default
+}
+
+src_compile() {
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
 	dobin tcmplex-panteltje
-	dodoc CHANGES COPYRIGHT README
+	einstalldocs
 }
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 6ef762e1787f..bc3448a2bd73 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 905f1fba5500..978656338546 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 13 Oct 2022 23:39:50 +0000
+Fri, 14 Oct 2022 05:39:52 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0321522a9797..ee2142470a4f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 529253 BLAKE2B 4870d0ebed8f73802444d2a3e204d4fe556355a8b2b4d4ffdd695d17206e94777c458bc34f39aee9fe92a996aea872cf895c73e601729b57032c40785dea2d65 SHA512 ca03ae189444f830ef68a97bf0be8dd0ed5045d9010eaead8695ce26c0591587965b16cbf215850d4c87fa27139a325c616d08f336a7213ad4483bb7e1f46baa
-TIMESTAMP 2022-10-13T23:39:54Z
+TIMESTAMP 2022-10-14T05:39:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNIocpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNI9itfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD0GBAAr0ZpvrPrenBiXxORi3v6PUTl31MSSAcn69yiWUBTmSsbIc47C1dSgxuo
-vSFxdI+Pm9ZbbAl4cT2FRwDhSIjrwP+egBUzjN3kbPeakzh1JEGf54Uf6xIZUsjG
-LBGnN/nqJX3jnPjqDkx3R2lBLkmT8jAFyET91xsdhkC3SZExOAZJ8NLsKG5pBjfV
-0V5XBRmy2o5tgif5o3iyrpoHb7Z79JFR+sEUcurhezZ4bH2ScrBNP8S59fgXRNLY
-rjOXQjzqD6Y4h8qh0t3O878qN6EG8zg06IUEc4qfn8iyWaxehuo3XZpWE31MKUQR
-K7F8ozmvC3RjBIxu9beikUbGKWaqvf2mwLH8GRFT75bC9pGHEtqgA9ut9ZOliQeR
-EwBFlCY+uEocQMQ+EoT7aLS82Kri9lEW06ndOhNN1r8Xe0ROfBgWyd8NJraHzz1C
-Or6tjyEcrfZTSa2i6B+TYmbCaHpbHlK478lRHSepaFzu5jv4bUGZbew4sR59QqWp
-HYMUMGBQArQ6DdtqLiWOBFlmXXOb0EBUt8KTjchQaN4mZ6/lZQkfVHYhodGekv8R
-EaVS2WeYAMZDyFs7tN9kqWxd53d9cKbjJUPOR60yuje0jQzbKzb3SHb+l1YpyVC9
-TIB0GZueQ3w2RBvz8P6mDoR+hatLl0+2du86K3z677pGB6hnT5Q=
-=fsIK
+klClYhAAsx0GvnjEtPBB9/J5YnTNhJV3GseikORTnMxbb71Qy+0Zq06pLBnfZgaq
+2OL1hY3nPBfPbFEq16jE3ylMwVmFiymvHmYhiC8Fqt7TcLiCJw6Hcsfoveb1W8OF
+TTpPM3BuPetaSJDlWK6YYGKTtDULjsAK5J8Ma5az6cRTbiJv6rxUQnL0pXbbidHT
+XDmCmxIEEPsqCzx+HsgsKhWhWkLUIhcwCRMHLsjvqrv4H3NwLM1Ll5jEwzw/p7BW
+o7VIHi8sgYpOhFozFTd7g7Zqj9s2eusHdlwCdP8llBgM4VopOLneU0H7r7BDO11J
+pMte3HxbAqhL46DLtXm6fU/3acbTDz/rXrPen7Pit1JxOicEsImWzaofFMwdNDUw
+6gYu3tlKtjKfqTkr1Bj5OJFfvNKRdw8WO/ndtTo6WjJiDGYE9VfNcnTnrSfec0CQ
+6BJi/uRbmgqiS10rMeTaqNNtYq1ih/vKmJFfllBApdCLAyIcUg6M+MRZtg39Evmk
+gvQjduOi6AoyyAwfdrHjZf3r+nj6J3yrN/E4OqDsenjOJHavszIOnc2DFFhcuaHx
+3HP5eGe2EBqATDqsmXxCIDoOwi4rRjsp+nl1UELkkLUAeNypp0kmOffgqvV1XgkR
+Z5cNwyeGa4KLO50YU3TnQ/VQwU1qgIQdynQL00qF3Ry2mxDM0tg=
+=KiHI
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 918e927e84be..978656338546 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 13 Oct 2022 23:39:51 +0000
+Fri, 14 Oct 2022 05:39:52 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b67c03521051..6b8fcc59cb5f 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 d0dbc251dcfb..8fac0399aa84 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.91 b/metadata/md5-cache/app-admin/awscli-1.25.91
new file mode 100644
index 000000000000..67ac31f64362
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.91
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.27.90[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.27.90[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.25.91.tar.gz -> aws-cli-1.25.91.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_=d3e40343c65019dc8ca8907cf3ccfe5a
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index a9aeac0568f0..2426656de186 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/rpm-4.17.1 b/metadata/md5-cache/app-arch/rpm-4.17.1
index c4f116aeba1c..31e9e272ce80 100644
--- a/metadata/md5-cache/app-arch/rpm-4.17.1
+++ b/metadata/md5-cache/app-arch/rpm-4.17.1
@@ -6,7 +6,7 @@ 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
+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 ) )
@@ -14,4 +14,4 @@ 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_=d2bbce1fd4f37e2ca4dd8248e29ad74d
+_md5_=6e3845f739218357787e99fee716393c
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index a603db2a2081..923683c630d6 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/deja-dup-42.8-r1 b/metadata/md5-cache/app-backup/deja-dup-42.8-r2
index f813036b790a..4edd17501892 100644
--- a/metadata/md5-cache/app-backup/deja-dup-42.8-r1
+++ b/metadata/md5-cache/app-backup/deja-dup-42.8-r2
@@ -1,6 +1,6 @@
 BDEPEND=|| ( dev-lang/vala:0.56 ) dev-util/intltool dev-util/itstool sys-devel/gettext virtual/pkgconfig test? ( dev-libs/appstream-glib ) >=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/atk >=app-backup/duplicity-0.7.14 <app-backup/duplicity-1.0.0 >=app-crypt/libsecret-0.18.6[vala] >=dev-libs/glib-2.64:2[dbus] >=dev-libs/json-glib-1.2 dev-libs/libgpg-error >=gui-libs/libhandy-1.0:1 >=net-libs/libsoup-2.48:2.4 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/atk >=app-backup/duplicity-0.7.14 >=app-crypt/libsecret-0.18.6[vala] >=dev-libs/glib-2.64:2[dbus] >=dev-libs/json-glib-1.2 dev-libs/libgpg-error >=gui-libs/libhandy-1.0:1 >=net-libs/libsoup-2.48:2.4 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Simple backup tool using duplicity back-end
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/DejaDup
@@ -8,9 +8,9 @@ INHERIT=meson gnome2-utils vala xdg
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=GPL-3+
-RDEPEND=dev-libs/atk >=app-backup/duplicity-0.7.14 <app-backup/duplicity-1.0.0 >=app-crypt/libsecret-0.18.6[vala] >=dev-libs/glib-2.64:2[dbus] >=dev-libs/json-glib-1.2 dev-libs/libgpg-error >=gui-libs/libhandy-1.0:1 >=net-libs/libsoup-2.48:2.4 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 gnome-base/dconf gnome-base/gvfs[fuse]
+RDEPEND=dev-libs/atk >=app-backup/duplicity-0.7.14 >=app-crypt/libsecret-0.18.6[vala] >=dev-libs/glib-2.64:2[dbus] >=dev-libs/json-glib-1.2 dev-libs/libgpg-error >=gui-libs/libhandy-1.0:1 >=net-libs/libsoup-2.48:2.4 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 gnome-base/dconf gnome-base/gvfs[fuse]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/World/deja-dup/-/archive/42.8/deja-dup-42.8.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=48ace243fbfe0e10c737b0c8644c8aad
+_md5_=a0e2bfe1a79cc77155b1bf3ec77876eb
diff --git a/metadata/md5-cache/app-backup/deja-dup-43.4 b/metadata/md5-cache/app-backup/deja-dup-43.4-r1
index 0be3ddd1aa04..77c3d591d18e 100644
--- a/metadata/md5-cache/app-backup/deja-dup-43.4
+++ b/metadata/md5-cache/app-backup/deja-dup-43.4-r1
@@ -1,6 +1,6 @@
 BDEPEND=|| ( dev-lang/vala:0.56 ) dev-util/intltool dev-util/itstool sys-devel/gettext virtual/pkgconfig test? ( dev-libs/appstream-glib ) >=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=>=gui-libs/libadwaita-1.0:1 >=dev-libs/glib-2.70.0:2 >=dev-libs/libgpg-error-1.33 >=gui-libs/gtk-4.6:4 >=dev-libs/json-glib-1.2 >=dev-libs/glib-2.64:2[dbus] >=app-crypt/libsecret-0.18.6[vala] >=net-libs/libsoup-3.0:3.0 >=app-backup/duplicity-0.8.21 <app-backup/duplicity-1.0.0
+DEPEND=>=gui-libs/libadwaita-1.0:1 >=dev-libs/glib-2.70.0:2 >=dev-libs/libgpg-error-1.33 >=gui-libs/gtk-4.6:4 >=dev-libs/json-glib-1.2 >=dev-libs/glib-2.64:2[dbus] >=app-crypt/libsecret-0.18.6[vala] >=net-libs/libsoup-3.0:3.0 >=app-backup/duplicity-0.8.21
 DESCRIPTION=Simple backup tool using duplicity back-end
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/DejaDup
@@ -9,9 +9,9 @@ INHERIT=meson gnome2-utils vala xdg
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=GPL-3+
-RDEPEND=>=gui-libs/libadwaita-1.0:1 >=dev-libs/glib-2.70.0:2 >=dev-libs/libgpg-error-1.33 >=gui-libs/gtk-4.6:4 >=dev-libs/json-glib-1.2 >=dev-libs/glib-2.64:2[dbus] >=app-crypt/libsecret-0.18.6[vala] >=net-libs/libsoup-3.0:3.0 >=app-backup/duplicity-0.8.21 <app-backup/duplicity-1.0.0 gnome-base/dconf gnome-base/gvfs[fuse]
+RDEPEND=>=gui-libs/libadwaita-1.0:1 >=dev-libs/glib-2.70.0:2 >=dev-libs/libgpg-error-1.33 >=gui-libs/gtk-4.6:4 >=dev-libs/json-glib-1.2 >=dev-libs/glib-2.64:2[dbus] >=app-crypt/libsecret-0.18.6[vala] >=net-libs/libsoup-3.0:3.0 >=app-backup/duplicity-0.8.21 gnome-base/dconf gnome-base/gvfs[fuse]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/World/deja-dup/-/archive/43.4/deja-dup-43.4.tar.bz2
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c13a0e80a46301461997617fdc262849
+_md5_=187dd199575a489f1a67fad97d0ffe07
diff --git a/metadata/md5-cache/app-backup/duplicity-1.0.0 b/metadata/md5-cache/app-backup/duplicity-1.0.0-r1
index df9e746beacd..4119a3de7ffe 100644
--- a/metadata/md5-cache/app-backup/duplicity-1.0.0
+++ b/metadata/md5-cache/app-backup/duplicity-1.0.0-r1
@@ -12,6 +12,6 @@ RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://gitlab.com/duplicity/duplicity/-/archive/rel.1.0.0/duplicity-rel.1.0.0.tar.bz2
+SRC_URI=mirror://pypi/d/duplicity/duplicity-1.0.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=05f98778e9c263d808d29fb3e13f0b49
+_md5_=81ceafc810ee4ff92c4dd573c6fc7099
diff --git a/metadata/md5-cache/app-backup/duplicity-1.0.1 b/metadata/md5-cache/app-backup/duplicity-1.0.1-r1
index 31abb0cebff5..7dc8bff38fa5 100644
--- a/metadata/md5-cache/app-backup/duplicity-1.0.1
+++ b/metadata/md5-cache/app-backup/duplicity-1.0.1-r1
@@ -12,6 +12,6 @@ RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://gitlab.com/duplicity/duplicity/-/archive/rel.1.0.1/duplicity-rel.1.0.1.tar.bz2
+SRC_URI=mirror://pypi/d/duplicity/duplicity-1.0.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=05f98778e9c263d808d29fb3e13f0b49
+_md5_=81ceafc810ee4ff92c4dd573c6fc7099
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index f1e29a9df4a8..f63fe4630930 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/emacs-aio-1.0_p20200610 b/metadata/md5-cache/app-emacs/emacs-aio-1.0_p20200610
new file mode 100644
index 000000000000..ed1ae50a384c
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-aio-1.0_p20200610
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-26.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Async and await functions for Emacs Lisp
+EAPI=8
+HOMEPAGE=https://github.com/skeeto/emacs-aio/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=Unlicense
+RDEPEND=>=app-editors/emacs-26.1:*
+SLOT=0
+SRC_URI=https://github.com/skeeto/emacs-aio/archive/da93523e235529fa97d6f251319d9e1d6fc24a41.tar.gz -> emacs-aio-1.0_p20200610.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=e6b7ced9f38fac4a05e164170e54c0ff
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 19880f9bbca6..282ae06f3e60 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/punes-0.109 b/metadata/md5-cache/app-emulation/punes-0.109
new file mode 100644
index 000000000000..567225acb9b0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/punes-0.109
@@ -0,0 +1,15 @@
+BDEPEND=cg? ( media-gfx/nvidia-cg-toolkit ) dev-qt/linguist-tools:5 dev-util/cmake virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=ffmpeg? ( media-video/ffmpeg:= ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib virtual/glu virtual/opengl
+DESCRIPTION=Nintendo Entertainment System (NES) emulator
+EAPI=8
+HOMEPAGE=https://github.com/punesemu/puNES
+INHERIT=autotools xdg-utils
+IUSE=cg ffmpeg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=ffmpeg? ( media-video/ffmpeg:= ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/punesemu/puNES/archive/v0.109.tar.gz -> punes-0.109.tar.gz https://dev.gentoo.org/~sam/distfiles/app-emulation/punes/punes-0.109_musl.patch.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=01322c4d082144398372c767ccdc51d6
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 4f4a0b96ffe4..34993799184d 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-sh-0.5.0 b/metadata/md5-cache/app-eselect/eselect-sh-0.5.0
new file mode 100644
index 000000000000..77deb26c7739
--- /dev/null
+++ b/metadata/md5-cache/app-eselect/eselect-sh-0.5.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Manages the /bin/sh (POSIX shell) symlink
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-eselect/eselect-lib-bin-symlink
+SLOT=0
+_md5_=e314d84ec4437c15a51257a80e47b0d2
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 5c3a0e6b599e..e59020df7e13 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/calcurse-4.7.1 b/metadata/md5-cache/app-office/calcurse-4.7.1
index 14efc236fdea..a0c77ed68312 100644
--- a/metadata/md5-cache/app-office/calcurse-4.7.1
+++ b/metadata/md5-cache/app-office/calcurse-4.7.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://calcurse.org/
 INHERIT=autotools python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=BSD-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/httplib2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/httplib2[python_targets_python3_10(-)] ) sys-libs/ncurses:0=
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://calcurse.org/files/calcurse-4.7.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ebde72b6ab750c14dc0300cc65a8976c
+_md5_=3983e48af86456b2dd89fa9b69b964c6
diff --git a/metadata/md5-cache/app-office/endeavour-42.0 b/metadata/md5-cache/app-office/endeavour-42.0-r1
index 2c9ae37948f9..9624d972055f 100644
--- a/metadata/md5-cache/app-office/endeavour-42.0
+++ b/metadata/md5-cache/app-office/endeavour-42.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-libs/libxml2:2 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 test
-DEPEND=>=dev-libs/glib-2.58.0:2 >=gui-libs/gtk-3.92.0:4[introspection?] >=gui-libs/libadwaita-1.2.0:1 >=net-libs/gnome-online-accounts-3.25.3:= >=dev-libs/libpeas-1.17 dev-libs/libportal:0=[gtk] >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/rest:0.7 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+DEPEND=>=dev-libs/glib-2.58.0:2 >=gui-libs/gtk-3.92.0:4[introspection?] >=gui-libs/libadwaita-1.2.0:1 >=net-libs/gnome-online-accounts-3.25.3:= >=dev-libs/libpeas-1.17 dev-libs/libportal:0=[gtk] >=gnome-extra/evolution-data-server-3.33.2:=[gtk] introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 DESCRIPTION=Personal task manager
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Todo https://gitlab.gnome.org/World/Endeavour
@@ -9,9 +9,9 @@ INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=+introspection
 KEYWORDS=~amd64
 LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.58.0:2 >=gui-libs/gtk-3.92.0:4[introspection?] >=gui-libs/libadwaita-1.2.0:1 >=net-libs/gnome-online-accounts-3.25.3:= >=dev-libs/libpeas-1.17 dev-libs/libportal:0=[gtk] >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/rest:0.7 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+RDEPEND=>=dev-libs/glib-2.58.0:2 >=gui-libs/gtk-3.92.0:4[introspection?] >=gui-libs/libadwaita-1.2.0:1 >=net-libs/gnome-online-accounts-3.25.3:= >=dev-libs/libpeas-1.17 dev-libs/libportal:0=[gtk] >=gnome-extra/evolution-data-server-3.33.2:=[gtk] introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.gnome.org/World/Endeavour/-/archive/v42.0/Endeavour-v42.0.tar.bz2
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bb5f07e89ad75326ea644fc9807826d7
+_md5_=b446f289691db00d2701c97b9e9e88c1
diff --git a/metadata/md5-cache/app-office/sc-im-0.8.2 b/metadata/md5-cache/app-office/sc-im-0.8.2
index 9c5a5b30d782..7f4244869e7c 100644
--- a/metadata/md5-cache/app-office/sc-im-0.8.2
+++ b/metadata/md5-cache/app-office/sc-im-0.8.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/andmarti1424/sc-im
 INHERIT=lua-single toolchain-funcs flag-o-matic
 IUSE=X plots wayland xls xlsx lua ods tmux lua_single_target_luajit lua_single_target_lua5-1
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=BSD-4
 RDEPEND=sys-libs/ncurses:= lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ods? ( dev-libs/libxml2 dev-libs/libzip ) plots? ( sci-visualization/gnuplot ) tmux? ( app-misc/tmux ) wayland? ( gui-apps/wl-clipboard ) X? ( x11-misc/xclip ) xls? ( dev-libs/libxls ) xlsx? ( dev-libs/libxlsxwriter dev-libs/libxml2 dev-libs/libzip )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) )
 SLOT=0
 SRC_URI=https://github.com/andmarti1424/sc-im/archive/v0.8.2.tar.gz -> sc-im-0.8.2.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e1a2d0938047bfce1d15a76e5b832e19
+_md5_=193e0e7611cdae9d2c4f2cb3aae4883c
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 73e6c7152878..daaa16510bf0 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/gtranslator-42.0 b/metadata/md5-cache/app-text/gtranslator-42.0
new file mode 100644
index 000000000000..6b84f1a677ed
--- /dev/null
+++ b/metadata/md5-cache/app-text/gtranslator-42.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.28 app-text/docbook-xml-dtd:4.1.2 ) dev-util/itstool >=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 test
+DEPEND=>=dev-libs/glib-2.71.3:2 >=x11-libs/gtk+-3.22.20:3 >=gui-libs/libhandy-1.5.0:1 gnome-extra/libgda:5= gnome-base/gsettings-desktop-schemas >=app-text/gspell-1.2.0:= >=x11-libs/gtksourceview-4.0.2:4 >=dev-libs/libxml2-2.4.12:2 net-libs/libsoup:3.0 >=dev-libs/json-glib-1.2.0
+DESCRIPTION=GNOME Translation Editor
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Gtranslator
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=gtk-doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.71.3:2 >=x11-libs/gtk+-3.22.20:3 >=gui-libs/libhandy-1.5.0:1 gnome-extra/libgda:5= gnome-base/gsettings-desktop-schemas >=app-text/gspell-1.2.0:= >=x11-libs/gtksourceview-4.0.2:4 >=dev-libs/libxml2-2.4.12:2 net-libs/libsoup:3.0 >=dev-libs/json-glib-1.2.0
+SLOT=0
+SRC_URI=mirror://gnome/sources/gtranslator/42/gtranslator-42.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7f3494f5ad7d0e93b3d67a6d3310fe09
diff --git a/metadata/md5-cache/app-text/hunspell-1.7.1 b/metadata/md5-cache/app-text/hunspell-1.7.1
index cd32163572bb..3d95a92c72fe 100644
--- a/metadata/md5-cache/app-text/hunspell-1.7.1
+++ b/metadata/md5-cache/app-text/hunspell-1.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://hunspell.github.io/
 INHERIT=autotools flag-o-matic
 IUSE=ncurses nls readline static-libs l10n_af l10n_bg l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_kk l10n_km l10n_ku l10n_lt l10n_lv l10n_mi l10n_mk l10n_ms l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sv l10n_sw l10n_tn l10n_uk l10n_zu
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MPL-1.1 GPL-2 LGPL-2.1
 PDEPEND=l10n_af? ( app-dicts/myspell-af ) l10n_bg? ( app-dicts/myspell-bg ) l10n_ca? ( app-dicts/myspell-ca ) l10n_cs? ( app-dicts/myspell-cs ) l10n_cy? ( app-dicts/myspell-cy ) l10n_da? ( app-dicts/myspell-da ) l10n_de? ( app-dicts/myspell-de ) l10n_de-1901? ( app-dicts/myspell-de_1901 ) l10n_el? ( app-dicts/myspell-el ) l10n_en? ( app-dicts/myspell-en ) l10n_eo? ( app-dicts/myspell-eo ) l10n_es? ( app-dicts/myspell-es ) l10n_et? ( app-dicts/myspell-et ) l10n_fo? ( app-dicts/myspell-fo ) l10n_fr? ( app-dicts/myspell-fr ) l10n_ga? ( app-dicts/myspell-ga ) l10n_gl? ( app-dicts/myspell-gl ) l10n_he? ( app-dicts/myspell-he ) l10n_hr? ( app-dicts/myspell-hr ) l10n_hu? ( app-dicts/myspell-hu ) l10n_ia? ( app-dicts/myspell-ia ) l10n_id? ( app-dicts/myspell-id ) l10n_is? ( app-dicts/myspell-is ) l10n_it? ( app-dicts/myspell-it ) l10n_kk? ( app-dicts/myspell-kk ) l10n_km? ( app-dicts/myspell-km ) l10n_ku? ( app-dicts/myspell-ku ) l10n_lt? ( app-dicts/myspell-lt ) l10n_lv? ( app-dicts/myspell-lv ) l10n_mi? ( app-dicts/myspell-mi ) l10n_mk? ( app-dicts/myspell-mk ) l10n_ms? ( app-dicts/myspell-ms ) l10n_nb? ( app-dicts/myspell-nb ) l10n_nl? ( app-dicts/myspell-nl ) l10n_nn? ( app-dicts/myspell-nn ) l10n_pl? ( app-dicts/myspell-pl ) l10n_pt? ( app-dicts/myspell-pt ) l10n_pt-BR? ( app-dicts/myspell-pt-br ) l10n_ro? ( app-dicts/myspell-ro ) l10n_ru? ( app-dicts/myspell-ru ) l10n_sk? ( app-dicts/myspell-sk ) l10n_sl? ( app-dicts/myspell-sl ) l10n_sq? ( app-dicts/myspell-sq ) l10n_sv? ( app-dicts/myspell-sv ) l10n_sw? ( app-dicts/myspell-sw ) l10n_tn? ( app-dicts/myspell-tn ) l10n_uk? ( app-dicts/myspell-uk ) l10n_zu? ( app-dicts/myspell-zu )
 RDEPEND=ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= )
 SLOT=0/1.7
 SRC_URI=https://github.com/hunspell/hunspell/releases/download/v1.7.1/hunspell-1.7.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=67bef30177dde49f8310a7e3cf24fc44
+_md5_=b35c141596645a89b0e7450e866a7a42
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 25d21953d816..f65cc72044e5 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/rqlite-7.7.1 b/metadata/md5-cache/dev-db/rqlite-7.7.1
new file mode 100644
index 000000000000..250a7cbe1abe
--- /dev/null
+++ b/metadata/md5-cache/dev-db/rqlite-7.7.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install test unpack
+DESCRIPTION=Replicated SQLite using the Raft consensus protocol
+EAPI=7
+HOMEPAGE=https://github.com/rqlite/rqlite https://www.philipotoole.com/tag/rqlite/
+INHERIT=go-module
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT Apache-2.0 BSD CC0-1.0 MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/rqlite/rqlite/archive/v7.7.1.tar.gz -> rqlite-7.7.1.tar.gz https://dev.gentoo.org/~zmedico/dist/rqlite-7.7.0-deps.tar.xz
+_eclasses_=go-module	b088539f282ed242c23f38fa65472184
+_md5_=600a3311ac813656daf81e394d0c4cff
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index c70c4910e2b8..36a214d607fc 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/javassist-3.29.1 b/metadata/md5-cache/dev-java/javassist-3.29.1
index ea3c045607a7..7ab3147e7eb4 100644
--- a/metadata/md5-cache/dev-java/javassist-3.29.1
+++ b/metadata/md5-cache/dev-java/javassist-3.29.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.javassist.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_29_1_ga.tar.gz -> javassist-3.29.1.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=f17691849cad1c11c801cde2a264f1cc
+_md5_=54ffedfa8f37a106251f265a1bd382dd
diff --git a/metadata/md5-cache/dev-java/reload4j-1.2.22 b/metadata/md5-cache/dev-java/reload4j-1.2.22
index 7ccd9db1a1de..125eb3687e25 100644
--- a/metadata/md5-cache/dev-java/reload4j-1.2.22
+++ b/metadata/md5-cache/dev-java/reload4j-1.2.22
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://reload4j.qos.ch
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/javax-mail:0 dev-java/jboss-jms-api:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/reload4j/archive/v_1.2.22.tar.gz -> reload4j-1.2.22.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=169b983c08461ebd8dd7b5a64dac493b
+_md5_=572d7af953e14efc9341fbc5d1f13d34
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-2.0.3 b/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
index 1f88a0cb3960..d4bfdf7ebeb0 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-ext-2.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.slf4j.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/cal10n:0 dev-java/javassist:3 ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=2c6c59e22997a7589a9cbb61579cc371
+_md5_=064eef513ab8da700ea4254f64696b17
diff --git a/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3 b/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
index 655ccd08aff8..3d221dc16374 100644
--- a/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
+++ b/metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.slf4j.org
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* dev-java/reload4j:0 ~dev-java/slf4j-api-2.0.3:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qos-ch/slf4j/archive/v_2.0.3.tar.gz -> slf4j-2.0.3.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=2d3a296930cc30bafb608b94be1f4b45
+_md5_=d35b7687926ecf3c692e53b85b8f4d3a
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 3f34b8ef91a2..8406bf1f50b1 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/apr-1.7.0-r5 b/metadata/md5-cache/dev-libs/apr-1.7.0-r5
index d0cf55c3c3a6..0619300e3052 100644
--- a/metadata/md5-cache/dev-libs/apr-1.7.0-r5
+++ b/metadata/md5-cache/dev-libs/apr-1.7.0-r5
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://apr.apache.org/
 INHERIT=autotools libtool toolchain-funcs
 IUSE=doc older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) selinux? ( sec-policy/selinux-base-policy )
 SLOT=1/1.7
 SRC_URI=mirror://apache/apr/apr-1.7.0.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d22147283a3ec095051a441f1ee0fcf3
+_md5_=f5392ff55f84eaacc8eafda5e47428b7
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r9 b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r9
index 5f154fc54333..cc50af0f7bf8 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r9
+++ b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r9
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://apr.apache.org/
 INHERIT=autotools db-use libtool multilib toolchain-funcs
 IUSE=berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~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
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.6.2:1= dev-libs/expat virtual/libcrypt:= berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( net-nds/openldap:= ) mysql? ( || ( dev-db/mariadb-connector-c >=dev-db/mysql-connector-c-8 ) ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.6.1.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	db-use	867a9246a45efc09934e0f8e3380c813	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=00a4369e4de08cb03567194f8e05b775
+_md5_=e3f3b0fee8a9539a94090b50fc00ec31
diff --git a/metadata/md5-cache/dev-libs/libxls-1.6.2 b/metadata/md5-cache/dev-libs/libxls-1.6.2
index b73d5e64f8b3..e0d2e9072866 100644
--- a/metadata/md5-cache/dev-libs/libxls-1.6.2
+++ b/metadata/md5-cache/dev-libs/libxls-1.6.2
@@ -3,8 +3,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=A library which can read Excel (xls) files
 EAPI=7
 HOMEPAGE=https://github.com/libxls/libxls
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD-2
 SLOT=0/8
 SRC_URI=https://github.com/libxls/libxls/releases/download/v1.6.2/libxls-1.6.2.tar.gz
-_md5_=a477f2e5e6f2997ad522f152048f1da8
+_md5_=583b57c8a7cf7536d52fa2af0fecab7a
diff --git a/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4-r1 b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4-r1
index c0a2fb1c6c9a..5a985a71b543 100644
--- a/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4-r1
+++ b/metadata/md5-cache/dev-libs/libxlsxwriter-1.1.4-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://libxlsxwriter.github.io/
 INHERIT=cmake plocale
 IUSE=openssl
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib[minizip] openssl? ( dev-libs/openssl:= )
 SLOT=0
 SRC_URI=https://github.com/jmcnamara/libxlsxwriter/archive/RELEASE_1.1.4.tar.gz -> libxlsxwriter-1.1.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5b231797a12f30ccd2aa24844f0bc1d9
+_md5_=f92e36fc4cfac37397d50c793705e587
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 2d40331ef592..9afd9369ac69 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/SaltTesting-2018.9.21 b/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
deleted file mode 100644
index 4c9d11639b61..000000000000
--- a/metadata/md5-cache/dev-python/SaltTesting-2018.9.21
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Required testing tools needed in the several Salt Stack projects
-EAPI=7
-HOMEPAGE=https://saltstack.com/community/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/psutil[python_targets_python3_8(-)?] >=dev-python/requests-2.4.2[python_targets_python3_8(-)?] dev-python/six[python_targets_python3_8(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 )
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/saltstack/salt-testing/archive/v2018.9.21.tar.gz -> SaltTesting-2018.9.21.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d506e9c9de8555050f13b116d2946aaa
diff --git a/metadata/md5-cache/dev-python/absl-py-1.3.0 b/metadata/md5-cache/dev-python/absl-py-1.3.0
new file mode 100644
index 000000000000..7a8b781a749b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/absl-py-1.3.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) 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=Abseil Python Common Libraries
+EAPI=8
+HOMEPAGE=https://github.com/abseil/abseil-py/ https://pypi.org/project/absl-py/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/abseil/abseil-py/archive/v1.3.0.tar.gz -> abseil-py-1.3.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_=741ef31f04b98d62953fe3bb5ea225f3
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.90 b/metadata/md5-cache/dev-python/boto3-1.24.90
new file mode 100644
index 000000000000..fadec71f702a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.90
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.90[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.27.90[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.24.90.tar.gz -> boto3-1.24.90.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.27.90 b/metadata/md5-cache/dev-python/botocore-1.27.90
new file mode 100644
index 000000000000..2b00944191c1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.90
@@ -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.27.90.tar.gz -> botocore-1.27.90.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/hvac-1.0.2 b/metadata/md5-cache/dev-python/hvac-1.0.2
index 54348a0ddb22..461a741e19d2 100644
--- a/metadata/md5-cache/dev-python/hvac-1.0.2
+++ b/metadata/md5-cache/dev-python/hvac-1.0.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/hvac/hvac
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pyhcl-0.4.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.24.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hvac/hvac/archive/v1.0.2.tar.gz -> hvac-1.0.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_=d78dec580083791e5951961ae49621fc
+_md5_=2f5502a48d45ed6185b33aca0be2e600
diff --git a/metadata/md5-cache/dev-python/pybtex-0.24.0 b/metadata/md5-cache/dev-python/pybtex-0.24.0
index 4cf6d340fc62..5a50208e8b0a 100644
--- a/metadata/md5-cache/dev-python/pybtex-0.24.0
+++ b/metadata/md5-cache/dev-python/pybtex-0.24.0
@@ -11,6 +11,6 @@ RDEPEND=dev-python/latexcodec[python_targets_python3_8(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/p/pybtex/pybtex-0.24.0.tar.gz
+SRC_URI=mirror://pypi/p/pybtex/pybtex-0.24.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=64cf84796217f8d9a57522941be95d56
+_md5_=6478656b1702836569fe28fafd9c2a01
diff --git a/metadata/md5-cache/dev-python/pyhcl-0.4.4 b/metadata/md5-cache/dev-python/pyhcl-0.4.4
index 6940a731459e..4a9528e3c3e3 100644
--- a/metadata/md5-cache/dev-python/pyhcl-0.4.4
+++ b/metadata/md5-cache/dev-python/pyhcl-0.4.4
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/virtuald/pyhcl
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=MPL-2.0
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/virtuald/pyhcl/archive/0.4.4.tar.gz -> pyhcl-0.4.4.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=48b04ba8485fee4a8a8c01edba45f337
+_md5_=1cfd9418f61b5b9057971742ecfd1084
diff --git a/metadata/md5-cache/dev-python/pyotp-2.7.0 b/metadata/md5-cache/dev-python/pyotp-2.7.0
index c36e013c3d53..953c4f1e8d5c 100644
--- a/metadata/md5-cache/dev-python/pyotp-2.7.0
+++ b/metadata/md5-cache/dev-python/pyotp-2.7.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pyauth/pyotp https://pypi.org/project/pyotp/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyotp/pyotp-2.7.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d727c3cc9790095173551ac354277283
+_md5_=5f7948f8a79345af88e4bdc208c87a05
diff --git a/metadata/md5-cache/dev-python/pytest-httpserver-1.0.6 b/metadata/md5-cache/dev-python/pytest-httpserver-1.0.6
index 02bc94ab1308..2f4bfc834bb4 100644
--- a/metadata/md5-cache/dev-python/pytest-httpserver-1.0.6
+++ b/metadata/md5-cache/dev-python/pytest-httpserver-1.0.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/csernazs/pytest-httpserver/ https://pypi.org/project/pytest-httpserver/
 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 ~ia64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/csernazs/pytest-httpserver/archive/1.0.6.tar.gz -> pytest-httpserver-1.0.6.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3ab7ddebe7536facc0e73f8aeb055743
+_md5_=1de47c12b74db342415e08b9702f8d08
diff --git a/metadata/md5-cache/dev-python/pytest-pylint-0.18.0 b/metadata/md5-cache/dev-python/pytest-pylint-0.18.0
deleted file mode 100644
index e3d9d330d2a2..000000000000
--- a/metadata/md5-cache/dev-python/pytest-pylint-0.18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pylint-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=pytest plugin to check source code with pylint
-EAPI=8
-HOMEPAGE=https://github.com/carsongee/pytest-pylint
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/pylint-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/carsongee/pytest-pylint/archive/v0.18.0.tar.gz -> pytest-pylint-0.18.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ea3547c5d9ab493de2acca84983e6245
diff --git a/metadata/md5-cache/dev-python/pytest-twisted-1.13.4-r1 b/metadata/md5-cache/dev-python/pytest-twisted-1.13.4-r1
index 417119b09650..6d9f43a4bde1 100644
--- a/metadata/md5-cache/dev-python/pytest-twisted-1.13.4-r1
+++ b/metadata/md5-cache/dev-python/pytest-twisted-1.13.4-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pytest-dev/pytest-twisted
 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 ~ppc ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~riscv ~x86
 LICENSE=BSD
 RDEPEND=dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/greenlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-twisted/archive/v1.13.4.tar.gz -> pytest-twisted-1.13.4.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5b2557cc9c59ac3d612d861a1cb92d3e
+_md5_=4a9d56f10e3511a4bf6920774523eeb3
diff --git a/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1 b/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
deleted file mode 100644
index c3bd4678ac6e..000000000000
--- a/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/dnspython[python_targets_python3_8(-)?] >=dev-python/pyopenssl-0.14[python_targets_python3_8(-)?] >=dev-python/urllib3-1.7.1[python_targets_python3_8(-)?] test? ( dev-db/etcd dev-python/mock[python_targets_python3_8(-)?] dev-python/nose[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?]
-DESCRIPTION=A python client for etcd
-EAPI=6
-HOMEPAGE=https://github.com/jplana/python-etcd/ https://pypi.org/project/python-etcd/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/dnspython[python_targets_python3_8(-)?] >=dev-python/pyopenssl-0.14[python_targets_python3_8(-)?] >=dev-python/urllib3-1.7.1[python_targets_python3_8(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 )
-REQUIRED_USE=|| ( python_targets_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/python-etcd/python-etcd-0.4.5.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5a921f27d4dc96a81553b75d989eaf9f
diff --git a/metadata/md5-cache/dev-python/responses-0.22.0 b/metadata/md5-cache/dev-python/responses-0.22.0
index 2f887bed0638..d76c7641febc 100644
--- a/metadata/md5-cache/dev-python/responses-0.22.0
+++ b/metadata/md5-cache/dev-python/responses-0.22.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/responses/ https://github.com/getsentry/responses/
 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 ~ia64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/requests-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.22.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getsentry/responses/archive/0.22.0.tar.gz -> responses-0.22.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_=414853a8cfeb1e3bfeb79353ab403362
+_md5_=45fd383034e51eb20035499db654ecac
diff --git a/metadata/md5-cache/dev-python/trimesh-3.15.5 b/metadata/md5-cache/dev-python/trimesh-3.15.5
new file mode 100644
index 000000000000..1711b238b052
--- /dev/null
+++ b/metadata/md5-cache/dev-python/trimesh-3.15.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-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 postinst prepare test
+DESCRIPTION=Python library for loading and using triangular meshes
+EAPI=8
+HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mikedh/trimesh/archive/3.15.5.tar.gz -> trimesh-3.15.5.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=838f01dcebb4615d2db7ea9115b9431e
diff --git a/metadata/md5-cache/dev-python/xarray-2022.10.0 b/metadata/md5-cache/dev-python/xarray-2022.10.0
new file mode 100644
index 000000000000..1a071f69af05
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xarray-2022.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/bottleneck[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( >=dev-python/scipy-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( >=dev-python/numpy-1.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-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
+DESCRIPTION=N-D labeled arrays and datasets in Python
+EAPI=8
+HOMEPAGE=https://xarray.pydata.org/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/numpy-1.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/x/xarray/xarray-2022.10.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=dcd42db327e5f3c747509ad36650cd83
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 679f6322a079..913a0143eeeb 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/byacc-20220128 b/metadata/md5-cache/dev-util/byacc-20220128
deleted file mode 100644
index a35802b8d993..000000000000
--- a/metadata/md5-cache/dev-util/byacc-20220128
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=The best variant of the Yacc parser generator
-EAPI=7
-HOMEPAGE=https://invisible-island.net/byacc/byacc.html
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=public-domain
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/byacc/byacc-20220128.tgz
-_md5_=0a4cb93961c9a64b57739bee0090650c
diff --git a/metadata/md5-cache/dev-util/byacc-20220128-r1 b/metadata/md5-cache/dev-util/byacc-20220128-r1
new file mode 100644
index 000000000000..66a6b72cfbee
--- /dev/null
+++ b/metadata/md5-cache/dev-util/byacc-20220128-r1
@@ -0,0 +1,13 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure unpack
+DESCRIPTION=The best variant of the Yacc parser generator
+EAPI=8
+HOMEPAGE=https://invisible-island.net/byacc/byacc.html
+INHERIT=verify-sig
+IUSE=verify-sig
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://invisible-island.net/archives/byacc/byacc-20220128.tgz verify-sig? ( https://invisible-island.net/archives/byacc/byacc-20220128.tgz.asc )
+_eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=e94ad7d8978f6f3436fdf1144126cd9a
diff --git a/metadata/md5-cache/dev-util/cproto-4.7t b/metadata/md5-cache/dev-util/cproto-4.7t
deleted file mode 100644
index 63625a02a448..000000000000
--- a/metadata/md5-cache/dev-util/cproto-4.7t
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=sys-devel/flex virtual/yacc
-DESCRIPTION=Generate C function prototypes from C source code
-EAPI=7
-HOMEPAGE=https://invisible-island.net/cproto/
-KEYWORDS=~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=public-domain
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/cproto/cproto-4.7t.tgz
-_md5_=2382dc9a9d9e5e3fdded3a5e3648f5e3
diff --git a/metadata/md5-cache/dev-util/cproto-4.7t-r1 b/metadata/md5-cache/dev-util/cproto-4.7t-r1
new file mode 100644
index 000000000000..6eaeb08fc66e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cproto-4.7t-r1
@@ -0,0 +1,14 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=unpack
+DEPEND=sys-devel/flex virtual/yacc
+DESCRIPTION=Generate C function prototypes from C source code
+EAPI=8
+HOMEPAGE=https://invisible-island.net/cproto/
+INHERIT=verify-sig
+IUSE=verify-sig
+KEYWORDS=~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://invisible-island.net/archives/cproto/cproto-4.7t.tgz verify-sig? ( https://invisible-island.net/archives/cproto/cproto-4.7t.tgz.asc )
+_eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=ade5983b23d86eca3a0587283d0bcb31
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20220728 b/metadata/md5-cache/dev-util/dialog-1.3.20220728
index 8566593105e6..9018ea955890 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20220728
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20220728
@@ -1,13 +1,15 @@
-BDEPEND=!minimal? ( sys-devel/libtool ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
+BDEPEND=virtual/pkgconfig !minimal? ( sys-devel/libtool ) verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install prepare unpack
 DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?] nls? ( sys-devel/gettext )
 DESCRIPTION=Tool to display dialog boxes from a shell
 EAPI=8
 HOMEPAGE=https://invisible-island.net/dialog/
-IUSE=examples minimal nls unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+INHERIT=verify-sig
+IUSE=examples minimal nls unicode verify-sig
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
 SLOT=0/15
-SRC_URI=https://invisible-island.net/archives/dialog/dialog-1.3-20220728.tgz
-_md5_=2be988480b1ad9f1fd68eca1cef12abf
+SRC_URI=https://invisible-island.net/archives/dialog/dialog-1.3-20220728.tgz verify-sig? ( https://invisible-island.net/archives/dialog/dialog-1.3-20220728.tgz.asc )
+_eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=083d9bcca20952265bcea6ab41b08fb7
diff --git a/metadata/md5-cache/dev-util/pkgdev-9999 b/metadata/md5-cache/dev-util/pkgdev-9999
index c6c057547889..2aa178d14e7f 100644
--- a/metadata/md5-cache/dev-util/pkgdev-9999
+++ b/metadata/md5-cache/dev-util/pkgdev-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f7adb0410d7f7953f6bab7d5d943514d
+_md5_=6f0fd69bfa2510ffeab54ad3f6e70895
diff --git a/metadata/md5-cache/dev-util/umockdev-0.17.13 b/metadata/md5-cache/dev-util/umockdev-0.17.13
index bd884c1a591f..0dd192b0e0bf 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.17.13
+++ b/metadata/md5-cache/dev-util/umockdev-0.17.13
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinpitt/umockdev/releases/download/0.17.13/umockdev-0.17.13.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61
-_md5_=e2d83307dd6cf06c2068d5c3aeb37de4
+_md5_=10273d414de343e15cd73e1133a8b103
diff --git a/metadata/md5-cache/dev-util/umockdev-9999 b/metadata/md5-cache/dev-util/umockdev-9999
index 43d7453fb1a0..3ad910131e73 100644
--- a/metadata/md5-cache/dev-util/umockdev-9999
+++ b/metadata/md5-cache/dev-util/umockdev-9999
@@ -1,6 +1,6 @@
 BDEPEND=|| ( dev-lang/vala:0.56 ) app-arch/xz-utils virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gobject-introspection-1.32:= test? ( || ( >=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-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gobject-introspection-1.32:= test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-libs/libgudev:=[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=Mock hardware devices for creating unit tests
 EAPI=8
 HOMEPAGE=https://github.com/martinpitt/umockdev/
@@ -12,4 +12,4 @@ RDEPEND=net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61
-_md5_=5e07a329bbe24dd4ce0e168e361aef27
+_md5_=582c52c4d96ab4a0c7f08a2335bba330
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 1f07cba01ad2..97bcff05d4f8 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/bsd-games-3.2 b/metadata/md5-cache/games-misc/bsd-games-3.2
index 44557451e6c4..c4d9184d033b 100644
--- a/metadata/md5-cache/games-misc/bsd-games-3.2
+++ b/metadata/md5-cache/games-misc/bsd-games-3.2
@@ -5,11 +5,11 @@ DESCRIPTION=collection of games from NetBSD
 EAPI=8
 HOMEPAGE=https://www.polyomino.org.uk/computer/software/bsd-games/
 INHERIT=toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~riscv ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~mips ~riscv ~x86
 LICENSE=BSD
 RDEPEND=sys-apps/miscfiles sys-libs/ncurses:=[unicode(+)] !games-puzzle/hangman !games-misc/wumpus acct-group/gamestat
 RESTRICT=test
 SLOT=0/3
 SRC_URI=https://github.com/msharov/bsd-games/archive/refs/tags/v3.2.tar.gz -> bsd-games-3.2.tar.gz https://dev.gentoo.org/~sam/distfiles/games-misc/bsd-games/bsd-games-3.1-verbose-build.patch.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=cd4759a8d995e98d5ad194e7b0be876c
+_md5_=506750565c9340e9bd4f24342966c55e
diff --git a/metadata/md5-cache/games-misc/bsod-0.1-r1 b/metadata/md5-cache/games-misc/bsod-0.1-r1
index cccddbf1543c..efc71b507efe 100644
--- a/metadata/md5-cache/games-misc/bsod-0.1-r1
+++ b/metadata/md5-cache/games-misc/bsod-0.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=This program will let you experience the authentic Microsoft Windows
 EAPI=7
 HOMEPAGE=http://www.vanheusden.com/bsod/
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.vanheusden.com/bsod/bsod-0.1.tgz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9745b26239b4fff2ae05c9aa647a172b
+_md5_=20507053988c32247519d4f5965ddb50
diff --git a/metadata/md5-cache/games-mud/Manifest.gz b/metadata/md5-cache/games-mud/Manifest.gz
index 3c2a1c8ea54e..4d4954e5d0ad 100644
--- a/metadata/md5-cache/games-mud/Manifest.gz
+++ b/metadata/md5-cache/games-mud/Manifest.gz
diff --git a/metadata/md5-cache/games-mud/tf-5.0_beta8_p8-r1 b/metadata/md5-cache/games-mud/tf-5.0_beta8_p8-r1
index 614c7b88a06b..5121db0d939b 100644
--- a/metadata/md5-cache/games-mud/tf-5.0_beta8_p8-r1
+++ b/metadata/md5-cache/games-mud/tf-5.0_beta8_p8-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A small, flexible, screen-oriented MUD client (aka TinyFugue)
 EAPI=7
 HOMEPAGE=http://tinyfugue.sourceforge.net/
 IUSE=+atcp doc +gmcp ipv6 +option102 ssl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre sys-libs/ncurses:= ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/tinyfugue/tf-50b8.tar.gz mirror://debian/pool/main/t/tf5/tf5_5.0beta8-8.debian.tar.xz http://homepage.mac.com/mikeride/abelinc/scripts/allrootpatch.txt -> tf-allrootpatch.txt http://homepage.mac.com/mikeride/abelinc/scripts/allsrcpatch.txt -> tf-allsrcpatch.txt doc? ( mirror://sourceforge/tinyfugue/tf-50b8-help.tar.gz )
-_md5_=8844fab3832e36cce4335b56c64e0feb
+_md5_=01db76f7853d7211aa79368bd11da371
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 23f534f52e65..b0366b4474c8 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/dconf-editor-43.0 b/metadata/md5-cache/gnome-base/dconf-editor-43.0
index c796585922f8..7b6b5293bba7 100644
--- a/metadata/md5-cache/gnome-base/dconf-editor-43.0
+++ b/metadata/md5-cache/gnome-base/dconf-editor-43.0
@@ -1,6 +1,6 @@
 BDEPEND=|| ( dev-lang/vala:0.56 ) dev-libs/libxml2:2 >=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=>=gnome-base/dconf-0.26.1 >=dev-libs/glib-2.55.1:2 >=x11-libs/gtk+-3.22.27:3 >=gui-libs/libhandy-1.6.0:1
+DEPEND=>=gnome-base/dconf-0.26.1 >=dev-libs/glib-2.55.1:2 >=x11-libs/gtk+-3.22.27:3 >=gui-libs/libhandy-1.6.0:1[vala]
 DESCRIPTION=Graphical tool for editing the dconf configuration database
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/dconf-editor
@@ -8,8 +8,8 @@ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome.org gnome2-utils meson vala xdg
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux
 LICENSE=GPL-3+
-RDEPEND=>=gnome-base/dconf-0.26.1 >=dev-libs/glib-2.55.1:2 >=x11-libs/gtk+-3.22.27:3 >=gui-libs/libhandy-1.6.0:1
+RDEPEND=>=gnome-base/dconf-0.26.1 >=dev-libs/glib-2.55.1:2 >=x11-libs/gtk+-3.22.27:3 >=gui-libs/libhandy-1.6.0:1[vala]
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf-editor/43/dconf-editor-43.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5569800acc41b8bcf93b696f3b78ec15
+_md5_=497087c5d94efbd8eb062adb6eeba054
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index de2833915dd3..ce8b3eda9bb1 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.46.0 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.46.0-r1
index 463052e90698..803379c7751f 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.46.0
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.46.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=net-libs/libsoup-3.1.1:3.0 >=dev-libs/json-glib-1.0.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=x11-libs/gtk+-3.20:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=net-libs/webkit-gtk-2.34.0:4.1 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-4.2.0:4= ) vala? ( || ( dev-lang/vala:0.56 ) >=net-libs/libsoup-3.1.1:3.0[vala] dev-libs/libical[vala] )
+DEPEND=>=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=net-libs/libsoup-3.1.1:3.0 >=dev-libs/json-glib-1.0.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=x11-libs/gtk+-3.20:3 >=gui-libs/gtk-4.4:4 >=media-libs/libcanberra-0.25[gtk3] oauth? ( >=net-libs/webkit-gtk-2.34.0:4.1 >=net-libs/webkit-gtk-2.36.0:5 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-4.2.0:4= ) vala? ( || ( dev-lang/vala:0.56 ) >=net-libs/libsoup-3.1.1:3.0[vala] dev-libs/libical[vala] )
 DESCRIPTION=Evolution groupware backend
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-data-server
@@ -9,10 +9,10 @@ INHERIT=cmake db-use flag-o-matic gnome2 vala virtualx
 IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth vala +weather test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
-RDEPEND=>=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=net-libs/libsoup-3.1.1:3.0 >=dev-libs/json-glib-1.0.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=x11-libs/gtk+-3.20:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=net-libs/webkit-gtk-2.34.0:4.1 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-4.2.0:4= )
-REQUIRED_USE=vala? ( introspection )
+RDEPEND=>=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=net-libs/libsoup-3.1.1:3.0 >=dev-libs/json-glib-1.0.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=x11-libs/gtk+-3.20:3 >=gui-libs/gtk-4.4:4 >=media-libs/libcanberra-0.25[gtk3] oauth? ( >=net-libs/webkit-gtk-2.34.0:4.1 >=net-libs/webkit-gtk-2.36.0:5 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-4.2.0:4= )
+REQUIRED_USE=oauth? ( gtk ) vala? ( introspection )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0/63-26-20
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.46/evolution-data-server-3.46.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	db-use	867a9246a45efc09934e0f8e3380c813	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2a07bebdbdd740f01955e8e14c1a3bb4
+_md5_=c2f6a28fdcd7df8bfa6189d3e0bd0e20
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-43.0 b/metadata/md5-cache/gnome-extra/gnome-calendar-43.0
new file mode 100644
index 000000000000..1529517df3c4
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-43.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/gdbus-codegen 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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.45.1:=[gtk] net-libs/libsoup:3.0 >=gui-libs/libadwaita-1.2:1 >=dev-libs/glib-2.67.5:2 >=gui-libs/gtk-4.6.0:4 >=dev-libs/libgweather-4.2.0:4= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.26.3:2
+DESCRIPTION=Manage your online calendars with simple and modern interface
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson virtualx xdg
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.45.1:=[gtk] net-libs/libsoup:3.0 >=gui-libs/libadwaita-1.2:1 >=dev-libs/glib-2.67.5:2 >=gui-libs/gtk-4.6.0:4 >=dev-libs/libgweather-4.2.0:4= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.26.3:2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-calendar/43/gnome-calendar-43.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=43bb1757c5c0dc8abda9467a7c2423a5
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 858a885dee21..0e24f704e444 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.1-r1 b/metadata/md5-cache/gui-libs/gtk-4.8.1-r1
index 48327c5387e7..4b51d9edc708 100644
--- a/metadata/md5-cache/gui-libs/gtk-4.8.1-r1
+++ b/metadata/md5-cache/gui-libs/gtk-4.8.1-r1
@@ -16,4 +16,4 @@ RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://gnome/sources/gtk/4.8/gtk-4.8.1.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_=b67a8131cb38501a5d67e763c87652bc
+_md5_=fed0bb30e4541ea14f4d389f24edd403
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 4f6acd6cdc8f..f373ec60aaea 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/gphoto2-2.5.28 b/metadata/md5-cache/media-gfx/gphoto2-2.5.28
index cdb69835f489..595873bc0fd8 100644
--- a/metadata/md5-cache/media-gfx/gphoto2-2.5.28
+++ b/metadata/md5-cache/media-gfx/gphoto2-2.5.28
@@ -10,6 +10,6 @@ KEYWORDS=~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.6.1 >=media-libs/libexif-0.6.9 >=media-libs/libgphoto2-2.5.17:=[exif] aalib? ( media-libs/aalib virtual/jpeg:0 ) ncurses? ( dev-libs/cdk:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
-SRC_URI=mirror://sourceforge/gphoto/gphoto2-2.5.28.tar.bz2
+SRC_URI=mirror://sourceforge/gphoto/gphoto2-2.5.28.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dc38bd10129ca23568d994fb677f771e
+_md5_=87ca5bdc64cc68bfde163b556fc8d4a1
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index e3b5db542e67..7333ce39a3d0 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/tremor-0_pre20130223-r3 b/metadata/md5-cache/media-libs/tremor-0_pre20130223-r3
new file mode 100644
index 000000000000..3e84a7e17dae
--- /dev/null
+++ b/metadata/md5-cache/media-libs/tremor-0_pre20130223-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig 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 prepare test
+DEPEND=>=media-libs/libogg-1.3.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(-)?]
+DESCRIPTION=A fixed-point version of the Ogg Vorbis decoder (also known as libvorbisidec)
+EAPI=8
+HOMEPAGE=https://wiki.xiph.org/Tremor
+INHERIT=autotools multilib-minimal
+IUSE=low-accuracy 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=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=media-libs/libogg-1.3.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(-)?]
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ssuominen/tremor-0_pre20130223.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=89e80567613a3b26b95ab9db77ba02af
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 9e75fbe17895..bbc3a43e8a5b 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/tcmplex-panteltje-0.4.7-r1 b/metadata/md5-cache/media-video/tcmplex-panteltje-0.4.7-r1
deleted file mode 100644
index ed0588667db0..000000000000
--- a/metadata/md5-cache/media-video/tcmplex-panteltje-0.4.7-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Audio video multiplexer for 8 audio channels
-EAPI=6
-HOMEPAGE=http://panteltje.com/panteltje/dvd/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://panteltje.com/panteltje/dvd/tcmplex-panteltje-0.4.7.tgz
-_md5_=b62238bdc2924474c269cc5e4812d0e2
diff --git a/metadata/md5-cache/media-video/tcmplex-panteltje-0.4.7-r2 b/metadata/md5-cache/media-video/tcmplex-panteltje-0.4.7-r2
new file mode 100644
index 000000000000..56908430d787
--- /dev/null
+++ b/metadata/md5-cache/media-video/tcmplex-panteltje-0.4.7-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Audio video multiplexer for 8 audio channels
+EAPI=8
+HOMEPAGE=http://panteltje.com/panteltje/dvd/
+INHERIT=flag-o-matic toolchain-funcs
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=http://panteltje.com/panteltje/dvd/tcmplex-panteltje-0.4.7.tgz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a356faaaa2d3032252039dfb6dfd00dc
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 9a0ca6eb9cca..93425764ad02 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/flent-1.3.2 b/metadata/md5-cache/net-analyzer/flent-1.3.2
deleted file mode 100644
index ab90b8128de0..000000000000
--- a/metadata/md5-cache/net-analyzer/flent-1.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The FLExible Network Tester
-EAPI=6
-HOMEPAGE=https://flent.org/
-INHERIT=distutils-r1 xdg
-IUSE=+qt5 +plots python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=qt5? ( dev-python/PyQt5[python_targets_python3_8(-)?] ) plots? ( dev-python/matplotlib[python_targets_python3_8(-)?] ) net-analyzer/netperf[demo] net-misc/iperf net-analyzer/fping python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 )
-REQUIRED_USE=|| ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/tohojo/flent/archive/v1.3.2.tar.gz -> flent-1.3.2.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4973e7a2f3f5310ee1510fdbf3af062c
diff --git a/metadata/md5-cache/net-analyzer/labrea-2.5_p1 b/metadata/md5-cache/net-analyzer/labrea-2.5_p1
index 54d190585486..78fc8354410a 100644
--- a/metadata/md5-cache/net-analyzer/labrea-2.5_p1
+++ b/metadata/md5-cache/net-analyzer/labrea-2.5_p1
@@ -11,4 +11,4 @@ RDEPEND=net-libs/libpcap >=dev-libs/libdnet-1.7
 SLOT=0
 SRC_URI=mirror://sourceforge/labrea/labrea-2.5-stable-1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0b7e4f76e892d0724f66878f50e89074
+_md5_=7638dddc43a11fef2bbbd993386f1cb9
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 175ab1c508cb..8f22f58f755e 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/profanity-0.12.1-r1 b/metadata/md5-cache/net-im/profanity-0.12.1-r1
index 45692ec0ac54..815993bf3275 100644
--- a/metadata/md5-cache/net-im/profanity-0.12.1-r1
+++ b/metadata/md5-cache/net-im/profanity-0.12.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A console based XMPP client inspired by Irssi
 EAPI=8
 HOMEPAGE=https://profanity-im.github.io
 IUSE=libnotify omemo otr gpg test xscreensaver
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 dev-libs/atk dev-libs/glib:2 dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/libstrophe-0.11.0 net-misc/curl sys-libs/ncurses:=[unicode(+)] virtual/libcrypt:= media-libs/harfbuzz:= gpg? ( app-crypt/gpgme:= ) libnotify? ( x11-libs/libnotify ) omemo? ( net-libs/libsignal-protocol-c dev-libs/libgcrypt:= ) otr? ( net-libs/libotr ) sys-libs/readline:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango xscreensaver? ( x11-libs/libXScrnSaver x11-libs/libX11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://profanity-im.github.io/tarballs/profanity-0.12.1.tar.gz
-_md5_=e63fd734e50cbdd1576b4173cad0297e
+_md5_=6997b59516690bae04f72640738d7563
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 6cad4bdc4429..0c79fefa9658 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/dleyna-0.8.0 b/metadata/md5-cache/net-libs/dleyna-0.8.0
new file mode 100644
index 000000000000..d52a3f43b347
--- /dev/null
+++ b/metadata/md5-cache/net-libs/dleyna-0.8.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/docutils virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.28:2 >=net-libs/gssdp-1.6.0:1.6= >=net-libs/gupnp-1.6.0:1.6= >=net-libs/gupnp-av-0.12.9:0= >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-3.0:3.0 dev-libs/libxml2 !net-libs/dleyna-connector-dbus !net-libs/dleyna-core !net-libs/dleyna-renderer !net-misc/dleyna-server
+DESCRIPTION=dLeyna is a set of services and D-Bus APIs that aim to simplify access to UPnP and DLNA media devices in a network
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/World/dLeyna
+INHERIT=meson
+KEYWORDS=amd64 ~arm64 ~riscv x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.28:2 >=net-libs/gssdp-1.6.0:1.6= >=net-libs/gupnp-1.6.0:1.6= >=net-libs/gupnp-av-0.12.9:0= >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-3.0:3.0 dev-libs/libxml2 !net-libs/dleyna-connector-dbus !net-libs/dleyna-core !net-libs/dleyna-renderer !net-misc/dleyna-server
+SLOT=1.0/6
+SRC_URI=https://gitlab.gnome.org/World/dLeyna/-/archive/v0.8.0/dLeyna-v0.8.0.tar.bz2
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=1bd06e3bd9ec7deccd1588d4133d5fa8
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 501ecb9eae3b..56f98347bb52 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/dhcp-4.4.3_p1 b/metadata/md5-cache/net-misc/dhcp-4.4.3_p1
index 8da31f15bbce..c515ff95d2d7 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.4.3_p1
+++ b/metadata/md5-cache/net-misc/dhcp-4.4.3_p1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.isc.org/dhcp
 INHERIT=systemd toolchain-funcs flag-o-matic tmpfiles
 IUSE=+client ipv6 ldap selinux +server ssl vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MPL-2.0 BSD SSLeay GPL-2
 RDEPEND=acct-group/dhcp acct-user/dhcp client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap:= ssl? ( dev-libs/openssl:= ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax ) virtual/tmpfiles
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.3-P1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.3-P1/dhcp-4.4.3-P1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ee8540ad5e3a28488e5f49b6a2836fd3
+_md5_=0603caa77936b187642c2ec327d56470
diff --git a/metadata/md5-cache/net-misc/dropbear-2022.82 b/metadata/md5-cache/net-misc/dropbear-2022.82
index aef7225150a3..5f9484067a3a 100644
--- a/metadata/md5-cache/net-misc/dropbear-2022.82
+++ b/metadata/md5-cache/net-misc/dropbear-2022.82
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html
 INHERIT=savedconfig pam verify-sig
 IUSE=bsdpty minimal multicall pam +shadow static +syslog zlib savedconfig verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT GPL-2
 RDEPEND=acct-group/sshd acct-user/sshd !static? ( >=dev-libs/libtomcrypt-1.18.2-r2[libtommath] >=dev-libs/libtommath-1.2.0 virtual/libcrypt zlib? ( sys-libs/zlib ) ) pam? ( sys-libs/pam ) pam? ( >=sys-auth/pambase-20080219.1 )
 REQUIRED_USE=pam? ( !static )
 SLOT=0
 SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2022.82.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2022.82.tar.bz2 verify-sig? ( https://matt.ucc.asn.au/dropbear/releases/dropbear-2022.82.tar.bz2.asc https://matt.ucc.asn.au/dropbear/testing/dropbear-2022.82.tar.bz2.asc )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=47e5b25811fe09d1c8eaaa5e8f1490a7
+_md5_=d733d213acf03294ec9f946f9cfb8dc4
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index adde4428f7f9..720a52297051 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/leafnode-1.11.11-r1 b/metadata/md5-cache/net-nntp/leafnode-1.11.11-r1
index 17fb69daf80a..98d2ea66907a 100644
--- a/metadata/md5-cache/net-nntp/leafnode-1.11.11-r1
+++ b/metadata/md5-cache/net-nntp/leafnode-1.11.11-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre-3.9 virtual/inetd
 SLOT=0
-SRC_URI=mirror://sourceforge/leafnode/leafnode-1.11.11.tar.bz2
-_md5_=9e149e7517a117994667977a56517128
+SRC_URI=mirror://sourceforge/leafnode/leafnode-1.11.11.tar.xz
+_md5_=fcebb8d4a15a03a3e4bd06c4ed2d55d1
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index b22d1f25a064..fd49b229558b 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/deluge-2.1.1 b/metadata/md5-cache/net-p2p/deluge-2.1.1
index dcb69528f427..5c06a664406c 100644
--- a/metadata/md5-cache/net-p2p/deluge-2.1.1
+++ b/metadata/md5-cache/net-p2p/deluge-2.1.1
@@ -6,7 +6,7 @@ HOMEPAGE=https://deluge-torrent.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 systemd xdg
 IUSE=console gui libnotify sound webinterface test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/deluge acct-user/deluge net-libs/libtorrent-rasterbar:=[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_8(-)] ) dev-python/pygobject:3[python_targets_python3_8(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] dev-python/pillow[python_targets_python3_8(-)] dev-python/pyopenssl[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] dev-python/rencode[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_8(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_8(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_8(-)] dev-python/mako[python_targets_python3_8(-)] ) python_single_target_python3_9? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_9(-)] ) dev-python/pygobject:3[python_targets_python3_9(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] dev-python/rencode[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_9(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_9(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_9(-)] dev-python/mako[python_targets_python3_9(-)] ) python_single_target_python3_10? ( gui? ( sound? ( dev-python/pygame[python_targets_python3_10(-)] ) dev-python/pygobject:3[python_targets_python3_10(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) dev-python/chardet[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] || ( >=dev-python/twisted-17.1.0[ssl(-),python_targets_python3_10(-)] >=dev-python/twisted-17.1.0[crypt(-),python_targets_python3_10(-)] ) >=dev-python/zope-interface-4.4.2[python_targets_python3_10(-)] dev-python/mako[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) libnotify? ( gui ) sound? ( gui ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.deluge-torrent.org/source/2.1/deluge-2.1.1.tar.xz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5692f136dcc3649ff0f7d1ee9bd76c32
+_md5_=96634ec74a2568ef651f51765a7f2178
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 80e3daf16618..6aeedb45c437 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/foxtrotgps-1.2.2-r1 b/metadata/md5-cache/sci-geosciences/foxtrotgps-1.2.2-r1
index 152b05987785..1a0435646191 100644
--- a/metadata/md5-cache/sci-geosciences/foxtrotgps-1.2.2-r1
+++ b/metadata/md5-cache/sci-geosciences/foxtrotgps-1.2.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Easy to use, fast and lightweight mapping application (fork of tango
 EAPI=7
 HOMEPAGE=https://www.foxtrotgps.org/
 INHERIT=gnome2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 gnome-base/libglade media-libs/libexif net-misc/curl >=sci-geosciences/gpsd-2.90:= sys-apps/dbus x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://www.foxtrotgps.org/releases/foxtrotgps-1.2.2.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ce10bf172be6723209f6cb1eab3f3197
+_md5_=c67fea566182e77838ae571cf8ddcaf8
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 36dff4154315..9c2b4f54a380 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/ipmitool-1.8.19 b/metadata/md5-cache/sys-apps/ipmitool-1.8.19
index 3854b888c0e8..32a88390c67b 100644
--- a/metadata/md5-cache/sys-apps/ipmitool-1.8.19
+++ b/metadata/md5-cache/sys-apps/ipmitool-1.8.19
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/ipmitool/ipmitool
 INHERIT=autotools systemd
 IUSE=openbmc openipmi static
-KEYWORDS=~amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 arm64 ~hppa ~ia64 ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0= sys-libs/readline:0= openbmc? ( sys-apps/systemd:0= )
 SLOT=0
 SRC_URI=https://github.com/ipmitool/ipmitool/archive/refs/tags/IPMITOOL_1_8_19.tar.gz -> ipmitool-1.8.19.tar.gz https://dev.gentoo.org/~ajak/distfiles/sys-apps/ipmitool/enterprise-numbers-1.8.19.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=34d9551b601142ac9f4760c64518ddd1
+_md5_=a69f1d427f65f568719ba15f67a4421f
diff --git a/metadata/md5-cache/sys-apps/man-pages-6.00 b/metadata/md5-cache/sys-apps/man-pages-6.00
index 97e48cb34e1f..1b3375da6da0 100644
--- a/metadata/md5-cache/sys-apps/man-pages-6.00
+++ b/metadata/md5-cache/sys-apps/man-pages-6.00
@@ -10,5 +10,5 @@ PDEPEND=l10n_ja? ( app-i18n/man-pages-ja ) l10n_ru? ( app-i18n/man-pages-ru ) l1
 RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<dev-libs/libbsd-0.8.3-r1
 RESTRICT=binchecks
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-apps/man-pages/man-pages-6.00.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=3b1b4814e266cfecf0e80f049c33d08c
+SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-6.00.tar.xz -> man-pages-6.00-upstream.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-6.00.tar.xz -> man-pages-6.00-upstream.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
+_md5_=0e4b63991946b6e5b987f454925fbad9
diff --git a/metadata/md5-cache/sys-apps/man-pages-9999 b/metadata/md5-cache/sys-apps/man-pages-9999
index 5dfa79c93e9a..08b20c284c64 100644
--- a/metadata/md5-cache/sys-apps/man-pages-9999
+++ b/metadata/md5-cache/sys-apps/man-pages-9999
@@ -13,4 +13,4 @@ RESTRICT=binchecks
 SLOT=0
 SRC_URI=mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53
-_md5_=3b1b4814e266cfecf0e80f049c33d08c
+_md5_=a3050164d212776d11049ab971def768
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index f01f4f87006a..ee5bfba7286f 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/icecream-1.3.1 b/metadata/md5-cache/sys-devel/icecream-1.3.1
deleted file mode 100644
index a945b164caac..000000000000
--- a/metadata/md5-cache/sys-devel/icecream-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-text/docbook2X 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 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare prerm
-DEPEND=app-arch/libarchive:= app-arch/zstd:= acct-user/icecream acct-group/icecream dev-libs/lzo:2 sys-libs/libcap-ng
-DESCRIPTION=Distributed compiler with a central scheduler to share build load
-EAPI=8
-HOMEPAGE=https://github.com/icecc/icecream
-INHERIT=autotools systemd tmpfiles
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/libarchive:= app-arch/zstd:= acct-user/icecream acct-group/icecream dev-libs/lzo:2 sys-libs/libcap-ng dev-util/shadowman virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/icecc/icecream/archive/1.3.1.tar.gz -> icecream-1.3.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b58f90ffc205afe0377112e1f9caad33
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index a2f647318db3..a0dda5d54011 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
index 26920c13c01e..b8deefbc2714 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+abi_x86_32 abi_x86_64 +clang debug test verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	9407b72c482a902f7f7d94f1302ba826	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=036082667ece14580b27c17d7ced5710
+_md5_=b622eb20115abc690e27877e4fd23ec7
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 45e76a3922e0..f4ab66d9a936 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/libapreq2-2.17 b/metadata/md5-cache/www-apache/libapreq2-2.17
index cd5a746850ee..a74ba16f8986 100644
--- a/metadata/md5-cache/www-apache/libapreq2-2.17
+++ b/metadata/md5-cache/www-apache/libapreq2-2.17
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://httpd.apache.org/apreq/
 INHERIT=apache-module perl-module
 IUSE=perl test
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=|| ( dev-libs/apr-util[openssl] dev-libs/apr-util[nss] ) perl? ( >=dev-perl/ExtUtils-XSBuilder-0.23 virtual/perl-version >=www-apache/mod_perl-2 ) virtual/libcrypt:= =www-servers/apache-2* dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/httpd/libapreq/libapreq2-2.17.tar.gz
 _eclasses_=apache-module	4d0ccd357b5f2d92599030b72f6efb62	depend.apache	416d1c5005c5f4594e79812fb7323f0d	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887
-_md5_=f89521fd0dc4c9162e87e4e47341926e
+_md5_=335d72fd09e9e93743e26b1b072750ca
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index d4bb4ef0412c..dda085de67be 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/lynx-2.9.0_pre10 b/metadata/md5-cache/www-client/lynx-2.9.0_pre10
new file mode 100644
index 000000000000..41e74d83573c
--- /dev/null
+++ b/metadata/md5-cache/www-client/lynx-2.9.0_pre10
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install unpack
+DEPEND=sys-libs/ncurses:=[unicode(+)] sys-libs/zlib bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn:= ) nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( dev-libs/libgcrypt:= >=net-libs/gnutls-2.6.4:= ) )
+DESCRIPTION=An excellent console-based web browser with ssl support
+EAPI=8
+HOMEPAGE=https://lynx.invisible-island.net/
+INHERIT=verify-sig
+IUSE=bzip2 cjk gnutls idn nls ssl verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)] sys-libs/zlib bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn:= ) nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( dev-libs/libgcrypt:= >=net-libs/gnutls-2.6.4:= ) )
+SLOT=0
+SRC_URI=https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.10.tar.bz2 verify-sig? ( https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.10.tar.bz2.asc )
+_eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=09cdbc326dab96b097c1c968c8a851a8
diff --git a/metadata/md5-cache/www-client/lynx-2.9.0_pre6-r2 b/metadata/md5-cache/www-client/lynx-2.9.0_pre6-r2
deleted file mode 100644
index 50dbf57c27d3..000000000000
--- a/metadata/md5-cache/www-client/lynx-2.9.0_pre6-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2.6.4:= ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn:0= ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=An excellent console-based web browser with ssl support
-EAPI=7
-HOMEPAGE=https://lynx.invisible-island.net/
-IUSE=bzip2 cjk gnutls idn ipv6 nls ssl unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( dev-libs/libgcrypt:0= >=net-libs/gnutls-2.6.4:= ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn:0= )
-SLOT=0
-SRC_URI=https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.6.tar.bz2
-_md5_=61ab3228a9fe40c2c387dc4907072e09
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index fbfbbea674ff..360eec764515 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/caddy-2.6.2 b/metadata/md5-cache/www-servers/caddy-2.6.2
new file mode 100644
index 000000000000..c139d4d29a51
--- /dev/null
+++ b/metadata/md5-cache/www-servers/caddy-2.6.2
@@ -0,0 +1,16 @@
+BDEPEND=filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=acct-user/http acct-group/http
+DESCRIPTION=Fast, cross-platform HTTP/2 web server with automatic HTTPS
+EAPI=7
+HOMEPAGE=https://caddyserver.com
+INHERIT=fcaps go-module systemd
+IUSE=+filecaps
+KEYWORDS=amd64 ~arm64 ~riscv
+LICENSE=Apache-2.0 BSD ECL-2.0 MIT
+RDEPEND=acct-user/http acct-group/http filecaps? ( sys-libs/libcap )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/caddyserver/caddy/archive/v2.6.2.tar.gz -> caddy-2.6.2.tar.gz https://dev.gentoo.org/~zmedico/dist/caddy-2.6.2-deps.tar.xz
+_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	go-module	b088539f282ed242c23f38fa65472184	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=499482260efe71ce132da30cb0667c5a
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index cc2dfab00448..d7068047ac03 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.11 b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.11
new file mode 100644
index 000000000000..330cb10a358a
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.11
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig app-arch/xz-utils
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/glib:2 >=x11-libs/gtk+-3.5.1:3 >=x11-misc/xdg-user-dirs-0.14
+DESCRIPTION=Integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk
+INHERIT=gnome.org readme.gentoo-r1 toolchain-funcs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-3.5.1:3 >=x11-misc/xdg-user-dirs-0.14
+SLOT=0
+SRC_URI=mirror://gnome/sources/xdg-user-dirs-gtk/0.11/xdg-user-dirs-gtk-0.11.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=67e47310c31bc75b0668966f1c2af5ec
diff --git a/metadata/md5-cache/x11-misc/xdock-0.3.0 b/metadata/md5-cache/x11-misc/xdock-0.3.0-r1
index 032309f12a16..47cf9c70b0ab 100644
--- a/metadata/md5-cache/x11-misc/xdock-0.3.0
+++ b/metadata/md5-cache/x11-misc/xdock-0.3.0-r1
@@ -1,9 +1,9 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libX11
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=Emulates Window Maker docks (runs in any window manager)
-EAPI=7
-HOMEPAGE=http://xdock.sourceforge.net
+EAPI=8
+HOMEPAGE=https://xdock.sourceforge.net/
 INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://sourceforge/xdock/xdock-0.3.0.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8087dd42e330df69e77cd0beb931ec88
+_md5_=cae4fd10d69675e243f841f38f99e256
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 6d021ebd3149..5212d1f2b95e 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/xterm-374 b/metadata/md5-cache/x11-terms/xterm-374
new file mode 100644
index 000000000000..a848a2c75a1a
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/xterm-374
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install unpack
+DEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
+DESCRIPTION=Terminal Emulator for X Windows
+EAPI=8
+HOMEPAGE=https://invisible-island.net/xterm/
+INHERIT=desktop flag-o-matic toolchain-funcs verify-sig
+IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama verify-sig
+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=MIT
+RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
+SLOT=0
+SRC_URI=https://invisible-island.net/archives/xterm/xterm-374.tgz verify-sig? ( https://invisible-island.net/archives/xterm/xterm-374.tgz.asc )
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=1ca345df4bef15774fb102fa64705227
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 3e617cb52d01..3aa30ed50550 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-13T23:39:54Z
+TIMESTAMP 2022-10-14T05:39:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNIocpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNI9itfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBPng//Vj7VG8AMSYyivl3YuTuGnpurdhVURdbl1g2+nZTzwaLpWsuFx6q0z53C
-BfkdnAmRS8VbtHAvGMrkMrEzcNHbgAI+ZBMmP3JpUH1/v468kJRtmyg4/C6zY7BG
-HWsFPl9iBSDkMiQQZXQYZS251O1oZhvCGeqxKmWzCEI8eBAMu4FdltsOTFa7ien7
-iTY7qirj3eK9Osh1ZH7vrIoIh8uChJNzwNMs/oDxoGX+/lTvXhANP5aeq1gnEmTp
-Vz19tu6AAOhYof2XEDrkcGVkatx3LHRWcBt41ytB7afWc2h7PxfC0jEkxCczPosH
-6yFQ5eNQx9MYsu9UGmyDh3zzrlSCybNEt1BvWFM7WyaKAwF178qnSP3CE9bq6ETN
-10TPJBLAcQ279Nlmk1dJoi61aoUhsA6um1HGfl22NygXcW9SXLaWoraQq5C5NOW/
-J+mJ7oC3qkNwczI+UCQMvGJsiVnLbvTk5RZD7bRQ7ghid6tvjUvf8EBXNu1SkOp5
-7qt6B5pE45GZstVvbgAfzwlENWFX7m0D0d7pag0j2dimAPgcjnKXGzDix/vgtsGx
-QDXIUHsOkqNsE6JcVOQdM2QSDcBbBYIKx2fu3WO2E5B5BsdjWrcPnlSl+05JiBzL
-AS5dqYigNF25B4Rs4P3Lt3UcjYUwtNtJZBcwO3B5E+B7XPpm0U8=
-=vP+l
+klBGSQ/+PRu8bmD3f1J/+LD4rDEF22m9KQ2WbrfDhghDeqsh4BlL7wfuqg3BqjtH
+AHVXDMWZWLdrUucoZxM5K6k7aNqL50kSlzyYO3UFwa1jgn8TfqZZ0iAf9SE/4dt0
+SigQlCsyUxsi4qnBArQZy3vVdmvsMojvb2fbGSweutFVqxGIZmX2ppyX7vpOoRV+
+iMrUrHcyRQ6q731XC4l3CwRUt7KuZrmEXcEGfvkH1Noe64eG5AxX3tpGwJIJEvKi
+mWkFY++1D18OTqIT4+hvwoh39zEnUsBQcrWsJoHnm8gDHOx32KCi93Vmj4uAVvHy
++zjlMoYklHRya5RC01F4kKkJavgy4lfXWH3fxKEPgqyIk9SlV0eHDBZ9RnXCpTIq
+RjwWDn+iAJJtkGghszUWaD7OHhNcBKUJTQDPIsF9PTAjaJ3LT8VdTmDEcfCD0Uaq
+MZEKBieeA2PxRgw6bzyaks5g4IzjvdJB1+vsJqNlaLZ2WfV1ApdXXRfbVRe5v+Tj
+SX9SYNvUjf1haqigyxvf133OlIn5ynv/dlcMqzBaU9b2yWSqzW3R8g5aGaAcmaB7
+upW0esTwvm0ky45mfszQV5A7V+DfNy8OBOrpXHPpRE2zGPDsy3zQOJlmCiX3hpPx
+vU7IqzzFQIcvhkU/Q0uS7HL/Z6n3/wDyls6FAuNa5W4nipF70Xw=
+=Jfk6
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 918e927e84be..978656338546 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 13 Oct 2022 23:39:51 +0000
+Fri, 14 Oct 2022 05:39:52 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 8a0c83b6ccd8..50f3904c7139 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Oct 13 11:39:50 PM UTC 2022
+Fri Oct 14 05:39:52 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ec4f5f7e52e5..53ae3a1b020e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 13 Oct 2022 23:45:01 +0000
+Fri, 14 Oct 2022 05:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 8a1f5fcf9a38..5db17b0e0068 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-386a8cd5937a3440a8fe11cc3cdc6973198f3ae6 1665703210 2022-10-13T23:20:10+00:00
+14d10f723d06545832e0008722d1c725c3b03e97 1665725222 2022-10-14T05:27:02+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 625ad2827ee4..949a063771e9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1665704401 Thu 13 Oct 2022 11:40:01 PM UTC
+1665726001 Fri 14 Oct 2022 05:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 905f1fba5500..978656338546 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 13 Oct 2022 23:39:50 +0000
+Fri, 14 Oct 2022 05:39:52 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index fcc49e654f33..11f1d9eb0e5e 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/flent/Manifest b/net-analyzer/flent/Manifest
deleted file mode 100644
index 0218bc61898e..000000000000
--- a/net-analyzer/flent/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST flent-1.3.2.tar.gz 2977251 BLAKE2B 03b4f67ec5a9a83ceee40b1cda529aaaccc162012a8de702a5c0bc58e08ec62df80e60d901bd76d3bc4c2d9cde0310ad32fcfbe458fc2b2a9cb2bdc82e9ec704 SHA512 cda7e9fffffa0b6d6e723c18e175fc844d97b8cae0299c46cbbd5ca03bd09d39d9d92c7ee72e6bda5bc27d921090ba5be747eca7a64dd4ef1f889575c18973d6
-EBUILD flent-1.3.2.ebuild 615 BLAKE2B 1d07580727d43e3722f568ef185ac20a60999869c1d472517310bb0b649e615c8e249918846b8dc1585f3b9f4823c1f8b37998a247a3498c92571b9abdcfa130 SHA512 d7e3449faf6b1167cbb319719400ff74ae8b4ed51276232def55c0f073ce79545cba6eaf4fac398135a4026ccaf24f91beb159829fd7231d4192fcb7b2c61ab4
-MISC metadata.xml 392 BLAKE2B 7ee32c6f764726ed63a8a2f9624f24669d8b81b45835ea97d11e9db92f856a998b05a6e25bbe7f9cf5a80d6e1300b8044860c32ac1de507687199ec80da2408f SHA512 f0f2f0a693615dda26d2789d3e8ab43a8cb2843b0a4f2e5f4a8e6b18fa8c96551bbd563207c9df5ae90c66808ee7cb9da5b249bcb2df30f858cd453f929920e8
diff --git a/net-analyzer/flent/flent-1.3.2.ebuild b/net-analyzer/flent/flent-1.3.2.ebuild
deleted file mode 100644
index 265d9cefe200..000000000000
--- a/net-analyzer/flent/flent-1.3.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="The FLExible Network Tester"
-HOMEPAGE="https://flent.org/"
-SRC_URI="https://github.com/tohojo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+qt5 +plots"
-
-RDEPEND="qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-		plots? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-		net-analyzer/netperf[demo]
-		net-misc/iperf
-		net-analyzer/fping"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/flent/metadata.xml b/net-analyzer/flent/metadata.xml
deleted file mode 100644
index 60c810ab37ea..000000000000
--- a/net-analyzer/flent/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zx2c4@gentoo.org</email>
-		<name>Jason A. Donenfeld</name>
-	</maintainer>
-	<use>
-		<flag name="plots">Enable drawing plots</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">tohojo/flent</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-analyzer/labrea/Manifest b/net-analyzer/labrea/Manifest
index 30372e003880..cab9988cfc06 100644
--- a/net-analyzer/labrea/Manifest
+++ b/net-analyzer/labrea/Manifest
@@ -1,6 +1,7 @@
 AUX labrea-2.5-libdir.patch 885 BLAKE2B 4f8b255706f053b510b5ef5ae773e2bf6d54558a6cb85d23a89ee4e433f1c38e0a22bd384c2642f3f518be4771fb0d05f00961250cb1c7c2fa0d07e40c0e81b9 SHA512 b0795d81d42e816c41c8f048e0a810d06d9b5ce13739fca55c62b75e03b7047cdf0bfa38e36fce18a622014337ccffc295ffbc7b9cda2339d304776b340e235b
 AUX labrea-2.5-pcap_open.patch 1115 BLAKE2B ba279ea65a905df62a9886ba5db86fb7696d88bfee1309f01ab8b0515809ec88706325e7486bcc3d8b7b6c32d29a1b0270420eaacfe6c825a1e96f65f8780c78 SHA512 336d06bc3db06d19b48a1c5c6b5bc9da31aef6d0103de3c711563e6cb74c650480bf2bfb4606686bc0030140ced2ffd54ad36f24a9bce06bad43d94c33906335
 AUX labrea-2.5-stable-1-incdir.patch 218 BLAKE2B c0b795e5c2010b733522873c8e78ce12551fd8009a51b32af01dfca64202f7ecd22f13935ae84de3ee7ac3949ffafd060cba69503d19726aea51524cccc4984e SHA512 935a9e0a884d8b1c7ae30c24c59c3f30d0491bde45329fe00f0f64e854d9c686b22f002dce832d5dbb17a45e23a0a3e3aae64f1150edc349c8b3499bd8bcadd1
+AUX labrea-2.5_p1-clang16.patch 136 BLAKE2B fa2ba6921ba7226979b773a1d7bcd51db8adabc1f2aef501beada380dca2193604a87093a713c58a66ccbbf79764ec89501b89b6a16888018c4bea4cef2d7908 SHA512 6078fed15292d3a60a870b100358f0c40df7e08bea79addc68a9331f3c8caf7c92c1696e7405c02d94764f73990f61e497b167e8adfe44b9ac4395effe018b93
 DIST labrea-2.5-stable-1.tar.gz 210494 BLAKE2B 3db2f4c014c578446fd9d6303f8c17245d3d9a7e8e481bf64195693f21eb30b9e0e2d6cf59ae124982e358d4aad2d22654ee46544957ab783f33a13c951d6a3d SHA512 63523f59e9e6ca31d2a5ea781f7b7087e7e41835aec24cd8cbf1cf7b65893fb1cedb2b13aa5fcfab458375ef27f5521a9ab88a71734b7317edf8eda2746c566c
-EBUILD labrea-2.5_p1.ebuild 971 BLAKE2B 71afac5d3e31922c557a55fbf3eff929c22e6648d3a7acd4f36f23cccc4766c03695443680c5360a4d834747aaa41ee1b9c454fa21f9b4ce2d65bdfcaa5793b3 SHA512 d3256843a0e506e63fafd6ac7a89982a2c57174e9d057664d336cd6f2fb13d8a8c8fb2f52e6b2ae3fcadeb3b9fc76e780a3f7c8c944113fe9155365c677c358f
+EBUILD labrea-2.5_p1.ebuild 1005 BLAKE2B ba6d35882630a26e01755d1aa2f5176185a97e756e2fad2f512575bbb4dd4eec180bb901723daa5ab391f389537087d73a140a9801124941bf63f1e25435955b SHA512 a0a191149e216590be4aa12fb2f2d319e4bfd0d2b78185e25dcdc1220bb2b273abdbf86293a84a5591d07bd55b045f91bf42c5b0fb56f597fc42326ecfc00e48
 MISC metadata.xml 357 BLAKE2B 597b1794e6bd03ea146d9ca5478594459165de957f42f32a2dd6bb15dc8847309e778abbf88528ac94824e05552bb7bc11211d146f51176a611fb91466aad3b0 SHA512 08bb3a3f7077aa687450903e913f51553e80eca3781f72780efe04e707482a66c6aaf7bc735f2d1fc5c1ef9481db4d6f641b9978e6d06e87bead98329ca9d1aa
diff --git a/net-analyzer/labrea/files/labrea-2.5_p1-clang16.patch b/net-analyzer/labrea/files/labrea-2.5_p1-clang16.patch
new file mode 100644
index 000000000000..15ed9ff0960c
--- /dev/null
+++ b/net-analyzer/labrea/files/labrea-2.5_p1-clang16.patch
@@ -0,0 +1,7 @@
+https://bugs.gentoo.org/871513
+--- a/inc/utils.h
++++ b/inc/utils.h
+@@ -52,2 +52,3 @@
+ 
++void		util_alarm(void);
+ void		util_init(void);
diff --git a/net-analyzer/labrea/labrea-2.5_p1.ebuild b/net-analyzer/labrea/labrea-2.5_p1.ebuild
index a47abfc9e1a0..9906ae64ea98 100644
--- a/net-analyzer/labrea/labrea-2.5_p1.ebuild
+++ b/net-analyzer/labrea/labrea-2.5_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${P/_p/-stable-}-incdir.patch
 	"${FILESDIR}"/${P/_p*}-pcap_open.patch
 	"${FILESDIR}"/${PN}-2.5-libdir.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_prepare() {
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index de4822ee2904..898a836b4179 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/profanity/Manifest b/net-im/profanity/Manifest
index 3dddc596519b..d5eccfa24368 100644
--- a/net-im/profanity/Manifest
+++ b/net-im/profanity/Manifest
@@ -1,7 +1,7 @@
 DIST profanity-0.12.1.tar.gz 895566 BLAKE2B 8e9a0e21ad598c5fdde293e38b9b6fb363ae06f424e7fd11d12a01ec6d5ce39a83849e56e284c15a842f01d66f3a4011f9518aef3a521459f690a7d052fe591f SHA512 ca3ea92fd439336cd0bf0be42afdda464e25be85b910aef837738b8d1787ac174ac93ccee4fb2fb385228ed7be8e9bac5e96a1f89a68df162785b17d7671463f
 DIST profanity-0.13.1.tar.xz 621836 BLAKE2B e038fa01272150cb7974b03f88f64335bf1690115dbbb1c6fe04c79acb69db18c556edf41316af1d363f9715cd2e7aeb3f3bd867836704b620d9a87976b64fa9 SHA512 6d7d3c96c65e26c15cac1157bd296c1dbd3e2471aec959d6c319c68b70ec21cef0c40d7b4eed40c30c377a766db9f13a774ccb4880c227ee368e4dd607d9c267
 DIST profanity-0.9.5.tar.gz 830966 BLAKE2B fc1b755b1a92dbde62aacb31cb5d9190cea951e98501a5b48495dbd31266f343cf436de1fa0f69caec34324cd1f781d0bd4f5f7ebdd984324c5d1d6edb91452a SHA512 79305ee488d3a9b87bb422d6525bfaae62c4969d466b968c86941ed5bf0c0080e349758f2e1ead144693513b5d19a635372e73aa1fe9e362836b9245e1d2b898
-EBUILD profanity-0.12.1-r1.ebuild 1318 BLAKE2B c1212ff4b5f305c87f8dd0b488aecf2eb1c696d7aaa91e87aee25a7c889a4f2f85c082b1de0f3d81cc46f1aa56cf5b3ccdf55fa51bb223550e0a3fde64f1dd8d SHA512 806c4abb7d5ca4a12c50e80e3ba16061bd4daff8c71d85d7f30a09cf797fbec16434148f1e0a1faffc6311f37c33fbde7ffec403ffa4bbeec2fdd14c61b52ec7
+EBUILD profanity-0.12.1-r1.ebuild 1317 BLAKE2B d2b9cbcb7f2c49707225026d87e5b5a72e0532390815180d23d4ea4d160589e1bbebfad488d45a6ad98ea1bba023342ecfc39193b46283be95acde14b359e4d9 SHA512 aa8f02d9c365114ed401686e20241cbd9da5bb546ebb913e86acea560692decd6b494ace2bb58ec110d065f98c5dc1a4a9294239da16f6c13a57bcbab95bf894
 EBUILD profanity-0.13.1.ebuild 1426 BLAKE2B 28850e77a12a87c71814d3204a2b036dcfe137b38e8b1622fb7593c97c7412ae3540f7c5ef7d3e8af1630a497bdadeac4e2a7cc26df3661f0a9337c01898678c SHA512 7588df5a35ecf5029b15fbb9034e974b9eedb9ec6b628c095cc8b199fc4d112c67feb221b67ee1dfafa09a0fa50b301c06f5154da39e1dd52cfdf189f8a25de7
 EBUILD profanity-0.9.5-r1.ebuild 1035 BLAKE2B 94078ea301009255f2b9b57b0835558ebc797ad3c0c75393be2c95c4b368832dabc0be1d596e45c2b421e3c2e58ea099d0238c55dc9a9ceaf0ccc3519b4c96ce SHA512 c21319345910123603041d916f0712c4eac3851bb71efee3906d8e2423e2aef3032139bb663ce3a4d2bcf13254456c03948a10511ef8dc2d72f214f023db19ed
 MISC metadata.xml 609 BLAKE2B 2b5d6d9f4e6a4fb8eebfaa93274f2fb183e091e79fa5aa8c86aa4dba78d5ffd6590dbb353a3555291fafee683acc7a5affb33274e1ac3019ff610e29b94f2acf SHA512 e69cff5a4f22c6c95f45a4d67a43d8ae59c89b8ef237ae72c5e0ed932a2998003457008dd2a2d68df5608a693fd5069c0f6c52ae481f688ea8a36136e110e681
diff --git a/net-im/profanity/profanity-0.12.1-r1.ebuild b/net-im/profanity/profanity-0.12.1-r1.ebuild
index 4dbaba2f82a7..aa5b3f1c580d 100644
--- a/net-im/profanity/profanity-0.12.1-r1.ebuild
+++ b/net-im/profanity/profanity-0.12.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://profanity-im.github.io/tarballs/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="libnotify omemo otr gpg test xscreensaver"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 9f5b61605716..e6e7cd741963 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/dleyna/Manifest b/net-libs/dleyna/Manifest
new file mode 100644
index 000000000000..10b17c8d9da1
--- /dev/null
+++ b/net-libs/dleyna/Manifest
@@ -0,0 +1,3 @@
+DIST dLeyna-v0.8.0.tar.bz2 146281 BLAKE2B 89fc24ed4dcc19b35f317c4760c82877dd829b144cc7f466a0ed22274131238f1058f0aeb53f56639802d808f06028ed9026115002f32d48ef493ff3a986f53f SHA512 f5f78cd5edf40550ea25ae408a910d7d9bbffb4d03539d2e6ee037204761e424f54a15e6da2083f3d4782728509ae58558e709cd7f6074a327dbcf2b5c677d6d
+EBUILD dleyna-0.8.0.ebuild 1170 BLAKE2B d47f69b811385ef6781501562f1ab3d060303f773113cff313fc69eca4c9a7fe7749098af3bddc79523285430573f83b435e5d217175bbe5dd6978467fb4fbc0 SHA512 5b396e7fe1c994cec0372a0dcd6cac7940a1a300b08e4a49b324b4cc0e99edfe625a625939b8995ebb7abfbac2c41d6d21569cc4adbb2adf8680d868f89e74e3
+MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-libs/dleyna/dleyna-0.8.0.ebuild b/net-libs/dleyna/dleyna-0.8.0.ebuild
new file mode 100644
index 000000000000..52fd2e2448ae
--- /dev/null
+++ b/net-libs/dleyna/dleyna-0.8.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="dLeyna is a set of services and D-Bus APIs that aim to simplify access to UPnP and DLNA media devices in a network"
+HOMEPAGE="https://gitlab.gnome.org/World/dLeyna"
+SRC_URI="https://gitlab.gnome.org/World/dLeyna/-/archive/v0.8.0/dLeyna-v${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0/6" # soname of libdleyna-core-1.0.so
+KEYWORDS="amd64 ~arm64 ~riscv x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=net-libs/gssdp-1.6.0:1.6=
+	>=net-libs/gupnp-1.6.0:1.6=
+	>=net-libs/gupnp-av-0.12.9:0=
+	>=media-libs/gupnp-dlna-0.9.4:2.0=
+	>=net-libs/libsoup-3.0:3.0
+	dev-libs/libxml2
+
+	!net-libs/dleyna-connector-dbus
+	!net-libs/dleyna-core
+	!net-libs/dleyna-renderer
+	!net-misc/dleyna-server
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}"/dLeyna-v${PV}
+
+src_prepare() {
+	default
+	sed -i -e "s/'rst2man'/'rst2man', 'rst2man.py'/g" doc/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddbus_service_dir="${EPREFIX}/usr/share/dbus-1/services"
+		-Dman_pages=true
+		-Ddocs=false
+	)
+	meson_src_configure
+}
diff --git a/net-libs/dleyna/metadata.xml b/net-libs/dleyna/metadata.xml
new file mode 100644
index 000000000000..f453528b934f
--- /dev/null
+++ b/net-libs/dleyna/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 96138e15b997..476a83aa37d3 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 1562a3e1c66e..2a9e38f6fa53 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -29,5 +29,5 @@ DIST dhcp-4.4.3-P1.tar.gz 10081055 BLAKE2B 6cc16f7472efb1e1f6b7a83cafd9a81a16f10
 DIST dhcp-4.4.3.tar.gz 10078953 BLAKE2B d88570760cc00bd72d1e9c2e76c7a7b9f07cadfbe044220a43ee33fc201c217725c3909a386ae11f28346920dacb0313d78193a9e3d7eac9757384b4fe762597 SHA512 4472d6794af80b482560956cee6895889cc1aca39980f851faf56824627e95731f2983cf7c7454bc3decb0a12c874fcbd29bd6c5a9695412def6bc14c6df17e0
 EBUILD dhcp-4.4.2_p1-r2.ebuild 8410 BLAKE2B bce58f30a590a98a8d5d61076ae43d5783ab2daa6095456e4253b671d94f2012072d4525ec8e7fff2adc641496ba519aa06d438d66ab969c37cbe0a3a4f339cf SHA512 e6fe16ac2fc57f9eaa9bdafc2af75fec1053cb6191a79d1b09064cdf77c0a88e0f7254d5b97e3a1a72477814d2d57d26cc2719eef543b2c538f3d62b802fbacc
 EBUILD dhcp-4.4.3-r1.ebuild 8527 BLAKE2B 0fd7d6dc235f1d7c3e29b5879901a99d442cfd71c90e70f22ae3d57260768c5f8ed272b7f12b10c9ad0ffd83b85811cd41fb981491b1087111c446b829c1bfc1 SHA512 6db12c5cc6c176bc6be89dda65707bb21e1c36c689328c75b73b779cae6b0d97ec5173d3d2b6f1c2a3cb3ffee500f2a9f0771cf3376a36ad23688405d5c99091
-EBUILD dhcp-4.4.3_p1.ebuild 8530 BLAKE2B b1fcb5c06467783d5ac356bc1af5cef282bb110bbe3266af2f902c3cd2adffb6d6d1f1b9998855adc2a22a5b4b562306d576cc2d9afafcd87173d5e181683cb7 SHA512 c710e494380e2d6a743d97c430c9ab45d2fd8f04df49da31bf3225a22b378e2ebeb37ea820ab1838e117ed0029f76bcd5b8fa85aeda95a79c205088652c90266
+EBUILD dhcp-4.4.3_p1.ebuild 8527 BLAKE2B 0fd7d6dc235f1d7c3e29b5879901a99d442cfd71c90e70f22ae3d57260768c5f8ed272b7f12b10c9ad0ffd83b85811cd41fb981491b1087111c446b829c1bfc1 SHA512 6db12c5cc6c176bc6be89dda65707bb21e1c36c689328c75b73b779cae6b0d97ec5173d3d2b6f1c2a3cb3ffee500f2a9f0771cf3376a36ad23688405d5c99091
 MISC metadata.xml 477 BLAKE2B 0e786da79e394f5dcc0812f19f81fa11327f2a173e5debb9b67929aab6100695908a2a1d990a9c25547f58b9ec7495483cd9a73e1e28da09ffcf08e77b9deaf6 SHA512 18add50afc3ff6b795a94f8fd00f13c666682beb60cea990b5a7c0d3e19a104b21d3eb29c7b8438e4386129b90b275821174eb5b7f98f4523026b6e5d714007d
diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index 43cd1fdd00dd..9db36ddb42da 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 6b7ae1ad8d57..00038fd7d005 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -6,5 +6,5 @@ DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc
 DIST dropbear-2022.82.tar.bz2 2309514 BLAKE2B 56ff931de1e5681850a4c96b8f2c1d90db1680a08a8a741ae3034a433c2780715ede9754357477c9adfe35a310859641d7a03534e6a656e11cd7de8832fbc27d SHA512 94c664e0d56bce3750b04aff166bf073f778dc2aa08e093541b520db1f165d4173e1cf25eef69a59b0a5a0a63cfb3ce8bbf94d6c4010687a0233ba1ad8ea403b
 DIST dropbear-2022.82.tar.bz2.asc 833 BLAKE2B 7d152456f24a61add2935e7f2c9ae7a05e00137ae2c39638004cccc1fd0491311328b5e829443cbe727ae6ec9d58973270b917bae0f23ddcef0b5051b62ca60b SHA512 a45fa49857598195b8d7e51e02bf26498a74c6900245c114ce1fa19bc4eb0ef0518cbb68996c3584c0b98c22bb2078eb963e4a513f0dfb03baae6d04f5911105
 EBUILD dropbear-2020.81-r3.ebuild 3009 BLAKE2B c85c3b010afa5aa31cad91e362385a38d7e39467d2b6b0353898eb603e3624da7b520c79512c3ae87b100445d4470eac16b762391589a2e4091de2a92767285e SHA512 bfb2f428fa98bb9accb282c18cb13378970362705f74a04711604dbe8ad9c25619f2b96d6e5df4060a9b556d04ea7fc7d695a1741481d541cc6032b131fbdfeb
-EBUILD dropbear-2022.82.ebuild 3434 BLAKE2B 68136a480b294f7885413772c284909f9b8f689c58df682c988548d5bd0b0301807893091881047a6174f6eb720075729aeb8c5c8d61fe09e1a28bb70d5b69d5 SHA512 d59db5bcec4cd29cb755dc0970a2880d0b3d36a505d28f48265e3a430ddb68dbbfb095b681d0563621a830f892bdb1a1829dbfb28ab6389f6ac93804fdc6c3d6
+EBUILD dropbear-2022.82.ebuild 3433 BLAKE2B 93f2b3b22bd56539e2566789344d637589c9a37d27836257a6aa64c845af38632195ae26179aeca8adba748bb96d13958969cc7a94845e4e3ced91619451e0d6 SHA512 8a64201de6e9e7a7ec835f4202f9e6c8cd2558feca1c82e22c257e739b48033beed25be133e081155fe731aa91826292d8ca0c6a04bccccc9a077413bb7f202a
 MISC metadata.xml 1792 BLAKE2B 11de80280a55da65d07a8a89195bd8342b34c5ac2b15b8c86aaee64dd81253bd0b3d0b6ce1b5544dbbb290a9359194981357b7e95570e52c45103c482a1828c9 SHA512 1d18e935fab0b524df060d3b4a000b9bd639f75f40328137c7bdf0b6a016307d3ddf7c60bf5e6500489d8e721fca39bc6332ace5fad97d2f0a9de91136da91dc
diff --git a/net-misc/dropbear/dropbear-2022.82.ebuild b/net-misc/dropbear/dropbear-2022.82.ebuild
index 1df3c22e1a2c..9c400702ebbb 100644
--- a/net-misc/dropbear/dropbear-2022.82.ebuild
+++ b/net-misc/dropbear/dropbear-2022.82.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" verify-sig? (
 
 LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
 
 LIB_DEPEND="
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 863074df2a5b..320b55972b14 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/leafnode/Manifest b/net-nntp/leafnode/Manifest
index 7c89bd8f7083..6a2ffee63c45 100644
--- a/net-nntp/leafnode/Manifest
+++ b/net-nntp/leafnode/Manifest
@@ -2,6 +2,6 @@ AUX fetchnews.cron 177 BLAKE2B 40574579d967e174182e291b835fdd1edcf3335dcfb0f3c20
 AUX leafnode-1.11.11-checkpeerlocal_ipv6_fix.patch 607 BLAKE2B bda3b892aec23af06847c1a24f14183a83d1e2e9aba8f296b9a73b719f0cd3fe0abe3cb368bd89f944fbc4e8fb0f45dd517b34246823a42844ff838b89e72a88 SHA512 eac21cb4a1af2ad7be2301c2cd882125d7d7c2027dc5d71eae781eed4e24ec153c55226b880cd0d9f3ead76d935dd124d5605c4388e3fe04c0bda0875beb3fe1
 AUX leafnode.xinetd 230 BLAKE2B 9c76ea43a2c885ac6bd8d7e88385320dbea97d9abadb4768828f4f28ddf6c704a6ef261b6fa1cc0acd2c7ccc3def60f1f10a16024604e7c8348d9113d91c2fb2 SHA512 3f471eb9c4b0f9d8ba51f43bfd53477012b241ea487b1f64b3c4a7a44bc04b1867731aab46ff92ebeaeba61157a58301bcb0f64b80185dea13a33298fc34bcc6
 AUX texpire.cron 158 BLAKE2B 91d5a32888968635bc07f1b6af189d766f3a9e84187d221ecb62f5b8ae13ee58b01e0e180f9c27eff9056c9ccf9b08632bac41074af598a507742756166a45b4 SHA512 a0c1089588349a4d11888a392302e1667c195933744ea4ca844eacf35e2df8d63edce1758491b947b11c35761a52e1f4a17295965a3d52103d46410332d6dc78
-DIST leafnode-1.11.11.tar.bz2 500482 BLAKE2B 41ab1483cc7673259bd8673f539c2d935d1d56e63d7af3beb0ad1786f7b58a2c35e44e14159c2a3e77c6ea3fc51dcf279b59edc8371426b15a15d53e9c48156a SHA512 3a476a32f2e59ed0812379efc2ad1964347094417e7fc01d93f84d0cfaed78a66b2f2f40d1ac36f8a0f8844523ab57b9a605d4bd73ea309248c0562e7c26248a
-EBUILD leafnode-1.11.11-r1.ebuild 1283 BLAKE2B 4c7cde76ab0b810cbba31ca6ef303c3dd6e022e78cedca445f40e0fc179997e544693ed20642793518e24231b5096311786c0cf79b8f09afc57a690dd95eb475 SHA512 9ad7f628e3b6444f7a8dbbc3628f36cd6d59c6e3b3dbc5814c2cceaaa52c0c4833531b848a5837dcec8a2c9deed6b34059e0f217ed682083567366e6584c1ab3
+DIST leafnode-1.11.11.tar.xz 453396 BLAKE2B 70471c7a68dd8c679d119bbca28c0073d78b3d577d3d64aa22540939125aa0bba464e161b6f24d78b6af771df2e0a8b9313c547e3469c4c9b406f7180a4564ec SHA512 a031306389c2c85777c6e9fc3c8529a5ef420e95be301ee60189f20db10cd8cf9328fac8adcd7f56b96d0e4a9c9c9a0c036775e604bd8f6749e5facc8e8228e7
+EBUILD leafnode-1.11.11-r1.ebuild 1283 BLAKE2B 2644d78f8e9998713165b53ea4717e8bb66f38c6251dcd0d4797a977820469301d64c3cc6767c59713b4979cbb9c967d9572d325d8418d780bcd055b39f3f113 SHA512 019ba37afb3c8ce62d6b4c03c1e96c8177a7d76ce8a2de529edee0327dc45cd9c1a125c4eaa5c50fb88bd1e034914f47aa564a79c35682fdbfec337b5fdabe74
 MISC metadata.xml 304 BLAKE2B 5b8da67b125ec274568da7630cde54a4bd785fa2e7855a478a8ce10db6cc58b374fad7d6cc16b303a5edfa4b5af1bbebd6c4379c5f292913c6cf005f3215c42a SHA512 4c0938db77bcc20bcc49a0e9263117d5ec04a3e593379d38f1993aee2d1c9bee2b8a70fbe1664b31759286804ea4ad79e1ac8819e56cd15ab28fb407e432b83c
diff --git a/net-nntp/leafnode/leafnode-1.11.11-r1.ebuild b/net-nntp/leafnode/leafnode-1.11.11-r1.ebuild
index 2d30f104d460..1b08a519c387 100644
--- a/net-nntp/leafnode/leafnode-1.11.11-r1.ebuild
+++ b/net-nntp/leafnode/leafnode-1.11.11-r1.ebuild
@@ -4,8 +4,9 @@
 EAPI=8
 
 DESCRIPTION="A USENET software package designed for small sites"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://leafnode.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 11b2e73ebf5e..8ff303d18be9 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index e4075462acf0..453531655ae2 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -11,6 +11,6 @@ AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95
 DIST deluge-2.0.5.tar.xz 1895268 BLAKE2B 2c815aa9dbbbed5ba780d694b0518f224577b9c370a03712b15c706eda6de55e34b834f624ec18001c9d41b925677b6a001a384691a7ffd9f29c16731a735d4b SHA512 6c2994ca2906fdb92e96aa3534a4ffd5199e9ab6a1b5b12de94c94ec29850cad0cef7546ae1bea5188075fd16a07e584a17bf2f8b5eb1d2b91dee2da1e494588
 DIST deluge-2.1.1.tar.xz 2541968 BLAKE2B 3fe59ad8b402281dd0e19504d10a8d9e2967911e9967613a0d5a146d9ca261cb59d2208f8bd529e7f1da824e125ffb590d12b337dd9655e78b54252b021ae8da SHA512 e94208981aee45f42b88e1c544b07e7b0d0f2c4ade6b7f37257b69d4a3394c89aff217cde699e79ad59de6d2ee4eca7a558f2b85505d2140ba73f1f76f184455
 EBUILD deluge-2.0.5-r2.ebuild 4465 BLAKE2B f5cf7688b3b3fa3d7c71968db2bd2d440143e968cd3e372d706e32e1332683f88657fab3dcb0c91303d8f2560f37e8b2100b820ac2c20fc41a9e5a35ffd6f3ac SHA512 ba0e72b842538b088dc463802f15a8c8a0b2684b0e6c35335096acaa255b818fde719a442ca0fa2d9b82c4cdb74459de777efcda9df44e6ed3fb552659a10a35
-EBUILD deluge-2.1.1.ebuild 5735 BLAKE2B dce52eb9a2ff034c44814b6fd2b071d990d66f7f1346e311ed6d8246ba193ee2f658f3f432415b03aa9729ae9fede0b96046cd21562db3fb8065ccaa360bb669 SHA512 039e723f2588701d2c6798229c4f2765de822d480a818570ed46c83cbb286fbc01a1166ad89fe5340c62910d0c04e3b130aba703cfa10201fcd46a9a79b11e32
+EBUILD deluge-2.1.1.ebuild 5734 BLAKE2B ac4696dc780bfec5e14faf517580305a821ed7165322adcc66f6b714fcd38c631bbe5f117ddb443ba76927ee25c42e9c78059cdacbbc2612249dfebe1d8b6b22 SHA512 9db00fb4471c1d7c23d883af9a268ea4106dae5d7f9500a70dac7ce06fc1fc45c10cc0c75cc2e648a132addd6cab6b79c13b620cef4e4eab1739c19e3554b5f7
 EBUILD deluge-9999.ebuild 5730 BLAKE2B 01949be06bdb0460438c418dfe428115b412b36516eede367510f531e9a5dd2eeaa8a39e8691fe28b082d4712c0ec32570826c6b3936f0e09eb9bf5c15663d2a SHA512 dc2e2c9bc09ea8c6e3c0fae62efd003e8c9604f36c0cf60a53ba651dcc73437173a860a0e6551fe1a21b3b812231f567cded16db16b18f12bd771ba02b6c783d
 MISC metadata.xml 675 BLAKE2B 79c1f6e56c1e5331a1722d6b98da4431e0fd9e19d1c1fd00677c20e3d2214f97d4f71b751edac9ef70e2552abac2b650ed704121275a218374386ff95ef404dd SHA512 1da3e3937d14728111aff841900bcb33912ffe29cae6c14dc401547897d777df37e373f2f65ba0fde00624855d33222445ec3a4edcc0478976bb992ac915d5b1
diff --git a/net-p2p/deluge/deluge-2.1.1.ebuild b/net-p2p/deluge/deluge-2.1.1.ebuild
index 82e9d085a02a..666613d61feb 100644
--- a/net-p2p/deluge/deluge-2.1.1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 59a0f119b2b1..be3222897390 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 0a85ec299e8d..0aac71556bf9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -268,35 +268,6 @@ x11-themes/e-flat-theme
 # Removal on 2022-11-11. Bug #835013.
 app-portage/repoman
 
-# Michał Górny <mgorny@gentoo.org> (2022-09-11)
-# Bad quality package with failing tests.  No revdeps.
-# Removal on 2022-10-11.  Bug #869650.
-dev-python/pytest-pylint
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2022-09-10)
-# Python 3.8 only. EAPI=6 ebuild. 5 open bugs. Issues with newer
-# dependencies versions.
-# Removal: 2022-10-10.  Bugs #869524, #684334.
-net-analyzer/flent
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2022-09-10)
-# Python 3.8 only package. Tests are disabled. Newer targets fail
-# more tests then 3.8 target.
-# Removal: 2022-10-10.  Bug #869521.
-net-nds/nsscache
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2022-09-10)
-# Python 3.8 only package, with inactive since 2017 upstream.
-# Tests fail and doesn't work on newer python targets.
-# Removal: 2022-10-10.  Bug #869512.
-dev-python/python-etcd
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2022-09-10)
-# Upstream repository archived. Python 3.8 only, with issues for
-# newer targets. No reverse dependencies in tree.
-# Removal: 2022-10-10.  Bugs #869503, #747997, #832242.
-dev-python/SaltTesting
-
 # Matthias Schwarzott <zzam@gentoo.org> (2022-09-08)
 # Breaks kernel builds with BTF enabled.
 # Bug #868762.
@@ -502,13 +473,15 @@ sys-devel/automake:1.11
 # Migration to it is expected for GNOME 42, NOT to be unmasked with GNOME 41.
 >=app-arch/file-roller-43
 >=app-backup/deja-dup-43
->=app-text/libgepub-0.7.0
 >=app-misc/tracker-3.4.0-r1
 >=app-misc/tracker-miners-3.4.0-r1
+>=app-text/gtranslator-42
+>=app-text/libgepub-0.7.0
 >=dev-libs/gjs-1.74
 >=dev-libs/libgweather-4.2.0
 >=dev-python/nautilus-python-4.0
 >=dev-util/devhelp-43
+>=dev-util/gnome-builder-43
 >=gnome-base/gnome-applets-3.46
 >=gnome-base/gnome-desktop-43
 >=gnome-base/gnome-flashback-3.46
@@ -520,6 +493,7 @@ sys-devel/automake:1.11
 >=gnome-extra/evolution-ews-3.46
 >=gnome-extra/gnome-boxes-43
 >=gnome-extra/gnome-calculator-43
+>=gnome-extra/gnome-calendar-43
 >=gnome-extra/gnome-clocks-43
 >=gnome-extra/gnome-shell-extensions-43
 >=gnome-extra/gnome-software-43
@@ -530,16 +504,17 @@ sys-devel/automake:1.11
 >=media-gfx/gnome-photos-43
 media-libs/libshumate
 >=net-irc/polari-43
+net-libs/dleyna
 >=net-libs/gnome-online-accounts-3.46
 >=net-libs/gssdp-1.6
 >=net-libs/gupnp-1.6
->=net-misc/gupnp-tools-0.12
 net-libs/libsoup:3.0
 net-libs/phodav:3.0
 net-libs/rest:1.0
 net-libs/uhttpmock:1.0
 net-libs/webkit-gtk:4.1
 net-libs/webkit-gtk:5
+>=net-misc/gupnp-tools-0.12
 >=net-misc/rygel-0.42
 sci-geosciences/geocode-glib:2
 >=sci-geosciences/gnome-maps-43
@@ -547,7 +522,6 @@ sci-geosciences/geocode-glib:2
 >=sys-libs/libosinfo-1.10.0-r1
 >=www-client/epiphany-43
 >=x11-wm/mutter-43
->=dev-util/gnome-builder-43.2
 
 # Thomas Deutschmann <whissi@gentoo.org> (2021-09-07)
 # Masked while being tested and reverse deps aren't fully compatible
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 59dd40a04d70..0dc275ce4cc7 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5259,7 +5259,6 @@ net-analyzer/echoping:priority - enable socket priority support.
 net-analyzer/echoping:smtp - enable support for SMTP protocol.
 net-analyzer/echoping:tos - enable support for TOS (TYpe Of Service).
 net-analyzer/ettercap:plugins - Install ettercap plugins (et_*.so)
-net-analyzer/flent:plots - Enable drawing plots
 net-analyzer/flowgrind:pcap - Enable packet capturing support using net-libs/libpcap
 net-analyzer/fprobe:messages - enable console messages
 net-analyzer/goaccess:geoipv2 - Enable support for GeoIP2 through dev-libs/libmaxminddb
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 3720be4ee1b4..bc1f4ff440a0 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/foxtrotgps/Manifest b/sci-geosciences/foxtrotgps/Manifest
index f911d6b6ce64..545f72e2e231 100644
--- a/sci-geosciences/foxtrotgps/Manifest
+++ b/sci-geosciences/foxtrotgps/Manifest
@@ -2,6 +2,6 @@ AUX foxtrotgps-1.2.2-fix-some-receivers.patch 1439 BLAKE2B b84bac776f7a55af7ee52
 AUX foxtrotgps-1.2.2-gcc10.patch 591 BLAKE2B fac2f1f2f3ddbde8c1a959c58600183eacde1a541731d50da22c7e8ba5eb4c3bd64d1d5a6b92e6f85001d4bafb4eb0865421e72d9e48108ebf6e2fb2eec3d6e5 SHA512 b9dff10263f033021d89dfba583b7f0f7e34c06c8340126cf36a1d8145b2fd9e449edd64e7a9bb83d058597a8669567cda896521130c6804afc4286c54756e8b
 AUX foxtrotgps-1.2.2-gpsd-api9.patch 1178 BLAKE2B 9ca91432862f1b488b497d44a7252be373d560287c0751363b306dca32d1c21f9de93dfa6987e3b67ff35e340f626943c9c6843b715071e6fe4fdec6e22598b2 SHA512 a2c89485f1bfaa9053a1a8ee47e3803345334a1504ce7a6af2add8dd0ab7d17e9651651263e8141e27f21ab32c3bd5852e96ac42934e6422f9d236782b7b7cd8
 DIST foxtrotgps-1.2.2.tar.xz 1692120 BLAKE2B a8a70948992cd25609189caae3ec4136d056f86c85dc8b6e9610e935f60499f7bd78f083cc3f3e0904ec56eadb492babb7c8016e0270ea3285dadd99b32fcca8 SHA512 57b436221698fd81e58052f847e19999783e8dd1a165b196c80616591f22b36896454a87dd5a3c2c25bdd4654b8110dc0f320f70f0592ed58210fcc0be98f2ff
-EBUILD foxtrotgps-1.2.2-r1.ebuild 691 BLAKE2B 9a557caf8dd3640c61a74eea186d8e727667851a67c2722438302b5a69b2f94f88ca81e83a4d85c7da0c57212e2a5b17f740500ca183b381d5b06c0abc7c0927 SHA512 9c52e6ea6885a476488d8ed84e7379607091f9b11efae03f83b7eca25818baac19effafa086c0f26e024ac8e485b5fa50b21a3aa49b4fbd5b77dab863c5463c2
+EBUILD foxtrotgps-1.2.2-r1.ebuild 698 BLAKE2B 2e28338e9985f447b4646fd272888c2e132e749a55519c841292e62d7d8727f3ec32a229531ef96974f84b401c4908dfadee430f8994dbad6b14218d45a0657f SHA512 4c4eed947af8c9c6ff51aae5031f62a6ab632c052cc06f93780b4dc456b30f97e82e414e59b9f8b067dff08e70f4334fd745c6eaa0e20c7ee508028b070e1fbe
 EBUILD foxtrotgps-1.2.2.ebuild 646 BLAKE2B 08ad38e71d5a94f3fddd0b639a9b4e5c6f823ac28f860e977969c985d57ec6480181cb49bcb5ce9db89108df867f7e3d7af258db6d01caef18683805e2a661ad SHA512 461f2f41e97ccbd522b9f79494ea450943292c12178ee8a615c1d7448fa27374725f59cebb7e305b6d09f13fd8c19b165edca5df1f751c4a7faf22405c177e15
 MISC metadata.xml 639 BLAKE2B c2642261babd86bc2137b2b1cfcb9e625679c373f6c2539a2d054e3dc8ea3a13e6b07ee49839ad0e00c02603205ed07de331f43d2dff2e15d92bec034ea8e4f3 SHA512 f2e63e8c67cb7a005075c388a730198d6e4afe3323f99edf35cd8b422eb8a08f02e7f16debf2b833492f2f04bd024a1d1cd8813c633cbe50d9c907871b827cb0
diff --git a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild
index cc36b1da8d8e..e45173eebb13 100644
--- a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild
+++ b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.foxtrotgps.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-libs/libxml2:2
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 2bd6d39c4a61..e1a5f83f1c55 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index 71107e650b4f..0f283c34a154 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -18,5 +18,5 @@ DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc1
 DIST ipmitool-1.8.19.tar.gz 641383 BLAKE2B e1db12bb7301cb4b551f87fbfcd405b3597a1f32c45447b2b239d9d43a2cdbe213ee5408291d50801035cc80e28078fb3a778ab28335665bc3316798c13ea1fc SHA512 2d91706e9feba4b2ce4808eca087b81b842c4292a5840830001919c06ec8babd8f8761b74bb9dcf8fbc7765f028a5b1a192a3c1b643f2adaa157fed6fb0d1ee3
 DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45
 EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6249 BLAKE2B 3d5060e5488181de705843c4845ac1c1ff50fb9f2096ab2876b111db2312079cb6111682f34faaa9edb3b2e30fb86db1a2d7359c47f7289d70b2087a3827526d SHA512 ebfc290090a08042a469ed30705c0f16f9b6e6ab15d8a0bf18f244037017b76a0d3299a15eb9ea22abf116d31b1bb74f6ec441b2199ea2fd7ee2694bd3ff3037
-EBUILD ipmitool-1.8.19.ebuild 4145 BLAKE2B f8e276392522585a01c41ca6d515c2337f42805b70dda8bbdb3bd642bb41f94640b6febc8984143db3140583438c0ad08f55087482fe2de952ba6144fd1b19ed SHA512 a330f1b066ca6d9bfc76a3b2716e9bdf61d8793994c99ec30c39d21a5500b1248d7a2aa9e85735ccae1dd6659e3eb0c7c05f5f6fee2c86c019d0cc1776e48e25
+EBUILD ipmitool-1.8.19.ebuild 4144 BLAKE2B f6213628db98f581297d0d8e2a9a7ccdbac2d536f8b6af306f18767e4242fd4aed3ab83ba656ab9be664c096872b216e58c32c9eeda27bb445b51253e6d53aa0 SHA512 08df912e79129ad886638d5399d02e2fa47b9184d9656abb2b40d86d96727d12ded3f6747d620e59e718a946cfd4608620e9657068534487a3943f234846fe93
 MISC metadata.xml 693 BLAKE2B 7a0cab3772eb4ebc0529b22ab7fa21eae882da4b652fe67c3abfc8e25b1f5a6d14a52089ec676a17a0a925436675ec80409cde8d2554c4f6dce50c4afc736b14 SHA512 8a2ace6c302db4437e6903899edf87aa005f47c5e84969e4d846f67e97a027bda05fced0ca2b1a8a09f12ed5be3ce9bdabfc1b75643c2a9435ba706a452eb055
diff --git a/sys-apps/ipmitool/ipmitool-1.8.19.ebuild b/sys-apps/ipmitool/ipmitool-1.8.19.ebuild
index 210c44be0470..2891e5b44419 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.19.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.19.ebuild
@@ -24,7 +24,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ~hppa ~ia64 ppc ~ppc64 ~x86"
 IUSE="openbmc openipmi static"
 
 RDEPEND="dev-libs/openssl:0=
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index c51f0ddb5adb..d479f5000be1 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,9 +1,9 @@
 DIST man-pages-5.12.tar.xz 1778220 BLAKE2B 347c5ef63cb80134018f322f810545354ccc7afdb8acb62f83e3b06ef15d7fbe6c0c68db37f52ce9727682a856a7810a5e64f1dcbe1cc11b22f83fb0273f7add SHA512 455794ed6e3bf20649f78b464300d5c1adad5000668a82a1194c1af8bdcbd064e4d930696cbe534481368d6526c7cda69927e958b9a868d95891202476fb4608
 DIST man-pages-5.13.tar.xz 1788980 BLAKE2B 7cca88b7f201d177b087893f60e6a87fd3ed8c78a183bd6ebcd0c28961f5f5d24aa2ba9d3a1d9cec4e0fc9cc0b26489c91e991a2d4420c28e1f61b850b882752 SHA512 a68c0bd5f078aff2f13f962060863e5d30734c1c562e8e9e3d5eda5a329b18ad3e9b4ebb883d31cacfc0a476f91fccb8dd4257598acd75d09dd21351893d3499
-DIST man-pages-6.00.tar.xz 1797552 BLAKE2B 11b0b402200557b40df9d619b93f7f6b0dab03c1fc76ab382d715bf82f00526cedc5984e5dabe933d1ff59b882dffadfdfb290099fa106073d20bd7de5ac774d SHA512 f761a75bc5e8ec18d89db3ecfe254c74228598aa95d6201d5985bd5a12ed73ca703028085ea303534f595ff37bd20de1893b2004131bb17b1bae56956e154b20
+DIST man-pages-6.00-upstream.tar.xz 1787416 BLAKE2B a61a6b771fc3a5f4412d460f53bcb9a3424f29bf1d0001caea2df1f20340da30e0ee89a35da6b9dad7ed910e00262dbc89aeba770ebbf0d13670b5f618a7a586 SHA512 c0286146fed800175316610998ea887568c168bcf3ec9a401209c6c159cedd9258c1e77e513cbe835268b563dd766b3ecc24751c6ab49ebb7ace8c84d8b83e68
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
 EBUILD man-pages-5.12-r3.ebuild 2227 BLAKE2B 3b3bd8ef026cdd916dd380a88a79e0bf79752309440629bfaed6791c18e09e86c7703b042f241e86c69d4bbd92b9cd37f9b450c05628555f2eb4d79a85026cb0 SHA512 7c054aeb1a8dee95e8f94ddc7226e83fb21fb8d8080111b0f20173c911fa37c6d63976af8db7cfaadfb6223ca205cc29fe33ec3c84aa7a78a71bf0b1a2034ed9
 EBUILD man-pages-5.13-r2.ebuild 2235 BLAKE2B 69ccf3e43c912486f4a10dd6a96a084eb51e2373d6eaf5fb2d1bdb1168d6b7c6a2157f97ebd3a30c9b3e562b1d047156f6ad92b1cf7aa593c84b3a2bcccc14f6 SHA512 9b48404aed7680bfecda777399c24c9e93d4415ec4585832e9a6eb2f621a9ed471e3773be86d798e96b45784b03b42df28528af7cea228f024fb1ca4586df26b
-EBUILD man-pages-6.00.ebuild 2813 BLAKE2B 1e809db727658802e94acf15284e8d8d1f57a05e6316cb7b8872b41877e44df024a6420c2865a5e7a8fe25a5f35d01be35d32e79f8ab76d325e1212d85944476 SHA512 4026e60e53d7f079212fbb1dbc47d15cba20ae8d03ae2d2616a113cc14ecc5cac129b3e550ba58b4e17d34da3a2dabef269fb95bc4387b51653863e131f6f0e9
-EBUILD man-pages-9999.ebuild 2813 BLAKE2B 1e809db727658802e94acf15284e8d8d1f57a05e6316cb7b8872b41877e44df024a6420c2865a5e7a8fe25a5f35d01be35d32e79f8ab76d325e1212d85944476 SHA512 4026e60e53d7f079212fbb1dbc47d15cba20ae8d03ae2d2616a113cc14ecc5cac129b3e550ba58b4e17d34da3a2dabef269fb95bc4387b51653863e131f6f0e9
+EBUILD man-pages-6.00.ebuild 3508 BLAKE2B c6ba7071b52373da5cfb1cafca76ff35a62e36b50107dc4f3bdc43e9c25d7c3110ba0a46c2727727a734dbfc9fceab015b45c67afe90c3e08625c68a2d5be963 SHA512 57cb535caf7c75a69baa547cecd82ae439e22b7d6c49b636cedb534f38cf6c8bdbdc79da9483e95ace5077115144f5b4c48406ada6962f21fe26ed330eb3c94e
+EBUILD man-pages-9999.ebuild 3352 BLAKE2B 8b11a197e756847c0a3e4befc9cfc120a3d235ec1ae651c35599157cd5bd26e8313d78cafb5b1f1e0d27d9160d6917ace7aabab57b8fb7f3d8f1c0ae070bca2c SHA512 e13536dced92ef55c52bc70e664f77e1b4eecedbe2ccdd01ace9e43b0ee15a34c1bd94cefce7b974c167cc60ef17c2f6080e64c96edd7d5cc77a179408e7166e
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-6.00.ebuild b/sys-apps/man-pages/man-pages-6.00.ebuild
index 14b792cd94b2..290e9994e445 100644
--- a/sys-apps/man-pages/man-pages-6.00.ebuild
+++ b/sys-apps/man-pages/man-pages-6.00.ebuild
@@ -3,11 +3,27 @@
 
 EAPI=8
 
-# Sometimes there's no dist tarball available post-release and upstream
-# encourage distros to make their own. Set to 1 if none is available, 0 otherwise.
-MAN_PAGES_GENTOO_DIST=1
+# Maintenance notes:
+# - Upstream are very friendly, do approach them if have any questions;
+#
+# - It's considered fine (and somewhat encouraged) for us to make snapshots
+#   if we want specific fixes, perhaps aligned with newer kernels, glibc, etc.
+#   Just generate it with 'make dist'. We can set DISTVERSION if we want a vanity
+#   name or if the comit hash is too long;
+#
+# - If we do use a snapshot, *don't* grab it directly from git and use it
+#   raw in the ebuild. Use 'make dist' as above;
+#
+# - Sometimes there's no dist tarball available post-release and upstream
+#   encourage distros to make their own. Set MAN_PAGES_GENTOO_DIST to 1 if none is
+#   available, 0 otherwise.
+MAN_PAGES_GENTOO_DIST=0
 GENTOO_PATCH=2
 
+if [[ ${PV} != 6.00 ]] ; then
+	die "Please use 9999 as a template for the next bump for SRC_URI fixes."
+fi
+
 DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
 HOMEPAGE="https://www.kernel.org/doc/man-pages/"
 if [[ ${PV} == 9999 ]] ; then
@@ -20,11 +36,11 @@ elif [[ ${PV} == *_rc* ]] ; then
 	S="${WORKDIR}"/${MY_P}
 else
 	if [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] ; then
-		SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+		SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-gentoo.tar.xz"
 	else
 		SRC_URI="
-			https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
-			https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
+			https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz -> ${P}-upstream.tar.xz
+			https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz -> ${P}-upstream.tar.xz
 		"
 	fi
 
diff --git a/sys-apps/man-pages/man-pages-9999.ebuild b/sys-apps/man-pages/man-pages-9999.ebuild
index 14b792cd94b2..4da3d9ecbf1d 100644
--- a/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sys-apps/man-pages/man-pages-9999.ebuild
@@ -3,9 +3,21 @@
 
 EAPI=8
 
-# Sometimes there's no dist tarball available post-release and upstream
-# encourage distros to make their own. Set to 1 if none is available, 0 otherwise.
-MAN_PAGES_GENTOO_DIST=1
+# Maintenance notes:
+# - Upstream are very friendly, do approach them if have any questions;
+#
+# - It's considered fine (and somewhat encouraged) for us to make snapshots
+#   if we want specific fixes, perhaps aligned with newer kernels, glibc, etc.
+#   Just generate it with 'make dist'. We can set DISTVERSION if we want a vanity
+#   name or if the comit hash is too long;
+#
+# - If we do use a snapshot, *don't* grab it directly from git and use it
+#   raw in the ebuild. Use 'make dist' as above;
+#
+# - Sometimes there's no dist tarball available post-release and upstream
+#   encourage distros to make their own. Set MAN_PAGES_GENTOO_DIST to 1 if none is
+#   available, 0 otherwise.
+MAN_PAGES_GENTOO_DIST=0
 GENTOO_PATCH=2
 
 DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
@@ -20,7 +32,7 @@ elif [[ ${PV} == *_rc* ]] ; then
 	S="${WORKDIR}"/${MY_P}
 else
 	if [[ ${MAN_PAGES_GENTOO_DIST} -eq 1 ]] ; then
-		SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+		SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-gentoo.tar.xz"
 	else
 		SRC_URI="
 			https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 02bacf3b3aa0..2fd184f3d234 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index c758acda3af3..58365fcf398f 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -2,8 +2,6 @@ AUX icecc-scheduler.service 264 BLAKE2B 27b85732b81c77d419a3acecdc31442fa6ebd3cf
 AUX iceccd.service 273 BLAKE2B 6d7ffa2776a8e2d813949185667f949a676240b231bf0c4d7640115fd79cb0b63a2a78506fdf4c557428390b56161bd1a296cb0f44a2505ce61a8de3aaa0b891 SHA512 1383cb4ef14bb673d49d000175dbc9363a55dc1eeb469abf2a393d7693eae0a9b25687a317431b02fd054c4f59bcba1a8eb7132c473c66236d7e2106b35fe079
 AUX icecream-tmpfiles.conf 103 BLAKE2B 4a263834594e0f1fe8cc8e356520f937cfc5f1abd9f019a2b88075643ff651d002d49de113d3ab4bcbc10e22b43e03ee85ea8f948765800ba74c43e5dd3ca0e2 SHA512 152d687a9fe18c71f08c002ee87d36fe18572a6e5b7ab976bbde784c6ff80c5ecda59f9cce4561868fa53ad76a040674af4b0579a97c78c9bf141bc0533f7631
 AUX icecream.openrc 1669 BLAKE2B 18726b8d8752f3db9a2864612423dedd00b347a6802012de5c0ca30d2516b1995c9bf4ae32d1d320a5e401d9a3466f8fc7165fa805e0b9991c16b0f4a96d59d6 SHA512 8c3c66ffd508284f0dc7c9e2695d02ff283048f82f80ac9b41982b6484967b39856a4e7651015d4bb10f74e3f0a7435bd59c0a0ec5eb62bc5aee49cae0354fde
-DIST icecream-1.3.1.tar.gz 224068 BLAKE2B d7d66dadf27b0b88ab706bf217ce2b0d33b5db2ed95e48c4e9dcbd000931688ad6809ecbd4e14f0f3889bcebddc8543bd364c9dda09ba71e5dc04d0a5a2122d5 SHA512 d850394b4093defcf2c50bb3f9306348a45bf17d21f4730baeee7125998c2a548b7b3a7597785855d7e388e84830769bf0ec1c4136330a4c8e359cbdd111f5da
 DIST icecream-1.4.tar.gz 232707 BLAKE2B 5fdebea4d0eba4a99e8c7c01acab46ec323a887d3fe9944da23ae7089403a9ebf7bf9870ca61af49578af6adf49679341f7070f9e3da3e8c7c2f50d9d4e7c3fe SHA512 b77dd630c51b7b6b4d7fa06cd14a580891b974fe2d50074f7a3b129adc558fc7ce19b3a3716a6798c2fd0f7d0d3a1bc295bbedee3ed6dafa015f309c7c2590f5
-EBUILD icecream-1.3.1.ebuild 1686 BLAKE2B 179d8da593e7a3d45930ca0fddc5202bcad2f8b5229e9dc2624ba0cc170075fd7c0f7eb635a95a9141dc0839bb92a5420c4e97d7b0008ad382cdf0eee44af4e1 SHA512 361b643bc8d83e1102f266858a9c12c70cc37267033b0dc22633ff6a9cae903fb62702ad7c8f52306e5a01030c6a6c3eab8e19063775d2146019f90e5c6dfb2f
 EBUILD icecream-1.4.ebuild 1707 BLAKE2B 05f32aed90adefb4355143dee7263bb5e183172f252c6fafe3b2c9e05d0b291dc3be277017b2104bd98d6165827575e287bd16a2c79f1ee1aee34ebf44587088 SHA512 ceafb4b0903c4eebb3a8998c1a7c1933c42c02ab75f7a66adef4c5699f6df496d023041956ee70d6dad196dd57b1194ca5a95bcfea18bcc82410e4f6a5c02605
 MISC metadata.xml 337 BLAKE2B 0a42596492049a954cd58c992c68ef68bec2a53a4eaaa83978b2d56c577f6c54fc8bc18b7621b0561fd8a348996d138e8a676ea129c94d08633663d3e254ac1a SHA512 7c96d0c35a47e595cf50c1c6efe5ccb186ec974ed0b31fea908240380f796fb9e77e2eba0ce9995a8473cd836056421d6475022f68685d88f8c360292d7284ec
diff --git a/sys-devel/icecream/icecream-1.3.1.ebuild b/sys-devel/icecream/icecream-1.3.1.ebuild
deleted file mode 100644
index 72ab4fad07b2..000000000000
--- a/sys-devel/icecream/icecream-1.3.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-AT_NOELIBTOOLIZE="yes"
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Distributed compiler with a central scheduler to share build load"
-HOMEPAGE="https://github.com/icecc/icecream"
-SRC_URI="https://github.com/icecc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-
-DEPEND="app-arch/libarchive:=
-	app-arch/zstd:=
-	acct-user/icecream
-	acct-group/icecream
-	dev-libs/lzo:2
-	sys-libs/libcap-ng"
-RDEPEND="${DEPEND}
-	dev-util/shadowman"
-BDEPEND="app-text/docbook2X"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-clang-rewrite-includes \
-		--enable-clang-wrappers
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-
-	systemd_dounit "${FILESDIR}"/iceccd.service
-	systemd_dounit "${FILESDIR}"/icecc-scheduler.service
-
-	newconfd suse/sysconfig.icecream icecream
-	newinitd "${FILESDIR}"/icecream.openrc icecream
-
-	keepdir /var/log/icecream
-	fowners icecream:icecream /var/log/icecream
-	fperms 0750 /var/log/icecream
-
-	newtmpfiles "${FILESDIR}"/icecream-tmpfiles.conf icecream.conf
-
-	insinto /etc/logrotate.d
-	newins suse/logrotate icecream
-
-	insinto /etc/firewalld/services
-	doins suse/iceccd.xml
-	doins suse/icecc-scheduler.xml
-
-	insinto /usr/share/shadowman/tools
-	newins - icecc <<<"${EPREFIX}"/usr/libexec/icecc/bin
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]]; then
-		eselect compiler-shadow remove icecc
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process icecream.conf
-
-	if [[ -z ${ROOT} ]]; then
-		eselect compiler-shadow update icecc
-	fi
-}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 414b96a0529f..952d10fe7796 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 2fc70273ed3e..637ea678b99d 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -9,7 +9,7 @@ DIST llvm-project-15.0.2.src.tar.xz.sig 438 BLAKE2B 37a3a7fbc2d74db9060e85f04e15
 DIST llvm-project-ebb258d3b0785f6dcc65e1f277d0690891ddc94d.tar.gz 168823463 BLAKE2B 111afe0f6ba6cef28c3d0162c9c650d15239f981949030768780ebe308418346d0ad367e0e58417832ae43e57b27bccaf56415f81e8221c6c5e78d1113f5617b SHA512 80351d7eeac77a15bf5613b289c71d718ecaccd8a6a4ea6736ed8bfc15c8154099c771564f99ea6c8b491f99bf1ca3a45fac977d638f6a03d7f7b42ba522fa20
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD compiler-rt-13.0.1.ebuild 3880 BLAKE2B 83202517f413772d355aa49b5a3bd8b7000c86f6538da1a5ae96de5e84bc7536d0e639b530d1f504dc68b769565504434cc80d25426207b19283b9bc41df3388 SHA512 fe5329aee6c29d408c67af9e9891205fcdf313676780b948975f94ddce31b3f54e68cc041233c81b3005ff94f7685dcc09044f3634760d90e8c18c61f63651c3
-EBUILD compiler-rt-14.0.6-r1.ebuild 4249 BLAKE2B 3c51da2e6e0a043d92357bfdac72380152623fd62387c2ceba8dce19549ca24d5d23235d7c860f502ea21973f6fa47960e105691531bd300e3be004b8cce6bb3 SHA512 da947456142aafdbd3478cf9f0355e409d6d14ac8d5259bea8ad73a79b2c4df679bef351751a689feb9f8a3ad35a725dd0952e69631734261e4cd50bcbda4586
+EBUILD compiler-rt-14.0.6-r1.ebuild 4248 BLAKE2B 8efb13b1c805b5178f01036e5ec3b9bf047066fd5d2fe09706bb40e1317fe8d2c3d72f2fd57536fbc5a0eeb6cc1b59d8290b2a342fcf8d6fc5bb8c6092276255 SHA512 52ae7b4f940ecf4f153ec001954589b4ece940e8a6302f5493d6edf5788d9db6f212fb165c7a6e07d1f8ad93e89f19520d0b65b9125a71e922b11503073f9e3e
 EBUILD compiler-rt-14.0.6.ebuild 4030 BLAKE2B 9881380671f25916b7a9356e14b45fd30b7c5cf5263fcf975b0d5ce0333389d519457dabaf1ac8dfc55f5206594335a5f996adcf26880f8a30c8a5ab99c3c391 SHA512 1ec4d79d5d319c5345caa7399c4d4bee5416af3952b9936f119764e17b1c05c25cc818a0c123c8b55ee31503e633999384d0a227a6c84d380cdbdc169f0f43ea
 EBUILD compiler-rt-15.0.2.ebuild 4261 BLAKE2B 1a632e00f5dd36c161f2df23dc7c9292429ce18f5df652480eba6592b4dbc72c0dc0154c40403e378a641e63af577357dc349175492cfb4b17534dc26b71e48c SHA512 d4cc5d0c50cb16ff74a74feee38f9430e930c76b57b6b038bf5c729159bc1af2263daf16cbe22b04d85393ee79b818975285a0330849c57274343cc4250f9ea8
 EBUILD compiler-rt-15.0.3.9999.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153
diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild
index 833be677be7e..fdb28e83c4ad 100644
--- a/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 55f9f60e2bae..6b84a897ddb2 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/libapreq2/Manifest b/www-apache/libapreq2/Manifest
index 57b272841180..56f5e16be8c7 100644
--- a/www-apache/libapreq2/Manifest
+++ b/www-apache/libapreq2/Manifest
@@ -3,5 +3,5 @@ AUX libapreq2-2.08-doc.patch 1188 BLAKE2B 296bf0b1e23389c0d418df23768e68932c22f0
 DIST libapreq2-2.16.tar.gz 839264 BLAKE2B 6a79e0281bb24962775f6c2fcc906d07a2f7643f608871018a647a225329c45516f1afe12e27c432449765463b2a4e823a728051fa73938e97ddc828b94c4732 SHA512 aa9e751a3f0d6a9cb587aa1c5408e8d9a073560860d7f653776196fe3739516df16abe943c9cb0460cfb9b68a2d79ad651cfd5e4a30a2ca34d6dc3ced73f628c
 DIST libapreq2-2.17.tar.gz 849867 BLAKE2B d2fa15693c200925e4926f207f1e023cba59ac0bfe3af3a8ac12880020bb00625c7fa21478c6562f9995d5307151b865efb83b837f45213d73fc523a1a864899 SHA512 89b139b8673145d9e2d8fd77d36f878c519c1deb7f9b853cda2a15d34cbb619d1c5e784ba21553f23c2ef07803f07c75a83d96cd770f80e1b36283a4cbb88999
 EBUILD libapreq2-2.16-r1.ebuild 1640 BLAKE2B 1bb13f488751319ab29288b37f799f933a54865aee666ea796b1108567d2d7fd4ca99b351213d7ad0eeefcb793195f484b264b115e548a531409a7127c8da083 SHA512 ec28ac5a8a2eb6175c4fb6b7cabe99d762e180d5360e6bdb501ddb3be23a3fc0053631ee2121de837457b057929c49500cdae8dc888b2fa3534501bfd9bd0025
-EBUILD libapreq2-2.17.ebuild 1642 BLAKE2B 4f25b7ad1160f20c11255a2712f1b8f1edfadda128c1a5e3b1cc935d3dd2a84910badb91bc8bc0709cdc6c9bd59db26804bcf97b2b4dc8d99d05ff247c714790 SHA512 a7a141a68ae9774b035b407bee6beec1bf8f780166045e8a2341df4b924a5a996e9da35d2df0b4e9ca596a05606066e6d461861dbe8a173f391dce5cfa0f291c
+EBUILD libapreq2-2.17.ebuild 1640 BLAKE2B 1bb13f488751319ab29288b37f799f933a54865aee666ea796b1108567d2d7fd4ca99b351213d7ad0eeefcb793195f484b264b115e548a531409a7127c8da083 SHA512 ec28ac5a8a2eb6175c4fb6b7cabe99d762e180d5360e6bdb501ddb3be23a3fc0053631ee2121de837457b057929c49500cdae8dc888b2fa3534501bfd9bd0025
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/libapreq2/libapreq2-2.17.ebuild b/www-apache/libapreq2/libapreq2-2.17.ebuild
index fb4e7ad5dd38..4d50482c8c95 100644
--- a/www-apache/libapreq2/libapreq2-2.17.ebuild
+++ b/www-apache/libapreq2/libapreq2-2.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="perl test"
 RESTRICT="!test? ( test )"
 
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 42433264c4a6..433fd157f5aa 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 9a03fe250c5e..4453bec0e0ad 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,9 +1,8 @@
-AUX lynx-2.8.6-mint.patch 1001 BLAKE2B 960b2401c262d2b3cb46a443eaa1bf0e8f890745aa2dd8b2455304ff3add46152e3844639fc033d686d0d473e8abc1ba148dbaeecbbd8965e6d941cc75564ca8 SHA512 c3f99d760886139c85aca68d99e4a51d57690c02348c6a5c42bbd640cb848682070e6ca7f13ae7a85ec58659765cb4dc8c58f66919d9276c96dc93f5f31f6674
-AUX lynx-2.8.9_p1-parallel.patch 2127 BLAKE2B f78dd62fdf81dfa3403ad358286dc2e27d76b2bb7a65d877317a22635931499687ac75fea6d02866295a65851cfcd7c5ebf5474e1120104d998119eed132e82b SHA512 fe5ea8caab053c0d4240d34c63ee7cfb81254851eaad7e206e2b840b963ad160982566ba5cbee5fa98c732b3ddd3ff8ed88e3b2b8e6328aaa9d8b5350e2d97bc
 AUX lynx-2.9.0_pre9-mint.patch 434 BLAKE2B 90b070232eca8f6e8b1cbbd44aff0f6a9c9403c1321db54b14fc468845248285b45dc5a8e57e1ce9021b4ffe517814c5c0ae7c1c270d7db8c1790b417b2806cb SHA512 0ca26d35c8f5493e720913caf5289e89ec7238b0615a7b4198c8cd1e070afc3f776c8e5bdabbf6d252a4060b486e0333f2f94244163413443504979f5cf32fcc
 AUX lynx-2.9.0_pre9-parallel.patch 2625 BLAKE2B aca2c28c6d73f0b22fe378fdad533264580b9cbbf4fc27b780f6063791b473c10b968a5d20a7d0224006b9a8f2446d2a5e49d82b5ebf6dd72ea27c0439f4ecb1 SHA512 e5bc3076deb0766a5c9f388f92d9aed13e20f01a2e5713bb0c17f3bc20c0949e81d5fa399ceb0941dafaa7e54fbcae39617a135fcad233a384b1d7c366a31e70
-DIST lynx2.9.0dev.6.tar.bz2 2730690 BLAKE2B 2b176db49ac053e6c057b366b625883f0877f0bbf9bc2fbc0dfe6a13af48e0c9d5a64de52e794a4e771d7f6b160c74589a9275543f2657cb678bba149cdba38c SHA512 0c15e00a8e36e43671a093182c69593d50bc5c51a4acd92faa59416055bf4a1fd9ecde903a0209963f1f55d1fd85136e8448ca7867e198100ff749c53e1e1531
+DIST lynx2.9.0dev.10.tar.bz2 2748823 BLAKE2B d4d5625091dd19fcbb245b51faca0913241491cc5c176702d04fb967abd960cee8a70ceb0fe769978a954cbf8a3bb3eae6cf096e2af600cb5916988a183479bd SHA512 afc8bbd241045a530d2c869b268fce708077024fea4363902d258a174994424e6cc64f066c63db82f08bb7e368647cbed1d420d596a494982f09ae05ec9e8bf5
+DIST lynx2.9.0dev.10.tar.bz2.asc 729 BLAKE2B 80c7cfa5e91e3b66af3bce2034c435e3bebbd4601034887bafdcad910619fc7141108f994ad4b095b28042e1f412549ab57182da09710f22e1a37f3249204c12 SHA512 386f1ce3d65db6275f999c3e6b9e4af31ca1f8c7bd2577fa0d130df3eb15685c0badc92b1b853805151b30ddda35f6423ad89f62b4983ad102ede770d6b15e60
 DIST lynx2.9.0dev.9.tar.bz2 2746988 BLAKE2B 6b5658b6bc224d02fe89fe31a1b8cdac5f736d68545fb6508f3a3b83e9c7537599dbacf5000320a019f0fab1059d5d4516e8d54341ef7d3384605d9e2f3c19da SHA512 ad343a7bc254cf287accde305db556101f7fa0f081e7c1c4327d7a4366c74cdbfb03ec003b0bc176768bbe726eae3e1bf8361416e0364ccdfe40d63fbc5b6dc4
-EBUILD lynx-2.9.0_pre6-r2.ebuild 2536 BLAKE2B 2e56c0a17e40ccba0f78199c3ff7bef7362b8b42d5ef42c1ed7792aa0e1fde92d20c70fdebe9e835083770f155bd0a84cc2ba9d40c1e270196aac8b38bc73247 SHA512 2d9aaa442037c25d0ea67bbd2acbc80361dbba7ebe6f27ed2525f74f6aff594b490bffe3aac9a1791d5470f832cc062151b022e193579b187af9935d25061a89
+EBUILD lynx-2.9.0_pre10.ebuild 2703 BLAKE2B 74dbfcec7bd3895f9d93f1fb33b08dcdc9f277ce190f2c7122d53bb72e8ba7b16ee9bdf6c4298121428c1935a6bc00f8e54e0e1a737f6a8c3cc6e732ee9079a8 SHA512 78c33b03d219fb78c0e74d0f571a19d9a9368fba2505faca5e43227f2153919bc16cbff041a4c09e642f58b1ddd3260a55772e7037ffd1326ba23396e581dc59
 EBUILD lynx-2.9.0_pre9.ebuild 2431 BLAKE2B 433087b1de3ccabb65d95a8006f2bcd4c1fb3e761f0bda24e35f2ac67e1b8914597d8529632616831cc85566825f90434a191a6c56c22ad9e75f20ae6ea514fc SHA512 8a45029298dfe9f27d2461be8814d78d6ac70f6ca25443e8d882f9117e10fa34bbf4e9ac0d5ec487bed58a3d41b182bd59b7ddc1b46f4a93e322f064204cb8a3
 MISC metadata.xml 521 BLAKE2B 1c520669081f0dfd89ddc4a9a9c121e02fa4e184d28ed796b7e8e160affff889cefedd23b4a0f38d4d4acd2c9e2e8426715a0b8d0f37fa14d4d12fb4f063a9d8 SHA512 2192536d199e0e00dc2add38560b72c8a772966192f394704bc9410674b413791d2d262fefe729a32726f2c9b166f52f7af54d5d71f0868072853c3cfea151b1
diff --git a/www-client/lynx/files/lynx-2.8.6-mint.patch b/www-client/lynx/files/lynx-2.8.6-mint.patch
deleted file mode 100644
index 3c7987718c64..000000000000
--- a/www-client/lynx/files/lynx-2.8.6-mint.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- lynx2-8-6/src/UCdomap.h.old	2009-03-18 08:16:12.000000000 +0000
-+++ lynx2-8-6/src/UCdomap.h	2009-03-18 08:15:12.000000000 +0000
-@@ -172,6 +172,18 @@
-        0, 128,UCT_ENC_UTF8,-4)
- #endif
- 
-+#ifndef NO_CHARSET_windows_1250
-+#define NO_CHARSET_windows_1250 !ALL_CHARSETS
-+#endif
-+
-+#if NO_CHARSET_windows_1250
-+#define UC_CHARSET_SETUP_windows_1250	/* nothing */
-+#else
-+/* Is this right ??? */
-+#define UC_CHARSET_SETUP_x_transparent UC_Charset_NoUctb_Setup("windows-1250","windows-1250",\
-+       0, 128,UCT_ENC_8BIT,0)
-+#endif
-+
- #ifdef __cplusplus
- }
- #endif
---- lynx2-8-6/WWW/Library/Implementation/www_tcp.h.old	2009-03-18 06:45:10.000000000 +0000
-+++ lynx2-8-6/WWW/Library/Implementation/www_tcp.h	2009-03-18 06:45:22.000000000 +0000
-@@ -94,7 +94,7 @@
- # endif
- #endif /* HAVE_DIRENT_H */
- 
--#if !(defined(DOSPATH) || defined(__EMX__) || defined(__CYGWIN__))
-+#if !(defined(DOSPATH) || defined(__EMX__) || defined(__CYGWIN__) || defined(__MINT__))
- #define STRUCT_DIRENT__D_INO 1
- #endif
- 
diff --git a/www-client/lynx/files/lynx-2.8.9_p1-parallel.patch b/www-client/lynx/files/lynx-2.8.9_p1-parallel.patch
deleted file mode 100644
index c4196af3b45e..000000000000
--- a/www-client/lynx/files/lynx-2.8.9_p1-parallel.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- lynx2.8.9rel.1/makefile.in
-+++ lynx2.8.9rel.1/makefile.in
-@@ -200,10 +200,10 @@
- 
- all lynx$x: cfg_defs.h LYHelp.h
- @MSG_DIR_MAKE@	$(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c
--@MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR)
--	cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS)
--	cd $(CHR_DIR) && $(MAKE_RECUR) all $(CHR_CFLAGS)
--	cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS)
-+@MSG_DIR_MAKE@	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR)
-+	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $(WWW_CFLAGS)
-+	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(CHR_DIR) all $(CHR_CFLAGS)
-+	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) all $(SRC_CFLAGS)
- 
- lint:
- 	cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@
-@@ -241,8 +241,8 @@
- 	rm -f core *.core
- 
- depend: cfg_defs.h LYHelp.h
--	cd $(WWW_DIR) && $(MAKE_RECUR) $@
--	cd $(SRC_DIR) && $(MAKE_RECUR) $@
-+	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $@
-+	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) $@
- 
- distclean: clean
- 	-rm -f WWW/Library/*/*~
-@@ -297,7 +297,7 @@
- 	@echo Full installation complete.
- 
- install-bin: $(BINDIR) lynx$x
--@MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR) install
-+@MSG_DIR_MAKE@	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR)
- 	@ECHO_CC@$(SHELL) -c "P=$(binary_PROG); \
- 	if test -f $(BINDIR)/$$P ; then \
- 	      mv -f $(BINDIR)/$$P $(BINDIR)/$$P.old; fi"
---- lynx2.8.9rel.1/src/makefile.in
-+++ lynx2.8.9rel.1/src/makefile.in
-@@ -118,7 +118,7 @@
- 	@echo "Compiling Lynx sources"
- 
- do_chartrans_stuff:
--	-cd chrtrans && $(MAKE_RECUR) \
-+	-$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans \
- 		SITE_DEFS="$(SITE_DEFS)" \
- 		BUILD_CFLAGS="$(BUILD_CFLAGS)" \
- 		BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
-@@ -210,7 +210,7 @@
-  $(CHRTR)viscii_uni.h
- 
- $(TABLES):
--	-cd chrtrans && $(MAKE_RECUR) tables
-+	-$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans tables
- 
- UCdomap$o :	UCdomap.c \
- 		chrtrans/UCkd.h \
diff --git a/www-client/lynx/lynx-2.9.0_pre6-r2.ebuild b/www-client/lynx/lynx-2.9.0_pre10.ebuild
index 6818ac17dadf..2e7cf9e38eb8 100644
--- a/www-client/lynx/lynx-2.9.0_pre6-r2.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre10.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
 
 case ${PV} in
 	*_pre*) MY_P="${PN}${PV/_pre/dev.}" ;;
@@ -11,63 +14,64 @@ esac
 
 DESCRIPTION="An excellent console-based web browser with ssl support"
 HOMEPAGE="https://lynx.invisible-island.net/"
-SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
+SRC_URI="https://invisible-mirror.net/archives/${PN}/tarballs/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( https://invisible-mirror.net/archives/${PN}/tarballs/${MY_P}.tar.bz2.asc )"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="bzip2 cjk gnutls idn ipv6 nls ssl unicode"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="bzip2 cjk gnutls idn nls ssl"
 
 RDEPEND="
-	sys-libs/ncurses:=[unicode(+)?]
+	sys-libs/ncurses:=[unicode(+)]
 	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	idn? ( net-dns/libidn:= )
 	nls? ( virtual/libintl )
 	ssl? (
 		!gnutls? (
-			dev-libs/openssl:0=
+			dev-libs/openssl:=
 		)
 		gnutls? (
-			dev-libs/libgcrypt:0=
+			dev-libs/libgcrypt:=
 			>=net-libs/gnutls-2.6.4:=
 		)
-	)
-	bzip2? ( app-arch/bzip2 )
-	idn? ( net-dns/libidn:0= )
-"
-
-DEPEND="${RDEPEND}
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.6-mint.patch
-	"${FILESDIR}"/${PN}-2.8.9_p1-parallel.patch
+	"${FILESDIR}/${PN}-2.9.0_pre9-mint.patch"
+	"${FILESDIR}/${PN}-2.9.0_pre9-parallel.patch"
 )
 
 src_configure() {
 	local myconf=(
-		--enable-nested-tables
 		--enable-cgi-links
+		--enable-color-style
+		--enable-externs
+		--enable-file-upload
+		--enable-included-msgs
+		--enable-ipv6
+		--enable-nested-tables
+		--enable-nsl-fork
 		--enable-persistent-cookies
 		--enable-prettysrc
-		--enable-nsl-fork
-		--enable-file-upload
 		--enable-read-eta
-		--enable-color-style
 		--enable-scrollbar
-		--enable-included-msgs
-		--enable-externs
+		--with-screen=ncursesw
 		--with-zlib
-		$(use_enable nls)
-		$(use_enable idn idna)
-		$(use_enable ipv6)
 		$(use_enable cjk)
-		$(use_enable unicode japanese-utf8)
+		$(use_enable idn idna)
+		$(use_enable nls)
 		$(use_with bzip2 bzlib)
-		--with-screen=$(usex unicode ncursesw ncurses)
 	)
+
 	if use ssl; then
 		myconf+=(
 			--with-$(usex gnutls gnutls ssl)="${EPREFIX}/usr"
@@ -94,10 +98,8 @@ src_install() {
 
 	sed -i "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \
 			"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
-	if use unicode ; then
-		sed -i '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \
-				"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
-	fi
+	sed -i '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \
+			"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
 
 	dodoc CHANGES COPYHEADER PROBLEMS README
 	dodoc -r docs lynx_help
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index d9e896a363a3..bc1a6c36eae8 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index e9d31deeb9e0..1b2ea716f895 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -5,5 +5,8 @@ AUX initd 736 BLAKE2B 67baedfce797cb3aa51a953b9762f44a5fc0605152c124ed723607a93c
 AUX logrotated 39 BLAKE2B 2801a25d70fe62aa7487da24561fe9d0efd96c0c76764edcbb2332dfb7f9e9ae7a2dee2abf0f5877a378618ac6a56ca8494800465cdfae839af84606db0f920e SHA512 2aa59645a23d8a7a8566532830883393b4b5ead245fe2fd2d752603bbdbe5beddcce522a22add725899995b87be44f801d0bfa721e5da1ac18273f1119e73d26
 DIST caddy-2.5.2-deps.tar.xz 121709464 BLAKE2B d15157536916aae8a63dcdcdd01bef7fa37c2f7174b8a43222d3a150b16efa153274b0158a6e86893f02310453b9b176529295021c51b85956de69e60653414f SHA512 6600a30bf3b63ceeae98a60377be43f16723e6e0cbd65ed626c3777cb5c39eb3fea5769a6cc0f987da978df8efc917825e85f118810a23504d396a94f3e270ae
 DIST caddy-2.5.2.tar.gz 538564 BLAKE2B dcdaacc63ec0481a9add35ac79c4d02d0a262dc4a1b5215877843797817832cf07e2ecaa2c8f73173f5e0bf38d4d15f2f6c5909f0dc3c8a178db9b001af5206f SHA512 98eb10075b6eacd93cfe893f7df6d8d8ce41649b6a6b78937c1ee7ba82ebdf483204d98c5e45501617abfe426d3b12a9a413e49304e1b62569ab3bad489e2c66
+DIST caddy-2.6.2-deps.tar.xz 157577068 BLAKE2B 4ee60155de108ae1a0c897f3cd95549fff6add81b8c6b5cc1e4407d47eb8e81da825977ac9334fa884729759b88a8e23297a9c7b10a088d865ee6698cd444054 SHA512 ca7ab6522b6a3ba2741ad3c40044236196331fd0abcfdf480690a6dfd63127512e31cdc6219deff6b7ec9f6c7acaa672c161b738b87d22e655896bf1d5f70788
+DIST caddy-2.6.2.tar.gz 556197 BLAKE2B a3fd7e69a33ee045de7f4b8218d5bb41e1f740c744bf633554c93d298c06506f3b8f2f8ff739b423641958459fed84d6783a2ffe764ff175ee329eab9dc7dc19 SHA512 01761de707668d589af7eeecdd694c94e867d5710f0b72285b4d2e6fb26cf9e10baeed3920e9b9b292c75568c84ff79b400026e37d7dcc003cebb839469b6c1b
 EBUILD caddy-2.5.2.ebuild 1041 BLAKE2B 5cfba3fe9efd2217f476ccc991692a34b366183407710e8d6ca178d40020e4bded01c2238d775c5a65221e2943a168824da12650b8500e8824650f99eb24191d SHA512 5c7724e4e150f1829cb43d452e716f6acd5e98dd636a4d00ff2c547d61b41bf908b80e15f7f295fb2c0908461d1940cb1a5d357bfb2d558b3a6920c1cbeb1667
+EBUILD caddy-2.6.2.ebuild 1041 BLAKE2B 5cfba3fe9efd2217f476ccc991692a34b366183407710e8d6ca178d40020e4bded01c2238d775c5a65221e2943a168824da12650b8500e8824650f99eb24191d SHA512 5c7724e4e150f1829cb43d452e716f6acd5e98dd636a4d00ff2c547d61b41bf908b80e15f7f295fb2c0908461d1940cb1a5d357bfb2d558b3a6920c1cbeb1667
 MISC metadata.xml 327 BLAKE2B c733fe2ddb3626e38631dea64fc3edf837fc52c8454ed7a37f2859a9759db43db0ef018753649276f846cf4a67b705f2080d7bf55856848c8fb2a2a5db43cb4a SHA512 c52162e031367163930279cf1ebb06b5a59a5d0d13769fe79f6ee146c4752865ac6e4bb13fb8087a569be125dc6d8ee0b2d052088f27d2ae327ba6a31160252b
diff --git a/www-servers/caddy/caddy-2.6.2.ebuild b/www-servers/caddy/caddy-2.6.2.ebuild
new file mode 100644
index 000000000000..c1adcb1cf8b0
--- /dev/null
+++ b/www-servers/caddy/caddy-2.6.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit fcaps go-module systemd
+
+DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
+HOMEPAGE="https://caddyserver.com"
+SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv"
+RDEPEND="
+	acct-user/http
+	acct-group/http"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+FILECAPS=(
+	-m 755 'cap_net_bind_service=+ep' usr/bin/${PN}
+)
+
+src_compile() {
+	ego build ./cmd/caddy
+}
+
+src_install() {
+	dobin caddy
+	dodoc README.md
+	keepdir /etc/caddy
+	insinto /etc/caddy
+	newins "${FILESDIR}"/caddy_config.json caddy_config.json.example
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newinitd "${FILESDIR}/initd" "${PN}"
+	newconfd "${FILESDIR}/confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotated" "${PN}"
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index dd13fd31425e..b1b21a61c47b 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index 84c14ad897e0..f5a7b110dafe 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5
+DIST xdg-user-dirs-gtk-0.11.tar.xz 126488 BLAKE2B 45b8c3ab0b43214a1c1b39d368a283fb566bee115549468eb85e1e9e5407025690dbe320698df107523a3ea0d7cd8d0d3ef8d2296c80c79a74863d50eb581581 SHA512 2a650c6372126f807ac90fb0508e1b11636b38b5960a3037b547e9f1bb1a6b82653f20da7d5aae1144eebec040e3af89a02fbf70c1768724019b384f6d9cf85a
 EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1419 BLAKE2B 631002f8419c360e2cedbe7c74a3ee4ed0531fa6a2b3752b0125b4261292fa2996b9c5b3b8c41403e3999173803da8938ac8f326a6a4f32209941b0de6cf1bfd SHA512 f70a410d149e5f941325fdf94fcc9d5f8d46995bf8fd02259efd7a45e6c1e567370aab7ebdd35ee2b67f2e0506296c6655b76a5bc512868b59df69944c002f1c
+EBUILD xdg-user-dirs-gtk-0.11.ebuild 1428 BLAKE2B 7dd9d27fc9399d688a60c8abe4a948da6830fcde15dba03d35ba2d21ec0cd3df39121caaf97ff9de761eb779e9f7c42d755f058e73f524a70a7e7713fc572459 SHA512 cb94733267d135b176be2975c248387b0b286ac0521cfe0153e6f7398545c3a9f1e793bf6882e22c17040faa0c26cb833c3537429f2ede5a67100ba3cf663afa
 MISC metadata.xml 233 BLAKE2B 0287c5840d68d6fa00f870fb7024dee6332bef9f8f8608afa0b5b2bfe15f1fefe5dc8a2de31964f4c7b0fb2787a58a3798884fd75e0314e61cf84079475c9a39 SHA512 534aef7349f0f6243a01e578013481c76b2516382638feec7705502de825d73ea54a3ae890e7171e6238a3bf0ecc5c88c9bc48890f4116a257031bae022c7202
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild
new file mode 100644
index 000000000000..66289fc25a46
--- /dev/null
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=x11-libs/gtk+-3.5.1:3
+	>=x11-misc/xdg-user-dirs-0.14
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="
+	This package tries to automatically use some sensible default
+	directories for your documents, music, video and other stuff.
+	If you want to change those directories to your needs, see
+	the settings in ~/.config/user-dirs.dirs
+"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/Encoding/d' \
+		-e 's:OnlyShowIn=GNOME;LXDE;Unity;:NotShowIn=KDE;:' \
+		user-dirs-update-gtk.desktop.in || die
+}
+
+src_configure() {
+	local -a myeconfargs=(
+		# Skip configure.ac disabling the cross-compiling pkg-config.
+		ac_cv_path_PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		# Skip searching for this program in the CBUILD root.
+		XDG_USER_DIRS_UPDATE="${EPREFIX}/usr/bin/xdg-user-dirs-update"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/x11-misc/xdock/Manifest b/x11-misc/xdock/Manifest
index a62a375e074b..e12d6a1a8408 100644
--- a/x11-misc/xdock/Manifest
+++ b/x11-misc/xdock/Manifest
@@ -1,4 +1,5 @@
 AUX xdock-0.2.0-ldconfig.patch 130 BLAKE2B 9f5834033b57a55b6c58b0dd05c82a4a52c575d7506852f03895617deda5c12a238f0ffc714672d01cac377c7870ac3ec20f5d8761caccd2ad6d1dd86f35fda3 SHA512 1dcb07e5aa82cbff4f6728a419587d4f661ef7d89fb63ca89949d89b6bd03554a3cfb0401d6c1eb3dc2ad214aba40235105ae95b49d3bb215ab6062e22a095da
+AUX xdock-0.3.0-clang16.patch 437 BLAKE2B f21081b954a20e384abe6b2b2793230670abbe21592e84450c5d2c429484c5f38995b0e9140131986ebb454c65598dd751ef48efc93164ce0c96b91cd4dd2fd5 SHA512 402e9619eaf010afd8be3150d3f20fff433eaf839d74f450d7d8b023bab8b483ee0a8bd38d8664a6e58e05d393ba9970edd5ad6f08d1b2a7d5463a14142334a6
 DIST xdock-0.3.0.tar.gz 345753 BLAKE2B 23f27c09280a54dc2360ef7a20dc89e68435c27b64a4d402539184bd0df7a10742fbe84d56fac21b8ea4b7c626c718aa308664a28635d1bac55bb4c6373c9b97 SHA512 72fcfa4ae643a054c2ea1a4a4bc2772cb961dedfbb8d85acfaa997bea574cb6b2df3f88bc6bb9dae3a2a27a7a0136887c79e2508ff2e69998c4c985d34080e88
-EBUILD xdock-0.3.0.ebuild 716 BLAKE2B 535ce5d8617a0fa5cb2a1942d7a07a5d25ab2ba31926e2a689ecea7286876cdf966a29c7c0bd1df645e4dfd293f1808c95e31c7f733f4b921145093fd6933684 SHA512 7ed8a88d2fb9a64acf4e8e0bd1f19b631bdaff7cdb212cc98b94e248ef6c4bccd930269cdea4aee16bafb2df312d01ac7260c645784e6e438e175771bf42209c
+EBUILD xdock-0.3.0-r1.ebuild 739 BLAKE2B 32803ce4cf044cd3a349dd269de9b8b7f65861c098b96869b625931e78ca68d7ec9e4ec53958f8595f22a2fe542a11ff41222d31c5e2df3cb06ce64887e2ac43 SHA512 4c24826884ee1470226430fe54627a0743a617fc06abb297d960220cc7f6bbcc1c962a18357e9d3ae16f07f9084c64c5951c338744f37dafe0c90ecd0db1919b
 MISC metadata.xml 243 BLAKE2B be8bdc68d113237be61dd614f7e16b2571f49e6aade5478fef5cea78745c72c95b7a2d677a47824bd3cf2e44f931c7f0ace467c4cd370a9fd19d97c9b59533d2 SHA512 07f45e56cbfb0dec6c2964222768789aae284c41b8617841645cf4cbfe5ebc6fa8e1e493dcfae8a1c195a672f98eec683d607427345867f325ee615c1672005d
diff --git a/x11-misc/xdock/files/xdock-0.3.0-clang16.patch b/x11-misc/xdock/files/xdock-0.3.0-clang16.patch
new file mode 100644
index 000000000000..17db7dbb0433
--- /dev/null
+++ b/x11-misc/xdock/files/xdock-0.3.0-clang16.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/871549
+--- a/src/docks/xdcalendar.c
++++ b/src/docks/xdcalendar.c
+@@ -1,2 +1,3 @@
+ #include <xdock.h>
++#include <ctype.h>
+ #include <getopt.h>
+--- a/src/docks/xdmemory.c
++++ b/src/docks/xdmemory.c
+@@ -1,2 +1,3 @@
+ #include <xdock.h>
++#include <ctype.h>
+ #include <getopt.h>
+--- a/src/lib/network.c
++++ b/src/lib/network.c
+@@ -10,2 +10,3 @@
+ #	include <fcntl.h>
++#	include <unistd.h>
+ #	define INVALID_SOCKET -1
diff --git a/x11-misc/xdock/xdock-0.3.0.ebuild b/x11-misc/xdock/xdock-0.3.0-r1.ebuild
index dad806f32209..4c830a3fe0f3 100644
--- a/x11-misc/xdock/xdock-0.3.0.ebuild
+++ b/x11-misc/xdock/xdock-0.3.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Emulates Window Maker docks (runs in any window manager)"
-HOMEPAGE="http://xdock.sourceforge.net"
+HOMEPAGE="https://xdock.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -14,12 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
 
 DOCS=( API AUTHORS ChangeLog README TODO )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.0-ldconfig.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_prepare() {
@@ -29,11 +32,8 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf --disable-static
-}
-
 src_install() {
 	default
-	find "${ED}" -name '*.la' -delete || die
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index a020b3a29fe7..3287283c59ef 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index e705f5af23cf..904d3acdaf30 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,5 +1,8 @@
 DIST xterm-372.tgz 1507107 BLAKE2B 256b99b13512740086203c4c05685cd170356118e11029a01d30b32f69c1fc5088efa0dabc955d8a24acf36f3e061faf7af9866c2302a4ac45405b97455384a0 SHA512 f65fee6227ca27be85569ec06f3701a6114489e036975d0fe37f3c71d7598d1b06c8689cfbda593a98418eec1417bd60b33e3978752b255989cfa0bb4ce332bf
 DIST xterm-373.tgz 1518059 BLAKE2B f215e6e695696cba3a0e02eac9e236fbcb50b3b99febba972bd42eb71b724ad596062ad567aaa89ff74d785c198c35ac6e99693f8231d763a4f054123863ba3b SHA512 0e1ef4165137fa5369ac2b2b93c73527a23c89a3f5e4b9de7a24dca5af78a6cb34cddb47a5aec2b16b1b302347c79447fbee87bddae3c569bbaac8765e7875f9
+DIST xterm-374.tgz 1518184 BLAKE2B fdd7f3361214217aae12fe3645b5df51085261b4d5a09e66be7867dd77aa9290be4cd54d7e52dbcddca173272c8a260c458b3d6172d82a8e953f2e4537104a70 SHA512 aba16f31e79ff13dd8c5576890cac40276e55b89e037d888d4cc0a73bf6e57e0f2e63a6684f5fdd6aaf0a0980586424f302bdf6ed5a4b0c96f61ec435a1de2e8
+DIST xterm-374.tgz.asc 729 BLAKE2B a97383910dfb22f40e9b8d38cd031af839b95a3d0fe8f8de3f72ad57b1d62687f6fe386ca4e6cdb54ca3a2d905e2e20f83a81a570f3b039dcb896caba449a652 SHA512 4b67de66be7bd00f479df43b15faf523f6041a5f2d4c245d361ae64efb97ae34fd160e416e41c1ca76b3f2b69088871928fb4a6c40489c047fd08351df60f662
 EBUILD xterm-372.ebuild 2602 BLAKE2B 34217a79398617f43dceb77255dc2f60ef742e0626a75a3362e0f440e976eabeabe5b68f01b64b04c944102b041b490550a7cfa11a49bb9a26a4f4a7045d4326 SHA512 931ebdb5db36135ab730418b2bcef4565040250f27b4d403cfa57abead4b2b2046f5982c202a034b5dfca3705b3dd613359b56740d8280336bb66da1211be1e0
 EBUILD xterm-373.ebuild 2619 BLAKE2B f89d4634c1ea84350ed93a3afe2259812d80a1b9a5dddb7e71366db422e4a9012e305d20385d58f0cef3ce0ab1c025e3847b9acf6c362e1c294d4819ceb633f0 SHA512 5efcbcb55ea3b402b6225431c01c6b0e8dc31d42bff8a4f476030e1c5b75088e2cd293c9ead52d4765a667529140bab944a805d8c84d315c73a76c1ffda527d6
-MISC metadata.xml 555 BLAKE2B f1b7d2b7173c14a931745b804803e32b3811a2be04721c27617f9770698d34a552e605a48b7e5761dc4a1e28771c62b2119721fce9536969765543621c372803 SHA512 80ad99d030e821e2d3835ff9b79d726be4081944a69f9db3de2865c778a7c95940461437d1f23a8d6e040aa1cbad0fd0a3b08c022edaab411ae338caffb45c98
+EBUILD xterm-374.ebuild 2855 BLAKE2B cc5a90b64fdb663588c788d413379e73103a1b7cbe62d6f5bcc7140606805ff5166b5638c24de19f909824d9d2ae5d913719e4aed30ebc057ac98e2810d3b298 SHA512 5bb04e7e79911c6cb742c63b52a12337324152f06a2351a6b81f0660388241e448bf5c568ed0d76a6dca0d7cc54f320e1ed9535fba661830fc257e1f8c98fd29
+MISC metadata.xml 552 BLAKE2B 1de52230aa9b681cee30dd4ee4651521bf9474cb2a99168fd6c8f13e0918cf185dbddd3dc6f97e0c81118680294e9c4d74137378763b021a07d8ce0a1430e18c SHA512 019a08f2f03a270da7a33bf1b0e9bb42864b806990884b9f2c19110238ad5d5fd18bc896e9fa7cde130b4ccf3f7003db43f6b485caf5b021f5d5e36f279f9d36
diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml
index b6bd9a1252cc..0f34a6fa43f0 100644
--- a/x11-terms/xterm/metadata.xml
+++ b/x11-terms/xterm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="openpty">Use openpty() in preference to posix_openpt()</flag>
 		<flag name="sixel">Enable sixel graphics support</flag>
diff --git a/x11-terms/xterm/xterm-374.ebuild b/x11-terms/xterm/xterm-374.ebuild
new file mode 100644
index 000000000000..5a88e2d3f668
--- /dev/null
+++ b/x11-terms/xterm/xterm-374.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit desktop flag-o-matic toolchain-funcs verify-sig
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="https://invisible-island.net/xterm/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
+
+DEPEND="
+	kernel_linux? ( sys-libs/libutempter )
+	media-libs/fontconfig:1.0
+	>=sys-libs/ncurses-5.7-r7:=
+	x11-apps/xmessage
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	unicode? ( x11-apps/luit )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/rgb"
+DEPEND+=" x11-base/xorg-proto"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
+
+DOCS=( README{,.i18n} ctlseqs.txt )
+
+src_configure() {
+	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
+
+	# bug #454736
+	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
+	# something sane like pkg-config or ncurses5-config and stops guessing libs
+	# Everything gets linked against ncurses anyways, so don't shout
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
+
+	local myeconfargs=(
+		--disable-full-tgetent
+		--disable-imake
+		--disable-setgid
+		--disable-setuid
+		--enable-256-color
+		--enable-broken-osc
+		--enable-broken-st
+		--enable-dabbrev
+		--enable-exec-xterm
+		--enable-i18n
+		--enable-load-vt-fonts
+		--enable-logging
+		--enable-screen-dumps
+		--enable-warnings
+		--enable-wide-chars
+		--libdir="${EPREFIX}"/etc
+		--with-app-defaults="${DEFAULTS_DIR}"
+		--with-utempter
+		--with-x
+		$(use_enable openpty)
+		$(use_enable sixel sixel-graphics)
+		$(use_enable toolbar)
+		$(use_enable truetype freetype)
+		$(use_enable unicode luit)
+		$(use_enable unicode mini-luit)
+		$(use_with Xaw3d)
+		$(use_with xinerama)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc xterm.log.html
+	domenu *.desktop
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-10-14 07:43:49 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-14 07:43:49 +0100
commit	fe8b106bd60ab72e98ab836f5c702070805e197e (patch)
tree	44016d57867c58de87efd4b028c171d352bbf3be
parent	30737dc88991519b90363c2c7bae8fd049098d13 (diff)