gentoo auto-resync : 12:08:2022 - 20:22:37

author: V3n3RiX <venerix@koprulu.sector> 2022-08-12 20:22:37 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-12 20:22:37 +0100
commit: f8ca23f9f6e4a55e4195e553ca2f3e7dd425f51c (patch)
tree: 8268a378f27e1940a5a76b3c55abf6e4ee0fc256
parent: 7c68db06bb531670c1261374c0133d652b476bd7 (diff)
305 files changed, 3260 insertions, 2825 deletions
diff --git a/Manifest b/Manifest
index 90b3ace48585..ab14916e0579 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29634 BLAKE2B 921a4ba99580e455cd33adc5a356bba75133d425ea31094451dc56dcc4643de7a8f1330a411372378c9a08a0d7df41f159b6b55df9b7efbea75a15c16d9c36e7 SHA512 f786b2ea596cc82ab9e9cb6b3e2053738ac5fcd1bec7242ef255bff138f97c623777532a31ae506ca804fc29984f8ab7498a1ce399801d2af1291a304bddca6c
-TIMESTAMP 2022-08-12T12:40:06Z
+MANIFEST Manifest.files.gz 29637 BLAKE2B 598b910f4f5d6ff3aec73c254a5e7b95a904fda648e3a8a2c75ddf2b3af87e498d942ec0f3d34f11b5de32d8f74d80f43cf0d16d211e230c4d5a21e22b933419 SHA512 b0ef24a5f424f13f780ef6e5dd3ec36c83efd422e863085f9b44b8b529c827e304b5e9b1ec42f4dc39ee652eb1b908c21dbe323e45d2246e7c68aa7eb8538da6
+TIMESTAMP 2022-08-12T18:39:42Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL2SiZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL2nm5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBqxw//bhf9MMfFXgiSucZcu3Fe2fIAQ9aadN8PFS8AnyTPyhiyANfizBWFwR4R
-re0najliAxWKjx9Ru4jajHjeLY3HIa/hQu5bI5V7MxnXpqJvavrN+W0Okrq0Jl43
-fRg493z3TeXfBo+yFSpRt/Iuccpf8De2TtE3ZGIQoRNo/erR/UkUhH/QPhz/QSHn
-ezm142+YX25JXSEgtve66k0r3tpiD9VPNzJ/gjsBNRKhu+Njg2DDgmBzg+HIkf1V
-784AUdJ7I9lL9uNMathzrCeU/z8/8V+XnDMKJ87reJ5LmC7NpdhGCtGRpmoYUcyk
-eDwqr6AjehVjCp1jxZkdoOsepvKmOE6MCivY54bDx/VFFxrPdF8gFTUHmrMRh/du
-YL6bGsxF5HttF5ACPW8yWr6OHcDQ6Be2EerkZIBmAQG+ovrM5cC0F18Yb6OoT1yu
-hA4aYmVJgG8wtMUTsNrd1ilSdD1dV32FiAoRuYPUBjeLLFQEL5IbfOybWWICy4MD
-f0DIE7/yC3vXOhbqRhYj3YU9L0rdenSR+AkY8cEbkK6CvvD3+lW88TKN2iYOGxpp
-H/e3tH/1v0y7m2GLS9tHArTQW2Lm/QyR8NboFOXuHal3sExGVUjmm22s19Fq5wRx
-B64wYonAh1I79I5+MJ3M632JGLBfxHc4gs6HDUp2AghS/sleVV0=
-=UInD
+klA8PQ/+Mzw+5+pzCMbxd86WJdVPFyHh/CuQaY/ABzeGH5c0TW9TdZpeTJI8eOk7
+MIX7DWjSYhg6JMi9ZoBB8MV8a5+zsHSPAziUoi1tJkGrIdQEdLQwo23ysvieBNCN
+z3XhL+OvBK08Jh6cCzwtYLQT7Q6/611A7iIopVdGFCvH1YOLzLa+9MXFshvjGhwN
+NlHYnhkwccs9ThH8bOXXN1U9juWHKFqyGCnJJcH3aJeJ+ElRhGcTex+DIVYbSjPa
+bQ19S6uqyWJ5GtfJAHfQOgz5KR7uEUdAl/+P7m8Bofe6F4oclmwMZgFUMIjsZOAz
+u9JJN4YBwRAkFKJ/cvErcS2xvAKVINCAuVnLr7RNH1+e5qcIMn8wFBW5J+xHWo7V
+hr6pJkJHmoNawt4XIhZo44+Jf6fxZLGCIrGECpFvpLOUcDYFYzqy6ymO+RF20ker
+2uuTkN4+sPn57JIX4TyqxqLF6GR7/dc0efpbNzxOJsSI8+Tjyw6Q0/0OCRjVkclu
+nOM+HzbuiThwvHLy4BGG7HSuuzBdFh0No7mUNR46n1lSs89cPLJp4ZFiy/vg6FMy
+rHzPbVGOWgWjeUrUlvKZedEx7Bf9TNLvLn4JmOdA7sUJv3hOTM59PBiZUJR4YbG5
+7KU9yv9179cUqY/Mg1MUrKwMUan30aOvemktmu9JRVSJjIJvgSs=
+=v4nW
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 7807299a5912..ace151a79948 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 837938336c81..eaf25e56a28b 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 1fcfba51a222..9d7bea5b0a50 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -3,6 +3,6 @@ AUX speech-dispatcher-0.11.1-remove-unused-variable-musl.patch 1106 BLAKE2B 0a21
 AUX speech-dispatcher-0.9.1-fno-common.patch 13112 BLAKE2B 6a4125117852cfe250bed1a9936af67a2a83303ecced615febd89b9b14918dda94a78862cdcceb95fcea3ea7ed30a12d799afbc21264ff386c94f9f867eb8136 SHA512 b957ebbfd8a6a9cfe2b85cba85b77dc813e76212721d63d42b3881ed17993d7b4a8c720d4c431c8e2eb3ea60996e411402732c735948f37fa84a9fdcfa2683fc
 DIST speech-dispatcher-0.11.1.tar.gz 6548489 BLAKE2B fd4e05c51b80991bdd5d27ecf967946cfde98f978462e909f193c14eab51f3cae047d281c3e2896b3ddeeb4e045ceb72f51e5dbfaf3f9ea8a818f8146cb5e625 SHA512 859911d7db5660423bc7911eacbe8e7a9c3104df97478cbbca48ca5fd6ec018113172d49bc66781680433c77b4d2af43578c9b0f11409e2ba7ac618deb31d7cf
 DIST speech-dispatcher-0.9.1.tar.gz 1662222 BLAKE2B 03c3d79a9cbbe7e549f638992fb276ab2270a45a057708721666257699479b3feb81daddf26d8032ba3f7b9ab6b836c7f582ee22a532ff018c99820af3864d87 SHA512 35adb353d22b8dff8884cb20f3836f96f4f74b272bbd442d522a10a3d3b91a0da6705e6c216764f295208b5446c2077da620de2a81cafe5a0c4dd826e33753c2
-EBUILD speech-dispatcher-0.11.1.ebuild 2914 BLAKE2B eb27742b7e6ada73501c473b4ff1484f9e7a12e9ab286ad0216cf0324d816fdf21650eabc9643420387811fec521b26a5cd2aad04db2ae4a3dabb7117684098b SHA512 35ef111206ccf3c6620e6edd4ab18bd34614ff8d4fa5154a4b1bb33853d19f229beed77916d4da58d612759930eb4afc15ea2b4dabf4a295f05e08cad9357c32
+EBUILD speech-dispatcher-0.11.1.ebuild 2933 BLAKE2B d9235a55cbce83da1fc223646853d948c93de097ddfede44ffb62ffc4e43dc407459b4666c95b5937a920722e689fa61bb7902d6cc0ab46382d0e5a71be7953c SHA512 a245da1e1b7675926da1e26a43a9977e6bb76e58ae3f4a714621e04d02b8b419a8565b047557e9d18b49f7a5b2cdadde2583dd5006840645ec3ec02bc0b16059
 EBUILD speech-dispatcher-0.9.1.ebuild 2835 BLAKE2B f840d158b1303532c3fd0f41f9e40bac941d06071a125bcbef0341e75cc0197fe29a47d495b8248bc714cf2f8da3981660b95aa91d8b178fb72a7c4a23303b51 SHA512 2e0e8b16492ee0922199389e05e7d24103d4090b218378ce3f50111705084515c112d9e363f6dabc6d10dee75e4bdbb5f7c794f4b7b6562baa11798f3dff0dc9
 MISC metadata.xml 708 BLAKE2B fdccc4d8de7f22eb64469021786480527bd87f3718dd5746426874266b8a46dcb6cc2b7bb25a4561a523362b919e0ed77e3f829f3fe269d90060d17a69f1b2ed SHA512 770e54e5ddeacc46165b90d41dd3ea0d1060adfdfb95055a9dab778f757189b892250e66b515773ce7b4d8b1bbdd692386b4d8cb49d670af7af8dadfed5c8788
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild
index 97cb9ea2d96a..ccfb7ba2a2d6 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.1.ebuild
@@ -32,6 +32,7 @@ DEPEND="python? ( ${PYTHON_DEPS} )
 RDEPEND="${DEPEND}
 	python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )"
 BDEPEND="
+	sys-apps/help2man
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig"
 
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 54bf5273dd78..99d97dd34835 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index a9463ac9fb6b..1ea0bc545ea2 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -11,11 +11,13 @@ DIST consul-1.12.1.tar.gz 24196810 BLAKE2B b82929de9228adaaf1bbf3a4269dd09e17b51
 DIST consul-1.12.2.tar.gz 24195804 BLAKE2B 550b5bc4977c9181a097f699ad5da88a81571327707b448bc659d7c8f2d92a8c82f6c1b0f13448fee25c89d08cc3771dd4fb78a4cf58d640442df38e86639cfa SHA512 91da8b1fecbd5db4c0deae1cec4b5265a26c11739633be74f6e2dd2027ab9ba5da10ba33b1b844531a59b63e4117ec57af87d55512d1098033e99f88e2e3aabc
 DIST consul-1.12.3-deps.tar.xz 289711856 BLAKE2B 471b51dfc95ec8185a5d15bd94998f8d115ecbede7df6bc792704a4d63d222bda5e1a7aa260c7a93dcbe602a62df8aefd2d907602f3ca36a57dee8698205c19e SHA512 68b8bc91e03f922e31e68980350b58020ce734b808348bffff5c4b03436e50270cf6337bc9b48b95f28cb085316670ae5bc937d5620b79504e8fac766518621b
 DIST consul-1.12.3.tar.gz 24365779 BLAKE2B 39b110f271fa38e03a39ee05cf0e06e9aa13a84b2cb5c1150a43cfd1c28481044e36e2e11145b4b3411662b7b969aef9b7a4fa06dd7554e6018dfd772547b7bf SHA512 33903c2ba15cde3d2d17b8942ea7a0c7aab54c60872bc80662098ee7f415f5e1651a0e5949f42c8c8b06d3f99d25899a141459a99f04c90a162baa38d33f56b9
+DIST consul-1.12.4.tar.gz 24910442 BLAKE2B cc67dca433d2b96116cb57025b61799fdc6aeeca82bfee002116afe08ce3d30d4b49387927d5a257c44ffa7e30f0242b37f37096a2e271c0ee209c62aae5e918 SHA512 a91279983340d1ca5b349ccaf6b5681516c2be5b0eee7808a0bedb6205020fe3a1b2d1fd9ac29db69bfacb35455200bca62ad5b3e867343fe116f78e89d3b2ac
 DIST consul-1.9.17-deps.tar.xz 214799320 BLAKE2B c9fe5511156d50d4155ed6050186af894b7efc29e2f311ff542f79d298769b2dc55ee1bba12ca5ba5b81eddb6959a1d7a5e55aeb533827d5e924d3a72853a418 SHA512 be9f417e721372b8eaffe8b908f1ca1d1299c897f032cfb8b7ea8b62f7c2689011c5079a450fb5eed2e4e5454f0ad6a5e3859c91bd67166193334d100968f093
 DIST consul-1.9.17.tar.gz 29480703 BLAKE2B c233eab63ea515f886234395100e47910c1acdefa0b29af5bbc96d6c078dae41e0cd4150e1f6f17daac972b3e66d3abe43b594a0c37bff790e43f0f3c0a20da2 SHA512 c859fbede7294884befd0c70469febed5a4269b21cb351f8619d13e3b29f9b8bdd8d18e9611ef34908fc54bd38f2fd0bbc6e96d4e08ab23da952c3db537fb92c
 EBUILD consul-1.12.0.ebuild 1337 BLAKE2B c0512a3b9915f4c71dd369ad2abe77dd26260945cd6fc151be222cf4e8d27ecffb2c0587bb12fbac2cb1ed174687f751fb84bcbaeab796276ea77f020a639ca2 SHA512 bb99a0217082b36ce03965061cb91e4d544ddf5a9e5fe819ca8d39b299c24f8b5b4ff3307e37ffeaa3d4fcc4879b936eda03c592a51cf2b433b7d2c73f646526
 EBUILD consul-1.12.1.ebuild 1346 BLAKE2B fdd4010edfd86bfa9506a02e875e4646cbc85bea4aa46b62131f97b8a6ea08190c5a60c5e7f66f3106cca90c39032ed0a17cc44e23d4408ab0d93326fc606917 SHA512 717c0baa47fdcef0cbec887d3eb610387eb7f7b19dba4997cea0ed9764c33316796b1bacd5dbefb66d422a49c8edb558f809ad94b479a74c4135d4bcfd2406d4
 EBUILD consul-1.12.2.ebuild 1353 BLAKE2B aa0b342491f97c82e07fa2238783a43a5eaaeef8eb62f567e9bc2f7ce88a2aebb2b5eff085fb8f40616495f80d500f131916fad80466846f8e85a15bc7a5dd50 SHA512 94484c9bae036c5c4571d0c5953393577a5b65ae23973bca6401536d0cff27cb6d8e4a6c038d9faa6bf775e5759f5c57769b67b9b85d5e407d8a52e5c58659bd
 EBUILD consul-1.12.3.ebuild 1344 BLAKE2B 7c2aec831068a5e91d0c9483675420d1cc11f946b27e64470a6ff6063c142102cc5c31a93c56a465b2cb608ddb56aac0b197d2bae240667fb0e562622be2f68d SHA512 072a0a82538099b3669086f292da8c8f7d5ef945bcc7ae5acce249e8ce2131b08b253baa5067a2b9ca1a3ae8502744d080d226cdce8eea7e76020e3652800faf
+EBUILD consul-1.12.4.ebuild 1353 BLAKE2B 08388107b5f88ef19b8ffab24b80c95d40a210e2dd238325425d7f596a5505769daee3fd07ac55ee97fc2ca04e48787b587a5bc03151127fac912789787e8983 SHA512 68c3488ecfbb5005c94674be08945f33847ee6f9f46bffcebf86426ca3c3d603623e8a6f391cad96ece035aa8ba427fa2f9cc465e69bd9066c0f4e97149f6cd2
 EBUILD consul-1.9.17.ebuild 1521 BLAKE2B 4b452b57b8d672d18f3c41b545814b20d0437d190a0439b08579acc5d01f437f1af8411ea4372cc2d4ad3db13f4387c373dae06b6e465ac0becf006f104cb546 SHA512 8edc438a09e02e87b67f1e686fc3ec24921deffc8b577d3239e03dbd78a7f92f9a2da04f65234f2563c55eff3fabc8e844e7f165dc36f5bfc4f66cbfbc68576f
 MISC metadata.xml 392 BLAKE2B 4995d973307987bb70802d4328dbb1d5e052683a2e1900912b40be5e345969740b1df9e8e1b3bcbf76fb90066ed43ac5ce91e8e11a0ad19c9d587c7204f45419 SHA512 92d4589b5294df0ddcee6fbafa5db5288b3e892dbec6d84bf0e53beb2b0a30e385f9166c536462e51aeaa9ee8799dd1ae3634b7b13e452e3059ba2853c5b77f1
diff --git a/app-admin/consul/consul-1.12.4.ebuild b/app-admin/consul/consul-1.12.4.ebuild
new file mode 100644
index 000000000000..09ef685ae064
--- /dev/null
+++ b/app-admin/consul/consul-1.12.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+GIT_COMMIT="94542765739cff9b09469e1fc5e738ae8a334038"
+
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/consul-1.12.3-deps.tar.xz"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake dev-build
+}
+
+src_install() {
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/consul
+	fowners consul:consul /var/log/consul
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 7fbc78143240..79a277e9dde7 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index fad181e80148..33eb4eafb41b 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,6 +1,9 @@
 AUX xz-utils-5.2.5-xzgrep-ZDI-CAN-16587.patch 3383 BLAKE2B c244f412f6d2bea84c5ef41b9f08d0f7be73cb9af1097e58169c9d9061b8eeff274903fbbc4b4639d06344bf9691f0d289671c4d07a4c5073efe9bc536e31a5a SHA512 97ba1bbe9fec7602d77e53961b94691d6551813ed9de5b6fde71f3724205848d2865c6085ace75b7df963d43b99c55c539547f028dd8d86da911aaa2b6a433cd
 DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
 DIST xz-5.2.5.tar.gz.sig 566 BLAKE2B 8b40d8d7913eaebe2595ea41a735d972d1969d8b58f42b2bee6591b51e2e626473fc85d64f1bbbff3cba6b0e1b4423556d6ddaf16f646ccc18ba1bad5cf45d83 SHA512 3aa21484bef0282ed0b83e3fcd5cf3d87bf51fa68e24d55bb11f91bc96f0ac29f468949bc4c8cc20fbd6ad12f5735686fe09ee42efe2b8d728010da9668aa5a9
+DIST xz-5.2.6.tar.gz 2069602 BLAKE2B 3cc160dc76944ad2a181fbfb23ce386dbbd04e75bbeb0b159aaaf82e2e8157ea8b2bb80b216d79a7c25339bfbd13bd9d8c261789829cc7c3cb86fc893a7b4b94 SHA512 090958dd6c202c989746686094c86707ad4ae835026640080fc0a9d0fad699821b7d5cb3a67e6700661a0938818ba153662366f89ab8ec47e0bae4a3fe9b1961
+DIST xz-5.2.6.tar.gz.sig 566 BLAKE2B 7c6114d93b4e3c8553108da3985029fc4585bfea5d72fc5028024221e91cc43c3b6cd3b7d169e4c8afed445a6beef7c255ef8420c5266a22ee9449a57cacec5d SHA512 50a1ac0f8f87f8c04c25c69870ba054094abf20b668bdecd42ed247a2eff24b8e52178b6442da84c125a9401a6f98d40ca76b27453833a30807c83128ab70eee
 EBUILD xz-utils-5.2.5-r2.ebuild 2980 BLAKE2B a84114ae0f3f8c76822059aed6880073befa57f27f2384410316063094da31372dbe7ef3c0086ac53ba678566d32b12421a8fa7702ebc30d65b519ffbf3d5732 SHA512 eeba7fd7474a0a868d3579fb472172834c9ccf8c7fcf33e47b6130526dc17cd53251864c19beb06bb4fa94cb8fb79958225e79957d5ec1bcea1a9594125c992b
-EBUILD xz-utils-9999.ebuild 2956 BLAKE2B 4f4253e58bde435729d911dfd7b1460f33eaf638e33562852bd69f5dc5db3c6aa04e7ffa5c3890010917300be6f95f3cd0c2f212a1d4031b1daf9776233da83c SHA512 de44465c0cfca619887dc2f4284fc235d22ef82a7034f7fc116b2e050e595314ce3f47bea32f3ba013752e6605891d3c782fcf01a31a02f35c315b46b5c46a2b
+EBUILD xz-utils-5.2.6.ebuild 2959 BLAKE2B 79badd2e1bdc64213623152970dedad6c567a07d1a660935dfc93d72e2bc092077cea34ce77fe9b66e3587ce645dea53ef7e00532ea3b149a19df7b732d055fd SHA512 61181718d8c3f45179380e6055090e167ed86f67e4df33391f56f116025f347b4e75b0dd431633595264d8ec448d8033ddc75388270834c2690a6b4aca206fc2
+EBUILD xz-utils-9999.ebuild 2959 BLAKE2B 79badd2e1bdc64213623152970dedad6c567a07d1a660935dfc93d72e2bc092077cea34ce77fe9b66e3587ce645dea53ef7e00532ea3b149a19df7b732d055fd SHA512 61181718d8c3f45179380e6055090e167ed86f67e4df33391f56f116025f347b4e75b0dd431633595264d8ec448d8033ddc75388270834c2690a6b4aca206fc2
 MISC metadata.xml 539 BLAKE2B 57809a0b57c640a42eca00c3cfbec8a549647b82afc6229b904c769b94b3ee109610d412af69cefe6b86c7cce9a7c363cf376bb87c19b5cee96b45bdd980cddc SHA512 5b86a0f7c76d5b33f32e5db91dafe675dc01399659c5304fafd77adf83b403c936019afadeed1f075834bbb31169d60c87c9d9e69783e7c7a720890f512172a7
diff --git a/app-arch/xz-utils/xz-utils-5.2.6.ebuild b/app-arch/xz-utils/xz-utils-5.2.6.ebuild
new file mode 100644
index 000000000000..6da152d612d9
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.2.6.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI=7
+
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
+	inherit git-r3 autotools
+
+	# bug #272880 and bug #286068
+	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
+	inherit verify-sig
+
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utils for managing LZMA compressed files"
+HOMEPAGE="https://tukaani.org/xz/"
+
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
+SLOT="0"
+IUSE="+extra-filters nls static-libs"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!<app-arch/p7zip-4.57
+	!<app-i18n/man-pages-de-2.16"
+DEPEND="${RDEPEND}"
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
+fi
+
+# Tests currently do not account for smaller feature set
+RESTRICT="!extra-filters? ( test )"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		# Allow building shared libs on Solaris/x64
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-threads
+		$(use_enable nls)
+		$(use_enable static-libs static)
+	)
+
+	if ! multilib_is_native_abi ; then
+		myconf+=(
+			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
+		)
+	fi
+
+	if ! use extra-filters ; then
+		myconf+=(
+			# LZMA1 + LZMA2 for standard .lzma & .xz files
+			--enable-encoders=lzma1,lzma2
+			--enable-decoders=lzma1,lzma2
+
+			# those are used by default, depending on preset
+			--enable-match-finders=hc3,hc4,bt4
+
+			# CRC64 is used by default, though some (old?) files use CRC32
+			--enable-checks=crc32,crc64
+		)
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
+
+		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
+		myconf+=( --disable-path-for-script )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 0397c369c1bb..6da152d612d9 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -22,9 +22,10 @@ else
 	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
 
-	if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
+
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -40,9 +41,8 @@ RDEPEND="!<app-arch/lzma-4.63
 	!<app-arch/p7zip-4.57
 	!<app-i18n/man-pages-de-2.16"
 DEPEND="${RDEPEND}"
-
 if [[ ${PV} != 9999 ]] ; then
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
 fi
 
 # Tests currently do not account for smaller feature set
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 073d50b98a11..dcb2d05ce9e2 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index a9c2ccf86880..a7188a0012b7 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,11 +1,6 @@
 AUX cron-confd.patch 916 BLAKE2B 52672e59ebbfde9dd120516d9c0fb80443b8bfe38d08ec943956005a3d07aa1ed3e9273c572730722a02d3b841859dbc8d3fa81e89e87d6958251abec016716c SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7
 AUX snapper-0.10.1-testsuite.patch 2525 BLAKE2B 0ece146356113d456ef0a56e46e76eae1f9509e3b454459499fa457119c75a9e5fecb85d5530caaab340cea7f4deba0f155ac9e31706ab3899372c45e381cf77 SHA512 e0e1a4ed7c9ef069bc0bc5449f784c2deda1ce6851e98ca6d04c03988361f00e06b6a4f347671ee905f496dba19f8dffa64e5bdcba89f547292fc9c8d276ecd7
-AUX snapper-0.9.1-testsuite.patch 2613 BLAKE2B 6fd621d1cab8ee829ba07ee7fac0ca7de884becb6b3ca24e444de4de547866fe2ec1c108fcc6686c8adc78661324445c8f37e82110514b7a7d9b578ede70c7ef SHA512 e447c6062e85f587b084334a5565d02dd89c778985d121e7489f8059a647b22a2e3386992f107f589b60bbfd55036f71efe21651841592073b29981a1451df36
 AUX snapper.bash 5939 BLAKE2B f8139dfbfb9bd9616d1b43cc1e90e0f7cf4472515a12425c8501c8109af72206e76c19d95f2156afd7048085fe48c84509fdffddbd11242db66f40732c68230f SHA512 c72a9557a93e988ccebc76b076a1abb9fcccea582b80f615b98b69fd4671a2f52c0dd60cbc6248ed9c55ddf96ea16b10a874348325f61fe14a0b675fd0887e98
-DIST snapper-0.10.1.tar.gz 407628 BLAKE2B 84b4c027762a11cbf5f49af3e94bc0e494e83e61aa35c3873d0ab98b0c232897b6d002ef28181ad3b2567cc88b84424f570e7b24278c546fb39452e399ad7333 SHA512 39f4d95e98b736510b6bea56eebc8275618a0ad3221d7fae9cd0f46f8a4af574700a6123a438918d522d65758ad50020f80c925395ae3ab84b7ad3eb924592c0
 DIST snapper-0.10.2.tar.gz 407857 BLAKE2B f59ee95612a66397f9cb1bec4a3a20fec41f12324d1a778d5bbdac2bd3359b6719d16fba5c50b3753e416681e83780180fe8965757b810165bebef8c4bed6634 SHA512 bdda67908b054beee7285bb3ac97ce28276449d7719369135a7ffa74bce40000ebc89f4f059abe44f8cc7c3a09c46af446e812229290ddd10b2af053fefbc568
-DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293
-EBUILD snapper-0.10.1.ebuild 2003 BLAKE2B ba7081ebddda94e426a031a99063fa85e99fb53905f507ad40bd87fdb809fc4d6bfb9e553390e969f84ce60e2d7cb5255bb72cb7e8408c51415c229046c6fcf3 SHA512 5ea5a60365e210af54aca1df2a512f6df5815f5c765a07bbae19487b63226695dae0ad73453487a7e192ef8c9384b4c76c86d7acc27b8a77466a3646157c856f
-EBUILD snapper-0.10.2.ebuild 2011 BLAKE2B 31ded933dbf072fc8bbfdef0ea4cf77a934892ef74d59d8ac764e6961f3216098a2664de49cda1b064d5703b5b1239ff536419526113bff6bd480bdb65770b42 SHA512 779de9868224af494d7a4f53f7865477d25f4f2d5459040b7a9349fbda4223c5f270a935b8c614132bae7d64729297e3957e6474ac71f81f930cad55fe5ecb52
-EBUILD snapper-0.9.1.ebuild 2064 BLAKE2B ba272ba78aed3980832775c8318671ef38781785b530d8322dfbaa2751b46f3772a324135f57dbb9fa21ac81f5e5d4be3756dd311de54992fa66a20c5368179d SHA512 e074e324915122c9e4ac42a7c6e27719b90ea32fe91bacc3f7e0ced18164100988f3d9309e2e95697a8668e5ad2f754ada9325e6e7d95bbcbad91354f4017f17
+EBUILD snapper-0.10.2.ebuild 2009 BLAKE2B 148ba5f979e5591d011ec5be16c38133f050504d4aa61cd807bd95e0d187fc37f90e16633ff8875b70725f589c8bbb148dab8aaaffc0b1dd33b9b575a36aaf78 SHA512 3a3b93cb0989e48230845d678d0119c4039778729032534eea9ba1fa05d1cd480d3cc5ffb4983587727539c41d631a8bb4b0d74cf5a5f885347382bf51852a2b
 MISC metadata.xml 1331 BLAKE2B 891a27fbae2ed364a26952def66b3e9e62be7025580d7b89f559f284888efed53476f4a8f5bcd7209c3c4de8494913a05354059004ef6c3aa6c1829a3e093efb SHA512 add8dffdf453f079d09f06608cae732ce61e04a5fac1988afb0733c8d60a943efe054a4973e54ca1cf304ad3d3778fd8aa6b01fc16815a1f42f83048d58adb63
diff --git a/app-backup/snapper/files/snapper-0.9.1-testsuite.patch b/app-backup/snapper/files/snapper-0.9.1-testsuite.patch
deleted file mode 100644
index 0bd3fd3189fc..000000000000
--- a/app-backup/snapper/files/snapper-0.9.1-testsuite.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 3f5c911..a8c9c95 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -84,6 +84,13 @@ CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'"
- 
- PAM_SECURITY=${libdir}/security
- 
-+AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]),
-+		[with_tests=$enableval],[with_tests=yes])
-+AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"])
-+if test "x$with_tests" = "xyes"; then
-+	AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support])
-+fi
-+
- AC_ARG_WITH([pam-security], AC_HELP_STRING([--pam-security], [Use a custom pam security directory (default is $libdir/security)]),
- 	[with_pam_security=$withval], [with_pam_security=no])
- AS_IF([test "x$with_pam_security" != xno], [PAM_SECURITY="${with_pam_security}"])
-diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
-index 81104bf..9c29477 100644
---- a/testsuite-cmp/Makefile.am
-+++ b/testsuite-cmp/Makefile.am
-@@ -2,6 +2,7 @@
- # Makefile.am for snapper/testsuite-cmp
- #
- 
-+if ENABLE_TESTS
- AM_CPPFLAGS = -I$(top_srcdir)
- AM_LDFLAGS = -lboost_system
- 
-@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc
- 
- EXTRA_DIST = $(noinst_SCRIPTS)
- 
-+endif
-diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
-index 717313a..527843d 100644
---- a/testsuite-real/Makefile.am
-+++ b/testsuite-real/Makefile.am
-@@ -2,6 +2,7 @@
- # Makefile.am for snapper/testsuite-real
- #
- 
-+if ENABLE_TESTS
- CXXFLAGS += -std=gnu++0x
- 
- AM_CPPFLAGS = -I$(top_srcdir)
-@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc
- 
- EXTRA_DIST = $(test_DATA) $(test_SCRIPTS)
- 
-+endif
-diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
-index ccb84d3..409e265 100644
---- a/testsuite/Makefile.am
-+++ b/testsuite/Makefile.am
-@@ -2,6 +2,7 @@
- # Makefile.am for snapper/testsuite
- #
- 
-+if ENABLE_TESTS
- AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
- 
- LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
-@@ -48,3 +49,4 @@ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la
- range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
- 
- limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
-+endif
-diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am
-index 7b52e13..71cb545 100644
---- a/zypp-plugin/testsuite/Makefile.am
-+++ b/zypp-plugin/testsuite/Makefile.am
-@@ -1,3 +1,5 @@
-+
-+if ENABLE_TESTS
- if HAVE_ZYPP
- TEST_LOG_DRIVER = $(SHELL) tap-driver.sh
- 
-@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS)
- 
- EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh
- endif
-+endif
diff --git a/app-backup/snapper/snapper-0.10.1.ebuild b/app-backup/snapper/snapper-0.10.1.ebuild
deleted file mode 100644
index 11fe4ff862dd..000000000000
--- a/app-backup/snapper/snapper-0.10.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-
-DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
-HOMEPAGE="http://snapper.io/"
-SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="doc lvm pam test systemd xattr"
-RESTRICT="test"
-
-RDEPEND="dev-libs/boost:=[threads(+)]
-	dev-libs/json-c:=
-	dev-libs/libxml2
-	dev-libs/icu:=
-	sys-apps/acl
-	sys-apps/dbus
-	sys-apps/util-linux
-	>=sys-fs/btrfs-progs-3.17.1
-	sys-libs/zlib
-	virtual/libintl
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	xattr? ( sys-apps/attr )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/cron-confd.patch
-	"${FILESDIR}"/${P}-testsuite.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
-		-i data/Makefile.* \
-		|| die "Failed to fix systemd services and timers installation path"
-	eautoreconf
-}
-
-src_configure() {
-	# ext4 code does not work anymore
-	# snapper does not build without btrfs
-	local myeconfargs=(
-		--disable-silent-rules
-		--with-conf="/etc/conf.d"
-		--enable-zypp
-		--enable-rollback
-		--enable-btrfs-quota
-		--disable-ext4
-		--enable-btrfs
-		$(use_enable doc)
-		$(use_enable lvm)
-		$(use_enable pam)
-		$(use_enable test tests)
-		$(use_enable systemd)
-		$(use_enable xattr xattrs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Existing configuration file required to function
-	keepdir /etc/snapper/configs
-	newconfd data/sysconfig.snapper snapper
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "In order to use Snapper, you need to set up"
-	elog "at least one config first. To do this, run:"
-	elog "snapper create-config <subvolume>"
-	elog "For more information, see man (8) snapper or"
-	elog "http://snapper.io/documentation.html"
-}
diff --git a/app-backup/snapper/snapper-0.10.2.ebuild b/app-backup/snapper/snapper-0.10.2.ebuild
index a9bdd7be0315..f8c9f634d9d5 100644
--- a/app-backup/snapper/snapper-0.10.2.ebuild
+++ b/app-backup/snapper/snapper-0.10.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="doc lvm pam test systemd xattr"
 RESTRICT="test"
 
diff --git a/app-backup/snapper/snapper-0.9.1.ebuild b/app-backup/snapper/snapper-0.9.1.ebuild
deleted file mode 100644
index df3d33714c14..000000000000
--- a/app-backup/snapper/snapper-0.9.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd bash-completion-r1
-
-DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
-HOMEPAGE="http://snapper.io/"
-SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="doc lvm pam test systemd xattr"
-RESTRICT="test"
-
-RDEPEND="dev-libs/boost:=[threads(+)]
-	dev-libs/json-c:=
-	dev-libs/libxml2
-	dev-libs/icu:=
-	sys-apps/acl
-	sys-apps/dbus
-	sys-apps/util-linux
-	>=sys-fs/btrfs-progs-3.17.1
-	sys-libs/zlib
-	virtual/libintl
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	xattr? ( sys-apps/attr )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/cron-confd.patch
-	"${FILESDIR}"/${P}-testsuite.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
-		-i data/Makefile.* \
-		|| die "Failed to fix systemd services and timers installation path"
-	eautoreconf
-}
-
-src_configure() {
-	# ext4 code does not work anymore
-	# snapper does not build without btrfs
-	local myeconfargs=(
-		--disable-silent-rules
-		--with-conf="/etc/conf.d"
-		--enable-zypp
-		--enable-rollback
-		--enable-btrfs-quota
-		--disable-ext4
-		--enable-btrfs
-		$(use_enable doc)
-		$(use_enable lvm)
-		$(use_enable pam)
-		$(use_enable test tests)
-		$(use_enable systemd)
-		$(use_enable xattr xattrs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Existing configuration file required to function
-	keepdir /etc/snapper/configs
-	newconfd data/sysconfig.snapper snapper
-	find "${D}" -name '*.la' -delete || die
-	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
-}
-
-pkg_postinst() {
-	elog "In order to use Snapper, you need to set up"
-	elog "at least one config first. To do this, run:"
-	elog "snapper create-config <subvolume>"
-	elog "For more information, see man (8) snapper or"
-	elog "http://snapper.io/documentation.html"
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 3891e4656256..d29adb3baf1a 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index eb835653bc6e..d9457baf4be3 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,6 +1,6 @@
 DIST opencc-1.1.3.tar.gz 2805430 BLAKE2B 060ca820676a92ddfddc362488031e1ada538626a1fbeb8d178a0ef059b99f606cb0f1151857579221942183820bf34c6f96517d13d4ae8dc3f81846537b668d SHA512 90da656fa4790c58932ad2240a076cc4a9e8cf70ac73d83e0d299e84472deb6491a823966a7686ed1487ef8405909981b9a12b661d8de7f086bd4b498594abac
 DIST opencc-1.1.4.tar.gz 2806887 BLAKE2B 150fd83818616de42e535f349b2574ff3319e41618e522583a57a00ab08b7f28db6e8f4fa4a0d4dbe027753b5be87065b2015542251986c6301ad441c4bf4c98 SHA512 ab8e7e6a0cc71106cf09eb32899fa8620b946a406f042d75a2444096e0b383cb1993d6c2d12cd7862e71854da4cd5893442bce51df84c32ed09fdfb4a2846f46
 EBUILD opencc-1.1.3.ebuild 1584 BLAKE2B 2648b515e72bb61064e0cdf0ac2adc8823dc13dd604d6795ad6640b5558ab1e63f4df023f61ff5b2ba417b95e04674534fd0051f97fa48f98fb3657e1d98fae4 SHA512 9ac4e2157b1338188652c77b33dd6f3077f25d6c22df74c98673b944ce88d506acea7dff257abf1132e0fd2d3114a5232206e46eb2762ce60b086b48a88b7e6f
-EBUILD opencc-1.1.4.ebuild 1585 BLAKE2B 98cd56472ad8cf5f1097a1ddc371778219b29c5b6b0eeb6a96eb1c6244c2fdc5a84ee9b03d31d2366c33fd8b9e77159339786943db0a2d4afd4bf064c57b8c4a SHA512 ffb99ec29ccf8e3cfbb56d427caddfa43629fcb2e1f906390d33bfc620aec2301c08b626b5af8fb7982709518b5f916bb2c77c0b695dc473696b92914f8ca8a2
+EBUILD opencc-1.1.4.ebuild 1584 BLAKE2B 2648b515e72bb61064e0cdf0ac2adc8823dc13dd604d6795ad6640b5558ab1e63f4df023f61ff5b2ba417b95e04674534fd0051f97fa48f98fb3657e1d98fae4 SHA512 9ac4e2157b1338188652c77b33dd6f3077f25d6c22df74c98673b944ce88d506acea7dff257abf1132e0fd2d3114a5232206e46eb2762ce60b086b48a88b7e6f
 EBUILD opencc-9999.ebuild 1533 BLAKE2B 7af70265939b180ea374cdf1f94160257c9bd3ba4c1f26eb70e1a2663e102466d0300ada0008aa29bf8788f1656d8b63475dcfbbb6ef89925b1ef671ff942a2e SHA512 a73dfa1a151602462a0406925963102224874bcff1eebfc277b461d0910310a69dff10ff0c9e5ce0bc5f0acf00f2bd7b9fc293090fbe00cc78c4c67d1e870b27
 MISC metadata.xml 624 BLAKE2B 0fc3325d54820e80e6800c408c9590b0ad55587f94f1cde371c1c2f5396eb650dc53e3d568eeab3e92739c5db142e698119dea51ccacaaed106765d03db9242c SHA512 562f4b08443ed1a7e9ff97b412d5e050ebb6d9e89cd6609302fdaa903cacd5a031f12360c7cbc2504b027b08d3690a119568760621cfeea0294916366bf5261c
diff --git a/app-i18n/opencc/opencc-1.1.4.ebuild b/app-i18n/opencc/opencc-1.1.4.ebuild
index b1f7acfceaf9..ccdabe3b3bb3 100644
--- a/app-i18n/opencc/opencc-1.1.4.ebuild
+++ b/app-i18n/opencc/opencc-1.1.4.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0/1.1"
-KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index fda7ca707989..7ba68dd629a0 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/weggli/Manifest b/app-misc/weggli/Manifest
index ddc15aedadbd..3e5383f1099e 100644
--- a/app-misc/weggli/Manifest
+++ b/app-misc/weggli/Manifest
@@ -1,24 +1,24 @@
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST assert_cmd-2.0.2.crate 29433 BLAKE2B d9f2a97bd81d1423afb6bddbc5fcf6e2cb334502c009368ed623015131d2795d705147e2ad347541a276712b45aa9b95ccb333c52b26aa85dbf58707160f68f5 SHA512 346268f1ff00416eb04ce9307bc6261a05edac4a9c10745f428c6a7c35edc7fa8f6b6c8f7fe66befe5b508e60c2763b8bc8acfcefca4b24a9d3e3e1ea85a9935
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bstr-0.2.17.crate 330350 BLAKE2B 90c3a48d78b73d7e36a3da9fda0beae6e91ce534d17198ea8ceee0b613d03297f9dd8bca30e1ec5da01d1da359a1da72b2c2771b77c82bebab5006cafd665192 SHA512 883eac8210d14f89517b4dd5e25d02c97cf31602ec74498b5e186112ba0f154d47de8d1c41a8f4e5503f3b53c064e2c976b60bbfd63fc28b186bc006e00f20c2
-DIST bumpalo-3.8.0.crate 79835 BLAKE2B 3937c4ca9d7c5e2ffee229c8f5503c6a59f2fabfa3b7c81fefbf5df816efc5f601aaca4b606a62e647262acafa34146aa0906eedc09368e16eb76b3c6722e8e1 SHA512 c9825e7638bd54f97877adee8ac8f6a2cee308050c3f446f9da3996688ec3d779cb6eb935a440329794fb534958a6e89749b44a9bb27dfd219a963f64a6bcac1
+DIST bumpalo-3.9.1.crate 77507 BLAKE2B b248a0c2a9faaf52061f2fe0a82b9fd4efb4dae01da9dbd986493941f3ef2632f1d5608d167f2d088536dc96b4cce28981602220062892a7af51c3ead7a74a4b SHA512 40bf3f0d261aaff1f7c30a539953b9c14f4526f05586af0dbe2e4df4cc042cbe6180e3dcc2fbc6f1802e694066f72e629e74de40bc2951c5527edaf551722a52
 DIST cast-0.2.7.crate 11222 BLAKE2B 8a09b6493d68b08539b38fef39ac3abae829c8b899d5243bda3c3d8acada44f4c57416e3247c82a9a4b82180d7f96c96f048b8cdbf21a8fc184ca6957b237ad9 SHA512 24d204acf21366e088f721714c48bb6431895882263ef3a08f6644abbca5c06f430729fa8bbb4c9f37c95a6baa1b824d3fad95c5f0889e92587490d51bebb4d6
 DIST cc-1.0.72.crate 57495 BLAKE2B b2057ca53aacafa063a4eaa907bfb65aa32ce01a74a90b9085c8243a87723cee8ce79e4904f9d205f9d451598ee34495f8879d27c189477ca43bd39b88b5ea2e SHA512 e9a5b283b2a1fee1030009068c1f87291ec1dab7584a0892f27cc7e523c8fdfd5d986281d9aec1a00af706af1e61d7e64c245c74be7b39c8c022ae2d4f87de8d
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
-DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
 DIST colored-2.0.0.crate 21619 BLAKE2B 5abcc05a95cd74a106c4e4f3c9b1722a7a9493c7d16c2d73f2a116d1d0d20f93d00c414a19871930e6286aa60cdcb0f4f4411ae059e7e76b7632cfca3a55ebe9 SHA512 c9ee830c1e8a32372ab8c7ce569701deaa6533fa369fc1b4c04bed57b1e686ed775fc76c3d9815ad21ee69cfc7c30d645abcbacad39081c7e37ff83ebb6d9e8a
 DIST criterion-0.3.5.crate 110662 BLAKE2B deac65befe648cabfca827b8c37a57a0c48ba1edf34b6e32799117dba9147eceee91b652244b2eb5523c88d8521ae3800d05fbec13b3b3548eabdb13a56f2763 SHA512 ad5d0cf9270c3be5d76c87ada41198d0fbdcdd9831f092ae7179b57e16df153d2aebc0bb70ad7b6fc98966240a902ed5f6fc7adf044be0420bbaa95b951e5be1
 DIST criterion-plot-0.4.4.crate 22546 BLAKE2B ab1326f804cbfbedcb415baadfee2d11b4a67544856fd94dae0f3f3a9bfe46550d23a29a0c8a3a84da6e18565dfb330580aaddfd69a42284499a36b2ae596fef SHA512 4f8fdfdf4ed5e1c410b8e133b36bf9add3d86d56bb23d75d37d92b1095b81850915209c7e4d19fd6aec7cf1b1270a9b968b8e37adc491cfc76b6df71c4619943
-DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
+DIST crossbeam-channel-0.5.2.crate 87842 BLAKE2B 9901a136366ad9afd698c4e385137717964f40c7d035142cb26724e7af45bd6730a0a601320a301a24a7a4f66611a0a650c582fb5a61f6692480bff99ea26492 SHA512 dc8dbfa40a7046ad82da3f33a20b29d216ff98180217489653e53aa46244089d1fd2490051d3f05b00333911e303e9efe76d16d4cbce8257be91f96554fb88d0
 DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
-DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064
-DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
+DIST crossbeam-epoch-0.9.6.crate 46055 BLAKE2B dad8d1181a2b68f6ecf4c620c6222e24850db5f76b99f402f7b79bacaae910effa776c0b72796271b2c9ee8b34f05778998cebf2f25fd88e0bd2f936580dea94 SHA512 5a91cc7ab84b802b9b2d74760b548da9c07e13a1926b9c772c3fb0e8003a27e4d7043c400106175b5009b93aaeaff4ce758a758aa6866d6c60c4c67813481e04
+DIST crossbeam-utils-0.8.6.crate 38841 BLAKE2B 90729cb53f5bdabaea522ac72e06e411a9737398c7970b1805a40bfc3e4d8717eb04c3afac8cf31a1c29c5ef4f137713bfb56320aa5c0e2cdaa6d49e3426b29b SHA512 ee47913da20440fc5b276d68913ab86f12e05d962daa2bfa9c1dc11a0ae775ecd4029584730fa09812d691b64dcb25ec9ad2dab5284fc83962a8e219924119e9
 DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
@@ -35,20 +35,21 @@ DIST indoc-impl-0.3.6.crate 7933 BLAKE2B 93e232e360e8f02943ef9a9cabf16bc863d792d
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST inventory-0.1.11.crate 11795 BLAKE2B 266093387707b91608243c6eb10a351428782b98024a45d1821ccf0b6101982538064af954d196e6b9b3ffd3e094b3fd1cde0f37e2b7d65b3e2cab7b79159825 SHA512 350dfba4bc07b0702ef505c4993643465e2cc05102f3763c36f91782a8e0a1fb88d99d56cae09eba7abb989197eabc7a5f75212778eb6d5cb1e3f108635f364d
 DIST inventory-impl-0.1.11.crate 6220 BLAKE2B 5a4b2157cd23c7d57afeb3179f7d09199734228be161b8a95580967557b4896f4c22bc55f814930f8d51a56684944314ffe5c1e1644fa3b951e4a0292ce60e04 SHA512 8e98e48300878f6b1ae52567d14934aab7b68ec18f3bdf3c6e077d21bdae398ffb31c29812f168a6034d30dbf07ed2e4994abe8f48cd8dc58df7a4a662ba8bd5
-DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
+DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
+DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
 DIST js-sys-0.3.55.crate 70499 BLAKE2B 6108d6bf4be72dc93db5c2f45d59dcbd7b94edc02ccb368a05bdc0e259768be4708e449647b254bc3c542a366492a02f0569d08e69c00249f58b07a566cdf97a SHA512 bd51d61684b3683d5b80df42eb80cb2e4688096bf14fcbd30234503709b1730ab25c7b58112516aeb5d7f44ae20e0ba08bdfddb0518a20603bbb4ca74544d4ac
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.107.crate 554639 BLAKE2B 583cc24943707bbd53823f15fddfececd7acadb5a4d7dc5d0eb07d7b4d851b93500f1e4081b70c6ce3cc76700bdd6c4173ba710fdd52af7776ec7f31aefa3714 SHA512 df1586889c97d45c95f47495f8285c273c143f1861e632b326345ee66da63c227c064d9e12a6a1b48cfb866c70010a4ad407fed120a1a808da7a345777a8f909
+DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
 DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
-DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
+DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST nix-0.17.0.crate 195654 BLAKE2B 6857f84b3deb5800fe3167efd226f042bbcbbc61a4153ce59f69fb544616842c3f6d4566444201c669c6235d1d7577302e5404399f4937f1c0bbbd17fd47ef71 SHA512 3f2bc4f0e9dcb9753535aec9d626ad8126f0a9ea18f73760ba72be0f35d82542c659b4c443783010de133a318f423a16f71cd1f1dd5b5a1f4f71ff7bda247b63
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
-DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
+DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
 DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
@@ -58,15 +59,15 @@ DIST plotters-0.3.1.crate 8595577 BLAKE2B 7c500c43c2b2875d9dc17e4eab57cbd8a470c6
 DIST plotters-backend-0.3.2.crate 13524 BLAKE2B cfd42df0fcea4e5ee944a6b8c48e3b7fcecefd6d97f07e1c333067193c211da9eba29fb56e9fc8b861cfa2d1baa3c042fddb494bb66b9109656b26bde7901f7d SHA512 116bc6866094a2ec40a9ab9363378566ff37eeb4a4e3805562dd3e95f1d5e8664b54d3dc858a2c9974b125e308e46b77c294de2a655f836d342712c32f0242a3
 DIST plotters-svg-0.3.1.crate 7596 BLAKE2B ac8dffc5dea833c0506c472567056be0804e5519828b68f7b3bec9ee63dd59f9aa828c10732a50e004214512df06c7eaf164eb9613cda75b2753270fa358c0d6 SHA512 4d3cd02534440dc26f5eaa3b4966081901626c61d9fabe0092fed87c48929cb9be070d9c34486fc7c7bef308337ff4890d30f9581a613549e507db60dd9d8876
 DIST predicates-1.0.8.crate 26996 BLAKE2B 0e45f2de536395c001475654c5ec2327c66151999ac00fba34abe637c4a2cd10e380597745de0e0bd85b3b088d09d171ec21d40664d878e100cc5d73f3eb5c6b SHA512 a6d8278c331223c24a7189e9dfeddd11a20e7e9010e647a8fbc554f4847b72a13aba2ad22d4e0fedfb2ed4490fd11b05fb2d0e7fda373794b7c0a70094998a6a
-DIST predicates-2.0.3.crate 29239 BLAKE2B f99835f75d16eaecc0a472015d07510623e87e694833c81b78eb6b4da9eca2b205ca596a873e49b15ce5972fb45cc9def664fbe2d9a9697adf0e0f2b3aa74713 SHA512 d77fd2a112b2ba558e78538e766ef551485938a15e32ff03fd8bb1a5448d03b41d8790ad88d6650386970028915cd8bc99a26cc1ece21d1bea05f4fc85d16991
+DIST predicates-2.1.0.crate 23141 BLAKE2B 32dc6455d74e4188385e196f9b9042411c0c1278d12121b4aeaffd58d5adbd201ee4a3e51d908dd59528928f5751f53a125b53e1b15542ed6064c753cd8cfe52 SHA512 824cc99e8e904e5257223bba104cc705fb2e1c93ec6b638cd898dd53fb29217978de1a61c2f11caf1e4a0e076a37efbd09a2998457bcf4af1c2e7eb3c089e0af
 DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
 DIST predicates-tree-1.0.4.crate 7682 BLAKE2B 10e32e4d316bd3bb7015a6ef6d8391381d441acdce0b54a7da2ae4f741175dad7bf92c2488809e233da45360388908f200c2a2756f17210641b0e503728cf150 SHA512 f4d4f3d58c13c9b0344832709709a677d0d1f32e80a2c1e7f38a6f214efaabfc2b8e12d4bb4ac8f0c57def9a44cfe94ce9144132cacc2b6f84002a57aeb4ae5e
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
-DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
+DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
 DIST pyo3-0.13.2.crate 281372 BLAKE2B 22ffcd9fa239efc205e5efcefb6ffbe99a979209aca357174e461826ae8edc1824da820df04bd8af4d07afd550b6a03fce75bc24e83970e7d2ec8cdc0aa17dca SHA512 3d4198a60e9c3abc619e5cac7198288bde294a789b6f84ec87a411d5eaad93d5d55043e8ec218cb0aa09a7289be7fd5bfa0b74be188e2b67c6c646cc2aec66d3
 DIST pyo3-macros-0.13.2.crate 5434 BLAKE2B 881b49ad2f6dbf0f60f7d9d648beb1b2f10266ede0f2d893e4bf0fa574563933f3540f93eabfa31ff2a73970e1a86d0ec1103ce7c0dc565670ad16bd99d10986 SHA512 3847c60f9e3f7150f46e68164fd35582994597eefcc70542ecf95afc7411785cea5b0eedd978b1c4baf2067ff8f2cdd93778affc82e11dcb264c09ba6ea0d788
 DIST pyo3-macros-backend-0.13.2.crate 33106 BLAKE2B df7d9cbb06932c7d01f809bb5cc9230a680f0da7f1231a1c509a7338713722a1a35e456faa81a36d21a16612a1c611b6ce5d018c87210b59e4153ba0addab568 SHA512 ee136e214a6f06b6dccec378d6a73a318408cd55795ffb00c18428b40cca1e2f45c3a98e85c82c68f0f2715b8187237f2bb3dd1e94b95288e2bed1bf6a6d042e
-DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0
+DIST quote-1.0.14.crate 27252 BLAKE2B c744f787e311f9c42b2678f88978d68eaeae87324f07cb28042152a77244ff973e3bc93b8a277f590abe1b6b7c37f6b095ac4a75c96ef9590f7d9d397382b62f SHA512 b2879fa8ae5ca80fb8aba56da016d9b8aab0f1014cc67fe597f42999e8042b2178b98dcb09109edc74b6bd1dc542341a72d11e4880273ffaaf766da243e687e4
 DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
 DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
@@ -75,24 +76,24 @@ DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
-DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
+DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
-DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
+DIST serde-1.0.133.crate 75566 BLAKE2B c6f9334c6a3f722fc3f8b75a031f3c34acf81de1488953addce546ed1dbfeb2350a2a2b25b6088920f47172e2cc9e755c4ef682c19c579a2b70e7f4ae4a7ffb1 SHA512 53f6027a23688a5a303ad9ad169a333c02272ff9c0dc827705c75c162b70040ddf676428f38d04b9aaa49ddd4cee96b5ea5e1dc03f09b90d5f12d8ad22dced0a
 DIST serde_cbor-0.11.2.crate 44570 BLAKE2B facc8d16886dde89125b7d69e9e77ff586c61993c3493fe4089ff03c53e6c0808c6da45a83337d3be7414dd82f3d6a7f3d43167473e49e586a7e817d47ef3014 SHA512 12ddcbd5de0d85f2da6e078e3ccfdf2115125084d57eb93d7e9b45bca6a86daf79dcc79c8e54260c56240c3b5e814b1481ac28c3aa1d1b4b982ef5956b5cc3cd
-DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
-DIST serde_json-1.0.69.crate 115218 BLAKE2B 3ee34530b19cdace9bfdf6417553a53465bde10c049fe4a66db327683e164d14a28eb55dfe82ccd0dbe9d66e02a9d364d6573b933fb888d536aa271df5eecc32 SHA512 4c74ddc935b905708ccd09e8c4ce9e6d4dbb3b0b978228d7947df4659620ac9fa74e8a5e87626ae7e6c79b77b0ac00666888ee62273a13168b53ae55ba1da941
+DIST serde_derive-1.0.133.crate 54726 BLAKE2B c59d71b857513be8b7377b4b9182b7f60e441f7fa5428939ff8a25567ab645eab8ed54178dbb4b41967b7b9073b51cdae68f5a910c91a26cfc2baad0c0344b9a SHA512 d8c18ab50c1b500dc49eed1b5ea26bb46b9adf98b3b3c6c97f9c5d11324368342188ffbfef4c8a092c69577622ec85e672341a49853a957b10bf8dcbc6c0f441
+DIST serde_json-1.0.74.crate 115919 BLAKE2B 230d205687c29f361705f80192e26a15e97c5dc1497a02bd56fa8399a4d562d087461729d17fbefe61af9662886381f8674aee91471b10f11f29e9ad9c14a39d SHA512 da070221e805495b9b8c56a203ded1b2651b81851ae473a73dbf46656c44375cd5ef7db01272792684abb4d7836e193c85a622e83c59125a393fb484431fb061
 DIST simplelog-0.10.2.crate 17999 BLAKE2B 10588425f7d040a2f2daeed8a106a3b7ca7aeda6fee2b98210c0c64cc02bc9d53951558f5bdec67f0d145080a8081ab857c34eb97b16f33745149226b73effb4 SHA512 0895b3b65e1dc55df20ffeaf0b2aa1f2e5449b7ab33e0eddc9c346a2de124c5299e9d1aad89f7fb131b690735b5225670b0ead6482326e5b3427c9188164ebf1
 DIST smallvec-1.7.0.crate 27459 BLAKE2B a740a4b7448a4c8d1bef59cfb6dc9a52145e40eeb38028c64c880f31800cd3a4cb8be17394742239dfa7fb692c749f9edf70e6df02abd7a1bff288eec38ba24e SHA512 d061e0059cd6bd1636424374848aa1d4edd21f75605844a7855ff5d343dbdb71e6eb14bd70de7947ae7ab58f04ff096a5e77aa9a1ac14cef59f657685c846156
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-1.0.81.crate 234144 BLAKE2B 7258c4a0ad0eb0c807912c297233eeb195d22b44cb2078e13e43eb90f1c82ecda6f7672ab072832ce130ccb953c1bb23c8440a3df77b714f462fe39cc6e6e1a3 SHA512 288ddaf4dc5ad2fdb3bc36800d94b53e2bfe9ac74a61a5d158bfcad3728955bebac6a900a5881c7d4abde4f3759515a1dd877e1421c226b85aff99a5ee649390
+DIST syn-1.0.85.crate 235056 BLAKE2B f72302314edc7a4040cc6e0c95a4b8a7105d81da0cd1788703067b01437a3cad216569d96e6871e5c26ec99bac23eaa077d871f2163ee4b501b4d57eba8502b3 SHA512 f12ac93bfc8f24b2a567485fc738a40ae8c9649515783003e07bc5d0f3e377bc324a4f649d66c7fa2d1272cb0a2fb884ecfb06f8aed98dc3c03329f62d03a44e
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
-DIST termtree-0.2.3.crate 6926 BLAKE2B 390aad5f90602785674fddf6dd5ffe5ddb37b5f2eea7cfd330e04e4b3f482c8ab3bca63fa595ee409a8bed3ffd27684bc6a1227ca679763f94cf5a75ad55ee93 SHA512 183a99ece5ba686e6fc9884c3dc702083a6f7918514a20e3af460195d8f171d9ec91fccb8e2a93319f844ca7164455c9490e4a6478ef096f44c1b57e532a7a76
+DIST termtree-0.2.4.crate 4416 BLAKE2B 994134f7af962123b19984aa32b30c19c6f77202067a90ddb3aa4414ec8dc541f5d8be9282244cdbb1eb16686c11750393325fc7f7005de0bec38d6a9219e015 SHA512 afe4e94bd57c9917ba48be4b3a22ff2b9b8a6c764c86871a3be9087ae0c65326fadb466e285a129082e4243ba6bca933d89ea01aa9188222c055f0c2b308cdf3
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
-DIST tree-sitter-0.19.5.crate 125205 BLAKE2B 8866e6f41e4efec4d1765cef573ae5b96330a0293164e42da39f7efb66a0a53c36f6acb7297b7af5046c354e5153f48dfc2a8bfbd4e1826da1a4cdce8bafb617 SHA512 5a29c95db190136400e6bdef706419e1cff227c3965af4cad0c6599dd2e7a20911b81aa5d8650d2ada93b66b8df6ec79e7611a546a6177cc1f3bca87dcc7a3d7
+DIST tree-sitter-0.20.2.crate 127877 BLAKE2B 47862e8fdff81b43f70301775fa67f6b0cf34aca2c026a020096563d7c58a86f1855c84f264e1e8128b3fe7760853579aa1227d3c8dc3bf4bd49fabc757f0511 SHA512 498a6a8add5c79d81add11af76b679322150ab87fb55171aeeaf279b44841ac9afb0ddfe3edb10f67979dacb7c37a1039a32ac4e516270e57e28fb1c020bd284
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST unindent-0.1.7.crate 8346 BLAKE2B cbf76fd18e49332e61275ab204cef1fc4dee58091307f8cbe2107d3a8441551055541583f1d643d4d15f9cc17a8405f540f0c53548f5b2379dd70791a03640cb SHA512 d3f4543f97f1386f63306a206074de1d10077ae968ea6eb6638545eeaf8cef662e1c84a15788e9df640eeb6af4cbc187721ec01af43984e4eeb2dfb0423c6d70
@@ -107,10 +108,10 @@ DIST wasm-bindgen-macro-0.2.78.crate 11700 BLAKE2B 9f1538d79a39555f643b9ac6bfe02
 DIST wasm-bindgen-macro-support-0.2.78.crate 17858 BLAKE2B 8378f639a94797d2d149f2cd836f56143a498d3be5fc30eced6fe4fc2e1bfe14a70f3165cdc5cc1c88f0162efec75b64e56aa9819596984afa97003601b933ce SHA512 84d9867407a7caa942ab11f0ad1c343839bf51793930cdc3ebc5279ca370062eda006540448cc401f6afa078dbb1523b348ae69f4c6d7ccc9a7b8fa1ff895236
 DIST wasm-bindgen-shared-0.2.78.crate 7206 BLAKE2B ee60946d3a90a2760d8cb045657de659c6367aed2d98efd60074cb57f6b06aedf9ac44fed3d41c20299c5edc095cac5537a365fdb01183f3e60b6323da581935 SHA512 a808b7a7909e4a287ccced1b251ad4c1230399c84c05e246127b6a91fa4ed328d6a24316dbdc1843db71a5bd78cfd80113424f9984e0777323d74e3125607134
 DIST web-sys-0.3.55.crate 664827 BLAKE2B 1864f320e6c9b80c6b4b4fd8941d66cf9368a9b0cebcb86d3486b99f65456748b46c507a1bb761611c4825d412986f5bd8c8fc38c3bda3dad2e9de213467ee51 SHA512 ddf191f009d49388bf60ee31650eff1ff884f01822989a226c559b9560aebd90681fadd34e7437f555d627a0a3139ebe267375618eadac8c17ace5fd47650764
-DIST weggli-0.2.3.tar.gz 992747 BLAKE2B 1128c71f026743502d353768af2b435c2f5c638f7b4e8ffdd24f54b4da49986364b57622b130ea6d5493b4684d7dcb9896d9cc5b49e71d81bd38cb0273b61b1c SHA512 b6c8abf9f9eafc94ec9a5c109bd08bcdc786bc9e18a1e7bd7bff086e9e0a762881001a1fe3806f08e444a1d51a359ed5145b2153e4ebacebfbdecb432a962cb2
+DIST weggli-0.2.4.tar.gz 1049807 BLAKE2B ac397f15388fa9ca57d668b68c4e37c170998dd549419cf9d9ef421803bf34a0bf1a2cc266b08aaae0e8bc18e9e5a17187f326243843bdb381e256f858f02032 SHA512 2473415f60f2834e652d3f6f933bc648e659fca8fef85e82d2cfb87cb039727a38aa32b2eb90ac93cf7d2f11a803daeb73350e85ac1144ed9194757854bc225e
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD weggli-0.2.3.ebuild 2647 BLAKE2B 43479fb8c3b03e54eb39f4f703178e8a997f4607e070d7afc1496232f7b0f4472df273993c2c18c4b5b8eab0c3433f9b6c28d295285236d5a2111553b809636f SHA512 2ae98db71648defbeb3eabf875271b7e24039cd1bb78892c45ab0ac9702d739427788237be8573d3d6b169b4491b1f612cda94050fd2c4a9ecb65c8206c44422
+EBUILD weggli-0.2.4.ebuild 2983 BLAKE2B 06b89cbe2f8aeced4748755ac3e81a326cbb934630a2d55b95a63e3e8718d949b180aeec62859a9368d63bce6d17f16c73d9e4f6d228114c14e0d38117a825d9 SHA512 837034d0077c2353d3fb097a956e41f7b67a7e902d18a1701cee55b7b119594ab7dc8d01af0eeefd921950f2d45e3a143aa325f44be8717af3fd58e3c79765e7
 MISC metadata.xml 333 BLAKE2B 20a308a2bdb3f2b18db61b2445569942d07e703619d4875f6ed0a9a6cfafb6f79010e0139fe7e1c7cad920823e35ff36c8c9913664f5faafc6ca818498108233 SHA512 72f3e220b1ed7284374b61468631250188c732ee5577a77eb869ea91fbf0a1091219d898fc46a879a8b239c0264b293e99d64e9147d1135721f0716156ce660d
diff --git a/app-misc/weggli/weggli-0.2.3.ebuild b/app-misc/weggli/weggli-0.2.4.ebuild
index 1217d60f0e27..06fb24a02262 100644
--- a/app-misc/weggli/weggli-0.2.3.ebuild
+++ b/app-misc/weggli/weggli-0.2.4.ebuild
@@ -1,32 +1,30 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Auto-Generated by cargo-ebuild 0.5.1
-
 EAPI=8
 
 CRATES="
 	aho-corasick-0.7.18
-	ansi_term-0.11.0
+	ansi_term-0.12.1
 	assert_cmd-2.0.2
 	atty-0.2.14
 	autocfg-1.0.1
 	bitflags-1.3.2
 	bstr-0.2.17
-	bumpalo-3.8.0
+	bumpalo-3.9.1
 	cast-0.2.7
 	cc-1.0.72
 	cfg-if-0.1.10
 	cfg-if-1.0.0
 	chrono-0.4.19
-	clap-2.33.3
+	clap-2.34.0
 	colored-2.0.0
 	criterion-0.3.5
 	criterion-plot-0.4.4
-	crossbeam-channel-0.5.1
+	crossbeam-channel-0.5.2
 	crossbeam-deque-0.8.1
-	crossbeam-epoch-0.9.5
-	crossbeam-utils-0.8.5
+	crossbeam-epoch-0.9.6
+	crossbeam-utils-0.8.6
 	csv-1.1.6
 	csv-core-0.1.10
 	ctor-0.1.21
@@ -43,20 +41,21 @@ CRATES="
 	instant-0.1.12
 	inventory-0.1.11
 	inventory-impl-0.1.11
-	itertools-0.10.1
+	itertools-0.10.3
 	itoa-0.4.8
+	itoa-1.0.1
 	js-sys-0.3.55
 	lazy_static-1.4.0
-	libc-0.2.107
+	libc-0.2.112
 	lock_api-0.4.5
 	log-0.4.14
 	memchr-2.4.1
-	memoffset-0.6.4
+	memoffset-0.6.5
 	nix-0.17.0
 	normalize-line-endings-0.3.0
 	num-integer-0.1.44
 	num-traits-0.2.14
-	num_cpus-1.13.0
+	num_cpus-1.13.1
 	oorandom-11.1.3
 	parking_lot-0.11.2
 	parking_lot_core-0.8.5
@@ -66,15 +65,15 @@ CRATES="
 	plotters-backend-0.3.2
 	plotters-svg-0.3.1
 	predicates-1.0.8
-	predicates-2.0.3
+	predicates-2.1.0
 	predicates-core-1.0.2
 	predicates-tree-1.0.4
 	proc-macro-hack-0.5.19
-	proc-macro2-1.0.32
+	proc-macro2-1.0.36
 	pyo3-0.13.2
 	pyo3-macros-0.13.2
 	pyo3-macros-backend-0.13.2
-	quote-1.0.10
+	quote-1.0.14
 	rayon-1.5.1
 	rayon-core-1.9.1
 	redox_syscall-0.2.10
@@ -83,24 +82,24 @@ CRATES="
 	regex-syntax-0.6.25
 	rustc-hash-1.1.0
 	rustc_version-0.4.0
-	ryu-1.0.5
+	ryu-1.0.9
 	same-file-1.0.6
 	scopeguard-1.1.0
 	semver-1.0.4
-	serde-1.0.130
+	serde-1.0.133
 	serde_cbor-0.11.2
-	serde_derive-1.0.130
-	serde_json-1.0.69
+	serde_derive-1.0.133
+	serde_json-1.0.74
 	simplelog-0.10.2
 	smallvec-1.7.0
 	strsim-0.8.0
-	syn-1.0.81
+	syn-1.0.85
 	termcolor-1.1.2
-	termtree-0.2.3
+	termtree-0.2.4
 	textwrap-0.11.0
 	time-0.1.44
 	tinytemplate-1.2.1
-	tree-sitter-0.19.5
+	tree-sitter-0.20.2
 	unicode-width-0.1.9
 	unicode-xid-0.2.2
 	unindent-0.1.7
@@ -121,7 +120,12 @@ CRATES="
 	winapi-x86_64-pc-windows-gnu-0.4.0
 "
 
-inherit cargo
+# We can inherit distutils-r1 here and build the Python
+# module. Unfortunately the Python module seems to not include the
+# tree-sitter grammar. Patching the .so to need the system's
+# libtree-sitter-cpp seems to work, but it is not correct because the
+# weggli grammar has some minor modifications.
+inherit cargo flag-o-matic
 
 DESCRIPTION="a fast and robust semantic search tool for C and C++ codebases"
 HOMEPAGE="https://github.com/googleprojectzero/weggli"
@@ -134,4 +138,11 @@ LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 Un
 SLOT="0"
 KEYWORDS="~amd64"
 
-QA_FLAGS_IGNORED="usr/bin/weggli"
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_prepare() {
+	default
+
+	# 854741
+	filter-lto
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 4a5764e9ab65..0a0e93acb5fa 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index b128eb830d63..a3399df83d66 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -2,6 +2,9 @@ DIST fzf-0.30.0-deps.tar.xz 20315772 BLAKE2B 8664b82f5e837bde97251f64e6d8637f202
 DIST fzf-0.30.0.tar.gz 209750 BLAKE2B ee21726dac11cddc29839c1c2368e46497b4b5172e8896914b8fda602ecb28a7179f27cb3c63d9841f42e87e7d3589b37427b348b9e59cf531797c487e3fdc2d SHA512 cebb685a7fa00bdff07751d0021edde82f0ff3bf705eff82f94f6bf57c5e008eb6894d023ed7b14378f1d92fa2394192c12b720c6f711b1a414438fe3f8b4ec3
 DIST fzf-0.31.0-deps.tar.xz 16051640 BLAKE2B 9aac02a1df4d9db7cf11c77dead32fb13b74965e0c38b4d5d650daff123a697091db93235c3a3f3325c91351cbaf4b5401cdeee8d5120a59bc83fa9a0ca763da SHA512 bd88603ce059cac3c10bcf4face50f8097d7efcc26ef8b61870f93e7405b849293c80e9d39e124a63103080b6bab0cc28225b85470bc650fc53c61aa5ae9f33d
 DIST fzf-0.31.0.tar.gz 210779 BLAKE2B 013ba0689e661a2497ffd3a6046ae330930aca295ad9b9620ab70474d34d969a78fccebb59daf45b278a76f33093db1fcd6838fb785aa63008755ce693b15967 SHA512 e0d281fe771a51d4bd617227daa9533e0d219cc047233ca9f342683591bc09843aad1d3686d58ddef71c317e69b2ccaf4a3d6175959cf81aaec50914fe51dea0
+DIST fzf-0.32.1-deps.tar.xz 16042284 BLAKE2B 9ca05904cfa0790372e1879a77946e337dff32c51fb787f38aba305fa5f2873d05ee6cc99cecc100355dbdd6cb598675a19aeb82eb922900030739f47c297bc8 SHA512 7326e3d10aae637a9879a231ff179b03b6c052160609053c79a7fd2e578e8986cc00a4ae117b780b686581507f9762fec7c9068b9f83cd0473dcaab8c975133d
+DIST fzf-0.32.1.tar.gz 212217 BLAKE2B b1b80bd5ed69dafdca3d52ff1630be99e1384119818bacb31fc04e0cfe58cfd99a4ebb9bd9b8a29e885e7e3db8aa8ba5046107d41a5222c6c05c5d194c42d394 SHA512 8abf7eceec466a3bb0cca48e36a426b4fbf5a4cb07f09756b92705fba11dc432d59102cf0337c8f0bae2782747a45cb7040d2f0de5a2050bb80fd5a6e09f0439
 EBUILD fzf-0.30.0.ebuild 1757 BLAKE2B 009b962eccb17af6b8533d2c411030f050235e159988946ae775d3d1da7aab96360afc8ae9771e5ad4f0d0d3f605b2629b1be6eece989afa2f0fec5adfcf107e SHA512 be9f419f071a169b3754b34152da426bdd6f4213221d7d886b5a964e672fce0e12209b48d06c4f26d84696b56c418f41723c2a7462d4faff67eec9b96fa0a0aa
 EBUILD fzf-0.31.0.ebuild 1975 BLAKE2B 6b6e8a022a9e3c8ebe89d79b8af14ee738cb521f2bd8b31489dfd9f1f81295fefe76bc681287c96b665694f37e9e7bf3911034749e7746c963ce3c6ba3ea438a SHA512 0778f5a555dbcf764230a78fc54277a3442f9d0fd41086e23e83f428b43dd5e53903d84c118548fffdaf07110d6c450a974031582cbbbf41682dd034ab3142f6
+EBUILD fzf-0.32.1.ebuild 1983 BLAKE2B 5d3555ed53c86ebbf5acbe69a54515fbe26673f7d4ba915e7675d9f6f71d7a5fb21473d7a9474d27de052b31b69b6c5dd49b2a162c0bc15639040acd088464d7 SHA512 912838d60b39bdc341410d9fd97608424d31a8b9c60529430d16d65ffcc8e51b08b6534a3bba2660f90bdc8610c20819354fabd2e169819b3220f629d2ad3616
 MISC metadata.xml 469 BLAKE2B 3d6dcce756d040b715bbf17f33faea2c0ddd810857cb38289f59cab134a5b049d21db71c9c3844497643e1728ecd09a924a51ba273f736712543307f2b806d1a SHA512 21f3fef809b276da7f7ad33dbafefc2ebfa86b9ce9aa0dea664724c399a6743923a8a1825cffbd06d885181dc7b305d351e7ab77bd133abb98f601a84783f52f
diff --git a/app-shells/fzf/fzf-0.32.1.ebuild b/app-shells/fzf/fzf-0.32.1.ebuild
new file mode 100644
index 000000000000..12b7161dcb56
--- /dev/null
+++ b/app-shells/fzf/fzf-0.32.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="General-purpose command-line fuzzy finder, written in Golang"
+HOMEPAGE="https://github.com/junegunn/fzf"
+
+# For fancy versioning only. Bump on the next release!
+# MY_GIT_REV is the first 7 characters of release commit, we truncate it
+# after to make it easier to copy/paste.
+MY_GIT_REV=4993d19466d5f3ac127de5c0c461cde7ef1894d7
+MY_GIT_REV=${MY_GIT_REV:0:7}
+
+SRC_URI="https://github.com/junegunn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+src_prepare() {
+	default
+	sed -i 's/-s -w //' Makefile || die # bug 795225
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
+}
+
+src_install() {
+	dobin bin/${PN}
+	doman man/man1/${PN}.1
+
+	dobin bin/${PN}-tmux
+	doman man/man1/${PN}-tmux.1
+
+	insinto /usr/share/vim/vimfiles/plugin
+	doins plugin/${PN}.vim
+
+	insinto /usr/share/nvim/runtime/plugin
+	doins plugin/${PN}.vim
+
+	newbashcomp shell/completion.bash ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins shell/completion.zsh _${PN}
+
+	insinto /usr/share/fzf
+	doins shell/key-bindings.bash
+	doins shell/key-bindings.fish
+	doins shell/key-bindings.zsh
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To add fzf support to your shell, make sure to use the right file"
+		elog "from ${EROOT}/usr/share/fzf."
+		elog
+		elog "For bash, add the following line to ~/.bashrc:"
+		elog
+		elog "	# source ${EROOT}/usr/share/bash-completion/completions/fzf"
+		elog "	# source ${EROOT}/usr/share/fzf/key-bindings.bash"
+		elog
+		elog "Plugins for Vim and Neovim are installed to respective directories"
+		elog "and will work out of the box."
+		elog
+		elog "For fzf support in tmux see fzf-tmux(1)."
+	fi
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 701f49be1cb2..5c967540662e 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index 9f132c3dc749..5f5a8511bb39 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1,8 +1,3 @@
-AUX java-service-wrapper-3.5.25-as-needed.patch 7061 BLAKE2B e3dd530192faff52f0580fa6593dbc26314d90dbc2456414e843b2fc041f1f788afd5faaf08411153cac384b8a4325d5b0d6da483ed80fb07698f29cd9284482 SHA512 d79958b7a46e21c7a003c9d4e913f2581ec984f5e8ef1c902f84ae8e83cc2c03a23162ceec1b36e94ba44a35fb2518964831dc74bd548692a07b8a767cbbd803
-AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1260 BLAKE2B 6d48e0ea2537343f76d6c7114c99aba4a9887bfba1b184076f8fae636f3888c8494251d6022946f2632ea24d1cb8b03030caa9de71ae21b8a7f1fc3e9acacf64 SHA512 1581a01ec1e4a352d86939e43e659c86fe8f99420e67ded44ed8ec42462b35a540b7763a8d1c055d8710dae422b8163d8ff650df016779f68ec6672cd8fc1150
-AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227d2eb0edede37650bb8dfa1c7a8e9a18109f34eabfb5ddc7b9db67c2922403b0448997cc96d8e83c96b62974b25da22a624d91dc500cf SHA512 c058363d17e0594ccce355183358d016acf8ec06dd88ff3dc3b360d143cd56fd1a70b5d7d9f5bf774451ea0eed5a78752c8b3fcc32422a1a97d52eb43e057e91
-DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
 DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09
-EBUILD java-service-wrapper-3.5.25-r2.ebuild 1407 BLAKE2B e05a6930c0ee852a43df15a7cadc1011663ab8db7849e45461a3d0fd1db43b379e254f1fcae482451a85c067eed0c851fe923c7dbd0c6785cb3adce9d92b9953 SHA512 60b08f6ce759bb8a724b1c50d5dd1e5aa8ca76ce95602dfae7c21d6567d9ff9719d5528e0d715842158f2f2f7c4f3147b7f646247cd4538e42eb0954ae98c705
 EBUILD java-service-wrapper-3.5.50.ebuild 2302 BLAKE2B 4a6c238518571f013e8ddd5d7f4346c0617cb307db33bd55563f93539d056b88f1c2ef0d740e3b8942c58b2a706586887d1d37a068564f3412f308025caade18 SHA512 c777594a5b2367af1be7b15192a62ed4e95e5f1b0e0cf728990da345049bc78707f0829b5791cfeef3570a8583c3427278947f045aabc803185ef6531db06af5
 MISC metadata.xml 640 BLAKE2B 1ced5abe1a0ff9b141f3a6020cd6352b02cf228524b694f36bedb7ef91a892ee471235b36e81e03fbe98eee6f28f680821b15501447b58c8788129eaf8e6b39a SHA512 4d9eb54f0328aa00380b40a0ead3fc43e552b71e8d4b5279341d5249a9615c3c161ca19295d6f586c43708f9e29aaf3799799243dd277c8822b95d7c1f82afd1
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
deleted file mode 100644
index 3eac44c0dc6c..000000000000
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-as-needed.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-https://bugs.gentoo.org/622806
-https://sourceforge.net/p/wrapper/patches/25/
---- a/src/c/Makefile-linux-armel-32.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ b/src/c/Makefile-linux-armel-32.make	2014-07-21 10:50:11.000000000 +0200
-@@ -33,14 +33,14 @@
- 	if test ! -d .deps; then mkdir .deps; fi
- 
- wrapper: $(wrapper_SOURCE)
--	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
-+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
- 
- libwrapper.so: $(libwrapper_so_OBJECTS)
--	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
- 
- %.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
-+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
- 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
- 	tr ' ' '\012' < .deps/$(*F).pp \
- 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- a/src/c/Makefile-linux-armhf-32.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ b/src/c/Makefile-linux-armhf-32.make	2014-07-21 10:51:05.000000000 +0200
-@@ -33,14 +33,14 @@
- 	if test ! -d .deps; then mkdir .deps; fi
- 
- wrapper: $(wrapper_SOURCE)
--	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
-+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
- 
- libwrapper.so: $(libwrapper_so_OBJECTS)
--	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
- 
- %.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
-+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
- 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
- 	tr ' ' '\012' < .deps/$(*F).pp \
- 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- a/src/c/Makefile-linux-ia-64.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ b/src/c/Makefile-linux-ia-64.make	2014-07-21 10:51:37.000000000 +0200
-@@ -33,14 +33,14 @@
- 	if test ! -d .deps; then mkdir .deps; fi
- 
- wrapper: $(wrapper_SOURCE)
--	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
-+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
- 
- libwrapper.so: $(libwrapper_so_OBJECTS)
--	${COMPILE} -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+	${COMPILE} $(LDFLAGS) -lm -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
- 
- %.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
-+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
- 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
- 	tr ' ' '\012' < .deps/$(*F).pp \
- 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- a/src/c/Makefile-linux-ppc-32.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ b/src/c/Makefile-linux-ppc-32.make	2014-07-21 10:52:05.000000000 +0200
-@@ -33,14 +33,14 @@
- 	if test ! -d .deps; then mkdir .deps; fi
- 
- wrapper: $(wrapper_SOURCE)
--	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
-+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
- 
- libwrapper.so: $(libwrapper_so_OBJECTS)
--	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
- 
- %.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
-+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
- 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
- 	tr ' ' '\012' < .deps/$(*F).pp \
- 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- a/src/c/Makefile-linux-ppc-64.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ b/src/c/Makefile-linux-ppc-64.make	2014-07-21 10:52:45.000000000 +0200
-@@ -33,14 +33,14 @@
- 	if test ! -d .deps; then mkdir .deps; fi
- 
- wrapper: $(wrapper_SOURCE)
--	$(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
-+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
- 
- libwrapper.so: $(libwrapper_so_OBJECTS)
--	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
- 
- %.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
-+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
- 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
- 	tr ' ' '\012' < .deps/$(*F).pp \
- 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- a/src/c/Makefile-linux-x86-32.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ b/src/c/Makefile-linux-x86-32.make	2014-07-21 10:53:39.000000000 +0200
-@@ -36,17 +36,17 @@
- 	if test ! -d .deps; then mkdir .deps; fi
- 
- wrapper: $(wrapper_SOURCE)
--	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
-+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
- 
- testsuite: $(testsuite_SOURCE)
--	$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
-+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
- 
- libwrapper.so: $(libwrapper_so_OBJECTS)
--	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
- 
- %.o: %.c
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
-+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
- 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
- 	tr ' ' '\012' < .deps/$(*F).pp \
- 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
---- a/src/c/Makefile-linux-x86-64.make.old	2014-07-21 10:48:31.000000000 +0200
-+++ b/src/c/Makefile-linux-x86-64.make	2014-07-21 10:54:16.000000000 +0200
-@@ -36,17 +36,17 @@
- 	if test ! -d .deps; then mkdir .deps; fi
- 
- wrapper: $(wrapper_SOURCE)
--	$(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
-+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper
- 
- testsuite: $(testsuite_SOURCE)
--	$(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
-+	$(COMPILE) $(CFLAGS) $(LDFLAGS) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite
- 
- libwrapper.so: $(libwrapper_so_OBJECTS)
--	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-+	${COMPILE} $(LDFLAGS) -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
- 
- %.o: %.c 
--	@echo '$(COMPILE) -c $<'; \
--	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@echo '$(COMPILE) $(CFLAGS) -c $<'; \
-+	$(COMPILE) $(CFLAGS) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
- 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
- 	tr ' ' '\012' < .deps/$(*F).pp \
- 	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
deleted file mode 100644
index a859a893bd1c..000000000000
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-|Original version of this patch by Ralph Sennhauser <sera@gentoo.org>
-|Updated version for 3.5.25 by tomboy64 <tomboy64@sina.cn>
-|
-|Added in 3.5.4, make false default for Gentoo
-|
-|* Add a new wrapper.java.command.resolve property to control whether or not the
-|  Wrapper tries to resolve any symbolic links in the Java command, specified
-|  with the wrapper.java.command property.  Historically, it has always done so,
-|  but some jvm started applications like run-java-tool on Gentoo will fail if
-|  it is run directly as they have a check to make sure it is launched via a
-|  symbolic link.
-|
-
---- a/src/c/wrapper.c.old	2014-07-21 09:12:55.000000000 +0200
-+++ b/src/c/wrapper.c	2014-07-21 09:13:22.000000000 +0200
-@@ -4908,7 +4908,7 @@
-     if (!path) {
-         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN, TEXT("The configured wrapper.java.command could not be found, attempting to launch anyway: %s"), *para);
-     } else {
--        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), TRUE);
-+        replacePath = getBooleanProperty(properties, TEXT("wrapper.java.command.resolve"), FALSE);
-         if (replacePath == TRUE) {
-             free(*para);
-             *para = malloc((_tcslen(path) + 1) * sizeof(TCHAR));
-
diff --git a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch b/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch
deleted file mode 100644
index d279cdf0f4ea..000000000000
--- a/dev-java/java-service-wrapper/files/java-service-wrapper-3.5.25-testsuite.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make
---- wrapper_3.5.25_src.orig/src/c/Makefile-linux-x86-64.make	2014-09-06 00:06:05.730644375 +0200
-+++ wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make	2014-09-06 00:06:51.130013387 +0200
-@@ -23,7 +23,7 @@
- LIB = ../../lib
- TEST = ../../test
- 
--all: init wrapper libwrapper.so testsuite
-+all: init wrapper libwrapper.so
- 
- clean:
- 	rm -f *.o
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
deleted file mode 100644
index e09f0c051ef4..000000000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-inherit java-pkg-2 java-ant-2 toolchain-funcs
-
-MY_PN="wrapper"
-MY_P="${MY_PN}_${PV}_src"
-DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
-HOMEPAGE="http://wrapper.tanukisoftware.org/"
-SRC_URI="http://${MY_PN}.tanukisoftware.org/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="tanuki-community"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="
-	virtual/jre:1.8"
-DEPEND="
-	virtual/jdk:1.8
-	test? (
-		dev-java/ant-junit:0
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed.patch
-	"${FILESDIR}"/${P}-gentoo-wrapper-defaults.patch
-	"${FILESDIR}"/${P}-testsuite.patch
-)
-
-src_prepare() {
-	default
-
-	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
-}
-
-src_compile() {
-	tc-export CC
-	BITS="32"
-	use amd64 && BITS="64"
-	eant -Dbits=${BITS} jar compile-c
-	if use doc; then
-		ejavadoc -d api -sourcepath src/java/ -subpackages org \
-			|| die "javadoc	failed"
-	fi
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant -Dbits="${BITS}" test
-}
-
-src_install() {
-	java-pkg_dojar lib/wrapper.jar
-	java-pkg_doso lib/libwrapper.so
-
-	dobin bin/wrapper
-	dodoc README*.txt
-	dodoc doc/revisions.txt
-
-	use doc && java-pkg_dojavadoc api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/jctools-core/Manifest b/dev-java/jctools-core/Manifest
index b5c71a939b79..7d61d6ced566 100644
--- a/dev-java/jctools-core/Manifest
+++ b/dev-java/jctools-core/Manifest
@@ -1,5 +1,3 @@
-DIST jctools-3.1.0.tar.gz 4204148 BLAKE2B 88f8f5395470072571de64ee3d696e90c1fbf22a6e9c1424463bfb8b497dd3d47f8d0fcc9a039acec8380ac52a3d445789257d5a1071e49e6963c59d156065e2 SHA512 bf69387732dea043e6e5fa44fe60a5f80ef5ae9d32ebb39ac16353e5bd82502b3b6e5564a8bd9f3b8ad073a95ff984ae55133884ebeea9d0b9a777c488af2a74
 DIST jctools-3.3.0.tar.gz 4214717 BLAKE2B c9c5f5897ebf8bb7ac439b969f372c45b7652517cbc5369c07fe80d11f779eebe7fe5ffb5d93a18fe3df5d9ca9adf3cee7268c8c6ed962fccb4d84f5b0451c4b SHA512 ce212abacca6137a133f7a4e94370442d00bf73794fa7b9ce440631701a9a2fca31c4dda05e2a768fcf28f75e84f2a7f318a936e429c7f4ed20daa7b79d11a4a
-EBUILD jctools-core-3.1.0.ebuild 2186 BLAKE2B e9949b3184c3b7a70efadf81b3c2181b7aeeb445281cc733d83ba3f109c5cdda5137d97ee62fe5f73164832df221145b79bdb93f15ce13a17caf81144cf64571 SHA512 2c16f8b53b16f67b63ab7e3e7b9ec547e5acc17e19250379415457e6d3992953158c79a95158ad9a32ff98947c82b0addc566d880c6a08d731f881a110415984
 EBUILD jctools-core-3.3.0.ebuild 2253 BLAKE2B 260724ac01c2202cfe685bb232a5533b5dd611b5e57d7c9e47fb06b35c8e66c1026622c0ee14c62e09535219c90225f990215e6b573e0113721c9f9c64a54210 SHA512 68a3b914db018eee7354adc21aab9502c533d5ae6e2b00347127ce97dc3a5639fb810a3d889d0100e5065c23af3be807143ccea974d940586b0362d5f3280b2b
 MISC metadata.xml 305 BLAKE2B 4ac1a7216894d3a7be6d9b4bbc034c2cb571ce0e9ec4f401eb4921f9c56b00296494be04d33b052d7f89684ac9a8d9b80385f7b33d7cb0a92b2ddb4bcc323835 SHA512 3ce5145f2b40c8a5bc7cd89c14ce33d6d194809ab70bec23c0726636ed516693f3cfdfe231e79fc1e3f3591ad950ff27f2632545fd69213a878be1b27d6f1f9d
diff --git a/dev-java/jctools-core/jctools-core-3.1.0.ebuild b/dev-java/jctools-core/jctools-core-3.1.0.ebuild
deleted file mode 100644
index aa0d71ccb18c..000000000000
--- a/dev-java/jctools-core/jctools-core-3.1.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/JCTools/JCTools/archive/v3.1.0.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jctools-core-3.1.0.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.jctools:jctools-core:3.0.1"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Concurrency Tools Core Library"
-HOMEPAGE="https://jctools.github.io/JCTools/"
-SRC_URI="https://github.com/JCTools/JCTools/archive/v${PV}.tar.gz -> jctools-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.google.guava:guava-testlib:21.0 -> >=dev-java/guava-testlib-30.1.1:0
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
-
-DEPEND=">=virtual/jdk-1.8:*
-	test? (
-		dev-java/guava-testlib:0
-		dev-java/hamcrest-library:1.3
-	)"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( ../{README,RELEASE-NOTES}.md )
-
-S="${WORKDIR}/JCTools-${PV}/jctools-core"
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="guava-testlib,hamcrest-library-1.3,junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-# Using the defaults of java-pkg-simple would skip more than half the number of tests.
-src_test() {
-	# These tests would fail and are not run by "mvn test".
-	# "org.jctools.queues.MpqSanityTest"
-	# "org.jctools.queues.QueueSanityTest"
-	# "org.jctools.queues.ScQueueRemoveTest"
-	# "org.jctools.util.TestUtil"
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			\( -name "*Test*.java" \
-			-o -name "nbsi_tester.java" \
-			-o -name "nbhs_tester.java" \)\
-			! -name "MpqSanityTest.java" \
-			! -name "QueueSanityTest.java" \
-			! -name "ScQueueRemoveTest.java" \
-			! -name "TestUtil.java" \
-			)
-	popd
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index f58569c72f14..6d1e00cd3737 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -1,5 +1,5 @@
 DIST postgresql-jdbc-42.4.0.src.tar.gz 966868 BLAKE2B 0a8bffcfbba4ddedcbd77717b6bca2f4e7cd9fe4597c6edb5a2ac8fbea788c692377ae713723aa7342895f857aff7eca0825eedd36cff69f3760b11cbb7b666c SHA512 816967923f54d5c2ad856e3ae2612987fa52234acc6b487f492d56614ac241d9542abd40a1f868ad6d895a45de28f7a0d586f8486dc719600238bcc3ef40819a
 DIST postgresql-jdbc-42.4.1.src.tar.gz 969554 BLAKE2B 76035b2362c304d6263b9549b2ecbedc6e1cfedeba9c2c35f07d29dada39e5bce93e939abb8cb2232a428b0341c5cd5e6ae22de6106292c4d28243e3e0e6fc00 SHA512 a49c5b68a26ba6fd1b150c45da2ec58ea4435b7c36b8aa9bf6c3d33b6a265dabe7da51705e9d7234a640c8f6ccb5c3abb639db2d7bc38e6f4e26550b05b4a844
 EBUILD jdbc-postgresql-42.4.0.ebuild 2019 BLAKE2B 6b0ebf8b68d03d0adaa6cf3764b9ea65225b33f6d2538f45a02f620d7d4e0bc1f957e923609bb3bef17ed0b69d64c1fddd9bd9751d99e9b6756e50dc7f2f1d2f SHA512 9b9dfeb0b2afea956039c6677e1479e8837b9244607b6731ac3381815991a3035e53518a9ce9ea316a0913385a19df89aaa8382c533b8309ffeb179dfd9ea09f
-EBUILD jdbc-postgresql-42.4.1.ebuild 2067 BLAKE2B 1ba0b60ed6b33ad6067116d54e55e585c83691a6fcd664ee26ca4c5261238f78865d08fbe0b09cfcb08a4a28cd639d06fa6127d3de04675e7df5b16c67b98766 SHA512 32482872affdf4b64b63740e724ea13a91ca2c248fd51727276affe209f5787ebab31eaa178334738e41c9b02a4772d598b4a07382ad4ff922a95bd1cb3c8a8b
+EBUILD jdbc-postgresql-42.4.1.ebuild 2066 BLAKE2B 4032d067a5bca160833591095bc872e7ac03e95037e2c488b9619d1f82d8bebdab8260b8713a52bd623f0799561da2dba85124a09f760981d3a48827f6c3ad48 SHA512 1ffe7afa2a60e9f2b64fb63ecfa732b72732ece9a4c79aa95ccd060eb8190b7ddf583916228b63714b13298e2d844cf82468267dea93e70b7dcb05e1839e6545
 MISC metadata.xml 295 BLAKE2B 1c8987c0d6f65d4e3019c2d6b8a0f8fac5f06e9144b118d3a0351f4a0e9b76ac4bc5b5ad678d92a691da7e8e8bb8c33f12d17d9dcc8b0ff007057d80307ebd24 SHA512 6a38ee7d2287a20ab89d7a92c59e74437877c4271cb38f00fccde9753c3caa8dccc3261fad23f81ec3dd2155f429aa4c3437bda024353640f8ed90ca096f9318
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild
index 96f23608ef89..73c30ae3a385 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.4.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc64 ~x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/log4j-12-api/Manifest b/dev-java/log4j-12-api/Manifest
index 0d2badabc9c7..4ad0681e5999 100644
--- a/dev-java/log4j-12-api/Manifest
+++ b/dev-java/log4j-12-api/Manifest
@@ -1,5 +1,3 @@
-DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
 DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
-EBUILD log4j-12-api-2.17.2.ebuild 3241 BLAKE2B 70ea7a1af7385a6e9197d98b743ab2e0c48350e7f3fa5fbd93600b5d3586f3fc2daf947d8bfdea57ffc9c74c78634f6020989488c466dc8403ccfb4db0fe3199 SHA512 1a770758d425819e6e37dbf5a902255adccf23372c8d054ae8e2e8b5dbbde6184809ea9899f9d65bdbc8b7323c3af45aec2a944780a03b608adbdf89c279d450
 EBUILD log4j-12-api-2.18.0.ebuild 3316 BLAKE2B c675a6ad27275209484176ecdf25761ced841c600121f1175cd78f8c0649899df8e8de64e40863d69853289a47f51e3296ae455cbd0014dcd7d0bec7b3029e57 SHA512 f4f0bfe344ce508b2e3ebade246bbff3122f5701949e6e0fd11557cbe531c52ba6b688eeb3103f8838a69769a499c9b279a53bad2b857c794ca8a9013b3186c8
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild b/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild
deleted file mode 100644
index 744dbf26acb1..000000000000
--- a/dev-java/log4j-12-api/log4j-12-api-2.17.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom log4j-1.2-api/pom.xml --download-uri mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-12-api-2.17.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-1.2-api:2.17.2"
-JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Apache Log4j 1.x Compatibility API"
-HOMEPAGE="https://logging.apache.org/log4j/2.x/"
-SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# We don't have junit-vintage and junit-jupiter
-RESTRICT="test"
-
-# Common dependencies
-# POM: log4j-1.2-api/pom.xml
-# org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
-# org.apache.logging.log4j:log4j-core:2.17.2 -> >=dev-java/log4j-core-2.17.2:2
-
-CP_DEPEND="
-	~dev-java/log4j-api-${PV}:2
-	~dev-java/log4j-core-${PV}:2
-"
-
-# Compile dependencies
-# POM: log4j-1.2-api/pom.xml
-# org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.1.Final -> >=dev-java/jboss-jms-api-1.0.1:1.1
-# POM: log4j-1.2-api/pom.xml
-# test? com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.1 -> >=dev-java/jackson-dataformat-xml-2.13.2:0
-# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
-# test? org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
-# test? org.apache.logging.log4j:log4j-core:2.17.2 -> >=dev-java/log4j-core-2.17.2:2
-# test? org.apache.velocity:velocity:1.7 -> !!!artifactId-not-found!!!
-# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? oro:oro:2.0.8 -> >=dev-java/jakarta-oro-2.0.8:2.0
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/jboss-jms-api:1.1"
-#	test? (
-#		!!!artifactId-not-found!!!
-#		!!!groupId-not-found!!!
-#		>=dev-java/commons-io-2.11.0:1
-#		>=dev-java/jackson-dataformat-xml-2.13.0:0
-#		~dev-java/log4j-api-${PV}:2
-#		~dev-java/log4j-core-${PV}:2
-#	)
-#"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
-
-S="${WORKDIR}/apache-log4j-${PV}-src"
-
-JAVA_CLASSPATH_EXTRA="jboss-jms-api-1.1"
-JAVA_SRC_DIR="log4j-1.2-api/src/main/java"
-JAVA_RESOURCE_DIRS="log4j-1.2-api/src/main/resources"
-
-#	JAVA_TEST_GENTOO_CLASSPATH="jackson-dataformat-xml,commons-io-1,!!!groupId-not-found!!!,log4j-api-2,log4j-core-2,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-#	JAVA_TEST_SRC_DIR="log4j-1.2-api/src/test/java"
-#	JAVA_TEST_RESOURCE_DIRS=(
-#		"log4j-1.2-api/src/test/resources"
-#	)
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/log4j-api/Manifest b/dev-java/log4j-api/Manifest
index 8717ebe83ec5..f832659cc45f 100644
--- a/dev-java/log4j-api/Manifest
+++ b/dev-java/log4j-api/Manifest
@@ -1,5 +1,3 @@
-DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
 DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
-EBUILD log4j-api-2.17.2.ebuild 2898 BLAKE2B 30b05532f1b879f095a3ea735077818fcfce91be99de9d47d547e842d0c8500e67d3f0051e046cf88c13dbde0d7f226b6fdb5266844936a662dc9775c46aa997 SHA512 4f42101df7321f37a28185156d93998f4cc5b67a7007fd17dbc84a8a87b2a50667d080304fee57f248617c047cafd7178ae569975555269266a11d46bfa6b2a6
 EBUILD log4j-api-2.18.0.ebuild 3007 BLAKE2B 5a40542111a3afd18b3814622d370bcab1fa8eb908335b9464f9f4d8545e1080aa1ef43022bb06847b4f2ed0b10b08c8151278db08ee7002a2e3528b2916a787 SHA512 1b447d0637decee4783728d4e562def111869ef0e7990e09d0c1f3547247317a1dfea3934c4024428b42fc2c6ba524af14d79188001d2fa2c64db2d62776408c
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-api/log4j-api-2.17.2.ebuild b/dev-java/log4j-api/log4j-api-2.17.2.ebuild
deleted file mode 100644
index 3713bdff3a94..000000000000
--- a/dev-java/log4j-api/log4j-api-2.17.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom log4j-api/pom.xml --download-uri mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-api-2.17.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-api:2.17.2"
-JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Apache Log4j API"
-HOMEPAGE="https://logging.apache.org/log4j/2.x/"
-SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# junit-{jupiter,vintage} is not available in ::gentoo
-RESTRICT="test"
-
-# Compile dependencies
-# POM: ${PN}/pom.xml
-# org.osgi:org.osgi.core:4.3.1 -> >=dev-java/osgi-core-api-5.0.0:0
-# POM: ${PN}/pom.xml
-# test? com.fasterxml.jackson.core:jackson-core:2.13.1 -> >=dev-java/jackson-core-2.13.2:0
-# test? com.fasterxml.jackson.core:jackson-databind:2.13.1 -> >=dev-java/jackson-databind-2.13.2:0
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
-# test? org.apache.maven:maven-core:3.8.4 -> !!!groupId-not-found!!!
-# test? org.assertj:assertj-core:3.22.0 -> !!!suitable-mavenVersion-not-found!!!
-# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
-
-DEPEND=">=virtual/jdk-1.8:*
-	dev-java/osgi-core-api:0"
-#	test? (
-#		!!!groupId-not-found!!!
-#		!!!suitable-mavenVersion-not-found!!!
-#		>=dev-java/commons-lang-3.12.0:3.6
-#		>=dev-java/jackson-core-2.13.2:0
-#		>=dev-java/jackson-databind-2.13.2:0
-#	)
-#"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
-
-S="${WORKDIR}/apache-log4j-${PV}-src"
-
-JAVA_CLASSPATH_EXTRA="osgi-core-api"
-JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
-
-#	JAVA_TEST_GENTOO_CLASSPATH="jackson-core,jackson-databind,commons-lang-3.6,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-#	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
-#	JAVA_TEST_RESOURCE_DIRS=(
-#		"${PN}/src/test/resources"
-#	)
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/log4j-core/Manifest b/dev-java/log4j-core/Manifest
index e4ecc5491d9e..caac9f9b9dbd 100644
--- a/dev-java/log4j-core/Manifest
+++ b/dev-java/log4j-core/Manifest
@@ -1,6 +1,4 @@
-DIST apache-log4j-2.17.2-src.tar.gz 11680029 BLAKE2B 19baf31f4e00f0572fad810177d52bf3376f73a47a70ea251ce60a198f4bb322e6e97691f23b1ebb78e29f4eb6f0a36093bd2c6cb558486841d569b601d11015 SHA512 ae09c3af8662fcf5fdc4e7c7dd298e91ec85e90272b8247ce4ee60c7d4ecd48a4cd294fc9e51c0b307fbb58c677e61e31527eab4085debcc9b40919af0920176
 DIST apache-log4j-2.18.0-src.tar.gz 11748446 BLAKE2B c11a5c7cb5be77fd27504b93962c5493f92475e759a575c5536b674a7e8116d4f9840bd2eb3e95156c257ff046f0e3ec437960b0f5ca01f2ddceb509c49aac1f SHA512 104eb8dbd35d3166a0d49190b2e3fdf981b864d21ed47d84f16acd417b943a41fbafa445b2c38ae8cdc494da6af8746ecc3a0db4795f45ce427344659cffae7b
-EBUILD log4j-core-2.17.2-r1.ebuild 8550 BLAKE2B d60dca70b9c62de3320543df7313ae3f1c523107f60e0a99ffaa48872058fe79054b2486936a394b665915af52464c77c83226159d7acdc42f7f703473745938 SHA512 5edfa502777e147684afc7b804b77ab7ba3c602ced5b04f501e8ce0b86f7cdb873821cff64eebdddbf44485d6c7c1d112b73a16bd0f26829bab50c06844d20b2
 EBUILD log4j-core-2.18.0-r1.ebuild 8531 BLAKE2B 9ca4ab440893e5658918c44f3c619764ccaeb9d1a5242a0a4670d0e2c4ba526b2e3793c11f59de34232b155f31d40d7e7f13530e37240beb51209b7a79d62911 SHA512 1ee8e743329fe801a4a927c3d334c30e2cb55dbbd85f2794084daf078895c0eb2a4bc5f659f2cd312752b2578f07125680f1a9381bf43040be04a46a7e854f3f
 EBUILD log4j-core-2.18.0.ebuild 8535 BLAKE2B d51defc755344b50e41a60ae3b3aa41a2f137734675eaf391275ad74dfafc1e874f02a8069274f5441242c3f10f61838112cbc7765e0b0a9949f830bcc908656 SHA512 d8032038a3dedcedf40c958537ebd2f9fd68e2881b3a3bfc3bff64e71f64be3ce918f7d0591365f81c3bd134e1ac50415bb9cb54f537921738b1cb675e6a522c
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild b/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
deleted file mode 100644
index ccbc2b1c3afe..000000000000
--- a/dev-java/log4j-core/log4j-core-2.17.2-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom log4j-core/pom.xml --download-uri mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz --slot 2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild log4j-core-2.17.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.logging.log4j:log4j-core:2.17.2"
-# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="The Apache Log4j Implementation"
-HOMEPAGE="https://logging.apache.org/log4j/2.x/"
-SRC_URI="mirror://apache/logging/log4j/${PV}/apache-log4j-${PV}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# We don't have junit-vintage and junit-jupiter
-RESTRICT="test"
-
-# Common dependencies
-# POM: ${PN}/pom.xml
-# com.conversantmedia:disruptor:1.2.15 -> >=dev-java/conversant-disruptor-1.2.19:0
-# com.fasterxml.jackson.core:jackson-core:2.13.1 -> >=dev-java/jackson-core-2.13.2:0
-# com.fasterxml.jackson.core:jackson-databind:2.13.1 -> >=dev-java/jackson-databind-2.13.2:0
-# com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.1 -> >=dev-java/jackson-dataformat-xml-2.13.2:0
-# com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.1 -> >=dev-java/jackson-dataformat-yaml-2.13.2:0
-# com.fasterxml.woodstox:woodstox-core:6.2.8 -> >=dev-java/woodstox-core-6.2.8:0
-# com.lmax:disruptor:3.4.4 -> >=dev-java/lmax-disruptor-3.4.4:0
-# com.sun.mail:javax.mail:1.6.2 -> !!!suitable-mavenVersion-not-found!!!
-# org.apache.commons:commons-compress:1.21 -> >=dev-java/commons-compress-1.21:0
-# org.apache.commons:commons-csv:1.9.0 -> >=dev-java/commons-csv-1.9.0:0
-# org.apache.kafka:kafka-clients:1.1.1 -> >=dev-java/kafka-clients-1.1.1:0
-# org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
-# org.fusesource.jansi:jansi:2.4.0 -> >=dev-java/jansi-2.4.0:2
-# org.jctools:jctools-core:1.2.1 -> >=dev-java/jctools-core-2.0.2:0
-# org.slf4j:slf4j-api:1.7.35 -> >=dev-java/slf4j-api-1.7.36:0
-# org.zeromq:jeromq:0.4.3 -> >=dev-java/jeromq-0.5.2:0
-
-CP_DEPEND="
-	dev-java/commons-compress:0
-	dev-java/commons-csv:0
-	dev-java/conversant-disruptor:0
-	dev-java/jackson-core:0
-	dev-java/jackson-databind:0
-	dev-java/jackson-dataformat-xml:0
-	dev-java/jackson-dataformat-yaml:0
-	dev-java/jakarta-activation-api:1
-	dev-java/jansi:2
-	dev-java/javax-mail:0
-	dev-java/jctools-core:3
-	dev-java/jeromq:0
-	dev-java/kafka-clients:0
-	dev-java/lmax-disruptor:0
-	~dev-java/log4j-api-${PV}:2
-	dev-java/slf4j-api:0
-	dev-java/woodstox-core:0
-"
-
-# Compile dependencies
-# POM: ${PN}/pom.xml
-# org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.1.Final -> >=dev-java/jboss-jms-api-1.0.1:1.1
-# org.osgi:org.osgi.core:4.3.1 -> >=dev-java/osgi-core-api-5.0.0:0
-# POM: ${PN}/pom.xml
-# test? ch.qos.logback:logback-classic:1.2.3 -> !!!groupId-not-found!!!
-# test? ch.qos.logback:logback-core:1.2.3 -> !!!groupId-not-found!!!
-# test? com.github.tomakehurst:wiremock:2.26.3 -> !!!groupId-not-found!!!
-# test? com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0 -> !!!groupId-not-found!!!
-# test? com.h2database:h2:1.4.200 -> !!!groupId-not-found!!!
-# test? commons-codec:commons-codec:1.15 -> >=dev-java/commons-codec-1.15:0
-# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# test? commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# test? log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
-# test? net.javacrumbs.json-unit:json-unit:2.32.0 -> !!!groupId-not-found!!!
-# test? org.apache-extras.beanshell:bsh:2.0b6 -> >=dev-java/bsh-2.0_beta6:0
-# test? org.apache.activemq:activemq-broker:5.16.4 -> !!!groupId-not-found!!!
-# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
-# test? org.apache.felix:org.apache.felix.framework:5.6.12 -> !!!groupId-not-found!!!
-# test? org.apache.logging.log4j:log4j-api:2.17.2 -> >=dev-java/log4j-api-2.17.2:2
-# test? org.apache.maven:maven-core:3.8.4 -> !!!groupId-not-found!!!
-# test? org.awaitility:awaitility:4.1.1 -> !!!groupId-not-found!!!
-# test? org.codehaus.groovy:groovy-dateutil:3.0.9 -> !!!groupId-not-found!!!
-# test? org.codehaus.groovy:groovy-jsr223:3.0.9 -> !!!groupId-not-found!!!
-# test? org.codehaus.plexus:plexus-utils:3.4.1 -> !!!groupId-not-found!!!
-# test? org.eclipse.tycho:org.eclipse.osgi:3.13.0.v20180226-1711 -> !!!groupId-not-found!!!
-# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!!
-# test? org.hdrhistogram:HdrHistogram:2.1.12 -> !!!groupId-not-found!!!
-# test? org.hsqldb:hsqldb:2.5.2 -> !!!groupId-not-found!!!
-# test? org.jmdns:jmdns:3.5.7 -> !!!groupId-not-found!!!
-# test? org.junit-pioneer:junit-pioneer:1.6.1 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.jupiter:junit-jupiter-params:5.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.platform:junit-platform-commons:1.8.2 -> !!!groupId-not-found!!!
-# test? org.junit.vintage:junit-vintage-engine:5.8.2 -> !!!groupId-not-found!!!
-# test? org.mockito:mockito-core:4.3.1 -> !!!suitable-mavenVersion-not-found!!!
-# test? org.mockito:mockito-junit-jupiter:4.3.1 -> !!!artifactId-not-found!!!
-# test? org.slf4j:slf4j-ext:1.7.35 -> >=dev-java/slf4j-ext-1.7.36:0
-# test? org.springframework:spring-test:5.3.15 -> !!!groupId-not-found!!!
-# test? org.tukaani:xz:1.9 -> >=dev-java/xz-java-1.9:0
-# test? org.xmlunit:xmlunit-core:2.9.0 -> !!!groupId-not-found!!!
-# test? org.xmlunit:xmlunit-matchers:2.9.0 -> !!!groupId-not-found!!!
-# test? org.zapodot:embedded-ldap-junit:0.8.1 -> !!!groupId-not-found!!!
-
-DEPEND="${CP_DEPEND}
-	dev-java/jboss-jms-api:1.1
-	dev-java/osgi-core-api:0
-	>=virtual/jdk-1.8:*"
-#	test? (
-#		!!!artifactId-not-found!!!
-#		!!!groupId-not-found!!!
-#		!!!suitable-mavenVersion-not-found!!!
-#		>=dev-java/bsh-2.0_beta6:0
-#		>=dev-java/commons-codec-1.15:0
-#		>=dev-java/commons-io-2.11.0:1
-#		>=dev-java/commons-lang-3.12.0:3.6
-#		>=dev-java/commons-logging-1.2:0
-#		>=dev-java/log4j-1.2.17:0
-#		~dev-java/log4j-api-${PV}:2
-#		>=dev-java/slf4j-ext-1.7.36:0
-#		>=dev-java/xz-java-1.9:0
-#	)
-#"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( {CONTRIBUTING,README,RELEASE-NOTES,SECURITY}.md )
-
-S="${WORKDIR}/apache-log4j-${PV}-src"
-
-JAVA_CLASSPATH_EXTRA="jboss-jms-api-1.1,osgi-core-api"
-JAVA_SRC_DIR="${PN}/src/main/java"
-JAVA_RESOURCE_DIRS="${PN}/src/main/resources"
-
-#	JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,commons-codec,commons-io-1,commons-logging,log4j,!!!groupId-not-found!!!,bsh,!!!groupId-not-found!!!,commons-lang-3.6,!!!groupId-not-found!!!,log4j-api-2,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!suitable-mavenVersion-not-found!!!,!!!artifactId-not-found!!!,!!!artifactId-not-found!!!,!!!groupId-not-found!!!,xz-java,!!!groupId-not-found!!!,!!!groupId-not-found!!!,!!!groupId-not-found!!!"
-#	JAVA_TEST_SRC_DIR="${PN}/src/test/java"
-#	JAVA_TEST_RESOURCE_DIRS=(
-#		"${PN}/src/test/resources"
-#	)
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	# Process the @Plugin annotation used on Log4j 2 built-in plugins
-	# to generate a serialized plugin listing file
-	# https://logging.apache.org/log4j/2.x/manual/plugins.html
-	local processor="org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor"
-	local classes="target/classes"
-	local classpath="${JAVA_JAR_FILENAME}:$(\
-		java-pkg_getjars --build-only --with-dependencies \
-		"${JAVA_GENTOO_CLASSPATH},${JAVA_CLASSPATH_EXTRA}")"
-	# Just in case java-pkg-simple.eclass changes the path in the future
-	mkdir -p "${classes}" || die "Failed to create directory for classes"
-	local sources_list_file="${T}/sources.lst"
-	find "${JAVA_SRC_DIR}" -type f -name "*.java" > "${sources_list_file}" || die
-	ejavac -d "${classes}" -cp "${classpath}" \
-		-proc:only -processor "${processor}" \
-		@"${sources_list_file}"
-	# Update the JAR to include the serialized plugin listing file
-	local jar="$(java-config -j)"
-	"${jar}" -uf "${JAVA_JAR_FILENAME}" -C "${classes}" . ||
-		die "Failed to update JAR"
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/xsdlib/Manifest b/dev-java/xsdlib/Manifest
index cea24cc6ef73..8dd8dad280f0 100644
--- a/dev-java/xsdlib/Manifest
+++ b/dev-java/xsdlib/Manifest
@@ -1,5 +1,3 @@
 DIST xsdlib-2013.6.1-sources.jar 274740 BLAKE2B 356c3e6005c26a1b63ea016a523140d93bb8c6a4c1952d60f5a881c92dd013e1691451be96e31b7c96c48e1f182e0224bceb712e230bb008ad97732a8e9ffdb6 SHA512 a4e308fae6a1116158ddbebfad0570f6cf1f840acb72de8bdd9414b363da78edf6aea2349f4ac7511b774a494f9e4c17c309f86aefc39b30421a1c86945302b0
-DIST xsdlib.20090415.zip 914126 BLAKE2B 7f8dc45c590606ece1775d08634f87bb7cd392c69c66204073d4867f925cf7159fe14b43cde6d59a72da90ab284d9a3adc0c4d6aa117ea5143eff8efc5bf6534 SHA512 479b20bb24c32f7a8bf548689cb6d7efc99e36d7f887d9e33b34b2e4707d74149ae1e312f7166a90acbd44422248729d6158a55d710616b656eb628cafc1e3f2
-EBUILD xsdlib-20090415-r1.ebuild 1194 BLAKE2B f1229a0275c91114f42476ae8e58c2792451b0a656f32f890fad2c05337ea36cf4714ab55aee0a37e71090c28f6631128ae610d6acac758b444d733e7318e050 SHA512 1d204071ae5193ac531c695784639cf1b18db853265aed676517eacb9e4469a0efe6b3df3d4d0db4a6e24ae38c0972dd04719d6f481560880d257dfa6ddda564
 EBUILD xsdlib-2013.6.1.ebuild 916 BLAKE2B 9ebcd72e2473378b10ff552c20cd81f45b247d0805bfb6b1699aa39ebce4cb719d765de563255f2357af459915a47f3fe0d629c6f9dca077fb1d4f881f4e8899 SHA512 3e74a7762cb9c45874406d255b119642e0ee0eb7e8e73ff3bb6e742aa3fd320374fd0a402e50762ece98642c5161df1e39d317bf8bd4bdb481f654f3d106b0c4
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/xsdlib/xsdlib-20090415-r1.ebuild b/dev-java/xsdlib/xsdlib-20090415-r1.ebuild
deleted file mode 100644
index d681cd0d55d5..000000000000
--- a/dev-java/xsdlib/xsdlib-20090415-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="net.java.dev.msv:xsdlib:2013.6.1"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Sun XML Datatypes Library"
-HOMEPAGE="http://msv.java.net/"
-SRC_URI="http://java.net/downloads/msv/releases/${PN}.${PV}.zip"
-
-LICENSE="BSD Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-COMMON_DEP="
-	dev-java/xerces:2
-	dev-java/relaxng-datatype:0"
-BDEPEND="app-arch/unzip"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8:*"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR=( "src" "src-apache" )
-JAVA_GENTOO_CLASSPATH="relaxng-datatype,xerces-2"
-
-src_prepare() {
-	default
-	find -name '*.jar' -delete || die
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	local dir; for dir in "${JAVA_SRC_DIR[@]}"; do
-		pushd ${dir} > /dev/null || die
-		jar -uf "${S}"/${PN}.jar $(find -name '*.properties') || die
-		popd > /dev/null || die
-	done
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	dodoc README.txt
-	docinto html
-	dodoc HowToUse.html
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 33bf8ec4b502..be3f414fb3f2 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 40de14e3436c..d15e2f0b5b05 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,11 +1,4 @@
-AUX libutf8proc-grapheme-test.patch 882 BLAKE2B ed3092be0d7e4e81c9dbde765d4a7cbfadfce266bc71f00dec83f1897436c3c1e759aef06d58136e7bc015861062d26e17b5b4989040bfef4d28d652e0f756eb SHA512 34f3d82bff1a6d0de9cae56b78af8197f103d9c6a4eb9bc912b28f84be8ecec2a7859758a5d1a9d4f5b7593c3f1e17c12f8ca6fdf980916327e3cff718bdc6d9
-DIST libutf8proc-2.5.0.tar.gz 155485 BLAKE2B a0cd9285e7f171b9449d9d98f91173bad2b793a00a9c10287c43cc2050b6a0306e289cbd3b4faebb0d97fd305b77ecbb7ce11f119d9ead2a580029db0d7ad898 SHA512 0c553faf4f3841c17c7aa4cce1e917b1585c430ac3f7f240ab98cbe01b9743f2074532e6f71faf3df030f5af00e483a3faf9716a67e6a4b1bb66a3de48308014
-DIST libutf8proc-2.6.1.tar.gz 182903 BLAKE2B aa2545136e084a44b2e3470e9395c15327b8d6fbe48e3145336366e208fb0e2565961c302a9117f8275e5b8a218d48a7059b5c1d2cfdff11e8341dc1bfb820a9 SHA512 9a09fe58a63c8c7983b8968b9b2c82f3d188724ed125097ea0de6a18d87569c678e226dc5de183108e47b3f068117e6bb352da1c3d24ebfd8018fb0b2346592e
 DIST libutf8proc-2.7.0.tar.gz 187906 BLAKE2B b2b3dc86ffa38f1d75293455cca22d3c0a0c51c529f154bbeaf40bb8b91bcedbf3955cfa459323db8b00566ce42857391875dac6fd677e36f700e8614767ac25 SHA512 29f7883de13302d609e8755872ed43174e70076e9681b4ac3f9b03e50295c45d9972c193bc81f94ad7e11e2d33a46cad5a30a80873173e6e1ae242101ebb3bed
-DIST libutf8proc-EastAsianWidth-13.0.0-r1.xz 68808 BLAKE2B e8bac9804aa195ebed82ba51f164166976e4feb2f8c3699847738bb2a320f2a00eada1743bcbadc398dbf7998a47d6f4de5826e278eba86a198748eb59abb7e9 SHA512 f74345a9f509865705d55f18a0f258346ba261d8b9a59e5fc4de51b84ecad6d1fcc9afa0af312b09fb76bacdf5f597b0f2a965800a18c80f65a604a0bc64d3d2
-DIST libutf8proc-EastAsianWidth-13.0.0.xz 62040 BLAKE2B 1665047336ded524d0b0a0c6a88afe0d9041a82eda688451b9b2556bcf9eebe6d817119e9aa6e07c602b076e710ecfc73d0bf3487ec5dcb131cd56914e1e6354 SHA512 8f6670299d545cc323a226cb310915ab2600d4e372221814afa67a75c6963bc0a4473a6e28fc847c0ad9761466c6f80de7b1eb3ed04fa28703a20ab34bcee0f2
 DIST libutf8proc-EastAsianWidth-14.0.0.xz 70420 BLAKE2B c2fa8ec34ae3cccb532d8ba82dc7ef40d82da2ed2f4bf187ef0df28cecd2e91320e25287e7bc6e7f22ffa6730af7b910b73d69172664235f3236c16a5ffe990f SHA512 5bd11dc8c30d12692d3cbca932c1bda5e19d9b5e99fc9f1a3ff8864e4f0e577769c4e1f91338cad10a468c38b904cf16b99ba44f44b80695cac23fe436f1e24a
-EBUILD libutf8proc-2.5.0.ebuild 1345 BLAKE2B f497b48353b1dce61cf6000702a5ec2c910979478c44a8367679a531e7c8c2898e9f05621ace0d720c44dd17c60763dfdf84d4acd99ffe1977000f5bf9fb9c24 SHA512 0c2b21c599f896bab2b3729a22be5db6a5025212dfeadc19651a587a1f442f9e68c6ebef72d2ab665c9f7d7805dbec7450bc6ec3ef2c0962ea62f243074126cf
-EBUILD libutf8proc-2.6.1.ebuild 1469 BLAKE2B e6267647b466b8d9f43613f17d7e853dd38f825cf45bb7e6ce6a65682c7cc4b55999f0ab47b4a4992e7131ff3eb0080c3bd2a541b2d85f7fddf1b0ccaae028fc SHA512 9bba76363832e1d8c0c096d6a4b81c86026821a75feec28d71e73d242e6db67652b336f987d0bc77492bb96932ef8c29f8689c8cf29008c6d2b52173dd25f0d8
 EBUILD libutf8proc-2.7.0.ebuild 1456 BLAKE2B ef13c6975061df3b1f76f3900ce4a3dfcbb7ba42b83104414fbd7645452106e64dcd3f2fbeacd6458593c53d2f6d91329a8e936ce0124732c00881e5352214ad SHA512 92c99005775c5d2029ad9a7864bd10ba03d52f6c8cb678075132221d167e7d17a144c771368d62ad4f6bccc1d455a2b53fef2a423a279927d950ee8773bf6c06
 MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/dev-libs/libutf8proc/files/libutf8proc-grapheme-test.patch b/dev-libs/libutf8proc/files/libutf8proc-grapheme-test.patch
deleted file mode 100644
index 64ebc26f671e..000000000000
--- a/dev-libs/libutf8proc/files/libutf8proc-grapheme-test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/JuliaStrings/utf8proc/commit/11bb3d9dc796bb006c79c2962a7d19abcadfb3df
-
-Author: Steven G. Johnson <stevenj@alum.mit.edu>
-
---- a/test/graphemetest.c
-+++ b/test/graphemetest.c
-@@ -18,12 +18,12 @@ int main(int argc, char **argv)
- 
-         while (buf[bi]) {
-             bi = skipspaces(buf, bi);
--            if (buf[bi] == '/') { /* grapheme break */
-+            if ((uint8_t)buf[bi] == 0xc3 && (uint8_t)buf[bi+1] == 0xb7) { /* U+00f7 = grapheme break */
-                 src[si++] = '/';
--                bi++;
-+                bi += 2;
-             }
--            else if (buf[bi] == '+') { /* no break */
--                bi++;
-+            else if ((uint8_t)buf[bi] == 0xc3 && (uint8_t)buf[bi+1] == 0x97) { /* U+00d7 = no break */
-+                bi += 2;
-             }
-             else if (buf[bi] == '#') { /* start of comments */
-                 break;
diff --git a/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
deleted file mode 100644
index 6b0bd1b34e6c..000000000000
--- a/dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A clean C Library for processing UTF-8 Unicode data"
-HOMEPAGE="https://github.com/JuliaStrings/utf8proc"
-SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	cjk? ( https://dev.gentoo.org/~hattya/distfiles/${PN}-EastAsianWidth-13.0.0.xz )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="cjk static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( =app-i18n/unicode-data-13.0* )"
-S="${WORKDIR}/${P#lib}"
-
-PATCHES=( "${FILESDIR}"/${PN}-grapheme-test.patch )
-
-QA_PKGCONFIG_VERSION="$(ver_cut 1).3.2"
-
-src_prepare() {
-	if use cjk; then
-		einfo "Modifying East Asian Ambiguous (A) as wide ..."
-		cp "${WORKDIR}"/${PN}-EastAsianWidth-13.0.0 ${PN#lib}_data.c || die
-	fi
-
-	default
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		prefix="/usr" \
-		libdir="/usr/$(get_libdir)" \
-		install
-	use static-libs || find "${ED}" -name '*.a' -delete || die
-}
-
-src_test() {
-	cp "${EPREFIX}"/usr/share/unicode-data/{Normalization,auxiliary/GraphemeBreak}Test.txt data || die
-
-	emake CC="$(tc-getCC)" check
-}
diff --git a/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
deleted file mode 100644
index b0d09b3227d8..000000000000
--- a/dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-USE_RUBY="ruby25 ruby26 ruby27"
-
-inherit ruby-single toolchain-funcs
-
-DESCRIPTION="A clean C Library for processing UTF-8 Unicode data"
-HOMEPAGE="https://github.com/JuliaStrings/utf8proc"
-SRC_URI="https://github.com/JuliaStrings/${PN#lib}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	cjk? ( https://dev.gentoo.org/~hattya/distfiles/${PN}-EastAsianWidth-13.0.0-r1.xz )"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="cjk static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? (
-		=app-i18n/unicode-data-13.0*
-		${RUBY_DEPS}
-	)"
-S="${WORKDIR}/${P#lib}"
-
-QA_PKGCONFIG_VERSION="$(ver_cut 1).4.1"
-
-src_prepare() {
-	if use cjk; then
-		einfo "Modifying East Asian Ambiguous (A) as wide ..."
-		cp "${WORKDIR}"/${PN}-EastAsianWidth-13.0.0-r1 ${PN#lib}_data.c || die
-	fi
-
-	default
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		prefix="/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		prefix="/usr" \
-		libdir="/usr/$(get_libdir)" \
-		install
-	use static-libs || find "${ED}" -name '*.a' -delete || die
-}
-
-src_test() {
-	cp "${EPREFIX}"/usr/share/unicode-data/{DerivedCoreProperties,{Normalization,auxiliary/GraphemeBreak}Test}.txt data || die
-
-	emake CC="$(tc-getCC)" check
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 59c25552bd6e..d760ee589ada 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index d0c93421a000..2c925f1401c5 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,5 +1,4 @@
 DIST PyPDF2-2.10.0.gh.tar.gz 6355180 BLAKE2B 1070e4989609cb1361f966f06a23a972ba0f53d6d02d2f489104a7198111d4e80573e2a54d7446bd85ccc8270ad8cb592c2131f0ba1433b3c1ca246bcd39c466 SHA512 dfc543a9cbc4c4e185abc928a64a8aeb5c69d833d3af0983bc994bb6a62b65732a6ea0a7b260bca4de8854639c0a03e0cc6398a5d9ec4df9125ccf7e4b3b264d
-DIST PyPDF2-2.4.1.gh.tar.gz 5121207 BLAKE2B 387085ea028d7fcbcfd5fa4e5373b655e647548093638db66fa92d44b8771bb5342f8086ebca82e205cf56f1865778bc604f49a49b39af16d8d9e3466a51653d SHA512 430e73ee6965fd6b8dac9ce8b6ee232e8ea829a7dbdfe87aafd29ae24ab182cd3e568b447030a0c199aab9049a79ce2a5518ce7fe59b1d8ce533b1313a568fc2
 DIST PyPDF2-2.4.2.gh.tar.gz 5327738 BLAKE2B 5343d5b7c2efe2ed664f896b030a60ad8570ae8f481376e4ad9c865144b66d912633e4f83294d7f6399230963c02dea262cc247b10ca3c146ab24f823c0d57f3 SHA512 84a13d5b624ca8ca2dc4c474309ffa47d1770e1681ccb527f7fc1df37698037c224939dd062da004cbf7b983744afd3ab9adc9a610bea3f2f297e1ed5b708dd2
 DIST PyPDF2-2.5.0.gh.tar.gz 5597332 BLAKE2B 40d4fa812f1a70c18d3b2907d83185cd79af3d722e762ec8dec9709cb5c70246c21fa124e419d8b12142b0ae22b1f13958835eaaa23e9f4cc9efbd05793db7ce SHA512 ec7560b4bb3737fe4c830f058f5303cb70c9ff660c3f40637b4b86c8c79bf11a246a3fcc425aa54b5ca160548311c7f93248a1001c75a7e1dbf3119245e3262f
 DIST PyPDF2-2.6.0.gh.tar.gz 5600718 BLAKE2B 13c8e485d0cbb1a6621e0769840a9894822aeda85fc63d98cd466628d4af0efe7e29ce400f7c71dfae63a6d8273dbceb14c115e14bbaea7592d8fa4aef552d24 SHA512 63ef0297b5b6151ed91d6cfc0e883e996561d9479e9d6bd0742711ffff12c2be173485b0ada052a038e7759d1d819850e0e1030031fdb0bc1df46fa4fa9f912b
@@ -11,7 +10,6 @@ DIST PyPDF2-sample-files-200644f7219811c3930ad1732ef70c570ece2d16.gh.tar.gz 5513
 DIST PyPDF2-sample-files-4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.gh.tar.gz 5443819 BLAKE2B 6eb440a2db3b58f7e195b8f24438552b2b414296b887cf44d75b14bda367e37ffef75b870152ac3b38e20e5a6f2c6a4cf374087b70daa9036821dd3ebdce2128 SHA512 de631f650098b6fe15830e5a816158d7f352c7a25d0c743b9e4bdf146e1ef2e3a6ea1751ed5d68f34e9a339a793bfb9dc217934595c7a8dffb854c0a4111b963
 DIST PyPDF2-sample-files-b6f4ff3de00745783d79f25cb8803901d1f20d28.gh.tar.gz 5522867 BLAKE2B 9a6cb3b92032f9ec697b972b1a257b2c2528d36cd4a7e40092ac6dbf0a4955c5b204b8c82d37f9bad4a19fccddf0070b095ee2f3b56de22d738ed3d8a3b555c0 SHA512 74aad38060f441ace87f6650de152a28f4a251e4f47574a8d46066857c8fbbb187cd3cd275caa198dce2c1557e90664b288f071995c2bbb9bf13a341210313e8
 EBUILD PyPDF2-2.10.0.ebuild 4733 BLAKE2B 5f901f05563a6ee94ba1aa7db40471ac8c82ccf2fbba6b28713b367316b82f6785322a6cc755b0089fb0bcffef3a113834ec81fc6a23895e80db2a56c08a63cf SHA512 3e7c659719398558d4ab9adae8c04d2af605abfbe78c7aa13065026914cc0d6d9aabbbee35f0ff2b7b8a66cd7146626b0fb3126544cd8a51157134925ca845ee
-EBUILD PyPDF2-2.4.1.ebuild 3417 BLAKE2B 2fc2228d08d8593a7c2e49cbe61cc8d036d894fc7ced3d4308d8c93ada40bf4045e955cb4a44ab0f0daa4836d87a620ca421117b4861b3cc6d0aefbdc36be739 SHA512 edf9219b5534384ccb3519836c8710f21b6f793f856f1e92bc218fe9ed81f9dda197900171f2b7f732150546ec513f55978d52cba72e68bdd8886b152e39c142
 EBUILD PyPDF2-2.4.2.ebuild 3852 BLAKE2B b4f0db756e82fccf51da50f995f197c9815da7f5f77257184094bc1e4fe677c9fceb5154a3de46d68c67226177f2c9ec68407d7bd00a6012ee98c3e732539125 SHA512 5635fa8e413ef5d3d266238ed20cda85326a4c5524f8470023c4dc20f1f2b568eee5f20037d0e4826b787bc01a0dad0dc3170ba258da4137adb784e0f85da257
 EBUILD PyPDF2-2.5.0.ebuild 4007 BLAKE2B 187f411a58db8c66fadbb7327bdbca018d62ba2bbe60b70fd10e807971483dcbf8b11863410a207d2ef1ac43acbd724e52c11f6881226c068228bf016490f285 SHA512 63050898595a7d5d7941d1691405465de26b42f31d0f7a598fa07c9f8ad7815d39907c0e9b1fe9a335800939bbab20217467b5c1a1b4bd5210205157eb82058c
 EBUILD PyPDF2-2.6.0.ebuild 4097 BLAKE2B cd9084d5646da17314d423f8ee9618b3125d88b0792bb3d23839c9b10ac379cd5ecf0b2adf34025bdccaf518e6b27b41447d3b19b939942b7030b83766869211 SHA512 1e48980180098c25bdd7461fe6c9ac655195abf46681e9a4b027335e9761dda7cc27523b4d51a75b419ec5ef7bf8c4dd1fc1a4494b16110abbf4f31c9988800f
diff --git a/dev-python/PyPDF2/PyPDF2-2.4.1.ebuild b/dev-python/PyPDF2/PyPDF2-2.4.1.ebuild
deleted file mode 100644
index b7318a31ebcc..000000000000
--- a/dev-python/PyPDF2/PyPDF2-2.4.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=4d24ff93dcddf21d55d028d9675d5b5bf9d7a350
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network access
-	tests/test_cmap.py
-	tests/test_filters.py::test_decompress_zlib_error
-	tests/test_filters.py::test_lzw_decode_neg1
-	tests/test_generic.py::test_dict_read_from_stream
-	tests/test_generic.py::test_parse_content_stream_peek_percentage
-	tests/test_generic.py::test_read_inline_image_no_has_q
-	tests/test_generic.py::test_read_inline_image_loc_neg_1
-	tests/test_generic.py::test_text_string_write_to_stream
-	tests/test_generic.py::test_name_object_read_from_stream_unicode_error
-	tests/test_generic.py::test_bool_repr
-	tests/test_generic.py::test_issue_997
-	'tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]'
-	tests/test_merger.py::test_trim_outline_list
-	tests/test_merger.py::test_zoom
-	tests/test_merger.py::test_zoom_xyz_no_left
-	tests/test_merger.py::test_bookmark
-	tests/test_merger.py::test_trim_outline
-	tests/test_merger.py::test1
-	tests/test_merger.py::test_sweep_recursion1
-	tests/test_merger.py::test_sweep_recursion2
-	tests/test_reader.py::test_unexpected_destination
-	tests/test_writer.py::test_sweep_indirect_references_nullobject_exception
-	tests/test_writer.py::test_write_bookmark_on_page_fitv
-	tests/test_page.py::test_extract_text_single_quote_op
-	tests/test_page.py::test_extract_text_page_pdf
-	tests/test_page.py::test_extract_text_page_pdf_impossible_decode_xform
-	tests/test_page.py::test_extract_text_operator_t_star
-	tests/test_reader.py::test_iss925
-	tests/test_reader.py::test_extract_text_xref_issue_2
-	tests/test_reader.py::test_extract_text_xref_issue_3
-	tests/test_reader.py::test_extract_text_pdf15
-	tests/test_reader.py::test_extract_text_xref_table_21_bytes_clrf
-	tests/test_reader.py::test_get_fields
-	tests/test_reader.py::test_get_fields_read_else_block
-	tests/test_reader.py::test_get_fields_read_else_block2
-	tests/test_reader.py::test_get_fields_read_else_block3
-	tests/test_reader.py::test_metadata_is_none
-	tests/test_reader.py::test_get_fields_read_write_report
-	tests/test_reader.py::test_unexpected_destination
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_extract_textbench
-	tests/test_xmp.py::test_xmpmm
-	tests/test_xmp.py::test_dc_description
-	tests/test_xmp.py::test_dc_creator
-	tests/test_xmp.py::test_custom_properties
-	tests/test_xmp.py::test_dc_subject
-
-	# Broken test
-	tests/test_utils.py::test_deprecate_no_replacement
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
-	fi
-}
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 6325cdfefba4..fc63ef54c1cf 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,7 +1,5 @@
-DIST autobahn-22.5.1.tar.gz 435571 BLAKE2B 5e596102b639228d95cea027a0e7187adc4f0910afbd3c5753c0408e070a37b911362eba64c79ce6201000e59381de0941619bef152ca2d784a2c19f1a67a36f SHA512 c27c0f1a782c53df7c152c8043a8e5502f19944e9d5a6ab4a95d02016dfbba70a770f1f4969b75995beed852191bde288d80d1336d56fba1eea190d6590ca642
 DIST autobahn-22.6.1.tar.gz 467355 BLAKE2B 54015ee50fa45f23fa589927da232b3ea523efae291b56b44704b66d171075d9459f1c3cf6b96b34fec119deddd2731ebd0695d49345a724bc84b57d7494f332 SHA512 b99f9e4508650fe9484e680b0cd9a0023935445b26ea42fce7565152a5692fc0d1c80f9854b4b3b3004ea17f60d13663477a8710e977211509a14dfad973c635
 DIST autobahn-22.7.1.tar.gz 476789 BLAKE2B 4860a6ec1a2631986dd5d8e94069134e75650eedb67dce18dd4c1e8ad45bd76ca183b4dcbca6ef4474c25f6feb4a1407c9fed4c74f0751e9c0c7fbca2b013406 SHA512 ea2c4d61d3f0f8ef35a31b599bc432781536dccaa316cda474a61003b10df0ef6346615d16228848cc5acb24a4e5f4c50be1fe759daf35b629f636da55688137
-EBUILD autobahn-22.5.1-r1.ebuild 3681 BLAKE2B b243c031a8db9bbb87b668ea39f2b3f674d05c054590889d5b7b2f7309b124762e59d278e2eb3e40517344995bd7f8892dcf6fc3bafc5a5cfb80e621ecb32e15 SHA512 c779c1d38e54f125739b178ce06278b98735ecee1dfecdbd98c21f0cb2c1eddb58e6f05a62aca166f1d43c26df5f52ed3bba55c4a027813dfe1aaba3fcbe7ba8
 EBUILD autobahn-22.6.1.ebuild 3681 BLAKE2B b243c031a8db9bbb87b668ea39f2b3f674d05c054590889d5b7b2f7309b124762e59d278e2eb3e40517344995bd7f8892dcf6fc3bafc5a5cfb80e621ecb32e15 SHA512 c779c1d38e54f125739b178ce06278b98735ecee1dfecdbd98c21f0cb2c1eddb58e6f05a62aca166f1d43c26df5f52ed3bba55c4a027813dfe1aaba3fcbe7ba8
 EBUILD autobahn-22.7.1.ebuild 3696 BLAKE2B 41c24bc853524f25c4ca94118708cbfc56f733dc0e06113343f2126305f63d6fc00470500db12a965e476a5e97684e077425a29301bc73fc3c2694b4775c2f38 SHA512 e9a61719bed1b14d39626acec28d255a7908a3ac73d99439960916d20d70a48ce7023f429d3b3cc0d38a7076fcff2cc3a62a9dd91f1af755e22f6ae45af5c221
 MISC metadata.xml 596 BLAKE2B 07cc4fbcb4c6fde6b1bb49a0a30fa8d2ef7ff4424397e29053a6ac89d87acd9fa7b1897c5381910d53f590192945a89a5b987fcdb9595e42f67f23333010a0ba SHA512 4d4cecf09593ec201711b13de1820e59f007f745b41611471ec737da4d679323787ac06a3a987cede9bf2c8dff71c9dbcb197e6a9c9109cf4d3a34d9247f9962
diff --git a/dev-python/autobahn/autobahn-22.5.1-r1.ebuild b/dev-python/autobahn/autobahn-22.5.1-r1.ebuild
deleted file mode 100644
index 80a959033ccd..000000000000
--- a/dev-python/autobahn/autobahn-22.5.1-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 optfeature
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python/
-	https://pypi.org/project/autobahn/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-IUSE="test xbr"
-RESTRICT="!test? ( test )"
-
-# The order of deps is based on their appearance in setup.py
-# All extra deps should be included in test and in optfeature
-RDEPEND="
-	>=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
-		>=dev-python/snappy-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
-		>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
-		>=dev-python/flatbuffers-1.12[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
-		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
-		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
-
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	if use xbr ; then
-		eerror "***************"
-		eerror "Required xbr dependencies are incomplete in Gentoo."
-		eerror "So this functionality will not yet work"
-		eerror "Please file a bug if this feature is needed"
-		eerror "***************"
-	else
-		# remove xbr components
-		export AUTOBAHN_STRIP_XBR="True"
-	fi
-
-	# avoid useless rust dependency
-	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
-
-	# remove twisted plugin cache regen in setup.py
-	# to fix tinderbox sandbox issue
-	sed -e '/import/s:reactor:__importmustfail__:' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf autobahn || die
-
-	einfo "Testing all, cryptosign using twisted"
-	local -x USE_TWISTED=true
-	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
-	unset USE_TWISTED
-
-	einfo "RE-testing cryptosign and component_aio using asyncio"
-	local -x USE_ASYNCIO=true
-	epytest --pyargs autobahn.wamp.test.test_wamp_{cryptosign,component_aio}
-	unset USE_ASYNCIO
-
-	rm -f twisted/plugins/dropin.cache || die
-}
-
-pkg_postinst() {
-	optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
-	optfeature "non-standard WebSocket compression support" "dev-python/snappy"
-	optfeature "accelerated WAMP serialization support" \
-		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
-	optfeature "TLS transport encryption" \
-		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/qrcode dev-python/service_identity"
-	optfeature "WAMP-SCRAM authentication" \
-		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
-	optfeature "native SIMD acceleration" "dev-python/cffi"
-
-	python_foreach_impl twisted-regen-cache
-}
-
-pkg_postrm() {
-	python_foreach_impl twisted-regen-cache
-}
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index f7e9fe87dfd3..c5110f18da81 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -1,7 +1,4 @@
-AUX debugpy-1.6.0-unbundle-pydevd.patch 3342 BLAKE2B 3a95507fa1c504a910edc43be562e73afa7ff551d608b0193828ad0f6c8bfc1d97aaa0b355afdc22e9925406f8f47badad5a506ea4a6f86d86dbd31307ce7007 SHA512 0c4b4888624558289623712239019144816f3f802668d3025e2cbb33301b84d6e8c08dceb67b619ed10d1193e0f0526202822685fa3aebdb219d0f3f733be66b
 AUX debugpy-1.6.1-unbundle-pydevd.patch 2908 BLAKE2B 2c9ef22ce4e00f8a7bafa4097bfbcaf4218195df9f6243233da2d713c819af40251d9a5b0d150a0d7e1615fa128ae36236aae0440791e6f5e1ccd6376f2c1192 SHA512 5f4938171f6edfbf093032ddd3711f112c90e350ca26287edc70cda0668aece98075ab34721e1734ba7c9e72c9a5df774e3683e230c15533e32dc9798329647f
-DIST debugpy-1.6.0.gh.tar.gz 6366079 BLAKE2B 134d2adcae6ec926dcdb7161f0874b830a1d0e3c55abb991f4861fa5a58045437ee4f4cb4c9572b902e3e33634bc3f9970ae055985b983d89d0ef1d99561bda8 SHA512 fe245d4ff751a6c2ef0e75a5249f99661b78075ac62c931c20e3ccbc9389d39a08dc2fda44a33eb23a0a76e5ee339edae439b0004d130cdfe421048f3cc83962
 DIST debugpy-1.6.2.gh.tar.gz 6684477 BLAKE2B ab1bdf394d3447ba347db149e5c4c36820df6df24c5d0984fe862419a490cea21b240322d76644bc9ebadbdf9a6d6c8709ae28452828d42b45d65edd2d2e58cb SHA512 64ecd9f8290588358abcff538f2c68025f14efc38ac5b406f32cd40a580aab90e0b2f145de90ca81943872c70969d6294ac51b3151bc4e03f18370ddfbb9ac6c
-EBUILD debugpy-1.6.0.ebuild 1102 BLAKE2B 7d06281e8ef9398df0abec8a4f80343164406d12309612b11c2427354cbc10c7ad87eb6c2b69cda51238d3747d7f67abe70a6112feba12571316e5521f56fe2c SHA512 bdc106ee170b4d9b72a7e85da442ea64d5dc25b668fad251c4d9ad494d09b40c6fe58e047dc4707aa3439bfeb90ef98d6a78838c56aee06504ea2eef94a9f27f
 EBUILD debugpy-1.6.2.ebuild 1132 BLAKE2B f2478be8d88ce9913a8ede1a2240f5a0e591884fee336d3b8633ee3d11ca18fff0eb882e1bc98972876eea6269c951bc4f7dbfb6ef517964cf101e9afac46079 SHA512 320dc027166702f0fef87f419827e57a9aacb3f2e1157bdda5dcc7c9c752d40740c7389e695f19af91ef68717be2fc1d5fd6d29c1d12c8b03f0caf9c74396f67
 MISC metadata.xml 451 BLAKE2B 671153316362e0394ae59824e67f5ea897615d3853552aa92fb273d4a41a88916cfe03650ab42248ffee557cb95149b21160395e0fcb2f1fd69bb3bc2c97ea55 SHA512 393d4898c3555b425c34dad5f540f42fc8e281f6299360d1192d099e73486467c92ed16ca710e34d2868aec63fca2eab4775b86e95e6dea79b8721ff70e1db87
diff --git a/dev-python/debugpy/debugpy-1.6.0.ebuild b/dev-python/debugpy/debugpy-1.6.0.ebuild
deleted file mode 100644
index deb729af9f44..000000000000
--- a/dev-python/debugpy/debugpy-1.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
-HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
-SRC_URI="
-	https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-# This is completely broken
-RESTRICT="test"
-
-RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.0-unbundle-pydevd.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Drop unnecessary and unrecognized option
-	# __main__.py: error: unrecognized arguments: -n8
-	# Do not timeout
-	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
-
-	# Unbundle dev-python/pydevd
-	rm -r src/debugpy/_vendored || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/debugpy/files/debugpy-1.6.0-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.6.0-unbundle-pydevd.patch
deleted file mode 100644
index 41a0b8e39ba6..000000000000
--- a/dev-python/debugpy/files/debugpy-1.6.0-unbundle-pydevd.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 15ea7e1..d3a2764 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -8,7 +8,6 @@ exclude = '''
- ( __pycache__
- | ^/.tox
- | ^/versioneer.py
--| ^/src/debugpy/_vendored
- | ^/src/debugpy/_version.py
- )
- '''
-diff --git a/setup.py b/setup.py
-index 2c0a2d6..7c22c0c 100644
---- a/setup.py
-+++ b/setup.py
-@@ -18,12 +18,10 @@ del sys.path[0]
- 
- sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
- import debugpy
--import debugpy._vendored
- 
- del sys.path[0]
- 
- 
--PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
- DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
- 
- 
-@@ -33,27 +31,6 @@ def get_buildplatform():
-     return None
- 
- 
--def cython_build():
--    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")
--    subprocess.call(
--        [
--            sys.executable,
--            os.path.join(PYDEVD_ROOT, "setup_pydevd_cython.py"),
--            "build_ext",
--            "-i",
--        ]
--    )
--
--
--def iter_vendored_files():
--    # Add pydevd files as data files for this package. They are not
--    # treated as a package of their own, because we don't actually
--    # want to provide pydevd - just use our own copy internally.
--    for project in debugpy._vendored.list_all():
--        for filename in debugpy._vendored.iter_packaging_files(project):
--            yield filename
--
--
- # bdist_wheel determines whether the package is pure or not based on ext_modules.
- # However, all pydevd native modules are prebuilt and packaged as data, so they
- # should not be in the list.
-@@ -133,8 +110,6 @@ with open("DESCRIPTION.md", "r") as fh:
- 
- 
- if __name__ == "__main__":
--    if not os.getenv("SKIP_CYTHON_BUILD"):
--        cython_build()
- 
-     extras = {}
-     platforms = get_buildplatform()
-@@ -179,11 +154,9 @@ if __name__ == "__main__":
-             "debugpy.common",
-             "debugpy.launcher",
-             "debugpy.server",
--            "debugpy._vendored",
-         ],
-         package_data={
-             "debugpy": ["ThirdPartyNotices.txt"],
--            "debugpy._vendored": list(iter_vendored_files()),
-         },
-         ext_modules=ExtModules(),
-         has_ext_modules=lambda: True,
-diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py
-index 642c776..947cd7d 100644
---- a/src/debugpy/server/__init__.py
-+++ b/src/debugpy/server/__init__.py
-@@ -3,7 +3,3 @@
- # for license information.
- 
- from __future__ import absolute_import, division, print_function, unicode_literals
--
--# "force_pydevd" must be imported first to ensure (via side effects)
--# that the debugpy-vendored copy of pydevd gets used.
--import debugpy._vendored.force_pydevd  # noqa
-diff --git a/src/debugpy/server/attach_pid_injected.py b/src/debugpy/server/attach_pid_injected.py
-index 6016545..9bd2e2c 100644
---- a/src/debugpy/server/attach_pid_injected.py
-+++ b/src/debugpy/server/attach_pid_injected.py
-@@ -33,7 +33,6 @@ def attach(setup):
-                 pydevd_attach_to_process_path = os.path.join(
-                     _debugpy_dir,
-                     "debugpy",
--                    "_vendored",
-                     "pydevd",
-                     "pydevd_attach_to_process",
-                 )
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 8c0ca44ef035..30e795349f44 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -3,4 +3,4 @@ DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f
 DIST pyside-setup-opensource-src-5.15.5.tar.xz 3577972 BLAKE2B ee16ce18ec4103add41ad89b658012cb2e8695bda51269d3cd1614c2b6d029c0eaba5e592d5e58b6267e1ddc020a938d3ccd2fbc9461cc5bf202f3bdbf6b5d62 SHA512 61b987ec823e9a89f2a07a1991d47f36eb45e3ce416aa6e0032a58ba3d623ac26224cb0f43a2db76850bce7290d12fae610de06405350362caac7860ba99f0c3
 EBUILD pyside2-tools-5.15.2.ebuild 1654 BLAKE2B 5f08539ae1da3dfcc0b3c923b6457cce03f26aa3889bc72461432b820d0d9d313439e48dc6186bd1c94915b233a97e1a55994e0662cedffb56592bcdd07433cf SHA512 0886f8591d9a725a75d78513f757537abdf072bc4e9e2d9d8a882ca32ce3e5841f01056bfb661c7406cf2ee88aac2664428cf9dfe0e43e2339c61140baa7cc5e
 EBUILD pyside2-tools-5.15.5.ebuild 1657 BLAKE2B c9143047f921a8bb850212fe77b81c6b4d169487e83f3b69a833802c86ca0bee28e12193954adc9c9e22edc12ae1245971023b0addbd805fcb256c83f4528e66 SHA512 0a42d037bf09abed7fa6e0cefebd858c193552c8b9e0b145c6a6a97e1116fb3124d854b3e606029a1da2cf0297099b3798e27403dab3eae804d4922b08ff6171
-MISC metadata.xml 250 BLAKE2B 2bd2a200020745da1f097ec123623682c370bf39f88991aed60c1682b0c18f56a698812a65e2f63699cf61fb6f433bcfc91de65b77290fe6053ac122a3ee21cd SHA512 bda67aad1f4c4e8949671e4a7a0e757359b53050f6873aca15fdaeea73064e1523143a8e5132e2f665770489442f0f6aca1d061577f6a5befbc59f2bb52ce62c
+MISC metadata.xml 369 BLAKE2B 283347f9cd46ba6f1f9614b5fb1dc098df063457f0950a233fcdbacb3f159ae295cbf4631fb8ae4711e56aef28b01c1515375957ee2a8861e3dc925adcd27430 SHA512 c94cb165cb4bfb4cfe2f45ad50a0118b1761508fab68347894d88b65a938fee6d6de8a3d1e90fbef2ac3bd760bc4cfd115728799238f3772378bdc1939e24c90
diff --git a/dev-python/pyside2-tools/metadata.xml b/dev-python/pyside2-tools/metadata.xml
index c03456561456..d9cf4d12c678 100644
--- a/dev-python/pyside2-tools/metadata.xml
+++ b/dev-python/pyside2-tools/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>fordfrog@gentoo.org</email>
 		<name>Miroslav Šulc</name>
 	</maintainer>
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 35a3b7c0b439..1237f79ed2b1 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -5,4 +5,4 @@ DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f
 DIST pyside-setup-opensource-src-5.15.5.tar.xz 3577972 BLAKE2B ee16ce18ec4103add41ad89b658012cb2e8695bda51269d3cd1614c2b6d029c0eaba5e592d5e58b6267e1ddc020a938d3ccd2fbc9461cc5bf202f3bdbf6b5d62 SHA512 61b987ec823e9a89f2a07a1991d47f36eb45e3ce416aa6e0032a58ba3d623ac26224cb0f43a2db76850bce7290d12fae610de06405350362caac7860ba99f0c3
 EBUILD pyside2-5.15.2-r2.ebuild 8669 BLAKE2B bffd6ee4d015761d13684a328dcd5a2c623646cd6ba3dee968941ac438b20d64cc8164ea61462a3c540e0b836a5f093883135e7c69b66a195c18d19403788e00 SHA512 4bc858eb5d75cfdc36e077064175efdf3d36980948546aad775561d1c25e90ad01be93035d2bf1713f687e1b86efe099f67fe17492a27fe16fa8a2153786651a
 EBUILD pyside2-5.15.5.ebuild 9117 BLAKE2B 0052f7df7aed5910f1d1b126036494c38c859371fcff69fe425a66ff117dda190531ee023ba68487cd7c747351b0ffa6064c5fb8ec1c725ade4cbc2b92e1829c SHA512 dfc719b93f71b6eac3bd0bda58fd0483e8c57b22490cd6f1b881227004f88e18e3564af44bfcaf28dc544ad88293b802c530d80b8d0290d8fa4e5234f07e3df8
-MISC metadata.xml 2021 BLAKE2B 88a02910c29d93871a1b6d4709fec361712d083839186270ad9c5e6472876a3ba50d7aa9c4acd0b169de19caf3c8047a00b6d241ea64b24b65e0a7e796e6f418 SHA512 c42370395ed54c9a20d9969f0a764ef72537bd77a76fb35bd3a5f10abcb801c4794cdd4f2ca528e97e5fb7a1e9293c76845c6a77b973bde00a1ddd9c61b3e5ef
+MISC metadata.xml 2112 BLAKE2B bfdbd4b400b231f3c6b2c5c6073c82d0cbd24a65e2dc4c18b7ef29236d11a728e900d841dc7b800638d2d5c4da3ee8465fc3e02c9464f89f13259a94c259a302 SHA512 d05f6ac9df3e1667a04973b53b7209ea35542645579b29fd65fa0416e36b1895b8da20f18fab790a401c616d36071632f1d6fbe59f16926550fe788b5c49e424
diff --git a/dev-python/pyside2/metadata.xml b/dev-python/pyside2/metadata.xml
index 6f1da8acacbb..a22d31ff4915 100644
--- a/dev-python/pyside2/metadata.xml
+++ b/dev-python/pyside2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
 	<use>
 		<flag name="3d">Build Qt3DCore, Qt3DAnimation, Qt3DExtras, Qt3DInput, Qt3DLogic, and Qt3DRender modules</flag>
 		<flag name="charts">Build QtCharts module</flag>
diff --git a/dev-python/pyside6-tools/Manifest b/dev-python/pyside6-tools/Manifest
new file mode 100644
index 000000000000..35a11b89f99e
--- /dev/null
+++ b/dev-python/pyside6-tools/Manifest
@@ -0,0 +1,4 @@
+AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f
+DIST pyside-setup-opensource-src-6.3.1.tar.xz 7685896 BLAKE2B 66eb9ced1899fabea2be1b6471fcaa3eca4c74e989e7eab47dc44db623eb6242a713e1e7c7e2a6daad36994d3766cf7adc79e3601bfc3908a051fdc97b52522f SHA512 81751fa9e2c492ceae42b3cb1f871d3f95f56cc07c382f02574899f3eab8db52453b0b636e63d53e0d2195f1686a01ad2bee20953aa0a8237719ec06d2b6e321
+EBUILD pyside6-tools-6.3.1.ebuild 1361 BLAKE2B 3f66578d716c3c2cdbb06884c70111dcc100587ba297e234897a2e75932f7112892b5ebb4d565349f7a83421ba0ea1f9b8eb26daef8ed5c8e920dd4ceab63c5f SHA512 61d6e9460d267120ffcbb2c3f3d514599a8d36c0a86e933953fc184419ab913fef5dc184fcea189ee0cc79f0736d9f1a2aed2570c675bce7e8f62fa011d3bbd8
+MISC metadata.xml 259 BLAKE2B 3bd5fecaefa4296413fd08aac88185d04771439afd26b516016a83ad674ca42d886412f99424be93e997431c64d5601ae89ae6478784cffb44e400d3fa4889b8 SHA512 d73de9f4636e5d93e57d9a781e5292e8d3bc270f8fb3b90c246cf3a2ba4a9ac9f36a9aea5a7f08aa6c608e61c836275bb1eb4b5c079b3db0da938efd10cdff9f
diff --git a/dev-python/pyside6-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch b/dev-python/pyside6-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
new file mode 100644
index 000000000000..60de6aa07ee7
--- /dev/null
+++ b/dev-python/pyside6-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
@@ -0,0 +1,58 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 20a5e19..575c1df 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,38 +55,6 @@ else()
+     set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}")
+ endif()
+ 
+-install(FILES "${UIC_PATH}"
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+-install(FILES "${RCC_PATH}"
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+-if (EXISTS ${DESIGNER_PATH})
+-    if (APPLE)
+-        install(DIRECTORY "${DESIGNER_PATH}"
+-                DESTINATION bin
+-                FILE_PERMISSIONS
+-                OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-                GROUP_EXECUTE GROUP_READ
+-                WORLD_EXECUTE WORLD_READ)
+-    else()
+-        install(FILES "${DESIGNER_PATH}"
+-                DESTINATION bin
+-                PERMISSIONS
+-                OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-                GROUP_EXECUTE GROUP_READ
+-                WORLD_EXECUTE WORLD_READ)
+-    endif()
+-endif()
+-
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
+                "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+                IMMEDIATE @ONLY)
+@@ -113,14 +81,6 @@ endif()
+ 
+ add_subdirectory(pylupdate)
+ 
+-# pyside2-rcc, pyside2-uic, pyside2-designer, shiboken and pyside2-lupdate entrypoints
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside_tool.py
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+ if (BUILD_TESTS)
+     enable_testing()
+     add_subdirectory(tests)
diff --git a/dev-python/pyside6-tools/metadata.xml b/dev-python/pyside6-tools/metadata.xml
new file mode 100644
index 000000000000..22b65e0b6c67
--- /dev/null
+++ b/dev-python/pyside6-tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.3.1.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.3.1.ebuild
new file mode 100644
index 000000000000..41ea6d4bbe2f
--- /dev/null
+++ b/dev-python/pyside6-tools/pyside6-tools-6.3.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{8..10} )
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake python-r1
+
+MY_P=pyside-setup-opensource-src-${PV}
+
+DESCRIPTION="PySide development tools (pyside6-lupdate with support for Python)"
+HOMEPAGE="https://wiki.qt.io/PySide6"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}/sources/pyside-tools"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pyside6-${PV}[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	pyside-tools_configure() {
+		local mycmakeargs=(
+			# the tools conflict with tools from Qt
+			-DNO_QT_TOOLS=yes
+		)
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
+	}
+
+	python_foreach_impl pyside-tools_configure
+}
+
+src_compile() {
+	pyside-tools_compile() {
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
+	}
+
+	python_foreach_impl pyside-tools_compile
+}
+
+src_install() {
+	pyside-tools_install() {
+		python_doexe "${BUILD_DIR}/"*.py
+	}
+
+	python_foreach_impl pyside-tools_install
+
+	einstalldocs
+}
diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest
new file mode 100644
index 000000000000..5ddb6ed7d780
--- /dev/null
+++ b/dev-python/pyside6/Manifest
@@ -0,0 +1,4 @@
+AUX pyside6-6.3.1-no-strip.patch 953 BLAKE2B f88bac603a584213a864fcfc7c528f1d236ebdbfb653c3877316cd0b95c30c2f7288b1c81c6a90a3e4228536da4aa63552991fefa952f450b0b852b3e2aed94a SHA512 2920075a26fc059bdebc8eb5fa7c15de74729b7f8d1eb59197f7426afa7a65f1f78a8ebb76e946b2dfaf5817dbf090744bafaed2f2156f2d1548c2932a7ce61a
+DIST pyside-setup-opensource-src-6.3.1.tar.xz 7685896 BLAKE2B 66eb9ced1899fabea2be1b6471fcaa3eca4c74e989e7eab47dc44db623eb6242a713e1e7c7e2a6daad36994d3766cf7adc79e3601bfc3908a051fdc97b52522f SHA512 81751fa9e2c492ceae42b3cb1f871d3f95f56cc07c382f02574899f3eab8db52453b0b636e63d53e0d2195f1686a01ad2bee20953aa0a8237719ec06d2b6e321
+EBUILD pyside6-6.3.1.ebuild 8562 BLAKE2B a7e78b58f0c8ab2c933ad666923dbc16a92aad841339c3747f3f2c9437a00e8ca26b33d258363d8ade803bffb85438ca4e9099e8b0715c5eacb5f8d5a1637878 SHA512 76fd97aee5cb1e0ee7de80400f62c0151793191fb6938de4f5bcbdc0bacd2e7ee9dc4b0611509fb091a2d6a79e3d2677d4fb925236a252a44b806c374eec4779
+MISC metadata.xml 1574 BLAKE2B 01707202ef30f3cdf60f2e01955c7f1d756eb80066b2a057037bdb0d62f214e2e167162eb47fadce04bb808a834b30742fd0b597af287864d59f12f4a1ac8a6e SHA512 a06bde152e261f2aaf5854fc10b8830b12bdfa2ba7b53cd0f0212f3abf7139d7d42c1f1ce4b691de5b28fb70a4c5f5019db4b390557368d52cc8c42119f88d2c
diff --git a/dev-python/pyside6/files/pyside6-6.3.1-no-strip.patch b/dev-python/pyside6/files/pyside6-6.3.1-no-strip.patch
new file mode 100644
index 000000000000..9f3a8c396f05
--- /dev/null
+++ b/dev-python/pyside6/files/pyside6-6.3.1-no-strip.patch
@@ -0,0 +1,26 @@
+diff --git a/libpyside/CMakeLists.txt b/libpyside/CMakeLists.txt
+index 0b2f7a0..31e41e8 100644
+--- a/libpyside/CMakeLists.txt
++++ b/libpyside/CMakeLists.txt
+@@ -123,8 +123,6 @@ endif()
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_TO_ASCII")
+ 
+-qfp_strip_library("pyside6")
+-
+ # create pkg-config file
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pyside6.pc.in"
+                "${CMAKE_CURRENT_BINARY_DIR}/pyside6${pyside6_SUFFIX}.pc" @ONLY)
+diff --git a/libpysideqml/CMakeLists.txt b/libpysideqml/CMakeLists.txt
+index 42238c8..33bfce1 100644
+--- a/libpysideqml/CMakeLists.txt
++++ b/libpysideqml/CMakeLists.txt
+@@ -57,8 +57,6 @@ endif()
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D QT_NO_CAST_FROM_ASCII -D QT_NO_CAST_TO_ASCII")
+ 
+-qfp_strip_library("pyside6qml")
+-
+ # Install-tree / relocatable package config file.
+ configure_package_config_file(
+     "${CMAKE_CURRENT_SOURCE_DIR}/PySide6QmlConfig-spec.cmake.in"
diff --git a/dev-python/pyside6/metadata.xml b/dev-python/pyside6/metadata.xml
new file mode 100644
index 000000000000..aef544ecb967
--- /dev/null
+++ b/dev-python/pyside6/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<use>
+		<flag name="concurrent">Build QtConcurrent module</flag>
+		<flag name="designer">Build QtDesigner and QtUiTools modules</flag>
+		<flag name="gles2-only">Build QtGui "QOpenGL*" classes</flag>
+		<flag name="gui">Build QtGui module</flag>
+		<flag name="help">Build QtHelp module</flag>
+		<flag name="multimedia">Build QtMultimedia and QtMultimediaWidgets modules</flag>
+		<flag name="network">Build QtNetwork module</flag>
+		<flag name="positioning">Build QtPositioning module</flag>
+		<flag name="printsupport">Build QtPrintSupport module</flag>
+		<flag name="qml">Build QtQml module</flag>
+		<flag name="quick">Build QtQuick and QtQuickWidgets modules</flag>
+		<flag name="quick3d">Build QtQuick3D and QtQuickWidgets modules</flag>
+		<flag name="serialport">Build QtSerialPort modules</flag>
+		<flag name="sql">Build QtSql module</flag>
+		<flag name="svg">Build QtSvg module</flag>
+		<flag name="testlib">Build QtTest module</flag>
+		<flag name="webchannel">Build QtWebChannel module</flag>
+		<flag name="webengine">Build QtWebEngine and QtWebEngineWidgets modules</flag>
+		<flag name="websockets">Build QtWebSockets module</flag>
+		<flag name="widgets">Build QtWidgets module</flag>
+		<flag name="xml">Build QtXml module</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">PySide6</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyside6/pyside6-6.3.1.ebuild b/dev-python/pyside6/pyside6-6.3.1.ebuild
new file mode 100644
index 000000000000..09cbf24f7b1e
--- /dev/null
+++ b/dev-python/pyside6/pyside6-6.3.1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-r1 virtualx
+
+# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
+# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
+# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
+# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
+# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
+# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
+# that the "PySide6/QtGui/CMakeLists.txt" and
+# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
+# testing whether the "Qt5::Gui" list property defined by
+# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
+# time contains the substring "opengles2". Since cmake does not permit
+# properties to be overridden from the command line, these files must instead
+# be conditionally patched to avoid these tests. An issue should be filed with
+# upstream requesting a CLI-settable variable to control this.
+
+MY_P=pyside-setup-opensource-src-${PV}
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://wiki.qt.io/PySide6"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}/sources/pyside6"
+
+# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details.
+# Shall we allow essential modules to be disabled? They are:
+# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
+# x11extras (for X)
+LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="
+	dbus +concurrent designer gles2-only +gui help multimedia
+	+network opengl positioning printsupport qml quick quick3d
+	serialport +sql svg test +testlib webchannel webengine
+	websockets +widgets +xml
+"
+
+# Manually reextract these requirements on version bumps by running the
+# following one-liner from within "${S}":
+#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
+# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	designer? ( widgets )
+	gles2-only? ( gui )
+	help? ( widgets )
+	multimedia? ( gui network )
+	opengl? ( gui )
+	printsupport? ( widgets )
+	qml? ( network )
+	quick? ( gui network opengl qml )
+	quick3d? ( gui network opengl qml quick )
+	sql? ( widgets )
+	svg? ( gui )
+	testlib? ( widgets )
+	webengine? ( network gui printsupport webchannel )
+	websockets? ( network )
+	widgets? ( gui )
+"
+
+# Tests fail pretty bad and I'm not fixing them right now
+RESTRICT="test"
+
+# Minimal supported version of Qt.
+QT_PV="$(ver_cut 1-2):6"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
+	>=dev-qt/qtbase-${QT_PV}[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?]
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	gui? ( >=dev-qt/qtbase-${QT_PV}[gui,jpeg] )
+	help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml(+)?] )
+	printsupport? ( >=dev-qt/qtbase-${QT_PV}[gui,widgets] )
+	qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	testlib? ( >=dev-qt/qtbase-${QT_PV}[gui] )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV}[qml(+)?] )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QT_PV}[gui] )
+"
+# testlib is toggled by the gui flag on qtbase
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-strip.patch"
+)
+
+src_configure() {
+	# See collect_module_if_found macros in PySideHelpers.cmake
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
+	)
+
+	pyside6_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
+			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
+		)
+		cmake_src_configure
+	}
+	python_foreach_impl pyside6_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE
+	python_foreach_impl virtx cmake_src_test
+}
+
+src_install() {
+	pyside6_install() {
+		cmake_src_install
+		python_optimize
+
+		# Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig
+		# file for the current Python target. See also:
+		#     https://github.com/leycec/raiagent/issues/73
+		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
+			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
+
+		# Uniquify the PySide6 pkgconfig file for the current Python target,
+		# preserving an unversioned "pyside6.pc" file arbitrarily associated
+		# with the last Python target. (See the previously linked issue.)
+		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+	}
+	python_foreach_impl pyside6_install
+
+	# CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing
+	# downstream consumers (e.g., pyside6-tools) to target one
+	# "libpyside6-*.so" library linked to one Python interpreter. See also:
+	#     https://bugreports.qt.io/browse/PYSIDE-1053
+	#     https://github.com/leycec/raiagent/issues/74
+	sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \
+		"${ED}/usr/$(get_libdir)/cmake/PySide6-${PV}/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
+}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index e73c98d6cdea..61ba0a4c4a31 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,6 +1,4 @@
-DIST python-ldap-3.4.0_p20220420.tar.gz 377780 BLAKE2B 433178138587dc09bfe1e6a8e894c001baf6e07c76266ca9d7c56b279f9e9ca5a642528a5869a837a9ee5576a2cf17afdeea313b4a8bc930926397738d6a5daf SHA512 0dfe8ff4737a630a08c7cd4d94f30c78fd1e0558ffc0609439d95ef064b72aef9d4ec4cdc0d40aaf1fc46396bdc0cbbdf0bf3cf6bb5e94bf8a9e3083b9ba1bf4
 DIST python-ldap-3.4.2.gh.tar.gz 377981 BLAKE2B 6efa768dd035f8867abacfd9cc1b9ceca1a468c79550d2529130bd8eaf7546e4474d5798cf9090a9a74f05286ca30a33b8e54821292b8aa2e27358f93d72cb7b SHA512 3a68dd2c160d7d74061d9c9eb060be6faeec1f607f3853722f969d7d1dc76c7da160aa20a4c139feb4d2eba6dbf2e2cfb02551cabd6fbf413654f32f73e94c15
-EBUILD python-ldap-3.4.0_p20220420.ebuild 2339 BLAKE2B 643b27187a5fc5892a6c7301bacb58fbf57a31f6de6a704e7871e6a9dfc693d9c6c3980137cfc41cf745d6fe52ebf94f0e98fa33094237e9dc0ee5407c0ae2d8 SHA512 2dcf1c028bd92213eedf22b099b9f4518b7a5add89d73b3aaec0958b20276ea18311145ac0ceb902f8ed9ea72eb1dfb5367e7404933acc309a0e5cf400d5aae3
 EBUILD python-ldap-3.4.2.ebuild 1704 BLAKE2B 49a15455aa8afe1b2b4e9cf3c97212dd0d9364b4fd6f27bdecec856dc8cdcb502914db1b43acc195a6abac64e105097956571492dce7c040b7da1369b5811ad3 SHA512 d611b9039ac4bffb96e93c08ccf0653ac390c7498745466139b42507953b1c3e68ea681f889c85dd6a907a7ac49f0f5aa947477b0ba7e7ee77524bbe20af58f4
 EBUILD python-ldap-9999.ebuild 2000 BLAKE2B 1340f010714318a6a8e90ffa228a3c0799909ee1f70af5ec5cbd73449d6982a18df35353a3d356d559a89c43be1c44f097698236a6118ad66fac5630a75d57c8 SHA512 c58a4c82d5e18bb29b62024a826b063f0f47ee3f9e4a798251175b4115a31f5a5803962ec597c12d8855faba83c259f559083a6499524f41197d2ecfd0d3a9fb
 MISC metadata.xml 449 BLAKE2B 14ffa18ca09eb663d3ef4ff5bd0ebc8511fa408a4e96c93885ba2beaccdf3bb82a9733a01149e088c8b66d6cb938f94fc3940c0c0cca5685599191e772443cb6 SHA512 2f5c014e55f838b84abf6ba630b000620a01e2fca6d1f1bd1b30db309f820df50c2ef7feddc17c69ee0188c3cbc91a388933b4bccfc8d2ea0cb18c6dae85cda6
diff --git a/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild b/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild
deleted file mode 100644
index 93023b5578a9..000000000000
--- a/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="https://www.python-ldap.org/en/latest/
-	https://pypi.org/project/python-ldap/
-	https://github.com/python-ldap/python-ldap"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git"
-	inherit git-r3
-else
-	# Snapshot for various new OpenLDAP fixes, bug #835637
-	# (There were a bunch of followup commits and general other
-	# serious bugfixes we want.)
-	MY_COMMIT="7f30c4721ea2ca4373ed7860e6467781f0afa758"
-
-	#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	SRC_URI="https://github.com/python-ldap/python-ldap/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${MY_COMMIT}
-
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~x86-solaris"
-fi
-
-LICENSE="MIT PSF-2"
-SLOT="0"
-IUSE="examples sasl ssl"
-
-RDEPEND="
-	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
-	net-nds/openldap:=[sasl?,ssl?]
-"
-# We do not link against cyrus-sasl but we use some
-# of its headers during the build.
-DEPEND="
-	net-nds/openldap:=[sasl?,ssl?]
-	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx Doc
-
-python_prepare_all() {
-	# The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
-	# https://github.com/pypa/setuptools_scm/issues/228
-	if [[ ${PV} == *9999* ]]; then
-		rm -r .git || die
-	fi
-
-	if ! use sasl; then
-		sed -i 's/HAVE_SASL//g' setup.cfg || die
-	fi
-	if ! use ssl; then
-		sed -i 's/HAVE_TLS//g' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Run all tests which don't require slapd
-	local EPYTEST_IGNORE=(
-		t_bind.py
-		t_cext.py
-		t_edit.py
-		t_ldapobject.py
-		t_ldap_options.py
-		t_ldap_sasl.py
-		t_ldap_schema_subentry.py
-		t_ldap_syncrepl.py
-		t_slapdobject.py
-	)
-	pushd Tests >/dev/null || die
-	epytest
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r Demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-sense-hat/Manifest b/dev-python/python-sense-hat/Manifest
index 268b3ff85ea1..a29d06212a29 100644
--- a/dev-python/python-sense-hat/Manifest
+++ b/dev-python/python-sense-hat/Manifest
@@ -1,3 +1,5 @@
-DIST python-sense-hat-2.2.0.tar.gz 20841 BLAKE2B 59e6b9111fb90493e6bda00ce4a4c143dcb84d8b6529efadaf2f337adb38a8fb4287cbd9a303070ea4f335f1e03c6f4789e6f8fbe64a7c70db20675bdae7c6a1 SHA512 71914f6f22206cff23992a6908698978741a46bf9b98648388bac4550f39e8de73db6bd389b79585eba6e82160649a8c8da4217d515bbdbcb50d47218415f3ac
-EBUILD python-sense-hat-2.2.0-r3.ebuild 596 BLAKE2B b4683f8758721adc8eb8ffcac3c4841858d3c7bd1991eddedf80af46aceb0fccf83857b56e9b2fe833c06cbecf4ac48d0c68375466f19a08911fee86b30575d7 SHA512 f7411e36015aa0e703a12c06926ece5b792e0bdabd60fb2347ac5932dac1213b4de9437de5d5fe40db77b930341a38a5ab1211c1f3713acfb280c48fb1f8d091
+DIST python-sense-hat-2.2.0.gh.tar.gz 20841 BLAKE2B 59e6b9111fb90493e6bda00ce4a4c143dcb84d8b6529efadaf2f337adb38a8fb4287cbd9a303070ea4f335f1e03c6f4789e6f8fbe64a7c70db20675bdae7c6a1 SHA512 71914f6f22206cff23992a6908698978741a46bf9b98648388bac4550f39e8de73db6bd389b79585eba6e82160649a8c8da4217d515bbdbcb50d47218415f3ac
+DIST python-sense-hat-2.4.0.gh.tar.gz 27396 BLAKE2B 7f7482e17f80a3598c92f53f7a5b99ce4f5da10a5fc9ba6de656b6e18db323f8133f720d1486c3ecbe9badfdfe597c5365d2ba17ff637933d3053ec52f36dcfa SHA512 b2ce6c231b814d415dcf72b1031b29fd2309ccf194b8996401b1d3d7ff356ad4ed83a9ecff7c182410f789c3f1f47c3a6d64dd53884abf952f928734b94e54a5
+EBUILD python-sense-hat-2.2.0-r3.ebuild 599 BLAKE2B 0ab5d8b0aa07feaed647afdf90cf07a88e08a2b8719f780de94523de959e67aad6e04ef968631851440bf97a3c163302ec58407599560d1b4a888cf04f4a3755 SHA512 c46e7d3ea4768439b1faafe77b8032bec6e770bab04f4aff2eb8877436e82e884c313cb1e25782ed104d73dacda245c15fde61ed1482d3d1c2f126430b96cf77
+EBUILD python-sense-hat-2.4.0.ebuild 598 BLAKE2B bf2b5c0cb9e2a588c0834f780f25f2c97c2b8188892b4d06101d1ca327388faac112498267644041dedea7ea79c7e900ba82b3d32fd6b4d747894426345ed9de SHA512 a96291d27ece9e3f26ebfc9921c50c6e23023151dfeb3cf3c0f9980ef444c441c3a29acf23e4c80b169a3fb472b421cb1441a29c5bfe94f549ab07df4d79a471
 MISC metadata.xml 696 BLAKE2B 8c66d39989f0a29eb4b674afdfea3787c8ea4446d7fd41713f1a77d5e76c926f71200b685e3ca243dfac9c88ac9b7c11569fc36dc5c08e39e6aad24cc2ff94f7 SHA512 4c8725ab9fd8388006ccba8befe362e59962d9cc368d541dc57686544c10d81b891ff20788f6e209d79eaaabce3f857045b88acc5fb87a54995046e4b6ad21e9
diff --git a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r3.ebuild b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r3.ebuild
index b6ffda3de655..f467b7bab3e0 100644
--- a/dev-python/python-sense-hat/python-sense-hat-2.2.0-r3.ebuild
+++ b/dev-python/python-sense-hat/python-sense-hat-2.2.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Raspberry Pi Sense HAT python library"
 HOMEPAGE="https://github.com/astro-pi/python-sense-hat"
-SRC_URI="https://github.com/astro-pi/python-sense-hat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/astro-pi/python-sense-hat/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/python-sense-hat/python-sense-hat-2.4.0.ebuild b/dev-python/python-sense-hat/python-sense-hat-2.4.0.ebuild
new file mode 100644
index 000000000000..cec88b32b3c4
--- /dev/null
+++ b/dev-python/python-sense-hat/python-sense-hat-2.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Raspberry Pi Sense HAT python library"
+HOMEPAGE="https://github.com/astro-pi/python-sense-hat"
+SRC_URI="https://github.com/astro-pi/python-sense-hat/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~arm ~arm64"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/rtimulib[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 3dea829d8186..d694b87c020f 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,11 +1,7 @@
 AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fcb99653a40bfbb9a1009519a79244fa3193ca43b9b8b3ef714f066fdac68f32d7f24c275690cb24bd1deca6b30120519b99a3402db7b4d4d48 SHA512 d55643d7ca251f465d14d8cffab60e6f2c8fb18ec6f9032a5318fab17a8b8e5ae5c98d22e0eff28aacd5bb8ec2ff606022921f73f3c9f7e54ee0853de262cfa7
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
-DIST regex-2022.6.2.tar.gz 383342 BLAKE2B 48587a91366203301c517dc9cfe4f09e70905924484b906481bc89cf376854d406871312e154ac8b5833feeb50848636a95fdf99511df4feda4f16794a70856b SHA512 ce69a058aa05c471ce8728d29d5a498e387e5661d754d13bee51558a85f5e9e059a1464cc1b7721294cab421bae7219da7fd067e331e6cd6fd3dc464fdf0ecc1
-DIST regex-2022.7.24.tar.gz 385003 BLAKE2B 996cdec63ec35f893f3bbf3afa7731944c496547f0cf3d97b85a90b8ceb8d4a1571a680608ea01c5d845a11de43365cc30fd98519bb2cfacc01eb5ff36950d0c SHA512 23ce018a4275ffc49ac9ad71e9ed70984e2118421e0d97d497ad41bc5ff4e19a5b783dbce82a94ad15b59681be668092594fa3ace44250d111693e046e953030
 DIST regex-2022.7.25.tar.gz 385022 BLAKE2B 64c2ff2e9a41d6d559ed199e978b7eb453ffe872d3cbe3d14f31ed6f7df546aa33079ce1d8279b815a35a18d9ea75da6f0beb38e4df576037995518a38db688a SHA512 1179239e8e2a1ff55150b6c2e483f2d2b795a7f5cb400310c315a59aad19590d410cc9c1a862c66be2ca93b24b387a4c4fa0a5467d497a9bc5ffc79dac7cb0ff
 DIST regex-2022.7.9.tar.gz 383431 BLAKE2B 9773b3e5c516d79ec6b37d288addb0638016716093ec49d8cdc4a2132fc16ea76c4a21fd02cc6bc6547fd0dd76bb0ec9984bb7f41eb88e4f89623a8d4a5be40d SHA512 0c8b78fc10e5ba4e95a3603a4958efb610168b63a490715c2556243af7bab4d04e6eab6cad6bc98816cfa94209404806ede28cf48643d7e92c9b8323c2b0c5e2
-EBUILD regex-2022.6.2.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
-EBUILD regex-2022.7.24.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
 EBUILD regex-2022.7.25.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
 EBUILD regex-2022.7.9.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2022.6.2.ebuild b/dev-python/regex/regex-2022.6.2.ebuild
deleted file mode 100644
index df6875fb35c8..000000000000
--- a/dev-python/regex/regex-2022.6.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://bitbucket.org/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/regex/regex-2022.7.24.ebuild b/dev-python/regex/regex-2022.7.24.ebuild
deleted file mode 100644
index d864a4bd8ea3..000000000000
--- a/dev-python/regex/regex-2022.7.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="
-	https://bitbucket.org/mrabarnett/mrab-regex/
-	https://pypi.org/project/regex/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index a33965d4cff3..49f1e66a82fb 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -37,15 +37,10 @@ DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed
 DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
-DIST pyo3-0.16.2.crate 350698 BLAKE2B dff6af75527ed3e34839e25810663ba0a1210cebaa4be0030b5fe1032fcbe93e813b9b3ca1398e446cca62ac5d77a025e40c32884f11caa7787fd35fef48af57 SHA512 b4de2d2bd631de6bcf3cb29802d634b27cab36c4f18a6dbf18f44a8e634e105b1222a9342c2978da701f43047e1a2fff41b8ce1efa9def92b5e97063f1a29b37
 DIST pyo3-0.16.5.crate 363266 BLAKE2B 3162d9a3da37b5579a91dbd42d3e200c480b5e3fb3a2ec208735045cb78a8418f6810a72ec24452f24d00961c72a58ccac4f5ca9a567c92c0a82ca37173de442 SHA512 068019c76b1fc3de2e100c6cdf084df24587094aac3479cb1d906f7fc95ab6296cfe4d0d211a1c5696261be5e0e0e96776f5bc5535faf8243432f93e4d2537f9
-DIST pyo3-build-config-0.16.2.crate 23501 BLAKE2B 0dc159f6059d64c7fdc8f287c6785b5db626b5776b5564be2ad33289115ee2cedce63131b8d747d913ac22cff4949b9ded7695672f01bfc6eac31b99db8b7c45 SHA512 ef645bb2bbc408c9e566ee6631fa669a54c51d9c751544f704b6b23852e5575e5178d138a677c4a5cd89d432ca48fbd771b4464f512302ff01e9dc0057aa7897
 DIST pyo3-build-config-0.16.5.crate 28880 BLAKE2B b821818831e410dc75df12f9f9625986ceea97d00f3160fc8cbf7315f003f94bad425bcfb3db73cca07ec62de47b763196e019e37d16beed9d5cf7386c05ca6c SHA512 91a9eb743b05808ccb5816a631e381167b16707515a68bbc43c04dee333c2537fd03ca1ae4a02b26738c79baa695b5dfa603753eee58e9002ac6b33320d275c6
-DIST pyo3-ffi-0.16.2.crate 60227 BLAKE2B cb19ce27510afa61cc0e1f40f27c2cb359fa13f72e9bdef499ecc8d925eac482c0c886dc8175fe0c8e775ebf88a09a55e8ce9df6b672596a8a0fbc1ff4807153 SHA512 2de278222eb74e4cbc67be5ee790de5ba76b06ad3ab09a2fcd0bdb8a1c6daab551a3948d58fd713277150a6cf35a39b71160809990bc8277ed631135dd1ecb2d
 DIST pyo3-ffi-0.16.5.crate 60737 BLAKE2B 84907201cf48e57a6b692a9261d67d005d0b773965116dd22d679eff2a3a02ee4f59678dde896635052e62c55ee2703f30726a65651a0f38fdcb31e8c95e3059 SHA512 8b4a486dfd204ea5c394b6832f5e2ead5cd88bc2a943bbc156fcf70e8212be6fa96af5c9ce06ce28a2d0e702fee858f26b49094070e00be658ffe3fa84265496
-DIST pyo3-macros-0.16.2.crate 8027 BLAKE2B dfe930ba1e718b8626743a36eb395e62010609cde6a58ac324da3137c3d28884b61c2d99efa52091d4cdd9915cbc7c7ffa65b75b851bb9b0f63b492f5621d3b6 SHA512 4988a4f4167f1408bd31454520113419af94f24b0d58c7887345bd5ccda4f6d6c8b3fb5e317a55ecbb2401e1cb0a0c8224ee9d3a7384cced6ef2bb54c0ed0191
 DIST pyo3-macros-0.16.5.crate 8456 BLAKE2B c37f31ebcea08fec38849ac52e6a52613b07e7532d7c79889ad52693461a0966e69a6cf29d4c2c8da19bce7e7d05e8c103dddccbb41667c69b28bb15cd388230 SHA512 c4f4993ab67d2f8fc6f1fe5c0eeffc00c10024e201c64fb49f3075f5c33af63d2d455f7696b094fe9786091469a27c5472cb11aea3e9c3b73404578ba76a93fc
-DIST pyo3-macros-backend-0.16.2.crate 49378 BLAKE2B 9227c6e7e29a316431adf697675e38c267fc2b18423c99b0198739c8eda91b028d8ed1ce1841cd29225db1827e1449ef95db04941e51466be6a266487de63d96 SHA512 5d6a4292ba8ea0910d209d59f8f8cf7e5b00a28d940d8ce2a221c28b782c2f98fde20fdbbedee8aab2f741ddac3a6267fb17a600c00964c2b155a5e43a841510
 DIST pyo3-macros-backend-0.16.5.crate 49221 BLAKE2B 690f5e90074f44478b7701203b8a7b63f1fd83ab20c7458fbafa17e61ff34053c8f81d22151a30aa78980bc983a73cb1e56b2cdc5a55c5d8ab9b7e3941ab7503 SHA512 c85a1f53311355e96284cffc40d181aa65d63f9fffcdf8fa33fa989b771bb1b412ab118c9d3b08b1f686936797edb24c61c000dc59bbc5c69aacccf70b035b4f
 DIST quote-1.0.16.crate 27566 BLAKE2B 3352f4ed2158cb8d29947d5435b7414ed223088887718f9d258f1f5d555034a4fbb79cbfb3cb772be4868be366853feabec777fba7f275ac36d8091eb3b371c7 SHA512 489f4dcaa8a8a2041b39fc8fc815fa7943c0a456881283398e4eb65f7b50f220a6e5493d60d1d5019a48b189ca217fd8c62056b552bf94b9329ec963cce01c74
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
@@ -60,7 +55,6 @@ DIST selectors-0.22.0.crate 44199 BLAKE2B f749e0e53476b695b4937bc0cbf1add4f3f7d4
 DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215520030d697e863427fa06edd9f63d05c522f696c5b9c1c45556803ae381cb4c77a2d4a7fc30f7363e3ecea SHA512 0470b9a3a6d398233d19a8240de3b0d18c4cd8f8fc6887658baac4053c88463d5de9b7145a564abd43f813e03b75a26050eedc1689450895953bc7f96b64859f
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST servo_arc-0.1.1.crate 9817 BLAKE2B 88586ca0c969df8bfb3a04ba4a689606995876434877a2cd48a72b26451deb6fdcf65273aa9b03948adcbc66b2450301840910e5c4162b993535d69585c62128 SHA512 59d531dcf7a9191b8462ce395e713194994714b65275c0af412186f862be169d0c6fc5d86603332a1aacd8af9ace934dc78531b9cb576cf8179ec35709225447
-DIST setuptools-rust-1.3.0.tar.gz 285698 BLAKE2B ecd1a2cdce5a9b3ca7c648c97d472dd0ed60db3738d44cfe601c85ac1cd8f3924cb82fe0a06f02a70d60cbe1956c324f3fe0153275c7bae75a14a21b242ecda7 SHA512 5971413a9544ddd626671de74e9517fb20410e4838c5420ed31653d7fdf07b858ff4ef14ec2d5b51677e3402757da915a76858337d0c2b164682450bce35ba11
 DIST setuptools-rust-1.4.1.tar.gz 288848 BLAKE2B 28f4ac618ae3550158814ac14b87d628ce16f140840c3948d48f486cb5a7f50389eccd78385fe3e5be635dad61bf19e25464d39567c2fc760e247d5a2e692145 SHA512 3b92eb37564872b4094e77c8412b006f57a3557213d1368e2db883bc04f5d0d516a97a5b1f0b5255b362ecc32832d2ef734ac759a49db72439f227d54f8a86f5
 DIST setuptools-rust-1.5.0.gh.tar.gz 293081 BLAKE2B bf373915da5c4703d94fa1b63cb9a7037731fb6fd8260032d947b8c57ce6ea3a726956af1ec38f242a1953fc696d9ae5297ab391e2a01d59e5004493743a402d SHA512 40e204e4599a41032dd591d4ef6edecb9dd90c756932fdaeab1999dd24000b97a3f9efb51a20ac81f7d9f1f5a9b25b3891b5f56292951090b89887f947346704
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
@@ -79,7 +73,6 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD setuptools-rust-1.3.0.ebuild 3145 BLAKE2B 89fcd32448cef2c1c9a68b3abcdcae256b22e3ebffd389efe37f6a8af0fbbf714d01c1c18143860b3baa94e65d38c23d94f2030d88e2fdb43810cb287475a081 SHA512 69a2570e8d7e6ecf833202b63196fc99d606a60aae02dcb369ba61a514fc6c16cfbd619a542ac10b0d567fa077f71314b592a2be8f20d9209d30b5fbf642135a
 EBUILD setuptools-rust-1.4.1.ebuild 3224 BLAKE2B 25e906de1b79f958cc2858704cd4a8246cea21d09532e38025258a49818ed2a417ef7fbcbb786286adfe5077af40687add0a0637532df6015d2b9a2c02af8bae SHA512 a4e2423a3b6eb6fc4f037e14be94e7356dce94c6028c361a342421f3931092ca25fd3f3b8e18d0673a90c634d0edd96b6a36ceb817f1ba091dbf67db1957d300
 EBUILD setuptools-rust-1.5.0.ebuild 3219 BLAKE2B bf1a733cfae3069ce56013278c0232cb4f03404b6296ecaa1fe054ded092fef0946ff479fb4e6ff6450558699af7c1cf9c1aa9a3abf3dcf457d73fd790b471e6 SHA512 1692d33a52db827ea9c36d6bb232f33d862f7f69e9a3668309aadd15bc22b2256253553d7deb77be877128460ee582a3dfd6b09c114feb1319f440f715175041
 MISC metadata.xml 476 BLAKE2B c8f0ef0779f0a4412a7d9b97e1bb03e3bfb3c031209f489a100b30402d99224014e379712989afd0cb76c85be301dcf9a51e21e8f9195262c5920dd1db0703d1 SHA512 af74755e9e8fb61cbded2dc3e63cd20f95393ef2650bed9f81e299f7759ae79c63b45df8048cd0fe25397ec7db10156be681fa5278606a20481f78d5279b815b
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
deleted file mode 100644
index 07b2de60c5ec..000000000000
--- a/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-CRATES="
-	bitflags-1.3.2
-	byteorder-1.4.3
-	cfg-if-1.0.0
-	convert_case-0.4.0
-	cssparser-0.27.2
-	cssparser-macros-0.6.0
-	derive_more-0.99.17
-	dtoa-0.4.8
-	dtoa-short-0.3.3
-	futf-0.1.5
-	fxhash-0.2.1
-	getrandom-0.1.16
-	html5ever-0.25.1
-	indoc-1.0.4
-	instant-0.1.12
-	itoa-0.4.8
-	kuchiki-0.8.1
-	lazy_static-1.4.0
-	libc-0.2.121
-	lock_api-0.4.6
-	log-0.4.14
-	mac-0.1.1
-	markup5ever-0.10.1
-	matches-0.1.9
-	new_debug_unreachable-1.0.4
-	nodrop-0.1.14
-	once_cell-1.10.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	phf-0.8.0
-	phf_codegen-0.8.0
-	phf_generator-0.8.0
-	phf_macros-0.8.0
-	phf_shared-0.10.0
-	phf_shared-0.8.0
-	ppv-lite86-0.2.16
-	precomputed-hash-0.1.1
-	proc-macro2-1.0.36
-	proc-macro-hack-0.5.19
-	pyo3-0.16.2
-	pyo3-build-config-0.16.2
-	pyo3-ffi-0.16.2
-	pyo3-macros-0.16.2
-	pyo3-macros-backend-0.16.2
-	quote-1.0.16
-	rand-0.7.3
-	rand_chacha-0.2.2
-	rand_core-0.5.1
-	rand_hc-0.2.0
-	rand_pcg-0.2.1
-	redox_syscall-0.2.11
-	rustc_version-0.4.0
-	scopeguard-1.1.0
-	selectors-0.22.0
-	semver-1.0.6
-	serde-1.0.136
-	servo_arc-0.1.1
-	siphasher-0.3.10
-	smallvec-1.8.0
-	stable_deref_trait-1.2.0
-	string_cache-0.8.3
-	string_cache_codegen-0.5.1
-	syn-1.0.89
-	tendril-0.4.3
-	thin-slice-0.1.1
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	utf-8-0.7.6
-	wasi-0.9.0+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit distutils-r1 cargo
-
-DESCRIPTION="A plugin for setuptools to build Rust Python extensions"
-HOMEPAGE="
-	https://github.com/PyO3/setuptools-rust/
-	https://pypi.org/project/setuptools-rust/
-"
-SRC_URI="
-	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
-	test? ( $(cargo_crate_uris ${CRATES}) )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/rust
-	<dev-python/semantic_version-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.8.2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.3.2[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-python_test() {
-	local examples=(
-		html-py-ever
-		namespace_package
-		rust_with_cffi
-	)
-	for example_dir in ${examples[@]}; do
-		pushd examples/${example_dir} >/dev/null || die
-		einfo "Running ${example_dir} test"
-		esetup.py build --build-lib=build/lib
-
-		case ${example_dir} in
-			html-py-ever)
-				pushd test >/dev/null || die
-				local -x PYTHONPATH=../build/lib
-				${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
-				popd >/dev/null || die
-				;;
-			*)
-				pushd build/lib >/dev/null || die
-				epytest ../../tests
-				popd >/dev/null || die
-				;;
-		esac
-
-		rm -rf build || die
-		popd >/dev/null || die
-	done
-}
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index 8d35ab8eaa48..1bb3e3034c3a 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -10,4 +10,4 @@ DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f
 DIST pyside-setup-opensource-src-5.15.5.tar.xz 3577972 BLAKE2B ee16ce18ec4103add41ad89b658012cb2e8695bda51269d3cd1614c2b6d029c0eaba5e592d5e58b6267e1ddc020a938d3ccd2fbc9461cc5bf202f3bdbf6b5d62 SHA512 61b987ec823e9a89f2a07a1991d47f36eb45e3ce416aa6e0032a58ba3d623ac26224cb0f43a2db76850bce7290d12fae610de06405350362caac7860ba99f0c3
 EBUILD shiboken2-5.15.2-r2.ebuild 6554 BLAKE2B a4d2ba9ae4ff29d9b974b26a5c5c0c7db66790bab3433dab0b84e2c0465b08bd6c8a15df78ef342a8942472978c031cba809625286d619a0e3119e20e17bb27d SHA512 e0287e12b01024290b3b97103244bfcfb1e3385bc4e2d1fa4465894d6afc30dcaad50bd335bee4d26536d48db742c6aa0d924dce59d696721fedae747b09d01c
 EBUILD shiboken2-5.15.5.ebuild 6566 BLAKE2B 7fb8de189deaa50f8d693563f6a5614389be75cc91f85b8a1e17e428dfdbc7ca1dca6aba1e4fc39f9b47ca056630c77545ee21ac315432fa948a29b0777f7fc9 SHA512 f2b6d04fc33adc0e889850a3a02cf8087b61f8f07f783cc82d7acca457427d548ab78ff2c239d3f35bbc7bcf9a46749c605df3f3a67e58c6d767de66db0c7881
-MISC metadata.xml 496 BLAKE2B 060c13ebf383e609b257f50f65484eecaaa1909d3b9242ab2be2b12ec203cdaaf4b5a9402f01b9e511b3744a4d7a562161d86a0d2f9bc90f401ac7ee0cea8ba4 SHA512 7edc53f2bde5d688e8dcac866997ec282cf2f7c1230a064a304c83a7b3c54c2079f99f4c75082dc47f7e9248dc65296ef98e0cda7dea08cbb97e766da48c11d5
+MISC metadata.xml 587 BLAKE2B d4d202f3e8fbc55833fd6247e4ac2d9f0caa0eddc757a829663c25893589904ba2c3a18e8338756c0d760849f41de4d00bdd7118b1cd894d094921c31d209205 SHA512 aeeb5625ff24ea8e4831b47660ca3e6000b7636c083201f9df181f6dba15dcb42ab29325f37158920d0e3cf7e033cf28e830c0507b2ec6d9277c78dc75e90443
diff --git a/dev-python/shiboken2/metadata.xml b/dev-python/shiboken2/metadata.xml
index c0eff1d300a3..3ca17a8495c9 100644
--- a/dev-python/shiboken2/metadata.xml
+++ b/dev-python/shiboken2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
 	<use>
 		<flag name="docstrings">Expose documentation as Python docstrings (recommended)</flag>
 		<flag name="numpy">Implicitly convert passed NumPy arrays to Qt lists</flag>
diff --git a/dev-python/shiboken6/Manifest b/dev-python/shiboken6/Manifest
new file mode 100644
index 000000000000..c27285a73221
--- /dev/null
+++ b/dev-python/shiboken6/Manifest
@@ -0,0 +1,4 @@
+AUX shiboken6-6.3.1-no-strip.patch 1001 BLAKE2B c486f9423d4934c2305e8f3109f017dbebd568573469a2fced8da895fbc61ef07a80e0d1c846e7a57988801d6ec4be05b86b46a8039e6702d667129a899fc137 SHA512 1f3e5b082a978e3ab8d8f4d9a5a0a661b8c063e2ece0221440abe342fbd45d566a384d588dbf00a1e469687f82da3728cd53e35d02077ce6a748d3747de3cec2
+DIST pyside-setup-opensource-src-6.3.1.tar.xz 7685896 BLAKE2B 66eb9ced1899fabea2be1b6471fcaa3eca4c74e989e7eab47dc44db623eb6242a713e1e7c7e2a6daad36994d3766cf7adc79e3601bfc3908a051fdc97b52522f SHA512 81751fa9e2c492ceae42b3cb1f871d3f95f56cc07c382f02574899f3eab8db52453b0b636e63d53e0d2195f1686a01ad2bee20953aa0a8237719ec06d2b6e321
+EBUILD shiboken6-6.3.1.ebuild 6407 BLAKE2B a088e2bc4dffa5478a89825999794663b7f1de1340d83ac007aeab75fd6a9451e96193a2346fbeba0ed8772168d29a004ecd3fee47c304f89136cab90f5e4043 SHA512 eb42098d5eeb0759967736f83c850c54acda28fb760c2604986b2dc46fd48ae3ca33e0c4e1fd079310e00c77a47cbe80321454e90a7bb53a39550241449602c5
+MISC metadata.xml 587 BLAKE2B 7958cb5081df4e7e19ca47ba6a4be479627c314b6ad39adcc50e3e82ff6b87eb1427f9984970c74de945f7fd19dabc0aa9c2dedc719aca85d14ab8bf778292c4 SHA512 7e96f35c56952a691c01e7f7ac0bf0ad443c8b01a52b2a39076295dbd542c7af0a748cbbfe675c124fe7849a215bcaac617d589ddb8be3e358783232421e1abf
diff --git a/dev-python/shiboken6/files/shiboken6-6.3.1-no-strip.patch b/dev-python/shiboken6/files/shiboken6-6.3.1-no-strip.patch
new file mode 100644
index 000000000000..c43f945964d1
--- /dev/null
+++ b/dev-python/shiboken6/files/shiboken6-6.3.1-no-strip.patch
@@ -0,0 +1,26 @@
+diff --git a/libshiboken/CMakeLists.txt b/libshiboken/CMakeLists.txt
+index c65dcdb..f27287f 100644
+--- a/libshiboken/CMakeLists.txt
++++ b/libshiboken/CMakeLists.txt
+@@ -140,8 +140,6 @@ set_target_properties(libshiboken PROPERTIES OUTPUT_NAME "shiboken6${shiboken6_S
+                                              SOVERSION ${libshiboken_SOVERSION}
+                                              DEFINE_SYMBOL BUILD_LIBSHIBOKEN)
+ 
+-qfp_strip_library("libshiboken")
+-
+ install(FILES
+         autodecref.h
+         basewrapper.h
+diff --git a/shibokenmodule/CMakeLists.txt b/shibokenmodule/CMakeLists.txt
+index 2d52766..8defd5d 100644
+--- a/shibokenmodule/CMakeLists.txt
++++ b/shibokenmodule/CMakeLists.txt
+@@ -34,8 +34,6 @@ target_link_libraries(shibokenmodule PUBLIC libshiboken)
+ 
+ create_generator_target(shibokenmodule)
+ 
+-qfp_strip_library("shibokenmodule")
+-
+ install(TARGETS shibokenmodule DESTINATION ${PYTHON_SITE_PACKAGES}/shiboken6)
+ 
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/_config.py.in"
diff --git a/dev-python/shiboken6/metadata.xml b/dev-python/shiboken6/metadata.xml
new file mode 100644
index 000000000000..5885bcbca714
--- /dev/null
+++ b/dev-python/shiboken6/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<use>
+		<flag name="docstrings">Expose documentation as Python docstrings (recommended)</flag>
+		<flag name="numpy">Implicitly convert passed NumPy arrays to Qt lists</flag>
+		<flag name="vulkan">Generate "QSurface::VulkanSurface" bindings</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">shiboken6</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/shiboken6/shiboken6-6.3.1.ebuild b/dev-python/shiboken6/shiboken6-6.3.1.ebuild
new file mode 100644
index 000000000000..b44de045d9ad
--- /dev/null
+++ b/dev-python/shiboken6/shiboken6-6.3.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Split the "/usr/bin/shiboken6" binding generator from the
+# "/usr/lib64/libshiboken6-*.so" family of shared libraries. The former
+# requires everything (including Clang) at runtime; the latter only requires
+# Qt and Python at runtime. Note that "pip" separates these two as well. See:
+# https://doc.qt.io/qtforpython/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
+# Once split, the PySide6 ebuild should be revised to require
+# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime.
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake llvm python-r1 toolchain-funcs
+
+MY_P=pyside-setup-opensource-src-${PV}
+
+DESCRIPTION="Python binding generator for C++ libraries"
+HOMEPAGE="https://wiki.qt.io/PySide6"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}/sources/shiboken6"
+
+# The "sources/shiboken6/libshiboken" directory is triple-licensed under the
+# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
+# with version 1.0 of a Qt-specific exception enabling shiboken6 output to be
+# arbitrarily relicensed. (TODO)
+LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+docstrings numpy test vulkan"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests fail pretty bad and I'm not fixing them right now
+RESTRICT="test"
+
+# Minimal supported version of Qt.
+QT_PV="$(ver_cut 1-2):6"
+
+# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
+RDEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtbase-${QT_PV}
+	sys-devel/clang:=
+	sys-devel/clang-runtime:=
+	docstrings? (
+		>=dev-libs/libxml2-2.6.32
+		>=dev-libs/libxslt-1.1.19
+	)
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	vulkan? ( dev-util/vulkan-headers )
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtbase-${QT_PV}[gui] )
+"
+# testlib is toggled by the gui flag on qtbase
+
+DOCS=( AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-strip.patch"
+)
+
+# Ensure the path returned by get_llvm_prefix() contains clang as well.
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+	# TODO: File upstream issue requesting a sane way to disable NumPy support.
+	if ! use numpy; then
+		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
+			libshiboken/CMakeLists.txt || die
+	fi
+
+	# Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include"
+	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
+	if use vulkan; then
+		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
+			ApiExtractor/clangparser/compilersupport.cpp || die
+	fi
+
+	# Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
+	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
+	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
+	# the largest version specifier that exists under the "/usr/lib/clang/"
+	# subdirectory. This assumption is false in edge cases, including when
+	# users downgrade from newer Clang versions but fail to remove those
+	# versions with "emerge --depclean". See also:
+	#     https://github.com/leycec/raiagent/issues/85
+	#
+	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
+	# eclass are defective, returning nonsensical placeholder strings if the
+	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
+	# PySide6 does *NOT* care whether the end user has done so or not, as
+	# PySide6 unconditionally requires Clang in either case. See also:
+	#     https://bugs.gentoo.org/619490
+	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
+		ApiExtractor/clangparser/compilersupport.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Minimal tests for now, 2 failing with the extended version
+	# FIXME Subscripted generics cannot be used with class and instance checks
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
+	)
+
+	shiboken6_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
+		)
+		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
+		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix)"
+		cmake_src_configure
+	}
+	python_foreach_impl shiboken6_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+src_install() {
+	shiboken6_install() {
+		cmake_src_install
+		python_optimize
+
+		# Uniquify the "shiboken6" executable for the current Python target,
+		# preserving an unversioned "shiboken6" file arbitrarily associated
+		# with the last Python target.
+		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
+
+		# Uniquify the Shiboken6 pkgconfig file for the current Python target,
+		# preserving an unversioned "shiboken6.pc" file arbitrarily associated
+		# with the last Python target. See also:
+		#     https://github.com/leycec/raiagent/issues/73
+		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+	}
+	python_foreach_impl shiboken6_install
+
+	# CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing
+	# downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so"
+	# library and one "shiboken6" executable linked to one Python interpreter.
+	# See also:
+	#     https://bugreports.qt.io/browse/PYSIDE-1053
+	#     https://github.com/leycec/raiagent/issues/74
+	sed -i \
+		-e 's~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
+		-e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
+		"${ED}/usr/$(get_libdir)"/cmake/Shiboken6-${PV}/Shiboken6Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
+
+	# Remove the broken "shiboken_tool.py" script. By inspection, this script
+	# reduces to a noop. Moreover, this script raises the following exception:
+	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
+	rm "${ED}"/usr/bin/shiboken_tool.py || die
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index e8967f55b635..2fbed8b76c5d 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 8b524808611f..4bc41d0de416 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtconcurrent-5.15.5-r1.ebuild 556 BLAKE2B 1b12758155f0bd71248eb105ead3f2da466ebf084940db60b3586c1d2becc435f962c9902b70f0c0deca95d2b2d6a627efb9f4e5b9247768aee5016947d23af7 SHA512 5c0d7c52825585b06f113c694705c777264e2b770235c3a60dfcbea306d9b061ef4c92f19ff28fbc4edf8f9624c9d7dafae6419a2f82c100ccaa4b58f3b5286e
+EBUILD qtconcurrent-5.15.5-r1.ebuild 555 BLAKE2B 6b549e297c587ec56026feb942f7b707e44ed8079cb225918cf1c7d4b060c70794b92bd66732dc75a41aa665350ce661d30c487d369496861186de2c9926a826 SHA512 55f62afd673270c798f810b66d17de6b1c74a08459f88b92c5f8691ea80d667e38edccee1903c40d0a04134f63c2b76c7c100cc646b4c1325fd3a00771c3f170
 EBUILD qtconcurrent-5.15.5.ebuild 482 BLAKE2B f6f93d1439f8b280891d63be609ca31d81dd58e655d109f137b24cea79517771e7b10fc501f24537a4f3617448148658a0074e9b97090bb6dc9a3a38e0eeb126 SHA512 71a36bb5d57392da512b20c8e65a53c99c53e81da6d6b3f582aeffd517614ce4eb6cb74811588c78e74fedb96892c1d6994d363e4075aff63b0ded1ec51cbc64
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.5-r1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.5-r1.ebuild
index 8ab67d6f38c1..7b32aa70d089 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.5-r1.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.5-r1.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 55c33afe5b99..d6ab5c1a8860 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -6,5 +6,5 @@ DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee0
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
 EBUILD qtcore-5.15.5-r1.ebuild 2213 BLAKE2B 071bb5ba9e3351cf11b7efc40b30a7df80c49d9d36520abe53aa88e412c380fba5b0525c330d41fe4bf0ae3ad79ef8f38b5bb29596b9c26013f9a59a1eace9b7 SHA512 53a00e769a6cbb916a184404597c0abe5627cd3fe67f0e6fee9b468163480c4ba1c61e723ad459da58f75cc656b965f3db058704b3e54e9c2c43e69dc160de9d
-EBUILD qtcore-5.15.5-r2.ebuild 2318 BLAKE2B c5c0394431f6af5c6564b23f9a922634766ac2eecdfc8e7528dda0df3926b3b6c3882fa97e39030260423d8d827ac0cda76cc6d3b34a094fc0b64a088fe2f67e SHA512 db807cb14e8e95e69bf0de2304bfa6d365f68d949e054dd70ecf4ec2df38e84e3718a0451cf1b9a98ec0bcf177f0cd4218767f6f8292ad23c508cb9f30992cae
+EBUILD qtcore-5.15.5-r2.ebuild 2317 BLAKE2B e5e64c0f64e4e0b2463f67c4bcb19e00f126f88d4527e1bd9703ffe26ace46a8181f3b8b3d052c1d5ad930077160a61a3046a0829279c6c6644fc5ff59ac5fb9 SHA512 8c852de875ced33d03aaf0d896818dd11525fd1853313267c539f561623e42676bc904e38f4a421c862f44a4d7f33a92d8348c78bad833a3cbb69bc4a6fd7a6e
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
index 47b7c19b3135..8bdc3597ff8b 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
 SLOT=5/${QT5_PV}
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="icu old-kernel systemd"
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 8d8ce982def6..9c8874ae7530 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtdbus-5.15.5-r1.ebuild 718 BLAKE2B d3f9df907a04c72d7b05d0e953d30eff1d4436cf0b020a41012a43417db5af24c221a06f540ff51297f896d194da646d8a8ac1e4be460fe2a564e6afbff0a2ea SHA512 e3b4176a01f5cfbedd164c4ed8564c3d3683711f4df49105d40fd32f63b5c6155c2ee68bd6ffbad78693468c042b0921bfee8bf86b64491e87c5434429fc2826
+EBUILD qtdbus-5.15.5-r1.ebuild 717 BLAKE2B 85dcf206f5d132bdd86e5e9a101c96704ae85a51d7feed4e7205bba006c9920b1dbc19720d5776970a6197619bc79c3da90699b2c007848890047f0fb2b6c7d5 SHA512 8fb29e730e39fb21fe2169ad7f713a1f180487fa71984276a22bafe5b8b102e802d3dc00f629f0cdb2f37a24461e1f7c3eb494ddf025b3304a71e9fc1a02719b
 EBUILD qtdbus-5.15.5.ebuild 717 BLAKE2B 180641b51d75ddeaf646e6b690859dbf7078cda7b0530a06bedeca8169fa604df86933f2fcc2a65ed5a7cc7ee37ca84ed7fec14cddf0501bf018cb4c26438c8d SHA512 8b8b6afe4744513483d865259b86a8c2d634da25c043a3c47e68a5d1485bab43f74356ef1edefb21eeb97db31c4caf01a6b48a69d0907a5dfee184406dbe0863
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtdbus/qtdbus-5.15.5-r1.ebuild b/dev-qt/qtdbus/qtdbus-5.15.5-r1.ebuild
index 0eaf911d18c3..cc0605005f0b 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.5-r1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.5-r1.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index b1bdd777adf9..a6dd9080733c 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtgui-5.15.5-r1.ebuild 3896 BLAKE2B b7815f4f381a0974de04559dbf09fc12708615b38b937a865ec44448ad7dcc3e5d214b18fa84b5b1fe958f465566ac544990fa8d33b9c44cb63170a472f13561 SHA512 f2cb1c4838f1f1216c66fcadaa1334d0974df18af375099c987399cc0fd11bdf123363e981316749cfd445ed0a8e86073012e5f3910218d5a5bfa3b4e44e2c61
+EBUILD qtgui-5.15.5-r1.ebuild 3895 BLAKE2B da9ffc7eab01eec75f006e0a6c9a052da4ff5c1abf722fe0b5d733159d3d33ea8dd47d3a49b9098f257197a4237981ddbd44ceb4ea0c0d362452a0baaa216037 SHA512 ba03b4e57c23a00903f8c3cd5dc51aaa77cb255c78db057dd1fe4a6db78149f474184e0497e2bdae7cfe8a01f09e140ec8de7b256a334da92fe7ee1402766867
 EBUILD qtgui-5.15.5.ebuild 3895 BLAKE2B 44c8de506dfd6172926579f0ddeb182c7b496b8c26880cdb5875622cad8f3079b647c43a32cbf5de8af8843f6ed9655125083e499ee486fd38414cd5ff563b85 SHA512 a461ec66e91256c2bf491e596b31d1a81a899c2ae186309537b5e74a59efd8e6a1a6a3650c403122abbc4b2b997a9ecc8b605a54b0c004ccd40404521f7ca9e7
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.5-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.5-r1.ebuild
index 405d2c8475af..acccf00a464d 100644
--- a/dev-qt/qtgui/qtgui-5.15.5-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.5-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 SLOT=5/${QT5_PV} # bug 707658
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 2428013b5eec..9b7b10756ffa 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -2,5 +2,5 @@ DIST qtimageformats-5.15.5-gentoo-kde-2.tar.xz 2596 BLAKE2B c09bea5234b433d33f63
 DIST qtimageformats-5.15.5-gentoo-kde-3.tar.xz 3268 BLAKE2B 21ada34678a2b999190ac9e642065d654e8bbc30ebe7789d20b97a49f3cae2d5e6893325b0019af695460fec8cb1f25e15b9573752396034a7db8ff6d7e49431 SHA512 fb2324d73db23da1ca13d1e050b9f045f1fd0b09cf722b94dc39eaea457629a643adacac16471841d4204cea7becfae11354674b70a4edf272dddc8863a10b22
 DIST qtimageformats-everywhere-opensource-src-5.15.5.tar.xz 1829872 BLAKE2B 7b240291e6076537daa9bc3b87f13f3285f19a4638de5b5db44a2b55275fbe843dc974226e999cd90e6bf902b43fbcd25f052619f291fa36807830a26c10cd52 SHA512 50a68bbe83fac710f21f05f3c0637beff17de00f9309aab2ceb27cfe7a178a1a56b0906f357584eef3188d7b89504591c924a9d4988a7321fb18a72271bb2dfd
 EBUILD qtimageformats-5.15.5-r1.ebuild 710 BLAKE2B bca14a1badda00a13e852dbe4e70168179a73ebcdf1e7a3799fb0da55fb0b4960460975090bcc46fd4e0e96c64595755cb38eccb0196d9f0c1c61bb70b96c4c0 SHA512 1ed641faed82574aeffec083593138b591d98fef813792695ea22a3fd9fad54488a3cf1efcc6fc52d022b66d153c683a4c4d19c32e5512b83faffd1a2fc73370
-EBUILD qtimageformats-5.15.5-r2.ebuild 711 BLAKE2B 4739b9246b40ffe5ab35048c224b6ae9cd295d0d23ad78cf9c21cbb0cb3375822c4c6a587507ba29e6fe68de1d52fe10eb05088dda8d4239326aeec7e4fd0fb0 SHA512 9938b63eb18bdbd434e063d8783eb76d2e5fd40abd2c04896f6c4dc1a6f98e1eabd8f7165585b86a56f4d9dfdc11913b8e4d257b046118d54c7ef4d457dc0e4b
+EBUILD qtimageformats-5.15.5-r2.ebuild 710 BLAKE2B 8803bd43faa76d2cd2fd1c43667bef5187a88436deaad8bba80f006e7033db38ed7e79f296cdc51705e09e712f0e285cdbc2a20ad1a78c8fae5c5db1f0f72f32 SHA512 877cd68f208a170506e324a0ce9482d9c78f94e01cd4d079a67acd4fea303ff45cfad6ce0df08f34723147133f1bd6591f10217d78993b4ce1445f52a6dbae60
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.5-r2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.5-r2.ebuild
index 406c0e39a190..84357f60f311 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.5-r2.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.5-r2.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 91936152a3f2..905e6ba75b30 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -3,6 +3,6 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtprintsupport-5.15.5-r1.ebuild 912 BLAKE2B 2a286ed746dc05b73871e248479c8526be49b4f213d45b47e76ef0efec379e74b009d714fca19f1f9996aa032a5f2925ab93af0f656474788202e32cfa9a562f SHA512 7de024ef526eb1194bafd7415a28d88d2e5e7bda1671d907b7259dd8f04d1956204641a95fadb2ecf26474df0250d335626ffe8a96637c97f079f6cf4bba851a
+EBUILD qtprintsupport-5.15.5-r1.ebuild 911 BLAKE2B c9936afd6291f08097a122ea72040c7d30ba2d02ad27b753632630972de262ed072f1fd6fd55bb9f20202b57a874b324c1f567bdacd3edca9f5dc86cbb3a8827 SHA512 ae34a2eddb3e4ca13d5d148a61b2efc60ad76e612186c98220f604295e86baf1507eac66f34cfed4afea33b07f0f2fea2d7a73c386e60f4b8622f4f224952cc2
 EBUILD qtprintsupport-5.15.5.ebuild 833 BLAKE2B f83d54fd48a8828d6bd34815915042ef61b5070fd754582efe8fe71a3c86f6753624743c6c526e1bb61ebce8d75cac812e3691f42d33c9b99ad748d6658fce3a SHA512 ce6bec40b14228bf13ef9e6c2793cbe7f8022287d1f911dc60f5609e46093df1b0ae711a8202b6fb541ec3cc6d2172288d1ad56a7b966ffbbc61ed3c1b4b3cb7
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild
index ac0003fc97a9..ba51dab18bfb 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.5-r1.ebuild
@@ -11,7 +11,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="cups gles2-only"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 91068b393865..cba3eea0dcf1 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -2,7 +2,7 @@ DIST qtsvg-5.15.5-gentoo-kde-1.tar.xz 6796 BLAKE2B 03e80a083fef2b595d11e53cdf638
 DIST qtsvg-5.15.5-gentoo-kde-2.tar.xz 7428 BLAKE2B 8a061086a08f6f8a493685989c62d6360f55bc62e759b00ab2b501e7128b7ddf3c510df25cc8121a3abd47b4040bf9024ac44c9a8288ab8590ce2b80e8e20e59 SHA512 5b537d58886444e58089284473a9fac504edc6e2ac6b34102e6ac23965d0488b05294b185783ff1d3ae65dd3e519ff39213f8215fb34cf7a13b982850879de67
 DIST qtsvg-everywhere-opensource-src-5.15.5.tar.xz 1888600 BLAKE2B 3bf675d3ac14f64c9afd096342ef4fb574c6b9d93f52b6cba3a5184b8f0f54204c90a133193685a4838236eecb72e5329eb2254c80948fa55a6a103d52256b0f SHA512 7938a84abca282f263f7840425863379ed9e0f9854ecfe38e5d1edacdaf39b2516e9e9b8b5dbcf52113785d8c4123ebea550f441abc000d01c07a20a6a742ac4
 DIST qtsvg-everywhere-src-6.3.1.tar.xz 1727104 BLAKE2B be22d9083366faa0e5fe1a3e7bd37e5f439ae1bc3c2aea18ac9987d208d85a47384b71b989dd4a9e0118b740b0723815d959c1f46abbf60dbcc8814a8aea20d1 SHA512 c040e96d2dc7ef615859dec589e0b0c4e5972c3761dcf9208086b0662bfa1c3d147a10534d62d86fd8c9786a1567f8e9ca196f942a372422fc81cd02f1312c4c
-EBUILD qtsvg-5.15.5-r1.ebuild 509 BLAKE2B c013b106239bcd37dfebdbf74ec961d6b71b36dbbc261be494287493a1db1964e476ab002bb6f485c754907a9746e4163d8d58ab1509c2c3d45e0f910a431d21 SHA512 cf3fb05e95095ef443ded94968261d519ffc25a2c1f5bb4c46b54d5709d560f9ad04dffa899ef6d956b998e0e858fcd114dbc4e2620588755190fab374743953
+EBUILD qtsvg-5.15.5-r1.ebuild 508 BLAKE2B bc828266addc115a41fcbbf919d500f719e3c96ad68834441ef032f6f010627077af71057890f3ce30608ce4b968b6c32cfb562e9d44686918c4406a3ced402b SHA512 56068fb240741a5eb7783de6a5c57dd3a7760b9ea3c390bc688adaa9372a3fa0a7bbc02da19787bba37a8e723263d97db38d31d93e5fd8b4e99606984b2e2fb8
 EBUILD qtsvg-5.15.5.ebuild 508 BLAKE2B b8ff9b538c8348a5b25c09fe4063962c40cf6262274cbcbeaf5a27227556083e49ff6b134afabf968648ad85dffa0b31fbe1b109dd23e314b0c89354f31a514e SHA512 f6fb04786de78cc499fe09ce6fc28b088fafcae699736d8ba7ae47156ea2c4aafebbedafd027844961b4e721ab87cb59c4ef3ee3e1e2426de09615da601bbf73
 EBUILD qtsvg-6.3.1.ebuild 342 BLAKE2B 09c0c3a8014981af4f44da56fc0b5f0d79924f21ae7188f32c59905e0561e071bc403945aaa88d37317ead2d788bfb9a2b58c46dae88f56fe0c2f3f0802b5207 SHA512 432c136765f20e6f2f418e5cb851d2d77fac85d20dda139f59dc088b552f7b89e7d518d506b17ea2094e084445ebf7b27b2a4eed4243d0ce308e3787f90333f9
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsvg/qtsvg-5.15.5-r1.ebuild b/dev-qt/qtsvg/qtsvg-5.15.5-r1.ebuild
index 2fa801079de8..7c72671783dc 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.5-r1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.5-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 6812b5b27027..89e706a7f5b8 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -4,7 +4,7 @@ DIST qtwayland-5.15.5-gentoo-kde-1.tar.xz 32076 BLAKE2B e42d847deaef08271eb2f321
 DIST qtwayland-5.15.5-gentoo-kde-2.tar.xz 35492 BLAKE2B 91334609155e4bd227d76e5972422b400ab4b6196389a1b6b4c271994287851bc3b624ae761ece1418037735784edf7740ed5337ef6972bf708c598c202b7e86 SHA512 2663b59c7647e8a7d5f64905be114fc1b248cd8e10c2eba6bddc25b74fbbc5216e8264f41f50b6368819664921e27dfe96d4c1556c0e56f8c3c2c0ed75a72080
 DIST qtwayland-everywhere-opensource-src-5.15.5.tar.xz 567384 BLAKE2B 01ce4d546bda7bf332f8cc4f86a5e8bfb1be0ef60336ee3cae58266a25d51cf00fef3e6c4204f0179abc2ef748f88bd3a20f89f36da74d5d15c70ae7b4975186 SHA512 828dceb7bc54ce610a73f110f0aca332a90cf95df4a3bc971bd21c4e878366cb8d2248e609b73ce4d381579a143843c87a62f23dcc95767e522874e53a1b0327
 DIST qtwayland-everywhere-src-6.3.1.tar.xz 835896 BLAKE2B 97dce7d120769d1d68c6b15f8154e7aefc95d44d011a3ab86565868e2b81ee38780ce0931ba02973b878eed24781c6098ae688294c4bd30fb265d6815a215a36 SHA512 571654a6abcd865717d4624c65d78e1b911829bba84f609521f349bf896b9475a8ce7759ba6b69e4bc4eef10c31e404c71610816dbee20d1202401efefa2323d
-EBUILD qtwayland-5.15.5-r1.ebuild 1148 BLAKE2B 7578a336c5dc4603729e81eedae39edc0073a9f261d712dccd13a7fb32a69d5aed2dd594f9482f141ca2a4ee99a116c6d8ee334ba3ca8ef4a49795f9e8da6d2c SHA512 01befbe2989cdf04d00dfd38ddc9036f2027e7107a5cdf060783b2b3027a37f1cc6e2446789e282c5c6e7948b1e388e29a9d3aa0aef26c12fed1016fadb17e85
+EBUILD qtwayland-5.15.5-r1.ebuild 1147 BLAKE2B 40a68a2ed720af062d9054c26c705bad4c3fb703105e0236812572a83685b725b947e1da5ca4800c9ae537a78a2576ace427444c9e0c2cbd769ed2087f15420f SHA512 594b97d65fb32ce928f759017dfa1ffc528928bc2633767c90e45879e24d41f653bd40a4de9716bf58a823ee6b49e44433b8c264aa28e1c31ace8639f7849e0e
 EBUILD qtwayland-5.15.5.ebuild 1147 BLAKE2B cb388d4b724850c2ac83f161f5546d12f9bebf2193c73f3252abe1afb9de5ee8d277b84dd539a159191c50e011c42bf643a76a0ccd2950b815edef36f1f45245 SHA512 55e53e006bb1d8f138e7c9ffe40eda9b670a0d82f22b64d6867db3285ea84846c205df1a3c3516c1636cfa20a825338ce16aa1c1cce753e93730ade702f32f80
 EBUILD qtwayland-6.3.1.ebuild 438 BLAKE2B ecb43b4035f97bde672b22faf6a1aa7a5fd0860db6bf871b4055c97b1c199840e2ba84b6720a69a3a2ff5bc8222abaead3a6ba53c282e83b1c3c114cd075115a SHA512 c9512430e1085f3e60a4fcab21036ac8aa393eb442ec2ebcc7f4161958316a9131bddbdb422fb2018f190ec99d5d51d2ba02a28503c220cc5e2c16e904445190
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild
index 5fea5061f37b..2b57823d0405 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.5-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wayland platform plugin for Qt"
 SLOT=5/${QT5_PV} # bug 815646
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="vulkan X"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 62202057c4d1..741bfda64f58 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtwidgets-5.15.5-r1.ebuild 1203 BLAKE2B 44173483ea1713c7c23fd3eafd8f3190860254315bb3996a11b673bb4c19701b04dbe212d331668075a8fe4f4814d4b15bead52c0909704d953e6853a27eb113 SHA512 9fafd9a6e0c0d0c2562ec48ee4898ef45cc55e8416ba1ead8a5a704ec59d88e6d12dbab685b277efad0384d042730cd785d33f80f2c867488821be18b087257a
+EBUILD qtwidgets-5.15.5-r1.ebuild 1202 BLAKE2B be5255b50d5381c5b8aaaf99714f2e9323a0a4ac544b50cd3cfbcc9c7e91a91899070d1015172e638278484e591b201aeb749707f4151b889c416713a0b4fac4 SHA512 5eca43a918613a7afb15bf8906328e3b0b5a1677414bc806ded798e6f3066d91295cdfa2cf5089e3bab60e64cd7b009e56692275664ad0bacb144edc3f714a27
 EBUILD qtwidgets-5.15.5.ebuild 1202 BLAKE2B 4b07340a89e1d70785fac371c793e17af1276e173d6f0b548bf36ff75effe09e92ebf419f56ae9672d7acf60e41fd126ac452e6273ed52e38cefd7b82267209d SHA512 e9a199986ca80b3ff20d8f9ae54d71c77725ea055f4b69bb17fd266b4aacb68a592d721987423c758b8d2f6784f7cfd0b33a72607341a5a7fb54a0433f6d1f56
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.5-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.5-r1.ebuild
index 72d042b82638..9d46a832a7e0 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.5-r1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.5-r1.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d78e92940506..22ffde4f788e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index b63540105fa5..ca67ba8f8df4 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,17 +1,8 @@
-AUX android-tools-31.0.3_p1-gcc12.patch 407 BLAKE2B 70ff27ea4d5a443c85c757b8236fca54a0f35871f22f1bbc63547dfce808a1b6a4e0a40f978bbac4531c7d00eb489b95fb44b0004aeba83430601fa9a635596c SHA512 b7982d93fc51607deccc7e964e665607eba5133fa9dbf55fc57b72dc2e4d6c59b8ffa50e039d26b6370ccf0c45eb1940ca1c3484ca8d0ef4ddddec625bb184a6
-AUX make-tarballs.sh 3176 BLAKE2B 7438c5dc63c355f1789309b5e825373396788808223f64718da227066a3b870fdb0fdcc827d0dbefd56d8d72fa6740a8b8c64e75b58dcda1a79eddebb064f001 SHA512 aebcc6e6c336932b4c9770ff21bb2ee3beff6947a04e88904b6ac1d1475c0c1e0eb5ccd774d9cc07aef6a9f849bd8dcf5b344012cec9c9b595d1aff916fc30c3
-DIST android-tools-31.0.0p1.tar.xz 25135336 BLAKE2B abef4fa611541370d6c745c3f6df8f0326074ef23d4e656ab19443484b5459531fab0544936177397dece12b79ff37189003e818e49bfc4bb3d47e98955b917f SHA512 40bded59614a6d0543e5011038b7f1c6abcb64f0daa71a13175ecb75fe42cb9985ed3a6301d73ee8d4ea20e2c98e3ed8130824ee74dcebe75bc0d7f3052c9d3b
 DIST android-tools-31.0.3-disable-werror-boringssl.patch 1815 BLAKE2B 63e911ba27e2995a11b27e2e1501c5e881d694c5477a216cb910bf1c9c1bf9f9fedffa864748ea4df668a1008124501f7815997304bc355e4ee105bf9b61f75f SHA512 db626d3680ec9f18be394bb2720c8bc7e380aac227ae6f1058476edb83784343f653afc583b06e7a2acd3f2ff500fa37d613d5efca4a9a24daedbf61b5b84015
 DIST android-tools-31.0.3-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
 DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
 DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357
-DIST android-tools-31.0.3_p1-install-e2fsdroid-ext2simg.patch 2075 BLAKE2B f30c99f2b60acac239f6c604d1cfe36ca49a74884f54fce85dba3bf9aae0f73abc5c8ba6b5232772e73aefe75813170c3427cf769e3f0f5e1b962b4ec606d4e4 SHA512 2f706384e1709fc6cc7b5e9183051fb15aaf9d188d23c072d449052ed2297d0e47222e53aaee3709e8bdc3e1b88481307b4b0c0e904bafe444f3fc0c3ad3e0e7
-DIST android-tools-31.0.3p1.tar.xz 25760004 BLAKE2B 1ae58daed61b82180a5a40efa6a67b64b2ce12f4397442663700a4b970f3493576e468dcf8a4c0351c6d7d8c13def1fb0621f9c680d1c41461cbf458e862ccec SHA512 a811eb1d7682b8807f7c110beb83ff234e65fe0f20127466dbd173ea13e68260def8891b4598d5776489af9ff8aeb9f0a19086f49b6df27f68ba63096688afa1
-DIST android-tools-dont-install-license.patch 1016 BLAKE2B da65a414d046995358e91a0ca037951bc9c5a3e790b3b2151716b234c2943301ecef4ed248914235736ddd949f772311bf823e9b3b3f1980b7a5c4b72e5bcd47 SHA512 747728723941091caa17c66e68e88d2145a2ff037e6f5724f89f680d2ce6f4031efebcda7dbcc5b459ca4f5f9ddbf4ba04b0451b9939d19eaf2fa9d9ab727284
-DIST android-tools-fix-gcc11.patch 137252 BLAKE2B 0e80aab92cb69e3223f81834d53c1d84aef866787261305fd539cb8cb75a21361c65f091b2f7d83f6f8236816f43510f4f0f8b51dee4b03d99af31c78dc53a79 SHA512 fb4d8d13f9022f0472c81fe6b9252000d93ba5f77b84d7ac7d6846753078b6fdac0687fcb7157e445bba02cbf008ea3744d84e8fc5d534ee3807f61674e3238c
-DIST android-tools-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9
-DIST android-tools-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423
-EBUILD android-tools-31.0.0_p1.ebuild 3403 BLAKE2B 494f2436c3c883bdc56c3a7dcca03c8e970f30f9eda1d5097985e547a515b8ede94405a483b8869d6b850163b170ca24f63a7526f8146d509bb0cd01e2120d05 SHA512 9b74696df9597428739015aa67163ba1ede670c3821a331ba540104eeb998b4e93592377a3207df25585ab456be91a049ac9b30ad2e592b1581068dab2e157d7
+DIST android-tools-31.0.3p2.tar.xz 22458776 BLAKE2B a51f839ac44e6e998092d802eb182566f4dc2a7f47a5687e0c877fa4fa6d419b16054f75066a6afe8e458e44f8bc5750ca88a2517619379d1044202d64b2ec80 SHA512 367a502c11a136ff15a060df44df14ceec46eb5eb386babb4d38783622e363421d2ec9a65a5810fb8f2b308912c2bdb980e6fce24ba532a111e413647efe67d5
 EBUILD android-tools-31.0.3.ebuild 2207 BLAKE2B 075ba2bcbf2f30b9c3804be39c3b67397634e69baf1572096f32a3f0d927fd35526246ef2e4590dddf92f71350bc172bf58c1e70107cfbde015588ada9f90509 SHA512 57d1e597562ab7688f5715635b6c4f86e7dd5b8b00fc120793fd7a047924f647f9f4725e86b93afb0648c8c8c086cca5a7eeea56a90a2636d23fcf571daccde7
-EBUILD android-tools-31.0.3_p1.ebuild 2647 BLAKE2B cc6d451bf00dc7cc591e7f66cf8336223bf5cf025005e5e60ec90229da675a1abfc930b1bf3cb3e77952c6d790517c60c2bb641ba72b0dab069657c310b3c820 SHA512 18010fc4c8f58bf363072564780aefa2d8f815bd6fe9e8e2d535a96bb40c05aa22b7de2fae04775599d5ed79d438baf09a55ccd2cd35250b774f1c27e358d8e4
+EBUILD android-tools-31.0.3_p2.ebuild 2159 BLAKE2B 9a43702e1d3a68e6a25486b0fbace35f6245f281088ffd8264d5120ae6e15aa28c6c0f5399b195cfd9de9dc8897e703f0ea1fac3691cd0f510ad9b77386c5f41 SHA512 063cb128d8e574da265e8907ca36706dee74dad37d314bb9f2f9f2c6ad0c36aaec0acbb5cbe17428be9d66b68c779298cb0a1c4de807b04840b2038a12263b1f
 MISC metadata.xml 724 BLAKE2B 7ef6e07d806dff51946236dfee2f5eaf207fd7c9cde6e73cb7f372fea5cd8b2b559e4f1fe81a315c41beed5beba92603cc93a16183d63953fbed4ba0d2941116 SHA512 d47cf87259ad2b2a8d6f8edf6b2c2084d0046773447ed9647cc232437ec8f3e8c452cb26ac7e0a619b220e073518903b77c55ba7c2e9f7663069fea2e7096e75
diff --git a/dev-util/android-tools/android-tools-31.0.0_p1.ebuild b/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
deleted file mode 100644
index b322fd0f0ba5..000000000000
--- a/dev-util/android-tools/android-tools-31.0.0_p1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-r1
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
-
-MY_PV="${PV//_/}"
-SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
-	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-no-gtest.patch -> ${PN}-no-gtest.patch
-	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-fix-gcc11.patch -> ${PN}-fix-gcc11.patch
-	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-dont-install-license.patch -> ${PN}-dont-install-license.patch
-	https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-install-e2fsdroid-ext2simg.patch -> ${PN}-install-e2fsdroid-ext2simg.patch
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# dev-libs/libpcre only required for e2fsdroid
-DEPEND="
-	app-arch/brotli:=
-	app-arch/lz4:=
-	app-arch/zstd:=
-	dev-libs/libpcre2:=
-	>=dev-libs/protobuf-3.0.0:=
-	sys-libs/zlib:=
-	virtual/libusb:1=
-"
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
-	dev-lang/go
-"
-
-DOCS=()
-
-src_prepare() {
-	eapply "${DISTDIR}/${PN}-no-gtest.patch"
-	cd "${S}/vendor/core" || die
-	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}/vendor/libziparchive" || die
-	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
-	cd "${S}"
-	eapply "${DISTDIR}/${PN}-fix-gcc11.patch"
-	cd "${S}/vendor/boringssl" || die
-	eapply "${S}/patches/boringssl/0001-Fix-mismatch-between-header-and-implementation-of-bn_sqr_comba8.patch"
-	eapply "${S}/patches/boringssl/0002-Use-an-unsized-helper-for-truncated-SHA-512-variants.patch"
-	eapply "${S}/patches/boringssl/0003-Fix-unnecessarily-direction-specific-tests-in-cipher_tests.txt.patch"
-	eapply "${S}/patches/boringssl/0004-Test-empty-EVP_CIPHER-inputs-and-fix-exact-memcpy-overlap.patch"
-	eapply "${S}/patches/boringssl/0005-Make-words-in-crypto-fipsmodule-modes-actually-words.patch"
-	eapply "${S}/patches/boringssl/0006-Move-load-store-helpers-to-crypto-internal.h.patch"
-	eapply "${S}/patches/boringssl/0007-Fold-ripemd-internal.h-into-ripemd.c.patch"
-	eapply "${S}/patches/boringssl/0008-Pull-HASH_TRANSFORM-out-of-md32_common.h.patch"
-	eapply "${S}/patches/boringssl/0009-Make-md32_common.h-single-included-and-use-an-unsized-helper-for-SHA-256.patch"
-	eapply "${S}/patches/boringssl/0010-Fix-array-parametes-warnings.patch"
-	cd "${S}"
-	eapply "${DISTDIR}/${PN}-dont-install-license.patch"
-	eapply "${DISTDIR}/${PN}-install-e2fsdroid-ext2simg.patch"
-	rm -r patches || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Statically link the bundled boringssl
-		-DBUILD_SHARED_LIBS=OFF
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	export GOCACHE="${T}/go-build"
-	export GOFLAGS="-mod=vendor"
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
-	docinto adb
-	dodoc vendor/adb/*.{txt,TXT}
-	docinto fastboot
-	dodoc vendor/core/fastboot/README.md
-}
diff --git a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild b/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
index 0f1abac32b14..0b65a7221081 100644
--- a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
+++ b/dev-util/android-tools/android-tools-31.0.3_p2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{7..11} )
 
 inherit cmake python-r1
 
@@ -13,8 +13,6 @@ HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/
 MY_PV="${PV//_/}"
 SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
 	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
-	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-disable-werror-boringssl.patch
-	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch
 "
 S="${WORKDIR}/${PN}-${MY_PV}"
 
@@ -51,13 +49,6 @@ src_prepare() {
 	cd "${S}/vendor/libziparchive" || die
 	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
 	cd "${S}"
-	eapply "${DISTDIR}/${PN}-31.0.3-disable-werror-boringssl.patch"
-	cd "${S}/vendor/boringssl" || die
-	eapply "${S}/patches/boringssl/0011-Disable-Werror.patch"
-	cd "${S}/vendor/adb" || die
-	eapply "${FILESDIR}/${PN}-31.0.3_p1-gcc12.patch"
-	cd "${S}"
-	eapply "${DISTDIR}/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch"
 	rm -r patches || die
 	cmake_src_prepare
 }
diff --git a/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch b/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch
deleted file mode 100644
index aa313daf9042..000000000000
--- a/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From 752fc3bd9a971858dbb7b51a0ef0289232e67e58 Mon Sep 17 00:00:00 2001
-From: Mike Lothian <mike@fireburn.co.uk>
-Date: Sat, 14 May 2022 02:01:18 +0100
-Subject: [PATCH] Add functional include
-
---- a/tls/include/adb/tls/tls_connection.h
-+++ b/tls/include/adb/tls/tls_connection.h
-@@ -19,6 +19,7 @@
- #include <stddef.h>
- #include <stdint.h>
- 
-+#include <functional>
- #include <string_view>
- #include <vector>
- 
diff --git a/dev-util/android-tools/files/make-tarballs.sh b/dev-util/android-tools/files/make-tarballs.sh
deleted file mode 100755
index 5a0a775c1290..000000000000
--- a/dev-util/android-tools/files/make-tarballs.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Create the various tarballs we need.  GoB does not provide stable archives (unlike github),
-# and some repos are uselessly fat, so we have to create things by hand.  Fun times.
-
-set -e
-
-die() {
-	echo "error: $*" >&2
-	exit 1
-}
-
-fetch_boringssl() {
-	local ver=$1 tag=$2
-	local content hash
-
-	echo "checking boringssl in ${tag}"
-	content=$(wget -nv "https://android.googlesource.com/platform/external/boringssl/+/${tag}/BORINGSSL_REVISION?format=TEXT" -O -)
-	hash=$(echo "${content}" | base64 -d)
-	echo "using boringssl ${hash}"
-
-	local tar="${DISTDIR}/boringssl-${hash}.tar.gz"
-	if [[ ! -e ${tar} ]] ; then
-		# We use github as it provides stable tarballs.  GoB does not (includes timestamps).
-		# https://boringssl.googlesource.com/boringssl/+archive/${hash}.tar.gz
-		wget -c "https://github.com/google/boringssl/archive/${hash}.tar.gz" -O "${tar}"
-	fi
-
-	du -h "${tar}"
-}
-
-# The extras repo has ballooned to ~200MB, so we have to strip the large useless
-# files and random binaries.
-fetch_extras() {
-	local ver=$1 tag=$2
-	local tar="${DISTDIR}/android-tools-${ver}-extras.tar.xz"
-
-	if [[ ! -e ${tar} ]] ; then
-		local prune=(
-			ioshark
-			memory_replay
-			perfprofd
-			simpleperf
-		)
-		local dir="${tag}-extras"
-		rm -rf "${dir}"
-		mkdir "${dir}"
-		cd "${dir}"
-
-		wget "https://android.googlesource.com/platform/system/extras/+archive/${tag}.tar.gz" -O extras.tar.gz
-		tar xf extras.tar.gz
-		rm -rf "${prune[@]}" extras.tar.gz
-
-		cd ..
-		tar cf - "${dir}" | xz -9 > "${dir}.tar.xz"
-		rm -rf "${dir}"
-
-		mv "${dir}.tar.xz" "${tar}"
-	fi
-
-	du -h "${tar}"
-}
-
-# Since the GoB archive is unstable, we might as well rewrite it into xz to shrink.
-fetch_selinux() {
-	local ver=$1 tag=$2
-	local tar="${DISTDIR}/android-tools-${ver}-selinux.tar.xz"
-
-	if [[ ! -e ${tar} ]] ; then
-		wget "https://android.googlesource.com/platform/external/selinux/+archive/${tag}.tar.gz" -O - | zcat | xz > "${tar}"
-	fi
-
-	du -h "${tar}"
-}
-
-# Since the GoB archive is unstable, we might as well rewrite it into xz to shrink.
-fetch_f2fs() {
-	local ver=$1 tag=$2
-	local tar="${DISTDIR}/android-tools-${ver}-f2fs-tools.tar.xz"
-
-	if [[ ! -e ${tar} ]] ; then
-		wget "https://android.googlesource.com/platform/external/f2fs-tools/+archive/${tag}.tar.gz" -O - | zcat | xz > "${tar}"
-	fi
-
-	du -h "${tar}"
-}
-
-usage() {
-	local status=$1
-
-	[[ ${status} -eq 1 ]] && exec 1>&2
-
-	cat <<-EOF
-	Usage: $0 <android version>
-
-	To find the next available version, consult:
-	https://git.archlinux.org/svntogit/community.git/log/trunk?h=packages/android-tools
-
-	They have some helper scripts for building the files directly.
-
-	Example:
-	$0 android-8.1.0_r1
-	EOF
-
-	exit ${status}
-}
-
-main() {
-	[[ $# -ne 1 ]] && usage 1
-	[[ $1 == "-h" || $1 == "--help" ]] && usage 0
-
-	if [[ -z ${DISTDIR} ]] ; then
-		eval $(portageq -v envvar DISTDIR)
-	fi
-	if [[ -z ${DISTDIR} ]] ; then
-		die "Please set \$DISTDIR first"
-	fi
-
-	local ver="${1#android-}"
-	local tag="android-${ver}"
-	fetch_boringssl "${ver}" "${tag}"
-	fetch_extras "${ver}" "${tag}"
-	fetch_selinux "${ver}" "${tag}"
-	fetch_f2fs "${ver}" "${tag}"
-}
-main "$@"
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 4a7948103ddb..d63b51fcc208 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -25,7 +25,7 @@ DIST cmake-3.24.0-SHA-256.txt.asc 833 BLAKE2B 828f1130930635ad78b6829d8cb1780d9f
 DIST cmake-3.24.0-docs.tar.xz 490472 BLAKE2B f7dcbee55473add99406d8956657098f78e49eb30df96d73dfc8affc2ee4aca19159956189511e1cea821974e4741fd7b1c5d28f6e8f9cc31ace80c6c504b27d SHA512 dc69388e8ab20eae3c447e95f7d1b0c153a537ae81d18ac4dc4117a7df5348a2a9f35ce8c6c18c3fabe34f7d9ce3dc3f90f2323789c65c089679abe9e359f1f6
 DIST cmake-3.24.0.tar.gz 10395167 BLAKE2B 72b75e3fa4ae1710f5e5d1ac4e356a723ec1b197c9121cd73273f079f7eb31e61fbd5acab228e9b5696c4f8ab85213da4a6cf8e35068f3ca776082742084ae6d SHA512 91507fc0643f2de20e37cd8d6a539d8cb38a80b604bf77de8e88c8446b6d7b6d02b7329d58966dc2412c6c75edcb9dfbdae02fe84965fefeb7ca47f87631fe17
 EBUILD cmake-3.22.2.ebuild 7052 BLAKE2B b0c8b15546a0216be79e66918de373cf6eb45eb080fb2871aa543f7518f71876bc79df21e894cfdfbe921718bf30d2915c9242a03cbcc4f19b955a2f2b9d8d85 SHA512 d2627f09f761e83363ef1a0a960dc4660d71160a47329f141cca9c9d0404d784719b258123db1716aec885d091f55206cc85f732b4235f0d19bee4e4e5c28d33
-EBUILD cmake-3.22.4.ebuild 6820 BLAKE2B 4e924937ebf2892082c9f8ac216a47376a6aad3a72872dcb8698bcd558acbc0f28e9cbb2a8653543db8fd8c75795c335835c77239e5139e66f8c196df20e4998 SHA512 b9cf3defba50e16668e2c9d04e67d2d8e7f287a68805ff0388cee0c497d592d5d6a76a7653d3a09133224b89a5b670faf54cacdb203c37d1bc567818cb4beb4c
+EBUILD cmake-3.22.4.ebuild 6819 BLAKE2B 80a67b691859734df593dc01add20acedfc991b0beba716690258fde46d9d3477a578bbe18eaae87744024093f1e9dc214cbc032e1a5c29ee980517ba668e00e SHA512 0b92fe74c7b0f62db3b107c9a1e5ae750e1f9fa013ae34e874564470a01148df750da7bcff0bfb465c094d547e926cb3bc27633837e23de24a07fba2a3bbb409
 EBUILD cmake-3.22.6.ebuild 6827 BLAKE2B c219b7191f3562325b33d75c3958cdf291ada8a892212e6b132ecd43fb77437465462dd4a6adc3958faff0b01a5ead7c0edf6011a0f232cc37d69045d8b6f60a SHA512 d3e5f98312456305149800f784362c37f69b1d50ff09088b474edd450046def404d6fedc02220674caf78bfc118fc5c710c9e85a98d5e13ef81801183fccba8d
 EBUILD cmake-3.23.1.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5
 EBUILD cmake-3.23.2.ebuild 7794 BLAKE2B e891b0a6ca8cf3335a46178040a6d28534277ad9c5ba830ce30d37e59afe92bc147e4bc2fac1a49b9674e7f3fc3bc936453a831a34ccb5e4546fb96ba63de857 SHA512 2fba10f3ba197d9ad36a503c7fad84916716399320b5bfeabf439cab06cfbe0640479a9bd85a5ab3ac341c5a53d74bfa7ef2ea967198073e0cd215e8fff93fc5
diff --git a/dev-util/cmake/cmake-3.22.4.ebuild b/dev-util/cmake/cmake-3.22.4.ebuild
index 4e54ecccc8b4..5582ddffae66 100644
--- a/dev-util/cmake/cmake-3.22.4.ebuild
+++ b/dev-util/cmake/cmake-3.22.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-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"
+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="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 77edd9f2b49b..b13fb5d7c6fd 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 431a1604dd2d..ffa34176531c 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -4,6 +4,7 @@ AUX git-2.31.0_rc0-optional-cvs.patch 14184 BLAKE2B 6f4d56487fda1e9b9f20a77b0c6b
 AUX git-2.32.0-r1-test-t5582.patch 754 BLAKE2B 6bd9fc93cea8f565ef7b5bd7d45770c5bdfae297b596a8a34451677c06cff24ddaa5b8a6f632849b3816e07d070efb6fdc0e9629ff98671fcbcba7897bca5430 SHA512 fb6a41d51bdbad862426cf5bbb70c08c722da807a462dfb0f2b069fc10801b53478bbcd8253b3ca3631737b448b3eeecffd1b523df3fabfe9ddf08db2a1a187b
 AUX git-2.33.0_rc0-optional-cvs.patch 14216 BLAKE2B a4179e0269917dd75b3e5b63fc70e931e42da3e6e170b5950efc20df89ac90eba1a18793eaa431150c8d8acb3fe1e3967a90075e9c940eae22f8b9a4fe158723 SHA512 ffdce5cca99b9c3196855316799470431e1ab064b7a8c739e7fc5b38029fd2bbceb415533d4b0000278eba3252f89e1fb2cdb52ae140668701d28bb88c07541b
 AUX git-2.37.0_rc1-optional-cvs.patch 14373 BLAKE2B b835715468cff979fdefcc42aeb7a48986c4ebba95f3e7ab033bc1b9c29eee9ded0b47a2c6d6831d4ece0662dd244f41a670d0805e1a5c8bd8c25531fcfb3493 SHA512 3c076c2865e930cfe2f0c9d01fb8e272037aeed99b46063e88942b89b1191e8149fd87ecbcbdb2d23ea37d556a971434938d7f4e4e2eef0e26e1b250534cc0e2
+AUX git-2.37.2-unsafe-directory.patch 367 BLAKE2B 433c4b39777d1f24fbebb0b08dc09672c059c01bbd8930b3a235d66d2990dcc5e3f17e758ff7860ce3d37d778db1a8792fd847ad110fef730095e52430fb0c19 SHA512 f23b0c29977e33596daa4eab60fcc1f64522dac93f6baa39aea9c627740363073176aabf29fe680a9802be34d9c3948713e17ce798000895cec787ccb40f56a7
 AUX git-2.7.0-mediawiki-500pages.patch 1317 BLAKE2B fa90ac6f90b7b5b948dc1f9b8f300419df7b2b957aad9c15121f0b8df873d854cd74def68cd80788f085635cbbef65502b40e3eea2b3d8fb35fb02b4a4a1afa5 SHA512 efe580f288c6fdb6d55b742a3e4335ac32ed96cb12c10b959a5f283e505ab0aeed039d0d19d9dbf148a07ac6c7aec075ecea0c0be68456fdbe23dcad77ca01be
 AUX git-2.7.0-mediawiki-namespaces.patch 3188 BLAKE2B a5949c317f01244d7344bd0f5088e4bf77f723bf32734b85aa7d0abad274999733b7b33568aab5009b07fccc0f3f16ede633965fe351eb552d018a7eadfd9e83 SHA512 f1597fcb8e771917561d92bf428825e28477ed792be7494e34754434c73422dc52fdf99d981656b291f7eb91a199abe54038ae87e9b5229c9a382a4ea88e9d4f
 AUX git-2.7.0-mediawiki-subpages.patch 2091 BLAKE2B 01c6735edd80c3f264b8fe41edd5acb9fb375f0cd439ea4719932d0f0ebb8e00e3acea8e4de465bd75d35cce096dc720e3b4edabd13e80d1374af9806158e40f SHA512 e294c0d4588499961632bcc6ea20474984c4bcc7a804ff3cd9d12584cecad3c36f5772c21cf7a884b517370eb7d87542f7bdc3b2c5482c18dbc623abe5e7c73e
@@ -23,6 +24,7 @@ DIST git-2.36.0.tar.xz 7003024 BLAKE2B 72bb148fc5fded2976554788eaf599d20fe9f200a
 DIST git-2.36.1.tar.xz 7004044 BLAKE2B 99f54efb4ea1d8db0e3afd3dc9780cb37fc853e4757f4b37d68a6badd90eeed3e2943c97393eaed6adf61c82b97b5d01ca8d015784f5425072b1db14d39144ce SHA512 459432bd0c1d5a87c828a6fbf6d3473f14bf6b95783b3f27ea4f3af1ba9fd0e712a96a41276a16c6ebeb7ac3583a5f445eedd0a9e19fe160c2c8e309ec58818e
 DIST git-2.37.0.tar.xz 6978796 BLAKE2B 204a06a6d35f4f1960d031c09eeef43273982e95c5825ab813899de3d30018c9e8d88425a51ce9447d4ae6183de1270017c6e0ecc9d601df897281e107def145 SHA512 2ae3c845c9d0e0f5245e47f95c958c86a4aa2c47dfe31bff6fc81b2434d2e9402b7eced18700c04ba7158ed6a72807a81c4cde6a26dd30c969b4267b8fce4d0a
 DIST git-2.37.1.tar.xz 6980388 BLAKE2B b5423e4628f8c727aa74b3f7c7da12d46814eb45adfe84bf57e87a33e85a0a793ff690f4c1f7d2da4824bc8dd7d1df1c06cbe96adae857177d3fb204941b53ef SHA512 3c9cad6b4757f425ee53996d8d80db2226b246513cbcec9011022e02e4235d7ec38c7c1aada73bb3c9279a91d1aaf8664633356ce1dce847e0d371f702a5b766
+DIST git-2.37.2.tar.xz 6985408 BLAKE2B dcc25fe1691b43e439e11a270d35d17cd5dbf255e11579ef1ebbfcfb46fac65ca9faca6db5713a4d239a02df4e50902dea8eb94720ce0bd83b461f318812af44 SHA512 a26d83f4eeb71d49c427ced9509861f7677e13e806da729f369ca39b795f8417b789a0adec859f44716f7fbc1190f7d1e6e518e774ad95c89e88442ac125b9c2
 DIST git-htmldocs-2.32.0.tar.xz 1381664 BLAKE2B d1b47aa99d32a252fd20df26eff44a558044f3a389379b161bb43621eb28375eb0621969849a31938ba7fc9fc58b140d27d703559ea5735d0a0ffd2e93cd9692 SHA512 12b84e342f0d19afe385ab8a685ae625e86c3295d1555992e0c427b361aa2cdfc89a679e7dbc468d3568a325dafbf699468aadcdb02f93e372eff3dd96a7cf7f
 DIST git-htmldocs-2.33.1.tar.xz 1396744 BLAKE2B cbd65cf08fc7ea466fcd72820ba3e2135ade37f69c436a4ee7276dc71fb62f6270b71e2f46d981f5681a0fd3c30613d61680c2ef2460d0d7d292f7455e114128 SHA512 5b856b919067e1f644539d43a85aab6f602537ea0970b6248b471e3fa6756a8494f0525a69d22ad3795fcf9e106ff8439e0f6716ba0b8c895d7aad8c59e5bd74
 DIST git-htmldocs-2.34.1.tar.xz 1406464 BLAKE2B 6ee2f58df3c1622d96ac4b1a70d4dc3d0c973635774dd6bb89fea3e502dd82d99d676e2f9cb33c14c429c3d4680cd6020213154099b3f7fe71ad67602ca9bc6c SHA512 cf9fa952d43e477528deece9f22d1bb63fa50b3a831fae20812c6af31c1dbaf193abe2fed48ac9966bcf1787442ceed19f00c00e524a1911f0ea31952a52fc8f
@@ -33,6 +35,7 @@ DIST git-htmldocs-2.36.0.tar.xz 1426148 BLAKE2B ba121e8f7d6a232f3df2b5a50c0f4a79
 DIST git-htmldocs-2.36.1.tar.xz 1426284 BLAKE2B 2213f870b7fe35cc76ce8654ed8c50c0e9694c58acac4aa2350f826422db6bf2fc238fbd12075f98e84539fdf6ca5624984e21844d1d1c1ceb90e3b090438a7d SHA512 3aa2ca197a789161571a6961dae8c2723ff5ba05a2d8ce7443f7fd9ef46fe5a3d001364831345f3fc4e028140022d20afefbabdf4a82cdeb311167793b292c1f
 DIST git-htmldocs-2.37.0.tar.xz 1444540 BLAKE2B 9249de4b49d0812cf5f3ceb0a062b396ca4f9482232c69c75177201d19c4094ca79acb61d47c9a80f9db8749ac634bb2cc3bb2fa96bd6b4a34798cf1da2dd74c SHA512 8f9ff2bfdb55db41805f4366c6eb6f116e37774b7dbbac193c4a817357c47c44664eb69eb1b55acfaabc513dbbd2393d7a93295b4443630f65bd6791fc742a87
 DIST git-htmldocs-2.37.1.tar.xz 1445040 BLAKE2B a2f748787f8008d67ae065b3efb34b04df76d2d96ec933f4e7af8d4d2580bf9d163c52a6bfe81c030af59a61ac8e02edfca30a988f1e24b1044271869e9426df SHA512 0aba312ff889875873f91e86689b7e02f4a9953e2f9339f84a94a41ba185503dbe265547c8b4bb7f128519ae8f9f0a288903e0490af23387a5bf81e7cf3b4ddd
+DIST git-htmldocs-2.37.2.tar.xz 1447008 BLAKE2B fc9df5e4af5ca0ec0a085cc0e2d520763eafe7a18fcfcbe9b1b254fc1eb0ee1974145872b2914ccaab67a607c0fc68fe6551d2f0baec9de2ed9cb3e69a394cdf SHA512 d54573a66153db448f1d776f8d855e2471d60733f8ed2ebf84b428a81b4e37417d53e05ca74730e2ab4119cd08844fd4a4e4e5361b5cd8fddb33f45c3f633d59
 DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e
 DIST git-manpages-2.33.1.tar.xz 494288 BLAKE2B 1f8bd4f23de31a285d3f4327e562dddafdf9f28e8b36334e54f5e280c81fc8170e8b153ca42baa642d02d8e6fdfcac9a8fdd3cee1e32c29bcd53f689d1a6c463 SHA512 d465a7b491046b7a5da6ad1fc6c62b351c69905932e0672263de5a1d3abe1113660cff9fe30c7be1d1695c6170ceca5a11b3f65e9b2d1545f35cc653e4c6ad62
 DIST git-manpages-2.34.1.tar.xz 497280 BLAKE2B aa3c67cec861eb40eda3e7827d3e380fdfb6f189027fb7e5618258b80ac33918cb3c2ca4d2f8dc5fbee959578766564137e9c4818672f5138304270c486658fe SHA512 8f3b56fa477e5aafec3ef29933234c362a372f59ed95694c4fb82ebb82d2a8ebc0ac17ae36caa9185964eef1700ea8732816e73df4ddd918afc949a8371fa0d8
@@ -43,6 +46,7 @@ DIST git-manpages-2.36.0.tar.xz 503604 BLAKE2B 438f533dce6628143c0ca348bc372017f
 DIST git-manpages-2.36.1.tar.xz 503680 BLAKE2B d43fc90584b2f9e3bae30460f0c545b4fb96a5c70ad03c73d655481e5737b75a8d7a293db5bfdd752aabfc835a4a11e77474a5a0f144c8791b2dd433a3e45b70 SHA512 dd2fd6c5186aac53d7834ccf0cb6c380758624bb4583c6c5703b5b7a24c65d4199403fbcf7033c69bd3dcfbe048baaef3e886b9ba99c8afeb375e18e5b3e6e40
 DIST git-manpages-2.37.0.tar.xz 509992 BLAKE2B 67a1bc6e3a92b69d30b5e977b170cf11ac37d85dc318b35e12b728b8e17d6cfaaca7bbd343da8745be2547be8ad3dd9d930a24c0ba716dcb96aaf0610e25b11d SHA512 d739670caa11b70f3ed50665764e78a5b4c3d3d912976898d22d10d45ba3e2599b9e13d2a2502f97076a9d88b5f9e67bb11d204c8c43149b81e8243d28981711
 DIST git-manpages-2.37.1.tar.xz 510044 BLAKE2B f1f79dcbb72d05258dd30ccaf76c2726de5400555d189a112786c2cecbe5cdd27879f27335ed48c84315c496bc28aa0f95e7498ee3c2672dea3071e274a1693b SHA512 5dec5aa33e707a3c3520c6391dddc8812c3c5d5f72c13a7a5f194dac08c5b73dd59b3ab777d699fba7ef5088767ee796b12de936f196224fee0ffdc31c8b8f62
+DIST git-manpages-2.37.2.tar.xz 510004 BLAKE2B f31cd031bead56a97a9ec9dc42ee3be9873e1df6f60cf00a26944f994d948b05555daf67cf3935b9cff636774dafb638aa07608536360c710f2d6a6a3d5e02f3 SHA512 c53cb4d1629e0d19c7523f9a072fee981cfce40363bf62dc090fcc54471e9e27f6da851b10a90274dcef1790301f402e72640fd21347cde895b051de4909c584
 EBUILD git-2.32.0-r1.ebuild 17396 BLAKE2B d3e72aee885b6c6f42fd8299943ef62bffa72bb6795b8d363d3f51d811643f3e497b580ba76e09041621006ac0cbb37edcbddc153c7857cae6c86ce76312aa7d SHA512 fff18efa738dbf828654033931ae7eab90e8f4995ff9033a7865559c4f0cbc270f406cd4c87c7ff9ea14af38e9a3be9c70b6254caddd98250f60ca6b6bec97eb
 EBUILD git-2.33.1.ebuild 17292 BLAKE2B 64fd297bf8d695d2f82745eec25790b26f7faa1f1c95af123cbefdc216964dbecbe2e01b2775c43d40633355b81b1d5047fd0a05d3394c1d736a25d38c7cbc55 SHA512 0379fee683ef4e83bb9d0da35a1d1e7371b3975263351fad482f14f550e17c2ea5bd6041bdd834541b585afd87136d74a8102db3205b953edbd9232a551e7221
 EBUILD git-2.34.1-r1.ebuild 17299 BLAKE2B 0b6dde0f056ea0682e71561d993ee90660753942c4e6b876af48f0c341adcac3d524ba83a948e9bda970e363e53ca0a9e057ab21a41647c4624af87994b8d0ff SHA512 154f6e0172f32906fc833e9228c95e0014fcfcfaf041dae8539c0f8113e8201bfac04a8f5299d678aab0bd05af0e96243b0c86936fba453d01ffa82ca2a335bb
@@ -54,8 +58,9 @@ EBUILD git-2.36.0.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469a
 EBUILD git-2.36.1.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-2.37.0.ebuild 17351 BLAKE2B 9cfc8cc03cce0e26ca7ec3ef1a72270a18602b2a102f993b95e119da1e330f3044f50fa314874dad5e84b0d01e8fae63e62f69380c3932c2842e2d4e9f4a05dc SHA512 d3541fb2ffd4e9fd5869b9c7f47b48fd26c968a11d5b385125abbdb2212abe7720754ce2b0f537714390f71f892c40265ef030328e6ae84de0b235aa1d9ab56a
 EBUILD git-2.37.1.ebuild 17351 BLAKE2B 9cfc8cc03cce0e26ca7ec3ef1a72270a18602b2a102f993b95e119da1e330f3044f50fa314874dad5e84b0d01e8fae63e62f69380c3932c2842e2d4e9f4a05dc SHA512 d3541fb2ffd4e9fd5869b9c7f47b48fd26c968a11d5b385125abbdb2212abe7720754ce2b0f537714390f71f892c40265ef030328e6ae84de0b235aa1d9ab56a
+EBUILD git-2.37.2.ebuild 17552 BLAKE2B 113a4c66dfe0f3dbb689c48882c29a2aaa0d4cf2855744ba7510e631d0ad8d815bc6440c10d88dd28577cb5c80efd2387efde3a57564545f814ebb43f9105656 SHA512 26591d1736c5899e393d0661b692c0b3f5bf67448c2dc2b4a57ed24bf4563bd46f5655a46df644fd7e7fc90ec11596b81cc68db3e514eb6817b409098a44d2dc
 EBUILD git-9999-r1.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-9999-r2.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-9999-r3.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-9999.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
-MISC metadata.xml 2156 BLAKE2B 483abd821824d94f560688a9ac65fa4d39556565c45b000288d9d58fb3280669de273a1b791821a211afbc7e5d7ab999a8d4e4e46c8e2b2492ce13a9bb92207c SHA512 c15fb128260d903299ef40dfc3e442970ad2150511f00b77090b5f870a4994714ad84dcf91cd4682517a68306cdcfbd7c2a29432686b0131a90f2c9c319ccd96
+MISC metadata.xml 2230 BLAKE2B 0e4c17cf8ddb998784705e2ecb65ea4163360bc6ea8d54e1d114ce0c698a445418ff822e274b226a8f43a47221326e4e2f0a7fe3440e97c880d85482e90ec09e SHA512 edf8ea87dea06bd5c034f975431ceab72653b75183ac2d3161003e8a6154c96f9cb64cc8d95526dc31b2ecbbe91cd5bd35e665c97fcf4ce6831988c2923dc921
diff --git a/dev-vcs/git/files/git-2.37.2-unsafe-directory.patch b/dev-vcs/git/files/git-2.37.2-unsafe-directory.patch
new file mode 100644
index 000000000000..27bf5413753a
--- /dev/null
+++ b/dev-vcs/git/files/git-2.37.2-unsafe-directory.patch
@@ -0,0 +1,14 @@
+Neuter the "safe directory" feature, except for tests.
+--- a/setup.c
++++ b/setup.c
+@@ -1157,7 +1157,9 @@ static int ensure_valid_ownership(const char *gitfile,
+ 	 */
+ 	read_very_early_config(safe_directory_cb, &data);
+ 
+-	return data.is_safe;
++	if (git_env_bool("GIT_TEST_ASSUME_DIFFERENT_OWNER", 0))
++		return data.is_safe;
++	return 1;
+ }
+ 
+ enum discovery_result {
diff --git a/dev-vcs/git/git-2.37.2.ebuild b/dev-vcs/git/git-2.37.2.ebuild
new file mode 100644
index 000000000000..70bd35f67fb0
--- /dev/null
+++ b/dev-vcs/git/git-2.37.2.ebuild
@@ -0,0 +1,648 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: seen
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 +safe-directory selinux subversion tk +threads +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	gnome-keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre2:= )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso(-),perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	gnome-keyring? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND="${BDEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex perforce '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads '' NO_PTHREADS=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	elif use ppcsha1 ; then
+		myopts+=( PPC_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]] ; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+	if ! use safe-directory ; then
+		# This patch neuters the "safe directory" detection.
+		# bugs #838271, #838223
+		PATCHES+=(
+			"${FILESDIR}"/git-2.37.2-unsafe-directory.patch
+		)
+	fi
+
+	default
+
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
+	fi
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use perl && use cgi ; then
+		git_emake gitweb || die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man || die "emake man failed"
+		if use doc ; then
+			git_emake info html || die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info || die "emake info html failed"
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree || die
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake || die
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake || die
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake DESTDIR="${D}" install || die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake DESTDIR="${D}" install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - removed upstream
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if [[ -d "${d}" ]] ; then
+				find "${d}" -name .packlist -delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if ! use prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
+			"git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	plocale_for_each_disabled_locale rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]] ; then
+		if [[ ${cvs} -eq 1 ]] ; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]] ; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		if [[ -f "${i}" ]] ; then
+			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+		fi
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+	elog "completion."
+	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	elog "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml
index a7248e6fdf0b..955f37f4086f 100644
--- a/dev-vcs/git/metadata.xml
+++ b/dev-vcs/git/metadata.xml
@@ -29,6 +29,7 @@
     <flag name="mediawiki-experimental">Add experimental patches for improved MediaWiki support</flag>
     <flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
     <flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag>
+    <flag name="safe-directory">Respect the safe.directory setting</flag>
     <flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag>
     <flag name="tk">Include the 'gitk' and 'git gui' tools</flag>
     <flag name="webdav">Adds support for push'ing to HTTP/HTTPS repositories via DAV</flag>
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 83a55caa0eba..32a51155ea9b 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index e0d74e7ceeb8..d649baa919b4 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,5 @@
 AUX khtml-5.96.0-with_x11.patch 3371 BLAKE2B 4e4d8bcbdeb6d99b185400831a15fe77c81c54da98c82d5c922b194a8fd50b4a8eac2d814db9b61928bee553764a9e56a64550e0b3974a07e345c5b5f85ae3a0 SHA512 5ca257ec36652ba273afbb7baff2412357ef0bec047b3894152f18b4712ded3981f602cac4ed09229ba568fe9a24d6d5579a155bb636984015b5c465bf8a4953
 DIST khtml-5.96.0.tar.xz 1965056 BLAKE2B 857a338c9831a03989348ecd6d9c355d6538458311eb22ccc2ae1c631137a7dd411866c70632f941d2ae64bd54584283b90e9bb0cf6573f6504d6ceab0cb01f5 SHA512 7ccd0c8dbca62486b316f381c437568650696cc4fca0b2e382bf8d337435f9c7fc7fa4664e01bbe8db509bd293c23ebb4abaabc34719be38e91480ae0b1d4141
-EBUILD khtml-5.96.0-r1.ebuild 1833 BLAKE2B 4f03daa22eec283c2cfde056d5872f5d2fa148447200e71b73727c624af7a95ca59489cf151aa608154f01d47268640796192131b1bcea12c2794f14d0745029 SHA512 e9f20679ce5be9ca4af304258b68fa3b3d1fc804a8eae6df74dcb782472a9d1a25934e2e49fc0feba7270b7615df2a2569885959476c2bbe4b6bd00af5bb3b9e
+EBUILD khtml-5.96.0-r1.ebuild 1832 BLAKE2B 4f6da9389313978ae6b0b127070943fb42da40ae4cde2170a93040cdc4912daaea6c7d772dc82e24cdbf7d35b2508b3ba2451c119daa257bdc9856eb36e3ca1b SHA512 473af3b53b0dd6e1cc21f046e7ff20b96ac6bfd376d2c35a7bdca8776986fb8369dfa4288d6fd705695348467648767f0ebaa7e12547a2edea7c55abde6527fc
 EBUILD khtml-5.96.0.ebuild 1790 BLAKE2B 765c616050c5c7217c075108e4c7dc2fb5afa2ca31fd9a5e49363d035841f249d4eccebd3644f50c23f2571af6f9a8e9516da7d03c6259da486fb2d089282077 SHA512 3a77aa609b50c48560cd610da34189ced45385d72e6d5377410758e5997ff6d3c29acbe69eb6223b4b82769eba2390b8d752d113a8a69f8a74c731fb336464d4
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild b/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild
index 9bce8c63dca7..0b77e9a2b34f 100644
--- a/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild
+++ b/kde-frameworks/khtml/khtml-5.96.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit ecm frameworks.kde.org
 
 DESCRIPTION="KHTML web rendering engine"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index ffb14da29eb3..2bd40eba0fe7 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,5 +1,5 @@
 AUX kinit-5.96.0-with_x11.patch 2306 BLAKE2B ec443e5351d1fd727ccb4ba212a19dac96db7934bf59850590566f00a4713fee37cdfa30e676df01c7f7c72ee87d717b121e7613472f965baf1b29a3a298ea57 SHA512 dfc82d59a925503a586c2229581b754b26baf7ffec0614da32c60dbb0ed14a9107a323ba57d2a545ffbcc38d06d38a3f22bf4a6ef7538f05caa343c844946880
 DIST kinit-5.96.0.tar.xz 119408 BLAKE2B 7372a85d89e1344e1205035fd1bd643b88619ccb487667cb7f41b64b59046253e8afcb053e51e5093c31a86a8ee7bb71c8c1b9b9fdca342612d0a9ba024c4fb6 SHA512 e3f2a8fc3a4487baa1ecc60ac86e6322b9b15a1cc0fdda288eba9cf9fce387fb299435a689abeaef8570e22c9f5fdd646021409a72aa37653e28e37c8a230e7d
-EBUILD kinit-5.96.0-r1.ebuild 1245 BLAKE2B e87fb2d8a69bad77a6470578e6814e1d8209f3cd750f3d009b0c2c4d42d8aba2277b59e8248ea3b6d723ddf0cad1d309d10fafb7770b1c87869e4c3cc5614f26 SHA512 f50453ad216e05330350d296f2ff821efee9057b7a84f361e74ba75a3aaa8474f94261bdc7c7f3a78fe513b721ed5d2727494aff9f9e4c02304a92eac3a6001f
+EBUILD kinit-5.96.0-r1.ebuild 1244 BLAKE2B 2038682f78ac3d58f3588eac458d463e545215f3c3e54ed0f450396e1adcc313acce4a1c76e0632c94b15f8ff0f90d12c178213bef7a449f89a714a2e29b47db SHA512 ca34a6b4ec43b20c4ccd8cc90607fa4401cf0c4fdf9bb35378e9cac5fd2a30a73759a28e1380a7a67bb4e8a0b788d4889dbed56bfe5396f6ece45281b27948b8
 EBUILD kinit-5.96.0.ebuild 1159 BLAKE2B 6561c5868b8cf8d539ea07bf0fff51535560c1066aa03507b5dde5962afeac486ac844b56a96253c61a4120ef8d15638655635105e9b52dac22b54bc3db7076c SHA512 d1cf2d85ecaa690437f1df43205dc051fb888bf3e674f0b7b91d0d09d44cd45500b453d699642b854018185f54477582ed40d03cb7f00c06f95142597d18358e
 MISC metadata.xml 565 BLAKE2B 8e740127ae95b251e2e5cdf63fc19fb605cf5ef42e631b54e0ef300e8f21f04e288527c4628500c076e884da4b3017d041b1b45ff9a6680e72585a43caa452a4 SHA512 0efe6998f185b5a5aca504a041b3e5fc1ef8da0a4f9eaf2398ef9533054d9de27ae50c9e940001b24e69958d2ead67ab829304d8e322404cb19fda0c904e952d
diff --git a/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild b/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild
index 986e68c5fce6..9748e430be3a 100644
--- a/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild
+++ b/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild
@@ -12,7 +12,7 @@ inherit ecm frameworks.kde.org
 DESCRIPTION="Helper library to speed up start of applications on KDE workspaces"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+caps +man X"
 
 RDEPEND="
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 5f14d90e565b..564099af9624 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -3,5 +3,5 @@ AUX kio-5.96.0-fix-crash-in-dropjob.patch 1568 BLAKE2B 91837508cbcdb278a1b38747b
 AUX kio-5.96.0-with_x11.patch 2626 BLAKE2B 22fe308b5238b54627c52e6ef927ffe8a3300a9086e04e91c4bd44c6dba9d7b09ee402877f0d45f08f685504f40fa426ddbb9f542274ee698aae191ac72a7b13 SHA512 4c54455ce672f7841a536d87ebf339187bda6db5e4c7ae876f3ff86a7d0e337c9de04be3ee09c81cbbe8d01eab4111819e8ab29b4cafa11f3cbcedd9e64ccce7
 DIST kio-5.96.0.tar.xz 3349852 BLAKE2B 981f0568c30678173f1c38972641b0a53071cce4b03cecdd1f829de7ace7244e3b67f9d63269501866474bcd64d22edc8d98e012f2197cb83f8cafd301a93da0 SHA512 70e7291efbd4b97916023cee7c44a96f3226355773f764f92a2c58c9110b75b04896196ab663ff468b757d1c2a5911f6e9021246044e7754a2ac47723eff8bd3
 EBUILD kio-5.96.0-r2.ebuild 2573 BLAKE2B 6eb6fa383b03f464fd5f6c9770a3bcdc7ef5b40c73d1e843efa3ab1549a0873219456e9b96438f310dca2329932149de6bcec85ccd19e5a1419defb6b7d1a700 SHA512 5f4107e0cd22bde707c2793964c926a7b7ac1051f3e22c3d6052231e546004b8ac0be3b2f236225014b305d3396a0faf059b6abb98d1aa8d100699df494bf304
-EBUILD kio-5.96.0-r3.ebuild 2614 BLAKE2B f6a3442675712a78b764ecdd9310bfc6b575a131a0ea14f5aae4b7bbf84dbcc16f040f628bec1476e638a1750fd71f79e47374cd578b67ebda0f88e789f9ef11 SHA512 85a541d71b24e47e2158b4583a1171c2c57261d8ed614f8d5b5d52defc3e6aa212c83e13884b4f04f5d7d97cbc19987db3ffd0b56134eeeb2141ea3c5a8c76ab
+EBUILD kio-5.96.0-r3.ebuild 2613 BLAKE2B 8e6996ce92fc4aeb18cf82431ffd56f02678eef5625f42be18266e931cac22fabfa947fe4172920d632575af867d1d5063622295384a412bcb9a02a53079da80 SHA512 8016c2cfa0a219f561ff0d507c98bfd1eea23607b91f25437564be1c1b97ac5e1340b2f4e68cc7dcc1877e51da7af44ca3fe4d7a6919bbc04cbc43a24ce1a89c
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/kio-5.96.0-r3.ebuild b/kde-frameworks/kio/kio-5.96.0-r3.ebuild
index 0a3ca54a7735..5043b3638255 100644
--- a/kde-frameworks/kio/kio-5.96.0-r3.ebuild
+++ b/kde-frameworks/kio/kio-5.96.0-r3.ebuild
@@ -13,7 +13,7 @@ inherit ecm frameworks.kde.org xdg-utils
 DESCRIPTION="Framework providing transparent file and data management"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # tests hang
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index be5137bc1393..1b261c08c8d9 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 187cc93da099..4f04c06de7ec 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -6,6 +6,6 @@ AUX kwin-5.25.4-drm-fix-blob-updating.patch 1096 BLAKE2B e0d4980bb08e5b1469df84a
 DIST kwin-5.24.6.tar.xz 6464412 BLAKE2B e3dabbac99cb1ad4eab9995987b6070d2ae0c7d24b8745edad51d573f955783ef4dfafa91ef686a9325659b7ff32282f8448c4beca90b8ad357d83d210964008 SHA512 582464134046c672f9dd798a5485eb2ea93c71676ad20aebda60d978d459104e74fe1283cb0e16968216faf53827dc3e47d669d4c977e0fb7a5a4bb408f77eeb
 DIST kwin-5.25.4.tar.xz 6639040 BLAKE2B d2160b7e9bedb77ed50033eee9e901edf962c3b6c2b6d0c4e5b19651a1a466c4e5868a2b66dc6b2b00f73381661a59fc9da317fc9cda48488b57ee86f7543f7f SHA512 14ffb4ea0eb069811803253b8abb7737eecb5c121c99c477c1b085a80812eae10d9e2012e3343b326f1a3258a2854d1f8b138dad2f31e548835b9bf09769c0fd
 EBUILD kwin-5.24.6-r1.ebuild 4126 BLAKE2B 4f12925511011887954c13882f644182eb24dbbe9c39d58974be95565afdfa48b8d770f382b614a7a45439cdce8c1c2229ed2b486aa4c7724a8c352bfd87a7f6 SHA512 79bba7223739f8b61744feaead7eca554d526e0d1c8e84e61c2f1f73d05c645767221ecd77a6e292f0c9bb97da9734faaeafb01c92aa51e2d5cafb25d6c724c1
-EBUILD kwin-5.24.6-r2.ebuild 4197 BLAKE2B 612d968998bf813f24a41a7f6a3375a45a357f30aa54e159a55b38f963592d920809c664ee103ea516bccc01792a15d427cd576779252d411977338e3dec149a SHA512 53301d5bea61c3c60768e6437566ed6df528880c54eb879a91b53f12699fc11e29ec3a3dd4c700ad1c44044d9533e08446a11e282d18472ed22c928e70a194f8
+EBUILD kwin-5.24.6-r2.ebuild 4196 BLAKE2B 192e71a76da2f2ed59b3c37ff02443993bb4ff96e088e776a16119d73a9b7013394dbafcda280560a1d75740dc86339178a352d6d2db43f1ad79288a01a2f8c2 SHA512 cc03061250fc552f8fcb3a43dbe93a7244d836a491bc9d7d084684f08489071df199714e5869a3aa9b1d6684ccc4bc90d0b2adffb97c36dc5299bf2c4a1a9fe3
 EBUILD kwin-5.25.4-r1.ebuild 4261 BLAKE2B 54cac57cf5022ed700f94cae73463a29b3bf12ae08f0e652fff1189b94b6560f332805f764eebab661b62a504f9c455df1b217e1e4aa21f2f9c98b4495cdf051 SHA512 4188247aba43f8b37dff1aa7dad6becad7ae5e94e457d29ed1070c2520157ef321891d9fa9b3117d37f85c621b0f2e132ff7df84df06f68bea190d54ff86c5dc
 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
diff --git a/kde-plasma/kwin/kwin-5.24.6-r2.ebuild b/kde-plasma/kwin/kwin-5.24.6-r2.ebuild
index bb3d86644b6b..3c7a924527a1 100644
--- a/kde-plasma/kwin/kwin-5.24.6-r2.ebuild
+++ b/kde-plasma/kwin/kwin-5.24.6-r2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
 RESTRICT="test"
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 03574a11b71b..40ebd876c1f7 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -4,6 +4,6 @@ DIST plasma-desktop-5.24.6.tar.xz 6246924 BLAKE2B dff70688c684437eddbf74ba8487be
 DIST plasma-desktop-5.25.4.tar.xz 6300800 BLAKE2B c1f36192c437989a637d9929963353cbc38184a907bf9b2d19b137f7c0fc406ca2ab2ac6c719a2ce8a2ebcbe6a3a0b3a7f6174d808bc66061e32f403cc2aee61 SHA512 271d38bc2c1bd5b8aa355fc33f432952e30b4b4087280d939a38e829b3187c1a40c8faa257854f41b9049cb74f136f8ba2b0589f5f7847b2681cc824fb034547
 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a
 EBUILD plasma-desktop-5.24.6-r1.ebuild 5212 BLAKE2B 9e3292213d22aa001054312f084233ddb6219eaa97f5f52c01e274dcb51acf35d04512fcf3dfd58130a479bdd3d5cd19aadb810b384998aff36129de2b0fb663 SHA512 ca15c914bd7285044dca71c22bed509c2fb834f75d945d8b34b7d8c30004e493bf7557519d7304a2bfdcc72b90aa785af9c45a3bcad3d25dd4f1c07e2b08e8ca
-EBUILD plasma-desktop-5.24.6-r2.ebuild 5348 BLAKE2B 60c60abaad0c55b3cfab40c8b392b9f4a4de3c8fbec5e94a591044229bd9bfe6edbbb9caf7ce8b4c3d2c63505d01e88205af8b432e768bf25289ea9a4ce41f6c SHA512 bc76802bd88ddd6d6ecfab80ee56d944bee48a5e07f57b299ce93cd1d9be5a2a8550f3c4476f5b79b7b02a477f661f45a8f0b9246177815e0061cc2f52710ea1
+EBUILD plasma-desktop-5.24.6-r2.ebuild 5347 BLAKE2B 5ede223f5cceae5035669e6f85f6e1c5708911daba2ef506876b1f4d51af12335d8f01a8ac37c0c827b14ce5b46280d3ee22522dc0e2dcdd66fa95fa0a27cb16 SHA512 a762545d683f391a2eff0f563c6425759a50587ffad55bd1a301f305e0f14eece92a0a4c7c6958413fae0f69c0ef5c83f6be3e7100b70924885ad2c611b9c40a
 EBUILD plasma-desktop-5.25.4.ebuild 5215 BLAKE2B 01e1822a2eaf6eea3122ef571338fb01f77d9cc1a5f1f130dc673f2f291cf2ea2d9d896af18496dc5ea151a8f81563dada9734493d6c29ff1a111bd97b513a4d SHA512 e8545e7a8a0aa8ed74bee801758be0888b7cad77a18af7bc911a6a2da65b9d419c6f1b65401a3028ae8719a4f9860e6b1d4d00078e424fa7c002a00eb29d0a2a
 MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
index 7c43685d3136..773c04c6828a 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
 
 COMMON_DEPEND="
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 4f2ae1f13627..9c62fff2dd1f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 460aec808fe3..f34fea7ade25 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,6 +1,6 @@
 AUX RT_5.8_fix_crop.patch 9040 BLAKE2B 740d181229fc5677735870d5b4f1b1887ae63aeb7242a038de15c726ee00b3e7b975ba099c2cb3d0e874790fcb8813cf7ab0418e2dddba17227afb6d7ab37d19 SHA512 0d62164d24a87318c7eac65003ede4b05845286dc1d39395239ee713d66011e3aba5caf18bc9e3240caacfa5cebd00b329e4e82fe9a8dccc5643538de0aa0538
 AUX RT_5.8_glibc234.patch 20080 BLAKE2B b6712195ba1d44c7c01d86b8d67c3649d13d3bb74077d2bb78741a99b1f9ee4a0aa1bbfe36488127a8982d50e36de09e26419cb02c979e7aa6362c3232232af1 SHA512 330ee4b1ef29dc6ec3e58dd3f5686f0ee935a2efbfb3ba55a9eeeac4ece7ff5594b7adfe7a9272d342fa5cbbe0387869a234e20baff25e4263963778015f4a4d
 DIST rawtherapee-5.8.tar.xz 12653148 BLAKE2B f6d4b9b177ad3b6a32b460ecfc7caf5d42a01b5dd4f24da29739f5a2e5936a8d36f9857c0e24bca11f077ab0626f08bbad59ef756792d12f93ef9516427cd2c4 SHA512 bc79586cd937dcaefc053e65faa2162de887d514e44980956d937c157c6d55c4f6e6a7a9b8f91f2d657ed2054814737b96d5d741674c1e5a961d7177433efe4e
-EBUILD rawtherapee-5.8-r1.ebuild 1921 BLAKE2B faeec755cdbd610c12b8d3cea3e08f22137097d5df00616aa7ccf9f0b91ff8021ca635220fe98e6caba71b06392a5c82011c5582c00661f40521f0a1297523a1 SHA512 a45029316203665c29c3137d33db42982b10e9978bf87cca192f5a6376b7c863912528ef79446e2c46dc3bf2d904533e8c2a785534a5ebdcff93af61c3bd75d4
+EBUILD rawtherapee-5.8-r1.ebuild 1928 BLAKE2B 3942c7d3287bd6a2cadf664fce54d18b3563a99df14faba7ed40f8120bd6073942fcb4d0bac82c34d2512998da59dc4fad6f0f7d450ba56b9bed78a53f042e15 SHA512 d79fa097cdd17bddf1cfcb7292dda795f23020719a72a5f1f333a25b99b8f172b2f0adb64070ef093bf8b400bd81301d9604b5f6130f02aa57175fff9c24ccdc
 EBUILD rawtherapee-5.8.ebuild 1744 BLAKE2B 16fceb655b47f7acfc1e9232bc53ceeb392c1a6acaeb719f446690f26c58576b0fa4beee131ed86a66e44400be553603c0422b4021f28dbce4f0e11216edad53 SHA512 cd700c2e125307410e9e8fa722747b73dd90c8ae26d581cbc44b98cb23f6c250117fe146e609452231c2b7d17a26cbfc6b6e0891e6f533f21656917077e6920d
 MISC metadata.xml 396 BLAKE2B 21d743fc4870d7d6aa5a712581eff1e2d1a200718008c450f10a41ad7c95008cb1a45f882db1fbc98a9561645f27cee31c1f077d12b9e359a8527b31ce2785bc SHA512 174b118efc92edf6e412e3b0720d850ce65683b3025a7dec30596c82de071b05a25d796df2159a6e81a3571704984d53710999431d53e163207e77d95ceda2b7
diff --git a/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild b/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild
index 6bc9d3808b2d..295e9dcfcfe8 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="openmp tcmalloc"
 
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7badff1152d6..028d94c4ada8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index dddf4b0324d7..34cf02bc7b8a 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,7 +1,9 @@
 AUX libjpeg-turbo-2.1.1-arm64-relro.patch 679 BLAKE2B f6ea6f311cc05ff960d76cdc49afc1d14bf4d638052d1f6007defe239757002ecad18823d706a2e5f5e51245a2447c237c97daf0862e2e1889c751b52f3890b7 SHA512 56ef2f905fe54921618a0c4f79de67cf74070d1ee595d3b4b41f19b33e23701d8045b250b28b8c53b1bd8911f4179dd3b1594a5e85ac9dbce8c869feef1ad124
 DIST libjpeg-turbo-2.1.1.tar.gz 2256321 BLAKE2B ad3fc108e0136220586cc59a277735d573a82d740146d2ac091cbb50af84019b7c623ca1c9c2e6e0f8a672b6fde7ed23441b199eef2435a52013abd73a3a7157 SHA512 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673
 DIST libjpeg-turbo-2.1.3.tar.gz 2260756 BLAKE2B 87ef47105e66b2ee918e95962ac59963b6adea5b49ab0db692810aee0a13a215a0ef7fe0b549ecd5151274549e12d09eb0b42439bf0a4bc1ad2c4e62dcceb77c SHA512 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d
+DIST libjpeg-turbo-2.1.4.tar.gz 2261822 BLAKE2B 80ffd77d58a37eae0bdc1868d994f34ea52c13e2624c720b1d0b6ec4d6d14b16911163ccd4009c8d6eda214f31e1fff78bb7eb4739ae6589d0fd8c7008c0e972 SHA512 511f065767c022da06b6c36299686fa44f83441646f7e33b766c6cfab03f91b0e6bfa456962184071dadaed4057ba9a29cba685383f3eb86a4370a1a53731a70
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-2.1.1-r2.ebuild 3248 BLAKE2B a2b9fcc4939e064ebb0f73875ce3a4cfa5e3233c0c8125905f66f8f76320fda29cd4ad4c0c08b66844dc7f36e9bce696ece323798c897c7e03243a8982e9117e SHA512 aa15cb2b8f08cd54d590a8ac76d3eb8b512ad8c62235a239cf36fda55f818a71462834b7e3579f4becc8269e2b3bccdbd6f6f809305fb2f6578587e03338a416
 EBUILD libjpeg-turbo-2.1.3.ebuild 3179 BLAKE2B 37956145b92842e3cb754c968795a83f5b9659c72f649226f2ee2ea0a766cc0bfd6f16e17ef7c83b3be82533acc6704f0a023e98ad3fd83ca4245c7e012c20ce SHA512 88bb60999672df2157f40db5e30398f0bd0e040ffb53bc9184d6eadf88412a5d4d6124ddbe29edbcce249ff710eb6020a4afed10d1146a31c13248cd6d49a2e5
+EBUILD libjpeg-turbo-2.1.4.ebuild 3172 BLAKE2B f158f2b3b3951f45e591778d5f07455ff57ef70cee49fc7faf87325b9d7cb94294628e4491ce5470d7174ebd322bf9ddc208d2f87ba11ab524d2560ecfcf780d SHA512 a0329a6c49cea2e572ed1e55c5a8ba8f29cdf5cbc9635dd03487c98b66efb5be7db706ae0ffa9c1f474570700fd5b53fbcab3a38e26ad0b7842a9cbd398ef98c
 MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.4.ebuild
new file mode 100644
index 000000000000..3487ca03f1e0
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.4.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib java-pkg-opt-2
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG ZLIB"
+SLOT="0/0.2"
+if [[ $(ver_cut 3) -lt 90 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="cpu_flags_arm_neon java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+COMMON_DEPEND="
+	!media-libs/jpeg:0
+	!media-libs/jpeg:62
+"
+DEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:*[-headless-awt] )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="
+	amd64? ( ${ASM_DEPEND} )
+	x86? ( ${ASM_DEPEND} )
+	amd64-linux? ( ${ASM_DEPEND} )
+	x86-linux? ( ${ASM_DEPEND} )
+	x64-macos? ( ${ASM_DEPEND} )
+	x64-cygwin? ( ${ASM_DEPEND} )
+"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+	local FILE
+	ln -snf ../debian/extra/*.c . || die
+
+	for FILE in ../debian/extra/*.c; do
+		FILE=${FILE##*/}
+		cat >> CMakeLists.txt <<EOF || die
+add_executable(${FILE%.c} ${FILE})
+install(TARGETS ${FILE%.c})
+EOF
+	done
+
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	if multilib_is_native_abi && use java ; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_STATIC="$(usex static-libs)"
+		-DWITH_JAVA="$(multilib_native_usex java)"
+		-DWITH_MEM_SRCDST=ON
+	)
+
+	# Avoid ARM ABI issues by disabling SIMD for CPUs without NEON, bug #792810
+	if use arm || use arm64; then
+		mycmakeargs+=(
+			-DWITH_SIMD=$(usex cpu_flags_arm_neon)
+			-DNEON_INTRINSICS=$(usex cpu_flags_arm_neon)
+		)
+	fi
+
+	# We should tell the test suite which floating-point flavor we are
+	# expecting: https://github.com/libjpeg-turbo/libjpeg-turbo/issues/597
+	# For now, mark loong as fp-contract.
+	if use loong; then
+		mycmakeargs+=(
+			-DFLOATTEST=fp-contract
+		)
+	fi
+
+	# mostly for Prefix, ensure that we use our yasm if installed and
+	# not pick up host-provided nasm
+	if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
+		mycmakeargs+=(
+			-DCMAKE_ASM_NASM_COMPILER=$(type -P yasm)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	if multilib_is_native_abi && use java ; then
+		rm -rf "${ED}"/usr/classes || die
+		java-pkg_dojar java/turbojpeg.jar
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	local -a DOCS=( README.md ChangeLog.md )
+	einstalldocs
+
+	newdoc "${WORKDIR}"/debian/changelog changelog.debian
+	dobin "${WORKDIR}"/debian/extra/exifautotran
+	doman "${WORKDIR}"/debian/extra/*.[0-9]*
+
+	docinto html
+	dodoc -r "${S}"/doc/html/.
+
+	if use java; then
+		docinto html/java
+		dodoc -r "${S}"/java/doc/.
+		newdoc "${S}"/java/README README.java
+	fi
+}
diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index 25aeb187de18..18298a9f1084 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -2,7 +2,5 @@ AUX libsixel-meson.patch 1904 BLAKE2B d4e4b4b800e8c8e847893b7f80369f71b2cb99ae4f
 AUX libsixel-musl.patch 1304 BLAKE2B 09e7a75a94edd944cca9997c74b235f9f27aeff550b2a9a02225c93d60f1faf598b9c5c304c9e8f1f207da37d7712d40115410f65cae17995c3bdaed6cfc99d7 SHA512 39b7227040e523881a9405e7f6b98362a0c4fb7f717bf50a724eabfd5cfe9779f820243f7ae0a83b61b4dd124ec4ff0070d391ea43476388095e1d4160f13cbd
 AUX libsixel-static-libs.patch 240 BLAKE2B ba9091c4991c6e69f83ca7eaa35aa7ceaf81e8542b1edffd1ce64ba1bedf518ad82603cdc610f256b1a0dc4954151b7407202a27c101ef6de59ff0724021faa3 SHA512 d3c6c060e8eba47c98180e5e4e127dfcb6f77f89b11dbaa8595cfd9786eee94a884476d210deb9ca6eaa2f548c6407a9bff714cfc3f18d4fa36b60d2c1fc165e
 DIST libsixel-1.10.3.tar.gz 4272940 BLAKE2B f65d9a3bdd54917f5746b7b1650dfca7084c64b505ea9cae07863c476d1189114d9fb303ec01d8fa209542e891f1d359ec6dbdc9babc4313b06b709813fab020 SHA512 ef16f9ccecec8289728ec84ce9f24145648f8a38184c1ec3df8ead3499c6cf7d3e0a0c738f8bfcb1093e16ee8ae7ce5e46d3890707c8104752ce4ab7eb3bc7ac
-DIST libsixel-1.8.6.tar.gz 4791628 BLAKE2B 5fa197d0d759eecd4040c4c1101e6d85fb9af7405ccdff75be571b3ac6b2b0aab6415bc3fdbb37157795f89190fcc1d0fea1bdf705e83a34762e2b05f5588c69 SHA512 460a5d46bada705b4a7ec2e250e2bde7f4b8ba155281fa5a102d1121f79c1c79145f042cd1f4bf93a2fc29e784e89afd539e963470663fc659d4fe72ea49fdaf
 EBUILD libsixel-1.10.3.ebuild 1941 BLAKE2B 626e04851badd3e12f1093bb221c7061f7540aa6921b5dc902e3c4545a982377500d18679948383327efe899d6bfd08dcad200c5a755024a698bbb6c0d3c4957 SHA512 530f3b059eb768727f4d58a3f9cfaca029f2f1e3dc9beae13e388dbfa09e3e32f73a5602e36e14fade00efcf8d54710ddb6407331e478a8ae78d16661d3122bb
-EBUILD libsixel-1.8.6.ebuild 1848 BLAKE2B 65ebce0c43773581673555da29d7ada4e2bcafb8b2d98dd6e311b1cd9ead95d1a8d52bcc2739b5c1410c2ab776403909bcea1a7198e664d9739db6cabf920f73 SHA512 4a006fd05ba3b344d387dea8c59e6895c28f515094c84bee22fc4479c320964faf768a926bbaee008103fb74fe4b5285e97b31ff61e1e2b12db045508ab548e9
 MISC metadata.xml 387 BLAKE2B 71825e6924d15781b4c819089beabe6b4279b8f408452e97c5121d2892d8539f95205d2c869dc1259b3aecb0e8d7a1389548b44bca7637994afe16da0abcc8d3 SHA512 4481aef804960b1205090e2453f878fc059b009d1548f1a8b28653919443b73cd030b9020b3d0707d98623f39a82775d36f5111ccb1bd65f1f9128183915faa4
diff --git a/media-libs/libsixel/libsixel-1.8.6.ebuild b/media-libs/libsixel/libsixel-1.8.6.ebuild
deleted file mode 100644
index 0cb049507e88..000000000000
--- a/media-libs/libsixel/libsixel-1.8.6.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_OPTIONAL="1"
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="A lightweight, fast implementation of DEC SIXEL graphics codec"
-HOMEPAGE="https://github.com/saitoha/libsixel"
-SRC_URI="https://github.com/saitoha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
-IUSE="curl gd gtk jpeg png python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="curl? ( net-misc/curl )
-	gd? ( media-libs/gd )
-	gtk? ( x11-libs/gdk-pixbuf:2 )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0 )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	default
-	if use python; then
-		cd python || die
-		distutils-r1_src_prepare
-		cd - >/dev/null || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_with curl libcurl) \
-		$(use_with gd) \
-		$(use_with gtk gdk-pixbuf2) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_enable static-libs static) \
-		--with-bashcompletiondir=$(get_bashcompdir) \
-		--disable-python
-	if use python; then
-		cd python || die
-		distutils-r1_src_configure
-		cd - >/dev/null || die
-	fi
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd python || die
-		distutils-r1_src_compile
-		cd - >/dev/null || die
-	fi
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete || die
-
-	cd images || die
-	docompress -x /usr/share/doc/${PF}/images
-	docinto images
-	dodoc egret.jpg map{8,16}.png snake.jpg vimperator3.png
-	cd - >/dev/null || die
-
-	if use python; then
-		cd python || die
-		distutils-r1_src_install
-		cd - >/dev/null || die
-	fi
-}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 03195d068e7b..069cda2bea25 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/svxlink/Manifest b/media-radio/svxlink/Manifest
index 1ae2b5e63cee..6e88386ba8db 100644
--- a/media-radio/svxlink/Manifest
+++ b/media-radio/svxlink/Manifest
@@ -5,5 +5,5 @@ AUX svxlink.init 782 BLAKE2B 536435d70a3a5afbcf533ce39cc1b8bc0de5320ac57728a4ef7
 AUX svxlink.rc 568 BLAKE2B 7e0fa55b6d7d099778f2b20cf3b85b54a943460ade694bdf75159945f0be671eefefbffdfceaf28b092dcd4078970f88194d63311f3cea9cfb38922d83e9f1de SHA512 96e95116c031e3e5f21d1239362736c093c3e5c32adcb4eef1fa667c89a08d62cdb82640a246cf11b9fddc62544f98a660f626e91c67dd7a0d608904b8ddf6dd
 AUX svxlink.service 690 BLAKE2B 7f62518556c7c0fd0a4e759031520181f5a9a61a4d5ebcf874e60e8cd400327feee0306011ab8c88b17b8a5b666cc0fda90244b7a9e5ad9734ec629e0bf3d2f3 SHA512 2879820eaa64bc574e1a2c57492ba429cb4b5748b56132fac8922727a8924197b719075c39a6ab0ffcb698b3cf4b5eb889f19c2aac0a9d143f0aef6de778b225
 DIST svxlink-19.09.2.tar.gz 1730836 BLAKE2B 7fe8a1b018dba7837486dbed21242d8514a1f546b5eecbd2d2bfdf620d7e093cddbedab17f19d5f2cbd79c9a66825713c45a981335f0b526ba0946e764efc535 SHA512 f3c8b29953da3b2f61eba528a07152f40a2aca2efe511cb98637b1ef77fa676e506a3f4766edb81069f13333ddbae2d39f679874455b05286d3daf96a903e1c1
-EBUILD svxlink-19.09.2.ebuild 1731 BLAKE2B 0a4a1408eec6df37625d1de078e4f50913e4ebc00d34cb467039b28c5c2c95028af437ddbbc410881e4edd4759732c4e02df52b9046ebff16546fbc8eb25f58d SHA512 940b333e1244c948b8aa3ff9f0556bfbf734d22ba6f5c54b10e1abbd53c6bdc367c3a188aa4d34910c78036a0628449c8aa68cde81e3db2965e2bad8d43ea8f2
+EBUILD svxlink-19.09.2.ebuild 1792 BLAKE2B b4cd5095dbba073f0759ea11a36b57bfe50143a7de24deed4faa435c130773080c1fa545a482205eff0e2db537f716d2944d4c837c47c1ee681c0d9a8caa0e27 SHA512 998601949ff26102b23f9fc581bd2a8c564811a3d46f72690e1c03865c0150110592014ebfcc03e030472491b97aee56c7cea9de2f54751e4b76f1f8c34907cb
 MISC metadata.xml 697 BLAKE2B 069f55a9c5052ba06c5caca06588e3c137a2eea1a81dfee5df102de20f6e7c69e027c8eabddb3458877a035a982f4516cfd898b15bdd6cdeebbb4978147c4c52 SHA512 bf9262e8f4fbd0256705237a7281b211b34588b668093e6288435ffced019a288433f0b9304f67f2b7623c4781c29bfeb563c0af60452e6a3f584a71063f348c
diff --git a/media-radio/svxlink/svxlink-19.09.2.ebuild b/media-radio/svxlink/svxlink-19.09.2.ebuild
index 32d84c58f3d0..9deb6df6d74d 100644
--- a/media-radio/svxlink/svxlink-19.09.2.ebuild
+++ b/media-radio/svxlink/svxlink-19.09.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR=emake
 
-inherit cmake systemd
+inherit cmake flag-o-matic systemd
 
 CMAKE_USE_DIR="${S}/src"
 
@@ -44,6 +44,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Wodr warnings, see bug #860414
+	filter-lto
+
 	local mycmakeargs=(
 		-DSYSCONF_INSTALL_DIR=/etc
 		-DLOCAL_STATE_DIR=/var
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index e0342a82aa01..c69be6ff2c30 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 0f1f263abdcb..65dd41a0167a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Aug 2022 12:40:02 +0000
+Fri, 12 Aug 2022 18:39:38 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c3f816f0073d..8b515104b6ab 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 521770 BLAKE2B c2acb8c863b2efce05519b69900dc397016a5ee5af4af18fda8ac25353a157eb4632e81d3a44a9e724b472ac3f520214dc9c6708619ea63041d0b272f7a9be10 SHA512 6eb592a988ac90c24adf99f6fcb0f9a848c75aa47fdc37e5dbf4ebafea5daf193d2bf7928130322630437e54a2d9a93d5dd6a6ed7658bde2da05b340db2721c7
-TIMESTAMP 2022-08-12T12:40:05Z
+TIMESTAMP 2022-08-12T18:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL2SiVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL2nm1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDMLxAAi9d5/CqujVmIukxnn8hv7sSB/ZE7MdxALbY5ilYxhqviKrCPaBOKoR0x
-/Fg1lntIJZuANROH/Pig7X7UHQML/lTREswbNkP/Hq/vnlpkqeWAcwr4BOZ9O0Uw
-/1JaXLLX+TstEB0uY1zAyKW5N5chG5WZpLLv2Z90DflyAhAOWC5KJ2W5rH1KZ4aI
-St815bbwQChUvJ5u9pat9DUQRtt/L6QlWyNes+Tg4lH5E0Yk2dg3XteTAoGKnWEK
-EoUWER5Z1NSUbvp2L6jyJtM3PVSoMFdX7XJSxvepzpn+A5DMmkfoVbesxaAMB+fC
-SUaEoze4Btkg0Wu6WeqGTM7kjvs+2noDRnMzyw91t44/85uxWr9lGt0e871rX9M2
-XbxtD/FdO0AsqtKxJ+RNbzfDtdhHMD9TLCS3Dk598tm6T74+WluhtCaym3NYcJFH
-zJXW+izRa3Gh6Cr1T1voqkpzRCwxH6tkwQmFtj5vMBqv81P8bGIfVJLm5RdWr+/c
-U55R1EMxpIvHwYYXeVdgII2fLlBaRJkoGPmEIlIVSevP8evcCDBjkV5bNylqgUkc
-YaKS4hXZZwRd7KVBbexxy8/w8t0vCuySKxnglyHJAAdwPf0CimF0Em1TIlXwj8Xv
-HR6F/qvjujJjaR77j2T9Cpr6J8XzgrQhPoUM+GwGuEu3SMgpoJQ=
-=7nwx
+klBAoQ//Vi6PcZUAPJBW13jKxh86nYJHhmHi18qQu9DD3zS5axNw4OWSKWI37hys
+M//d1JvadPxgUbGgK4qu7iNdV3utoi0sNC+6LmEvWqFH3JBYapUU5AehDV6w/0Uy
+qrNCViDWAOCl8lrkTAkf66ENs42jQj9zDlFWMSLhenj5OKL3twXmh490mKHZkqTz
+tmP19wlVZSSvIuuLMOZUjCQ5O3IyQvuIrLUPTN+9dpss+km74PwmQllY0qNgK9cY
+Its3Y5HzWBjXLPkvrBojgAT5tsU4FhKJMy1VNdp0TDTZreLrrCYJs+TNMACCcC9m
++WOutyLap9tcFDaJO23+O54tQtqrLEqqwQmvYmVCBl8I1Qib4BpBtGYnYsdjuaSK
+iwPP+rWvH9k0BQCMWGYnUPZlZChqMInLKrFkKrpxuS0ap2CLH/umLM9gSm33xFbL
+amn1KIUktLmZgRoQjNzEfMLHrAINDJY5Ffg9qItQt3QJ7uD0/tfWfmrTFoGhgfW7
+CqG2qg9wQ0bu0lsEn6fiJ86HfvYbVlq0t5nx8WjMx2QJqmNpyqoo2k02HEfJ3xeK
+ZP5LzKi3aS+fJTdFZu3jcwAQO/ZvlTILCZliLaWNTC7YTh821EYrzF2TS00bnWl7
+Uv8lXmWsmOIUNJkek8LWMSAh1yBOg5N21+hDGWVviTEHEWkVrUY=
+=OHgH
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 0f1f263abdcb..65dd41a0167a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Aug 2022 12:40:02 +0000
+Fri, 12 Aug 2022 18:39:38 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index ff76bf333a8f..3fba945685c5 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 3ca292e00785..72cb2d8739e9 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.1 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.1
index 5f9af77c9d3a..c1e8a2c47421 100644
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.1
+++ b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.1
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig virtual/pkgconfig
+BDEPEND=sys-apps/help2man >=sys-devel/gettext-0.19.8 virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst
 DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.36:2 dev-libs/libltdl:0 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) espeak-ng? ( app-accessibility/espeak-ng ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio )
 DESCRIPTION=Speech synthesis interface
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 py
 SLOT=0
 SRC_URI=https://github.com/brailcom/speechd/releases/download/0.11.1/speech-dispatcher-0.11.1.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=50edb9653b18e4d7b6e1ead97cd86553
+_md5_=cb22ffc32ba640f965700ac55fe8054c
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 56a8260c557a..18c0d9248a93 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/consul-1.12.4 b/metadata/md5-cache/app-admin/consul-1.12.4
new file mode 100644
index 000000000000..8c47288add32
--- /dev/null
+++ b/metadata/md5-cache/app-admin/consul-1.12.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/consul acct-user/consul
+DESCRIPTION=A tool for service discovery, monitoring and configuration
+EAPI=7
+HOMEPAGE=https://www.consul.io
+INHERIT=go-module systemd
+KEYWORDS=~amd64 ~arm64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
+RDEPEND=acct-group/consul acct-user/consul
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.12.4.tar.gz -> consul-1.12.4.tar.gz https://dev.gentoo.org/~zmedico/dist/consul-1.12.3-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=fe20e6c32cf1e3470c8d095fffd76a0e
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 214f6c5fdc02..0d3c3e4064c0 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/xz-utils-5.2.6 b/metadata/md5-cache/app-arch/xz-utils-5.2.6
new file mode 100644
index 000000000000..06f24d9a353e
--- /dev/null
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.6
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-lassecollin ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
+DESCRIPTION=Utils for managing LZMA compressed files
+EAPI=7
+HOMEPAGE=https://tukaani.org/xz/
+INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript verify-sig
+IUSE=+extra-filters nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain LGPL-2.1+ GPL-2+
+RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
+RESTRICT=!extra-filters? ( test )
+SLOT=0
+SRC_URI=https://tukaani.org/xz/xz-5.2.6.tar.gz verify-sig? ( https://tukaani.org/xz/xz-5.2.6.tar.gz.sig )
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=858cae11d1012f395a740e3815728513
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index f057c7237af6..7357fe61b600 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -12,4 +12,4 @@ RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
 RESTRICT=!extra-filters? ( test )
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=6670179078b1db89063374851885b026
+_md5_=858cae11d1012f395a740e3815728513
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 0312c24d97fd..de8c668f00c3 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/snapper-0.10.1 b/metadata/md5-cache/app-backup/snapper-0.10.1
deleted file mode 100644
index 2ade31ca5796..000000000000
--- a/metadata/md5-cache/app-backup/snapper-0.10.1
+++ /dev/null
@@ -1,16 +0,0 @@
-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 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr ) app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Command-line program for btrfs and lvm snapshot management
-EAPI=8
-HOMEPAGE=http://snapper.io/
-INHERIT=autotools systemd
-IUSE=doc lvm pam test systemd xattr
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/openSUSE/snapper/archive/v0.10.1.tar.gz -> snapper-0.10.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3a37cc8da73cc933dbe0087293cf64e4
diff --git a/metadata/md5-cache/app-backup/snapper-0.10.2 b/metadata/md5-cache/app-backup/snapper-0.10.2
index d5b8229a101c..c2e14544a594 100644
--- a/metadata/md5-cache/app-backup/snapper-0.10.2
+++ b/metadata/md5-cache/app-backup/snapper-0.10.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://snapper.io/
 INHERIT=autotools systemd
 IUSE=doc lvm pam test systemd xattr
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openSUSE/snapper/archive/v0.10.2.tar.gz -> snapper-0.10.2.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c84fb01bbd9bc85f39ea1e60304f8fb7
+_md5_=61f1cfdf0a452e339bf7e6ec2c6265af
diff --git a/metadata/md5-cache/app-backup/snapper-0.9.1 b/metadata/md5-cache/app-backup/snapper-0.9.1
deleted file mode 100644
index af7517129ff5..000000000000
--- a/metadata/md5-cache/app-backup/snapper-0.9.1
+++ /dev/null
@@ -1,16 +0,0 @@
-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 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr ) app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Command-line program for btrfs and lvm snapshot management
-EAPI=7
-HOMEPAGE=http://snapper.io/
-INHERIT=autotools systemd bash-completion-r1
-IUSE=doc lvm pam test systemd xattr
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/json-c:= dev-libs/libxml2 dev-libs/icu:= sys-apps/acl sys-apps/dbus sys-apps/util-linux >=sys-fs/btrfs-progs-3.17.1 sys-libs/zlib virtual/libintl lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) xattr? ( sys-apps/attr )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/openSUSE/snapper/archive/v0.9.1.tar.gz -> snapper-0.9.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=39d70fc164639285765a6f9a8c0eb968
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 442a55221fae..721d574dec36 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/opencc-1.1.4 b/metadata/md5-cache/app-i18n/opencc-1.1.4
index fa6d4a8213b4..61b8ebc3d114 100644
--- a/metadata/md5-cache/app-i18n/opencc-1.1.4
+++ b/metadata/md5-cache/app-i18n/opencc-1.1.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/BYVoid/OpenCC
 INHERIT=cmake python-any-r1
 IUSE=doc test
-KEYWORDS=amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/marisa:0=
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=https://github.com/BYVoid/OpenCC/archive/ver.1.1.4.tar.gz -> opencc-1.1.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3c2890a7eedc5bd7b0bac545fabd7175
+_md5_=7d921dece30d4d8016beb17703e2ad2c
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index e249654ea992..873a1106b1f4 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/weggli-0.2.3 b/metadata/md5-cache/app-misc/weggli-0.2.3
deleted file mode 100644
index 53118478185a..000000000000
--- a/metadata/md5-cache/app-misc/weggli-0.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=a fast and robust semantic search tool for C and C++ codebases
-EAPI=8
-HOMEPAGE=https://github.com/googleprojectzero/weggli
-INHERIT=cargo
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 Unlicense
-SLOT=0
-SRC_URI=https://github.com/googleprojectzero/weggli/archive/refs/tags/v0.2.3.tar.gz -> weggli-0.2.3.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/assert_cmd/2.0.2/download -> assert_cmd-2.0.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.8.0/download -> bumpalo-3.8.0.crate https://crates.io/api/v1/crates/cast/0.2.7/download -> cast-0.2.7.crate https://crates.io/api/v1/crates/cc/1.0.72/download -> cc-1.0.72.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/colored/2.0.0/download -> colored-2.0.0.crate https://crates.io/api/v1/crates/criterion/0.3.5/download -> criterion-0.3.5.crate https://crates.io/api/v1/crates/criterion-plot/0.4.4/download -> criterion-plot-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download -> crossbeam-channel-0.5.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.5/download -> crossbeam-epoch-0.9.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.5/download -> crossbeam-utils-0.8.5.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.21/download -> ctor-0.1.21.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/ghost/0.1.2/download -> ghost-0.1.2.crate https://crates.io/api/v1/crates/half/1.8.2/download -> half-1.8.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/inventory/0.1.11/download -> inventory-0.1.11.crate https://crates.io/api/v1/crates/inventory-impl/0.1.11/download -> inventory-impl-0.1.11.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/js-sys/0.3.55/download -> js-sys-0.3.55.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.107/download -> libc-0.2.107.crate https://crates.io/api/v1/crates/lock_api/0.4.5/download -> lock_api-0.4.5.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/oorandom/11.1.3/download -> oorandom-11.1.3.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/plotters/0.3.1/download -> plotters-0.3.1.crate https://crates.io/api/v1/crates/plotters-backend/0.3.2/download -> plotters-backend-0.3.2.crate https://crates.io/api/v1/crates/plotters-svg/0.3.1/download -> plotters-svg-0.3.1.crate https://crates.io/api/v1/crates/predicates/1.0.8/download -> predicates-1.0.8.crate https://crates.io/api/v1/crates/predicates/2.0.3/download -> predicates-2.0.3.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.4/download -> predicates-tree-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.32/download -> proc-macro2-1.0.32.crate https://crates.io/api/v1/crates/pyo3/0.13.2/download -> pyo3-0.13.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.13.2/download -> pyo3-macros-0.13.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.13.2/download -> pyo3-macros-backend-0.13.2.crate https://crates.io/api/v1/crates/quote/1.0.10/download -> quote-1.0.10.crate https://crates.io/api/v1/crates/rayon/1.5.1/download -> rayon-1.5.1.crate https://crates.io/api/v1/crates/rayon-core/1.9.1/download -> rayon-core-1.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/1.0.4/download -> semver-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.130/download -> serde-1.0.130.crate https://crates.io/api/v1/crates/serde_cbor/0.11.2/download -> serde_cbor-0.11.2.crate https://crates.io/api/v1/crates/serde_derive/1.0.130/download -> serde_derive-1.0.130.crate https://crates.io/api/v1/crates/serde_json/1.0.69/download -> serde_json-1.0.69.crate https://crates.io/api/v1/crates/simplelog/0.10.2/download -> simplelog-0.10.2.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.81/download -> syn-1.0.81.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/termtree/0.2.3/download -> termtree-0.2.3.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinytemplate/1.2.1/download -> tinytemplate-1.2.1.crate https://crates.io/api/v1/crates/tree-sitter/0.19.5/download -> tree-sitter-0.19.5.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.7/download -> unindent-0.1.7.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.78/download -> wasm-bindgen-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.78/download -> wasm-bindgen-backend-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.78/download -> wasm-bindgen-macro-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.78/download -> wasm-bindgen-macro-support-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.78/download -> wasm-bindgen-shared-0.2.78.crate https://crates.io/api/v1/crates/web-sys/0.3.55/download -> web-sys-0.3.55.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7e74d19a24a9eb4b65967ce34b940798
diff --git a/metadata/md5-cache/app-misc/weggli-0.2.4 b/metadata/md5-cache/app-misc/weggli-0.2.4
new file mode 100644
index 000000000000..4d66c81fc0c3
--- /dev/null
+++ b/metadata/md5-cache/app-misc/weggli-0.2.4
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=a fast and robust semantic search tool for C and C++ codebases
+EAPI=8
+HOMEPAGE=https://github.com/googleprojectzero/weggli
+INHERIT=cargo flag-o-matic
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 Unlicense
+SLOT=0
+SRC_URI=https://github.com/googleprojectzero/weggli/archive/refs/tags/v0.2.4.tar.gz -> weggli-0.2.4.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/assert_cmd/2.0.2/download -> assert_cmd-2.0.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/cast/0.2.7/download -> cast-0.2.7.crate https://crates.io/api/v1/crates/cc/1.0.72/download -> cc-1.0.72.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/colored/2.0.0/download -> colored-2.0.0.crate https://crates.io/api/v1/crates/criterion/0.3.5/download -> criterion-0.3.5.crate https://crates.io/api/v1/crates/criterion-plot/0.4.4/download -> criterion-plot-0.4.4.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.2/download -> crossbeam-channel-0.5.2.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.6/download -> crossbeam-epoch-0.9.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.6/download -> crossbeam-utils-0.8.6.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.21/download -> ctor-0.1.21.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/float-cmp/0.8.0/download -> float-cmp-0.8.0.crate https://crates.io/api/v1/crates/ghost/0.1.2/download -> ghost-0.1.2.crate https://crates.io/api/v1/crates/half/1.8.2/download -> half-1.8.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/inventory/0.1.11/download -> inventory-0.1.11.crate https://crates.io/api/v1/crates/inventory-impl/0.1.11/download -> inventory-impl-0.1.11.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/js-sys/0.3.55/download -> js-sys-0.3.55.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.112/download -> libc-0.2.112.crate https://crates.io/api/v1/crates/lock_api/0.4.5/download -> lock_api-0.4.5.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/oorandom/11.1.3/download -> oorandom-11.1.3.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/plotters/0.3.1/download -> plotters-0.3.1.crate https://crates.io/api/v1/crates/plotters-backend/0.3.2/download -> plotters-backend-0.3.2.crate https://crates.io/api/v1/crates/plotters-svg/0.3.1/download -> plotters-svg-0.3.1.crate https://crates.io/api/v1/crates/predicates/1.0.8/download -> predicates-1.0.8.crate https://crates.io/api/v1/crates/predicates/2.1.0/download -> predicates-2.1.0.crate https://crates.io/api/v1/crates/predicates-core/1.0.2/download -> predicates-core-1.0.2.crate https://crates.io/api/v1/crates/predicates-tree/1.0.4/download -> predicates-tree-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/pyo3/0.13.2/download -> pyo3-0.13.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.13.2/download -> pyo3-macros-0.13.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.13.2/download -> pyo3-macros-backend-0.13.2.crate https://crates.io/api/v1/crates/quote/1.0.14/download -> quote-1.0.14.crate https://crates.io/api/v1/crates/rayon/1.5.1/download -> rayon-1.5.1.crate https://crates.io/api/v1/crates/rayon-core/1.9.1/download -> rayon-core-1.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/1.0.4/download -> semver-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.133/download -> serde-1.0.133.crate https://crates.io/api/v1/crates/serde_cbor/0.11.2/download -> serde_cbor-0.11.2.crate https://crates.io/api/v1/crates/serde_derive/1.0.133/download -> serde_derive-1.0.133.crate https://crates.io/api/v1/crates/serde_json/1.0.74/download -> serde_json-1.0.74.crate https://crates.io/api/v1/crates/simplelog/0.10.2/download -> simplelog-0.10.2.crate https://crates.io/api/v1/crates/smallvec/1.7.0/download -> smallvec-1.7.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.85/download -> syn-1.0.85.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/termtree/0.2.4/download -> termtree-0.2.4.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinytemplate/1.2.1/download -> tinytemplate-1.2.1.crate https://crates.io/api/v1/crates/tree-sitter/0.20.2/download -> tree-sitter-0.20.2.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.7/download -> unindent-0.1.7.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.78/download -> wasm-bindgen-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.78/download -> wasm-bindgen-backend-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.78/download -> wasm-bindgen-macro-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.78/download -> wasm-bindgen-macro-support-0.2.78.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.78/download -> wasm-bindgen-shared-0.2.78.crate https://crates.io/api/v1/crates/web-sys/0.3.55/download -> web-sys-0.3.55.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=bf135eef7f3913aafba05302af23f7a0
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 8a83979dddf1..6c6aaaa96e60 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/fzf-0.32.1 b/metadata/md5-cache/app-shells/fzf-0.32.1
new file mode 100644
index 000000000000..b487c4466597
--- /dev/null
+++ b/metadata/md5-cache/app-shells/fzf-0.32.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare unpack
+DESCRIPTION=General-purpose command-line fuzzy finder, written in Golang
+EAPI=8
+HOMEPAGE=https://github.com/junegunn/fzf
+INHERIT=bash-completion-r1 go-module
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT BSD-with-disclosure
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/junegunn/fzf/archive/0.32.1.tar.gz -> fzf-0.32.1.tar.gz https://dev.gentoo.org/~sam/distfiles/app-shells/fzf/fzf-0.32.1-deps.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=449a125787a90bce99b8787ac402175d
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index ba60c65b343f..14cb8fab68a4 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/java-service-wrapper-3.5.25-r2 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r2
deleted file mode 100644
index f430d94f1844..000000000000
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=virtual/jdk:1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=A wrapper that makes it possible to install a Java Application as daemon
-EAPI=7
-HOMEPAGE=http://wrapper.tanukisoftware.org/
-INHERIT=java-pkg-2 java-ant-2 toolchain-funcs
-IUSE=doc source test
-KEYWORDS=amd64 ~arm x86
-LICENSE=tanuki-community
-RDEPEND=virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://wrapper.tanukisoftware.org/download/3.5.25/wrapper_3.5.25_src.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d0aeb80cc4cce8db41bbe12cbbc97a9b
diff --git a/metadata/md5-cache/dev-java/jctools-core-3.1.0 b/metadata/md5-cache/dev-java/jctools-core-3.1.0
deleted file mode 100644
index 8dc4b1512cd0..000000000000
--- a/metadata/md5-cache/dev-java/jctools-core-3.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/guava-testlib:0 dev-java/hamcrest-library:1.3 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Java Concurrency Tools Core Library
-EAPI=8
-HOMEPAGE=https://jctools.github.io/JCTools/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=https://github.com/JCTools/JCTools/archive/v3.1.0.tar.gz -> jctools-3.1.0.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=244b62ab66a92d1285ebb725c3db0ce8
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-42.4.1 b/metadata/md5-cache/dev-java/jdbc-postgresql-42.4.1
index 476eda0ea23b..522e34bd63b4 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-42.4.1
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-42.4.1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://jdbc.postgresql.org/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.8:* dev-java/scram:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-42.4.1.src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=01eb9945b506d46789d8ecbe2356eded
+_md5_=391e3440977f033919c05f3ca52908eb
diff --git a/metadata/md5-cache/dev-java/log4j-12-api-2.17.2 b/metadata/md5-cache/dev-java/log4j-12-api-2.17.2
deleted file mode 100644
index dd97c5820794..000000000000
--- a/metadata/md5-cache/dev-java/log4j-12-api-2.17.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=~dev-java/log4j-api-2.17.2:2 ~dev-java/log4j-core-2.17.2:2 >=virtual/jdk-1.8:* dev-java/jboss-jms-api:1.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=The Apache Log4j 1.x Compatibility API
-EAPI=8
-HOMEPAGE=https://logging.apache.org/log4j/2.x/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-java/log4j-api-2.17.2:2 ~dev-java/log4j-core-2.17.2:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=571098f937e395b5d31e9c89fd54ab81
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.17.2 b/metadata/md5-cache/dev-java/log4j-api-2.17.2
deleted file mode 100644
index 61bb1e701c33..000000000000
--- a/metadata/md5-cache/dev-java/log4j-api-2.17.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=The Apache Log4j API
-EAPI=8
-HOMEPAGE=https://logging.apache.org/log4j/2.x/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=aab9b71adce49ddbcf80053e6539a3ed
diff --git a/metadata/md5-cache/dev-java/log4j-core-2.17.2-r1 b/metadata/md5-cache/dev-java/log4j-core-2.17.2-r1
deleted file mode 100644
index f8452a2622fa..000000000000
--- a/metadata/md5-cache/dev-java/log4j-core-2.17.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jakarta-activation-api:1 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:3 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.17.2:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 dev-java/jboss-jms-api:1.1 dev-java/osgi-core-api:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=The Apache Log4j Implementation
-EAPI=8
-HOMEPAGE=https://logging.apache.org/log4j/2.x/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* dev-java/commons-compress:0 dev-java/commons-csv:0 dev-java/conversant-disruptor:0 dev-java/jackson-core:0 dev-java/jackson-databind:0 dev-java/jackson-dataformat-xml:0 dev-java/jackson-dataformat-yaml:0 dev-java/jakarta-activation-api:1 dev-java/jansi:2 dev-java/javax-mail:0 dev-java/jctools-core:3 dev-java/jeromq:0 dev-java/kafka-clients:0 dev-java/lmax-disruptor:0 ~dev-java/log4j-api-2.17.2:2 dev-java/slf4j-api:0 dev-java/woodstox-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=2
-SRC_URI=mirror://apache/logging/log4j/2.17.2/apache-log4j-2.17.2-src.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=1c2a068148bf5da72984cfd812e5879b
diff --git a/metadata/md5-cache/dev-java/xsdlib-20090415-r1 b/metadata/md5-cache/dev-java/xsdlib-20090415-r1
deleted file mode 100644
index c19bf435e6fc..000000000000
--- a/metadata/md5-cache/dev-java/xsdlib-20090415-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Sun XML Datatypes Library
-EAPI=7
-HOMEPAGE=http://msv.java.net/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD Apache-1.1
-RDEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://java.net/downloads/msv/releases/xsdlib.20090415.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=450d84935fd1f21e92dbd894ff81d532
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 8f1171e92a9c..a8bd5a8c2928 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/libutf8proc-2.5.0 b/metadata/md5-cache/dev-libs/libutf8proc-2.5.0
deleted file mode 100644
index 12774a7da40a..000000000000
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( =app-i18n/unicode-data-13.0* )
-DEFINED_PHASES=compile install prepare test
-DESCRIPTION=A clean C Library for processing UTF-8 Unicode data
-EAPI=7
-HOMEPAGE=https://github.com/JuliaStrings/utf8proc
-INHERIT=toolchain-funcs
-IUSE=cjk static-libs test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/2.5.0
-SRC_URI=https://github.com/JuliaStrings/utf8proc/archive/v2.5.0.tar.gz -> libutf8proc-2.5.0.tar.gz cjk? ( https://dev.gentoo.org/~hattya/distfiles/libutf8proc-EastAsianWidth-13.0.0.xz )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4bd45ffe2ff4284b24843622a440851b
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.6.1 b/metadata/md5-cache/dev-libs/libutf8proc-2.6.1
deleted file mode 100644
index 664182897799..000000000000
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( =app-i18n/unicode-data-13.0* || ( dev-lang/ruby:2.7 ) virtual/rubygems )
-DEFINED_PHASES=compile install prepare test
-DESCRIPTION=A clean C Library for processing UTF-8 Unicode data
-EAPI=7
-HOMEPAGE=https://github.com/JuliaStrings/utf8proc
-INHERIT=ruby-single toolchain-funcs
-IUSE=cjk static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/2.6.1
-SRC_URI=https://github.com/JuliaStrings/utf8proc/archive/v2.6.1.tar.gz -> libutf8proc-2.6.1.tar.gz cjk? ( https://dev.gentoo.org/~hattya/distfiles/libutf8proc-EastAsianWidth-13.0.0-r1.xz )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b5a5d4f0f699639de4a6bdd19c896cb4
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f451d7d50cdd..dbe2f853e09f 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/PyPDF2-2.4.1 b/metadata/md5-cache/dev-python/PyPDF2-2.4.1
deleted file mode 100644
index 3997f82aa42f..000000000000
--- a/metadata/md5-cache/dev-python/PyPDF2-2.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Python library to work with PDF files
-EAPI=8
-HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) 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/py-pdf/PyPDF2/archive/2.4.1.tar.gz -> PyPDF2-2.4.1.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.tar.gz -> PyPDF2-sample-files-4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.gh.tar.gz )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=01e3df90647081689ed86a0f40eaeda9
diff --git a/metadata/md5-cache/dev-python/autobahn-22.5.1-r1 b/metadata/md5-cache/dev-python/autobahn-22.5.1-r1
deleted file mode 100644
index 0d8ede49a701..000000000000
--- a/metadata/md5-cache/dev-python/autobahn-22.5.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/wsaccel-0.6.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snappy-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/msgpack-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ujson-4.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cbor2-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/py-ubjson-0.16.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flatbuffers-1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-20.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/service_identity-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pynacl-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytrie-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cffi-1.14.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/argon2-cffi-20.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/passlib-1.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=WebSocket and WAMP for Twisted and Asyncio
-EAPI=8
-HOMEPAGE=https://crossbar.io/autobahn/ https://github.com/crossbario/autobahn-python/ https://pypi.org/project/autobahn/
-INHERIT=distutils-r1 optfeature
-IUSE=test xbr python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/zope-interface-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-20.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-20.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/txaio-21.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hyperlink-21.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/autobahn/autobahn-22.5.1.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8c1ee1749a34d73e785e33004688b932
diff --git a/metadata/md5-cache/dev-python/debugpy-1.6.0 b/metadata/md5-cache/dev-python/debugpy-1.6.0
deleted file mode 100644
index 4c6fe2e7c50f..000000000000
--- a/metadata/md5-cache/dev-python/debugpy-1.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pydevd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An implementation of the Debug Adapter Protocol for Python
-EAPI=8
-HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/pydevd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/microsoft/debugpy/archive/v1.6.0.tar.gz -> debugpy-1.6.0.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=79b101d535b70eab7ab807d2ef6794c7
diff --git a/metadata/md5-cache/dev-python/pyside6-6.3.1 b/metadata/md5-cache/dev-python/pyside6-6.3.1
new file mode 100644
index 000000000000..575b542a8baf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyside6-6.3.1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/shiboken6-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtbase-6.3:6[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?] designer? ( >=dev-qt/qttools-6.3:6[designer] ) gui? ( >=dev-qt/qtbase-6.3:6[gui,jpeg] ) help? ( >=dev-qt/qttools-6.3:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.3:6[qml(+)?,gles2-only(-)=,widgets(+)?] ) positioning? ( >=dev-qt/qtpositioning-6.3:6[qml(+)?] ) printsupport? ( >=dev-qt/qtbase-6.3:6[gui,widgets] ) qml? ( >=dev-qt/qtdeclarative-6.3:6[widgets?] ) quick3d? ( >=dev-qt/qtquick3d-6.3:6 ) serialport? ( >=dev-qt/qtserialport-6.3:6 ) svg? ( >=dev-qt/qtsvg-6.3:6 ) testlib? ( >=dev-qt/qtbase-6.3:6[gui] ) webchannel? ( >=dev-qt/qtwebchannel-6.3:6[qml(+)?] ) webengine? ( >=dev-qt/qtwebengine-6.3:6[widgets?] ) websockets? ( >=dev-qt/qtwebsockets-6.3:6 ) test? ( >=dev-qt/qtbase-6.3:6[gui] )
+DESCRIPTION=Python bindings for the Qt framework
+EAPI=8
+HOMEPAGE=https://wiki.qt.io/PySide6
+INHERIT=cmake python-r1 virtualx
+IUSE=dbus +concurrent designer gles2-only +gui help multimedia +network opengl positioning printsupport qml quick quick3d serialport +sql svg test +testlib webchannel webengine websockets +widgets +xml python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/shiboken6-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-qt/qtbase-6.3:6[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?] designer? ( >=dev-qt/qttools-6.3:6[designer] ) gui? ( >=dev-qt/qtbase-6.3:6[gui,jpeg] ) help? ( >=dev-qt/qttools-6.3:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.3:6[qml(+)?,gles2-only(-)=,widgets(+)?] ) positioning? ( >=dev-qt/qtpositioning-6.3:6[qml(+)?] ) printsupport? ( >=dev-qt/qtbase-6.3:6[gui,widgets] ) qml? ( >=dev-qt/qtdeclarative-6.3:6[widgets?] ) quick3d? ( >=dev-qt/qtquick3d-6.3:6 ) serialport? ( >=dev-qt/qtserialport-6.3:6 ) svg? ( >=dev-qt/qtsvg-6.3:6 ) testlib? ( >=dev-qt/qtbase-6.3:6[gui] ) webchannel? ( >=dev-qt/qtwebchannel-6.3:6[qml(+)?] ) webengine? ( >=dev-qt/qtwebengine-6.3:6[widgets?] ) websockets? ( >=dev-qt/qtwebsockets-6.3:6 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) designer? ( widgets ) gles2-only? ( gui ) help? ( widgets ) multimedia? ( gui network ) opengl? ( gui ) printsupport? ( widgets ) qml? ( network ) quick? ( gui network opengl qml ) quick3d? ( gui network opengl qml quick ) sql? ( widgets ) svg? ( gui ) testlib? ( widgets ) webengine? ( network gui printsupport webchannel ) websockets? ( network ) widgets? ( gui )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.3.1-src/pyside-setup-opensource-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=16120f823828a6bec459db0ca6425a43
diff --git a/metadata/md5-cache/dev-python/pyside6-tools-6.3.1 b/metadata/md5-cache/dev-python/pyside6-tools-6.3.1
new file mode 100644
index 000000000000..29936c08ea7f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyside6-tools-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/pyside6-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=PySide development tools (pyside6-lupdate with support for Python)
+EAPI=8
+HOMEPAGE=https://wiki.qt.io/PySide6
+INHERIT=cmake python-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/pyside6-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.3.1-src/pyside-setup-opensource-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=746ed25c71f83a715a6c6b426e91f44c
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.4.0_p20220420 b/metadata/md5-cache/dev-python/python-ldap-3.4.0_p20220420
deleted file mode 100644
index 05d8a3efa41c..000000000000
--- a/metadata/md5-cache/dev-python/python-ldap-3.4.0_p20220420
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-nds/openldap:=[sasl?,ssl?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-nds/openldap:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 )
-DESCRIPTION=Various LDAP-related Python modules
-EAPI=8
-HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap
-INHERIT=distutils-r1
-IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~x86-solaris
-LICENSE=MIT PSF-2
-RDEPEND=>=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-nds/openldap:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-ldap/python-ldap/archive/7f30c4721ea2ca4373ed7860e6467781f0afa758.tar.gz -> python-ldap-3.4.0_p20220420.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ef1b94bf357885c661df34c428bd450c
diff --git a/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r3 b/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r3
index ca6b5d8a6190..8716468bbdc2 100644
--- a/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r3
+++ b/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r3
@@ -11,6 +11,6 @@ LICENSE=BSD
 RDEPEND=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/rtimulib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
-SRC_URI=https://github.com/astro-pi/python-sense-hat/archive/v2.2.0.tar.gz -> python-sense-hat-2.2.0.tar.gz
+SRC_URI=https://github.com/astro-pi/python-sense-hat/archive/v2.2.0.tar.gz -> python-sense-hat-2.2.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6a76fb080526816e198abef134b23419
+_md5_=a7cc5bb06aeab9d51adaaf5fb65c3d09
diff --git a/metadata/md5-cache/dev-python/python-sense-hat-2.4.0 b/metadata/md5-cache/dev-python/python-sense-hat-2.4.0
new file mode 100644
index 000000000000..8ba0e8f015be
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-sense-hat-2.4.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rtimulib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Raspberry Pi Sense HAT python library
+EAPI=8
+HOMEPAGE=https://github.com/astro-pi/python-sense-hat
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~arm ~arm64
+LICENSE=BSD
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rtimulib[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/astro-pi/python-sense-hat/archive/v2.4.0.tar.gz -> python-sense-hat-2.4.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8312e5dedd0107c0295b6dad7ac25c1c
diff --git a/metadata/md5-cache/dev-python/regex-2022.6.2 b/metadata/md5-cache/dev-python/regex-2022.6.2
deleted file mode 100644
index 16fec4f5452e..000000000000
--- a/metadata/md5-cache/dev-python/regex-2022.6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Alternative regular expression module to replace re
-EAPI=8
-HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex/ https://pypi.org/project/regex/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/regex/regex-2022.6.2.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=88d190d0d3122b83ecad6ab200cd8556
diff --git a/metadata/md5-cache/dev-python/regex-2022.7.24 b/metadata/md5-cache/dev-python/regex-2022.7.24
deleted file mode 100644
index 6bb87375db28..000000000000
--- a/metadata/md5-cache/dev-python/regex-2022.7.24
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Alternative regular expression module to replace re
-EAPI=8
-HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex/ https://pypi.org/project/regex/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/regex/regex-2022.7.24.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1ad205f76c461be4a3a0f2e7ef50a02b
diff --git a/metadata/md5-cache/dev-python/setuptools-rust-1.3.0 b/metadata/md5-cache/dev-python/setuptools-rust-1.3.0
deleted file mode 100644
index ddda9b172737..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-rust-1.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-6.3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=A plugin for setuptools to build Rust Python extensions
-EAPI=8
-HOMEPAGE=https://github.com/PyO3/setuptools-rust/ https://pypi.org/project/setuptools-rust/
-INHERIT=distutils-r1 cargo
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools-rust/setuptools-rust-1.3.0.tar.gz test? ( https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/cssparser/0.27.2/download -> cssparser-0.27.2.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dtoa-short/0.3.3/download -> dtoa-short-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/html5ever/0.25.1/download -> html5ever-0.25.1.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/kuchiki/0.8.1/download -> kuchiki-0.8.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/pyo3/0.16.2/download -> pyo3-0.16.2.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.2/download -> pyo3-build-config-0.16.2.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.2/download -> pyo3-ffi-0.16.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.2/download -> pyo3-macros-0.16.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.2/download -> pyo3-macros-backend-0.16.2.crate https://crates.io/api/v1/crates/quote/1.0.16/download -> quote-1.0.16.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selectors/0.22.0/download -> selectors-0.22.0.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/string_cache/0.8.3/download -> string_cache-0.8.3.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.1/download -> string_cache_codegen-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.89/download -> syn-1.0.89.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/thin-slice/0.1.1/download -> thin-slice-0.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate )
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9b09a6bcf0fe03305f107cd7e72a257f
diff --git a/metadata/md5-cache/dev-python/shiboken6-6.3.1 b/metadata/md5-cache/dev-python/shiboken6-6.3.1
new file mode 100644
index 000000000000..b58f5fa37c53
--- /dev/null
+++ b/metadata/md5-cache/dev-python/shiboken6-6.3.1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-qt/qtbase-6.3:6 sys-devel/clang:= sys-devel/clang-runtime:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) vulkan? ( dev-util/vulkan-headers ) test? ( >=dev-qt/qtbase-6.3:6[gui] ) !!sys-devel/llvm:0
+DESCRIPTION=Python binding generator for C++ libraries
+EAPI=8
+HOMEPAGE=https://wiki.qt.io/PySide6
+INHERIT=cmake llvm python-r1 toolchain-funcs
+IUSE=+docstrings numpy test vulkan python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
+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 ) >=dev-qt/qtbase-6.3:6 sys-devel/clang:= sys-devel/clang-runtime:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) vulkan? ( dev-util/vulkan-headers )
+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://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.3.1-src/pyside-setup-opensource-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=05d7c2fab1fa3ca3402066a1d7ca3bdb
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 40c7c2aa88f4..0f1b073c3d47 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.5-r1
index c2f17dc91625..ab7fe1939f9b 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.5*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=d7066d0cfdeacfb718332604e4358114
+_md5_=ca9772f81f5e53144534fe62aa756105
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.5-r2 b/metadata/md5-cache/dev-qt/qtcore-5.15.5-r2
index db9097be0faf..1e5a86c74716 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.5-r2
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.5-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=linux-info qt5-build
 IUSE=icu old-kernel systemd debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= )
 RESTRICT=test
 SLOT=5/5.15.5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=e439de1123fffbc34c02a0036ea4d3dd
+_md5_=f1ee72bd787189d93260e776375eb6bd
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtdbus-5.15.5-r1
index 03eacb83c652..091ccdc7a329 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.5*:5= sys-apps/dbus
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=70f0b442c1492da25f70d195859d2c10
+_md5_=9b1e71f0c807a93d54764788fd584bd3
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtgui-5.15.5-r1
index 8b9e1b06fd58..999da14c2c43 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.5-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.5* )
 RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.5*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.5* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.5* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.5* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:=[xkb] x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=5/5.15.5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=dec37ee274a2f888d130ceeb01ab92ae
+_md5_=32f25fb3727aa7beeec7095c225520b5
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.5-r2 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.5-r2
index a77617e6194a..41c5b71e99d5 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.5-r2
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.5-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtimageformats https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=mng debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.5* =dev-qt/qtgui-5.15.5* media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtimageformats-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.5-gentoo-kde-3.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=b8d2b4a4c09f3a2b8c6291eba56fc746
+_md5_=ffc2cc27749e4fd2176fb67ea878a550
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5-r1
index 2dfedea8fd2b..9b763769c469 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=cups gles2-only test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.5*:5= =dev-qt/qtgui-5.15.5*[gles2-only=] =dev-qt/qtwidgets-5.15.5*[gles2-only=] cups? ( net-print/cups )
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=4042bec4123ac8b753e71f4b5c4d928f
+_md5_=93eee6929692902082667de5beaf1a6c
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtsvg-5.15.5-r1
index 64a4f2f4b2f6..3b51bba05218 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtsvg https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.5* =dev-qt/qtgui-5.15.5* =dev-qt/qtwidgets-5.15.5* sys-libs/zlib:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtsvg-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtsvg-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=d87e211eb59636f3b65cfaca54e18810
+_md5_=aa751f1ee04d34965280675dca425cbd
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtwayland-5.15.5-r1
index db1a266124ec..10ca35f678cf 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwayland https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=vulkan X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.5*:5= =dev-qt/qtdeclarative-5.15.5*:5= =dev-qt/qtgui-5.15.5*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.5*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
 RESTRICT=test
 SLOT=5/5.15.5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtwayland-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=db75232db623cc1159ef533a8f9cb802
+_md5_=e386a1f8e99fb1f9285bcd5c7d7ab659
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.5-r1 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.5-r1
index 51a763fa48d0..a3352d8c2a4b 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.5-r1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.5-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=dbus gles2-only gtk +png +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.5*:5= =dev-qt/qtgui-5.15.5*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.5* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.5*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
 REQUIRED_USE=gtk? ( dbus )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=276b560d4fbf1bf860f087fa2454c39c
+_md5_=c7d5821320e5278e239a2a279bc10d9f
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 74f5513a2a8c..a803147d984d 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/android-tools-31.0.0_p1 b/metadata/md5-cache/dev-util/android-tools-31.0.0_p1
deleted file mode 100644
index 6dcfd8e533ef..000000000000
--- a/metadata/md5-cache/dev-util/android-tools-31.0.0_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/go >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= virtual/libusb:1=
-DESCRIPTION=Android platform tools (adb, fastboot, and mkbootimg)
-EAPI=7
-HOMEPAGE=https://github.com/nmeum/android-tools/ https://developer.android.com/
-INHERIT=cmake python-r1
-IUSE=python python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86 ~x86-linux
-LICENSE=Apache-2.0 BSD-2
-RDEPEND=app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= virtual/libusb:1= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
-SLOT=0
-SRC_URI=https://github.com/nmeum/android-tools/releases/download/31.0.0p1/android-tools-31.0.0p1.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-no-gtest.patch -> android-tools-no-gtest.patch https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-fix-gcc11.patch -> android-tools-fix-gcc11.patch https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-dont-install-license.patch -> android-tools-dont-install-license.patch https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.0_p1-install-e2fsdroid-ext2simg.patch -> android-tools-install-e2fsdroid-ext2simg.patch
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ff29c70296da16a076256a3482e0be71
diff --git a/metadata/md5-cache/dev-util/android-tools-31.0.3_p1 b/metadata/md5-cache/dev-util/android-tools-31.0.3_p2
index 8f891f3bdac7..045ef8c972eb 100644
--- a/metadata/md5-cache/dev-util/android-tools-31.0.3_p1
+++ b/metadata/md5-cache/dev-util/android-tools-31.0.3_p2
@@ -5,12 +5,12 @@ DESCRIPTION=Android platform tools (adb, fastboot, and mkbootimg)
 EAPI=8
 HOMEPAGE=https://github.com/nmeum/android-tools/ https://developer.android.com/
 INHERIT=cmake python-r1
-IUSE=python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x86-linux
 LICENSE=Apache-2.0 BSD-2
-RDEPEND=app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= virtual/libusb:1= python? ( 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? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RDEPEND=app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= virtual/libusb:1= python? ( 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? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
-SRC_URI=https://github.com/nmeum/android-tools/releases/download/31.0.3p1/android-tools-31.0.3p1.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-no-gtest.patch https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-disable-werror-boringssl.patch https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3_p1-install-e2fsdroid-ext2simg.patch
+SRC_URI=https://github.com/nmeum/android-tools/releases/download/31.0.3p2/android-tools-31.0.3p2.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-no-gtest.patch
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7db3ca60d89825e7aec79453558cdc65
+_md5_=b38351823963e901cf72478061fbc6a5
diff --git a/metadata/md5-cache/dev-util/cmake-3.22.4 b/metadata/md5-cache/dev-util/cmake-3.22.4
index 816d5092cfba..6c8ed9197433 100644
--- a/metadata/md5-cache/dev-util/cmake-3.22.4
+++ b/metadata/md5-cache/dev-util/cmake-3.22.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://cmake.org/
 INHERIT=bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing toolchain-funcs virtualx xdg-utils
 IUSE=doc emacs ncurses qt5 test test
-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
+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=CMake
 RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.22/cmake-3.22.4.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5f00a68df7195a21adb209ff92f25555
+_md5_=4d2fbb44c8860c8cac04c0c397826cf6
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 44539dd372c6..fd962190b86a 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-2.37.2 b/metadata/md5-cache/dev-vcs/git-2.37.2
new file mode 100644
index 000000000000..785fc546f589
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.37.2
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=8
+HOMEPAGE=https://www.git-scm.com/
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 +safe-directory selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( 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 ) ) selinux? ( sec-policy/selinux-git )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.37.2.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.37.2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.37.2.tar.xz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=33cd14df48fdf05c127e30ec2977bc19
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index e68dd4e883b1..f1055f9443e3 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.96.0-r1 b/metadata/md5-cache/kde-frameworks/khtml-5.96.0-r1
index e2f362cc074e..8676c7ddeb2f 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.96.0-r1
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.96.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://develop.kde.org/products/frameworks/
 INHERIT=ecm frameworks.kde.org
 IUSE=X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2
 RDEPEND=dev-libs/openssl:0 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kglobalaccel-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/kjs-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kparts-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwallet-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5[X?] =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/sonnet-5.96*:5 media-libs/giflib:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/phonon-4.11.0 sys-libs/zlib X? ( >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.96
 SRC_URI=mirror://kde/stable/frameworks/5.96/portingAids/khtml-5.96.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7a83ffe7f4faf69e094d1ca95f245e23
+_md5_=514874f1ab0d9417a9e62b79054ef228
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.96.0-r1 b/metadata/md5-cache/kde-frameworks/kinit-5.96.0-r1
index 67c111ae6563..f8bd9d3f5b78 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.96.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.96.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://develop.kde.org/products/frameworks/
 INHERIT=ecm frameworks.kde.org
 IUSE=+caps +man X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kio-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5[X?] caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.96
 SRC_URI=mirror://kde/stable/frameworks/5.96/kinit-5.96.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9a1387fece22dec81ca82c6da164dd59
+_md5_=5cf85e1fde7ab6b4b3599cd3268e266f
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.96.0-r3 b/metadata/md5-cache/kde-frameworks/kio-5.96.0-r3
index 2698f2638187..a97305450774 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.96.0-r3
+++ b/metadata/md5-cache/kde-frameworks/kio-5.96.0-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://develop.kde.org/products/frameworks/
 INHERIT=ecm frameworks.kde.org xdg-utils
 IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2+
 PDEPEND=>=kde-frameworks/kded-5.96:5
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5[ssl] >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 =kde-frameworks/kauth-5.96*:5 =kde-frameworks/karchive-5.96*:5 =kde-frameworks/kbookmarks-5.96*:5 =kde-frameworks/kcodecs-5.96*:5 =kde-frameworks/kcompletion-5.96*:5 =kde-frameworks/kconfig-5.96*:5 =kde-frameworks/kconfigwidgets-5.96*:5 =kde-frameworks/kcoreaddons-5.96*:5 =kde-frameworks/kcrash-5.96*:5 =kde-frameworks/kdbusaddons-5.96*:5 =kde-frameworks/kguiaddons-5.96*:5 =kde-frameworks/ki18n-5.96*:5 =kde-frameworks/kiconthemes-5.96*:5 =kde-frameworks/kitemviews-5.96*:5 =kde-frameworks/kjobwidgets-5.96*:5 =kde-frameworks/knotifications-5.96*:5 =kde-frameworks/kservice-5.96*:5 =kde-frameworks/ktextwidgets-5.96*:5 =kde-frameworks/kwidgetsaddons-5.96*:5 =kde-frameworks/kwindowsystem-5.96*:5[X?] =kde-frameworks/kxmlgui-5.96*:5 =kde-frameworks/solid-5.96*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.96*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.96*:5 ) X? ( >=dev-qt/qtx11extras-5.15.4:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5/5.96
 SRC_URI=mirror://kde/stable/frameworks/5.96/kio-5.96.0.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	frameworks.kde.org	c2fd5a72d3ab78b02072d048e723db69	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ca4550ab85a38b432eb19b64b595fc75
+_md5_=5401c66f75ba6ebaa196485de84c2544
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index cfb57bacf878..cc6589df9d4a 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.24.6-r2 b/metadata/md5-cache/kde-plasma/kwin-5.24.6-r2
index 87263353b651..4f29db843f23 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.24.6-r2
+++ b/metadata/md5-cache/kde-plasma/kwin-5.24.6-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm plasma.kde.org optfeature
 IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 PDEPEND=>=kde-plasma/kde-cli-tools-5.24.6:5
 RDEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtx11extras-5.15.4:5 >=kde-frameworks/kactivities-5.92.0:5 >=kde-frameworks/kauth-5.92.0:5 >=kde-frameworks/kcmutils-5.92.0:5 >=kde-frameworks/kcompletion-5.92.0:5 >=kde-frameworks/kconfig-5.92.0:5 >=kde-frameworks/kconfigwidgets-5.92.0:5 >=kde-frameworks/kcoreaddons-5.92.0:5 >=kde-frameworks/kcrash-5.92.0:5 >=kde-frameworks/kdbusaddons-5.92.0:5 >=kde-frameworks/kdeclarative-5.92.0:5 >=kde-frameworks/kglobalaccel-5.92.0:5=[X] >=kde-frameworks/ki18n-5.92.0:5 >=kde-frameworks/kiconthemes-5.92.0:5 >=kde-frameworks/kidletime-5.92.0:5= >=kde-frameworks/knewstuff-5.92.0:5 >=kde-frameworks/knotifications-5.92.0:5 >=kde-frameworks/kpackage-5.92.0:5 >=kde-frameworks/kservice-5.92.0:5 >=kde-frameworks/ktextwidgets-5.92.0:5 >=kde-frameworks/kwayland-5.92.0:5 >=kde-frameworks/kwidgetsaddons-5.92.0:5 >=kde-frameworks/kwindowsystem-5.92.0:5=[X] >=kde-frameworks/kxmlgui-5.92.0:5 >=kde-frameworks/plasma-5.92.0:5 >=kde-plasma/breeze-5.24.6:5 >=kde-plasma/kdecoration-5.24.6:5 >=kde-plasma/kscreenlocker-5.24.6:5 >=kde-plasma/kwayland-server-5.24.6:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.92.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 >=dev-qt/qtvirtualkeyboard-5.15.4:5 >=kde-frameworks/kirigami-5.92.0:5 >=kde-frameworks/kitemmodels-5.92.0:5[qml] sys-apps/hwdata x11-base/xwayland multimedia? ( >=dev-qt/qtmultimedia-5.15.4:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.6/kwin-5.24.6.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2dc68f9b9bc0f1b58cdc378997cb72cc
+_md5_=0ca4c93de5be5e72dd1fbdcb083262f9
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6-r2 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6-r2
index b264d4ffb38e..36321062e392 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6-r2
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm plasma.kde.org optfeature
 IUSE=emoji ibus +kaccounts scim +semantic-desktop telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.4:5 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtsql-5.15.4:5 >=dev-qt/qtsvg-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtx11extras-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 >=kde-frameworks/attica-5.92.0:5 >=kde-frameworks/kactivities-5.92.0:5 >=kde-frameworks/kactivities-stats-5.92.0:5 >=kde-frameworks/karchive-5.92.0:5 >=kde-frameworks/kauth-5.92.0:5 >=kde-frameworks/kbookmarks-5.92.0:5 >=kde-frameworks/kcmutils-5.92.0:5 >=kde-frameworks/kcodecs-5.92.0:5 >=kde-frameworks/kcompletion-5.92.0:5 >=kde-frameworks/kconfig-5.92.0:5 >=kde-frameworks/kconfigwidgets-5.92.0:5 >=kde-frameworks/kcoreaddons-5.92.0:5 >=kde-frameworks/kcrash-5.92.0:5 >=kde-frameworks/kdbusaddons-5.92.0:5 >=kde-frameworks/kdeclarative-5.92.0:5 >=kde-frameworks/kded-5.92.0:5 >=kde-frameworks/kdelibs4support-5.92.0:5 >=kde-frameworks/kglobalaccel-5.92.0:5 >=kde-frameworks/kguiaddons-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 >=kde-frameworks/kiconthemes-5.92.0:5 >=kde-frameworks/kio-5.92.0:5 >=kde-frameworks/kitemmodels-5.92.0:5 >=kde-frameworks/kitemviews-5.92.0:5 >=kde-frameworks/kjobwidgets-5.92.0:5 >=kde-frameworks/knewstuff-5.92.0:5 >=kde-frameworks/knotifications-5.92.0:5 >=kde-frameworks/knotifyconfig-5.92.0:5 >=kde-frameworks/kparts-5.92.0:5 >=kde-frameworks/krunner-5.92.0:5 >=kde-frameworks/kservice-5.92.0:5 >=kde-frameworks/kwidgetsaddons-5.92.0:5 >=kde-frameworks/kwindowsystem-5.92.0:5 >=kde-frameworks/kxmlgui-5.92.0:5 >=kde-frameworks/plasma-5.92.0:5 >=kde-frameworks/solid-5.92.0:5 >=kde-frameworks/sonnet-5.92.0:5 >=kde-plasma/kwin-5.24.6:5 >=kde-plasma/libksysguard-5.24.6:5 >=kde-plasma/libkworkspace-5.24.6:5 >=kde-plasma/plasma-workspace-5.24.6:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.92.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 >=kde-frameworks/kirigami-5.92.0:5 >=kde-frameworks/qqc2-desktop-style-5.92.0:5 >=kde-plasma/kde-cli-tools-5.24.6:5 >=kde-plasma/oxygen-5.24.6:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.6/plasma-desktop-5.24.6.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d150f97f9be8e8cf23f86906e6d0b42e
+_md5_=a22392729ea685e8d001057286e0f8b4
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 737f7f335121..bf0a3dbc2fba 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/rawtherapee-5.8-r1 b/metadata/md5-cache/media-gfx/rawtherapee-5.8-r1
index be3d6f982d27..33d7227d1f2a 100644
--- a/metadata/md5-cache/media-gfx/rawtherapee-5.8-r1
+++ b/metadata/md5-cache/media-gfx/rawtherapee-5.8-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.rawtherapee.com/
 INHERIT=cmake flag-o-matic toolchain-funcs xdg-utils
 IUSE=openmp tcmalloc
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=dev-cpp/atkmm:= dev-cpp/cairomm:= dev-cpp/glibmm:= dev-cpp/pangomm:= dev-libs/expat dev-libs/glib:= dev-libs/libsigc++:2 media-libs/lcms:2 media-libs/lensfun media-libs/libcanberra[gtk3] media-libs/libiptcdata media-libs/libpng:0= media-libs/tiff:0 sci-libs/fftw:3.0= sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:3 tcmalloc? ( dev-util/google-perftools )
 SLOT=0
 SRC_URI=https://rawtherapee.com/shared/source/rawtherapee-5.8.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5f5dcc1f8503899b2ade6b5343de4eb2
+_md5_=869462b73f63acbe374c08097b0ac6f8
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index d11750a77091..3e81483b0338 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/libjpeg-turbo-2.1.4 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.4
new file mode 100644
index 000000000000..73bd6e16790d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.4
@@ -0,0 +1,15 @@
+BDEPEND=amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-macos? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-cygwin? ( || ( dev-lang/nasm dev-lang/yasm ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jdk-1.8:*[-headless-awt] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
+EAPI=8
+HOMEPAGE=https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/
+INHERIT=cmake-multilib java-pkg-opt-2
+IUSE=cpu_flags_arm_neon java static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=BSD IJG ZLIB
+RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/0.2
+SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.1.4.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=cc14fb48d93a98fddd030e1bd3fbcc53
diff --git a/metadata/md5-cache/media-libs/libsixel-1.8.6 b/metadata/md5-cache/media-libs/libsixel-1.8.6
deleted file mode 100644
index d598235187f4..000000000000
--- a/metadata/md5-cache/media-libs/libsixel-1.8.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig python? ( 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[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
-DESCRIPTION=A lightweight, fast implementation of DEC SIXEL graphics codec
-EAPI=7
-HOMEPAGE=https://github.com/saitoha/libsixel
-INHERIT=bash-completion-r1 distutils-r1
-IUSE=curl gd gtk jpeg png python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~ia64 x86
-LICENSE=MIT public-domain
-RDEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) python? ( 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? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/saitoha/libsixel/archive/v1.8.6.tar.gz -> libsixel-1.8.6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=00e5e51ea26099414f859d71b8f34052
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 6c7d59559607..e9a11cb3af3a 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/svxlink-19.09.2 b/metadata/md5-cache/media-radio/svxlink-19.09.2
index db5c9ab51447..ba4a526c9192 100644
--- a/metadata/md5-cache/media-radio/svxlink-19.09.2
+++ b/metadata/md5-cache/media-radio/svxlink-19.09.2
@@ -4,11 +4,11 @@ DEPEND=dev-lang/tcl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/q
 DESCRIPTION=Multi Purpose Voice Services System, including Qtel for EchoLink
 EAPI=7
 HOMEPAGE=http://www.svxlink.org
-INHERIT=cmake systemd
+INHERIT=cmake flag-o-matic systemd
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-lang/tcl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-sound/gsm dev-libs/libgcrypt:0 media-libs/speex media-libs/opus dev-libs/libsigc++:2 dev-libs/popt acct-group/svxlink acct-user/svxlink
 SLOT=0
 SRC_URI=https://github.com/sm0svx/svxlink/archive/19.09.2.tar.gz -> svxlink-19.09.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7ae10190e0c689c27c8d110fd2b4bcf9
+_md5_=fa634fc2af283a276d4e5c0acab5970b
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index ebc59c14b892..b30b64cc26f7 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/nagios-4.4.7 b/metadata/md5-cache/net-analyzer/nagios-4.4.7
index 7eb35a6a30c5..e7b299f1f042 100644
--- a/metadata/md5-cache/net-analyzer/nagios-4.4.7
+++ b/metadata/md5-cache/net-analyzer/nagios-4.4.7
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=The Nagios metapackage
 EAPI=8
 HOMEPAGE=https://www.nagios.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc x86
 LICENSE=metapackage
 RDEPEND=~net-analyzer/nagios-core-4.4.7 || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
 SLOT=0
-_md5_=788fa065deaf825dc776a9144aec1b10
+_md5_=13fc079588fb38dae476ff1cd09b9441
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_logfiles-4.0.1.3 b/metadata/md5-cache/net-analyzer/nagios-check_logfiles-4.0.1.3
index c5de3bdc9ab3..db0524016065 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_logfiles-4.0.1.3
+++ b/metadata/md5-cache/net-analyzer/nagios-check_logfiles-4.0.1.3
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure
 DESCRIPTION=A nagios plugin for checking logfiles
 EAPI=8
 HOMEPAGE=https://labs.consol.de/nagios/check_logfiles/index.html
-KEYWORDS=~alpha ~amd64 ~ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~ppc ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 >=net-analyzer/monitoring-plugins-2 )
 SLOT=0
 SRC_URI=https://labs.consol.de/assets/downloads/nagios/check_logfiles-4.0.1.3.tar.gz -> nagios-check_logfiles-4.0.1.3.tar.gz
-_md5_=7524ac779a921d9a9817d9e772335ded
+_md5_=f437a6ce20d8487014d4c806a2394855
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_rbl-1.6.3 b/metadata/md5-cache/net-analyzer/nagios-check_rbl-1.6.3
index 01c081cbf12d..09c7869452e0 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_rbl-1.6.3
+++ b/metadata/md5-cache/net-analyzer/nagios-check_rbl-1.6.3
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl dev-perl/Data-Validate-Domain dev-perl/Data-Validate-IP dev
 DESCRIPTION=Monitor whether or not a host is blacklisted
 EAPI=8
 HOMEPAGE=https://github.com/matteocorti/check_rbl
-KEYWORDS=~amd64 ~hppa sparc ~x86
+KEYWORDS=~amd64 ~hppa sparc x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl dev-perl/Data-Validate-Domain dev-perl/Data-Validate-IP dev-perl/Monitoring-Plugin dev-perl/Net-DNS dev-perl/Net-IP dev-perl/Readonly virtual/perl-Socket
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/matteocorti/check_rbl/releases/download/v1.6.3/check_rbl-1.6.3.tar.gz
-_md5_=e7b01bf71b4e47c1b1a19b3421da5ffd
+_md5_=fdc31ad9d22d3ae8d9517d5a8d9c7602
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.7 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.7
index d19c1b51f0e7..3bf33dbc97c0 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.4.7
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.4.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.nagios.org/
 INHERIT=systemd toolchain-funcs
 IUSE=apache2 classicui lighttpd +web vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/nagios acct-user/nagios virtual/mailx dev-lang/perl:= dev-libs/libltdl:0 web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( www-servers/apache[apache2_modules_alias,apache2_modules_cgi] www-servers/apache[apache2_modules_alias,apache2_modules_cgid] ( www-servers/apache[apache2_modules_alias] www-apache/mod_fcgid ) ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
 REQUIRED_USE=apache2? ( !lighttpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nagios-4.4.7.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=dd78dcec54d587d65cd46ce79aad7fca
+_md5_=9cfbde651d48a7e507f8a2d07bf13a75
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.0 b/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.0
index ece3108ae3be..75b38b66aea4 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.0
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-2.4.0
@@ -5,10 +5,10 @@ DESCRIPTION=Official plugins for Nagios
 EAPI=8
 HOMEPAGE=https://nagios-plugins.org/
 IUSE=ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=nagios-dns? ( net-dns/bind-tools ) nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) ssh? ( net-misc/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] ) dev-lang/perl ldap? ( net-nds/openldap:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) ssl? ( dev-libs/openssl:0= ) radius? ( net-dialup/freeradius-client ) !net-analyzer/monitoring-plugins selinux? ( sec-policy/selinux-nagios )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nagios-plugins/nagios-plugins/releases/download/release-2.4.0/nagios-plugins-2.4.0.tar.gz
-_md5_=26ed0b244afbf7cdee50198b9d76e107
+_md5_=e2a8698d0e1392e89d471827e0b4b4cc
diff --git a/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.26-r11 b/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.26-r11
index 911decab65d7..1a7d35e8a381 100644
--- a/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.26-r11
+++ b/metadata/md5-cache/net-analyzer/pnp4nagios-0.6.26-r11
@@ -4,10 +4,10 @@ DESCRIPTION=A performance data analyzer for nagios
 EAPI=6
 HOMEPAGE=http://www.pnp4nagios.org/
 IUSE=apache2 icinga +nagios
-KEYWORDS=~amd64 ~ppc ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php:*[filter,gd,json(+),simplexml,xml,zlib] net-analyzer/rrdtool[graph,perl] icinga? ( net-analyzer/icinga2 ) nagios? ( net-analyzer/nagios-core ) virtual/perl-Getopt-Long virtual/perl-Time-HiRes media-fonts/dejavu apache2? ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authz_core,apache2_modules_rewrite] )
 REQUIRED_USE=^^ ( icinga nagios )
 SLOT=0
 SRC_URI=mirror://sourceforge/pnp4nagios/PNP-0.6/pnp4nagios-0.6.26.tar.gz
-_md5_=ccb3d9d78f74a8b51f6719e27771ceca
+_md5_=b087430403e0df78be0e38b4da7f8b6e
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 5b3f2e8c9925..bca143e98d0b 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/smartdns-37 b/metadata/md5-cache/net-dns/smartdns-37
new file mode 100644
index 000000000000..e38545fe6f57
--- /dev/null
+++ b/metadata/md5-cache/net-dns/smartdns-37
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/openssl:0=
+DESCRIPTION=A local DNS server returns the fastest access results
+EAPI=8
+HOMEPAGE=https://github.com/pymumu/smartdns
+INHERIT=systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-libs/openssl:0=
+SLOT=0
+SRC_URI=https://github.com/pymumu/smartdns/archive/refs/tags/Release37.tar.gz -> smartdns-37.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a330df9633f0800f3a65d2f3f85ff93c
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 325094cf5d5d..9aaa64897b62 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.6.2 b/metadata/md5-cache/net-fs/nfs-utils-2.6.2
new file mode 100644
index 000000000000..e894be8d0820
--- /dev/null
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.6.2
@@ -0,0 +1,17 @@
+BDEPEND=net-libs/rpcsvc-proto 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 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-db/sqlite:3 dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=NFS client and server daemons
+EAPI=8
+HOMEPAGE=http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git
+INHERIT=autotools linux-info systemd
+IUSE=caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-db/sqlite:3 dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
+REQUIRED_USE=kerberos? ( nfsv4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.6.2.tar.bz2
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	529bb8cd5756c8476d37ba89dd41e635	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=66a9d9c3e84812f226d970b8098a5f7b
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index b8c2d76c617f..0a35f00d2ab5 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/mu-1.6.10 b/metadata/md5-cache/net-mail/mu-1.6.10
deleted file mode 100644
index 5ef779c8b5e4..000000000000
--- a/metadata/md5-cache/net-mail/mu-1.6.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst test
-DEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) readline? ( sys-libs/readline:= )
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=8
-HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
-IUSE=emacs guile readline
-KEYWORDS=amd64 arm arm64 x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) guile? ( >=dev-scheme/guile-2.2:* ) readline? ( sys-libs/readline:= )
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/releases/download/1.6.10/mu-1.6.10.tar.xz
-_eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=867fd9166dc119acaa9954e56d1c5530
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 9e53aaa2873d..9c044bbb0dd2 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/rsync-3.2.5_pre2 b/metadata/md5-cache/net-misc/rsync-3.2.5_pre2
new file mode 100644
index 000000000000..854b1dc9f510
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rsync-3.2.5_pre2
@@ -0,0 +1,15 @@
+BDEPEND=examples? ( 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 ) ) verify-sig? ( sec-keys/openpgp-keys-waynedavison ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst prepare setup unpack
+DEPEND=acl? ( virtual/acl ) examples? ( 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 ) dev-lang/perl ) lz4? ( app-arch/lz4 ) ssl? ( dev-libs/openssl:0= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )
+DESCRIPTION=File transfer program to keep remote files into sync
+EAPI=8
+HOMEPAGE=https://rsync.samba.org/
+INHERIT=flag-o-matic prefix python-single-r1 systemd verify-sig
+IUSE=acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 verify-sig
+LICENSE=GPL-3
+RDEPEND=acl? ( virtual/acl ) examples? ( 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 ) dev-lang/perl ) lz4? ( app-arch/lz4 ) ssl? ( dev-libs/openssl:0= ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )
+REQUIRED_USE=examples? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+SLOT=0
+SRC_URI=https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.2.5pre2.tar.gz verify-sig? ( https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.2.5pre2.tar.gz.asc )
+_eclasses_=flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=9077336cb0b472aea14d1b1376f33c56
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index ffd5718201ac..6b6a063a9a94 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.7.9 b/metadata/md5-cache/net-vpn/tor-0.4.7.9
new file mode 100644
index 000000000000..6b2f4a61fed7
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tor-0.4.7.9
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install setup unpack
+DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) test? ( dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) )
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=8
+HOMEPAGE=https://www.torproject.org/
+INHERIT=python-any-r1 readme.gentoo-r1 systemd verify-sig
+IUSE=caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos
+LICENSE=BSD GPL-2
+RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.torproject.org/dist/tor-0.4.7.9.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.7.9.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.7.9.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.7.9.tar.gz.sha256sum.asc )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=c013de39844581d636998848559bc25c
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index b639b5c435a5..a8a687c8b823 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-sergehallyn-20220812 b/metadata/md5-cache/sec-keys/openpgp-keys-sergehallyn-20220812
new file mode 100644
index 000000000000..e2e6ce5b78c5
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-sergehallyn-20220812
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by Serge Hallyn
+EAPI=8
+HOMEPAGE=https://github.com/hallyn
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://github.com/hallyn.gpg -> openpgp-keys-sergehallyn-20220812.asc
+_md5_=e56d015519b595622c83f97f8e2825ca
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 3a4635a44bae..610d5f393275 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/help2man-1.49.2 b/metadata/md5-cache/sys-apps/help2man-1.49.2
new file mode 100644
index 000000000000..8382171b56a1
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/help2man-1.49.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
+DESCRIPTION=GNU utility to convert program --help output to a man page
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/help2man/ https://salsa.debian.org/bod/help2man
+IUSE=nls
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
+SLOT=0
+SRC_URI=mirror://gnu/help2man/help2man-1.49.2.tar.xz
+_md5_=fc1aacd35fa50513f7d8d7db5702d861
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 04d9f229a08e..672d6b5faed7 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/gnu-efi-3.0.15 b/metadata/md5-cache/sys-boot/gnu-efi-3.0.15
new file mode 100644
index 000000000000..5f24be3ddca2
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/gnu-efi-3.0.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Library for build EFI Applications
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/gnu-efi/
+INHERIT=toolchain-funcs
+IUSE=abi_x86_32 abi_x86_64 custom-cflags
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86
+LICENSE=GPL-2+ BSD BSD-2
+REQUIRED_USE=amd64? ( || ( abi_x86_32 abi_x86_64 ) ) x86? ( || ( abi_x86_32 abi_x86_64 ) )
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/gnu-efi/gnu-efi-3.0.15.tar.bz2
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d1d650dc8235c20a3df88c41ed41a514
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index d8dfdaffb825..b4fb3ca9aaaf 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/erofs-utils-1.5 b/metadata/md5-cache/sys-fs/erofs-utils-1.5
new file mode 100644
index 000000000000..280a25bf1731
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/erofs-utils-1.5
@@ -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=configure prepare
+DEPEND=fuse? ( sys-fs/fuse:0 ) lz4? ( app-arch/lz4:0= ) selinux? ( sys-libs/libselinux:0= ) uuid? ( sys-apps/util-linux )
+DESCRIPTION=Userspace tools for EROFS
+EAPI=8
+HOMEPAGE=https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git
+INHERIT=autotools
+IUSE=fuse +lz4 selinux +uuid
+KEYWORDS=~amd64 ~loong
+LICENSE=GPL-2+
+RDEPEND=fuse? ( sys-fs/fuse:0 ) lz4? ( app-arch/lz4:0= ) selinux? ( sys-libs/libselinux:0= ) uuid? ( sys-apps/util-linux )
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-1.5.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=5ff1b2186a4fe9ace6b3dd995e21f961
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index e7dd38f0153a..3b99f7cffb5f 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/slang-2.3.3 b/metadata/md5-cache/sys-libs/slang-2.3.3
new file mode 100644
index 000000000000..606f5671c295
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/slang-2.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:= cjk? ( >=dev-libs/oniguruma-5.9.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( >=sys-libs/readline-6.2_p5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Multi-platform library designed to allow a developer to create robust software
+EAPI=8
+HOMEPAGE=https://www.jedsoft.org/slang/
+INHERIT=multilib-minimal
+IUSE=cjk pcre png readline static-libs zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:= cjk? ( >=dev-libs/oniguruma-5.9.5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( >=sys-libs/readline-6.2_p5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://www.jedsoft.org/releases/slang/slang-2.3.3.tar.bz2 https://www.jedsoft.org/releases/slang/old/slang-2.3.3.tar.bz2
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f7a5763bb617023cfd8b26bb798bf63e
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index f73cd2ff0c6d..a0178cda0215 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/varnish-7.1.1 b/metadata/md5-cache/www-servers/varnish-7.1.1
new file mode 100644
index 000000000000..250182907563
--- /dev/null
+++ b/metadata/md5-cache/www-servers/varnish-7.1.1
@@ -0,0 +1,17 @@
+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 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/readline:0= dev-libs/libedit dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= dev-python/docutils dev-python/sphinx virtual/pkgconfig
+DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
+EAPI=8
+HOMEPAGE=https://varnish-cache.org/
+INHERIT=autotools systemd python-r1
+IUSE=jemalloc jit static-libs python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD-2 GPL-2
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sys-libs/readline:0= dev-libs/libedit dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0/2
+SRC_URI=http://varnish-cache.org/_downloads/varnish-7.1.1.tgz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a0315adffbf3c3eba5bbcb0b565b896a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 3693ca0338bf..0b1893fc2e94 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-08-12T12:40:05Z
+TIMESTAMP 2022-08-12T18:39:41Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL2SiVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmL2nm1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCtvg//X2tpWydZB0Ydzl+eFa1RL4G4FNKkJl8gQp9YITOnkd+l6MW11a+H4hVo
-8m+OF0wZYhjW92qZA+DYzxCO6rttWhn6j9K2rd2N6JfKy5SSdegj4ct27WdCeQyM
-KTjuIRPRotgjkBCv131B9NUr+4RaCaBW+vjDB8UZrpFVlqC7sZuVNVyyfDZDKM+u
-6J9FHYcLxcXjYI8NELFzjylNJ19PvUJwY52Yp7rDb7jEPpKCZ4axeRXcbsiey/tH
-YyA35zsXbgqbrRAiuBVjbBnnuFPj3xTKnOAbkfr3gksm5AfCffg7xY40qIzjnxUj
-ZD4El5gklHOLh6K7kKG7QHL2PdkK4OhEjozhccPO+1Da8zeJ3jzW8Sop4qKfpSLs
-mX1WpBcNfDO9aKFJlZLpOCcJpIHdp3++PRp0w5WPDdn/TXurEE52hdQMNrt/wXJn
-oku4gK7rgNf1mF+qKmBU6t8JrZcg/szrf0FSQ4XIngVE5evw5zB2UVVsxR+Bsy4N
-DbqkFccy3sn7IaVf0KaQ0/91hnjOaM2iy250qcrPZ4kP/okNWqKYzlDNnSMzVGqp
-kjRPJrIMLMH1a8lqZda0lNttYpx8UisrY3VCzr5AV1sPwJ4ftffI7nRqPiKwp2kW
-DIuaDxtclZ0O7KpmUeFXPhokk04vC32mrnDeuP9cHCSsHWfKbzg=
-=TPQ7
+klAzRg//QqsLew8eAkW4xmv+k/sYGbx1gawH55KIh/vPEGeIB1I7v+kufB/VO1VV
+c/JEGowqUprl8sAGBPQqbO5W7Jg7u1geygodkvxCce/RzKUwU7kuIaqIM1YBSMs2
+R2ts7grD4SNaIQrRAWVJ6KLR9hZjW1leKn+FtzABK14Bk2yQs26Av8DROJ7rF+Ua
+dbpZQJ58cXHA3j8W6JrQVfeCdePxhGvY2z1WOHXJnjqBmoFz778sJA0flZhiV3/Y
+CQyoM8jLRQwppS2agPTWin0Q24gN4+HihpB7NgRNIMGhaD3IlbJQKxK7y2iamgXh
+VdAI43oe40/UdHF6dFONbCIe4HZxHVcdqbQigmQIgDrzgi6Fwhhv5IIyk2xtOkZ0
+9cofK8oZ/V68zEljcWEIXH2IRTiy+zDVor70YxqfCDgXtlnqhW6QFaqbsb5M4SdG
+hw0HGRuT6gWxar3KPbgFQQwD8R2ACUQgbma321+QxJseVgfXfldov7w2S/GF4w4k
+YE7CQribZ1Ab1ftAl7zRiKUoKckfY+9rhwZ/ZF6J4O+RLcoWINV80Snaayw49vt3
+PBHOSh9Xk+GBThsRw/FAS6zZasloHTscqaXJaA8x1XOKf16bfPhkoHLOwKqnNfQB
+8QENK40chzUoxBM8w4JtZ+Ing6ZfazQpmeapCTPTrIO2G1D6Pfw=
+=rQFZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 0f1f263abdcb..65dd41a0167a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Aug 2022 12:40:02 +0000
+Fri, 12 Aug 2022 18:39:38 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index bd0eecf9900d..1d2b3b4cc835 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Aug 12 12:40:02 PM UTC 2022
+Fri Aug 12 06:39:38 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 0c8d6aa23a9b..9febf3a283c6 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Aug 2022 12:45:01 +0000
+Fri, 12 Aug 2022 18:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 4491b482b8f9..b200152475be 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-64afb48721e103fb5334a3a6d3f4a152a82e749e 1660307375 2022-08-12T12:29:35+00:00
+d6ca194365913dea0243b8fd11840d02b26b7618 1660328185 2022-08-12T18:16:25+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b83b64e1a0b9..ad3ef700cf05 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1660308001 Fri 12 Aug 2022 12:40:01 PM UTC
+1660329601 Fri 12 Aug 2022 06:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 0f1f263abdcb..65dd41a0167a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Aug 2022 12:40:02 +0000
+Fri, 12 Aug 2022 18:39:38 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 81b8f2d21bf8..df87f5c985b9 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagios-check_logfiles/Manifest b/net-analyzer/nagios-check_logfiles/Manifest
index a444af780c4f..2efbce39217e 100644
--- a/net-analyzer/nagios-check_logfiles/Manifest
+++ b/net-analyzer/nagios-check_logfiles/Manifest
@@ -1,5 +1,5 @@
 DIST nagios-check_logfiles-3.7.6.3.tar.gz 238683 BLAKE2B c2bd47a13263ac76c1bbced7a1410416c07ef35b39ea60bbf6037de3c10dd00df30a215f461270501240d5eb35e2b687fd5590d291028d7975c15470c06177a4 SHA512 2f72d571bfc0815e12b5c9a6e178b7b9b6e58d69e2d1a3efc560dd6b7bfd3d04a705d15e93069959611be1981941866e8775ee7d67c5dbf3983a155ab2ec3c91
 DIST nagios-check_logfiles-4.0.1.3.tar.gz 254371 BLAKE2B d4219e03ac2b981b08866baa4eab4fb16857215cb817ee44f23690094a3b29bf806caa6c1cd98c439ba81fa31cd63ce1fcfca5c92d1aad260490db087a560fd7 SHA512 1893e67d9b27939fae6f330b1f796e98becbb1c4bd1dfe11811236b0d9bcdab0b2fea2a49f7b90302d15c75328422f479d1a26a486cfbe1ec0d3b8f9b71a5150
 EBUILD nagios-check_logfiles-3.7.6.3.ebuild 665 BLAKE2B 2fb51740ef6962499caee6bb22c720fb99331d4c0fbef9e2ca5d9606c26d6f9078e6bb22e26717b5abcbcd3ed4bf7093e41e44b63befec1a1cd833171af51092 SHA512 61c6bbcb2ea40f575f53259bf97638c7966e62153fc0c6d20116b2475c93368b8fbe3beb708307689f55f6fc6634d28f25a71f04c43b1b9fb2af2fcfabaec8f1
-EBUILD nagios-check_logfiles-4.0.1.3.ebuild 664 BLAKE2B a7078e4261dad74f464aaf124cc45159bb62d56e6c57b3c42d9f09b36f302ecb4fdec5c5184999a9b59fd24f450bb4498706d76e8244556d0ad7bb0d03adbaf2 SHA512 0961239d7d1754ecf06e1c045c6c1ae664d4ad40cd42dc8afa2665dfc642d4a34e9be003b5503ea19a4f31e475b7c3cd23ba3c9b36d0fa573f61d033643a1767
+EBUILD nagios-check_logfiles-4.0.1.3.ebuild 663 BLAKE2B 2f7e0496b8d532d5a04ffc47c3ae10a455cdc73fc8874947dd3d8bfdb97d26381caca0c4a3a3afc86d7977555d9ba396fa7c89f2bdfbee74347857478db78448 SHA512 4ec122b6bd94c0af1bd9de3703f030a030c01e236dd5a94d685d1b245fdac171d6885c066f8ea83e7a6a51f3d79963765f3afc0af9a73d1e6667de835fd34576
 MISC metadata.xml 261 BLAKE2B d10a6cff4ddbb4023d1088dc2da1259de0bc679eccdbdd83a2e056b42c3b37a2d1b39ae62e1b7f825e5ffec1956088c4fe5de6f2c07ff46585d56fd9ade7be3e SHA512 a7b0772ebf944cebfbef2086a385636b1331a565a81ac6918273b16a0b3576a8602121c58e30007cb93b64a81df19987fa28d97b9235ab36deb14db003e1695b
diff --git a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild
index 25b78d0db30a..0c0077e193cd 100644
--- a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild
+++ b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz -> ${P}.t
 LICENSE="GPL-3"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ppc64 ~sparc x86"
 
 RDEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 >=net-analyzer/monitoring-plugins-2 )"
 
diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest
index 1151ff0183d0..518592e2c86a 100644
--- a/net-analyzer/nagios-check_rbl/Manifest
+++ b/net-analyzer/nagios-check_rbl/Manifest
@@ -1,5 +1,5 @@
 DIST check_rbl-1.4.1.tar.gz 47585 BLAKE2B 24979d1579ef46f6d0626700bb8b9aa3f3acd4b422398ecbfa98909248fd6ffe61a763e377e7942d3078d8b91488f3fc0e2ab25f7c4821bcfa5cde08d000bd5c SHA512 3023aab6ba42dec46cb93eb2ef15e1998a1b3226bd1f143441e14a4271279ac9b24b85b9fc41a382eb203e5d2846b7f4ea4fe27db99d75b104d9182ea53079cb
 DIST check_rbl-1.6.3.tar.gz 50250 BLAKE2B cdaaf7252871c6a2cf34a1cacef36251b8526b73f4edb73fc1611a3426f350523928532bc78068438b8e71ec0e023da46749673aa5e9e1d5c6cd8b889f330305 SHA512 2fc84089eb9e41657f522aa7813776b3d46811759e177d031ff5d2f737d63c00897d50d5d878c1e5d5368ca1dde0b173e81b8a6f16fbb970270ef63d988add9b
 EBUILD nagios-check_rbl-1.4.1.ebuild 1483 BLAKE2B 225aa6cbc698bdc7e6346195e896277dcd2f71730d28fdc4274b30573c41bbb7ec644d8f5804765fd93b71cd2f8e1b38643314498a761249b655648ad1587c26 SHA512 da8f812cec89631714719ad52fa7b065915b3e02568001e2bca277ee9a4556d74f8c6c1a6888a2ec13bc3d55cad9cce98af850e8cfddec1bd508da92047e2380
-EBUILD nagios-check_rbl-1.6.3.ebuild 1541 BLAKE2B 700c98aee81186627bc24087ec0d6fde5d3879c000594a7333f9e0069e7b2117490d8a9883926e211218af028ba7bc8fe44855f82d4e211d9061ca0092a6f4d2 SHA512 7d2897842335c4cb6335988abbc389ba1aef5c000667c08e3d9197efeecc5f813561b988672d8ff5580ee19d7b33d2c5c2dc0a9f052b82fb8d2d40c5c1d27a20
+EBUILD nagios-check_rbl-1.6.3.ebuild 1540 BLAKE2B 7764e7e41869be206d68de7715abc893a0710f83d5f1419daaac8f02f4e025f7cc38aef5ad9bd2fd364edf5144caff8d0db09c4daa1a6600cb2a64170c85ecc6 SHA512 59946549d16dc87718cf3ffe024103fd403d9334bdc175cde12e65ad09067e6358f2f1c393bafab12e62d5e7fe230a4307e41024f598730bd3338e7db4a6cbcf
 MISC metadata.xml 469 BLAKE2B fbdd218961dcf07ca906741000ed4268491946520ed7ff6920b50a2ed70676e0fd68b63d39426c7cfdfd177c8ad70c2228736e2b2ccdecb4db1c72f686f9417f SHA512 e72d2be36e83f2691bd5d6f491a79616bed686d03ef02f33aa8d80db55f08f876a31cc3822615a5eeb5df03f7ed2e93146de20d185acf795955cc2cd6e38adf5
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.6.3.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.6.3.ebuild
index 0c1a76c56fcb..9b4bd0c2b400 100644
--- a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.6.3.ebuild
+++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/matteocorti/check_rbl/releases/download/v${PV}/${MY_
 LICENSE="GPL-3"
 SLOT="0"
 
-KEYWORDS="~amd64 ~hppa sparc ~x86"
+KEYWORDS="~amd64 ~hppa sparc x86"
 IUSE=""
 
 # No, this is not redundant -- see bug 627082.
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index d2d6d97beb5f..fc6dd078d470 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -4,5 +4,5 @@ DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b
 DIST nagios-4.4.7.tar.gz 11340759 BLAKE2B 4316e6cfc7f576d0fe5ba075aba2931dc850c97fe84b124eceeefaa6c01563c0639c8cecf751e086d5a6f9c0a1079f7e9bd013f961956d7d59536dea4516cf86 SHA512 92adc74e687bcbbd742075c8c7222d42c90795a4eb7582e3f1f492349db8200c61f390bf3c4cab4b023c5c111353a43f5dd687b0ee5ab6a8775444e06d42517b
 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
 EBUILD nagios-core-4.4.6-r3.ebuild 9243 BLAKE2B cdbc7b6b1f4ee156db7000d4413f33722d888c7cdb2bca0f072d189219cc677d9da6a255590b126505f9ac27329ff2361d55e5eebc47c2e553bf2200a370e36c SHA512 81b8c9af2f2b0dd9dcb362163c2bc224de97fe0327ee97b4376ddab373a1c657fe3be88bb948e0d9f6398aab6a9f79bca40e757adbc0130d473530c0f5570bed
-EBUILD nagios-core-4.4.7.ebuild 9245 BLAKE2B 2558b3be32de4ff9a7549a5dfffab7da488abfc0ce4e7d539ed37b031742f1a05d474e1b4263cc5eec8e9e965dc76720bbe62b690af617602660e8dadef93224 SHA512 e519539d20a35f30d8762fed2ff509c2f989fe78f184cc797e505fa89d330e08452e9315c551fc64fd02199b471130d9340e1a16830d265d06ccec7eea440932
+EBUILD nagios-core-4.4.7.ebuild 9244 BLAKE2B f280f61bd2f0936ec004e25f61c6b5e40697a9da4ea7fc1de12b5fdf48a6cecc21abca7bdd8a9958e7b5f118295b0e6291bd18624696043c0f2bfc95d57e4c87 SHA512 152dfa84929c84866e9d612ae1628b844e9a5fd843d8d1e50b88ded3427f20a029fba95de328f4afb9836d390858bcddbea8d71276a23a33eb19c92398556e98
 MISC metadata.xml 1467 BLAKE2B d5ddd6280aafd3ad3a36a408071037fa757810382761f617eb2763a20e65185b30eef94fb4cdad7d4b5e9b81b6245efacf57d4ec0003406d66ef2053f09f3708 SHA512 25d3d4d19c18b416a0902d2ff39c0ca71b2e7bcc2bac61119b9636c6462391e65b2767d8b0e794abb318b19fe1c2bcbf2c80ee8d1ea6faec3f6eb9cddf60a9cd
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
index a41b65d95fc2..fc5ca77f76d3 100644
--- a/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
 IUSE="apache2 classicui lighttpd +web vim-syntax"
 
 # In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index 2ee57e755455..1783e3073f2a 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -6,5 +6,5 @@ DIST nagios-plugins-2.4.0.tar.gz 2738643 BLAKE2B 695c3804aec592dad0ae1f2f19222a5
 EBUILD nagios-plugins-2.3.1-r3.ebuild 2993 BLAKE2B fdfb49d287611867610decf2de17b1fcc6e070e72d32013979ca33af5279db41b998fe54c894aeceb11dc85e0c672cfc392355533a8c61bef8be91c40eac45f3 SHA512 8e57455884815ea28dc671bb35b5d580f79c5108d5ef0e486493ca2a11886ac4fb19b7e2ffdbba544cbffc073c58f5224a0b144039d3d7496c45cf8139519329
 EBUILD nagios-plugins-2.3.3-r3.ebuild 3043 BLAKE2B 81cd85e2d642195e6d02085d3758f1a39faa4fc6676c4788fb03941dbbdfc34f0c0620c47af5a3e62bf3bc693a40c5899106b6fbda0e6e2c457df9cae8fd94b2 SHA512 52f64e344951a83aff641586918279114b7f0e67d1510f02dda463ec224eefa0711b1c2b29a6d87a8e455ccdcae48f31aea1eb6f3d9e017db827a6be2db0061d
 EBUILD nagios-plugins-2.4.0-r1.ebuild 3225 BLAKE2B dda29986ebcc2340c6a1c45805ce47b2e0e3218fdcb562d03be4f06c20c26e54328ff07dc3c7e17e2467c699598e7d1b9a3e511af3b52f8ef7e88d94044aef82 SHA512 67d45f7e9cb6332a975694c3c9fd658c47667b439f7d064310e9c2d2a705d30a436ebe50efcb23c78bc1253463270d253085b97bb45cfce3426f00e5452f61b4
-EBUILD nagios-plugins-2.4.0.ebuild 3025 BLAKE2B 87742d9836160af12e2456e51139b7fe1a77f4a7ef6bd5b57044820242d691c353a410c82c0f06368656413d3f7738da70e87f341fae485980f383884b501ad7 SHA512 f8f0eba9e4f4995fc8f3985b7a2ee2e96f2d81cbf3340089e9a3ebdd2c714301249592f46bbfac4d73863b14a74669c940123cfdf56c6cfadfeba8d6036dac9f
+EBUILD nagios-plugins-2.4.0.ebuild 3024 BLAKE2B 64a127745d4c5888fac1d42744dec7fa492966314b94126ba568024e00841df4101aa95c544e0f72933c37b7fc0f7b4693ca9b5d41ac58f9ce14b210e1a158af SHA512 f6373bdea850eb58520e66f92a0d046cab9ca0f8765b5034d45a5db664be8004fb4a3ffe9c74c095abca27d80bf51a59c55af1d2735fca94014e2a7dfde045f2
 MISC metadata.xml 1431 BLAKE2B 7a5b71bb1d5acc47492a8ac0414c5de789e2fff607a1602c8e464dd4285adb1acd71f152dc9dae18bade31623d78ca2ebe796b871f62542d2d29a75a3b5e4ce6 SHA512 5aa293f0fd8f810b3b750772e260009cbf10bb68aae1f8cbb9e02f7565204f8ae14da3f6a18db58e9fdff5fd97ba8566d07a421ff8bc35f07747338ced13b92c
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild
index da3d5c477676..23f75f972e5e 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86"
 IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index fdbbef0c3c63..9b78c110eb3d 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,3 +1,3 @@
 EBUILD nagios-4.4.6.ebuild 393 BLAKE2B 6200ada14b6e43e509b775ba2e41914c19b660e152e185fb7c1e978238b179e276abb24fb2c1dfa8e5c19ab976b6faef2570fd54dd69c9d10d18d4acbd7e1387 SHA512 3287a38973570a85a4cb7fd21a696965d50265002f58be716485374bdf154301ac0a2cc9a6785b96c2d1bd45e57f1a7b88d766bd9862f9266b1eb851b2a670ca
-EBUILD nagios-4.4.7.ebuild 395 BLAKE2B 5e702708e2180bce1d0fff0bfb63abedd06b4e468ccfcf8d62799dbb57ca0f16fd27919cfdd472a33f12bc18575029a964f7d9a889448c4ac2d7e688d8788f2e SHA512 8e690e4d0b3b893e840bf5ca66503d004827b571416ccdd0040ec9121d6a5d833bd9cfaf63f1d85ca12774d5b1464f1c7be3dcdc97b879d7bba884bf10c654d5
+EBUILD nagios-4.4.7.ebuild 394 BLAKE2B df5e77cbd5b0827184bcaf27ec9d0d406ee25be209d8eda17d405aa37ea6c0e21ddc07901fc41c9725e69810ac56a238fc082ff8ca6cf4c512ac57d4ebcc8935 SHA512 5da1d12953497423f8f4f90cbf87d23e5ba27aa305cae600c92c4f2e93f8a8c7610e4e0bf8e78e77ea8b001b2a8014bb5c956f7368e7b25623b313a248f8896e
 MISC metadata.xml 1111 BLAKE2B d2c8f269fe7ef92c656219c0c93efca6083c09ea1ea402ccab7cf37f415931ad5abdf46a20b568ec82883a574005a4788617c0786c20c2d326b2d481195261e0 SHA512 e6c32f8405e79a4a3cf03d21dce3539c28454d75929348efb30f5c7c2b55f5346e3cd39f9d64f4e276aaad12f1fbf274f2fc08c255c03df1a5a7f0356031d66e
diff --git a/net-analyzer/nagios/nagios-4.4.7.ebuild b/net-analyzer/nagios/nagios-4.4.7.ebuild
index b9cdc8bf3bab..c9515c5d07bb 100644
--- a/net-analyzer/nagios/nagios-4.4.7.ebuild
+++ b/net-analyzer/nagios/nagios-4.4.7.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.nagios.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="~net-analyzer/nagios-core-${PV}
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index 3acbc2038b8f..4690045b4cde 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -5,5 +5,5 @@ AUX pnp4nagios-0.6.26-magic-quotes.patch 987 BLAKE2B 02bc9b3f3c8d3289593147530d8
 AUX pnp4nagios-0.6.26-sizeof.patch 15528 BLAKE2B f6db44720ef2a68dc5d617427fd9d0813ce34e5fe922bd25153df482420a5b2d718ccd90a09a6073e803345a48e6545e39430522d45b6fea4f4924617ff4583e SHA512 02e671a31371662a1e0958dd704b7918360d20bd2fc4171d2d8c7d0332bc37356b24929834ae910858072812f7fa6d61ba4097ff1f93848e0d02b55aee515290
 DIST pnp4nagios-0.6.26.tar.gz 3039265 BLAKE2B 1adb3c41222e6bc93671af955a1564387d77901ce118f5d309d101d88c691140e0feef1c2594bc5db44706ff01505a4fcf99b79b6a0c5b5cb923838dd00f1ff0 SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427
 EBUILD pnp4nagios-0.6.26-r10.ebuild 3075 BLAKE2B 96e83b274e13bfe9f30f43b931eb2b8aadba2ae69611c40d67a286d479e88b2711bd9b6bca389baa53031cd40efbacad69476f696ceabd73ae9a3ce02d5c7e6d SHA512 177ad812bfd764cd9bc19ad6e84a9be6b15e32f6506056c6a8cc6cc1698c163e679b76d1ed40cd44554ea7565e8c1d311b7d2514eaad8b551d5294bec779be1e
-EBUILD pnp4nagios-0.6.26-r11.ebuild 3166 BLAKE2B 02f899dc9d2089a57538925a445b19a997c22d66e5021929e1e03f633addb8abe375ac4fc3698b1bb6eee570e2fd0315a1ce23a32ead8f10db34446a76f71064 SHA512 9abdde7d7f5a30b2dc3601d2c12e99c4930fdfb27177b1ad7badf6d0b76bcf4f553405d1a3c7e05484f3f3d4c7ca09a8769ebd5b56ba9b926174e98d8b3a3c35
+EBUILD pnp4nagios-0.6.26-r11.ebuild 3165 BLAKE2B b223d5e78ac048fb0893711f30edc6c2418fcc214b5639e1c9f8ba4601e722976cb1e4a910954ade9bbedba64c6f1327a0eb140862f4d3fd85964249bb89e914 SHA512 3a798dfa1892b1df692ac9b5d1756be21b51eb97febce4a2d958986e283e5382f4507e62ce9245ee50e9e541bb4717e6dfed2b6690ac5854e0f9901a7e03fd90
 MISC metadata.xml 677 BLAKE2B f58a0350bbf34f21834181d537d1e4906c91b9eea8187b10965578fa6fa82abd3de727754b2f62987f078aad6db146ec00a0437c48edd4411b23b1ef780abb0f SHA512 9843fd05d441d4324ceab6f99f67c7eba266b9f6cad7a28616c7ef094bd8345ef573ac4b5f83ee8f049f3dbf3067df1c1005fff803db9560f10f8b05f11fceda
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
index 52328140ab7a..fa6c0ab81709 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 icinga +nagios"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
 
 REQUIRED_USE="^^ ( icinga nagios )"
 
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 9c45af17431c..a85c3f6b6218 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/smartdns/Manifest b/net-dns/smartdns/Manifest
index ffee49c54352..3dbfce8780d8 100644
--- a/net-dns/smartdns/Manifest
+++ b/net-dns/smartdns/Manifest
@@ -1,5 +1,7 @@
 AUX smartdns.confd 148 BLAKE2B 4ea7db4def275650a2321b42ad22ab95f316fb6371cb814792ba5b47091e472a69d9a13c6a77202dc005116c3e723dbf07d4515a43d69239e71e2ea0cffd85fb SHA512 57a69fe8cb1b1f96a9c1e9c06d1908e4764c0bf4010fcfdd8515dfbbc358ff38b85d28416c7b11a8715623528ff22b3982d287dbf266f6c7ae104e745c5cb068
 AUX smartdns.initd 480 BLAKE2B f27c77b95ea13d65eb45d75de831fc2622d7e37cbf517b466e56d38506ad10e283c9a75d74446d3d1329600f3b3b1178ca6169fd7c611e3f8d9aa8bc5b2e8a79 SHA512 66d8b43b01419029162817685c569731eb45dc44128224644e628191bb57cc830d3fdbb9df80d61a52333bba5a763dbefdef7b3be5c164e0bc66cd425ba89e94
 DIST smartdns-36.1.tar.gz 499257 BLAKE2B c0bca0b8751afd67d7628d993f1093fb95c0864d153e65ebb31d0f9ccf76c7581f98a7fc16cf503cfa83f4d3e9b05e7c21818f34fa34ce770e9e0f0c3eced921 SHA512 88da539f12351bfef256e93d851a08247699ed2f08724abd5d0cc770a6b0475e0540d2aef6f43524edc48cccd9f58db3ad4c68561b26812bf8863b543748c549
+DIST smartdns-37.tar.gz 517246 BLAKE2B c39e46016eeee4c5ecf6bce35a40588f1680ac07bfc70c8beb035bf1e253764c93aead0aa6673246bd52cf42f34c48ec44ab139d76d4c35069675f689d408efc SHA512 469c0d8ed382dce11abc6ac82cc7cff4f88194bac5d32b51afd6c7be10452f20d00eed0e296aac57073ad6624c6441c24d89bc304b3e3c706b214c1a019b9bd8
 EBUILD smartdns-36.1.ebuild 787 BLAKE2B 2165733c98e378a6e4480ee66c3c0d86d95b264b4eea9ccae96efdbc2f51bdd403c169d88c24a7bc867d8d9bcabdb1fa73d09d3bc10d73f12ed5bffc9a7d4157 SHA512 4568a9688c5e8a6e3ab21b2c0326df10c7706d6b9f00b63d924a1844c28a6fc9f23b2d3d5ced13ab09b75a5e7bc524c83c072494f71e784497b9721c7e84fbc5
+EBUILD smartdns-37.ebuild 787 BLAKE2B 2165733c98e378a6e4480ee66c3c0d86d95b264b4eea9ccae96efdbc2f51bdd403c169d88c24a7bc867d8d9bcabdb1fa73d09d3bc10d73f12ed5bffc9a7d4157 SHA512 4568a9688c5e8a6e3ab21b2c0326df10c7706d6b9f00b63d924a1844c28a6fc9f23b2d3d5ced13ab09b75a5e7bc524c83c072494f71e784497b9721c7e84fbc5
 MISC metadata.xml 241 BLAKE2B ac22a6a72982cebf268e9d367947dc556420370c70b1f6e26531950f7f2c89734cd293fad93dfea0345fd020a97b8f9304c1362a2ccd6225b22aac1f7b674b17 SHA512 b59cc421f52bc545bc8667dcbf6b4891e29180ef1984596ccc20886071e5f080bed259026c2831c6418131802b93ad945137fe4406d042feb02d9bfdc14c431c
diff --git a/net-dns/smartdns/smartdns-37.ebuild b/net-dns/smartdns/smartdns-37.ebuild
new file mode 100644
index 000000000000..b3addca60631
--- /dev/null
+++ b/net-dns/smartdns/smartdns-37.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+DESCRIPTION="A local DNS server returns the fastest access results"
+HOMEPAGE="https://github.com/pymumu/smartdns"
+SRC_URI="https://github.com/pymumu/smartdns/archive/refs/tags/Release${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/openssl:0="
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${PN}-Release${PV}"
+
+src_prepare() {
+	default
+	sed -i -e "/install .*default /d" \
+		-e "/install .*init.d /d" Makefile || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" install
+
+	newconfd "${FILESDIR}"/smartdns.confd smartdns
+	newinitd "${FILESDIR}"/smartdns.initd smartdns
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 1a43421549c4..7acf6e28652e 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index c7e852cd0462..48e173b84768 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -11,5 +11,7 @@ AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f1
 AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac
 AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f
 DIST nfs-utils-2.6.1.tar.bz2 946432 BLAKE2B fe6ec58b4c0def75a43f40a581a9d67d25ee2e6979f41da87453661b33460b99744e1799d6b1a3ef026027cafb1aae8a954cc6449d3eb77eee494fe72804751d SHA512 5b8949b3d30ccd33c9bc68875ba0993a22e490234d5eeebc189b3da2b1df0c290cd27d58226ffa5f4fe8b9548234fadb1c432b9c7d9b297c10a39fd2887d2f7f
+DIST nfs-utils-2.6.2.tar.bz2 969689 BLAKE2B 8e0a3b309223779824276acd3ede13cfc161b955dc9376cc9426ffe9c604b111f7405088fe8e5a88a2d2ac1413d2742fbdf166a5b04c975e51a9e384e071fa60 SHA512 6e5dcc5147ad551b2ecbf0304e1b0e0713d1eff32c5a511562a6d03660589e027364e38fc9f6de1b06d32d8907d502f63c564a6e56171f58823b0ea68dd3a6b8
 EBUILD nfs-utils-2.6.1.ebuild 6052 BLAKE2B 6300335bff0c8714b88f68379fdf8f71c6d92f413452e0df1417f9ab99114adfc4619a28ebaafb0b99bb7c1fd6a162e50e3418feb966302a4643d97ea4c0d07b SHA512 2667edceb1d4bce5413da011e6169b652229722a95a1d24a58e788cf6c74fb20ace6ceed066e07e09449a3b5ab5543929a9d51c3e3aeb5c3d66f2662833324f6
+EBUILD nfs-utils-2.6.2.ebuild 6097 BLAKE2B 14c561596ecb167f2f2af87a1f61bfb64379ee2767b5d19438c8a60db38980da9b2adad11fd4d43d06b1cc541c36afbe53deff01763e196b088c5fe4726a249b SHA512 23dd2e493ddd42310a937c103c7ed683850b6e7f1bafea805d1bca96dc038da05a005360dbcde9d35711f5ab01c949a4f10c8b8e0d59664873ad7e81ee8b15a8
 MISC metadata.xml 866 BLAKE2B 9bed3ad112962947235d7b03372ab0d0d8a35d57fee9500cc4cfe56dc4182634752878767a03760e06880862910b9c5e6abb91b174a624d1e72682bd6515abd3 SHA512 e7797d23c963836eb16bbea897c9ca761794308bb57e23dd10513e009a36d0ed6bf7e095975cf4f68c7f91ea5b6e9a89c1df1d301613383ef799c545e0c9ff3b
diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild
new file mode 100644
index 000000000000..6a6968c458fd
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MY_PV="$(ver_rs 1- -)"
+	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+else
+	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+# bug #315573
+RESTRICT="test"
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+COMMON_DEPEND="
+	dev-libs/libxml2
+	net-libs/libtirpc:=
+	>=net-nds/rpcbind-0.2.4
+	sys-fs/e2fsprogs
+	caps? ( sys-libs/libcap )
+	ldap? (
+		net-nds/openldap:=
+		sasl? (
+			app-crypt/mit-krb5
+			dev-libs/cyrus-sasl:2
+		)
+	)
+	libmount? ( sys-apps/util-linux )
+	nfsv4? (
+		dev-db/sqlite:3
+		dev-libs/libevent:=
+		>=sys-apps/keyutils-1.5.9:=
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	uuid? ( sys-apps/util-linux )"
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-libs/libnfsidmap
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+"
+BDEPEND="
+	net-libs/rpcsvc-proto
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-no-werror.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
+		ewarn "Your NFS server will be unable to track clients across server restarts!"
+		ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
+		ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
+		ewarn "support the legacy, in-kernel client tracker."
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Our DEPEND forces this.
+	export libsqlite3_cv_is_recent=yes
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+
+	# SASL is consumed in a purely automagic way
+	export ac_cv_header_sasl_h=no
+	export ac_cv_header_sasl_sasl_h=$(usex sasl)
+
+	local myeconfargs=(
+		--disable-static
+		--with-statedir="${EPREFIX}"/var/lib/nfs
+		--enable-tirpc
+		--with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/
+		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
+		--with-rpcgen
+		--with-systemd="$(systemd_get_systemunitdir)"
+		--without-gssglue
+		$(use_enable caps)
+		--enable-ipv6
+		$(use_enable junction)
+		$(use_enable kerberos gss)
+		$(use_enable kerberos svcgss)
+		$(use_enable ldap)
+		$(use_enable libmount libmount-mount)
+		$(use_enable nfsdcld nfsdcltrack)
+		$(use_enable nfsv4)
+		$(use_enable nfsv41)
+		$(use_enable uuid)
+		$(use_with tcpd tcp-wrappers)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Remove compiled files bundled in the tarball
+	emake clean
+
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		insinto /etc
+		doins support/nfsidmap/idmapd.conf
+
+		# Install a config file for idmappers in newer kernels. bug #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	keepdir /etc/exports.d
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+
+	# Nuke after 2015/08/01
+	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount
+	for f in nfs nfsclient ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+
+	# bug #234132
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED}"/etc/conf.d/nfs || die
+
+	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+	sed -i \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+		"${ED}${systemd_systemunitdir}"/* || die
+
+	# bug #368505
+	keepdir /var/lib/nfs
+	# bug #603628
+	keepdir /var/lib/nfs/v4recovery
+
+	# No static archives
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
+	local f
+	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
+	done
+
+	if systemd_is_booted; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 1.3.0; then
+				ewarn "We have switched to upstream systemd unit files. Since"
+				ewarn "they got renamed, you should probably enable the new ones."
+				ewarn "You can run 'equery files nfs-utils | grep systemd'"
+				ewarn "to know what services you need to enable now."
+			fi
+		done
+	else
+		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
+		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
+		ewarn "same runlevel as nfsmount."
+	fi
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index ff5f34e91080..5d490bb4126d 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index ff06c20278cb..002d51c23aba 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,10 +1,8 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
-DIST mu-1.6.10.tar.xz 867008 BLAKE2B 6cce22f18691c3ad6dda1ec012d72c398df2ba4d1beca70fc6f88d87aa9b749e2aa4c03f5c0e0d70f4f9978e2beb60ea02642b8ff71e86e0668df726e5923b52 SHA512 a51847b338afeff9c9fa88c4698df4b85289d017063cb5e3410eb967c605d8779618dcbd988e2d923a92291c1e0738ec84afecf017c76a63776149619d134887
 DIST mu-1.8.5.tar.xz 539368 BLAKE2B 6efc12f82aab2beee86475ee49492ce59cb70e8b4fa63f2099a6071ec3275e7f0f308a868133ab3be4646d2280f720a4f6bb5673563a4437d2135e149b1cdfac SHA512 f43afb9484937077f32a38f347352b1ec8fb74c85be74f3afdd53ff75b965f42ab88daa58433fd9292a10c69ed2f2daf3ddbaf3d8d5d5595b0b29b81629a846f
 DIST mu-1.8.6.tar.xz 539684 BLAKE2B ea220a1a6f1fafab54574aa79638232aac4108d32c1e84cb3a1bc910dabbc0dcd1092b18ab62bc5dc57eef4118e023b729d279f9cb84b1fa061d72d60bfa5a91 SHA512 09ac9732e9c18ccdf85b2e2ed64f21f8b87d1484b773ae5ce6edea37f46711ec8709ccceb76f500f8ac02ad5cb54c2bbbc86f75185682ef73bd05a9b467c254c
 DIST mu-1.8.7.tar.xz 539664 BLAKE2B 2f0081f350c0d6da4b7920c0380a02aab42eda12062011bd03a46ceb925c179089b794b501df53b4fc84daa38e6e977a3510801685aa7c91c1c0be58c9c78929 SHA512 04c2027acec80c7569f055c8324f947862721aa36b093dba07ac80b9051229a51225e5371af7cd48fae71c9d5148bd3dc2081f591b9f733bccb5650b4853df67
 DIST mu-1.8.8.tar.xz 540092 BLAKE2B 3cd3d5f41aaf145dee66fc6d5e71256a650b16d0ee99da253d7ffc87df2e36b5fef6d19dd8831002d040c5d6ed13a53e9df69d18d7c002a05a64fb22fe32f5f5 SHA512 deb48ef7d12d76575f14e5313e9c94a40a04dc916943fa45d4281aa637b6549cbcee3cc0879b9daab51e0409cdfdc619acae12bf2ff3edaeb84fb77c3bee8982
-EBUILD mu-1.6.10.ebuild 1586 BLAKE2B d14b3421814913a85460439407fb4fc90b9537df3132520c64697a20b5b3f35fc8c658395a36d4fabf514da9964333969c4e86d1092866cc6d033732d836a168 SHA512 465f3afbb8e522ce51404d6f0de08984b680498fe322484bec0f9dd2a5740fc4405ea69a78d081d9e07fcc26520c50e3349706d830c8cc2fb5dd4539f719c15a
 EBUILD mu-1.8.5.ebuild 2099 BLAKE2B c695a17f01602bc7d0f7d9aef41fac4ae585d7183f9ffb880b618f139b1328a91679ca69eee6e1fd076517062f72d706f48f514eec5a74b9818643bd9c7d0431 SHA512 f51afffe20c60bef08b3da69ed129103bb13c3ebb9d106d3de89b4a8fbc602637e44bd2f4d534ef26218ef018c028a388c505528277818189b9068a66b126504
 EBUILD mu-1.8.6.ebuild 2103 BLAKE2B 3def0840baba20487d6256076c9327c2762cca569af1e1c48589ee7308569f20e88aa32245b449eca9416dc4f819937f1720a0c569799d7ae29cbc7b595eb07a SHA512 f24cb94e4c8d62559a5ef824472d2684ff7b8a5239c9112c8bace36a4df6c0c38089a707bf9138928b874ef445165efd5e18bca644659fb140f1a90abb548459
 EBUILD mu-1.8.7.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
diff --git a/net-mail/mu/mu-1.6.10.ebuild b/net-mail/mu/mu-1.6.10.ebuild
deleted file mode 100644
index 7900e1384200..000000000000
--- a/net-mail/mu/mu-1.6.10.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
-IUSE="emacs guile readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	guile? ( >=dev-scheme/guile-2.2:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable emacs mu4e)
-		$(use_enable guile)
-		$(use_enable readline)
-		--disable-gtk
-		--disable-webkit
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# On some systems make -n errors out so the default src_test
-	# implementation does not call the tests.  Bug #836782
-	emake test
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 93ae0353abf1..ae174e73e9b1 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 5868dbff8226..7f6dd0943c61 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -9,8 +9,11 @@ DIST rsync-3.2.4.tar.gz 1114853 BLAKE2B a67fcb9619874f1c5346a876138e59f4bf508a90
 DIST rsync-3.2.4.tar.gz.asc 195 BLAKE2B 9bc2fbd59e5396a91de82f27a461367ad2a129820e2d1926c3b1e26dacf93c676a7231f186c341b6dec9c764a9619b504bc9b5f95925982e78de4607eddf6c65 SHA512 7e1bbebc777d5710345fdec1efd4c2ef1079d6c0ec90272a1a4a51a59ae3cb619b9d1c0ae2f337ecdd06827bb3536b969b6f21f9108f8d21114713aa1750012b
 DIST rsync-3.2.5pre1.tar.gz 1126641 BLAKE2B 14ffa62305d3e842a89992d9d47e79a8efec5744b297a16dbe6d3440c26b10ac200927ca0f4b6fd1d83e705b56fb6ee9cdedc048dd7e8d6ccf92932e462e9159 SHA512 fe3126ba617b1e4dfb0de845dc1438be8aff07d51d70c0b232e6f0d1efba808d0fb42a30ed39fdb3303c489ef85e0761e188d4ed5fa9d6145cb749c7d11b3fb5
 DIST rsync-3.2.5pre1.tar.gz.asc 195 BLAKE2B 714eed7026f17131a8cbc13fa3f79e0fba52087b23ef84dbe45a5d84a23610d365ac9cd1e7494287a863b7c1bf8ee296fb80b4d4d592ec79d22376666cc005e4 SHA512 9ddfa092155f6c07e9617000ba55c36a2521cc9a9f30f376e89dde2de7bc25270fa348c0622a2a27c68f69bbdae20c75d99d8a75ce446ff490acb236bf5f9b58
+DIST rsync-3.2.5pre2.tar.gz 1127513 BLAKE2B efad3981877809493a96a15f1bec6920a3b975c2d100b5c292800d6fe3aa78e84df601be7eb6fdf51a720ef7d6d96aa648589151bbd238ad1f60ca04f003dda6 SHA512 0e576d074fedefacaaf86d1a7e90b8c77db365f3994d2362d5e6b738cf8362ce2f113dcc2acd76b6635db589492b64ad7a1649ae5cbdb4faec5cde03de6e6faf
+DIST rsync-3.2.5pre2.tar.gz.asc 195 BLAKE2B 80ca72083189d978ea993f581de6776488202763a1b3bc6a777d97cecec38a964df2b8b485472f833828370d314c038b4266e9272faf4f19c4f85b28191647ab SHA512 08d14a0e938e27bae7f6302cf1c4f4c1c0bd309cb5c27e341ef7ca2ca07b0536efd853c91bd59cdca78ac43999924e239e660211ec7f0daefe7ab1c58a728e73
 EBUILD rsync-3.2.4-r1.ebuild 4489 BLAKE2B d13cc511cb1c48c11dfce0df382a0e3baf107ffeddc6d8204debf64c2a15aa97f970a0e4a59b33f71d3e98ad42913ece4ffe576e653a985d9e3391b61419896b SHA512 bdb098101abe7ef32e23b8658f56718cfb00ca3acf273bf590a21edd80e1e54bdeee6169e4a55af4d6e9c94d00233f9e3dbbe970e48bc9d21da5a9479863df73
 EBUILD rsync-3.2.4-r3.ebuild 4766 BLAKE2B 2c5a0c4bd2f5f600cec463fe3d5a41cd4f9908ec5ead8e19a52a29108ad25be43cb6da3eb3f04fb0aafb9efb0bcc33e66d6b6f3450ce59a922d21db533d5f87d SHA512 482dee5328c886e9103a4d0a7d05e7bb258f12093f2dd530eef427714dd7f80ffbff821c4104783c066a7178efbe46da7d86101d74fb094c46f32ee411db22d2
 EBUILD rsync-3.2.5_pre1.ebuild 4489 BLAKE2B f21a5a702902d36dd64f2be93338788d3ffda53950f19abdd9b96c51838d4ecaaf1511b7556621795d1ba4bf78f6843b65aaca9862ebaca5b62e8eae9aeb2eab SHA512 709c9c3f7a669893b2aa7423aff5506149f4d3a5fed18cb3d45946607c1dd5ab9951f7115d327a05a83a8e52cc52935b48f1973640d0292298fcd29c1257feb9
+EBUILD rsync-3.2.5_pre2.ebuild 4489 BLAKE2B f21a5a702902d36dd64f2be93338788d3ffda53950f19abdd9b96c51838d4ecaaf1511b7556621795d1ba4bf78f6843b65aaca9862ebaca5b62e8eae9aeb2eab SHA512 709c9c3f7a669893b2aa7423aff5506149f4d3a5fed18cb3d45946607c1dd5ab9951f7115d327a05a83a8e52cc52935b48f1973640d0292298fcd29c1257feb9
 EBUILD rsync-9999.ebuild 4490 BLAKE2B cf88182b642dea41913431c96f3fe67d5a254767cb65721139423702f53d613c6fa59d614ae6c0475314e5153525682e8bd6c154aaddba92c486c1ae00833592 SHA512 ca478bfa7cb1c50712816631c1d4cdbc4284eac6240306f10e8498956f1209f8dac94d7bc7f540bcfe21911fbafd5412fb42ea1d271756ef48ad5d799e9e05c0
 MISC metadata.xml 707 BLAKE2B 54c2a5840dd4fabb9055652c6bd39d657fab4846891b5ea3fbc59345d98a494b28033336f52d7dfe69b783f73bc64e40496b5c1d09f735545fa1bd74c04d69a8 SHA512 607337487ce0a6b7a5d52f9cdd0a8c5d40daf67ae9e1a3a2107b366484aca6b1eaed05840b95839a2957971accb28ce228f5a4922c7bbace1cc65fb29151df6d
diff --git a/net-misc/rsync/rsync-3.2.5_pre2.ebuild b/net-misc/rsync/rsync-3.2.5_pre2.ebuild
new file mode 100644
index 000000000000..f5a0cad3ef74
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.5_pre2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit flag-o-matic prefix python-single-r1 systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+	inherit autotools git-r3
+
+	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc
+	inherit verify-sig
+
+	if [[ ${PV} == *_pre* ]] ; then
+		SRC_DIR="src-previews"
+	else
+		SRC_DIR="src"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+
+	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
+		verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
+	S="${WORKDIR}"/${P/_/}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd"
+REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acl? ( virtual/acl )
+	examples? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+	)
+	lz4? ( app-arch/lz4 )
+	ssl? ( dev-libs/openssl:0= )
+	system-zlib? ( sys-libs/zlib )
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	xxhash? ( dev-libs/xxhash )
+	zstd? ( >=app-arch/zstd-1.4 )
+	>=dev-libs/popt-1.5
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}"
+BDEPEND="examples? ( ${PYTHON_DEPS} )"
+
+if [[ ${PV} == *9999 ]] ; then
+	BDEPEND+=" ${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+		')"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
+fi
+
+pkg_setup() {
+	# - USE=examples needs Python itself at runtime, but nothing else
+	# - 9999 needs commonmark at build time
+	if [[ ${PV} == *9999 ]] || use examples ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 ]] ; then
+		eaclocal -I m4
+		eautoconf -o configure.sh
+		eautoheader && touch config.h.in
+	fi
+}
+
+src_configure() {
+	# Force enable IPv6 on musl - upstream bug:
+	# https://bugzilla.samba.org/show_bug.cgi?id=10715
+	use elibc_musl && use ipv6 && append-cppflags -DINET6
+
+	local myeconfargs=(
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+		--without-included-popt
+		$(use_enable acl acl-support)
+		$(use_enable iconv)
+		$(use_enable ipv6)
+		$(use_enable lz4)
+		$(use_enable ssl openssl)
+		$(use_with !system-zlib included-zlib)
+		$(use_enable xattr xattr-support)
+		$(use_enable xxhash)
+		$(use_enable zstd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+	dodoc NEWS.md README.md TODO tech_report.tex
+
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install stunnel helpers
+	if use stunnel ; then
+		emake DESTDIR="${D}" install-ssl-daemon
+	fi
+
+	# Install the useful contrib scripts
+	if use examples ; then
+		python_fix_shebang support/
+
+		exeinto /usr/share/rsync
+		doexe support/*
+
+		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+	fi
+
+	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_newunit packaging/systemd/rsync.service rsyncd.service
+}
+
+pkg_postinst() {
+	if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
+		ewarn "is a security risk which you should fix.  Please check your"
+		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+	fi
+
+	if use stunnel ; then
+		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+		einfo
+		einfo "You maybe have to update the certificates configured in"
+		einfo "${EROOT}/etc/stunnel/rsync.conf"
+	fi
+
+	if use system-zlib ; then
+		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
+		ewarn "using the --compress option."
+		ewarn
+		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
+		ewarn "and the --compress option, add --new-compress (-zz)."
+		ewarn
+		ewarn "For syncing the portage tree, add:"
+		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+	fi
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 43f6fcff1651..3bec5f533767 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 19a90b257b26..bced19eef04a 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -10,6 +10,10 @@ DIST tor-0.4.6.10.tar.gz.sha256sum.asc 488 BLAKE2B 4f17ba1b555eeaa0aadad93484209
 DIST tor-0.4.7.8.tar.gz 7910081 BLAKE2B 40f6eab453d95a09e4531ce7cdb59715a21b84e1d0b1045d107add6a443fb7563a5747734b23e0e1dfda6490a5a7659f912e38c11cdb5fa635535dcff6169eeb SHA512 2daeb4ef9144772b4e0793ccd00990b7eda58c533f9616670940931d6d12770e9a7d48b33b5626d330f62bb71fbc6e1f559881f062d16bc15fbb162e29fa91f4
 DIST tor-0.4.7.8.tar.gz.sha256sum 85 BLAKE2B 0fa1e094af83c74f46f87d0569a623bd3061b416f272d19326faf08ab6e9e926b14c2d46c99fba80d68f22188aa74c73e68477015e1c37382e4acb115d10a5a2 SHA512 8d8ef020e8028a0d481cbf6e50809212ebfb493b11c3937f1f732be48ca139a991e68b799342a17374f6faf77f0a7113d15c5220a5bf94d110d11582a078a013
 DIST tor-0.4.7.8.tar.gz.sha256sum.asc 1321 BLAKE2B b70d64db73c45f50bac4ef07f12d755eaf02b676d929bd6f3a9b5b593326e1cce4a3bc8466f2ccce003ab044084fa812ce6ea4cbf32f5a4c0321199dcd291bee SHA512 5c58745abb4db4a9d53c4c4df209cab96689494704d661439efa705f143267aac648ed23240aedc802e9689223f79d2d1c7eba865d2d5b3296590f8b93e03c37
+DIST tor-0.4.7.9.tar.gz 8073881 BLAKE2B b230c8b3224743e2ec8b2c4e5df2c21b12e90f5b545d22ea5feabf8024adb682e481abfc36e2a50758918e3c8de7a4f4757e123cc872ec19bd83ab57b885a7cc SHA512 c319a8139ec9089a50ec6f886db8f5479203b438b51e0632ef846de5f9bf68ed02904d4ad6a3e0a306cae36c64d763fff208de20f2215ab9d1a9eb67ab0d49db
+DIST tor-0.4.7.9.tar.gz.sha256sum 85 BLAKE2B ab921641f6b2ae546a8f0df61034103e06be3d95a12e520fcdf03b92947751ce21bb1aae58dadbd5cdf7172c70a488df4d5b964cabc3a5748a799e3a4955927d SHA512 5c0292e7953e2c42c48b696ba4bdc866accdedf2a9506d4860cfa498743ea818fbe22f5c68485863f04447c1455a37be42d031e9baea7140de726536a4b55145
+DIST tor-0.4.7.9.tar.gz.sha256sum.asc 1321 BLAKE2B 3828ace090b12f10408bba0ae6c2cac23efb67dec7f1968b512969c3ab2123fb6d02a6b48368bd90aa00c1f8f366f2d897ac105e19896003b46d47f8593812d5 SHA512 8289ed0f865edc0a995470777a829fcf260716b91f8d14012bcf0ddd6de9f407f07c8ba651c1b7b4f11003e08b7cf26d35ddae1b7c1390fe2215ea0ca08d818f
 EBUILD tor-0.4.6.10.ebuild 3085 BLAKE2B 1b09e39479439bbd276f0a3f810f2509a7cdec2f5e1b31176586e213d2cb7398c97452e12b4960c3c75e37c3eed64691824d08f9ac0a6d66a701b5d3f7e3cea8 SHA512 8dbd47200f35f15479cf611f2f68346c534f30403b3d56d289717672097b150b627cfd91e64ae46a881e94f5c39714f830cc788931a13ca485f0872cc870ebde
 EBUILD tor-0.4.7.8.ebuild 3182 BLAKE2B 33b1531bbaf9ed8f176b1801fa9a7c7a17d7feeac0bd2007b9cab0f3bf36f838e242c13ae566776c8844da7b9557626cebdddba7aaf54284a08005a85a4c2fdf SHA512 35133f9dfc685723739a53f2714032b0a428a338473945769386c57e96388b11dad64f6c68bd6e152d47efb77fed308b55cbc1345dcd41b77860d03ef762d5f2
+EBUILD tor-0.4.7.9.ebuild 3188 BLAKE2B 38219b96311d1b087f15543634fec44839223a1f5e74ea3baeddbcf3907819bb6fa5b8dc07364802d51e453d50d3c352de461a8014cfab2c9f40b5526e5d6853 SHA512 f3e2012daae2cf4afe29bd01d5bd5c3d64dfbc221f3c519070d04758e65e11be8fa28a4c88833f72d0af6a852c5927a3523e187fc1c421ec14622bdf701e11bf
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/tor-0.4.7.9.ebuild b/net-vpn/tor/tor-0.4.7.9.ebuild
new file mode 100644
index 000000000000..46b0279c3cb8
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.7.9.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 readme.gentoo-r1 systemd verify-sig
+
+MY_PV="$(ver_rs 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="https://www.torproject.org/"
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+	https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
+	verify-sig? (
+		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum
+		https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc
+	)"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+fi
+IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
+
+BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 )"
+DEPEND="
+	dev-libs/libevent:=[ssl]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	man? ( app-text/asciidoc )
+	dev-libs/openssl:0=[-bindist(-)]
+	lzma? ( app-arch/xz-utils )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
+	systemd? ( sys-apps/systemd )
+	zstd? ( app-arch/zstd )"
+RDEPEND="
+	acct-user/tor
+	acct-group/tor
+	${DEPEND}
+	selinux? ( sec-policy/selinux-tor )"
+
+# bug #764260
+DEPEND+="
+	test? (
+		${DEPEND}
+		${PYTHON_DEPS}
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+)
+
+DOCS=()
+
+RESTRICT="!test? ( test )"
+
+# EAPI 8 tries to append it but it doesn't exist here
+# bug #831311 etc
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc}
+		verify-sig_verify_unsigned_checksums \
+			${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_configure() {
+	use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING )
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		--disable-all-bugs-are-fatal \
+		--enable-system-torrc \
+		--disable-android \
+		--disable-html-manual \
+		--disable-libfuzzer \
+		--enable-missing-doc-warnings \
+		--disable-module-dirauth \
+		--enable-pic \
+		--disable-restart-debugging \
+		--disable-zstd-advanced-apis  \
+		$(use_enable man asciidoc) \
+		$(use_enable man manpage) \
+		$(use_enable lzma) \
+		$(use_enable scrypt libscrypt) \
+		$(use_enable seccomp) \
+		$(use_enable server module-relay) \
+		$(use_enable systemd) \
+		$(use_enable tor-hardening gcc-hardening) \
+		$(use_enable tor-hardening linker-hardening) \
+		$(use_enable test unittests) \
+		$(use_enable test coverage) \
+		$(use_enable zstd)
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r9 tor
+	systemd_dounit "${FILESDIR}"/tor.service
+
+	keepdir /var/lib/tor
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r2 torrc
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index bd52e19f6f3b..06cfe574f496 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 23d2ee7c1f6c..5f9afe5f13b4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org>
+# Masked for testing, depends on dev-qt/qt*:6
+# Pyside6 is stuck on python3_10 for the moment being
+dev-python/shiboken6
+dev-python/pyside6
+dev-python/pyside6-tools
+
 # Michał Górny <mgorny@gentoo.org> (2022-08-11)
 # Niche library with no revdeps left.  Last commit in 2015.
 # Removal on 2022-09-10.  Bug #864889.
@@ -591,15 +598,6 @@ dev-ml/patience_diff:0/0.15
 dev-util/patdiff:0/0.15
 =dev-ml/alcotest-1.6.0*
 
-# Sam James <sam@gentoo.org> (2022-04-13)
-# 2.35.2 was a quick release to mitigate a security issue (bug #838127), but
-# introduces problems of its own with e.g. Portage. bug #838223. Pending
-# investigation both on the Portage side and potentially upstream (as there's
-# at least some UX issues with 2.35.2+ with the new "safe directory" mechanism).
-# Earlier versions are still safe as long as you do not use git commands
-# on a local repository controlled by a user you do not trust.
->=dev-vcs/git-2.35.2
-
 # David Seifert <soap@gentoo.org> (2022-04-06)
 # Unsupported branches, no consumers left, removal on 2023-01-01.
 sys-devel/automake:1.13
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 140a5896fb3d..8392e223544d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2497,6 +2497,27 @@ dev-python/pyside2:widgets - Build QtWidgets module
 dev-python/pyside2:x11extras - Build QtX11Extras module
 dev-python/pyside2:xml - Build QtXml module
 dev-python/pyside2:xmlpatterns - Build QtXmlPatterns module
+dev-python/pyside6:concurrent - Build QtConcurrent module
+dev-python/pyside6:designer - Build QtDesigner and QtUiTools modules
+dev-python/pyside6:gles2-only - Build QtGui "QOpenGL*" classes
+dev-python/pyside6:gui - Build QtGui module
+dev-python/pyside6:help - Build QtHelp module
+dev-python/pyside6:multimedia - Build QtMultimedia and QtMultimediaWidgets modules
+dev-python/pyside6:network - Build QtNetwork module
+dev-python/pyside6:positioning - Build QtPositioning module
+dev-python/pyside6:printsupport - Build QtPrintSupport module
+dev-python/pyside6:qml - Build QtQml module
+dev-python/pyside6:quick - Build QtQuick and QtQuickWidgets modules
+dev-python/pyside6:quick3d - Build QtQuick3D and QtQuickWidgets modules
+dev-python/pyside6:serialport - Build QtSerialPort modules
+dev-python/pyside6:sql - Build QtSql module
+dev-python/pyside6:svg - Build QtSvg module
+dev-python/pyside6:testlib - Build QtTest module
+dev-python/pyside6:webchannel - Build QtWebChannel module
+dev-python/pyside6:webengine - Build QtWebEngine and QtWebEngineWidgets modules
+dev-python/pyside6:websockets - Build QtWebSockets module
+dev-python/pyside6:widgets - Build QtWidgets module
+dev-python/pyside6:xml - Build QtXml module
 dev-python/python-lsp-server:all-plugins - Pull in all optional plugins
 dev-python/python-mpd:twisted - Enable twisted support
 dev-python/python-stdnum:vies - Enable VIES
@@ -2512,6 +2533,9 @@ dev-python/scipy:sparse - Adds support for sparse solving with sci-libs/umfpack
 dev-python/shiboken2:docstrings - Expose documentation as Python docstrings (recommended)
 dev-python/shiboken2:numpy - Implicitly convert passed NumPy arrays to Qt lists
 dev-python/shiboken2:vulkan - Generate "QSurface::VulkanSurface" bindings
+dev-python/shiboken6:docstrings - Expose documentation as Python docstrings (recommended)
+dev-python/shiboken6:numpy - Implicitly convert passed NumPy arrays to Qt lists
+dev-python/shiboken6:vulkan - Generate "QSurface::VulkanSurface" bindings
 dev-python/subprocess-tee:test-full - Enable full test mode. Pulls in many additional dependencies, and requires having been emerged without this flag first in order to avoid a circular dependency.
 dev-python/sympy:aesara - Add support for dev-python/aesara
 dev-python/sympy:imaging - Add support for dev-python/pillow
@@ -2949,6 +2973,7 @@ dev-vcs/git:mediawiki - Support pulling and pushing from MediaWiki
 dev-vcs/git:mediawiki-experimental - Add experimental patches for improved MediaWiki support
 dev-vcs/git:perforce - Add support for Perforce version control system (requires manual installation of Perforce client)
 dev-vcs/git:ppcsha1 - Make use of a bundled routine that is optimized for the PPC arch
+dev-vcs/git:safe-directory - Respect the safe.directory setting
 dev-vcs/git:subversion - Include git-svn for dev-vcs/subversion support
 dev-vcs/git:tk - Include the 'gitk' and 'git gui' tools
 dev-vcs/git:webdav - Adds support for push'ing to HTTP/HTTPS repositories via DAV
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 69a502576d5e..56b688c50522 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-sergehallyn/Manifest b/sec-keys/openpgp-keys-sergehallyn/Manifest
new file mode 100644
index 000000000000..cba8196ea754
--- /dev/null
+++ b/sec-keys/openpgp-keys-sergehallyn/Manifest
@@ -0,0 +1,3 @@
+DIST openpgp-keys-sergehallyn-20220812.asc 14968 BLAKE2B 12dfc04f3937b31af215b15f86008846de852d5786f480fc13d708b5bb905c5f6069bdee3df5c2762a2a723ec21834941662fa9d91d60fb59782bc1622dce1fa SHA512 35af0ac0600db204e31a2ce5812cf136caff2bc17ef160daefd113fc8b5daf068793bbd0f563588aec6780c26f082820d0c6bd6b7c72839321feecabfa6a4a01
+EBUILD openpgp-keys-sergehallyn-20220812.ebuild 540 BLAKE2B d4cf6eda0b710cef9e705125eafc65bdf85f537cd29bdee016ddd36f672071cb5ab5ce46a5ab8166ebaf410a17bb5c1e9a9b4243bc8d802437284029accc2ed2 SHA512 6cbe748c6ea73a0acb84106f71dbe7d4f6b8d466cabb1cf44903e0a921e351703bd97a7920454931d7703fec73bd101a65c36d34183e0402e7de3bf138e76a7e
+MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
diff --git a/sec-keys/openpgp-keys-sergehallyn/metadata.xml b/sec-keys/openpgp-keys-sergehallyn/metadata.xml
new file mode 100644
index 000000000000..8cb7f9b298b9
--- /dev/null
+++ b/sec-keys/openpgp-keys-sergehallyn/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>base-system@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-sergehallyn/openpgp-keys-sergehallyn-20220812.ebuild b/sec-keys/openpgp-keys-sergehallyn/openpgp-keys-sergehallyn-20220812.ebuild
new file mode 100644
index 000000000000..9842319ef619
--- /dev/null
+++ b/sec-keys/openpgp-keys-sergehallyn/openpgp-keys-sergehallyn-20220812.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by Serge Hallyn"
+HOMEPAGE="https://github.com/hallyn"
+SRC_URI="https://github.com/hallyn.gpg -> ${P}.asc"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - sergehallyn.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 26835b566f7d..e3fc79da984c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 3df183d9b474..f3ccb783c2de 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,4 +1,6 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
 DIST help2man-1.48.5.tar.xz 204672 BLAKE2B 6d96f5f65f8c637d524e5c373f2b89f114adf544c1d3508a9cb51115279b9bf6399c8ebb0a8d831de12ef8cdaca40b6e75412a221efc5d2dd1794e9c9643196f SHA512 800eb0daa9daef8e423d52ede55eee2960122ea0269865295afada4cf4fcc1c6791da8429c3a57c0fc1bf0a14c8a77953952325413a8faa5dd07b1bc5bc0edd1
+DIST help2man-1.49.2.tar.xz 225428 BLAKE2B 62db47a5915432093991f060390a62ebf2d1e5e6e78f7142d0cd5f8a273a1fd74f55de4b3ead5c1071aaf4de084e62782981a1d888b8a8b76da9c07e0cda20ea SHA512 cb8f9f923263d7160a27a7924ae559aba93d7258167888eb9e0e3e97a2014297b8d739b2bb7869acbf586354d099bd91d85f8208b901bce5ba0c5ad4b6abd6d5
 EBUILD help2man-1.48.5.ebuild 1042 BLAKE2B 32553914ae2c27d4d4f05d5be5ac93ed582c1443bd04642aedcf0d838f87dfebf6666d9159f41483bb91d56cb4d29c3b4220a75703ab567d8541117f93d0c44a SHA512 17c63491252c0730ec8e1403062a0413ea5be4368a5e43db561fc80bf07afe835533ebdccaec55b4e8078e8f827b2518ec726e97d3f5c4736dcd6a8572853ef2
+EBUILD help2man-1.49.2.ebuild 1101 BLAKE2B f0f905a56bbd3ed7e9261e9b4d21da3a97bdced886096af6a52a9a4fcc55ed064c38a611f18be1412aecf68ea96da5b38ccfb981b5c80d3bfc93c447d43e8769 SHA512 91d09746b6c07d21a8d249584de69ab50afa237f158269b470b10431024fd1ea039233cff2dccb159f76a189e036ea9ffac8d1ae4c19fa5d0660bce31cba9da5
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/help2man/help2man-1.49.2.ebuild b/sys-apps/help2man/help2man-1.49.2.ebuild
new file mode 100644
index 000000000000..bd9be868fe32
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.49.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="https://www.gnu.org/software/help2man/ https://salsa.debian.org/bod/help2man"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+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="nls"
+
+RDEPEND="dev-lang/perl
+	nls? ( dev-perl/Locale-gettext )"
+DEPEND="${RDEPEND}"
+
+# bug #385753
+DOCS=( debian/changelog NEWS README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i \
+			-e 's/-shared/-bundle/' \
+			Makefile.in || die
+	fi
+
+	default
+}
+
+src_configure() {
+	# Disable gettext requirement as the release includes the gmo files, bug #555018
+	local myeconfargs=(
+		ac_cv_path_MSGFMT=$(type -P false)
+		$(use_enable nls)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 7e467337b3c4..73d99e7b3a5c 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index dcecdd9e270a..9addcf737161 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -1,6 +1,8 @@
 AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af4840d0301c1fb590d34b029e18a239a232ecca6a62431e10138d4e12cb44a5f64b415936935c1bdaf601dcf605ebe892de54 SHA512 1f77f4a5dcd2f1589cd6950da3462f2508d0ac51c2d2268400414c336ddd41fcf430e79fb702fd5aa99cb4be0bf0fc6eabe9362d736a1223b1c53c2c0b319584
 DIST gnu-efi-3.0.12.tar.bz2 154575 BLAKE2B 264e04351cf1ef74956e65d209c00514c0f56c18427a87a894132e5a5b0b09b3ca992475a2f95aac42c8a26ff4977ec837ff473d76c1c766049e903f03bd9fff SHA512 cbec6f6e37271c22c71e3ce44d3579e48e7f3b797ec3946f56eb843ed3e472722763c566fc3b749f0c692ab6cb26e8909bb258cd164771a5b1eeff5c7cd51368
 DIST gnu-efi-3.0.14.tar.bz2 159295 BLAKE2B c7f9127d3bb7e5e2bc52f5fc7be3376ddc5076b262e5db5a30a997cf10bf10288da63ded64d11327fad09190a803ce26e82b32aea2d8525ee0d1e1a23ebadff2 SHA512 37420ba3804e8547451a7b143a689ceb6af0557234fa7801efdeba3c2fc581a5354fe34cbaacb338d7b394d913e7274098ebf07026b7c1d50b2236d7f86c470c
+DIST gnu-efi-3.0.15.tar.bz2 159399 BLAKE2B 0df93d8cacfa1e6d4b7731e32287d4386da9375c5e5c5847df8a29c99d70f5c24b14abc5e44ab9d0a39a6ec96682eb2b5e84d81a5a142d44a50a522a4ae0e3c2 SHA512 64d408b6d115bdc6eebae12fbd6cd907ed5f847f54e506c1e8f8ea5de38a95cf6fac66ab1009bd1d0bd2d54ad45ad598d29bcc303926a5899bf5cc25448cbb2f
 EBUILD gnu-efi-3.0.12.ebuild 1893 BLAKE2B be5aa026b5aeadb8e39322013446277ea08bf96cbee08eeadea7a8392d56b1ad45f7d5963ef7f1baeef459e54fb68bc24ba5faaeef72f52e64dde1a1ef767d17 SHA512 be87d6720e42a9ff0334fb5e79b85d272339d332fa13bf8aa415badcb68bf3727b63ac241f44a1efcc1e44f869fa122350298837526d064d79931ade56e0cb3d
 EBUILD gnu-efi-3.0.14.ebuild 1914 BLAKE2B a56a217406b98741e472504df0e7e5ad33d6b3ba40cd1ea7f78378b6151e9134083d9b43635fd8b76855a717742a3553ddf94bbf89b648e65cebfa8b7d2fb3cf SHA512 a08046a2f8a309d692d3ec5b65f84cd35633ac2ba40b51024c69aa2e583bf2f99790566b92ccad993a289970384c814e536e505ae21cdfeaf31764802e1127c4
+EBUILD gnu-efi-3.0.15.ebuild 1914 BLAKE2B 93733f6975a473250018f18a819e499bc4310bd377cd2f3ced29e5e7c774c78dfdb7895ba145db163d80f4bc06667fcc04d2b3a39de24f9c2742c11265d668b1 SHA512 91120cc3b186b57332e75742441c242244849f1182fbcab2467318f71641647ac599bf047af5108723045de7ef739ae2db8163cf3b58888a4ba8cbf4150b7434
 MISC metadata.xml 324 BLAKE2B 7eff39b7405a7a2e574ca870890052a58dfcf612d2a5057dffda9aa7d674ead8884acac2bda143586d8d20000cb4e9e35f044fd2618386c7f4577d8014b899a2 SHA512 9ee2a23d2c9ac583a55b2e2d92652121f4ff11f8f40a0caa13d5a52fa61259814044ec106b46be0cc741cbdf68414c55c4da96b46328a96f5a1ec1d0e1fa11d6
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.15.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.15.ebuild
new file mode 100644
index 000000000000..efa2f8c2d9e6
--- /dev/null
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.15.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2004-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Library for build EFI Applications"
+HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
+SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
+
+# inc/, lib/ dirs (README.efilib)
+# - BSD-2
+# gnuefi dir:
+# - BSD (3-cluase): crt0-efi-ia32.S
+# - GPL-2+ : setjmp_ia32.S
+LICENSE="GPL-2+ BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86"
+IUSE="abi_x86_32 abi_x86_64 custom-cflags"
+REQUIRED_USE="
+	amd64? ( || ( abi_x86_32 abi_x86_64 ) )
+	x86? ( || ( abi_x86_32 abi_x86_64 ) )
+"
+
+# These objects get run early boot (i.e. not inside of Linux),
+# so doing these QA checks on them doesn't make sense.
+QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
+RESTRICT="strip"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.9-fix-clang-build.patch )
+
+src_prepare() {
+	default
+	sed -i -e "s/-Werror//" Make.defaults || die
+}
+
+efimake() {
+	local arch=
+	case ${CHOST} in
+		arm*) arch=arm ;;
+		aarch64*) arch=aarch64 ;;
+		ia64*) arch=ia64 ;;
+		i?86*) arch=ia32 ;;
+		riscv64*) arch=riscv64;;
+		x86_64*) arch=x86_64 ;;
+		*) die "Unknown CHOST" ;;
+	esac
+
+	local args=(
+		ARCH="${arch}"
+		HOSTCC="${BUILD_CC}"
+		CC="${CC}"
+		AS="${AS}"
+		LD="${LD}"
+		AR="${AR}"
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR='$(PREFIX)'/$(get_libdir)
+	)
+	emake -j1 "${args[@]}" "$@"
+}
+
+src_compile() {
+	tc-export BUILD_CC AR AS CC LD
+
+	if ! use custom-cflags; then
+		unset CFLAGS CPPFLAGS LDFLAGS
+	fi
+
+	if use amd64 || use x86; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
+		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake
+	else
+		efimake
+	fi
+}
+
+src_install() {
+	if use amd64 || use x86; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
+		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install
+	else
+		efimake INSTALLROOT="${D}" install
+	fi
+	einstalldocs
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index ff34d40c73b5..28640016068f 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest
index 731558140c20..0d9a03b6f980 100644
--- a/sys-fs/erofs-utils/Manifest
+++ b/sys-fs/erofs-utils/Manifest
@@ -2,5 +2,7 @@ AUX 1.4-dump-fix-de-nid-issues.patch 4849 BLAKE2B 48e29859955f5e7b13af7657a2411b
 AUX 1.4-fsck-add-missing-include.patch 878 BLAKE2B e7d32eced8199a6c282d7398cea068cf560d9715caf035c67127f25fdf7055492fe25c56703e166a683f40cbb7d6ed6723c5d97467bec22f67418bb9b3bcfc5b SHA512 4cffb6faf7e1bb8150347ba8e47e0b05ad1b7d5dd4eb265330a33d6054dc6157e780a38b80a17cb61d3ab1fb2b41f36fcf65c39846f30003bc6013d23028c1fa
 AUX 1.4-werror.patch 2523 BLAKE2B e794e82eb2bbc2bdc76cefb054e37a8e07a3ce1abb3d94dcbcbf115189e719677fbe18b965f1d84353853b0963ab188638634f6ebc5c32d4790ebbf0850a94a1 SHA512 3856b297ba273389e5db9ce859291ee1bbdacbeda4cdf560250f1721af81fa2037a9e3b06d955ed4caab795fec15428397cc6b03d81e79269ae963dbd0e7d51a
 DIST erofs-utils-1.4.tar.gz 93979 BLAKE2B aef1dca8cb95e6104d73a84590319d3c55aba1a4ef5dbdbf470662cb86ee1b66a5707dc1c453470115ec6f2bf1246ee4b6b28aa1cb83b4cb9c8eed45e88668d4 SHA512 ab95d6a7b2d278ee443d1e378c62354db66ce7ab5ce03b3a8d9004cf498c4e43e3e8ced6524444d2ea4871c4db0195489f033180c8a2082c2cba69c46c09692f
+DIST erofs-utils-1.5.tar.gz 106559 BLAKE2B 69a2b93c0ba8c50fb3f75a53cc224490ab31f55e24055932091e85032a637c2be6d937ab42f068a2937e5b9d8b6054fd756e89b9333f47a6b6b35c20a421ed49 SHA512 0a9d593a9fef3c5976dc63e2927f47d070121ed07e6dda727b0a715b72cfe560c83bdf26ce41fe07b8cb5b66b0660105848e3f7c5a84f222296eb422d1cd5cba
 EBUILD erofs-utils-1.4.ebuild 1112 BLAKE2B b6309a68000ef76ce396cc4b73d9731d39005618cffd8ffedd2b54e300e0149d861e568cf7eae6d0cc890be0343635721429ef26b8c27dbed6279268999336df SHA512 71103201d5483b3cebf6f90f4eaeb80b19a4a0204ad24f0d2fe48936debcbdceb99c76f60329b9f63a5e23a1067fe75feb7fd14bdeb05e8a75f770ac0865d1a1
+EBUILD erofs-utils-1.5.ebuild 997 BLAKE2B 84c7ad925869c512f6a51045c443dc887c62e2daa3b06b910e3f441d719266ea7698d4bfb29beaf5b78a6e98f1796829fee90109a0d692e96914af049327bf17 SHA512 6f799afc9f6caf456ce9188ff55d61f1d4e6d464799de7971aa1824bb4dfcbdcdd95c734215a21a55dc7d9da768f29769da4e74d2b553c61f0b121498a470c70
 MISC metadata.xml 422 BLAKE2B 9c580f677db0b02904c12e023efd2c1abf0dca9d5dd84776ea55551e3997a968bf23c092b9bfa98e941f7d16009c6e56cdd0120a075872c8e3f84a77899ba556 SHA512 bb5def8dcfe0ecfdc8ce9e6fec61b7c707114abef8e79f2c0f27736341e9c3cca48c053b613d85db762c1632194e76d3ab33386bf0be7ba669a6aaee652b64c1
diff --git a/sys-fs/erofs-utils/erofs-utils-1.5.ebuild b/sys-fs/erofs-utils/erofs-utils-1.5.ebuild
new file mode 100644
index 000000000000..6ad7945f7521
--- /dev/null
+++ b/sys-fs/erofs-utils/erofs-utils-1.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Userspace tools for EROFS"
+HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
+LICENSE="GPL-2+"
+
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/${PN}.git/snapshot/${P}.tar.gz"
+KEYWORDS="~amd64 ~loong"
+
+SLOT="0"
+IUSE="fuse +lz4 selinux +uuid"
+
+RDEPEND="
+	fuse? ( sys-fs/fuse:0 )
+	lz4? ( app-arch/lz4:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	uuid? ( sys-apps/util-linux )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# This package asks for MicroLZMA support, which is not included in any
+	# released version of xz-utils at the moment, so disable lzma until a new
+	# xz-utils is packaged.
+	econf \
+		--disable-werror \
+		$(use_enable fuse) \
+		$(use_enable lz4) \
+		--disable-lzma \
+		$(use_with selinux) \
+		$(use_with uuid)
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 427aa37a86c0..1bcbede47771 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index c498da5322ab..87cd1bc8ff95 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -1,4 +1,7 @@
 AUX slang-2.3.1-slsh-libs.patch 761 BLAKE2B a0bc1a573fa1031e44c998bb75c80113ccd86be47f7d0b80da0ba53c7fa066d780ebb86b9cc5ff503e0d4c99b49fe75cb4c916088cc7b18a5a6c1670cbca4ba3 SHA512 77516f0b0373a08fbf61765e4eb83cbfa91b29a58a41e0006d1041672c6107dc5a2410056d65dd64fe68de40e01c211feb9f748a8238473cd5c98dfe2125f7b2
+AUX slang-2.3.3-slsh-libs.patch 1638 BLAKE2B 5d187745c96d44780e4f335f4db7d52905b7153cbfd3aca81e18362464a925425dfdfbaa9dbf78fd760d2fa6a3c60bc2647dd79e9ff8ae844361eab2353e6f11 SHA512 a5ad139bbceaa94bf232c13fcc21f88d31218bcf8979b1409ecbe3cb25d5bf4f78fba14ae3201938e87008e07bb171e0410b800af049ec8d9a9db9e91a0ceb33
 DIST slang-2.3.2.tar.bz2 1586720 BLAKE2B e923a431e6273f1783c40dc09b2e324ace22e41a163fd46dcb8ab16c9ef27f190651df8da24432edc75890b83cd95051a835d5e582385bb23e36cd8ae18e6d24 SHA512 35cdfe8af66dac62ee89cca60fa87ddbd02cae63b30d5c0e3786e77b1893c45697ace4ac7e82d9832b8a9ac342560bc35997674846c5022341481013e76f74b5
+DIST slang-2.3.3.tar.bz2 1646311 BLAKE2B 2f304b25e807fe38b544479f4a6e98723816d08cda576177a270df736d7db8992a478f980333afc10a7bc0b5dc5508e49b33a13de02f0466f065efdfa3b7b351 SHA512 f882f09e3fcd53427de0f233c9fc3ab15497f2323007be9a084696c8cf810ffe2726cd003149e757df26198b390b9f8c1ff411dc6473513457bd0f94722f8490
 EBUILD slang-2.3.2.ebuild 2245 BLAKE2B ce75e58672dc3e44bf8bbc8e98293bf8903f4b7063f40cb08a7b38bfc17515b76826185ddb1e8e3bf56fcfc013e3da3f846ab700e437e6e420f752daca8304c4 SHA512 226e5e32b38e6328540853fbcf38f00540a7be72bf50353f0be635f3c3d39c845286794479226e565902b265013a473096835f6a92c9d4e146eef199abb6268c
+EBUILD slang-2.3.3.ebuild 2257 BLAKE2B 4725ee88c11936321a9176363800902ca1d99b797a548154c234492a9d367a429bd52a2ceb7c5c8ebe23dbe5962b1aca9ac46346be4754cc364e30d726e7b93f SHA512 283f715aca9a83bf56bdd16e501c575464956339bad924eee77c7d071a48cdbd7b6629ea5468b8aa25c56f237c2593dec672c64d87d07afcbf28b2d20de81426
 MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/sys-libs/slang/files/slang-2.3.3-slsh-libs.patch b/sys-libs/slang/files/slang-2.3.3-slsh-libs.patch
new file mode 100644
index 000000000000..15062ee7d420
--- /dev/null
+++ b/sys-libs/slang/files/slang-2.3.3-slsh-libs.patch
@@ -0,0 +1,21 @@
+Fix build issue:
+```
+make -j32 -j1 -C slsh slsh
+make: Entering directory '/var/tmp/portage/sys-libs/slang-2.3.3/work/slang-2.3.3-abi_x86_32.x86/slsh'
+x86_64-pc-linux-gnu-gcc -m32 amd64objs/slsh.o amd64objs/readline.o -o amd64objs/slsh -Wl,-O1 -Wl,--as-needed -Wl,--defsym=__gentoo_check_ldflags__=0 -Wl,-z,pack-relative-relocs -fuse-ld=bfd -Wl,-O1 -Wl,--as-needed -Wl,-export-dynamic -L/usr/lib -Wl,-R/usr/lib -L/usr/lib -lslang -Wl,-O1 -Wl,--as-needed -Wl,--defsym=__gentoo_check_ldflags__=0 -Wl,-z,pack-relative-relocs -fuse-ld=bfd -Wl,-O1 -Wl,--as-needed -lreadline -ldl  -lm
+/usr/lib/gcc/x86_64-pc-linux-gnu/12.1.1/../../../../x86_64-pc-linux-gnu/bin/ld.bfd: cannot find -lslang: No such file or directory
+collect2: error: ld returned 1 exit status
+make: *** [Makefile:95: amd64objs/slsh] Error 1
+make: Leaving directory '/var/tmp/portage/sys-libs/slang-2.3.3/work/slang-2.3.3-abi_x86_32.x86/slsh'
+```
+--- a/slsh/Makefile.in
++++ b/slsh/Makefile.in
+@@ -92,7 +92,7 @@ slsh: $(OBJDIR)/slsh
+ $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+ 	$(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+-	$(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(INST_LIBS)
++	$(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh.o: $(OBJDIR_TSTAMP) slsh.c slsh.h config.h Makefile
+ 	cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
+ $(OBJDIR)/readline.o: $(OBJDIR_TSTAMP) readline.c slsh.h config.h Makefile
diff --git a/sys-libs/slang/slang-2.3.3.ebuild b/sys-libs/slang/slang-2.3.3.ebuild
new file mode 100644
index 000000000000..8332aeb6fc27
--- /dev/null
+++ b/sys-libs/slang/slang-2.3.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Multi-platform library designed to allow a developer to create robust software"
+HOMEPAGE="https://www.jedsoft.org/slang/"
+
+if [[ ${PV} == *_pre* ]] ; then
+	MY_P="${PN}-pre${PV/_pre/-}"
+	SRC_URI="https://www.jedsoft.org/snapshots/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+else
+	SRC_URI="https://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
+		https://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="cjk pcre png readline static-libs zlib"
+
+# ncurses for ncurses5-config to get terminfo directory
+RDEPEND="
+	sys-libs/ncurses:=
+	cjk? ( >=dev-libs/oniguruma-5.9.5:=[${MULTILIB_USEDEP}] )
+	pcre? ( >=dev-libs/libpcre-8.33-r1[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:=[${MULTILIB_USEDEP}] )
+	readline? ( >=sys-libs/readline-6.2_p5-r1:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+MAKEOPTS+=" -j1"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.3-slsh-libs.patch
+)
+
+src_prepare() {
+	default
+
+	# Avoid linking to -ltermcap race with some systems
+	sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die
+	# We use the GNU linker also on Solaris
+	sed -i -e 's/-G -fPIC/-shared -fPIC/g' \
+		-e 's/-Wl,-h,/-Wl,-soname,/g' configure || die
+
+	# slang does not support configuration from another dir
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-readline=$(usex readline gnu slang)
+		$(use_with pcre)
+		$(use_with cjk onig)
+		$(use_with png)
+		$(use_with zlib z)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake elf $(usex static-libs static '')
+	emake -C slsh slsh
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install $(usex static-libs install-static '')
+}
+
+multilib_src_install_all() {
+	rm -r "${ED}"/usr/share/doc/{slang,slsh} || die
+
+	local -a DOCS=( NEWS README *.txt doc/{,internal,text}/*.txt )
+	local -a HTML_DOCS=( doc/slangdoc.html slsh/doc/html/*.html )
+
+	einstalldocs
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index ddf5959671d7..16289130224b 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 4e1d8e74b8f2..31603c385a69 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -7,5 +7,7 @@ AUX varnishlog.initd 707 BLAKE2B 90e75e267a2ad8688ace41d4eff20e8601e0b20abc9b73e
 AUX varnishncsa.confd 84 BLAKE2B fbb338ec2163562d7679a7371cda3cd297449186bfcaa668e3924d944dc78eae8d8bf5c60230202fee4093119ccc74d67ad8f3e6774091c6c2b5c9b184d4b5eb SHA512 a5426ff66b89d2afb6273f05e4117b3eec5ce0162a624d52c92b418960f72e58bd01224165613221af76ec241bd98e1eb985b2ef7b83a5b615e9ece67234dcc8
 AUX varnishncsa.initd 716 BLAKE2B 33fd6b044ab50aef629fa4501eb4a78bd3d690db52b86a33d1d4e87c1da28088b9f25ce917d16a9ed777b1d6e1ece5a916af0c4ff293db82b94d264fd5baafa9 SHA512 1d0c781675ecba5adce02c37a02c431c4b44d64310a0945bff4f6f57f7d0c87cb7dda874311e44d667317d5beda113b62f4ba49c81534a0c078314b3fa15a512
 DIST varnish-7.1.0.tgz 3787588 BLAKE2B 1a019b140c467063861460b529c253361975826cee797c304c7c096645c315b67ad20400467ecf11711abae5354134ac29a934793691283e12e3fbe29921943b SHA512 ad9ce0cdc759976fcb7044914d28863edd197167f583fab2d1bc57f4e5b86c224b7c948faf1f7364a2a16bde9c415375d011462bdc43026c5f7a60e65bd21f73
+DIST varnish-7.1.1.tgz 3742869 BLAKE2B d41e7214c3b51ac18b1a89012b48d3db58f4f777df675fa93d6ac75d3cf14b78af23f9d6e8b8686fdfa82add70a1a42e5e54f382506444ec81ad6d121a99e447 SHA512 7c3c081bd37c63b429337a25ebc0c14d780b0c4fd235d18b9ac1004e0bb2f65e70664c5bd25c5d941deeb6bc078f344fa2629cf0d641a0149fe29dcfa07ffcd2
 EBUILD varnish-7.1.0.ebuild 2234 BLAKE2B 751a1ee4b19575d5965b507f20318b6fd203030cf0dd6a19090ee4989871bff9bd5f2a1fc6af5f0d4e36dccb57603bf446bd45ac0e82411a4dfdc4c6679ae5b8 SHA512 6c10b0d06a27c735c886de7545e0df562ba17b0880c710ca9ea569c1eef61893e4d1808639e21633d6a6962b5e8538ac8318beb6f0e917e27752a09760839ebf
+EBUILD varnish-7.1.1.ebuild 2236 BLAKE2B c469af8f3fbd4569a8021074d8a5731993f18becec637c26716c4b3e9aec1065108b46ecb418c6fb83595e4cda32f50fc96070057dd6b5d87e06fbed3bf78de9 SHA512 8da3030f1a7c916a2ced77857944c9a66e35e0c7501ad23c0a207d40dc1a7532971f54e0ff5e2c901502b0880343cad21ab222e80cedfb12cc5b5d0c12eb8240
 MISC metadata.xml 1155 BLAKE2B 84875f3204cf314d1cb22e323ae8edb4e439e11d165c019bdf959925236ee4df671a9dbfd5a98d4c8841f8ec19cf8e602b703052d9a864d7e3c652ffe40054f0 SHA512 34bad8011b4530abc02f35b1bacb3d632ea5d57da41162a246d5601d766f192448efb31445536e02485fa195ab5f5eb564b4a1886632d0fd32626184d1173db7
diff --git a/www-servers/varnish/varnish-7.1.1.ebuild b/www-servers/varnish/varnish-7.1.1.ebuild
new file mode 100644
index 000000000000..e96a88314f50
--- /dev/null
+++ b/www-servers/varnish/varnish-7.1.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit autotools systemd python-r1
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
+HOMEPAGE="https://varnish-cache.org/"
+SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="jemalloc jit static-libs"
+
+CDEPEND="
+	sys-libs/readline:0=
+	dev-libs/libedit
+	dev-libs/libpcre[jit?]
+	jemalloc? ( dev-libs/jemalloc )
+	sys-libs/ncurses:0="
+
+#varnish compiles stuff at run time
+RDEPEND="
+	${PYTHON_DEPS}
+	${CDEPEND}
+	acct-user/varnish
+	acct-group/varnish
+	sys-devel/gcc"
+
+DEPEND="
+	${CDEPEND}
+	dev-python/docutils
+	dev-python/sphinx
+	virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+src_prepare() {
+	# Remove -Werror bug #528354
+	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
+
+	# Upstream doesn't put varnish.m4 in the m4/ directory
+	# We link because the Makefiles look for the file in
+	# the original location
+	ln -sf ../varnish.m4 m4/varnish.m4
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable jit pcre2-jit)
+		$(use_with jemalloc)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
+
+	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
+
+	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
+	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
+	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+	diropts -m750
+
+	keepdir /var/lib/varnish
+	keepdir /var/log/varnish
+
+	systemd_dounit "${FILESDIR}/${PN}d.service"
+
+	insinto /etc/varnish/
+	doins vmod/vmod_*.vcc
+	doins etc/example.vcl
+
+	dodoc README.rst
+	dodoc doc/changes.rst
+
+	fowners root:varnish /etc/varnish/
+	fowners varnish:varnish /var/lib/varnish/
+	fperms 0750 /var/lib/varnish/ /etc/varnish/
+
+	find "${ED}" -name "*.la" -delete || die
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-08-12 20:22:37 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-12 20:22:37 +0100
commit	f8ca23f9f6e4a55e4195e553ca2f3e7dd425f51c (patch)
tree	8268a378f27e1940a5a76b3c55abf6e4ee0fc256
parent	7c68db06bb531670c1261374c0133d652b476bd7 (diff)