gentoo auto-resync : 03:08:2022 - 03:20:22

author: V3n3RiX <venerix@koprulu.sector> 2022-08-03 03:20:23 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-08-03 03:20:23 +0100
commit: 83cfc3cac0511042177fc061cc188c99bf900be9 (patch)
tree: 5034fb6788fbc83794da9ca9541a6bd4fe6ea974
parent: ca45ec83b5d77af14152011046f506005a8a71aa (diff)
299 files changed, 5039 insertions, 506 deletions
diff --git a/Manifest b/Manifest
index 472079f04a50..edc41eb509b3 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29608 BLAKE2B 529ffa30c7d8330778cf678f8a12c7bb8014e6da446364fe61471d2dc16524134b46b04f10712eefc7fe97631a37fb4bd244ec10dca044cb78df52c1456902b0 SHA512 4a96aa9208db89627d67dcdb8e04a91b2fd34d28d5c3c1eddc481c767f5176973727bf58608ed129b9c1712875de0022066def9a55f45841bbb303ca802e84b3
-TIMESTAMP 2022-08-02T19:39:47Z
+MANIFEST Manifest.files.gz 29628 BLAKE2B e40389ce3c4c764bf8890387f444eb202d676f20e3eddb295330a5841218cc9c639729874d1ace1f64fe494b813a21f4f117ffbdbdfb84c7d888b5fa86c2b89f SHA512 6d2dfaee43d3fe10d2a7dc581fb5b7b666e298d93765c1c7bf422420fdb9a799640b2b98692a377476dbb4cb9e0f6358206e221533977b1804db2eb7a42889b1
+TIMESTAMP 2022-08-03T01:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLpfYNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLp0eRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCGCg/+LqBm6+mj0F75dungZIsFT9twJwrq56Shlkx0YTeP4DYr572SnwkaM/Et
-lGBmzg4TQg1STg8U/phEpMRMU9OKxDsZNucm2BLIpQVGLfNwKDQgBwGIbC7eOEju
-MAkoFSnAtmME9hJGcURBeG5kWavn/r9xwpgEOO5Y6KOu5REAi8QiQ9/VdO2q4LS3
-G3wtMVbPU3GnkL/gz944W2yvqKIIAxg37uz7AKYzxfl9CO5HddncjclKNjD0nXQO
-ikxNslpwNBdVU/BVhRMoisfpiW/amptMrH6zaXKGNOtgS6AqbpZyudg4zY57wHsN
-fRiwOBfuJH+7xh+zsKL4xV4ePVI8VnKQoTWmHLOPsU/UAHW0qoJgcUoJA2zM9t1F
-AEcB+T3vExOwvwx+A3BYZlSE3Wx2NIeSEX2BYGuwZxv18KcUBB6xOUSZRdSUiBeh
-7rnEhAcSj4UV4GtP0ul2Pdkj5yEok4yTIHw2UwNSqY0BwHZA5C0kGmSzL2yqooQn
-eQffmHSLtu1MKUPzF5p1fC09lB3LHIl6H9i/rIbN+qOkB2ifVZIJc/uzLueWEhyt
-UrYN9QGiKzfQa4Fc+8uJ2WdBJQTtlQzBJsAkyMs8u2Jmx5uhyYBozkfV3zZc2e9W
-D40zJdzYoeH/ScCxjMu/F4aVgZgqy9kWIFr67hAsyGT2xZv9JiE=
-=Qi8/
+klCD3Q//YK6waRO3ZeIA5xj0g5+IwAmOoyK3GNsZWpkFdGUjNeYYLYU51wrEXkPd
+HPvs3GrbKRZEfPe7bWJTARUecfyA5LhCGGdYW0cDwfjfD4lCr7vc04FnvNq1k3Qj
+I0IuDIOuPkV0lU9qIkDPbGPes7NrTmUmJNA0JE6dysZ4atgOiag6s2n6ebF6xiYl
+ttAo02O4zLi0tmx9hhCsiHnUiBiDYpNmz4ctoZAo2KCiUUdpWCwiXpNN4THpL85C
+2MOD+VV3QnXWvUM11ZTm/T/7mbH7S9Vk3ZePpn5vaaAJCL5spjXHbzyY0lhEoYaZ
+62UKDlZonBksQmWx4G/95bpOCk/+c6LMQk1GPswTBU2zL8rcDXZctFT4q1ufGTwk
+558PTjaP4Q1AVMJGtf2kYubqBlW2HFqTUjcQaIEtiYN/Phf5/ZBV6Y+5Ap4Mbw2G
+4tT6CfpwmEt1yV0Kf8hjC0q1PPztDSjtfBacaJqwYeOHiezNCt+54/Ir6m/8QCdW
+f4buIj9Zpm2jjOJyM/AtL7Vrj+XZbBuLqSDmnC5AKdcaz+aJIAyDK+gbi11EOC+c
+UJTftfzZOtgSSrTjbE8xjD0YbcbEacE84vlYMO1g5LugNus1flrm6l0eJnnc/zqM
+asFnBgyvn5GcmUp45uX2mJmbt47dlY9NzAQOEwcyKcWf6eV3oNs=
+=hkRx
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 412a1fc0909f..34fad68d1e68 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 128ed9066ee5..137efeb715e4 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index 515dbc9bf6a6..9520b21bd183 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,5 +1,5 @@
 AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
-EBUILD pwgen-2.08-r1.ebuild 605 BLAKE2B f10c824ae577bb71cf0d394ceebfad72eb9f46ea41c435d4409f3fec13fe81d05a3f5de94b522259d29358f3770a5466e58991ba408338dea0cdb5dd914c49bd SHA512 4d5281965c65581155fa120b2d3c56321fb43d93d16dc8e26429ab318dd05b94e67023ff4f1aa3f88831d79ae3b316da543e641561f7da3e943db27452a2ce53
+EBUILD pwgen-2.08-r1.ebuild 612 BLAKE2B bc9ad3416a7b2ad64f5bda2427536939c8b61d7b64ce5bd5878cccaf3fd97633a15a305d2eae3fd26ca86fdc3fe05653e35d4d1f0dfe1e0977fc840a5fa26726 SHA512 f1d870471410c64541a639bf2013b5640304718a66aed9b3e7234898cc08773f5e28a25e0f9c58618d7699cc6e55053b1731042709a92db1b4a69b0882885530
 EBUILD pwgen-2.08.ebuild 597 BLAKE2B 3ddd679af075d48ad52db3c370fc3dbe33cc45f5d315bc803ad860c921ef231d7279e399d257b391baea63d0351cb787d2ee5ba5c6ae55b85d90c184be521431 SHA512 d9edc8ecc0873444a53632d1faf7cda6e72661f91a8eedbda33253a172cb0f180548664d3e236a82c302cae6317c7f081ad81fa42a91fdc6bb684bd6e583ce5a
 MISC metadata.xml 801 BLAKE2B dd9ac9712fcbfc2a681587ca84aa40ac7e2c96474dd6b89ba4f16b40be44c7ea441bf44dd4008397aa99ad08ae2ab07a535ce5375940b6f3991dc6e8e9f5f75a SHA512 15ab62126db1bb0211d39963ff8102e31cfb8791a496c660d6a63666c0c440ab1d6f04ad490e0455aa39f9c69bb69035e0c33c02107b9940e45a0a788b2f9ce9
diff --git a/app-admin/pwgen/pwgen-2.08-r1.ebuild b/app-admin/pwgen/pwgen-2.08-r1.ebuild
index c9004c9dec93..8e3b71035d4b 100644
--- a/app-admin/pwgen/pwgen-2.08-r1.ebuild
+++ b/app-admin/pwgen/pwgen-2.08-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="livecd"
 
 src_configure() {
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 9772ed567080..c6453be7a92f 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -7,6 +7,9 @@ DIST vault-1.10.5-vendor.tar.gz 50096802 BLAKE2B 07f797666f97666a3dbdfb3cca7ba9f
 DIST vault-1.10.5-webui.tar.xz 1258192 BLAKE2B c546475dc9949c8854e702ff97267cde97472b47f209e7ed923e6caf9d0fe2b615c0087299148c0325669ae25b4ec111d7e8eff8454dfe5fe15a47bf4c969984 SHA512 fb44ad261cfa2e492b824fc8ec0ad44e54eaa417980bd9cd845e017fcad23670231a696df306332df5cfd5ce039cc1e3f744fe3ef35563b4902ebb15798a6b1d
 DIST vault-1.11.1-vendor.tar.gz 52063513 BLAKE2B adb2fb6ab7991e94ce00aa298837f2fac21c24bb8ea8edd2265eed6664498b38567d81fcfe28749b4bf16c449c769448a75fa3c1403f5cdf33b18580d8a65936 SHA512 c1247308f390117c98e43dd82498a069c34d3e766298dd05d5ddb5f69b9a3db2e312b897f35c9f63225cffcac476ba1021a4a71100721848642b6c4412123251
 DIST vault-1.11.1-webui.tar.xz 1335740 BLAKE2B 6a6fdcb22563ad4c3f18bf3816fe8a016c11d19a014458594c2dade3dc8e908db252c34bad88be9e80c2a6408af28af6324158e1e69b40061af6d6fe1a66c655 SHA512 1c02e0ef645df946ffb9d967a9be230800e67597d0ed6cf8afb2688eed9ca863a1f29efeefbb51e0257d2be588da443864df9e1306956844645b0168c2d58d9b
+DIST vault-1.11.2-vendor.tar.gz 52069450 BLAKE2B aa28c4e79fe7e95fee12fcf039c890780dfd4c3983025b5c39c53ed81be99e9c8cdb19580f23a0e05e607693dd46fa868abcaaad04d2abdcaeb0151af8fa6f60 SHA512 2339bd8fa1768cb3e719af00f581116d5d6decad826de00a4e726c212dcd5b29e89426ac3aba86dbb01bb2cb6f7feae899924134040ada7d10a1bc90d42b8f67
+DIST vault-1.11.2-webui.tar.xz 1335748 BLAKE2B ce38383d4f37fc88215f6554b6f07a3527481a31bbcf7c3047a735817f259a947f0c0cea8d0f87a0e5e8a1523173e922ac5dab3c1571366383dc97952cfc7d5b SHA512 218fd7c034b3e0dc9ed0217ae450d290d5b677d31b936b85c735783fed993da91590e5d4f22527840386b14837f56849e485f3f2d5196e68b0557e0c02122104
 EBUILD vault-1.10.5.ebuild 2024 BLAKE2B a9c4d0a36f3dc15e96fdf85c26228e6bc33eab38da1ab0119396cbbab0722162f9c079cd804c8d4ddf5b953f1424fa3c77fb2d9909ed0a18171270166b1acd1c SHA512 e404fce90bb878d834ad156356a7c4b4b6585465ce1e242b580b99ec1da0a22510a975d410ce8c465635423916572670c4ec4c089908da0505905b853de44866
 EBUILD vault-1.11.1.ebuild 2091 BLAKE2B d0803a4206e29127e35b3c2c5b0d6c41d57f643bf89ab7a0b97e13225b6e5103676712204bbddf4603a1dc94de34d8b5751710cf1004a9b97f381e2f3d62a9c0 SHA512 060ae598f2372b2217659fca84a40bc83b2c16ad2b10230e5dc535d4dcf06547afe938e371166bfdb13c8be34dc2f77e9775a6629c82cc2e1ea707cd938a910d
+EBUILD vault-1.11.2.ebuild 2091 BLAKE2B d0803a4206e29127e35b3c2c5b0d6c41d57f643bf89ab7a0b97e13225b6e5103676712204bbddf4603a1dc94de34d8b5751710cf1004a9b97f381e2f3d62a9c0 SHA512 060ae598f2372b2217659fca84a40bc83b2c16ad2b10230e5dc535d4dcf06547afe938e371166bfdb13c8be34dc2f77e9775a6629c82cc2e1ea707cd938a910d
 MISC metadata.xml 372 BLAKE2B 8e18e03d14e17a6a5d8c6b7bdb0d87ef6aec8530e203edc579a66b0c6ba0809bbddf4d68943281483ed841daa18a87ee13bed427162e40cd6c2fe3c45b0ec4fb SHA512 07bd140cd5152ccf7e9c39a0ad45a9361b56306b773176155fceaee3dbfa4645d74dba5a21a131f0221419aed5a9aeed4a5aef7c4eec2750c803e11c96621b02
diff --git a/app-admin/vault/vault-1.11.2.ebuild b/app-admin/vault/vault-1.11.2.ebuild
new file mode 100644
index 000000000000..004b6dd49b57
--- /dev/null
+++ b/app-admin/vault/vault-1.11.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module systemd
+
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
+	webui? (
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+webui"
+
+BDEPEND="
+	app-arch/zip
+	dev-go/gox
+	>=dev-lang/go-1.15.3"
+COMMON_DEPEND="acct-group/vault
+	acct-user/vault"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+RESTRICT+=" test"
+S=${WORKDIR}/${P}-vendor
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
+		-i scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-e "s/gofumpt/gofmt/g" \
+		-i Makefile || die
+	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
+		rm -rf "${S}/http/web_ui" || die
+		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
+			die "mv failed"
+	else
+		mkdir -p "${S}/http/web_ui" || die
+		touch "${S}/http/web_ui/no_web_ui" || die
+	fi
+}
+
+src_compile() {
+	mkdir "${T}"/bin || die
+	BUILD_TAGS="$(usex webui ui '')" \
+	GOPATH="${T}" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake bin
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 5ca563da0f38..58fcec692fa6 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 8d4b104b38a9..7af539d87923 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 1587 BLAKE2B 40608bde14eb5566a3b8e171a8177459639b5978989508f8c1c885a9bb351dfec57bb6ca653fd34e4150a72c7b7714ae19b49be4c69f8cf6536c2a4302dd9dfb SHA512 2d13ed40c00c3f500997c76cfe6effcff2cd6ebdecb1620b9fce60e304ee49921f5132675617e1187f177fa03a2a800aad97ddda9d9fb292bbb9052158c3e2cf
+EBUILD opencc-1.1.4.ebuild 1586 BLAKE2B 8784984aec2fe62c6de983186019ae0ca97a0a0db4276fec2aefa8b4e926d8915a472c2697aca61e39e28184b72d39730b3faf50bd23c85f0f3f8cf66d98f221 SHA512 29600b261a8bd8c63ee1125322647e084b9bcdb928f0dd6d1f95d73f55729a73659b6d1e2340d7d6515b1dd8c2e2eb366e4dc56bdb4ac05e36549bbb698fc0a2
 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 7a3f1f71a348..24a2e0c27f8c 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/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 0b7f361278d2..a44b6b6a3229 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest
index e645e22c9a71..ef8fd8b98b83 100644
--- a/dev-java/hamcrest/Manifest
+++ b/dev-java/hamcrest/Manifest
@@ -1,4 +1,4 @@
 AUX hamcrest-2.2-java-11.patch 6356 BLAKE2B 4950e452b7e785e575db862902c2deda6fd46575de46e5d429df116e642c9e95077a710f3e74069ec39d6eba177c498580cd81ac398a7f1395b6a9e278dcbf17 SHA512 d8240e2be33bb7594b570da8224f149ddbc36e55249b9e4ced0d03e2851d781a34b1763b8022b59345b90c0033f25c0d4a8a4e03b124abf08c183b30aa8eb556
 DIST hamcrest-2.2.tar.gz 603615 BLAKE2B b367fcb13be3314655e29e9196f3ae202200335801ea5bd8f97b5cd845bf7ecb39c4910b10e49938a373aa7897b62bc0935780490386bde1993add5b943b1eaf SHA512 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a
-EBUILD hamcrest-2.2.ebuild 1164 BLAKE2B e40aa25739a6710f96f4b62890fe89436bfc29241ba9b75ce889a4b1bbc1b9eeb751350b5ddbf241a79c135be7f4a348468ed65ffc41bc82f67cee8abaabd324 SHA512 0ef16472e93bdc4bf636f05c77114f22dacd14ade33e696390d7d1e252970284b3b6950b9747f58e9e6013fe2f52c1ac2ba14f4f83004bce31d7323812ff7fdf
+EBUILD hamcrest-2.2.ebuild 1163 BLAKE2B 3abe3e9026850f15e6c3b9ae7b88fae4cf41f18524c0838246f00c23736290fd33438697a0e7757a243f230ef92fd26575118a6cc4f52356d12ecddaef32032b SHA512 02ecaf351c5c624da731a4c60bb97a2cf3d2618e02656670ef1a22e2136ca70495d2259ebe0c34dea2f0c4c2f9fa3ea757c006ad48dba5dd12ddcf9485d69dc9
 MISC metadata.xml 303 BLAKE2B b415b83e9cd87ea6d0c58b8096930a08d4f3732068be492e201820cfef6599045327972bdc36d5936fc2f04c49b5c82c16b64b808edc882f863047989c94256e SHA512 97de5ee8a7aa583829434d5768522c3d73cebbc70a44874cafc87f0827d595d01b6b545b9709ec24f034e3c62527627828c6c0b0ac158cc6a7c4a633bb26748f
diff --git a/dev-java/hamcrest/hamcrest-2.2.ebuild b/dev-java/hamcrest/hamcrest-2.2.ebuild
index 6b0b18d4b6b5..d9ea7d1a79d0 100644
--- a/dev-java/hamcrest/hamcrest-2.2.ebuild
+++ b/dev-java/hamcrest/hamcrest-2.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 2711de6bf7da..8072c333a07e 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index bcc4fd899850..bf306099a8e4 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,4 +1,5 @@
 AUX eisl-2.50-Makefile.patch 923 BLAKE2B 33c1effb134e13383d46a1b8af3a0873262bf79cd0d09769229479ba1de5a7d5d1e64c90355d865a74a7bb2e75a6d3cdec6242026b5763812cc0c405ef21572a SHA512 050ff2148f989cc60d6de16e8c3a06827ea4cfb9dc6e8e7d0be9d8d7beca0420e2f231d60bf2fae219eb0413ca4331bc1b22f56946af4779171fa98054219be3
+AUX eisl-2.50-compat-no-cdefs.patch 207 BLAKE2B d8d2dd5133ed5fef70bc426829424633cbe1de079e9651df968d55c476c3eaf094d6e276abcd0cf59da4757434aed0c854b6bc7a0ddac1911ef2ea840e9bfaaf SHA512 8cb511c88de2dd1618720a6e15fa96850e3e4676cdb8aafe75e1cf5d2d70402ebc54fe73884acab7d38aec23a372670ec12b449e4dab2a3e08910d7157b09420
 DIST eisl-2.50.tar.gz 1757697 BLAKE2B 83c68213522320c815d9c7930c58181adba6f7fd3387421b7c7de55aca0fb6cabd78f65543c71adb89408531ea59855aafcf5bafd466bf517626a49cd252641f SHA512 4865c09dbbc0db885af69ec5ef0a731e2f55455f296b343b1cb05d3233e1e18c397b3b0a21eb0a6a86f85f20bf4e62f5e968fdf3cab45f6b5e3e3f9ee27d5e80
-EBUILD eisl-2.50.ebuild 690 BLAKE2B 0d2231212bfeafa48bc400f4db0eef4fc17ddfaee2cf02dd649481f7f3eb784c5b747d8a1f1fc69c1a3f941b9e4de0570f358b4eda8d34048bbcdcbd78ab5eff SHA512 4cc475885a63d23a071edf399f770ed18fcb52b66194ae3c9f3b28fbde56ed16aa63601da9287e07249b3dee009e27615b50e12fb6886f086d3494dba468cc34
+EBUILD eisl-2.50.ebuild 733 BLAKE2B a83c010cf807d9803b602d7532983b78e84aa40276e5695c9e385a046c6c9f3a649cb9670009853f267015ac4b21c775f07646397168e9532127451d373e461e SHA512 f9ed33141108315c4ec81d813989fd0dd2010a68235be62446d9b07072e5391a8750e9942f5368cf35fb7fdd847683da533369c6ac1eb850be6a0c4c22eea7d1
 MISC metadata.xml 631 BLAKE2B fd171b07cf1f7beae7be774a5da360d466c83f01a6bd52dc69af436926ae5aebec27a2723c11498be21c4f96f6b82c6aa3571f4b84e763459ef78086450252f2 SHA512 dd9e329f24ce6d3922e92e81d36234b93151f71c88d6ba4b38557565a7c1c3bc4b7172d4d55f1d2d5bd6c5cada449691067cc71abd4d456941f6a8b78fe0df87
diff --git a/dev-lang/eisl/eisl-2.50.ebuild b/dev-lang/eisl/eisl-2.50.ebuild
index cad52bf1c3f0..d2ff0a7a86a7 100644
--- a/dev-lang/eisl/eisl-2.50.ebuild
+++ b/dev-lang/eisl/eisl-2.50.ebuild
@@ -20,7 +20,10 @@ DOCS=( README-ja.md README.md documents )
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-compat-no-cdefs.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)" clean all
diff --git a/dev-lang/eisl/files/eisl-2.50-compat-no-cdefs.patch b/dev-lang/eisl/files/eisl-2.50-compat-no-cdefs.patch
new file mode 100644
index 000000000000..d4cb1f6f2bf4
--- /dev/null
+++ b/dev-lang/eisl/files/eisl-2.50-compat-no-cdefs.patch
@@ -0,0 +1,11 @@
+--- a/compat/cdefs.h
++++ b/compat/cdefs.h
+@@ -3,8 +3,6 @@
+ #ifndef COMPAT_CDEFS_H
+ #define COMPAT_CDEFS_H
+ 
+-#include <sys/cdefs.h>
+-
+ #ifndef __dead
+ #define __dead \
+         __attribute__((__noreturn__))
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 448155f9877c..772608afceb2 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,11 +1,9 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
-DIST go1.17.12.src.tar.gz 22205674 BLAKE2B 0770f1979ba9c14779e078638b2d5f9b6af1a62939f863abadc3c84418ce639715e61ed4763674e2e2d0d95219636e59e53a0db658ae02f17e713205789fcc5a SHA512 d2bcea2a33723af5c2ae871f5c44694c69d37c74c62e81eddeaf4bfedf124feea2752997d3a359990071bf01f88942fc66b21cb092385946ad4ae9410854c8b9
-DIST go1.17.13.src.tar.gz 22206518 BLAKE2B b227e5197c6466e7dc4594646a6b5f7e2f5e8bc0d44b8ab45b488f5249eb64ff736fccf0e0070d6685a08361e1b3dd1a2ee7050df6395bec519a7ae7dca78630 SHA512 2820bdd679fdb5e37d4c601b26c246bab23d4e8e1b226ac37c38e90a68b693e877bff944275eb25e3296ee772e7b40ef7d71dd49cca524df4cb8e721bfb50c33
 DIST go1.18.4.src.tar.gz 22845866 BLAKE2B 9997100ab5ae8a8ffdf4d2515d45d0bf29decf6d117d8f0079f0ec3fe63b3c5a32181e17c13de2ea656a5e8c87c1ed3f0e00945f717a306d23542bc0425d1d26 SHA512 4872956e31fa5d681021db12e876bc60a1815cf45203e75db83d6c54e9b7138766ae44bf1659db5333eba0b6097aea1990519795fffd2f124e7a78b78df1339b
 DIST go1.18.5.src.tar.gz 22847094 BLAKE2B 8edf133aa5b1fa4076db72bd7c63240db6cbd6b9b4725c2a71384ff302bee77e193bcfad6b55bfd31ee58f08fc59d9bbee5750d9227598fe402d6293863595ff SHA512 4ba69ad49b5c17963fdc39ae7f5360fa38950db39ec1fb9b52744d6a209abf177dab6bd587e7457c83a4fd265589907ec241d8b09d0eac76cf984243a14500ef
-EBUILD go-1.17.12.ebuild 4813 BLAKE2B c4f3808ff284d5a6e9cfe43852073002dc204ac3832bd40c7a132f3661c459ff2e4be15e99530787b95844158e11f200d1cabfc2a2d4dbd28c5f3dd79e145017 SHA512 c30ee5f4110c8bbd292cb3d59eb264bb421d8bd78f06d840866fd39682b9b2691ea974e75b18bce58f6f7d9588652dbda3dfe61a58c6e71447df6aaf14998f2a
-EBUILD go-1.17.13.ebuild 4818 BLAKE2B 906a76bebb6036a5e2d5af8563cc2aa3d8c10d48c8926d5e1368026d97c9b00c65973be3f3937396fa35865f0119d9fd59586c66d2ef137c980695a3b62861eb SHA512 07796174e89485089232edfd712a4540bc8bb138894bfa119f8d79deedb3bb8fe770de018637f81c27629e277ea65fa369721b70fead893b600d0d554efae650
-EBUILD go-1.18.4.ebuild 4813 BLAKE2B c4f3808ff284d5a6e9cfe43852073002dc204ac3832bd40c7a132f3661c459ff2e4be15e99530787b95844158e11f200d1cabfc2a2d4dbd28c5f3dd79e145017 SHA512 c30ee5f4110c8bbd292cb3d59eb264bb421d8bd78f06d840866fd39682b9b2691ea974e75b18bce58f6f7d9588652dbda3dfe61a58c6e71447df6aaf14998f2a
-EBUILD go-1.18.5.ebuild 4818 BLAKE2B 906a76bebb6036a5e2d5af8563cc2aa3d8c10d48c8926d5e1368026d97c9b00c65973be3f3937396fa35865f0119d9fd59586c66d2ef137c980695a3b62861eb SHA512 07796174e89485089232edfd712a4540bc8bb138894bfa119f8d79deedb3bb8fe770de018637f81c27629e277ea65fa369721b70fead893b600d0d554efae650
-EBUILD go-9999.ebuild 4818 BLAKE2B 906a76bebb6036a5e2d5af8563cc2aa3d8c10d48c8926d5e1368026d97c9b00c65973be3f3937396fa35865f0119d9fd59586c66d2ef137c980695a3b62861eb SHA512 07796174e89485089232edfd712a4540bc8bb138894bfa119f8d79deedb3bb8fe770de018637f81c27629e277ea65fa369721b70fead893b600d0d554efae650
+DIST go1.19.src.tar.gz 26521849 BLAKE2B 2f985c4a9a125fa81fb6bd83e47d2382b4f256b689da1e16b53cdd83c896894d89b8601fc6263e8cb344d9e45c9b647d0d3c88fdf65bb304a352612d98e4bb7c SHA512 c4460d54957a0bcf3407ea72cd1c6b3c645ef4ef6cc0fa142a80cb43c06ca4af31d52b0ccd723c81d17a62004bc96559cad23da874a4b668b4d8b168f1da2186
+EBUILD go-1.18.4.ebuild 4798 BLAKE2B 8857c2432424a27febc299a46ca61bfd267d9a1d2fad7116096e5938a519410d35bf90b61a1827e2ad769986b9406ecd0bf1b9197e64b8a176e0a8d9dbb600eb SHA512 9e2efbcb8652fd203e239626f2ace311dba12c591829ce00e4204f28c3d908adeca69d1a17855c2544f2f8bc5d88a636a3d1c806d36542788c1949204b5535b8
+EBUILD go-1.18.5.ebuild 4803 BLAKE2B d2b93e9fca1ebcc0619b6c72c724c95da3b7b0223f2d0ac95081096fcf2c5123f0c4f8284fc935450780545c1d408f71ad905ad12029c02dee9eec1f2e4f45b9 SHA512 356f3323b209c69113a81920367ac38793bf3d8599fa71d64838027da0db878430fa0856ec0d74db943752e211c2fbc410eec30fae3f15a4fb8cc53b15f63580
+EBUILD go-1.19.ebuild 4799 BLAKE2B 3433ebbdf6313194cdc57fc5c53debefe00a8fdec5702d7c6e5c30009582cc696a8e5ad8717af3f3b8324cdcbbe74e493acd0dbc696bc7d68b95b3bfaef82353 SHA512 7690654033f336486269430230c7488d2fd683239cf3c623305fe0b307a324f83e73152db23a6828733d2418de14c544727b1b384c485dbfb5b1eda1d9be9379
+EBUILD go-9999.ebuild 4803 BLAKE2B d2b93e9fca1ebcc0619b6c72c724c95da3b7b0223f2d0ac95081096fcf2c5123f0c4f8284fc935450780545c1d408f71ad905ad12029c02dee9eec1f2e4f45b9 SHA512 356f3323b209c69113a81920367ac38793bf3d8599fa71d64838027da0db878430fa0856ec0d74db943752e211c2fbc410eec30fae3f15a4fb8cc53b15f63580
 MISC metadata.xml 537 BLAKE2B 8017fd0edeef2ec4b17f75e8686f6014ce3c3e39b7083c347f601de9b15f34896305d6041edd0bc2b6a0687a69827c9dcecb2f07ca5994f29a3c0f8014c0604b SHA512 5f6b42721e1602efab24f33955806c33ace6433e17b41755dbee47abea79a2744292148c330d6e5a04612b0b451545c32241236cc8f211c5e7cf22c8cdebc778
diff --git a/dev-lang/go/go-1.17.13.ebuild b/dev-lang/go/go-1.17.13.ebuild
deleted file mode 100644
index 217891046702..000000000000
--- a/dev-lang/go/go-1.17.13.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://go.dev"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="cpu_flags_x86_sse2"
-
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-
-# the *.syso files have writable/executable stacks
-QA_EXECSTACK='*.syso'
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# This package triggers "unrecognized elf file(s)" notices on riscv.
-# https://bugs.gentoo.org/794046
-QA_PREBUILT='.*'
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
-)
-
-go_arch() {
-	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		riscv) echo riscv64 ;;
-		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
-	esac
-}
-
-go_arm() {
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os() {
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple() {
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile() {
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile() {
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="${PWD}"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	use arm && export GOARM=$(go_arm)
-	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test() {
-	go_cross_compile && return 0
-
-	cd src
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install() {
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	elog "due to the static linking nature of go."
-	elog "If this is not done, the packages compiled with the older"
-	elog "version of the compiler will not be updated until they are"
-	elog "updated individually, which could mean they will have"
-	elog "vulnerabilities."
-	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	elog "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.18.4.ebuild b/dev-lang/go/go-1.18.4.ebuild
index 7f1ce9304e51..b8ededbce758 100644
--- a/dev-lang/go/go-1.18.4.ebuild
+++ b/dev-lang/go/go-1.18.4.ebuild
@@ -64,14 +64,14 @@ README.md
 
 go_arch() {
 	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
+	local tc_arch=$(tc-arch $@)
+	case "${tc_arch}" in
 		x86)	echo 386;;
 		x64-*)	echo amd64;;
 		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
 		riscv) echo riscv64 ;;
 		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
+		*)		echo "${tc_arch}";;
 	esac
 }
 
diff --git a/dev-lang/go/go-1.18.5.ebuild b/dev-lang/go/go-1.18.5.ebuild
index 217891046702..c340b5873264 100644
--- a/dev-lang/go/go-1.18.5.ebuild
+++ b/dev-lang/go/go-1.18.5.ebuild
@@ -64,14 +64,14 @@ README.md
 
 go_arch() {
 	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
+	local tc_arch=$(tc-arch $@)
+	case "${tc_arch}" in
 		x86)	echo 386;;
 		x64-*)	echo amd64;;
 		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
 		riscv) echo riscv64 ;;
 		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
+		*)		echo "${tc_arch}";;
 	esac
 }
 
diff --git a/dev-lang/go/go-1.17.12.ebuild b/dev-lang/go/go-1.19.ebuild
index 7f1ce9304e51..caf4943ce8ff 100644
--- a/dev-lang/go/go-1.17.12.ebuild
+++ b/dev-lang/go/go-1.19.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+#		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
@@ -55,23 +55,22 @@ QA_PREBUILT='.*'
 RESTRICT+=" strip"
 
 DOCS=(
-AUTHORS
-CONTRIBUTING.md
-CONTRIBUTORS
-PATENTS
-README.md
+	CONTRIBUTING.md
+	PATENTS
+	README.md
+	SECURITY.md
 )
 
 go_arch() {
 	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
+	local tc_arch=$(tc-arch $@)
+	case "${tc_arch}" in
 		x86)	echo 386;;
 		x64-*)	echo amd64;;
 		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
 		riscv) echo riscv64 ;;
 		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
+		*)		echo "${tc_arch}";;
 	esac
 }
 
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 217891046702..c340b5873264 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -64,14 +64,14 @@ README.md
 
 go_arch() {
 	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
+	local tc_arch=$(tc-arch $@)
+	case "${tc_arch}" in
 		x86)	echo 386;;
 		x64-*)	echo amd64;;
 		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
 		riscv) echo riscv64 ;;
 		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
+		*)		echo "${tc_arch}";;
 	esac
 }
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ecb06f753e44..f01f627beb3d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index ff3d060434f6..c23cb3d20484 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -1,3 +1,3 @@
 DIST libpfm-4.11.0.tar.gz 1043686 BLAKE2B 99b4f1a5156316139603cf50cf42c13c548a0b196435bfc92bc26ebd3f8d7ec9584255978d4f3fbff45cddc937269961e9d2b65d065632ae635e9ca45c179a54 SHA512 633035b8a7b35973437572095cdc80d422b2a1a61e74e14f106db95fa8e44e4518e591699cc457f828b8f2fb63f60eef6d0c7535c6b4c9a6c3a70d4550b3c3c7
-EBUILD libpfm-4.11.0.ebuild 962 BLAKE2B f51cef1a882d7cb390c5b52cd0a5a1b19a1d04749f4601eb1bb803b8abab9f1be40c9802d2d82daa4f5b0c648fae917d8e286139d4537c044c4c4511d3252e69 SHA512 8d1dadc4fadfebdd09f43f8c753e95dc0ecd64d3dcd6717946fff4103bdfd68f586eb11bdcc625572cba1660b985af02757ec95996eaee4d9eac335e70c6c8a1
+EBUILD libpfm-4.11.0.ebuild 961 BLAKE2B be56f2ce4db1869fb5aeb053c0f17f9fb73305cc387e92d1fcf9f4644b99233f6662b43acedf8e2af6d8f849e8217e0efecf95408cab3209236bd18d76407e37 SHA512 e40d0f9874fbac52a7ee72d5e73544b4027ae466a16a7fd5a9aa4a05296f4c11d4953bc82ebd1ad4d752065601752e0189bf5f8e0f7ccc797b480cb4e3330c51
 MISC metadata.xml 246 BLAKE2B 08a76e53ab8da2beee24c0920d47104aefd113853da0d9295967f0db8800717ea4486bddfb9ea1dd83039bb8f8deaf99edb834e2ed2bfe0207282130c7878a90 SHA512 7123d176941aa889b85a3fb204987908d69d05cfe577678b8e8bb0a4512b6a274dfb7e0ad1d2f5d93078512b78f89227712fdd3262fed332caafcaa40ffbc735
diff --git a/dev-libs/libpfm/libpfm-4.11.0.ebuild b/dev-libs/libpfm/libpfm-4.11.0.ebuild
index a3868b0f5074..20874dd07873 100644
--- a/dev-libs/libpfm/libpfm-4.11.0.ebuild
+++ b/dev-libs/libpfm/libpfm-4.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0/4"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild b/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild
index 8955aa189fbf..26d5ebe36dfb 100644
--- a/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild
+++ b/dev-python/Frozen-Flask/Frozen-Flask-0.18-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/flask[${PYTHON_USEDEP}]
diff --git a/dev-python/Frozen-Flask/Manifest b/dev-python/Frozen-Flask/Manifest
index 9dfdcfe6fd14..15cd7e79025f 100644
--- a/dev-python/Frozen-Flask/Manifest
+++ b/dev-python/Frozen-Flask/Manifest
@@ -1,4 +1,4 @@
 DIST Frozen-Flask-0.18.tar.gz 179245 BLAKE2B a82695892aef9b6b4e3aeb91f12f78d7d661f2f2b0efc57c11f64524ed467b85d8d9e0e7b147cb78c3d0a641dfef0f683e0f77cfda560aada79e1b435424c0ce SHA512 6c2e4d900547cc5c0de4af23b96c5b9e1925101fb40f710bedc67ac52c303282aa223f6972f5b9cc813878bb15eb90cb0a007619dd5a9db2dec762f04dcc7ba0
-EBUILD Frozen-Flask-0.18-r1.ebuild 620 BLAKE2B 0a29f7119f9ebbe525fd77afabc3d368afbec4d48feaabb559f1debfa75d558b2a1d28e7daa1490e980c38fabcffa9a7d833f8eaae1627ef6c35114516a15837 SHA512 4a5ea7a31cba2cc69ca87d507578e58ab7ac6768d9b452b38007ef93cc084ecce8f2ff3d1c3ef6e0486fd05fe45f61d87609372d4c6be01e80ce0daba81abaf3
+EBUILD Frozen-Flask-0.18-r1.ebuild 618 BLAKE2B ad188d335d14f5e3f72497593b821fa7ad5464fefab063e52404bd65fff6aed04799be7af1cc7408ae783c1da9dd12332bad978edeba0f847b31b13f954dd383 SHA512 7fbeb6e5185f0e538dd3a3c03f15d5ef5b6989d1798a4dbf526ef28112d27aaa3756fd9e5ffe153a942fe03c106bf626f7f9cc179bbc2037723b272aaf23c0c8
 EBUILD Frozen-Flask-0.18.ebuild 582 BLAKE2B 57764929f38dcce97b873dd49663db0f85ab9689befb82c125032ba503d5624553bb5dd6d852fe89dff368f04d8a98b9e7404754e56488acaaa23036067713f9 SHA512 322413c86b74b1c017039aaf04a4c6257c3caf2ca03cd0cddced67b0d01a5f732a874e365e9ebdead6c56b557f4489831a8c45d59544e398352574f9a3be7441
 MISC metadata.xml 418 BLAKE2B da73d29cda242f659f85fc281c49682670f0de29fb6d5edae6df2e2ed0bf7fafb080221f7512f27eb48b3210eaeb363371e70b8299aa650d5c901fbd7a6680f5 SHA512 95a895607e43532bb5e9e88499b86ca0d43aa3c9a310b960ff8ed7438548d62c1a2758e0ac97b7200399c6cef5ef317029dd4f56d5636175aa285880731e01a1
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e5b4322b8682..1c1836093add 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest
new file mode 100644
index 000000000000..bd9f25add6db
--- /dev/null
+++ b/dev-python/PyQt6/Manifest
@@ -0,0 +1,3 @@
+DIST PyQt6-6.3.1.tar.gz 1015220 BLAKE2B e225f2da11eec482ab8e00f886a858cec4a2c8add764f5e54bf603959394aad7f12d91b92c1ba6ab98d1b25903d4404e6667232258a87c52c95a2abdae9ccd2d SHA512 94319cd0983eb3f9bb0f1acbc620a1631a37f82e2fcffb9d0e58437fb1c120640be1e2a0a09e98e03f6c7082a2d94e9eabceefa6b07bae354f77bda02ba92d58
+EBUILD PyQt6-6.3.1.ebuild 4629 BLAKE2B 274a90de1c3408570ba0b2906bb330028d5ecba575e27f2aa93575337e2f2a44c483c88da8115477c357a001b0b08f8bec7b3db01f8f17fb39327ea3ff657d7a SHA512 8a246038979c91e536b2a68ae03b451d7e04a4b6e19b5621de5a1a54b106035bf742a367efe9701300c0a1b0a3c38d0a043940c9ef25af31c5a4a9c5b6b11404
+MISC metadata.xml 1915 BLAKE2B b4ca171871165e02fbc54d7931a52da3a70415b4acf5f85b23459d6949c7a720b68fbddba1a5c22d4d8b90e16faa7f628cb088cc93eb9f1db05da15d33967b1b SHA512 32671e148db535c25b9bf1dd48f945d3ddd74e9df86014af2beb92dccb8d49289e778a1ba38c57cc61dabab88528057ab1aa57ee48b95b80aa1254b1c765772b
diff --git a/dev-python/PyQt6/PyQt6-6.3.1.ebuild b/dev-python/PyQt6/PyQt6-6.3.1.ebuild
new file mode 100644
index 000000000000..4eee1c118cf4
--- /dev/null
+++ b/dev-python/PyQt6/PyQt6-6.3.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=sip
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 flag-o-matic multiprocessing qmake-utils
+
+QT_PV="6.3:6" # minimum tested qt version
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+# currently keeping defaults in sync with qtbase, and beside that trying to
+# stay minimal'ish given each builds relatively slowly (but still subject to
+# change if something is needed by most consumers)
+IUSE="
+	+dbus debug qml designer examples gles2-only +gui help multimedia
+	+network opengl positioning printsupport quick quick3d serialport
+	+sql +ssl svg testlib webchannel websockets +widgets +xml"
+# see `grep -r "%Import " sip` and `grep qmake_QT project.py`
+REQUIRED_USE="
+	designer? ( gui widgets )
+	help? ( gui widgets )
+	multimedia? ( gui network )
+	opengl? ( gui )
+	printsupport? ( gui widgets )
+	qml? ( network )
+	quick3d? ( gui qml )
+	quick? ( gui qml )
+	sql? ( widgets )
+	svg? ( gui )
+	testlib? ( gui widgets )
+	webchannel? ( network )
+	websockets? ( network )
+	widgets? ( gui )"
+
+# note: xml(+) for now given qtbase-6.3.1-r0 is missing IUSE=xml with a TODO
+DEPEND="
+	>=dev-qt/qtbase-${QT_PV}[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml(+)?]
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		sys-apps/dbus
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
+	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+	qml? ( >=dev-qt/qtdeclarative-${QT_PV} )
+	quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
+	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/PyQt6_sip-13.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/PyQt-builder-1.11[${PYTHON_USEDEP}]
+	>=dev-qt/qtbase-${QT_PV}
+	sys-devel/gcc
+	dbus? ( virtual/pkgconfig )"
+
+src_prepare() {
+	default
+
+	# hack: qmake wants g++ (not clang), try to respect ${CHOST} #726112
+	mkdir "${T}"/cxx || die
+	ln -s "$(type -P ${CHOST}-g++ || type -P g++ || die)" "${T}"/cxx/g++ || die
+	PATH=${T}/cxx:${PATH}
+}
+
+src_configure() {
+	append-cxxflags -std=c++17 # for clang and old gcc that default to <17
+
+	pyqt-use_enable() {
+		local state=$(usex ${1} --enable= --disable=)
+		shift
+		echo ${*/#/${state}}
+	}
+
+	# hack: currently lacking qt6_get_bindir (or alternatively have
+	# qmake6 in PATH like qmake5 is so it wouldn't matter)
+	local qmake6=$(qt5_get_bindir)/qmake6
+	qmake6=${qmake6//qt5/qt6}
+
+	DISTUTILS_ARGS=(
+		--jobs=$(makeopts_jobs)
+		--qmake="${qmake6}"
+		--qmake-setting="$(qt5_get_qmake_args)"
+		--verbose
+		--confirm-license
+
+		# TODO: enable/restrict more as qt6 packages/USE get added
+		--disable=QAxContainer
+		--disable=QtBluetooth
+		--enable=QtCore
+		$(pyqt-use_enable dbus QtDBus)
+		$(pyqt-use_enable designer QtDesigner)
+		$(pyqt-use_enable help QtHelp)
+		$(pyqt-use_enable gui QtGui)
+		#--disable=QtLocation # force-disabled in project.py
+		$(pyqt-use_enable multimedia QtMultimedia \
+			$(usev widgets QtMultimediaWidgets))
+		$(pyqt-use_enable network QtNetwork)
+		--disable=QtNfc
+		$(pyqt-use_enable opengl QtOpenGL \
+			$(usev widgets QtOpenGLWidgets))
+		$(pyqt-use_enable positioning QtPositioning)
+		$(pyqt-use_enable printsupport QtPrintSupport)
+		$(pyqt-use_enable qml QtQml)
+		$(pyqt-use_enable quick QtQuick \
+			$(usev widgets QtQuickWidgets))
+		$(pyqt-use_enable quick3d QtQuick3D)
+		--disable=QtRemoteObjects
+		--disable=QtSensors
+		$(pyqt-use_enable serialport QtSerialPort)
+		$(pyqt-use_enable sql QtSql)
+		$(pyqt-use_enable svg QtSvg \
+			$(usev widgets QtSvgWidgets))
+		$(pyqt-use_enable testlib QtTest)
+		#--disable=QtTextToSpeech # force-disabled in project.py
+		$(pyqt-use_enable webchannel QtWebChannel)
+		$(pyqt-use_enable websockets QtWebSockets)
+		$(pyqt-use_enable widgets QtWidgets)
+		$(pyqt-use_enable xml QtXml)
+
+		$(usev debug '--debug --qml-debug --tracing')
+
+		$(usev !dbus --no-dbus-python)
+		# TODO?: plugins not in wheels by upstream, see project.py#L215
+		# (if needed by something, will need to be added to python_install)
+		$(usev !designer --no-designer-plugin)
+		$(usev !qml --no-qml-plugin)
+
+		$(usev !gles2-only --disabled-feature=PyQt_OpenGL_ES2)
+		$(usev !ssl --disabled-feature=PyQt_SSL)
+	)
+}
+
+python_install_all() {
+	einstalldocs
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/PyQt6/metadata.xml b/dev-python/PyQt6/metadata.xml
new file mode 100644
index 000000000000..1872d32a4049
--- /dev/null
+++ b/dev-python/PyQt6/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<use>
+		<flag name="dbus">Build bindings for the QtDBus module</flag>
+		<flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag>
+		<flag name="gui">Build bindings for the QtGui module</flag>
+		<flag name="help">Build bindings for the QtHelp module</flag>
+		<flag name="multimedia">Build bindings for the QtMultimedia module</flag>
+		<flag name="network">Build bindings for the QtNetwork module</flag>
+		<flag name="opengl">Build bindings for the QtOpenGL module</flag>
+		<flag name="positioning">Build bindings for the QtPositioning module</flag>
+		<flag name="printsupport">Build bindings for the QtPrintSupport module</flag>
+		<flag name="qml">Build bindings for the QtQml module and enable the qml plugin</flag>
+		<flag name="quick">Build bindings for the QtQuick module</flag>
+		<flag name="quick3d">Build bindings for the QtQuick3D module</flag>
+		<flag name="serialport">Build bindings for the QtSerialPort module</flag>
+		<flag name="sql">Build bindings for the QtSql module</flag>
+		<flag name="svg">Build bindings for the QtSvg module</flag>
+		<flag name="testlib">Build bindings for the QtTest module</flag>
+		<flag name="webchannel">Build bindings for the QtWebChannel module</flag>
+		<flag name="websockets">Build bindings for the QtWebSockets module</flag>
+		<flag name="widgets">Build bindings for the QtWidgets module</flag>
+		<flag name="xml">Build bindings for the QtXml module</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://www.riverbankcomputing.com/mailman/listinfo/pyqt/</bugs-to>
+		<doc>https://www.riverbankcomputing.com/static/Docs/PyQt6/</doc>
+		<remote-id type="pypi">PyQt6</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/PyQt6_WebEngine/Manifest b/dev-python/PyQt6_WebEngine/Manifest
new file mode 100644
index 000000000000..6e7e1a4ed21f
--- /dev/null
+++ b/dev-python/PyQt6_WebEngine/Manifest
@@ -0,0 +1,3 @@
+DIST PyQt6_WebEngine-6.3.1.tar.gz 30607 BLAKE2B f07454684ce9c55ed8f477e7d7ba260af6d219b079e68d6752292310d1d8799b642acd3dad94b9259edfc9c41ee6249d2c1b69f57f7e5132dd71bc88e1e1d463 SHA512 61e30b6dbbd5d31dd03498b1d14279005bd00b59fe375f89b13cf318d5bdb6cbbf5449cd910303c9794ed14cbd25b0e63824ab952fc050d8c0451292c6f97be0
+EBUILD PyQt6_WebEngine-6.3.1.ebuild 1683 BLAKE2B a9867225b3f43c9621a5909d82e965f4a653f6e042501295fc894fe0d39947b45c4e9b05d56d58ff4b0557cbb56ac98c291c0c0c2a3c68dd802090c4b04e3895 SHA512 67a12a6339f1bc730c16a0903519b025f6de385a5cc76cb93d5f7ef1005aa74fa4ea4fe3af6ecdfcbadd24e1c9e6369dde75a9ab3f0d452f5e86a9d06b82371b
+MISC metadata.xml 572 BLAKE2B d0c911bf7d8f4f33e30daabfafe3447367045dce444dda4d8600ea47a844842996989ee7c64ccee6ce77a033bdbd1e7c58136e16ddd5f76a7b5688681f791d2c SHA512 11a8b7ab3fe9fa8e8a7160658aac5b8148a60f30b49bcba92cb08eee6d8f5021e4d117632dcddab98c9a0ebbbecd256ce09fbbe43f05105f7429355f9120e42f
diff --git a/dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild b/dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild
new file mode 100644
index 000000000000..f304d9d147f4
--- /dev/null
+++ b/dev-python/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=sip
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 flag-o-matic multiprocessing qmake-utils
+
+QT_PV="6.3:6" # minimum tested qt version
+
+DESCRIPTION="Python bindings for QtWebEngine"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug quick +widgets"
+
+RDEPEND="
+	>=dev-python/PyQt6-${PV}[gui,ssl,${PYTHON_USEDEP}]
+	>=dev-qt/qtbase-${QT_PV}
+	>=dev-qt/qtwebengine-${QT_PV}[widgets]
+	quick? ( dev-python/PyQt6[qml] )
+	widgets? ( dev-python/PyQt6[network,printsupport,webchannel,widgets] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-python/PyQt-builder-1.11[${PYTHON_USEDEP}]
+	>=dev-qt/qtbase-${QT_PV}
+	sys-devel/gcc"
+
+src_prepare() {
+	default
+
+	# hack: qmake wants g++ (not clang), try to respect ${CHOST} #726112
+	mkdir "${T}"/cxx || die
+	ln -s "$(type -P ${CHOST}-g++ || type -P g++ || die)" "${T}"/cxx/g++ || die
+	PATH=${T}/cxx:${PATH}
+}
+
+src_configure() {
+	append-cxxflags -std=c++17 # for clang and old gcc that default to <17
+
+	# hack: currently lacking qt6_get_bindir (or alternatively have
+	# qmake6 in PATH like qmake5 is so it wouldn't matter)
+	local qmake6=$(qt5_get_bindir)/qmake6
+	qmake6=${qmake6//qt5/qt6}
+
+	DISTUTILS_ARGS=(
+		--jobs=$(makeopts_jobs)
+		--qmake="${qmake6}"
+		--qmake-setting="$(qt5_get_qmake_args)"
+		--verbose
+
+		--enable=QtWebEngineCore
+		$(usex quick --{enable,disable}=QtWebEngineQuick)
+		$(usex widgets --{enable,disable}=QtWebEngineWidgets)
+
+		$(usev debug '--debug --qml-debug --tracing')
+	)
+}
diff --git a/dev-python/PyQt6_WebEngine/metadata.xml b/dev-python/PyQt6_WebEngine/metadata.xml
new file mode 100644
index 000000000000..88c4a67e1477
--- /dev/null
+++ b/dev-python/PyQt6_WebEngine/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>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<use>
+		<flag name="quick">Build bindings for the QtWebEngineQuick module</flag>
+		<flag name="widgets">Build bindings for the QtWebEngineWidgets module</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://www.riverbankcomputing.com/mailman/listinfo/pyqt/</bugs-to>
+		<remote-id type="pypi">PyQt6-WebEngine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/PyQt6_sip/Manifest b/dev-python/PyQt6_sip/Manifest
new file mode 100644
index 000000000000..f097d715861a
--- /dev/null
+++ b/dev-python/PyQt6_sip/Manifest
@@ -0,0 +1,3 @@
+DIST PyQt6_sip-13.4.0.tar.gz 111209 BLAKE2B 963d3788d0996565696e82e6a9c197c197322f8b1637cead79a4af8cf8d3ed1b82423ff41e507204aeddc5f16fa0b96b7e7a49c6848ac7438bd98885f3ae4dc6 SHA512 e93a88fedbb965a7ea605a33820798352c340d5656b3ad60c40adc8dbd24fdd18deb67e706595e3cb96e41d1e17d4c837f1224a1c250f0179c6b60b1a5b0e6a2
+EBUILD PyQt6_sip-13.4.0.ebuild 410 BLAKE2B c301cea78dff70e55607f175504e8457340adeb6b0dafce34d3212f6dd50e4eb8944dab7acc9b23f7c7e62dad90d0aa233c52b0fef633f88cbcb550bc3a0f3aa SHA512 e51f1064330c2c52fc194932989ffa2fe011eac282c06a4298464c1e614fe4a867b72ff08cdb9c4da153bed8989cf9886f724f877dba4403f280844755e4fbd4
+MISC metadata.xml 397 BLAKE2B e634d1d335e66f1999898912570f465e7f4e79f7e8aa60b9ad5e8038078ae65c93db31af3e25a7b879941b97704b81efe7e4ab8a698f710eecca914af733f4e7 SHA512 56fa4d44568faf5818bf66b2fef7c2e7cb5010de8c57c21c3c4c8550ab9da671af5afe71e83890e7432c73e5c299b46b6abf2fedbb519f408c21d395900fa490
diff --git a/dev-python/PyQt6_sip/PyQt6_sip-13.4.0.ebuild b/dev-python/PyQt6_sip/PyQt6_sip-13.4.0.ebuild
new file mode 100644
index 000000000000..c0e19cedab8a
--- /dev/null
+++ b/dev-python/PyQt6_sip/PyQt6_sip-13.4.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 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="sip module support for PyQt6"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-python/PyQt6_sip/metadata.xml b/dev-python/PyQt6_sip/metadata.xml
new file mode 100644
index 000000000000..a999cde076c9
--- /dev/null
+++ b/dev-python/PyQt6_sip/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://www.riverbankcomputing.com/mailman/listinfo/pyqt/</bugs-to>
+		<remote-id type="pypi">PyQt6-sip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index 9e5a0c984c22..55ffd6704867 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,6 +1,6 @@
 AUX aws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch 1533 BLAKE2B 709ffaa46c2934fda754745f918bd54444433d5d57c6bca65d8c9be5b940e7ec91f8de47e94a31262ecf7126bb2068ed453ad18a4d6a07fae42d2bf6e764a600 SHA512 fcea4f8e094d1c3354897349c8705e7268e264d9699ec61609796d451db865931b1c2fd4e273fb80427645c0968993756e685e688d303e7fbe7c0bdce88d968f
 DIST aws-xray-sdk-python-2.10.0.gh.tar.gz 270819 BLAKE2B caed5f5b92bdc25e0006663838549c9e9a85474829cce03f612ef4b9a36fce38460606e000c65bb140f7250225426bece2e8bc624a430bdfdcd4fc8808842aac SHA512 f5b4d08f5876cab2e833a763b1da52b6de1e3ca2c746b234a1b013f674155ec31686a6710225e411458f27ca096f68ee6413c8d1c360d5a326f1be94287d09b7
 DIST aws-xray-sdk-python-2.8.0.gh.tar.gz 267880 BLAKE2B 7a433a0b1b3ca38a100f3b23c79e9b0d7f84cb096f6d30832fdf16f171f9528aee8b81aaf3ba263a90d46f791de8b2f37a919651f9699e5fcf3073db83fc25b4 SHA512 e0fb3fb0bfbd963863714537ea12771df7ffa2857aaf4cdb6414d71ecdfc65c2623fa40a6a48c4eab30f4370d545a595db2762932133a6eba56121a4048502fb
-EBUILD aws-xray-sdk-python-2.10.0.ebuild 1923 BLAKE2B 2201ff273e3c6053b66a2a9f2244395afbf4f3679b0f552cc41f13d86fde30110e447c3e5ef5708fd0eace6eec634c8b6f527e981d6479f279c2f73d59b2b575 SHA512 d91c3fe7d380610b1cd8db5c11a30b41f8b7de6bc50980200d280254e432d1f4ceec989c9a9172b0e070c3dead3647a7cc93b29a8c88c79435da9ce700661254
+EBUILD aws-xray-sdk-python-2.10.0.ebuild 1921 BLAKE2B 405220002f7969d032568b620acabc77a230a8dc8bcd08eac3028caa148dcce7f03e749ead339ce08fef5a55e5a5a89577ed185a050d8c7fd08dcf2173f57c4a SHA512 7b4103772341a16f230421fe391fe533d6ff83dfaef8e83bb0e993ccd85c8d2b20e9d0424a3ae23c76520a23edcd76007aec67f3f97c0d86f35667829988bc6a
 EBUILD aws-xray-sdk-python-2.8.0.ebuild 1903 BLAKE2B a100c485d032e3c80394222f7546112120a1c718098d3357ffc94c8c2e386a2499a5673926508c1ea94dcf1cd4e72ace16f68393e685d7a5c674f87111a57f6a SHA512 0bd8cdbb48b494eaf07ee0ea82a555d7b3e900fda2395580636d2379dd3d64fb1b7943ac6d17f56aafb91ecf8d33223f7e737c113703a0283315215e69a27e45
 MISC metadata.xml 579 BLAKE2B 3f7aaed38bcceb97fb3597954ca9075ddf7a5718bcac69327be2b99d241c6d8cb0eefd369ca892c8d751703de9067c7eadf19f8c4445334ee8e4952b99fef69e SHA512 f3033cf16f60cae6727f80bd53944972f851579ffef8101cf6fda45e2575696183ec92ea8c994a77bbf3ffc8219be2ae2fae456faabe73a9896bcefddf3b5db5
diff --git a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.10.0.ebuild b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.10.0.ebuild
index 5cd390c0be9d..fa39672112ff 100644
--- a/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.10.0.ebuild
+++ b/dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.10.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-1.12.122[${PYTHON_USEDEP}]
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 594fe51cbf82..ccae01a7e96b 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -2,5 +2,5 @@ AUX bottleneck-1.3.4-install-test-data.patch 512 BLAKE2B 850df917f8b10b2c513c083
 DIST bottleneck-1.3.4.gh.tar.gz 118739 BLAKE2B af4b32bf296f11538b12f364592553d407668762e1e2d94c814bf262bc9ef88f1338cd388ff1c02065f8266988fe6cad5f8461aed2a144a9bfaf98f8ae46eeae SHA512 0cb3837139f947a7da026bddc8ff6e8025ee0aac6aedf4046383eb8385789d1816158ae20438b15a28c7f0b6552c3570c18abdbb6ef265fa9f497edebae1d808
 DIST bottleneck-1.3.5.gh.tar.gz 118989 BLAKE2B 5b9338a77cb3f0253348f45e641dca9fce11b50fb632e697272203870dd604730c08f1adc94ebf9c6c21f551e3f06b5492bcb036d6f40eaec8853d08ca298873 SHA512 9a0f224337fd9d5c741a1e469197be26923eaffb143eddfe0969128ddc233c799da6a5f2ba4ef22f6267cf93e7f748c140fbb16f57149ad327c47fe87ffc3346
 EBUILD bottleneck-1.3.4.ebuild 863 BLAKE2B 3dbc46bbfde6c6633b7c76f7ca68ebab0d53def686fba15929b0b56a4b2b01d49b5375149582d5789ec3399093e2e8ff95d8a9ebf27ae8de8c5b043294018012 SHA512 2df59b21d20e23f0e8fe3a5603a54a126903cdb0d247ac0f9d8ca78f095805b8c4ecc0061e80dffe98766a59ac8f09964d3c79fde6158eef3dac984b8860a216
-EBUILD bottleneck-1.3.5.ebuild 762 BLAKE2B fb36c7f11e06cd6aa3d2e8f338b1d2905aa379c3b04d1514cf52f3d019f9708dd6ee154a4e9dabd0d1bb53a87003a9e5d25d26d10ac0aa9d8fd5992ea551850b SHA512 4c474449dbe7c498952d7f9330195365bbab6e74f4dc4be448e007af5f2ede4a3e8bb89b01bb2be361923743121d724f6bcbf20eb460a6e5b8e8200cefb5dcaa
+EBUILD bottleneck-1.3.5.ebuild 761 BLAKE2B fcc671c0db763eaa73bd7a2758ad1b660ea98310e5140ba973d425add1a5c63e93c1cbf5478db3b66761f14c996514c44d965d8828db6381f46ab011542bf669 SHA512 3921b563c169a0930c7038d8521072c0bbdd53197783d63ab574fac570a6c308a3ee7c32eda31097faad2afce0dc810ae9a387306c815e7d2da1e89d1c12eae8
 MISC metadata.xml 519 BLAKE2B 5e5e712122fb0bbc898942cbae15c7cf623aa8462257f063f65a06bc9caae6662c373963f0945f99c5fffe01270e2792e8e5d01af93b49a04f5c3c22cd3a30f7 SHA512 55d2c03dedaa48c8f802d1e4d1d7db4e829fe7357b501c3b2955d28da501eae00675b2775ab36d1131cf2ef0a3d037183bde8df4c85e986d81510df4e234b0ae
diff --git a/dev-python/bottleneck/bottleneck-1.3.5.ebuild b/dev-python/bottleneck/bottleneck-1.3.5.ebuild
index d08fc08ef870..e0332ec2ec18 100644
--- a/dev-python/bottleneck/bottleneck-1.3.5.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 424ee5366c68..f98734e54eb8 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -2,5 +2,5 @@ AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534d
 DIST cffi-1.15.0.tar.gz 484058 BLAKE2B 0d2d470c7eb11b8a9526be816b153c4483a5cfb529d3d220a804842facae1f06e2a822aa2be9abb1b5648cb36a97033bffc1dd235d83bdf8c075d67a907aa7d9 SHA512 ee83efde6f77f4a0c5889088c4c208ed7b9071fe06dfc16a8d2396de07f78fe859e1e39866760198a9d700f3b7359e8715e8a3e4907feb81d3fc4b8dd0dbaca1
 DIST cffi-1.15.1.tar.gz 508501 BLAKE2B accc317385d9af7dbed3397afde63fbab63bfc935376d951802055c63796863ed102a940f192789924480b9b16751c8cf3d21caf9b262c479c61ffc977aac83c SHA512 e99cafcb029076abc29e435b490fa0573ee2856f4051b7ca8a5b38cd125d56dd9dae8b189f59ceb3d728a675da8ee83239e09e19f8b0feeddea4b186ab5173a5
 EBUILD cffi-1.15.0-r1.ebuild 1749 BLAKE2B c710a237cfe7792896a08d61896fc195ba5cc4f50a2a545dde4ed54dfed4a37baed202d5a94717805375caf853ed82ec68bae4abb81a995d2755c65f091b2b6c SHA512 3ede32681e8ce94d3988ac3d58e5788bb73f5bacc6c52c98df654aedae1f07b1377bd33ae133a7d79ee155bedce36a07bd46be7e4516423c77b93c70d932a12b
-EBUILD cffi-1.15.1.ebuild 1576 BLAKE2B 75fedd3cb62a77ebb676ff5deb5d925bfd538fc8d7e1de208af269d68f3edfb734d8b8c5912a83a8935dd7ffcfd7d6478f248b3c49829b988a6dc725a49d02fd SHA512 404c7becffa009cac6369feeccf63efbaba6c46f469f0ec9e334849dcaec6f10ea498dc2dc0142876d4025e22bcf8104307d7e9121c285103b478eff973cdd5a
+EBUILD cffi-1.15.1.ebuild 1572 BLAKE2B 4f91730ed5cd45bb03f6748a0af90134cb48b602f6288c3b838e1c80da1842c1ce34e7597940cd10ee286bd3d29d19e537b28c28751c1106366261497322ffda SHA512 91a0de15143505856005c90a6810e9261dce73dc6a76b091976e66a3dec66634f53471b908b232e48d6f010a39b6426c9383fe7598477fa923181526f537e32d
 MISC metadata.xml 318 BLAKE2B f914459fac4ae3d8ac9273fb721c52494513b932676f570f02cc4cfb2283705d8cfc761806ffed23c6f31c95a967398edee01c1536547c1830def5ca4144c003 SHA512 ec451f8c535f0d01dc7bcd248c002745947982cd469a02ac247d0d34f4d7a33374fa10c28d8f074932f0548dc500c3270b499dd08b18acbb9d308777bcc7e4f0
diff --git a/dev-python/cffi/cffi-1.15.1.ebuild b/dev-python/cffi/cffi-1.15.1.ebuild
index 54f6e3ffe8b7..2a7aa9f5191b 100644
--- a/dev-python/cffi/cffi-1.15.1.ebuild
+++ b/dev-python/cffi/cffi-1.15.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-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"
+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"
 
 DEPEND="
 	dev-libs/libffi:=
diff --git a/dev-python/django-crispy-forms/Manifest b/dev-python/django-crispy-forms/Manifest
index f87be2a8180e..fa4bd0f8bf72 100644
--- a/dev-python/django-crispy-forms/Manifest
+++ b/dev-python/django-crispy-forms/Manifest
@@ -1,3 +1,3 @@
 DIST django-crispy-forms-1.14.0.tar.gz 295826 BLAKE2B 4be78ba2eb8b7dfd6d9813d2a94b26ca571f3c8767f22e37e64deca517b0044d1684343f82790860f024b6eaf6759acfdb6975e4497e40bb75cc64ace3ce9745 SHA512 964ebcd74dd284d11cd0a820238468cce415a61b9ac83afe401b1414da0e27b3e9e0a9aa4fec411a8ff9fa08aa6fb56550c6262e0a9d821b17e12590fc06970c
 EBUILD django-crispy-forms-1.14.0.ebuild 513 BLAKE2B a5fef681d0d4815787df6b3ac681e8e1a30d8300c5eef495d802ea842039b03b8f287af9efc2d803102350f9e0ce0e3a7714b6e6c8832b6ca80826f465927489 SHA512 4874e3e634fd83c5527653230e76c4b1c0f8ba85c0fe6ca2ea1b9b29c5f3732c91d84db0b50d77037881ae881e98d39eda55153169f8b6e8c18973f1ef506825
-MISC metadata.xml 408 BLAKE2B 562679975cbc8642795f2366edf7061fe22703d88b6e24b7f3cffa35dfa4982934834c3991f436a25f330cc4cb7e20e939a6e589dbbfbad25f23c99d36237c86 SHA512 f4dba401041c328d9e42f6d603d80fa943cdf441d6a12d140b753b3196d561d0a2cdd2fc4a2b81103674e6867f288d9847534651a53a3169c2cbcfa30b22d1fb
+MISC metadata.xml 409 BLAKE2B d9663843245601ca8675fd522ca3b4150c36611874fb852f3c0c7bf68ec9595cb45ef66c293d658c13670f18bca6949a2747cffbbf819b55cd9b30ca6340bfba SHA512 2b1091cac748a00099f3a1685150bc8dfdf252b18b7e5c2fc17a8ca5054ec7ac0e72286dba872ead0354b4bae02cc3c410a5d05828f9dc257919526077bffc8d
diff --git a/dev-python/django-crispy-forms/metadata.xml b/dev-python/django-crispy-forms/metadata.xml
index 0e3ee306f637..af8be72c1475 100644
--- a/dev-python/django-crispy-forms/metadata.xml
+++ b/dev-python/django-crispy-forms/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>tupone@gentoo.org</email>
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 94a06a28fedd..a107d1357307 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -2,6 +2,6 @@ DIST dulwich-0.20.43.tar.gz 423604 BLAKE2B e8f6b3fc22ac2289e6529d862f54d8c407725
 DIST dulwich-0.20.44.tar.gz 425226 BLAKE2B ba120c682b0fd298a9f17eec524ffdd92af9024e30d0b8c52accda3ef8a1d4876b483e8aaa5f12b4beb73a6c1719ed4504c52396cd355244ab688ceab551faaf SHA512 124a3ae89abf5df9e192919f916012be67112195fc7cfd7c30e814a04d93749a3dc396e12f2d8df1456b113a24cdd1b2f3a1f2733864d5cfad22431a987c25fb
 DIST dulwich-0.20.45.tar.gz 424373 BLAKE2B 4eb6731312bd8bb45d35efdc1e640dd2cfb118b633de461c4f9ffa2a9e50258bada2c77b4d4bf2e72bc9947f143f89fd720e4e9411f0f84d67ab208f39f7b4b8 SHA512 5b7217fac88a84591e42db2cd3c812a0aae6482221e1da9474df9b3fd968a80b653353fec804103f36a29f0f96e650267f124575a260dd082a3106de5f13fc7b
 EBUILD dulwich-0.20.43.ebuild 1644 BLAKE2B c27c433faf91999c3a52391cde1bd690c19edaf77b12f5b7fbccb9c5c9c52f2cd7ff0bb1ee162991738ff46d8ab892b10d4590c3b2f6f0aa653b04a2dcbfdd0a SHA512 bd78b84c26d625706bffcecd4fa3cb187746392df0366f4107262628034dbbe7095ea9a54fc9d826acaa8ce315c7c5ec33d62a5b7c2e85d58c77d75504caeea6
-EBUILD dulwich-0.20.44.ebuild 1647 BLAKE2B 7cac66dccd03e74b0b3a19d43e894924abceddb5715781a486507796ae342f180cdceb6b49321e90b626adf8daf34c93210b72a2116b9fc9f39e790b2c965803 SHA512 7a42977e188b70ed8dd47599d16abb00e024a442ec3116731fa044ebdea713e8308af28224efcf3a91b3d6fffb386d13581b269fdd277a8e94f4e1ca6d533a1a
+EBUILD dulwich-0.20.44.ebuild 1645 BLAKE2B 7a105815218eb147b51f83cfcff3e42f8fe379ae7352aac2f1044dc71c19e7ae5db8e61f49b567c49fbc5c0c55addd75987a2e267460cb9d8f2566c8b0d19639 SHA512 a275b5a898b4c4f6a06e1499004c68fc63ba6721996f048aeb435d49572db5df6702382eff7d77d86a6eaa3b7b57e898af3c73aa1316cd15cceb8cd4e4412495
 EBUILD dulwich-0.20.45.ebuild 1648 BLAKE2B 3fd03d65cbc5d76d7a6bb7dc1b65bf1e87c41a75479e891d43555dcfb5739649465c6548152011bf33e058a3da45b645ae1a8a8b527d6ef7154c9a1784d6aa99 SHA512 e89ffbc7baa3c8ee0df81ca231230d97ce837022bdbc001ba157d7074eff5900113c9fb23a0b4f7b7e5a555fd4dd505a39439bbbfc7a1b79241eb5bb0c518d46
 MISC metadata.xml 556 BLAKE2B 240554ff522160e9508bf6debadafcc44b5ccc4074dd4c9d3ce82358963084c60a1afae9fafee6ab1e6e5d898940ccb4d1b524cebff155e61bf6707c9396b647 SHA512 a7cdca224a01d5bd26bf4a5adb0273977ddff61f75cd02f5642132656fd0c6608114617efcb068d834f107804666cf4fb3725967e804b73d2ddcb67342dc30de
diff --git a/dev-python/dulwich/dulwich-0.20.44.ebuild b/dev-python/dulwich/dulwich-0.20.44.ebuild
index 855cd030c07c..1e6ac07eb6e1 100644
--- a/dev-python/dulwich/dulwich-0.20.44.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.44.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 49f0f007e9b2..c92ce0ee1e52 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -4,6 +4,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
 EBUILD lit-14.0.4.ebuild 915 BLAKE2B 1b5f3a2c173e1321cb172352f090e013d90535b1a97af0d37e5db9d7c4699638d627942f8ca0c90e56840039f6fa7b8d1360b069f89c4b0298a541015c4036aa SHA512 f40f818848819f460efdba91dd05215ab878f38cb0900ece6ed9e59bfa3c8b25ab025ea698bc377f92d535c6b6c189fc9b219d6832ad365f6c1bd01c70397b44
-EBUILD lit-14.0.6.ebuild 915 BLAKE2B 1b5f3a2c173e1321cb172352f090e013d90535b1a97af0d37e5db9d7c4699638d627942f8ca0c90e56840039f6fa7b8d1360b069f89c4b0298a541015c4036aa SHA512 f40f818848819f460efdba91dd05215ab878f38cb0900ece6ed9e59bfa3c8b25ab025ea698bc377f92d535c6b6c189fc9b219d6832ad365f6c1bd01c70397b44
+EBUILD lit-14.0.6.ebuild 914 BLAKE2B 80f1bb1010f71ff835aef8e87cc0bca5de0dd97e74debaee4e26d698e530468b755bc632884c11616a0ae082befa75a7b6c11043c70c3bb5679b0dae1c985d0a SHA512 77eafef2378be28fdcaa87f07fec8b1907f8c491b4a600b47d9f5970148f6684e6b4733ad6dafb753aa7a56ed1834b10ff30afc5995812c895749ea0c7294e47
 EBUILD lit-15.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-14.0.6.ebuild b/dev-python/lit/lit-14.0.6.ebuild
index 8f9f37454230..4ba84a917af2 100644
--- a/dev-python/lit/lit-14.0.6.ebuild
+++ b/dev-python/lit/lit-14.0.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index b4a0f8e06ef8..7a8a4e40f2e8 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST mkdocs-git-revision-date-localized-plugin-1.0.1.tar.gz 375668 BLAKE2B 355b0fdced378305dd12c72d05186ef50fc1e5b7e5302c9c0887ced03329d598528367313e81d3c8a4658ed1bb2e940c9495c09c2e6e40a03cbc52833fbb13a5 SHA512 7f54ac18bb09ce1f396d593edb5e456476c18c68464dafc62e6b6e1f3aa89735319016925d2f2b8a4ff7aed03d8e02109da23f23a84d9ae0d138bbca278aafd5
 DIST mkdocs-git-revision-date-localized-plugin-1.1.0.gh.tar.gz 375907 BLAKE2B d39f1d807616da95962cca6bdc5a4501163d008f0a8fcac5df2e7542bf8401d04362a38383558689f467c9249f2ad6dff636a8ebf4568aa920ea0078f90fb367 SHA512 f5f911cba9b9e3747c5628e4c947a87fa07c798f854b6ed8783b74c732cf29e4afdacb37e074a5d04672d90f96de560ab6b86cd3d826ce46226d73f48c54c27d
 EBUILD mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild 1465 BLAKE2B 1a56964093c775066e461c1d8aa8000ecc9b2a5556961b2f524efef14088024504f1cb7aa8945c2fc678c21e2f568a955b5f3e5193e3a2cecf6db6c357cadcf3 SHA512 c3040df805f5d9379ffa4e5ca6131052c75ea238aea4e512a298d0cc3e2420c2cbd8360f72151f37680931d506e8f876598138175b152212e24e98b82536cc87
-EBUILD mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild 1470 BLAKE2B 9f7152fdd1a0d8e995891c991a312fb8dc1a498b2ddb8f2b9ceedde606778df912c114312d66a880916ab0d1e438d3af3e260afd30f12faf7b1626beea527831 SHA512 95c25ba5627471b0dd2be9c6feb4f45b93399a6094f12533b5172723748c94470babf17329fcd77fafe886f62c7fd5e0a2966d252397a06b37ceb1eb6eed173d
+EBUILD mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild 1468 BLAKE2B 2a0c2d5949fc89bea7f9a861b22f8b9a724d97f245717c6eba9673e3a551d6cda6a3cc5cd39410ea27a88b3e9d2984a8c56a3d0dcfba37369188b2dbc3400e80 SHA512 7bb3486ef69ba05662db87ef1f734067bafa17f87d85abb2867d779a18630d415f4c7b45e81b118d7370d459f4f4f5cd7a777a8ecba47cd1b64b1c51a8e77b2a
 MISC metadata.xml 596 BLAKE2B 9010c7fd37265b6770544a605f918524b75d7b1afea8809075c3b5afb5e56f6848aff4c7fe98367b3dcb3de16f0d21682f9a2fc80f441783f32f904dd8f9a152 SHA512 431dff95204b056afa3a4dab48eec1559d72d0c1ae9a65d89d95fb97454f858c9022578043238a34ce205ac5a16871e6f6d68a3bfe3231c20852437c4fd66254
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild
index 2e2d9c9d4191..38f0810143ed 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pecan/Manifest b/dev-python/pecan/Manifest
index 13a4133dc245..4e12a3a78481 100644
--- a/dev-python/pecan/Manifest
+++ b/dev-python/pecan/Manifest
@@ -1,5 +1,5 @@
 DIST pecan-1.4.1.tar.gz 124777 BLAKE2B c3af6ba06aa9e24f9e49ace8117480affd34dfdc889639ab34565325e7504d3c75f17003da09f9f67f91edc536bde95080dbc51170cccc50fde3ec1929c63958 SHA512 bd5ba47935e2d97677bcdc25ad4678ec63293e0000750fa3b39a2447be326dc7e1fd4cf77ac0519e1b7c6ecc7ba7c3e66d98443e78e647fba92383f048775c83
 DIST pecan-1.4.2.tar.gz 124900 BLAKE2B bf78c630605dbf020bcda830855cf19dc660c8bdbfa6d68a9739a0da7c585ec17d30525d37337867e007aa31d3329e87224cfd4e0335b14496df911457af5c82 SHA512 cea290db5b7c4664057ec326e1f9ac11d4b523e2df83a84c3b47acbce0520f248bbd33de0f66379409a4ff463b6408b587238917362572479288d36843542ab0
 EBUILD pecan-1.4.1.ebuild 716 BLAKE2B 1b06ac38ab618bbf189394c4004ca11fd985f6c0ae7f4fedbdd3c1f7383ca19a70c8547e0325771e7d591d1926463f9d75105f8da23ee33a04125258b7aa40a7 SHA512 cf1e576a148bda7d81d3079c5cd1799a9476e5b7d4339db747ed51c7aa3dfb7966eb262a2d2806275f90a7f984ae0ac990c466b04764baba7a12750a8ae60b4a
-EBUILD pecan-1.4.2.ebuild 857 BLAKE2B d7c669015b877293518f2de7ddab0c742936074c72433aca5c263ca1282e7b3d2eab576f6678e041d5a2609fa4da7a03bd3ad04592e0555fd24bf1c75ea01de6 SHA512 585ce6ab3450adba6b5a337a6aad5acbdecabcadf6747cc25b080aaa8fab2031880dd64da311140d79e6c3270cac8713c16cc5f5d6b7ba33d82809ae09b67e05
+EBUILD pecan-1.4.2.ebuild 855 BLAKE2B 4a6058d85e484f9b4cc77a1f16498695d54e5ea9828bcb58f2977b4ff55297fb5cd3edb72968a1f3468fdd5561c8526f3078be9643e6f35cb07d6fc3bb82cdcd SHA512 4d42f5ce9ec6d5c3bce5bc70b3c74e040f6edd55ba46d3b8e6c37b4765d204e7cce86bcab53f0461701da7918582235ebbe76aafbe3ba998d13ebad8bc4dc994
 MISC metadata.xml 347 BLAKE2B 5d328910f51d402c88a420f3276e79513932d13af6a01e03a3d05840f8d867f4dfb824870c478757ad48e3db8c07e2d1f9d5864b14b526827b0fca0f598bc531 SHA512 6427cb256dff0c2ebd856820cc549c176d8e732b20806dbe3739ed7691bdbccb3c941e4dbca3e29de18f7014145788b5c81dfdaa5f4da5acad10c7eb544a6ab8
diff --git a/dev-python/pecan/pecan-1.4.2.ebuild b/dev-python/pecan/pecan-1.4.2.ebuild
index afa88af1668e..d5a6b0580205 100644
--- a/dev-python/pecan/pecan-1.4.2.ebuild
+++ b/dev-python/pecan/pecan-1.4.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/webob-1.4[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 2c63f9bde11d..5d6f21bce4a4 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -3,5 +3,5 @@ DIST python-phonenumbers-8.12.51.gh.tar.gz 4903034 BLAKE2B 6d97e25c3601f817ad51e
 DIST python-phonenumbers-8.12.52.gh.tar.gz 4904385 BLAKE2B c063fee535e3d1dd30844ea7a974601962fb8fd6b56608046e0c488e638624456020100b2b775f979f770ea1690bda38044d4f7457341d1261132f4323a6de86 SHA512 638ec8e09d58adc5131e855a9436b45f1f0252c084638a13130df793d5357fc249e695668e2cce4902a534300c4683b64078e08620fdd2636857f6d328a45d82
 EBUILD phonenumbers-8.12.50.ebuild 801 BLAKE2B 6a2726b7845d46717aacb23295f6248b11475b197ff1a37c0de0d2a4e409cac62e941f005057f715fced24909943303ee1f0e975e40484368d82a81578c26b14 SHA512 8b5f322852d39eeec3bf3f023765fda596f6459eba5fa70f9f7074bf5e45428a5f292b394bfcc7786cb25049e198c410d794aade497539b6f0e8964a9f72bbc4
 EBUILD phonenumbers-8.12.51.ebuild 810 BLAKE2B 3b18782b7466900c6dcf66ada03d333fefd3df0a6a02bc1417de82a4e692e0baf316db5d1b4bf070d4a73b7f8b5133018c22587f5549fbe8863b8e3ec6859441 SHA512 9f1fc8118ab9fc7284723238e398f9152d6e491bfe0be97fa5b181f1bb30a0d96900c1e1674b6ca325daefb8813bc25dfae44f1ab172361e367725c5a040ba4e
-EBUILD phonenumbers-8.12.52.ebuild 810 BLAKE2B 3b18782b7466900c6dcf66ada03d333fefd3df0a6a02bc1417de82a4e692e0baf316db5d1b4bf070d4a73b7f8b5133018c22587f5549fbe8863b8e3ec6859441 SHA512 9f1fc8118ab9fc7284723238e398f9152d6e491bfe0be97fa5b181f1bb30a0d96900c1e1674b6ca325daefb8813bc25dfae44f1ab172361e367725c5a040ba4e
+EBUILD phonenumbers-8.12.52.ebuild 808 BLAKE2B ef45a7f57cab5aa38bb958cae5b0bb0bbca327073d8d4bc41aa56552037a2ae91e5e01b3e6af6e9d948ad4f7edd5ff7fd0808c2a7d742845040fbcd55a6b3b77 SHA512 2786479b7b053e0c900d5548a1339a0d81c0d4c44a25d0b33ce6058e06a872710d7c887d4ee20b7c705065e2a2e4eee6519bb76960902afc45f86c3806819108
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.52.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.52.ebuild
index baab22b23fc7..fa0f470bb38b 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.52.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.52.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 5f0aa3b0d89c..7261bcde1108 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -3,5 +3,5 @@ DIST pocketlint-0.23.gh.tar.gz 23854 BLAKE2B 2ff3388b639ba29ae60ccd0013cea9b1f43
 DIST pocketlint-0.24.gh.tar.gz 23875 BLAKE2B b4699d1f0633ed6a3f84b97db972818c00a1d382a48648fd4fe6870f4c54f983fd36366f85a409a99b860f385902a9a05adec63199e35d1264a522a7a3086e31 SHA512 21c4055dd42c244760950b64ec4cd9359fc589014953be6f9296e0265101f098fbe34351e87f92630751fa0055de20281974a04b425f691acc4608cf929d4bf4
 EBUILD pocketlint-0.22.ebuild 487 BLAKE2B ddb58387ad3830f65c4b44cb627e86bbfdd4bf0210bd106071fa70a9e3a5fefc1ee0c4ac91fd6bde07abfce72dff455f1a32501e381460a2d192f4458a7b44cf SHA512 96bf0eb52b41e9696c97fb4161ff526fb9f3acf4fc1f3d83fa13c9f0166eec59e93382d3908257950649058ca522bcb1254984c30291dfcd3789db19b7b0ff97
 EBUILD pocketlint-0.23.ebuild 575 BLAKE2B 96eea8110471e78a93387adaf951758d84415e8488eedfab83f2dc231bb89690806750acecec28e3c3a31e110082bf0a51ffbbba271f83ec02246c7ebbad774b SHA512 a6a2693cfe1124ebf8dc7e6d1ed050076b6d3e0b8af45b2ee57307bad0922b1b551cc4e089942a3b2e5c7b77705866fd46c2f35c8cb5df98bbd0539d41ebd125
-EBUILD pocketlint-0.24.ebuild 655 BLAKE2B b241e86fc28b436b69f362a48502c3ab54c10489e736f0a4b0a471fa5082283a5f3e87109d3748502895a36d8fffadaab16a8c3b42befef1ef930a62511ceb29 SHA512 2cb9868f142fefa478373cab272f36ea7ed1f96965812f22a3e1eaee8866a6a52f99fb100152147add30e20d5cc1a38186126b5a393abc89c1a2a5092f8869c0
+EBUILD pocketlint-0.24.ebuild 652 BLAKE2B 97ebabe660073027450043986a24af3c2eacc54a70aa4064d31de066df88c67db3ac2e755da6759ec524fb97be1f0bb2d118db1c02373b3a0a514dabc4c8a01a SHA512 eeacd634694fe6ee9dad2e0ae9acf7f9b9bead9cf73ea959ba798660f81ad51be6f8fb8ebc6f8d6b3522465d4d781e022654bc151b4d813f0f3be5deecd71dbb
 MISC metadata.xml 303 BLAKE2B fd0ac0ccb8faa5f3e9b7074f238915f2b7babb9dc3af3b1574dd3f98e2970182d4cc0e579f59388601e43bd8991fa7cbca570c499f48060a25bdf8279a5c0751 SHA512 9f916df92044f8b6c2351e094e0ffdee2cf039e4d2d2d101ecc5a5e10af58dd4bafa19dc6cba47af87aaf73ad22abd64b50803c5e77cb283ae12c1f9e1653f43
diff --git a/dev-python/pocketlint/pocketlint-0.24.ebuild b/dev-python/pocketlint/pocketlint-0.24.ebuild
index 9972b55ac64f..4895f3233c0b 100644
--- a/dev-python/pocketlint/pocketlint-0.24.ebuild
+++ b/dev-python/pocketlint/pocketlint-0.24.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/pyaudio/Manifest b/dev-python/pyaudio/Manifest
index 0041498127ff..0d4e90a56a4f 100644
--- a/dev-python/pyaudio/Manifest
+++ b/dev-python/pyaudio/Manifest
@@ -1,5 +1,5 @@
 AUX pyaudio-0.2.11-python310-size_t.patch 845 BLAKE2B 68eee6ebd83440e0f42a51a1c88735f5c6a7b2b541413faadee0260c22f65baff4d922100304fe719e9a6818ec98e3ce0bb51c763c916ae76385511d0d4ae12c SHA512 a9db774bcaaeb6693871ae49ec584bf58543469cd5c166e5ecb61efc354be7fde2a4c3283c1fe070a3d9d102301fa1a5f39d844418d52cd88565e1e62348992b
 DIST PyAudio-0.2.11.tar.gz 37428 BLAKE2B 18db51a651876135a6afc6c8c60e2221017a311fe1aec10497905bc35b81a73b5e9f27201431566bac3d13bcf582ec12a3b818c51f0e5e70aeb4ad177608461a SHA512 64db5542ee60837c9b07677e146fc7b060ff47c8b1c04cbb575bce79dd3ed4776c201e169ff2860f27dbe9e00a77046ba0cb925b55f7c546f8de46c6df68954e
 EBUILD pyaudio-0.2.11-r1.ebuild 1091 BLAKE2B 7ebb50ca17f473fa13ebdf973da074cb00bc161b0c2bf46701a5935a4eeb20763f5790e813ba74f6518db9a7f1a9caabffc554a80755c45bb5156691e8177d3f SHA512 41a4115bb3b8a2da4403fb7358fc3602d83cce90118770d59c31199dadd6e0f639260e62f77b1235d22f16ecca00a860910ad9c75fb8dbdf6628cc7e6f346e05
-EBUILD pyaudio-0.2.11-r2.ebuild 1182 BLAKE2B 7ee7cb3992233b3a08e79fd17fcb81ac63f6fa51fdc8ac6066b0d9ce14afe1b4c50a64eda0bb99ab2f0d4892bae33327711c64d2b8e83e01187363101b8c4614 SHA512 cf7d5d4fd000b4a32f8f6537bf525c97e17a9849acba15955e91097cb50f3a5ca9f19d58f58449842cfa8102da422cc589e936273eedfc6f40885bd96c252f36
+EBUILD pyaudio-0.2.11-r2.ebuild 1181 BLAKE2B f2c557546022d82c91749b8c004d18ddf9356ef2508011e0563f7353eea46d6a6ab7bd64bc0a71d98662ff7f5c33ae911981adc2b81e7348544eee88eb7e9900 SHA512 99a5a788b19b96ac8653440848a16036e470294e6c57f88b06a3101cbc6c64f667ff2cadd15da3586858803009c8f341649233c1c54db83c3102f4ec0adc043f
 MISC metadata.xml 629 BLAKE2B 13fcd9ca931e654d70fa328133f5c1aff9410c7c504338d7fd14f53f2ea971c5418c3f8e242d2cc35cd990c91494626379cf88e7e157a5bfc37b87c0c83bf7c8 SHA512 cc9475811d3f8265e79c80d2b7b817156942430843d23361c3ea9791730c422acd9c399755c8f6a775b6a3e9d7fb9138f22e87ebde9e7019591d68c696095d81
diff --git a/dev-python/pyaudio/pyaudio-0.2.11-r2.ebuild b/dev-python/pyaudio/pyaudio-0.2.11-r2.ebuild
index b061423018d0..6994804667fc 100644
--- a/dev-python/pyaudio/pyaudio-0.2.11-r2.ebuild
+++ b/dev-python/pyaudio/pyaudio-0.2.11-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 # Tests work if you have the correct HW device(s) to test. 0.2.11-r1.
 RESTRICT="test"
diff --git a/dev-python/pycxx/Manifest b/dev-python/pycxx/Manifest
index f026ea70012e..d2e9f76685c1 100644
--- a/dev-python/pycxx/Manifest
+++ b/dev-python/pycxx/Manifest
@@ -1,4 +1,4 @@
 DIST pycxx-7.1.5.tar.gz 156343 BLAKE2B 099de7f88c19ec86aea67b503e6fbdc0df66bbdd3bdc0ff7f8ce77425be9486e6abebed8548f9ac764688a85e62cda77d3832f460e5678b4c07b1c6d2123b257 SHA512 0f980298739886d0c05ddd5ee23ebb234014b8276d811e62dc5b0a738666c6a011ad3f4aeeb7b1b404d8bff87dddfc30f68eec9c6bd13d5f262a2f7c53e273be
-EBUILD pycxx-7.1.5-r1.ebuild 918 BLAKE2B 2f2032f893514c4db0210d5ec8de8cfe51d09cdcf0d3ee8ce45caf90ca5b74cca554099934b8e843b83bfb430637249afa2c7c244e102ab0a34680beb546bb93 SHA512 098471d8b55e3d6d9a809d740366f98fd74a32768eabf5887e786497e9bdac568058ded37359eebb1fc9efb0ffa3547d230936931426635f998c28b51e86b432
+EBUILD pycxx-7.1.5-r1.ebuild 917 BLAKE2B 4fa7752c6cb3115343c70c34e03f227bf68c9b80b58ab1601a01e0782135a6cae04d080196d0e26dbd65316c8d9a74c76f57c11581418949cdddb650aae7f118 SHA512 1d4548082727663c0532046269570056649be90169d6844ee71bba609d15d1f3b9f4d28953dce5d459cfbd23ac7b64d72108d8da31f60e374c7b4f2b2ec011bd
 EBUILD pycxx-7.1.5.ebuild 916 BLAKE2B 723d0ceac9c91cfb1e804802688a8df7b8090a8c05305001392b002c3e11b234894ca94568ca1fcdc6a9648cb9c8346cd8901b4e8f36109e937a6f82735ff782 SHA512 7fcdaf0ad47fa1835799cba9f2737a02f0de91189da07d25a7301882892314c99de63f4e973a12ecca7491f840a2b01f1f59c13d438b199835e79c9d5ad155ed
 MISC metadata.xml 667 BLAKE2B 1d5c679b2fcac7f5f302c35517f3903e0b3e3fdf5b65ec0005e0f1b2137ebc2a2e175031100c1bca997a6b2d7aa20ce3642c5dfcd7245c607d70d57b890694fe SHA512 2dc5bce4a24791956ca064750f7998556796af5afdb8cb24eaacd1e6485e6b92c939f053e410507e3fe3d6c29e320061c897f8ea0972ba04e4ed46f60876663c
diff --git a/dev-python/pycxx/pycxx-7.1.5-r1.ebuild b/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
index b4fb8ce64f69..702c90da48f7 100644
--- a/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
+++ b/dev-python/pycxx/pycxx-7.1.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/cxx/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="doc examples"
 
 python_prepare_all() {
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 08512d62099f..dcb7975fcf9d 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -3,5 +3,5 @@ AUX pyside2-5.15.2-python311-fixups.patch 1962 BLAKE2B 37d91352ea09eaef6d36c6001
 AUX pyside2-5.15.2-python311.patch 1777 BLAKE2B 1afa7c39755c4f91b4b4c951f59e1a3190f924d8b20cf2140ad5342c2fa046ff7e6bec540bea9d7652116894e0cb7f5fa5ea73067212ca5b631382e7139d7786 SHA512 b88f300e4944cbb9adc8ac887e263e74e088a1b291000c86f6677a01241939e612fa5eebba3807fb2318477e68de241914832cc92ed0470726804d3098486120
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
 EBUILD pyside2-5.15.2-r1.ebuild 8565 BLAKE2B e83634bda361686691269f351d55ebba635fda4070a4bd1542109e528e840a9f525bd2f92b80cf7c3560ba374b9e4f541cd33ba336c299a9e141f4ad546de956 SHA512 c770d2aba3ee2d1d3072e3f2779dc552ca6649bfecfe5f5ca6d0148fbd819c6d76a22e8626f7281772f6c7da1a9dc98db2a53fb6fb2b136ef2bd7eede1c77b8f
-EBUILD pyside2-5.15.2-r2.ebuild 8672 BLAKE2B 0a13b7fd9e71b0affc66a9d282313f69d256311c5a0faf71dac1af6413eaf102a6127956c548f58eba12be50b3dd71f6d2ce8b0471ceacbfdb37d90774090431 SHA512 8afb6c03c15e40f1032d8c790e70855a30cdea128139a29334badc6ce88fe65514069b450c0e3c221263f998da963008884a625307f34a6363737b8125664c33
+EBUILD pyside2-5.15.2-r2.ebuild 8671 BLAKE2B 0089f536234c9617b84cb7ebc5d8ec291c1f9b5f72ba90b84497f2573a496bd809b6f94eb3b1cc705c0fcc0ebb0b55c1ca2bf0b274678724755970835bf17389 SHA512 73746534015089f55b4ffbcdb65d6ec1233a241e60e14b002f19ad05dc362db5edbc20259c95b3237615c736fb339d05ef8b91d6a0818f22975efbd39e3a344e
 MISC metadata.xml 2021 BLAKE2B 88a02910c29d93871a1b6d4709fec361712d083839186270ad9c5e6472876a3ba50d7aa9c4acd0b169de19caf3c8047a00b6d241ea64b24b65e0a7e796e6f418 SHA512 c42370395ed54c9a20d9969f0a764ef72537bd77a76fb35bd3a5f10abcb801c4794cdd4f2ca528e97e5fb7a1e9293c76845c6a77b973bde00a1ddd9c61b3e5ef
diff --git a/dev-python/pyside2/pyside2-5.15.2-r2.ebuild b/dev-python/pyside2/pyside2-5.15.2-r2.ebuild
index 1956ebcc9ea0..bd5c7390d6d8 100644
--- a/dev-python/pyside2/pyside2-5.15.2-r2.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.2-r2.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${MY_P}/sources/pyside2"
 # See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="
 	3d charts concurrent datavis designer gles2-only +gui help location
 	multimedia +network positioning printsupport qml quick script scripttools
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 176263061747..560bb4b04888 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -2,5 +2,5 @@ AUX requests-cache-0.9.3-cattrs-22.patch 6925 BLAKE2B f753c154741fe3a6b6fb05db19
 DIST requests-cache-0.9.4.gh.tar.gz 1541821 BLAKE2B 90f3ffe8f4213a47d19c1190f1201bb484473a4ee2fae82dff59c9e80bc8c154739e99f5024aa55b436f9e620d5594441df61e2db44e3cbb381d394c1b6b4a0b SHA512 66023dc8b153070a532f160af58ac2102f6b9d536a0045c4c62ad1d4175f59df6e7db5a25422f5610a2f17049270ad0b63c6023ddddf64235432a63d2cce9b91
 DIST requests-cache-0.9.5.gh.tar.gz 1542034 BLAKE2B 01996e7536ce967dee2b909091d1eb08501b3882b6171a5460b2196666eed848dec89a85ef8ea0c892b2fd153f90107948239de04b973e7766d3acfad7b10059 SHA512 de1481ff609f3ff36ed662d986fb86a500a8d26755832478a9a4396f2c71934b5f65540137b92365eb36f66087b3fbc1cd72c63d37546d09c86bbee7340fd8eb
 EBUILD requests-cache-0.9.4.ebuild 1973 BLAKE2B 80dd5db6761f818e3b389fd063371cd549050b7636fff825637d106a58feeb678e9915b773d28beac892d00a1c7e63d5dfa24bcede8c66e7e1b7cd472253bafb SHA512 e82a49eb38e33ffedc1d1cb28482ac838549116a9c8ed73b08f79a74b4f4a2cf95c5638465828056d862a6762168d2678319ddfbedc825b48e4e8ccfec2c52c6
-EBUILD requests-cache-0.9.5.ebuild 1802 BLAKE2B 8addbff1f4603f7c28f8bc5fc3ca350ea1d1c01084e0c5461c04128680b05f5d93e8fe0ece13b9aaaa0ef42245120dee7d356991f2bfa76e6199df5013967980 SHA512 112cf3cba0fcd6f3bedbe4bcf12412c6ce5c77d01c93a187164b338e5958210df7a1c92b87230adb9dc341b296d86eaec51c3a68d13ef87f7f311d4fef96e0ee
+EBUILD requests-cache-0.9.5.ebuild 1800 BLAKE2B 94b814c239d343e3515c79c34b353a0920fba71b0139cac1f7d3332f891ac6d8cbfff2c68aaed8b47419606a4ed68b3950f04fe74ad83760eb17acf242983403 SHA512 c5483081f64e6a05343e9c57f32b715401d323558150bbb34e120fc351f3284a1439a50637dcf8045fa690b052597c43a60645972703241ff437f9e08f4e83da
 MISC metadata.xml 541 BLAKE2B a8fd81921a36e2fe5bdec38cc1039b9e91971c992a59cbe2dc4826977f753bd6cd2533f65b5f1a076308a898972fe70e85a2c8cf480259e9801f51b10c4de8a4 SHA512 64f29b67eaf3ce892a9f918abd7eaf8f020323e9e0d986b424cffc83e3ac1ba5cb14b534f0a0ec73a8e81694ca4e0e7f98ef02968ac5b43dab104b2b12e8e0f2
diff --git a/dev-python/requests-cache/requests-cache-0.9.5.ebuild b/dev-python/requests-cache/requests-cache-0.9.5.ebuild
index a05212c9f27b..836dbde0e04f 100644
--- a/dev-python/requests-cache/requests-cache-0.9.5.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.9.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index 0aef537c2d98..65eec5508df0 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -4,5 +4,5 @@ AUX shiboken2-5.15.2-python311-fixups.patch 2059 BLAKE2B 746cc4c4f6f29895fc4c4d6
 AUX shiboken2-5.15.2-python311.patch 4606 BLAKE2B 40cc608b4dd5eb305809e2cd2fe2908e8f5a47dcf2a2e6efc92cbcf26604c50cd63b007d4e49b061f017a6675c57542b897fa019820a72adc4c291f798f6f01e SHA512 8403955111e8d9f9f9d8795668ab6cb19d83e9a2434593a4578905a065f706c5a4fede2f17c9e9acd8d2f9d5d0e64a54b6e65f512b147ee91f152430ac171c5b
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
 EBUILD shiboken2-5.15.2-r1.ebuild 6551 BLAKE2B ba5cd749b4641a87c5d4edcf9c8e10d5c199dcd1f9888cd620b801f0d1e5c87d8988131011ecb5b4ea4077543f5a3c91bb5241ec21de091957b7e2cfe0b754bb SHA512 5a14af1ec01cd89b54652e6a1dfed547fcdccff6500ba221ab27796103605c5c9c16d812655478daa14be2fdc1e5a613223c44b9df67d47ef04a30882826e6b0
-EBUILD shiboken2-5.15.2-r2.ebuild 6557 BLAKE2B 4ea92a96a58d44bdc8a5108167d47e98d687334bbfd6e584822c11f4690b6f50b64f93c6bd71168fb4cf977a062e587c214629b53161f68ee2896148162d8b4a SHA512 140242eb4f4af1c609fab2ae3fd1f99d725a055af76fd5d565195481214548c80f9368a9b771cd82c848ff2e0aba61da39b2276595bd9a0eca4c878d0d989994
+EBUILD shiboken2-5.15.2-r2.ebuild 6555 BLAKE2B 4d13e1446ea254d7fd4752d291c05f50b2d05a3f398ab977bdb22e2b3a31ecd57bc60976f91827adad90d64752eff8b44a3f2de5aa21ee2d3b9d7586128baa11 SHA512 c59a9620d3d1ff9bc1db31b1df8bad8f9a4bdc305b3016dab3abdd1e7027d4a73ffc145e890248fc382c76725d143fad6ce26dee2dc7a50863f49cd3abf24f4f
 MISC metadata.xml 496 BLAKE2B 060c13ebf383e609b257f50f65484eecaaa1909d3b9242ab2be2b12ec203cdaaf4b5a9402f01b9e511b3744a4d7a562161d86a0d2f9bc90f401ac7ee0cea8ba4 SHA512 7edc53f2bde5d688e8dcac866997ec282cf2f7c1230a064a304c83a7b3c54c2079f99f4c75082dc47f7e9248dc65296ef98e0cda7dea08cbb97e766da48c11d5
diff --git a/dev-python/shiboken2/shiboken2-5.15.2-r2.ebuild b/dev-python/shiboken2/shiboken2-5.15.2-r2.ebuild
index 4ba580569103..ab8b7ab7bb2b 100644
--- a/dev-python/shiboken2/shiboken2-5.15.2-r2.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.2-r2.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}/sources/shiboken2"
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index d7bae544ce29..24c44a8f1438 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,5 +1,5 @@
 DIST tempest-31.0.0.tar.gz 1110051 BLAKE2B 9c3c87db902220e3e8de6e88e0d282eae07cb3b155eaa415156e83aff9d52523416fbfcae5b49a335eb81ae3488e4e2aa4cf86d10a35820aa3e24184466576d8 SHA512 9f8cfae192a5fe0fd5d6c1659ae42b5f2042392945e2c91b3bb96cecc412a1e6e582bc46ab481452012dc2440d13bc8298ca875587d5b1592dc95971d9adf4f0
 DIST tempest-31.1.0.tar.gz 1114805 BLAKE2B 29c0f55db6812a4da6bdbce1159a7e5b87ef0caf4b21e0810b6c941633182da12b72675d86ec0f9f2b844d91258439305c059f6f03ed09d45f7758426c6c096f SHA512 56726d5c0aa8d576e3dc200d30a370be08fec178f357381f00ca08883ab1ccf56fbfaa53ec9322a5f4eb5383e0572f25d8cd277848bc0c3a3d12e57722860a2b
 EBUILD tempest-31.0.0.ebuild 2135 BLAKE2B d0c801530e7f5c9e19e607bcb7c2ac31ed6f5a322b8b294b641eb8494445fba7a3bf02632c2ea52ae521022a5e87108854eaf5af3fe3c4513a3f7f12aba56330 SHA512 8b02dcbf09d3e7025c50672a25f708fce68056a130262dfc363c1de74262d8fe064b5516a461a617b86e43f12c3d50527aa8de91f8bf5944bdd111a8db75f443
-EBUILD tempest-31.1.0.ebuild 2138 BLAKE2B c1c17ef2a0cce940b9befaafe8815d4707788a309b6aae90092adb35b7a0421d0b6a9aa886f217f64b097e617411901b49be719d81eaacd8a798dcf60072532f SHA512 9c321710e01ad2ab2181d023820838bc7ecceba6f9e4478d1d582a17e8f830069fb25a560884b52484886a1ae157089f56afe974a09a14514453d81e75d146ad
+EBUILD tempest-31.1.0.ebuild 2135 BLAKE2B aed4a3c33e8c909f1b40b8d9bb5b13cd38b038b340f0d156ceb6692238f6dfa04d7f2cb69d01728e590c9a16b9312f521ae1be418a9a9d4c846d7216ac77ae17 SHA512 62d4381d73e3d8bffa6e89cf8459553424e4059a09f897f34584d9c517a950531a2869aa1af0a3029fd4f5e17bcd4f01014f259d000397ecaba57de018064070
 MISC metadata.xml 503 BLAKE2B c048e018345a8d306f22fb944e8f04db6fa8ab0e9e7099b19e0fd24ad69632d9dd1dfed9620c092f2f740e80e06556617b59cfdd0121101fa030dd6415aafa34 SHA512 39986e26bad2304333d43fd0ed1b12db5d9c56059d30ceb3868b6967f6655f50edaa232a86059da3434a4e219847c8f74e98972cecfa074a8bd28b76b3e3ccbb
diff --git a/dev-python/tempest/tempest-31.1.0.ebuild b/dev-python/tempest/tempest-31.1.0.ebuild
index e5d757d4c5b8..003830d1993e 100644
--- a/dev-python/tempest/tempest-31.1.0.ebuild
+++ b/dev-python/tempest/tempest-31.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
index 85fb0ccdbdac..0e379d954c8d 100644
--- a/dev-python/textdistance/Manifest
+++ b/dev-python/textdistance/Manifest
@@ -1,5 +1,5 @@
 DIST textdistance-4.2.2.tar.gz 45089 BLAKE2B 8b08db743a56c289cc10a9ceb606612acb2a13d12cd12f9627870a4748c415804bde7c3f1aee54d59a49053731727827dbbd5f4ed6c2cfcc302166575ba382ca SHA512 f181686153e6e8f1541a15ac752e6a86698445713732858e63b6465c96dfeb582d2ea6cad1f7c526a3dc60796d58064355480bc6ced7dc69268a5c0abbfabdb7
 DIST textdistance-4.3.0.gh.tar.gz 45535 BLAKE2B e43ae62b0b7656a6c4f879b1d8e0c34ae6c83705d324aa99bb7ff6e2d0166faf1fed3ee7bc06602388c16c742a1983a4eaee143b09a7c371b9e941d53edca2b5 SHA512 30d68048b1f0b79e584f5f07731e03193af64cb2de3f52882c17154cc027f4ff8d590b994941bd5d62642d4da334ef0739d4bb65b6b12f039a1ee9aef154cde4
 EBUILD textdistance-4.2.2.ebuild 820 BLAKE2B 666b87245e2d9ff6b5a074d4e4a615024ef928e1b8551ec1c02e6474991d710be1ba9081bbbe0c5fde3bf2c0bbb7cdb46995c485c18dc3ed81e07b5e655a8ebf SHA512 4c64c8b0acb9295218411d1448767fa48e8ae51cf6155da7443535cc2a367d71fb3acf9e55f4e0d6aa8ff2f86d6ce6bf8087e0f4c5b8946b274ccec7c5e5f015
-EBUILD textdistance-4.3.0.ebuild 825 BLAKE2B 05fc786b647ce8d4a964807a9ebd775e5a618caa1ba3f66055198bc0283d96352b1601780b5e4e82fbb8fc0d3f60c9e7ce24f32ab4c8a0b14792d29db49b895d SHA512 3e41fdc02ec6a32b74bd699e5c8360b28e4b7d82059ab8e44ea3f1aab37ee76850af10d9b4c7980bb1e13236180a49f2093262f0e9e345757aac4aed986264cf
+EBUILD textdistance-4.3.0.ebuild 823 BLAKE2B ca9eb7697c93acb7b5776287b90ca426976b9573cc6d0fa0818a825dc95890137134d2330daee415a0993b8b46396e4bcc5f39f44ee484100fa3f200c98f4889 SHA512 59c71638a315ba2760da220f3a19a4f11179d5f9ad95ff93ebed6a4493b768cdb94b1d95746bea7108d41649f68f5e1f3e8ec5a20aed934273d31bcf4633b679
 MISC metadata.xml 517 BLAKE2B a429684151f5700f148c5350b16026e797fdedc80b950d3c79c050a4d7418763918a05936eaeeed07b9756d9ec39602128570cd8c27049234bbda27e006ff00f SHA512 be445c2c21f5fd0bee241f8f76094b51c2fcbd7fe0d2175f7455beb881c3b83e8070c8a14817695d2b7a7dfabcdb856e12d7749aadc91ca31f7af8187e9a409e
diff --git a/dev-python/textdistance/textdistance-4.3.0.ebuild b/dev-python/textdistance/textdistance-4.3.0.ebuild
index abcea1dd1ff6..b7752b1c5c8d 100644
--- a/dev-python/textdistance/textdistance-4.3.0.ebuild
+++ b/dev-python/textdistance/textdistance-4.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 47968612a880..19c80a347a50 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -3,5 +3,5 @@ DIST translate-3.7.1.gh.tar.gz 1152674 BLAKE2B c4a7d8cb1eec656a261a1af145a1171e9
 DIST translate-3.7.2.gh.tar.gz 1153306 BLAKE2B 986c531004cb0ee0a58a940043377ee047e13b0f32c6fda5ab80cc7fca96d18b45f2cd3e112d47f177cd06a7e99580777c6591df969a8237bcb9fe7a52b1d4fd SHA512 28d774ff670c92dedee5d98d7d33f21d32ed4b7afd6a8281fcf7abb39470e11a6c0d9c121576aa2be10edf18929c74b2cfc36b70984d66d432cfa5e337b9556c
 EBUILD translate-toolkit-3.7.0.ebuild 2418 BLAKE2B 156d03ffb8e361ee3a3808080deeabc17bafc37992d043cc5ed79d70dff97348beb24dc6b7bbefadd212e48e262ece204603a116a306e53e27c5b6f3b720c353 SHA512 0b15869bb2752e241d92f38dc05708440e118c26b956e9ecf5996be6db90f9d78c40abafd00485dd5b387fa1d143f9e728ee5e9ee5b4d7683a91eb398977b5df
 EBUILD translate-toolkit-3.7.1.ebuild 2421 BLAKE2B b5c818ed8fdef983bf87d3103c58e4bb6bbb12a555213d40c40feef74402588db68fdf14caa958aea3f0a8d64ba39af06c46239afd61652c17f409f74a2a2fe2 SHA512 ab76f4b06f9b1e73b2cd83e85e5d82b50b5427327b999735abcd8537d15a2ddf30a43b626d345731e5fb038334acbf69c84c60f3991c2674a91ec23250cd8350
-EBUILD translate-toolkit-3.7.2.ebuild 2423 BLAKE2B 567256ee0892925d8f4322e2908ba123b7a05e15d3fa8cb0e43412b053773066dfc9db5a81cd3b7c524632920ccd63044f7135d6c5078a34b11f60d637223cf7 SHA512 8094446117598ae75d365c87f7cde4935033cc01ec55698d381be58ba1cbb294e0e2858a99de41a1867fe8bb4c567d6da4029d978759713d04004e4df638008d
+EBUILD translate-toolkit-3.7.2.ebuild 2420 BLAKE2B 55272a0cf5f90152cdac723e3523cc4e06d9130c0b652f7e43655bcec6d92e4a12463544d0a613086713c41ec75a7c2f53924120794daf8d81ad98fe2a70368a SHA512 d0441e2c77159d6b0f75be7b2fc9c96920422e142b7cee1c494ae2dc3cbaf44956912d797731ad0267b1dfb6b05a8af1df72db285b8129e4d8228b979fa2df88
 MISC metadata.xml 756 BLAKE2B 06f64f258d362954f99f7e9eee241eb3dddc6b00b9069df2ad977d28b5cf06f9c8ee2246ee5958600b5ac86297968d7aaced6b6420dca4ed507c441c58c61ca9 SHA512 80374c40513ca450f97e3930929c1450e7438ea15830e60937952a6fccfd999675f2ca2056c5aa4e287ba256c6ec08a09d8f7adb8b2c5af8ca0cd595f34acd85
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.7.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.7.2.ebuild
index 7c5cbdaf61ca..7022e482cf3f 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.7.2.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.7.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 RDEPEND="
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 1e12f2875eb9..abe74a808092 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -3,5 +3,5 @@ AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ff
 AUX wxpython-4.0.7-ultimatelistctrl.patch 4121 BLAKE2B 0fdf74a0131c9d5c49dd867c3867ac212d26f4d877dc4f4e48680d90956c1027bbc776d19edd235d8f1e4b619d616c4ca1ab28b45a3b2dc79aa97a59c48adb2f SHA512 9d766d9724613e269215db81ecaad7d836b65c4d17f8b522bd688881bce1176241965d05539886da42755f0c7be65ef55c4ce340c21fddd512abb6577ece5482
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
 EBUILD wxpython-4.0.7-r1.ebuild 2311 BLAKE2B 563169aac0ee52d5270eaaceb298d19aca4c6ba00afd96a7a43a9474f21733aabfc91a4ce64c7d52f0ee57fa26b64b77cf2a8d556f08d2b226db9cd8191b11e8 SHA512 dc2659b721faa6f3c9d36cc05659eb6350efa9e7fd6c633be6c67487cca2cc93ab49bdf7a8f43a994d6873ae82a9c773c4f0d9724240a26e405403488977c8a4
-EBUILD wxpython-4.0.7-r2.ebuild 2368 BLAKE2B 0b0152c56e3273cab07e96d1dcd7f167278d7e67352aff6fdf5522d012aac5ded9bec3e046dbdc2cee34acb6dd9a601fe17c5da82998d6ebde7f1187b50280e0 SHA512 1d93f8c1acac4dc237f457f38f53101a1d267a229ecdefc91497c0eba840c5f569ba9f4c90e8fce820ec17ad837e166335d45cfa8ab35e03a2baeba1d151e676
+EBUILD wxpython-4.0.7-r2.ebuild 2367 BLAKE2B b2379425908a8e7780b900a3f55f22499b153c57baec9f67e4f026234b8b3d8e2bdf70818543b42af58d809d9d27527cc449021994ff561ffa25179f3be8369b SHA512 9eee4fa38f69b5f5d304eb8116c6a80502b4223bf7f8e39fa76d4841605a9db0863aa3e6216be6ab0532b276f63486f31af87fe72d0d7127012c207be88b7ac9
 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa
diff --git a/dev-python/wxpython/wxpython-4.0.7-r2.ebuild b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
index 04ef05084fb8..204a26505f22 100644
--- a/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 RESTRICT="test"
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 770b438fa205..ace78f07f85b 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest
new file mode 100644
index 000000000000..2fdc26f5b543
--- /dev/null
+++ b/dev-qt/qt5compat/Manifest
@@ -0,0 +1,3 @@
+DIST qt5compat-everywhere-src-6.3.1.tar.xz 8195804 BLAKE2B 782da113f35ecd231ed408337fef8e6c688c5a1dc1b2533490d7bc751fa9d2404d45e16a47017d8ae6d7b8e7f077b33e94e82cfcd35bd4c81690422a36e29e73 SHA512 66196a8d29a2789179904638fcd9ec162d5715e7dc28618b3ef78d07682a05578b6c2e7023144c628b94321a9c1332d39826c13adb1e5db5121406c530c9c35c
+EBUILD qt5compat-6.3.1.ebuild 353 BLAKE2B 24febf04b6210fa2890b6791196f7f8494e4ffeedb5b643371608241703f3656c0d2d202eff1fec8f72a3cebf59a8a19a985d7fcc534387a4a3975df76e4d7ee SHA512 56a7bab643f26a3c08c887412f9386410aef306f9060638459e8d51d30b498c4680ff076582ee948f9c9bae79d1d220e0e7f33aa20000a289e688f6d0dd5c81b
+MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qt5compat/metadata.xml b/dev-qt/qt5compat/metadata.xml
new file mode 100644
index 000000000000..ae8aa9597f20
--- /dev/null
+++ b/dev-qt/qt5compat/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qt5compat/qt5compat-6.3.1.ebuild b/dev-qt/qt5compat/qt5compat-6.3.1.ebuild
new file mode 100644
index 000000000000..2bf0684e946d
--- /dev/null
+++ b/dev-qt/qt5compat/qt5compat-6.3.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[gui,network]
+	=dev-qt/qtdeclarative-${PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
new file mode 100644
index 000000000000..83d49d745874
--- /dev/null
+++ b/dev-qt/qtbase/Manifest
@@ -0,0 +1,3 @@
+DIST qtbase-everywhere-src-6.3.1.tar.xz 47118260 BLAKE2B b8b819330011033275d9532219bf09cce3ef1e7d8e50945b1cdeceddf3742c1ee4a1bba9d4340f1f6b48fd59659920c3652abf21bbd8b4bbed0c635a3caafb0c SHA512 5c4304dc1f5fa80201b61c9c8dbf4c3449506a243ea1f87e336dc3641a37b9d40c2aa4a93190cc69ddde0f349c74e327c35de5f46de888ddfd49616903e8a7b5
+EBUILD qtbase-6.3.1.ebuild 4834 BLAKE2B 074241a6f61567daa85cd211f56e4839f34b67734bf6b90d030326eb3a324f688914e14165c30c8eeb8e6495fcd464da1281be980df1062a441cf57fd19ad8d6 SHA512 56db8e0c0a94aa1e8d6ab38a7535930f042ff5d882ffd20080418f25447e1744bd53e5713cd571f4fd953782ba18afdb13f5b0417103519d4b655939763fd158
+MISC metadata.xml 1817 BLAKE2B 8f5b89970837847b5a81326445309f706316943d65ab909c0f0407e95dd5770d9d02a16ad1380a8b1eaee3d251bdc79fba4fee49be688f6db84c1c598de959e0 SHA512 1e650288d6f9e53560163e911ac9f80017e35eaed6b77031f66996e7f7bc3811735e5d9fccd6cddead4c5aaa88ccc032277bb4db45df227ca3a34a643d41c918
diff --git a/dev-qt/qtbase/metadata.xml b/dev-qt/qtbase/metadata.xml
new file mode 100644
index 000000000000..ba54edfe722e
--- /dev/null
+++ b/dev-qt/qtbase/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="brotli">Enable support for Brotli decompression</flag>
+		<flag name="concurrent">Build Qt6Concurrent module</flag>
+		<flag name="dbus">Build Qt6DBus module</flag>
+		<flag name="egl">Enable EGL integration</flag>
+		<flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag>
+		<flag name="evdev">Enable support for input devices via evdev</flag>
+		<flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag>
+		<flag name="gtk">Build the GTK platform theme plugin</flag>
+		<flag name="gui">Build Qt6Gui module</flag>
+		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
+		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic HTTP/SOCKS proxy configuration</flag>
+		<flag name="network">Build Qt6Network module</flag>
+		<flag name="sql">Build Qt6Sql module</flag>
+		<flag name="systemd">Enable native journald logging support</flag>
+		<flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>
+		<flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
+		<flag name="vulkan">Enable support for Vulkan</flag>
+		<flag name="widgets">Build Qt6Widgets module</flag>
+		<flag name="X">Build the XCB platform plugin and enable X11 integration</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtbase/qtbase-6.3.1.ebuild b/dev-qt/qtbase/qtbase-6.3.1.ebuild
new file mode 100644
index 000000000000..36931e0ea933
--- /dev/null
+++ b/dev-qt/qtbase/qtbase-6.3.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+# Qt Modules
+# TODO: Restore/patch xml flag support (seems fixed in 6.9999).
+IUSE="+concurrent +dbus +gui +network +sql opengl +widgets zstd"
+REQUIRED_USE="
+	opengl? ( gui )
+	widgets? ( gui )
+	X? ( || ( evdev libinput ) )
+"
+
+QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X"
+QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc"
+QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite"
+IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev"
+# QtPrintSupport = QtGui + QtWidgets enabled.
+# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X
+REQUIRED_USE+="
+	$(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/})
+	$(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/})
+	$(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/})
+	accessibility? ( dbus X )
+	cups? ( gui widgets )
+	eglfs? ( egl )
+	gtk? ( widgets )
+	gui? ( || ( eglfs X ) || ( libinput X ) )
+	libinput? ( udev )
+	sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) )
+	vnc? ( gui )
+	X? ( gles2-only? ( egl ) )
+"
+
+# TODO:
+# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c
+# qtnetwork: connman, networkmanager
+DEPEND="
+	app-crypt/libb2
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2:=[pcre16,unicode]
+	dev-util/gtk-update-icon-cache
+	media-libs/fontconfig
+	>=media-libs/freetype-2.6.1:2
+	>=media-libs/harfbuzz-1.6.0:=
+	media-libs/tiff:0
+	>=sys-apps/dbus-1.4.20
+	sys-libs/zlib:=
+	brotli? ( app-arch/brotli:= )
+	evdev? ( sys-libs/mtdev )
+	freetds? ( dev-db/freetds )
+	gles2-only? ( media-libs/libglvnd )
+	!gles2-only? ( media-libs/libglvnd[X] )
+	gssapi? ( virtual/krb5 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	gui? ( media-libs/libpng:0= )
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	libinput? (
+		dev-libs/libinput:=
+		>=x11-libs/libxkbcommon-0.5.0
+	)
+	libproxy? ( net-libs/libproxy )
+	mysql? ( dev-db/mysql-connector-c:= )
+	oci8? ( dev-db/oracle-instantclient:=[sdk] )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:* )
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd:= )
+	tslib? ( >=x11-libs/tslib-1.21 )
+	udev? ( virtual/libudev:= )
+	vulkan? ( dev-util/vulkan-headers )
+	X? (
+		x11-libs/libdrm
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libxcb-1.12:=[xkb]
+		>=x11-libs/libxkbcommon-0.5.0[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_BINDIR=${QT6_BINDIR}
+		-DINSTALL_INCLUDEDIR=${QT6_HEADERDIR}
+		-DINSTALL_LIBDIR=${QT6_LIBDIR}
+		-DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR}
+		-DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR}
+		-DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR}
+		-DINSTALL_QMLDIR=${QT6_QMLDIR}
+		-DINSTALL_DATADIR=${QT6_DATADIR}
+		-DINSTALL_DOCDIR=${QT6_DOCDIR}
+		-DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR}
+		-DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR}
+		-DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs
+		-DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR}
+		-DQT_FEATURE_androiddeployqt=OFF
+		$(qt_feature concurrent)
+		$(qt_feature dbus)
+		$(qt_feature gui)
+		$(qt_feature gui testlib)
+		$(qt_feature icu)
+		$(qt_feature network)
+		$(qt_feature sql)
+		$(qt_feature systemd journald)
+		$(qt_feature udev libudev)
+		$(qt_feature zstd)
+	)
+	use gui && mycmakeargs+=(
+		$(qt_feature accessibility accessibility_atspi_bridge)
+		$(qt_feature egl)
+		$(qt_feature eglfs eglfs_egldevice)
+		$(qt_feature eglfs eglfs_gbm)
+		$(qt_feature evdev)
+		$(qt_feature evdev mtdev)
+		-DQT_FEATURE_gif=ON
+		$(qt_feature jpeg)
+		$(qt_feature opengl)
+		$(qt_feature gles2-only opengles2)
+		$(qt_feature libinput)
+		$(qt_feature tslib)
+		$(qt_feature tuio tuiotouch)
+		$(qt_feature vulkan)
+		$(qt_feature widgets)
+		$(qt_feature X xcb)
+		$(qt_feature X xcb_xlib)
+	)
+	use widgets && mycmakeargs+=(
+		$(qt_feature cups)
+		$(qt_feature gtk gtk3)
+	)
+	if use libinput || use X; then
+		mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON )
+	fi
+	use network && mycmakeargs+=(
+		$(qt_feature brotli)
+		$(qt_feature gssapi)
+		$(qt_feature libproxy)
+		$(qt_feature sctp)
+		$(qt_feature ssl openssl)
+		$(qt_feature vnc)
+	)
+	use sql && mycmakeargs+=(
+		$(qt_feature freetds sql_tds)
+		$(qt_feature mysql sql_mysql)
+		$(qt_feature oci8 sql_oci)
+		$(qt_feature odbc sql_odbc)
+		$(qt_feature postgres sql_psql)
+		$(qt_feature sqlite sql_sqlite)
+		$(qt_feature sqlite system_sqlite)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 71fdd591d506..f0052c4e84c0 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,5 +1,7 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
 DIST qtdeclarative-5.15.5-gentoo-kde-1.tar.xz 21772 BLAKE2B 83a19f79355102da7c3bb705a85fd6d9cfe7b0906a60664c56ca43e47ede33dffc0655ea71c79aeb60048e8c7810ae4279a6a0f491ff8a687743fe715a7ee033 SHA512 6a8e979f3673373bfae29d30b909f8d4034e64206ef5b09e34e2168421ad8c0d58972d1fe446ee61d8dcb2e27dafce455885749d8f4df45abdaeb5ed66358a3c
 DIST qtdeclarative-everywhere-opensource-src-5.15.5.tar.xz 21581628 BLAKE2B 4cd378a0e55269c9b22349c161f81653e43326e2e78ed7880f776aa787a934412bc83196fefdbc09250db283aff883668eb29fab326bdee4a5a966e57028b538 SHA512 b4b2754ae3566bbfa3e0162738ae6ea3b36d506841ce7e4b5651d0b0ca1c341ab19f653aebc23d13a17840d391280137c463c29fcf4866fc1f1c3adf8ebb5e5b
+DIST qtdeclarative-everywhere-src-6.3.1.tar.xz 30098680 BLAKE2B eaae3753e993c7e199f2135878790fd68febd7665b0f3232ff51953a51a2ffb15d85aca9e457666b088dee4a622c46f08981e3a94a3bdcaee8392d469dc28ed5 SHA512 547b29dcf26f734b32283677b9e02a43a75f3ab4849e578592031fa37babc09e5b1795e719119ba6b9400ef59b16fd387fb97aa3603454775be4a27e19ff065c
 EBUILD qtdeclarative-5.15.5.ebuild 1549 BLAKE2B 27a4c3fd9059ca5964351063adbd6804461652ee824be3c9219c4f4212df0c96ec05f24479628b650c7255743421f713c6791df303df180da875c53fcd30a92e SHA512 3a44bb5546fc9674ad55bc80f422ad2a30393960996610cf6004ac217efbd732f74a4c7f3344f6d40730428f9c7aea235a28939d714e74db744442186240cb27
-MISC metadata.xml 701 BLAKE2B f28878770fe3d7abe7d61ef71306a00ea53f3428c4002a76b484f8d99924567a640f8d091e33485bc46b9644ab1dbf34a19a3329e53040419c402ea70a6f33d2 SHA512 31d0a0f10002da589a2130c16548b36a67bc763aee5b3dbcf6b4ef815a2f0a64ee40b185867adbbc910ae99c2916e83104a91a90e0dba0e0a219e20c24674eb9
+EBUILD qtdeclarative-6.3.1.ebuild 521 BLAKE2B 17d493bcf062e1d208438aaa85ad814af01546be1476569a9620f7d29270e94d3d8d253d38fb50781b45e83cd4a137262e860eac4a5452c8492f54f7dc8e5dd3 SHA512 bd7b10e8ac12a2deaf5751edb2a7e39ac2530aab69191dd3a1e0c7a35e6038e7f8a96ac7cc1f22fa8377cc1c2de14148f1ec9f767823832fbca59ea7c98d61d5
+MISC metadata.xml 799 BLAKE2B d83b1968260ec3b1de9c62454382de42f214c985171c04f98377cd7e1c3a167b5a7707b328d0ffd700e525e7bfa82780907d7358df350a0a9922f36cac940d17 SHA512 b798e3e434f485c82fb058939e864a98dd86b5c2d5df902de256e461d37371291bf0159f31ff474be36d129effb0556e27eb5a5e95ab850fd987fa30f8caecf1
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index 050837f31bcb..aa22d78afb51 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -7,7 +7,9 @@
 	</maintainer>
 	<use>
 		<flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag>
+		<flag name="opengl">Enable OpenGL support</flag>
 		<flag name="vulkan">Enable support for Vulkan</flag>
+		<flag name="sql">Enable QtSQL support</flag>
 		<flag name="widgets">Enable QtWidgets support</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild
new file mode 100644
index 000000000000..e8ac7eddceb2
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.3.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt Declarative (Quick 2)"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="opengl +sql +widgets"
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[network,opengl=,sql=,widgets=]
+	=dev-qt/qtshadertools-${PV}*
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(qt_feature opengl)
+		$(qt_feature sql)
+		$(qt_feature widgets)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 17500613a1c0..0c6fd61c0581 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,7 @@
 AUX qtmultimedia-5.15.2-no-qtopengl.patch 445 BLAKE2B 9224c90ef5a57b0da8c5ea5a51eb03d4702824fbb435101d5d9d559bdc4d30ece2de7457ed1bb80ca7f028a0b1a5abfa7436501d5d30c87680fb46707de17f53 SHA512 2f3dbb4dcbcedd01e3d911cf1f665e78dc08b383a5c8f2e17f96072330242e7463e6e403159f90f60b799110371ca923f502619548d5db3fd264af4298e4b587
 DIST qtmultimedia-5.15.5-gentoo-kde-1.tar.xz 1324 BLAKE2B d29d8102e6fd55f2c2f6037e292a3c4039c7532fb63c34cc19fbedc8cf3f8082c6d75debd1617a5d29fcdf5b8c7a7fef35f103c9179f980986b646dae9ff867b SHA512 7b37f0db1de002f2cbaad6852edcf772dd0220f81d9dd836b3c1266df7eb49ec40d3eba6d3ccaf68f621c8e93b2812e2d882291fb2f07d0b80e4c9975a408cdc
 DIST qtmultimedia-everywhere-opensource-src-5.15.5.tar.xz 3832656 BLAKE2B 6098fe14344ed03dbfcbb2db429c431a47282bbbb89602742be2fe44ef063ceb98322bb576eeb559a649b24f142cd5e21b652fed8c96814b8e3b8b0a66b51fe9 SHA512 f798ffe0a32bc9f16f584b7a322c321dc2ef62c18395987ffce1f7f6cac10722c6f1166c64a1fda9877f3970a8e7b3ef8b7d9763af4c59ff313adc6081a7acfb
+DIST qtmultimedia-everywhere-src-6.3.1.tar.xz 4737800 BLAKE2B 2481c5c7e8d3c7204977556a4ebb4e5ccc8e2534894be23a7198bb9992403567a74f7e3aebbf3bce612ff6cbb8609598f2ccd740d9ba4a2ab429e00da23cfb85 SHA512 c557a8577a28df1997a07643c125033d6ab0e1d64a2e67b659f51d11d29c5634e7ea1264ad31705889e138521b65b74761ac68399dd94637ced8c5d6d07e03c3
 EBUILD qtmultimedia-5.15.5-r1.ebuild 1581 BLAKE2B f82d2a27fe50b1bcf20d4554d0ac5974c1dde94b75199b0eb2c76a3e3de1fa2fbd51135e62676a49409b899f2f0496842248116d2d5089ff1cfc52ddb8cf9435 SHA512 2e7e66a055d6857b639afad1de0e14827a2f6abe9279acdce4d7c94b9e4943d00c5a29e5bf8e69d08689f7f58c9ce27112ab8fcb6fb57682961c2d684b94709f
+EBUILD qtmultimedia-6.3.1.ebuild 772 BLAKE2B b7b5c93328dfc5b019eabfabd2f70fdb8e23b481903a49f9d018ba4a1ee371260fa516b842e41321b1c67e27d31f7bb447abccf53b0b2ee77af947c390c0fb2c SHA512 4a7a64a3cad73ec1373605b7effb34c39eb91f8f7e722d37b63c0f7c77745eb1ab4e5cae0fdb471cbfc3c70e57331f76a17cb8bb727c35a862f9323004d9b55b
 MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.3.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.3.1.ebuild
new file mode 100644
index 000000000000..508673acc814
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt Multimedia"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="gstreamer"
+
+RDEPEND="
+	=dev-qt/qtbase-${PV}*[gui,network,widgets]
+	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtshadertools-${PV}*
+	=dev-qt/qtsvg-${PV}*
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/libglvnd
+	)
+"
+DEPEND="${RDEPEND}
+	gstreamer? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	# TODO: linux_v4l automagic
+	local mycmakeargs=(
+		-DQT_FEATURE_alsa=off
+		-DQT_FEATURE_pulseaudio=off
+		$(qt_feature gstreamer)
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 29433f90ce7f..5d1ead5ef10c 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,3 +1,5 @@
 DIST qtlocation-everywhere-opensource-src-5.15.5.tar.xz 6559912 BLAKE2B 4f546293b2cfddf5512f3648aef9c527762d6c6ddbaca6583cf0287178524bae9f84e4b94950ce1139042efa995a4f31ef20f26b8d5479048df2ba75cac35d23 SHA512 5090f68926a7bc2f25ea5ae259cb87653b83fcf337c3255a7a2700724f6ac83ec2e1d9b6f38f185ab7dab84e5e042b72c58f4e4cacada6fb7d729378b93d9b3e
+DIST qtpositioning-everywhere-src-6.3.1.tar.xz 1493356 BLAKE2B e2dc4e3747e62d80492b9f563ba8836f8c28de9bb99e855ed453af939e074a80848cc3a0c4c8cc11999377ad7e141552fda5870b60c02b4033d84a6375750805 SHA512 32cea980147487e5ea6dbd25347b3b37f74fd9d8180d7b463f784eb3877361862e38bfa310e36d83dd9c9eed91b4415812ec9ee7329c96818a32d99a17f76e5f
 EBUILD qtpositioning-5.15.5.ebuild 870 BLAKE2B 999d8763bcb4e6f76a7620214c7038fab89e3023baa5d887604ca93b9677e273707c85e9d07be45722e6c08e074d9c357684324200c273d5a4f270707c5b7edd SHA512 05333d0b413afdf112f2dec4a624cb04c9726fedf8c94bd35c4412185fee98c106f9f3de7d9f0e4ad0b740392972d64d76dd813c068ea45adf5513126d3ce0bc
+EBUILD qtpositioning-6.3.1.ebuild 407 BLAKE2B fbda79a88b7903862e1c556c3b4bd0b7515e10f3eedb4e6325c777e53c3639b19f90b3736fb90f7ad9b3f7b9691709d3e927365b4740a74d0f2a5c34d921d4e9 SHA512 1437f9a95a0f344b4da1ffba30a517a6d25302b5c13fdf1e7de5a3e4457cf794af21a294834dd7a0a4e8f076363c3adb3ede94ccf973783a519ab7f300bcce2b
 MISC metadata.xml 639 BLAKE2B e49b21d1ca752b501e8fd6421e3166f490fd5b304ad04edae73db2634189b63bc3ee321d358ce2ca1b412ec0c1c608327aefc92658b27f28f5ff15b2e41fe31b SHA512 275f24bb9566eace9bb35aea94925088131784b094835fbd4cdfbdc050ec9c411091fa73496de59d28a5d137986a0a6b4ad1cccf06db2e72fb86f31da6b1cc10
diff --git a/dev-qt/qtpositioning/qtpositioning-6.3.1.ebuild b/dev-qt/qtpositioning/qtpositioning-6.3.1.ebuild
new file mode 100644
index 000000000000..7be915ffecea
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-6.3.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Physical position determination library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[dbus,gui,widgets]
+	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtserialport-${PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest
new file mode 100644
index 000000000000..f524db184454
--- /dev/null
+++ b/dev-qt/qtquick3d/Manifest
@@ -0,0 +1,3 @@
+DIST qtquick3d-everywhere-src-6.3.1.tar.xz 37289264 BLAKE2B 3d6a09f6d748c13485eae58ebe910d3371ae2d1bface3b1c9817280f5624e74f551a27f5f87e4f932f49949d5a14afc6547def0db8e99171f7b2b2715afdb001 SHA512 342a1c558a4eece6e9442e45cc400af58c96fb59614902e0299291ea2c5b1c406d76cd8ec8cf1d8ac0d8b5fc4f2f4637063d1747dcdc54f191a81310df93534e
+EBUILD qtquick3d-6.3.1.ebuild 667 BLAKE2B 14e51964aac99913632049d692fda19d4661f378bb98ca71a89856eb43d2a8c2905c90b0f90dbce409a9f150cbf031067213585edca800f1f23673e26e3b2716 SHA512 f14b630a1cea3f5ec788546e855fb96d83889a7e89a93b60bddf05d74fa893e00342e4c0c58d2ecf0399a63532e36ea82fbba5a4105593bd5f6222cafb2b047d
+MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtquick3d/metadata.xml b/dev-qt/qtquick3d/metadata.xml
new file mode 100644
index 000000000000..ae8aa9597f20
--- /dev/null
+++ b/dev-qt/qtquick3d/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtquick3d/qtquick3d-6.3.1.ebuild b/dev-qt/qtquick3d/qtquick3d-6.3.1.ebuild
new file mode 100644
index 000000000000..6eb36deec911
--- /dev/null
+++ b/dev-qt/qtquick3d/qtquick3d-6.3.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+elif [[ ${QT6_BUILD_TYPE} == live ]]; then
+	# Don't clone qtquick3d-assimp.
+	EGIT_SUBMODULES=()
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[concurrent,network,widgets]
+	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtshadertools-${PV}*
+	=dev-qt/qtquicktimeline-${PV}*
+	media-libs/assimp:=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_FEATURE_system_assimp=ON
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index b07c6e529dc1..28971c31507a 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1,3 +1,5 @@
 DIST qtquicktimeline-everywhere-opensource-src-5.15.5.tar.xz 104344 BLAKE2B e542add97b60963a91f7f4c9c8871ec095392a86b80a4ce9876eabf2040d7b03cd426a25ab03d109f822bbc8b557e04d03695bcd9598befe101cf3d0ddbdc635 SHA512 7fccb88fc371714ad4c1632e2919f6239cc240f8f5452796dac13e9ee6875b91e07a18ac039bdaf135d7cc44a5bc8d7adc6f48116910af73a2990b76f20e0742
+DIST qtquicktimeline-everywhere-src-6.3.1.tar.xz 113464 BLAKE2B 6838985b84360483fba7881f04f3126a99b5d586710a1062ecc919c2cbdd3ba2d4ecef209337620541ee5efd8503b21e3f8ce1250734b5caceab111349fa7d3e SHA512 ad55ed87942ac39c28587e15a5928ed458d5019501a689b7e51d105032d65122ef866a9d39af91c382def54d6e5246a38d16a0906f05fb8d1374e9eecefd2646
 EBUILD qtquicktimeline-5.15.5.ebuild 367 BLAKE2B 9277628f8ddc066de3a200293cc02dcaa1c58127af081ed739a55cde5d0e9284ce76132d9392bb14aef54cf6167c6645d5c0af9136bf30a17bd9061561ba165f SHA512 0c4c90b683682a5e0a775f13f598b479344c51f5ee034275abd11dc23b7b4571e7b2f2a387a65211b22b73aec7c3e1b089e9b23f422e16765539a5b3516c0fe4
+EBUILD qtquicktimeline-6.3.1.ebuild 349 BLAKE2B f70e5d683ac95ad1bf23b39a50e8457f571704ec65b20364b7d3224d50001d3203b889cf88b8ae9e6e05e4b45297560550fa1094243e1a92d6419ba421f728e3 SHA512 f2465a785aa935116843fa6adaea44dd54c4b3ef2ba6c2291cbc12f4ae8a33b77852bd81f3f8ae3f709a1d2cfe9e35295ccb8ff755e96bce84a3fb8fe968dc19
 MISC metadata.xml 383 BLAKE2B 8f734db19973b4ebfe57cf9417f7fbf6db00ca254cf2410e336c2f252aff7e85500d5fdb944e511a48bf08ebb3ee74e729073f567b9d7558efb19024f7c1e10e SHA512 c0c9a947c7ab5edce2487560d6d9c215966ba5804e370557f2d2a35d67bc6c1ac8a04afdaac8c733cc66be0977835826ecd817248b83c01f4230f8824fbc41a1
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.3.1.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.3.1.ebuild
new file mode 100644
index 000000000000..0673606b845e
--- /dev/null
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.3.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt module for keyframe-based timeline construction"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*
+	=dev-qt/qtdeclarative-${PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 8bd228d0202a..9c7f270e6e88 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,3 +1,5 @@
 DIST qtserialport-everywhere-opensource-src-5.15.5.tar.xz 323168 BLAKE2B 68a3ae2f513d73908c48e87493c5213429160d41e770f9883439ca5d7f58c7cafead1acaf9b1a845c3480d5db0747cf9a356e14ecc1c7b69276979b618864aaf SHA512 479bc5a4bddc4cb7659d2768b51947847f3c413102554fe3883e1decc42e6c9d0ad693627f607bd8cec43fd014e495fa9812934dd1b8ce1cf3f3ad46b5f6c774
+DIST qtserialport-everywhere-src-6.3.1.tar.xz 319404 BLAKE2B e55617d72c1612c68889310a5b8f9b856c67a3974ad0eba78d9c67a4242c2fcfe81b8e4d183719b0def4f88d64c4d7a910f1ff8fbc2bf2ebca69cc413d72007a SHA512 c774353fe019f9745ab8b6ffbb61f15a08a74368b3b8e7f6e16ab60c43ad9003690c013381515e4895288c3f5c22b956506795a153670e3b0c92c200a5283a9e
 EBUILD qtserialport-5.15.5.ebuild 558 BLAKE2B d92e70df53f6ead0ed247b8461bbf57ca2c83a0e9ef18feaf8052ce9ae23499432fc0c0491b316a53cfa2af41d6e784e9207b582ece8b415d3c4ac5aa99904a1 SHA512 d38f4ded5ed4a9d73b59ee7f8ef134d29d943a744b570ea794807b96b0debf3b2bceb10c80181f4ed6790d6c78323c6928129daf8fc22f5990eb54b2a937354c
+EBUILD qtserialport-6.3.1.ebuild 354 BLAKE2B 9c1001bc6a2db28b5610d642b0ec09501dc40db0d5858cf321b8eac1f825ffcebe3a48d04f3324d0216f2d56a97c06f7832cb570d82bfe1c5846a896f1f4e2f7 SHA512 47be4c3c4cab44e3df6e6d9ff6d0bf83f03861a01e1e2baf1718f3a6ce5f1e119c779dc7579330dc14eee417c12077fcc28f91a1881101170fe7742061764e96
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtserialport/qtserialport-6.3.1.ebuild b/dev-qt/qtserialport/qtserialport-6.3.1.ebuild
new file mode 100644
index 000000000000..218a7f2dd3c2
--- /dev/null
+++ b/dev-qt/qtserialport/qtserialport-6.3.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Serial port abstraction library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[gui,widgets]
+	virtual/libudev:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest
new file mode 100644
index 000000000000..84edc149db77
--- /dev/null
+++ b/dev-qt/qtshadertools/Manifest
@@ -0,0 +1,3 @@
+DIST qtshadertools-everywhere-src-6.3.1.tar.xz 998200 BLAKE2B 8975ddf4cc453f26d4e16be1befb43ee9e1535f12ba2559b9fcc7f5ca60d179228585c89e1d9edc276ec8868418c21bd3761a0527f19c51be9a415d931d9fd37 SHA512 c9f62139e4407b7bfbec78c231d00fd627be5396056a68c054e6b6ecada8af846198aadcbe2af56bb2c525f2851ecd492195a432e4e084f1db346d2e3722747e
+EBUILD qtshadertools-6.3.1.ebuild 314 BLAKE2B 60629b8f57bb75ada0f718c3095952a87e07d926f349d5ba3ece6786474f46ad5ac9e27d1680263f3283e9f5792d0fb85af8543654f500166156685eca2690a7 SHA512 8f6c194b29c584d69b5f9085db9ca492fc6957fd57e5ace17c929f67898e8dead723dd1ef29b85ee7490fcb2366501f10dbf52d95d01b2806e365709307b5251
+MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtshadertools/metadata.xml b/dev-qt/qtshadertools/metadata.xml
new file mode 100644
index 000000000000..ae8aa9597f20
--- /dev/null
+++ b/dev-qt/qtshadertools/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtshadertools/qtshadertools-6.3.1.ebuild b/dev-qt/qtshadertools/qtshadertools-6.3.1.ebuild
new file mode 100644
index 000000000000..755d9ae0bbbb
--- /dev/null
+++ b/dev-qt/qtshadertools/qtshadertools-6.3.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[gui]
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 5cf19905e983..69d332104d12 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,6 +1,8 @@
 DIST qtsvg-5.15.5-gentoo-kde-1.tar.xz 6796 BLAKE2B 03e80a083fef2b595d11e53cdf638082dd0a3da60a0c275d188bdf3967c0c7ceaf715e01917cd178d08714aa83827f1820c1c030253359b2018894ee805c2ff1 SHA512 31b7c804aa907aacad00debf318dd04700f16b437428ad9f5a1743dc1de3dc998b134a756395db6b439bee345d38569623a9baf1bb9f429ef068ffd7e1da593a
 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 514 BLAKE2B 72107f9a7eaa338fa26de2c2c0b484b8d48c8d3002b09f41706a42769881c2c46dcf7c1c9000313ea87fe3d756b512e62b927266bb6de8ab0102a0255ea690aa SHA512 31e0808446ee51560245994f680e4c87b9b2c4b0285490fa34995d980124120278cdac8dbdfbd19cf7a14be4a19c483437ae798ccee11f147b565b89ecd23403
 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-6.3.1.ebuild b/dev-qt/qtsvg/qtsvg-6.3.1.ebuild
new file mode 100644
index 000000000000..037c2eb09b80
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-6.3.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="SVG rendering library for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[gui,widgets]
+	sys-libs/zlib:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
new file mode 100644
index 000000000000..c8515117d825
--- /dev/null
+++ b/dev-qt/qttools/Manifest
@@ -0,0 +1,3 @@
+DIST qttools-everywhere-src-6.3.1.tar.xz 8628880 BLAKE2B e8a142ad601490a4d3d2398d074b87a8a574f97676d218a20e9a5499b7a46de47e92098dd72f304f3464207bc8341fbc51508c52624af42476555b3198e2f334 SHA512 6e392ef2415b14119d0c4058efa78f1a66e91c01c8f48a2f1926df43f7f1cb8fcd94f84c91fc0188baa96e3055eede6f080ca4e9f150e263c3fdc5c864649883
+EBUILD qttools-6.3.1.ebuild 1234 BLAKE2B 2693a2600cfc2eb0fe0d58c1faf8d4084c38edde874a2305e29f6ede3358d80d12cc9cdc9bf6325b9e1f3f98686b60d3e3800867906fbf7e080fd17e54f51d33 SHA512 455bf9d086977b1b2fb791f9e1514d7fe2af67e22734a27788cc4553fb2575a2c3f4264ca1f7e7a8ebc731caab8fdd62ea0f777705a05935be24ae061ea8b050
+MISC metadata.xml 1094 BLAKE2B 0d4a81302d083669c9a2fe16e1bb7d11d2c421037eb90fa052a77db35b304f51d0d7c85d18c90527a7a546dcb0fbe72d318a26cacfc2c738967553f4e953f12f SHA512 02e76ec2ffca69115e904129f77aca35bbd9c33058636d969175c7c4e738eba61c5bceb2901ca6d3b8e6a6868f4de85b968dedd6513f2e938594574a2f4633ce
diff --git a/dev-qt/qttools/metadata.xml b/dev-qt/qttools/metadata.xml
new file mode 100644
index 000000000000..b86ca58bee58
--- /dev/null
+++ b/dev-qt/qttools/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="assistant">Build Qt Assistant</flag>
+		<flag name="designer">Build Qt Designer</flag>
+		<flag name="distancefieldgenerator">Build Qt Distance Field Generator</flag>
+		<flag name="linguist">Build Qt Linguist</flag>
+		<flag name="pixeltool">Build Qt Pixeltool</flag>
+		<flag name="qdbus">Build the Qt D-Bus Interface and D-Bus Viewer</flag>
+		<flag name="qdoc">Build Qt Documentation Generator</flag>
+		<flag name="qtattributionsscanner">Build Qt Source Code Attribution Scanner</flag>
+		<flag name="qtdiag">Build Qt Diag</flag>
+		<flag name="qtplugininfo">Build Qt Plugin Info</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qttools/qttools-6.3.1.ebuild b/dev-qt/qttools/qttools-6.3.1.ebuild
new file mode 100644
index 000000000000..23e1c0874fce
--- /dev/null
+++ b/dev-qt/qttools/qttools-6.3.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt Tools Collection"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="
+	assistant designer distancefieldgenerator linguist pixeltool
+	qdbus qdoc qtattributionsscanner qtdiag qtplugininfo
+"
+REQUIRED_USE="linguist? ( designer )"
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[network]
+	assistant? ( =dev-qt/qtbase-${PV}*[sql,widgets] )
+	designer? ( =dev-qt/qtbase-${PV}*[widgets] )
+	distancefieldgenerator? (
+		=dev-qt/qtbase-${PV}*[widgets]
+		=dev-qt/qtdeclarative-${PV}*
+	)
+	pixeltool? ( =dev-qt/qtbase-${PV}*[widgets] )
+	qdbus? ( =dev-qt/qtbase-${PV}*[widgets] )
+	qdoc? ( sys-devel/clang:= )
+	qtdiag? ( =dev-qt/qtbase-${PV}*[opengl,widgets] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(qt_feature assistant)
+		-DQT_FEATURE_commandlineparser=ON
+		$(qt_feature designer)
+		$(qt_feature distancefieldgenerator)
+		$(qt_feature linguist)
+		$(qt_feature pixeltool)
+		$(qt_feature qdbus)
+		$(qt_feature qdoc clang)
+		$(qt_feature qtattributionsscanner)
+		$(qt_feature qtdiag)
+		$(qt_feature qtplugininfo)
+		-DQT_FEATURE_thread=ON
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 9b3d1d67666a..55ccd7a87f9a 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -3,6 +3,8 @@ AUX qtwayland-5.15.3-clang.patch 405 BLAKE2B 914a7448f590cfd6e83ca32352070644bbb
 DIST qtwayland-5.15.5-gentoo-kde-1.tar.xz 32076 BLAKE2B e42d847deaef08271eb2f3211db7496bb1d3e1da976cf242f2129775c0401eb834fd7c94b35ac58d601eb28e770c3b6bedaf4135e5ad97f43e0adee5054214aa SHA512 277c3612de892f21058bac3ef9c2b3584aa43850e1f6dab0c43989a952e30656c6069d1f7d07b0f1df7d1ec2ab1893a0ba1c4c6fecc6f56c101333832bdd483c
 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 1153 BLAKE2B 7e5ff059f7f96da0c7c5302a8e57255d50cb7e07291d5fb9f00cc5a0c58fe223de899dd7da6132bc8a9ce6018080fa867fdae9b629fc0830b4794c3eb5699c3b SHA512 20235ece58cc1aaace573ecdd0212c65108ea54b37c692143e759eb0e1a250eccc1c45d33a3d9518befd72db5eef375965e3d804d7a1920ba6c7efae83b82432
 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-6.3.1.ebuild b/dev-qt/qtwayland/qtwayland-6.3.1.ebuild
new file mode 100644
index 000000000000..09413e556f22
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-6.3.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+BDEPEND="dev-util/wayland-scanner"
+DEPEND="
+	dev-libs/wayland
+	=dev-qt/qtbase-${PV}*[gui,opengl]
+	=dev-qt/qtdeclarative-${PV}*
+	media-libs/libglvnd
+	x11-libs/libxkbcommon
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 85482dae5e4e..8f63dd8be90b 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,4 +1,6 @@
 DIST qtwebchannel-5.15.5-gentoo-kde-1.tar.xz 5780 BLAKE2B 304a4cc0c5598412bb516679f65c5771eadf517e19d6fb026b3496664360e5a2b07d37b3d47cbe4b6e2638f35aa631f7dd4c17b8debe6805a0ea7c6749f491a5 SHA512 b5ca4905f8dc2b1efaf7e5d81c7cbd7decde95887132a548b3b1e1f1ff3c57d6af28020c53c7f9a714633753836bc4c04a6353e7bf587655e9f59d98ac3b8703
 DIST qtwebchannel-everywhere-opensource-src-5.15.5.tar.xz 210712 BLAKE2B a07998872a3e790decb68c5a5294259cbeb393bcf90293b9f2a54484cefb7e443534b95866d5a90a28b2eeb3b55fbc7d33b4355c106e5e4acd6dc610a6327a2e SHA512 74ac09f418fd918cf5930f7d985fd69477da3ef1ecdedcf4b59eb9c17b43849876141ed6483dc32ef3e5e3f3fbc2a6babeb281f72da7850bfc677f2acfaad3fe
+DIST qtwebchannel-everywhere-src-6.3.1.tar.xz 213812 BLAKE2B 001e30aa82cd1c4178fdbb777f09165e3d24cda5e07b1652d14c2dae321e0e9aa51bb9bf3a0b0cc3b18ecc380b30e159d531a7889ee89954fc07d6cf31f7ff70 SHA512 d253e087a9e97173a6a97eac46d8dfa740d3c77182dfd57514c14e68e50f6745cd90e9367cbb5f5d0a7c43fcbfc046af0bd9124fb2517d741bb5ab1a5af5bf62
 EBUILD qtwebchannel-5.15.5.ebuild 604 BLAKE2B 7c990056bb14f9a555a9de45ee52f26f2f0afa103475edb0e54e55394443e242941657c659ef5166c2ae2d94521382a9c163b081b5c3f6879cc5865fb2074038 SHA512 4bac324583c4ab4a1bfd9ad7d7e144ba8c4310079fc91f4fe78fbe24b5e058652a729bf391937653ff1200b5e7c29787060e1376f26a884d4bd0cfc6f25dbf85
+EBUILD qtwebchannel-6.3.1.ebuild 353 BLAKE2B 25d0b8ce3de471d920fda2109ed42f7da27428964a233b1d41024b3b2e18d4a54b3b2f78e2338ad728f8c031b66dec935ed6fb188c477eb17305298a995dbe59 SHA512 48f6edae6126ce01d638b5cf494960ca90c36d9eca8438411717ac952cd0c8d5dacb1e6ed4f568c89fb8bd0612dc01e2b2cdad996679057a97ecce6f690e58ed
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.3.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.3.1.ebuild
new file mode 100644
index 000000000000..62dd2732151a
--- /dev/null
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.3.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Qt WebChannel"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[concurrent]
+	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtwebsockets-${PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index b7a299cd1890..dc3b83f9823c 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -9,9 +9,12 @@ AUX qtwebengine-5.15.3_p20220406-ffmpeg5.patch 8393 BLAKE2B 07dee5bd305699378353
 AUX qtwebengine-5.15.3_p20220406-gcc12-includes.patch 1139 BLAKE2B ba451fcef0dd235f6044622913197581fe2d2f3de8b6342fd9dc0f6706c28a16d8d6b6ad5429f6f2ea3a211a3cd01b730a1b36fd1f34e61b4391d19e0db1ae91 SHA512 7104313aec55fc8eede53cc966833f8e2632d175e4206dd90da2fa42807795152a01010e2cce7bacd57f30cd3fdbbfef32624d5763210d08362beda77a5724cd
 AUX qtwebengine-5.15.3_p20220505-extra-gn.patch 458 BLAKE2B 0595f06d31fd83a04cc0ef9fb7567374c28c4d09c8774e6584d288aa18c2386efe699bd1d155fdee96f5960d3575baff6a6aa7a694d0c953401f80add9daf6c3 SHA512 81498f04c1ad4d73e888bba31fb1129e24990bcddb1d68111b004bba2e4fdab91698b3fe1d01bd94a0bf904e52f614cddc4ba6f70ffaf6a1d45e37a53e583629
 AUX qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch 2259 BLAKE2B 77426028cd350e3e70739cf5e5827b9a6302d2fada806ba46c5bdf9394b47d47aa2f52d8f1f38e53662bdfc3eb1e6c1616e77fbefb3e9b3c685d9271597b4153 SHA512 be2e52eba0168cfedad5e72a0f766fa2e0ef9beab9c28e44d2478fc0c4187cf669d03141b04c4a37ec5cfdd1d3987ce43e1cee61a59ae18fa2101a2a2eaf8d90
+AUX qtwebengine-6.3.1-widevine.patch 707 BLAKE2B eb7b465e6db8d42225c604abfbf3d5a4ada4791b9e7a8627059ec692f4236e8086b8de319c325e5fd1e39cd0ed78ec492751196413a06b5d7d13c5d093ea024b SHA512 2a067c4418fc3e678251a64eea8a0ba7b96485effe07970bd1a049736c20532437a1a53aee43e330863bafe61e8da88808d5030dc1664ceb35e33c6b4bbdc29a
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
 DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
 DIST qtwebengine-5.15.5_p20220618.tar.xz 320131236 BLAKE2B 842322c94737cdf647277ccf226c0d015ac0b362af54c4298cbad6b4494aa4ef0e73830577fb391be31c91b4331b85f407ec58641897a7cc7237e7623043577d SHA512 b1bab7aa5edc7f7b9d4f8338a05dbbd55ae6e0312e1a7e6061895bd7a98c67780127c20db1dbbc81664bf483a5b8f7ed887cedd1baaa1a0259e28fd4b13d6944
+DIST qtwebengine-everywhere-src-6.3.1.tar.xz 398269544 BLAKE2B 3b56a87fd93de0da9ccbfdeda0c5a3e07892dcb1c8dce848cc21c73cb45e7c94746bad299feaa68910ba036abf0c1c16fa423307fdc08c8af4e5e920e2e8a329 SHA512 e00601a7ec6400551f7707d15cf326340ae8d6a5bb8cda55df4619148414f4b3ca3daabfd7263dd5a2ff2ca8ba64f9e91c9db3f1a50bea4903148c57b6dc81dd
 EBUILD qtwebengine-5.15.5_p20220618.ebuild 9282 BLAKE2B c8a2e6bb82be40f6f7d3fd18c1f6af7c3df433af0d027f0c88623686eabb889ed9ed6199679263a435bffb7890724638099aba97852afa51f69464ae0bb67b56 SHA512 2cd95bd77b1237c5f55e7f734245ef477af132fd69113e7de951db7f8e73b026dace177123c7abf778b83e49e0d11321bbec168e463ea4e8c78b3e13f85021f6
+EBUILD qtwebengine-6.3.1.ebuild 7435 BLAKE2B 05cf03ec10fd467b4c188bc015f65ab1ecca94a01a58e93706f9cf1a1da3df273bcb35da7574f2cba8c955aee7fb03b9e86e5c81121868d5ad1d809d0d01ac48 SHA512 cadfc426300f13cb560d5f1a1ecd5c7ceeacd8679182239816a9e5b1f9dd2afe81cd87f0585d4a3b98f28ca2803dbe1283411534795080ab5954963f4e75f44e
 MISC metadata.xml 1258 BLAKE2B 450cb9e683a52475729881c910e7b0b79587d3d672d4eb90613b91194ec19ab7c0fb86bf4ff4bf631686ed3cad49859eed07405b1f7d6129f40b5f4edba68e43 SHA512 971dbe74479e6bf3ed3cda00724bb4a60d6382c4020ee6ce3a730646a69af0a66785fb135706a2a0cc00ff3190674e724aa3def03f43c8e9ed5e5d317ae271f0
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.3.1-widevine.patch b/dev-qt/qtwebengine/files/qtwebengine-6.3.1-widevine.patch
new file mode 100644
index 000000000000..74da3f35f793
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.3.1-widevine.patch
@@ -0,0 +1,18 @@
+Backport from 6.3.2
+https://bugreports.qt.io/browse/QTBUG-104238
+https://github.com/qutebrowser/qutebrowser/issues/7231
+--- a/src/core/content_client_qt.cpp
++++ b/src/core/content_client_qt.cpp
+@@ -54,4 +54,5 @@
+ #include "media/base/media_switches.h"
+ #include "media/base/video_codecs.h"
++#include "media/cdm/supported_audio_codecs.h"
+ #include "media/media_buildflags.h"
+ #include "ui/base/layout.h"
+@@ -276,4 +277,6 @@
+ #endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
+ 
++            capability->audio_codecs = media::GetCdmSupportedAudioCodecs();
++
+             // Add the supported encryption schemes as if they came from the
+             // component manifest. This list must match the CDM that is being
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild
new file mode 100644
index 000000000000..468f7bbc29d7
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild
@@ -0,0 +1,246 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_REQ_USE="xml(+)"
+CHROMIUM_VER="94.0.4606.126"
+CHROMIUM_PATCHES_VER="101.0.4951.64"
+
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="
+	alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
+	+system-ffmpeg +system-icu widgets
+"
+REQUIRED_USE="designer? ( widgets )"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+	dev-util/gperf
+	dev-util/ninja
+	dev-util/re2c
+	net-libs/nodejs[ssl]
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/re2:=
+	=dev-qt/qtdeclarative-${PV}*
+	=dev-qt/qtwebchannel-${PV}*
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz:=
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	>=media-libs/libvpx-1.5:=[svc(+)]
+	media-libs/libwebp:=
+	media-libs/opus
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/zlib[minizip]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libxcb:=
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbcommon
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	alsa? ( media-libs/alsa-lib )
+	geolocation? ( =dev-qt/qtpositioning-${PV}* )
+	kerberos? ( virtual/krb5 )
+	pulseaudio? ( media-libs/libpulse:= )
+	screencast? ( media-video/pipewire:= )
+	system-ffmpeg? ( media-video/ffmpeg:= )
+	system-icu? ( >=dev-libs/icu-69.1:= )
+	widgets? (
+		=dev-qt/qtbase-${PV}*[widgets]
+	)
+"
+DEPEND="${RDEPEND}
+	media-libs/libglvnd
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-widevine.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+	# bug #307861
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+		ewarn "You may experience really long compilation times and/or increased memory usage."
+		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+	fi
+	eshopts_pop
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# (check-reqs added for bug #570534)
+	#
+	# Estimate the amount of RAM required
+	# Multiplier is *10 because Bash doesn't do floating point maths.
+	# Let's crudely assume ~2GB per compiler job for GCC.
+	local multiplier=20
+
+	# And call it ~1.5GB for Clang.
+	if tc-is-clang ; then
+		multiplier=15
+	fi
+
+	local CHECKREQS_DISK_BUILD="7G"
+	local CHECKREQS_DISK_USR="150M"
+	if ! has "distcc" ${FEATURES} ; then
+		# bug #830661
+		# Not super realistic to come up with good estimates for distcc right now
+		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+	fi
+
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	qtwebengine_check-reqs
+}
+
+pkg_setup() {
+	qtwebengine_check-reqs
+	python-any-r1_pkg_setup
+}
+
+pkg_preinst() {
+	elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
+	elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. Extensive as it is, the"
+	elog "list of backports is impossible to evaluate, but always bound to be behind"
+	elog "Chromium's release schedule."
+	elog "In addition, various online services may deny service based on an outdated"
+	elog "user agent version (and/or other checks). Google is already known to do so."
+	elog
+	elog "tldr: Your web browsing experience will be compromised."
+}
+
+src_unpack() {
+	# bug 307861
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn
+		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
+		ewarn "You may experience really long compilation times and/or increased memory usage."
+		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
+		ewarn
+	fi
+	eshopts_pop
+
+	case ${QT6_BUILD_TYPE} in
+		live)    git-r3_src_unpack ;&
+		release) default ;;
+	esac
+}
+
+src_prepare() {
+	# bug 620444 - ensure local headers are used
+	find . -type f -name "*.pr[fio]" -exec \
+		sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' {} + || die
+
+	if use system-icu; then
+		# Sanity check to ensure that bundled copy of ICU is not used.
+		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
+		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
+		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
+		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
+		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
+		local file
+		while read file; do
+			echo "#error This file should not be used!" > "${file}" || die
+		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
+	fi
+
+	qt6-build_src_prepare
+}
+
+src_configure() {
+	export NINJA_PATH="${BROOT}"/usr/bin/ninja
+	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+	local mycmakeargs=(
+		#-DQT_FEATURE_accessibility=off
+		#-DQT_FEATURE_force_asserts=off
+		#-DQT_FEATURE_opengl=off
+		#-DQT_FEATURE_printer=off
+		-DQT_FEATURE_qtpdf_build=off
+		-DQT_FEATURE_qtpdf_quick_build=off
+		-DQT_FEATURE_qtpdf_widgets_build=off
+		-DQT_FEATURE_qtwebengine_build=on
+		-DQT_FEATURE_qtwebengine_quick_build=on
+		-DQT_FEATURE_qtwebengine_widgets_build=on
+		#-DQT_FEATURE_ssl=off
+		#-DQT_FEATURE_static=off
+		#-DQT_FEATURE_system_zlib=off
+		#-DQT_FEATURE_system_png=off
+		#-DQT_FEATURE_system_jpeg=off
+		#-DQT_FEATURE_system_freetype=off
+		#-DQT_FEATURE_system_harfbuzz=off
+		#-DQT_FEATURE_use_gold_linker=off
+		#-DQT_FEATURE_use_lld_linker=off
+		-DQT_FEATURE_webengine_embedded_build=off
+		-DQT_FEATURE_webengine_extensions=on
+		#-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
+		-DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
+		-DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
+		#-DQT_FEATURE_webengine_jumbo_file_merge_limit
+		-DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
+		-DQT_FEATURE_webengine_native_spellchecker=off
+		-DQT_FEATURE_webengine_ozone_x11=on
+		-DQT_FEATURE_webengine_pepper_plugins=on
+		-DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
+		-DQT_FEATURE_webengine_printing_and_pdf=on
+		-DQT_FEATURE_webengine_sanitizer=on
+		-DQT_FEATURE_webengine_spellchecker=on
+		-DQT_FEATURE_webengine_system_opus=on
+		-DQT_FEATURE_webengine_system_libwebp=on
+		-DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
+		-DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
+		-DQT_FEATURE_webengine_system_icu=$(usex system-icu)
+		-DQT_FEATURE_webengine_system_libevent=on
+		-DQT_FEATURE_webengine_system_libpci=on
+		-DQT_FEATURE_webengine_system_libpng=on
+		-DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
+		-DQT_FEATURE_webengine_system_zlib=on
+		-DQT_FEATURE_webengine_webchannel=on
+		-DQT_FEATURE_webengine_webrtc=on
+		-DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
+		#-DQT_FEATURE_xcb=off
+	)
+
+	qt6-build_src_configure
+}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index ca8709b33844..ea8b5e22f1cb 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,4 +1,6 @@
 DIST qtwebsockets-5.15.5-gentoo-kde-1.tar.xz 2052 BLAKE2B 18a4cb3ccc6d08f5142601cb53c501f4883c3aa47f56ba977c5979be6ae3c90765c5a6205fd62caee1f93006d5bdf0ede8ca48e34ab11ef673e0287811fd9980 SHA512 7ae654741be15954da8d729180186e3590c88140e86260241ccb27badface40a76946d048c0dd3220734f19888433f3bd4f7a2094c6ea548703b961db3a2c189
 DIST qtwebsockets-everywhere-opensource-src-5.15.5.tar.xz 260676 BLAKE2B a8a35e697c204cf1b2d87c80f6332809d3a9ee85cd26cf99cedbab13eb8cf386cbb74614bbb1146f3f734795b3123e25ac0059d898501b801c6843084601ff74 SHA512 2d44983e462a899c4adb90998b84d24466d70d8fab340481bc916228b289c45456ea5acde61a70aa9e3f9233216c5ca80375f190d9cbc406f8d40b535e90e480
+DIST qtwebsockets-everywhere-src-6.3.1.tar.xz 264268 BLAKE2B 94b6a8f71ffc537d81d2f8ca8e95f1edddbaee0313d06af88d09a08f334e40c6679f7bca0e5023ab6021a4abb13a22e80fafba9b14ddff4557fe9fb81fde2667 SHA512 25ab603753fdc1c65585b6aa91d3777f48e0763cff97978478586a0f04d0536b5c4d5853f9218d2a0c3b3d01b1bd9ca7e2f0e90020737c1fc70bdd4a3cd5a30c
 EBUILD qtwebsockets-5.15.5.ebuild 583 BLAKE2B 03765c46170ca5eb45df9f2773b60ef2fc126c9bf14bea4fc084f3984c3fd16a804de1625577da27658af0201c486f3a3ca1dc3977cdac546456954717cb707c SHA512 0fe201988a3af2a80c11da78c23e99f88abdbe45228284a24cafcc582118764bf761b5157476076bf1d448479ca874e7d83d2d39036cc386da4611dc5f28e57b
+EBUILD qtwebsockets-6.3.1.ebuild 370 BLAKE2B 34f5c1e43cc6bab1d586f1462794399c47abab7c43a542f4fd38f23ada93c3a31c9509910282c4dcd34a1e4462cbf4b788b8738ea130fd3797d5ea5ac32f5d0d SHA512 7c00e905728c2fda7d00a11e4541d25ddbcf14dfe0a048086793b26e5d78383147e86f5e95358fdfb7302029ea929327f037d922534cc2be14137b1c0cfe3599
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.3.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.3.1.ebuild
new file mode 100644
index 000000000000..6b0e253a28cb
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.3.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qt6-build
+
+DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	=dev-qt/qtbase-${PV}*[network]
+	=dev-qt/qtdeclarative-${PV}*
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a8a3061c441a..610583bcfdb3 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 13c80e4bf0e0..61af2e0eca1e 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -6,5 +6,5 @@ AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.11485.tar.gz 8831925 BLAKE2B 7e2bcb37b4c34bb01788a8d75fc42498223b6193421cb726c21ce7949181757a10d112ae151736cd9283ba6ed8f0625597fb1f2a61229a7352e7f1f5ec34d1d0 SHA512 03fb571fdd61daea3a5c61ff75a146bd98b9b92dfd8bc1957143fe127977f5111df680ac86769d3c1fa1801ba2012b600b1ff844b318ce64460f2d042c4ae65b
-EBUILD intel-graphics-compiler-1.0.11485.ebuild 2635 BLAKE2B a0f4542bf8343a23887c729fab4588480c11bcf884dd6b458fdc07c35765661d58f6e5bde6fd7bfe643754062b57165311d16b85b5c82f25cd8887576b6a73fb SHA512 8ca420c146f9332a7294fb8b4dcb7da42c5b4c9d782479500925e4ac0377e50a2edde0b05ff3582792664badcf0b483f8e7e7b96ccc12a6cf738098ca4bafa9a
+EBUILD intel-graphics-compiler-1.0.11485-r2.ebuild 2635 BLAKE2B a0f4542bf8343a23887c729fab4588480c11bcf884dd6b458fdc07c35765661d58f6e5bde6fd7bfe643754062b57165311d16b85b5c82f25cd8887576b6a73fb SHA512 8ca420c146f9332a7294fb8b4dcb7da42c5b4c9d782479500925e4ac0377e50a2edde0b05ff3582792664badcf0b483f8e7e7b96ccc12a6cf738098ca4bafa9a
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11485.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11485-r2.ebuild
index cbacc91fa4d3..cbacc91fa4d3 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11485.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11485-r2.ebuild
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 8d121c27a299..128ccbc029e1 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
new file mode 100644
index 000000000000..c8313e255a0a
--- /dev/null
+++ b/eclass/qt6-build.eclass
@@ -0,0 +1,161 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: qt6-build.eclass
+# @MAINTAINER:
+# qt@gentoo.org
+# @SUPPORTED_EAPIS: 8
+# @BLURB: Eclass for Qt6 split ebuilds.
+# @DESCRIPTION:
+# This eclass contains various functions that are used when building Qt6.
+# Requires EAPI 8.
+
+if [[ ${CATEGORY} != dev-qt ]]; then
+	die "qt6-build.eclass is only to be used for building Qt 6"
+fi
+
+case ${EAPI} in
+	8)	: ;;
+	*)	die "qt6-build.eclass: unsupported EAPI=${EAPI:-0}" ;;
+esac
+
+# @ECLASS_VARIABLE: QT6_MODULE
+# @PRE_INHERIT
+# @DESCRIPTION:
+# The upstream name of the module this package belongs to. Used for
+# SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass.
+: ${QT6_MODULE:=${PN}}
+
+# @ECLASS_VARIABLE: VIRTUALX_REQUIRED
+# @DESCRIPTION:
+# For proper description see virtualx.eclass man page.
+# Here we redefine default value to be manual, if your package needs virtualx
+# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
+: ${VIRTUALX_REQUIRED:=manual}
+
+inherit cmake virtualx
+
+HOMEPAGE="https://www.qt.io/"
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
+SLOT=6/$(ver_cut 1-2)
+
+QT6_MINOR_VERSION=$(ver_cut 2)
+readonly QT6_MINOR_VERSION
+
+case ${PV} in
+	6.9999)
+		# git dev branch
+		QT6_BUILD_TYPE="live"
+		EGIT_BRANCH="dev"
+		;;
+	6.?.9999|6.??.9999)
+		# git stable branch
+		QT6_BUILD_TYPE="live"
+		EGIT_BRANCH=${PV%.9999}
+		;;
+	*_alpha*|*_beta*|*_rc*)
+		# development release
+		QT6_BUILD_TYPE="release"
+		MY_P=${QT6_MODULE}-everywhere-src-${PV/_/-}
+		SRC_URI="https://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_P}
+		;;
+	*)
+		# official stable release
+		QT6_BUILD_TYPE="release"
+		MY_P=${QT6_MODULE}-everywhere-src-${PV}
+		SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_P}
+		;;
+esac
+readonly QT6_BUILD_TYPE
+
+EGIT_REPO_URI=(
+	"https://code.qt.io/qt/${QT6_MODULE}.git"
+	"https://github.com/qt/${QT6_MODULE}.git"
+)
+[[ ${QT6_BUILD_TYPE} == live ]] && inherit git-r3
+
+# @ECLASS_VARIABLE: QT6_BUILD_DIR
+# @OUTPUT_VARIABLE
+# @DESCRIPTION:
+# Build directory for out-of-source builds.
+: ${QT6_BUILD_DIR:=${S}_build}
+
+IUSE="debug test"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+	RESTRICT="test" # bug 457182
+else
+	RESTRICT="!test? ( test )"
+fi
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+"
+# TODO: Tests have not been split from qtbase.
+#if [[ ${PN} != qttest ]]; then
+#	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
+#fi
+
+EXPORT_FUNCTIONS src_prepare src_configure
+
+######  Phase functions  ######
+
+# @FUNCTION: qt6-build_src_prepare
+# @DESCRIPTION:
+# Prepares the environment and patches the sources if necessary.
+qt6-build_src_prepare() {
+	qt6_prepare_env
+
+	cmake_src_prepare
+}
+
+# @FUNCTION: qt6-build_src_configure
+# @DESCRIPTION:
+# Configures sources.
+qt6-build_src_configure() {
+	cmake_src_configure
+}
+
+######  Public helpers  ######
+
+# @FUNCTION: qt_feature
+# @USAGE: <flag> [feature]
+# @DESCRIPTION:
+# <flag> is the name of a flag in IUSE.
+qt_feature() {
+	[[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
+	echo "-DQT_FEATURE_${2:-$1}=$(usex $1 ON OFF)"
+}
+
+######  Internal functions  ######
+
+# @FUNCTION: qt6_prepare_env
+# @INTERNAL
+# @DESCRIPTION:
+# Prepares the environment for building Qt.
+qt6_prepare_env() {
+	# setup installation directories
+	# note: keep paths in sync with qmake-utils.eclass
+	QT6_PREFIX=${EPREFIX}/usr
+	QT6_HEADERDIR=${QT6_PREFIX}/include/qt6
+	QT6_LIBDIR=${QT6_PREFIX}/$(get_libdir)
+	QT6_ARCHDATADIR=${QT6_PREFIX}/$(get_libdir)/qt6
+	QT6_BINDIR=${QT6_ARCHDATADIR}/bin
+	QT6_PLUGINDIR=${QT6_ARCHDATADIR}/plugins
+	QT6_LIBEXECDIR=${QT6_ARCHDATADIR}/libexec
+	QT6_IMPORTDIR=${QT6_ARCHDATADIR}/imports
+	QT6_QMLDIR=${QT6_ARCHDATADIR}/qml
+	QT6_DATADIR=${QT6_PREFIX}/share/qt6
+	QT6_DOCDIR=${QT6_PREFIX}/share/qt6-doc
+	QT6_TRANSLATIONDIR=${QT6_DATADIR}/translations
+	QT6_EXAMPLESDIR=${QT6_DATADIR}/examples
+	QT6_TESTSDIR=${QT6_DATADIR}/tests
+	QT6_SYSCONFDIR=${EPREFIX}/etc/xdg
+	readonly QT6_PREFIX QT6_HEADERDIR QT6_LIBDIR QT6_ARCHDATADIR \
+		QT6_BINDIR QT6_PLUGINDIR QT6_LIBEXECDIR QT6_IMPORTDIR \
+		QT6_QMLDIR QT6_DATADIR QT6_DOCDIR QT6_TRANSLATIONDIR \
+		QT6_EXAMPLESDIR QT6_TESTSDIR QT6_SYSCONFDIR
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 9a74361c09cc..315f77bb0526 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index ddd8ca237a6a..55dba2c27309 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,3 +1,5 @@
 DIST libtgvoip-2.4.4_p20220117.tar.gz 1098045 BLAKE2B 752b3b26f511316b8261d9ebb833e2b74df91377daca255fbbeefb18b3ab3811b97eaee1d9965e95ed9d215467e6ff5dc857369d381d470570cb87c3bfec33af SHA512 b9d8e354e9b8f9226d5e06397fdf3c91f71fee890db7d180dffae2e3fb6f74bca1c31b7f87049257c3edf44c2171780ed5781877cf8f2d40b2d56c1f5385ef77
+DIST libtgvoip-2.4.4_p20220503.tar.gz 1098061 BLAKE2B 5389a3783fa5179d10a18ef0282ab65d1526c829852095718384c2ba476ebfb1ee1f997f71b47424ef60a826055bc63d0d2dde7980de98c978860d72717ffefb SHA512 68f1e5b46df3b974d39333949e586ed00243044ff4bcac31937cba7eced6266fdacfd6ff3c6453f7dfa64ec82dd3aeafa251411dc85de0aae26b2cd0d8a79013
 EBUILD libtgvoip-2.4.4_p20220117.ebuild 1586 BLAKE2B 8ee4658a921472e3c5aaa2cccb6059620041f71ee4c8fb24fdcf3759b4f5bbb99c481c888f71300cc82a49ec4037fec96065f89c36145b57b293a9818cba3e54 SHA512 0159bdc29c80a8c2ac03783bded57b68908d814a1113431db85b62042b1c00b433f9bce4359201ec43a79205e27463c84b33a33254cf3aa3b25a9343fe1039e2
+EBUILD libtgvoip-2.4.4_p20220503.ebuild 1587 BLAKE2B 63114d768dc02b5be4b5916c88c50cbba051444ce155820ccced9d5dd3fa35eafa8dcb508b75d8a0ea411d34bab34ae5a6b89f63c5abcff6abfc3f7e9380e249 SHA512 848122f1180dfecfb4bd67cf347a75fca9d4520ae56d865d7cd246541b9fa2bb70443511739304b8b747f2f3340b9fe24178871c1bb1fc8dcf592aba6f5cfed8
 MISC metadata.xml 543 BLAKE2B 56f3e74859e09ff7ecaa4f068e1872257213a7239cd946c920c0b2e7e12cfc0bdb314ca1fb0a75b489abd5ae5c4e5b4218ced1b3ee78e60a4e82558100d68e1f SHA512 83e39833446eb97c76280a81e428bdd64b5c46a052e1b87bdc19a5db31478f1004e3ae6f323c7983992541bf9d15f155037523990964ccae4ad8653396f7534b
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20220503.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20220503.ebuild
new file mode 100644
index 000000000000..14fae24d7ae3
--- /dev/null
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20220503.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic autotools
+
+DESCRIPTION="VoIP library for Telegram clients"
+HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
+
+LIBTGVOIP_COMMIT="78a8e22bedb0d06004da8bafeba88b7474cb89a4"
+SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="+dsp +alsa pulseaudio"
+
+DEPEND="
+	dev-libs/openssl:=
+	media-libs/opus
+	alsa? ( media-libs/alsa-lib )
+	dsp? ( media-libs/tg_owt:= )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+REQUIRED_USE="
+	|| ( alsa pulseaudio )
+"
+
+src_prepare() {
+	# Will be controlled by us
+	sed -i -e '/^CFLAGS += -DTGVOIP_NO_DSP/d' Makefile.am || die
+	# https://bugs.gentoo.org/717210
+	echo 'libtgvoip_la_LIBTOOLFLAGS = --tag=CXX' >> Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Not using the CMake build despite being the preferred one, because
+	# it's lacking relevant configure options.
+	local myconf=(
+		--disable-dsp  # WebRTC is linked from tg_owt
+		$(use_with alsa)
+		$(use_with pulseaudio pulse)
+	)
+	if use dsp; then
+		append-cppflags "-I${ESYSROOT}/usr/include/tg_owt"
+		append-cppflags "-I${ESYSROOT}/usr/include/tg_owt/third_party/abseil-cpp"
+		append-libs '-ltg_owt'
+	else
+		append-cppflags '-DTGVOIP_NO_DSP'
+	fi
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index f51b497fbfdb..d03a9d89c497 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -2,7 +2,11 @@ AUX tg_owt-0_pre20211207-fix-dcsctp-references.patch 1337 BLAKE2B cf74aefd4a350e
 AUX tg_owt-0_pre20220209-allow-disabling-X11.patch 4382 BLAKE2B 26db92be5b8e75542a62618c7cda08dd7a54a95532df616cacb7d5fb2d39ab791758593e8f9a41494e23e529c0dc2a48aca2a87310fdb62acbd27a7eaf456e4e SHA512 dba0d14b14dc63f8372f50ab8cd4cb02067bcdb338d3dfb33ea2d8977eb2fa2738c93edd42b9a36ed97bcbfd2c7a123e27a7b161d318338d0ff1450780abe98a
 AUX tg_owt-0_pre20220209-gcc-12-cstddef.patch 741 BLAKE2B d644e354e5f4c6dd714bc86b18a1e57e120cdb66faed50fda97f8934abc8bdcc522e83abbc424370af8107ca1f3fa8f8f3cc86568ee56c558f59576af48f62a5 SHA512 c86018bc2a3690abd9656ddb5ebccb59c8a3aa83a37004368b0e71326d1f8b473c016dd15d3fd2143d3f74fd4e270757bb50a642154a3f10a1274c1b5bcf007b
 AUX tg_owt-0_pre20220209-gcc-12-cstdint.patch 1361 BLAKE2B 06587d98836d335a9edf9fa276cd660e29d2080186ddcd724ae4e82a5a69e6e57684575f6de77f3c026696f3383695a61f97ac6184b1983e99a4ba27533d8c70 SHA512 06d2cd5c6f2a360f0c46a7b91d045dcf582d0eb5efb93304d1377e78beff38dac545b406afd5a52e1a9e0725e9d6b1181984a39c1bead12870267c51afb6b884
+AUX tg_owt-0_pre20220507-allow-disabling-X11.patch 4470 BLAKE2B 65498236c2d315ec313bc89b6b5390bba9a378f4dee7bc9dccbe1b0184262aba0c308d7248c69262c900bf963d898feb47662a882e73fcdfc0c1f69b89c5601a SHA512 32cdb00633be55e573d5830d1e3b351e8cc99b209f4de5c23cf49a9dd94cedfa1227f8d44bc1ac73029391eecbb1cab59d718f2fa4939eeb0f31c62b7f649d54
+AUX tg_owt-0_pre20220507-unbundle-crc32c.patch 1933 BLAKE2B 1aaae7a32aec615f70cff3e6abea1e8398df778b92adfb20bfc4bdc211491d0da2bec81c8f1cf730a32407a07b762e3bc3fc9ead75fce7fe050d23f7ad658763 SHA512 a8fd7e0ac746b4bf8203eef14e1f6771dccd644466412f40517c2fb1af048ffe34033a910531720cfb478c9d4a8e80b571ae0084d01cf52b8046290eccc9d5da
 DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be51c166440e6b03fa98f65d907efc446800804058a5ea7fdf944e12cb1237a1487e83fbe9a2f1ce4c73521234e43632f921ad0333507737d81e1cb23ce8f SHA512 f97529b80a786e2e92443caabebd6d85a42641e10c3d2940b0f69bedf3b8a96c69c3247abddd059c4ddd6f78107ab7214222a4267a559fc2086c8edf5ea1afbc
 DIST tg_owt-0_pre20220209.tar.gz 16501237 BLAKE2B fb04aca8803645cc107a7e7fbab8d6020ad91f487ece0445aba29dd1127270e8b3a33d51bb35cfc916168df78cbdc98987610b39fd2cf7b86821b4f9733783c9 SHA512 0a35ce3379887b115117188aa8dce44bf89e23ad6f9fab7320a1cd55cdd534bae4c240778a37cb9588cd6acea1e7a83c22c113d608f7bfd5272ee22bb2773af3
+DIST tg_owt-0_pre20220507.tar.gz 15799740 BLAKE2B f12f3ecdfb0c7cfdae12af4734ddf22da4d95fd991b8a8ba17515f9d5c22a2f12b81967c0af15ac150c99129701c50c9384ea0e0240bf2366e176c833b14f7db SHA512 6902c65a1be0bcf300f08c274109ed53cdf92b7aff35915045c3989899fc2584cce3fe9df0e8ac29e708fcc575453fe5a6affaea85787f9c4fcc3bcde3b85711
 EBUILD tg_owt-0_pre20220209.ebuild 3499 BLAKE2B dbdfe128deb5963ec2033a79471541424aeaf7513ed06c86b325d384b25b22293de9648e394649f71783db44b806e15e9bd56e57b44629dd6853f7810ac50d17 SHA512 5a18db66356512cc10a3f2bd5772c7be62ddcbe6dd8cebb69112f4e4bfecf96e4250ffc9d3b339707f2e6a04d3937183c3a8d833ad0c3afebd5b6871c844c937
+EBUILD tg_owt-0_pre20220507.ebuild 3492 BLAKE2B 7c293e77e98dbf52fcf40193df428f39682b9f00383040bdea4dbd28519cd28f7412d466341e6a98275b424392f96c7c9203e9ab41999ae71efafa57594f0d4b SHA512 28ff966bd43341de5b6d61d919f5640bd8a78a888ebc85fca8e0b28a882bfe3db233ff99ba4058b65fab0413b7c508ebf3569d3a91bb0bfae8c2b4474e9214a4
 MISC metadata.xml 410 BLAKE2B 4bb73f9210c791887bf87b9d6476c339ed077d8a9e2cca19a7c96fdd6634dd7217cd96e196dd52f112f79ae88b320651fa91ed7f3b13a7db1a5ae6fb4fa2f1ad SHA512 ee72d3f004691ec17c5c5b95e5c602757a4679d7eb92d31afb1394adf34b758829ea2d1fb049d25a7db24247331e58c22ccb322421fe956ec843c65f7ddc612e
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20220507-allow-disabling-X11.patch b/media-libs/tg_owt/files/tg_owt-0_pre20220507-allow-disabling-X11.patch
new file mode 100644
index 000000000000..71b587f471bb
--- /dev/null
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20220507-allow-disabling-X11.patch
@@ -0,0 +1,117 @@
+Add -DTG_OWT_USE_X11
+
+Allows disabling X11 desktop capturing independently of pipewire support, for
+the few people that run wayland without any X11 support whatsoever.
+
+This setup is untested, but supported by the GNI build system, see:
+* src/modules/desktop_capture/BUILD.gn (option rtc_use_x11_extensions)
+
+Toggling the WEBRTC_USE_X11 define also affects some files under
+src/modules/audio_device, but that falls under "X11 support", regardless...
+
+--- tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41.orig/CMakeLists.txt
++++ tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41/CMakeLists.txt
+@@ -21,11 +21,13 @@
+ 
+ option(BUILD_SHARED_LIBS "Builds shared libraries instead of static." OFF)
+ option(TG_OWT_USE_PROTOBUF "Use protobuf to generate additional headers. Useful for packaged build." ${BUILD_SHARED_LIBS})
++option(TG_OWT_USE_X11 "Use X11 for desktop capture on non-Apple Unix." ON)
+ option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture on non-Apple Unix." ON)
+ option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire 0.3 for desktop capture on non-Apple Unix." ${not_packaged_build})
+ option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." OFF)
+ 
+ if (NOT UNIX OR APPLE)
++    set(TG_OWT_USE_X11 OFF)
+     set(TG_OWT_USE_PIPEWIRE OFF)
+ endif()
+ 
+@@ -97,6 +99,10 @@
+ add_library(tg_owt)
+ init_target(tg_owt)
+ 
++if (TG_OWT_USE_X11)
++    link_x11(tg_owt)
++endif()
++
+ if (TG_OWT_USE_PIPEWIRE)
+     if (TG_OWT_DLOPEN_PIPEWIRE)
+         include(cmake/generate_stubs.cmake)
+@@ -189,10 +195,6 @@
+ include(cmake/libwebrtcbuild.cmake)
+ target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild)
+ 
+-if (UNIX AND NOT APPLE)
+-    link_x11(tg_owt)
+-endif()
+-
+ function(add_sublibrary postfix)
+     add_library(tg_owt_${postfix} OBJECT)
+     init_feature_target(tg_owt_${postfix} ${postfix})
+@@ -2370,6 +2372,39 @@
+     )
+ endif()
+ 
++if (NOT TG_OWT_USE_X11)
++    remove_target_sources(tg_owt ${webrtc_loc}
++        # src/modules/desktop_capture/BUILD.gn (rtc_use_x11_extensions)
++        modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.cc
++        modules/desktop_capture/linux/x11/mouse_cursor_monitor_x11.h
++        modules/desktop_capture/linux/x11/screen_capturer_x11.cc
++        modules/desktop_capture/linux/x11/screen_capturer_x11.h
++        modules/desktop_capture/linux/x11/shared_x_display.cc
++        modules/desktop_capture/linux/x11/shared_x_display.h
++        modules/desktop_capture/linux/x11/window_capturer_x11.cc
++        modules/desktop_capture/linux/x11/window_capturer_x11.h
++        modules/desktop_capture/linux/x11/window_finder_x11.cc
++        modules/desktop_capture/linux/x11/window_finder_x11.h
++        modules/desktop_capture/linux/x11/window_list_utils.cc
++        modules/desktop_capture/linux/x11/window_list_utils.h
++        modules/desktop_capture/linux/x11/x_atom_cache.cc
++        modules/desktop_capture/linux/x11/x_atom_cache.h
++        modules/desktop_capture/linux/x11/x_error_trap.cc
++        modules/desktop_capture/linux/x11/x_error_trap.h
++        modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc
++        modules/desktop_capture/linux/x11/x_server_pixel_buffer.h
++        modules/desktop_capture/linux/x11/x_window_property.cc
++        modules/desktop_capture/linux/x11/x_window_property.h
++
++        # screen_drawer_linux.cc depends on x11, rest are revdeps
++        modules/desktop_capture/screen_drawer.cc
++        modules/desktop_capture/screen_drawer.h
++        modules/desktop_capture/screen_drawer_linux.cc
++        modules/desktop_capture/screen_drawer_lock_posix.cc
++        modules/desktop_capture/screen_drawer_lock_posix.h
++    )
++endif()
++
+ if (NOT TG_OWT_USE_PIPEWIRE)
+     remove_target_sources(tg_owt ${webrtc_loc}
+         modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc
+--- tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41.orig/cmake/libwebrtcbuild.cmake
++++ tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41/cmake/libwebrtcbuild.cmake
+@@ -29,6 +29,13 @@
+     BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0
+ )
+ 
++if (TG_OWT_USE_X11)
++    target_compile_definitions(libwebrtcbuild
++    INTERFACE
++        WEBRTC_USE_X11
++    )
++endif()
++
+ if (TG_OWT_USE_PIPEWIRE)
+     target_compile_definitions(libwebrtcbuild
+     INTERFACE
+@@ -65,11 +72,6 @@
+         INTERFACE
+             WEBRTC_MAC
+         )
+-    else()
+-        target_compile_definitions(libwebrtcbuild
+-        INTERFACE
+-            WEBRTC_USE_X11
+-        )
+     endif()
+ 
+     if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20220507-unbundle-crc32c.patch b/media-libs/tg_owt/files/tg_owt-0_pre20220507-unbundle-crc32c.patch
new file mode 100644
index 000000000000..44283c24384c
--- /dev/null
+++ b/media-libs/tg_owt/files/tg_owt-0_pre20220507-unbundle-crc32c.patch
@@ -0,0 +1,72 @@
+Use system's crc32c if found
+
+--- tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41.orig/CMakeLists.txt
++++ tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41/CMakeLists.txt
+@@ -147,7 +147,6 @@
+ 
+ target_link_libraries(tg_owt
+ PRIVATE
+-    tg_owt::libcrc32c
+     tg_owt::libpffft
+     tg_owt::librnnoise
+     tg_owt::libsrtp
+@@ -185,6 +184,7 @@
+ link_libabsl(tg_owt)
+ link_libopenh264(tg_owt)
+ link_libvpx(tg_owt)
++link_crc32c(tg_owt)
+ 
+ if (TG_OWT_BUILD_AUDIO_BACKENDS AND (UNIX AND NOT APPLE))
+     link_libalsa(tg_owt)
+@@ -2599,7 +2599,6 @@
+ 
+ set(export_targets
+     ${tg_owt_export}
+-    libcrc32c
+     libpffft
+     librnnoise
+     libsrtp
+@@ -2617,6 +2616,9 @@
+ if (NOT LIBOPENH264_FOUND)
+     list(APPEND export_targets libopenh264)
+ endif()
++if (NOT Crc32c_FOUND)
++    list(APPEND export_targets libcrc32c)
++endif()
+ 
+ export(
+     TARGETS ${export_targets}
+--- tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41.orig/cmake/external.cmake
++++ tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41/cmake/external.cmake
+@@ -166,6 +166,20 @@
+     endif()
+ endfunction()
+ 
++# crc32c
++function(link_crc32c target_name)
++    if (TG_OWT_PACKAGED_BUILD)
++        find_package(Crc32c)
++        set(Crc32c_FOUND ${Crc32c_FOUND} PARENT_SCOPE)
++        if (Crc32c_FOUND)
++            target_link_libraries(${target_name} PRIVATE Crc32c::crc32c)
++        endif()
++    endif()
++    if (NOT Crc32c_FOUND)
++        target_link_libraries(${target_name} PRIVATE tg_owt::libcrc32c)
++    endif()
++endfunction()
++
+ function(link_glib target_name)
+     find_package(PkgConfig REQUIRED)
+     pkg_check_modules(GLIB2 REQUIRED glib-2.0)
+--- tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41.orig/src/net/dcsctp/packet/crc32c.cc
++++ tg_owt-10d5f4bf77333ef6b43516f90d2ce13273255f41/src/net/dcsctp/packet/crc32c.cc
+@@ -11,7 +11,7 @@
+ 
+ #include <cstdint>
+ 
+-#include "third_party/crc32c/src/include/crc32c/crc32c.h"
++#include "crc32c/crc32c.h"
+ 
+ namespace dcsctp {
+ 
diff --git a/media-libs/tg_owt/tg_owt-0_pre20220507.ebuild b/media-libs/tg_owt/tg_owt-0_pre20220507.ebuild
new file mode 100644
index 000000000000..384b3d7cafce
--- /dev/null
+++ b/media-libs/tg_owt/tg_owt-0_pre20220507.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="WebRTC build for Telegram"
+HOMEPAGE="https://github.com/desktop-app/tg_owt"
+
+TG_OWT_COMMIT="10d5f4bf77333ef6b43516f90d2ce13273255f41"
+LIBYUV_COMMIT="ad890067f661dc747a975bc55ba3767fe30d4452"
+SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://archive.org/download/libyuv-${LIBYUV_COMMIT}.tar/libyuv-${LIBYUV_COMMIT}.tar.gz"
+S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
+# Fetch libyuv archive from: https://chromium.googlesource.com/libyuv/libyuv/+archive/${LIBYUV_COMMIT}.tar.gz
+
+LICENSE="BSD"
+SLOT="0/${PV##*pre}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="screencast +X"
+
+# This package's USE flags may change the ABI and require a rebuild of
+#  dependent pacakges. As such, one should make sure to depend on
+#  media-libs/tg_owt[x=,y=,z=] for any package that uses this.
+
+# Bundled libs:
+# - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx bundle it)
+# - libsrtp (project uses private APIs)
+# - pffft (no stable versioning, patched)
+DEPEND="
+	>=dev-cpp/abseil-cpp-20211102.0:=[cxx17(+)]
+	dev-libs/openssl:=
+	dev-libs/protobuf:=
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libvpx-1.10.0:=
+	media-libs/openh264:=
+	media-libs/opus
+	media-video/ffmpeg:=
+	dev-libs/crc32c
+	screencast? (
+		dev-libs/glib:2
+		media-video/pipewire:=
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXrender
+		x11-libs/libXrandr
+		x11-libs/libXtst
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/tg_owt-0_pre20220507-allow-disabling-X11.patch"
+	"${FILESDIR}/tg_owt-0_pre20220507-unbundle-crc32c.patch"
+)
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}/src/third_party/libyuv" || die
+	unpack "libyuv-${LIBYUV_COMMIT}.tar.gz"
+}
+
+src_prepare() {
+	# libopenh264 has GENERATED files with yasm that aren't excluded by
+	# EXCLUDE_FROM_ALL, and I have no clue how to avoid this.
+	# These source files aren't used with system-openh264, anyway.
+	sed -i '/include(cmake\/libopenh264.cmake)/d' CMakeLists.txt || die
+
+	# The sources for libcrc32c aren't available, avoid needing them
+	sed -i '/include(cmake\/libcrc32c.cmake)/d' CMakeLists.txt || die
+
+	# "lol" said the scorpion, "lmao"
+	sed -i '/if (BUILD_SHARED_LIBS)/{n;n;s/WARNING/DEBUG/}' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes
+	# see https://bugs.gentoo.org/754012
+	# EAPI 8 still wipes this flag.
+	append-cppflags '-DNDEBUG'
+
+	local mycmakeargs=(
+		-DTG_OWT_USE_X11=$(usex X)
+		-DTG_OWT_USE_PIPEWIRE=$(usex screencast)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# Save about 15MB of useless headers
+	rm -r "${ED}/usr/include/tg_owt/rtc_base/third_party" || die
+	rm -r "${ED}/usr/include/tg_owt/common_audio/third_party" || die
+	rm -r "${ED}/usr/include/tg_owt/modules/third_party" || die
+	rm -r "${ED}/usr/include/tg_owt/third_party" || die
+
+	# Install a few headers anyway, as required by net-im/telegram-desktop...
+	local headers=(
+		third_party/libyuv/include
+		rtc_base/third_party/sigslot
+		rtc_base/third_party/base64
+	)
+	for dir in "${headers[@]}"; do
+		pushd "${S}/src/${dir}" > /dev/null || die
+		find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/${dir}/{}" \; || die
+		popd > /dev/null || die
+	done
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index cf7e1e6327ba..8af535cae259 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 9b67a2748af5..fa97f108dfd5 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 02 Aug 2022 19:39:43 +0000
+Wed, 03 Aug 2022 01:39:44 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index d2ada1ab79fb..66395fbc5d60 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518764 BLAKE2B 800d8c605261a8d2ca31eca4bde7d3bb3f684de4f3181019daf03f289f18680c6d96f494d58f96fe4ad07cdd9e1d88375337c122e7b8e08a991332389d887299 SHA512 aedc41e29d7be49299b1cb0ff40f391a2deff64b9b55c25130ff0d38269f249b737b1d372d346ecfc163d0044fae33a0e164e57a26c205b60f17269607a8117b
-TIMESTAMP 2022-08-02T19:39:47Z
+TIMESTAMP 2022-08-03T01:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLpfYNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLp0eRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCyAA//Q0U2eO51oNQlaWN/p9L2rOersJHUQVL4gAjGa+Z+gfwgG4CCoZ8kr/8a
-lSndyF+Re4iSPy0ZZkeqBxJPSjTb3jqGUWBKIeQ4FhrnJ07+q207II/IhgXnSlqo
-xd0CVJjs8+zQGnUUV+tqJETj/uptxkUIBFRtllpHuLCJLAcy+a/sw1mm5I1kPnty
-t79NwBI+eVWh/Tk63IW3iAXzU/wMtVw5M7mrkV34XMMBZOLN00vzkAMHiJjGq5kZ
-rH1EvVNTIcSAVLR9+whbDViWgSUQphRhid4hGMCSdh5OCbPxbQLOTygZ+rbcMVgH
-5KWQIDCYRlpTh+fFH2vUkc1hesF6vbZFR/q3fG7irLyfRxqfFUSX3rYIzyMChwSM
-Ec1bjZ/wboL/Oh1UeOoFcmx/C7GQeOGJFnB62CL+zQGQIEUQi1IFhMfBPcQwAjDv
-c/1L6g+elFa0zHpqQwexm3y82Oly2PamfqAABed3q5PiurUtdoyn4cd9FJVUlLYR
-mG19dZdcUwl/ZdaJ2sLsVK/Yu0878T8cUhO8qtH611UNIVX1j5+8OyZCjBt+Dc/M
-jwI4dsAU+qwi48vP9K1bP6XQQMdemtBH5dX2OhLmWjhZcxugLtXblVNLSMCgsPX3
-c4iSTcpjXi9p7S9zuaWkLMu85vb/bwSjiWtKYct1lHSDyyggUiE=
-=NMvi
+klCi4hAAqhEfqV3hZKRPtWGqRNy9DvVdSzVu6zllAWpx/MiqEAEfgRSIAFSyh5V0
+RRp4q53Js/X6s1+tzREkBVEGG0sMND7ueH7RQ29CkjBG2aZsOizTl6g3ic+T3JZl
++vTp9pXA8Jimd0fTPzPFcuV4yXJgXORQeUpcg14q0di8fjB/77o9rKZREslMBDLN
+oUFqawJqpDJzgB5DLSbVZW6DAnRejiQBMmzq/Sw7+7AqAbqrUAuHQTcZ3cVOs8Ts
+WvyvsoZeff9DenQ1gaXTNIKbCzBVZ5bSPSolZlgqt7Vt1cd1HTP/4QYjFYOj8aHY
+KChxeE38llxUJ9weWIk5ggtHIxnyPa5FoKEdp6IkJmHul6Dq7MdHnTQ1iikLGPFD
+fJ7rr8VtAxF/18qkun4Vy6eRoKvpIDVwVZAqAELjNgiGV1nM86xtVksOn2FYE4wJ
+aG+s2P7w7KhVgOCzTCDxKnZUsas2xASfHtbaiCrBv2EKHTGshx9eofNh/ACyHi4T
+c9FLJn8/vxPogBYHaCM6y7jstiUme9vy+kE8z3pvX6ouNr7oF66Eg3O0HchHefVD
+JWt9rwg1H4I0gQkozfbns0UQ+him4Ddj3swEGDBCnrO3A3LDdQTnQuQD8IgcXBqH
+HyIZZQtoX5+HBkqTrkFN0bjJ18fMW72Dtx/A0dc5Ndzqn91T7GY=
+=JeG3
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index eb2f48ded6e5..ff2df3e96fbb 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 02 Aug 2022 19:39:44 +0000
+Wed, 03 Aug 2022 01:39:45 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e1ff2306066a..0085c3c1bd0c 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index ce3d7d1b327a..a77540a663f2 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/pwgen-2.08-r1 b/metadata/md5-cache/app-admin/pwgen-2.08-r1
index 92bc4540577b..7b7064a4bdbd 100644
--- a/metadata/md5-cache/app-admin/pwgen-2.08-r1
+++ b/metadata/md5-cache/app-admin/pwgen-2.08-r1
@@ -3,8 +3,8 @@ DESCRIPTION=Password Generator
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/pwgen/
 IUSE=livecd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/pwgen/pwgen-2.08.tar.gz
-_md5_=95a4aada4d7f926236c62ed2df362f2f
+_md5_=97e4cbf36a08cf4c0f8a01980a99e00a
diff --git a/metadata/md5-cache/app-admin/vault-1.11.2 b/metadata/md5-cache/app-admin/vault-1.11.2
new file mode 100644
index 000000000000..6ddc529f61e0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-1.11.2
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/zip dev-go/gox >=dev-lang/go-1.15.3 filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=acct-group/vault acct-user/vault
+DESCRIPTION=A tool for managing secrets
+EAPI=7
+HOMEPAGE=https://vaultproject.io/
+INHERIT=fcaps go-module systemd
+IUSE=+webui +filecaps
+KEYWORDS=~amd64 ~arm64
+LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
+RDEPEND=acct-group/vault acct-user/vault filecaps? ( sys-libs/libcap )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/zmedico/vault/archive/refs/tags/v1.11.2-vendor.tar.gz -> vault-1.11.2-vendor.tar.gz webui? ( https://dev.gentoo.org/~zmedico/dist/vault-1.11.2-webui.tar.xz )
+_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=668064f193327672401ce5ffdb8b7054
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 55cefb0c7cbb..417e2e33e5d8 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 ffb859146633..d0bddd41ef88 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_=ecdc1576782116e4443729c625757eee
+_md5_=479235588ffe5cbc7bac0d349f4cfce6
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index c78c3082ac23..6f90b8220d00 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/hamcrest-2.2 b/metadata/md5-cache/dev-java/hamcrest-2.2
index 77e3b89aefa0..acb98d34778f 100644
--- a/metadata/md5-cache/dev-java/hamcrest-2.2
+++ b/metadata/md5-cache/dev-java/hamcrest-2.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://hamcrest.org/JavaHamcrest/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hamcrest/JavaHamcrest/archive/v2.2.tar.gz -> hamcrest-2.2.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=009e5804cbaa2f03192e2e8432875d9e
+_md5_=38ef113ad5e5e4a2b0f07d3dfe42e3fa
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 7710d3652321..376eb873db1f 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/eisl-2.50 b/metadata/md5-cache/dev-lang/eisl-2.50
index e1e03990129c..4a10cb5052d1 100644
--- a/metadata/md5-cache/dev-lang/eisl-2.50
+++ b/metadata/md5-cache/dev-lang/eisl-2.50
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sasagawa888/eisl/archive/v2.50.tar.gz -> eisl-2.50.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=41cbb74ef234b33fcfff017169a9e2c1
+_md5_=0116206dbf5735a64ca63574154d8ece
diff --git a/metadata/md5-cache/dev-lang/go-1.17.13 b/metadata/md5-cache/dev-lang/go-1.17.13
deleted file mode 100644
index 96c8f9ee42e5..000000000000
--- a/metadata/md5-cache/dev-lang/go-1.17.13
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
-DEFINED_PHASES=compile install postinst test
-DESCRIPTION=A concurrent garbage collected and typesafe programming language
-EAPI=7
-HOMEPAGE=https://go.dev
-INHERIT=toolchain-funcs
-IUSE=cpu_flags_x86_sse2
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=BSD
-RESTRICT=strip
-SLOT=0/1.17.13
-SRC_URI=https://storage.googleapis.com/golang/go1.17.13.src.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fc24210a0aa57f21008ae4e77fc81606
diff --git a/metadata/md5-cache/dev-lang/go-1.18.4 b/metadata/md5-cache/dev-lang/go-1.18.4
index dd8f9a897b27..adb32e4762ac 100644
--- a/metadata/md5-cache/dev-lang/go-1.18.4
+++ b/metadata/md5-cache/dev-lang/go-1.18.4
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0/1.18.4
 SRC_URI=https://storage.googleapis.com/golang/go1.18.4.src.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ac3453c815991c44ecf86884873769c6
+_md5_=9879ba0696ec1c9f8fc9cc3e4bc2f035
diff --git a/metadata/md5-cache/dev-lang/go-1.18.5 b/metadata/md5-cache/dev-lang/go-1.18.5
index 7f735296655a..6dd1834dbdee 100644
--- a/metadata/md5-cache/dev-lang/go-1.18.5
+++ b/metadata/md5-cache/dev-lang/go-1.18.5
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0/1.18.5
 SRC_URI=https://storage.googleapis.com/golang/go1.18.5.src.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fc24210a0aa57f21008ae4e77fc81606
+_md5_=2546eb2cff0bc2bd5b288dc0f5b78f0b
diff --git a/metadata/md5-cache/dev-lang/go-1.17.12 b/metadata/md5-cache/dev-lang/go-1.19
index e449c9f38f73..3d194992cc55 100644
--- a/metadata/md5-cache/dev-lang/go-1.17.12
+++ b/metadata/md5-cache/dev-lang/go-1.19
@@ -5,10 +5,9 @@ EAPI=7
 HOMEPAGE=https://go.dev
 INHERIT=toolchain-funcs
 IUSE=cpu_flags_x86_sse2
-KEYWORDS=-* amd64 arm arm64 ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RESTRICT=strip
-SLOT=0/1.17.12
-SRC_URI=https://storage.googleapis.com/golang/go1.17.12.src.tar.gz
+SLOT=0/1.19
+SRC_URI=https://storage.googleapis.com/golang/go1.19.src.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ac3453c815991c44ecf86884873769c6
+_md5_=0720f989c1899b9806c341d7086688cf
diff --git a/metadata/md5-cache/dev-lang/go-9999 b/metadata/md5-cache/dev-lang/go-9999
index b09a7c22843c..e1792998b5a2 100644
--- a/metadata/md5-cache/dev-lang/go-9999
+++ b/metadata/md5-cache/dev-lang/go-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RESTRICT=strip
 SLOT=0/9999
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fc24210a0aa57f21008ae4e77fc81606
+_md5_=2546eb2cff0bc2bd5b288dc0f5b78f0b
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 581df4478f49..1096e3746466 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/libpfm-4.11.0 b/metadata/md5-cache/dev-libs/libpfm-4.11.0
index bc5eeebd84e9..afc663885280 100644
--- a/metadata/md5-cache/dev-libs/libpfm-4.11.0
+++ b/metadata/md5-cache/dev-libs/libpfm-4.11.0
@@ -4,9 +4,9 @@ EAPI=7
 HOMEPAGE=http://perfmon2.sourceforge.net
 INHERIT=toolchain-funcs
 IUSE=static-libs
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2 MIT
 SLOT=0/4
 SRC_URI=mirror://sourceforge/perfmon2/libpfm4/libpfm-4.11.0.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9388cd17d6ce622257a69b11f7a66463
+_md5_=436032a6d8ef89d6f943357c4a3e53ce
diff --git a/metadata/md5-cache/dev-python/Frozen-Flask-0.18-r1 b/metadata/md5-cache/dev-python/Frozen-Flask-0.18-r1
index f709afef7965..eba46a25a607 100644
--- a/metadata/md5-cache/dev-python/Frozen-Flask-0.18-r1
+++ b/metadata/md5-cache/dev-python/Frozen-Flask-0.18-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Frozen-Flask/Frozen-Flask/ https://pypi.org/project/Frozen-Flask/
 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=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Frozen-Flask/Frozen-Flask-0.18.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0f3857d1410056d5ca6dd83c5e517841
+_md5_=0b091255ac0615d6f1e32398a74ce4fb
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index d7d29ca5497d..b8bf81441444 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/PyQt6-6.3.1 b/metadata/md5-cache/dev-python/PyQt6-6.3.1
new file mode 100644
index 000000000000..a1553f58e425
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt6-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/PyQt-builder-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtbase-6.3:6 sys-devel/gcc dbus? ( virtual/pkgconfig ) 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/sip-6.6.2[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-qt/qtbase-6.3:6[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml(+)?] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.3:6[designer] ) help? ( >=dev-qt/qttools-6.3:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.3:6 ) positioning? ( >=dev-qt/qtpositioning-6.3:6 ) qml? ( >=dev-qt/qtdeclarative-6.3:6 ) quick3d? ( >=dev-qt/qtquick3d-6.3:6 ) serialport? ( >=dev-qt/qtserialport-6.3:6 ) svg? ( >=dev-qt/qtsvg-6.3:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.3:6 ) websockets? ( >=dev-qt/qtwebsockets-6.3:6 )
+DESCRIPTION=Python bindings for the Qt framework
+EAPI=8
+HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/
+INHERIT=distutils-r1 flag-o-matic multiprocessing qmake-utils
+IUSE=+dbus debug qml designer examples gles2-only +gui help multimedia +network opengl positioning printsupport quick quick3d serialport +sql +ssl svg testlib webchannel websockets +widgets +xml python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=dev-qt/qtbase-6.3:6[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml(+)?] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.3:6[designer] ) help? ( >=dev-qt/qttools-6.3:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.3:6 ) positioning? ( >=dev-qt/qtpositioning-6.3:6 ) qml? ( >=dev-qt/qtdeclarative-6.3:6 ) quick3d? ( >=dev-qt/qtquick3d-6.3:6 ) serialport? ( >=dev-qt/qtserialport-6.3:6 ) svg? ( >=dev-qt/qtsvg-6.3:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.3:6 ) websockets? ( >=dev-qt/qtwebsockets-6.3:6 ) >=dev-python/PyQt6_sip-13.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=designer? ( gui widgets ) help? ( gui widgets ) multimedia? ( gui network ) opengl? ( gui ) printsupport? ( gui widgets ) qml? ( network ) quick3d? ( gui qml ) quick? ( gui qml ) sql? ( widgets ) svg? ( gui ) testlib? ( gui widgets ) webchannel? ( network ) websockets? ( network ) widgets? ( gui ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyQt6/PyQt6-6.3.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ac1c151e84f5845035a0f9eac53d5fac
diff --git a/metadata/md5-cache/dev-python/PyQt6_WebEngine-6.3.1 b/metadata/md5-cache/dev-python/PyQt6_WebEngine-6.3.1
new file mode 100644
index 000000000000..051bb2682459
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt6_WebEngine-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/PyQt-builder-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtbase-6.3:6 sys-devel/gcc 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/sip-6.6.2[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/PyQt6-6.3.1[gui,ssl,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtbase-6.3:6 >=dev-qt/qtwebengine-6.3:6[widgets] quick? ( dev-python/PyQt6[qml] ) widgets? ( dev-python/PyQt6[network,printsupport,webchannel,widgets] )
+DESCRIPTION=Python bindings for QtWebEngine
+EAPI=8
+HOMEPAGE=https://www.riverbankcomputing.com/software/pyqtwebengine/
+INHERIT=distutils-r1 flag-o-matic multiprocessing qmake-utils
+IUSE=debug quick +widgets python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=dev-python/PyQt6-6.3.1[gui,ssl,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtbase-6.3:6 >=dev-qt/qtwebengine-6.3:6[widgets] quick? ( dev-python/PyQt6[qml] ) widgets? ( dev-python/PyQt6[network,printsupport,webchannel,widgets] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyQt6_WebEngine/PyQt6_WebEngine-6.3.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=eef6cd96b09e0e9abcb7e728cf824f9f
diff --git a/metadata/md5-cache/dev-python/PyQt6_sip-13.4.0 b/metadata/md5-cache/dev-python/PyQt6_sip-13.4.0
new file mode 100644
index 000000000000..18cb22db2b8e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt6_sip-13.4.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-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=sip module support for PyQt6
+EAPI=8
+HOMEPAGE=https://www.riverbankcomputing.com/software/sip/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 SIP )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyQt6_sip/PyQt6_sip-13.4.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=995d48e9993e973b768f48ba78648f40
diff --git a/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.10.0 b/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.10.0
index d0e32048de6c..661c2e619cb9 100644
--- a/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.10.0
+++ b/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.10.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/aws/aws-xray-sdk-python/ https://pypi.org/project/aws-xray-sdk/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/botocore-1.12.122[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wrapt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-xray-sdk-python/archive/2.10.0.tar.gz -> aws-xray-sdk-python-2.10.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_=ded66fe60686cd62536137362a2c9b2a
+_md5_=81270e55beec72de0adba4c8f676fb9c
diff --git a/metadata/md5-cache/dev-python/bottleneck-1.3.5 b/metadata/md5-cache/dev-python/bottleneck-1.3.5
index 97e0c22ab803..8be413b5672f 100644
--- a/metadata/md5-cache/dev-python/bottleneck-1.3.5
+++ b/metadata/md5-cache/dev-python/bottleneck-1.3.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pydata/bottleneck/ https://pypi.org/project/Bottleneck/
 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 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pydata/bottleneck/archive/v1.3.5.tar.gz -> bottleneck-1.3.5.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=70ea7857f8c5bf914e458a1d7686cee8
+_md5_=16f5cdf1a4a8c1928cac82901c6cac4b
diff --git a/metadata/md5-cache/dev-python/cffi-1.15.1 b/metadata/md5-cache/dev-python/cffi-1.15.1
index 5103adecd1c5..3b594e4fb6ef 100644
--- a/metadata/md5-cache/dev-python/cffi-1.15.1
+++ b/metadata/md5-cache/dev-python/cffi-1.15.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://cffi.readthedocs.io/ https://pypi.org/project/cffi/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=doc test 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-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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=MIT
 RDEPEND=dev-libs/libffi:= dev-python/pycparser[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 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.15.1
 SRC_URI=mirror://pypi/c/cffi/cffi-1.15.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bb5d93f638cbf26121dc520d7b8e182b
+_md5_=ef28f106c50a1ff2b1842de543e681b9
diff --git a/metadata/md5-cache/dev-python/dulwich-0.20.44 b/metadata/md5-cache/dev-python/dulwich-0.20.44
index db29af4de946..bbb4a34634f9 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.20.44
+++ b/metadata/md5-cache/dev-python/dulwich-0.20.44
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/
 INHERIT=distutils-r1
 IUSE=doc examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ Apache-2.0
 RDEPEND=dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.20.44.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f3a284d0b83136f3e7818126655dace0
+_md5_=af185bacc3ade63f24a3e082288fcea1
diff --git a/metadata/md5-cache/dev-python/lit-14.0.6 b/metadata/md5-cache/dev-python/lit-14.0.6
index e1e7ca0b2c9b..a41f739d8b98 100644
--- a/metadata/md5-cache/dev-python/lit-14.0.6
+++ b/metadata/md5-cache/dev-python/lit-14.0.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=distutils-r1 llvm.org
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	llvm.org	67f55755cc49864ddaddee8d3c7bb68d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=a823c719fa2670ad380d17b3a600a704
+_md5_=a62a9c63dc9a58c2963bf6100ac1249c
diff --git a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-1.1.0 b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-1.1.0
index d49bdc8eca01..a6fac3e09c03 100644
--- a/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-1.1.0
+++ b/metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-1.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/ https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
 INHERIT=distutils-r1 docs
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/Babel-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/GitPython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/archive/v1.1.0.tar.gz -> mkdocs-git-revision-date-localized-plugin-1.1.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	docs	8ed2a8a28ff109e7a3582c9abb7fe327	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b8158a3a66b43811d65ae500766ea637
+_md5_=e480cc5bd3029db49e8bdbdd800848f8
diff --git a/metadata/md5-cache/dev-python/pecan-1.4.2 b/metadata/md5-cache/dev-python/pecan-1.4.2
index 0054d40ec0ee..d1a8960d0be0 100644
--- a/metadata/md5-cache/dev-python/pecan-1.4.2
+++ b/metadata/md5-cache/dev-python/pecan-1.4.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pecan/pecan/ https://pypi.org/project/pecan/
 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 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-python/webob-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mako-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/logutils-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pecan/pecan-1.4.2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=58647eba866eb1572bcef7e3b3083e55
+_md5_=f4b5d491187156cee61cc504ed4af7ae
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.52 b/metadata/md5-cache/dev-python/phonenumbers-8.12.52
index 41ba81ee0a30..ed05ef5986a2 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.52
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.52
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers/ https://pypi.org/project/phonenumbers/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/daviddrysdale/python-phonenumbers/archive/v8.12.52.tar.gz -> python-phonenumbers-8.12.52.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ace22bdcc29265ea793f8ce1640c3bd8
+_md5_=898e6d8846897853679b4b2098191410
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.24 b/metadata/md5-cache/dev-python/pocketlint-0.24
index 0ba4ff663b96..80b432799a79 100644
--- a/metadata/md5-cache/dev-python/pocketlint-0.24
+++ b/metadata/md5-cache/dev-python/pocketlint-0.24
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/rhinstaller/pocketlint/ https://pypi.org/project/pocketlint/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pylint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] 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/rhinstaller/pocketlint/archive/0.24.tar.gz -> pocketlint-0.24.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=46ac47e343ce2efd7f46405eb7b89c02
+_md5_=37f07c0c4ced7f80b64a7bded17f510a
diff --git a/metadata/md5-cache/dev-python/pyaudio-0.2.11-r2 b/metadata/md5-cache/dev-python/pyaudio-0.2.11-r2
index da19910e002f..358addc9dce5 100644
--- a/metadata/md5-cache/dev-python/pyaudio-0.2.11-r2
+++ b/metadata/md5-cache/dev-python/pyaudio-0.2.11-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://people.csail.mit.edu/hubert/pyaudio/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=MIT
 RDEPEND=media-libs/portaudio 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 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyAudio/PyAudio-0.2.11.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=def119f83e2e99e7e9bc35a4084202e8
+_md5_=3b031af09165bdedf9a92f194d1e95c8
diff --git a/metadata/md5-cache/dev-python/pycxx-7.1.5-r1 b/metadata/md5-cache/dev-python/pycxx-7.1.5-r1
index 705bab9c1758..c43828d32d44 100644
--- a/metadata/md5-cache/dev-python/pycxx-7.1.5-r1
+++ b/metadata/md5-cache/dev-python/pycxx-7.1.5-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://cxx.sourceforge.net
 INHERIT=distutils-r1
 IUSE=doc examples python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cxx/pycxx-7.1.5.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=67171cd8a330241d0ab40ac690ebc558
+_md5_=43cf24bfeadc0fb93b24a0ef7557cfb5
diff --git a/metadata/md5-cache/dev-python/pyside2-5.15.2-r2 b/metadata/md5-cache/dev-python/pyside2-5.15.2-r2
index f3a8823844cc..7ff61fb347ba 100644
--- a/metadata/md5-cache/dev-python/pyside2-5.15.2-r2
+++ b/metadata/md5-cache/dev-python/pyside2-5.15.2-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide2
 INHERIT=cmake python-r1 virtualx
 IUSE=3d charts concurrent datavis designer gles2-only +gui help location multimedia +network positioning printsupport qml quick script scripttools scxml sensors speech sql svg test testlib webchannel webengine websockets +widgets x11extras xml xmlpatterns python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 x86
 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 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/shiboken2-5.15.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-qt/qtcore:5= dev-qt/qtopengl:5= dev-qt/qtserialport:5= 3d? ( >=dev-qt/qt3d-5.15:5[qml?] ) charts? ( >=dev-qt/qtcharts-5.15:5[qml?] ) concurrent? ( >=dev-qt/qtconcurrent-5.15:5 ) datavis? ( >=dev-qt/qtdatavis3d-5.15:5[qml?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[jpeg,gles2-only?] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[qml?,widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5[qml?] ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) qml? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) script? ( >=dev-qt/qtscript-5.15:5 ) scxml? ( >=dev-qt/qtscxml-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5[qml?] ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5[qml?] ) webengine? ( >=dev-qt/qtwebengine-5.15:5[widgets?] ) websockets? ( >=dev-qt/qtwebsockets-5.15:5[qml?] ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xml? ( >=dev-qt/qtxml-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5[qml?] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) 3d? ( gui network ) charts? ( widgets ) datavis? ( gui ) designer? ( widgets xml ) gles2-only? ( gui ) help? ( widgets ) location? ( positioning ) multimedia? ( gui network ) printsupport? ( widgets ) qml? ( gui network ) quick? ( qml ) scripttools? ( gui script widgets ) speech? ( multimedia ) sql? ( widgets ) svg? ( widgets ) testlib? ( widgets ) webengine? ( location quick widgets? ( gui network printsupport webchannel ) ) websockets? ( network ) widgets? ( gui ) x11extras? ( gui )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.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_=4e85e2016156bce22cd3589f28d4c507
+_md5_=bfab7a9c6c00ae1568de176ad2359888
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.9.5 b/metadata/md5-cache/dev-python/requests-cache-0.9.5
index 01d7300374ec..fabfb406676f 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.9.5
+++ b/metadata/md5-cache/dev-python/requests-cache-0.9.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/requests-cache/requests-cache/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/cattrs-22.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/requests-cache/requests-cache/archive/v0.9.5.tar.gz -> requests-cache-0.9.5.gh.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_=0a9b8baf888a861ff95e611b903b8cbd
+_md5_=c682fec58e21a1f2600afb84cc94c537
diff --git a/metadata/md5-cache/dev-python/shiboken2-5.15.2-r2 b/metadata/md5-cache/dev-python/shiboken2-5.15.2-r2
index f85b60733b89..b09d82d0fdda 100644
--- a/metadata/md5-cache/dev-python/shiboken2-5.15.2-r2
+++ b/metadata/md5-cache/dev-python/shiboken2-5.15.2-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.qt.io/PySide2
 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 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 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/qtcore-5.15:5 sys-devel/clang:= sys-devel/clang-runtime:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 >=dev-qt/qtxml-5.15:5 >=dev-qt/qtxmlpatterns-5.15:5 ) 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 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.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_=787e1934709383bd53ea4b129ff6f65d
+_md5_=ddb184767b71f657d9829c11b976e9b2
diff --git a/metadata/md5-cache/dev-python/tempest-31.1.0 b/metadata/md5-cache/dev-python/tempest-31.1.0
index 80597a12a75b..6a4d313a0083 100644
--- a/metadata/md5-cache/dev-python/tempest-31.1.0
+++ b/metadata/md5-cache/dev-python/tempest-31.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/ https://launchpad.net/tempest/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/cliff-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/paramiko-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-utils-4.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.21.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempest/tempest-31.1.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d8788ea9a9c32fcd33d4b109ede9fb50
+_md5_=867a79301c819cb40b89df87434bea6e
diff --git a/metadata/md5-cache/dev-python/textdistance-4.3.0 b/metadata/md5-cache/dev-python/textdistance-4.3.0
index 29fb227142f4..9c2ea603d1c3 100644
--- a/metadata/md5-cache/dev-python/textdistance-4.3.0
+++ b/metadata/md5-cache/dev-python/textdistance-4.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/life4/textdistance
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/life4/textdistance/archive/4.3.0.tar.gz -> textdistance-4.3.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_=21fad5381567444452033a6f4f63ec13
+_md5_=c211eb2784c6c07e020bd3eb27294fbf
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.7.2 b/metadata/md5-cache/dev-python/translate-toolkit-3.7.2
index 47961a7d37a9..19791741bf75 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.7.2
+++ b/metadata/md5-cache/dev-python/translate-toolkit-3.7.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/translate/translate/ https://pypi.org/project/translate-toolkit/
 INHERIT=distutils-r1
 IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=!dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cheroot[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ruamel-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ical? ( dev-python/vobject[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/translate/translate/archive/3.7.2.tar.gz -> translate-3.7.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=202d4b41673308aff44c1eb1e51202b3
+_md5_=1dc5870ca2ca066199a8f7572d5962c5
diff --git a/metadata/md5-cache/dev-python/wxpython-4.0.7-r2 b/metadata/md5-cache/dev-python/wxpython-4.0.7-r2
index 526d1a7e6f29..f4938d017e73 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.0.7-r2
+++ b/metadata/md5-cache/dev-python/wxpython-4.0.7-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.wxpython.org/
 INHERIT=distutils-r1 multiprocessing virtualx wxwidgets
 IUSE=test webkit python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=wxWinLL-3
 RDEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 media-libs/libjpeg-turbo: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 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=4.0
 SRC_URI=mirror://pypi/w/wxPython/wxPython-4.0.7.post2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	7b65c41111cd80a4d4a0921e8d4a310c	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
-_md5_=cd27e3eb29476762a91ba7f7bef4f07a
+_md5_=c188a95f9f77d0ad77c0f9b3fc73954a
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index f89a9a4816cb..fb167b83dd9a 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/qt5compat-6.3.1 b/metadata/md5-cache/dev-qt/qt5compat-6.3.1
new file mode 100644
index 000000000000..9a12f2ddd7a7
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt5compat-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-qt/qtbase-6.3.1*[gui,network] =dev-qt/qtdeclarative-6.3.1*
+DESCRIPTION=Qt module containing the unsupported Qt 5 APIs
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.3.1*[gui,network] =dev-qt/qtdeclarative-6.3.1*
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qt5compat-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8fb885ea4741ce8121c5441ee5642350
diff --git a/metadata/md5-cache/dev-qt/qtbase-6.3.1 b/metadata/md5-cache/dev-qt/qtbase-6.3.1
new file mode 100644
index 000000000000..206431447a4f
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtbase-6.3.1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode] dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= media-libs/tiff:0 >=sys-apps/dbus-1.4.20 sys-libs/zlib:= brotli? ( app-arch/brotli:= ) evdev? ( sys-libs/mtdev ) freetds? ( dev-db/freetds ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) gssapi? ( virtual/krb5 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) gui? ( media-libs/libpng:0= ) icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) jpeg? ( media-libs/libjpeg-turbo:= ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) libproxy? ( net-libs/libproxy ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tslib? ( >=x11-libs/tslib-1.21 ) udev? ( virtual/libudev:= ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=Cross-platform application development framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=+concurrent +dbus +gui +network +sql opengl +widgets zstd accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X brotli gssapi libproxy sctp +ssl vnc freetds mysql oci8 odbc postgres +sqlite cups gtk icu systemd +udev debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=app-crypt/libb2 dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2:=[pcre16,unicode] dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= media-libs/tiff:0 >=sys-apps/dbus-1.4.20 sys-libs/zlib:= brotli? ( app-arch/brotli:= ) evdev? ( sys-libs/mtdev ) freetds? ( dev-db/freetds ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) gssapi? ( virtual/krb5 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) gui? ( media-libs/libpng:0= ) icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) jpeg? ( media-libs/libjpeg-turbo:= ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) libproxy? ( net-libs/libproxy ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tslib? ( >=x11-libs/tslib-1.21 ) udev? ( virtual/libudev:= ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=opengl? ( gui ) widgets? ( gui ) X? ( || ( evdev libinput ) ) accessibility? ( gui ) egl? ( gui ) eglfs? ( gui ) evdev? ( gui ) gles2-only? ( gui ) jpeg? ( gui ) libinput? ( gui ) tslib? ( gui ) tuio? ( gui ) vulkan? ( gui ) X? ( gui ) brotli? ( network ) gssapi? ( network ) libproxy? ( network ) sctp? ( network ) ssl? ( network ) vnc? ( network ) freetds? ( sql ) mysql? ( sql ) oci8? ( sql ) odbc? ( sql ) postgres? ( sql ) sqlite? ( sql ) accessibility? ( dbus X ) cups? ( gui widgets ) eglfs? ( egl ) gtk? ( widgets ) gui? ( || ( eglfs X ) || ( libinput X ) ) libinput? ( udev ) sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) ) vnc? ( gui ) X? ( gles2-only? ( egl ) )
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtbase-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=64f0656789378ddba3066ea7db171516
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-6.3.1 b/metadata/md5-cache/dev-qt/qtdeclarative-6.3.1
new file mode 100644
index 000000000000..318ffb096221
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-qt/qtbase-6.3.1*[network,opengl=,sql=,widgets=] =dev-qt/qtshadertools-6.3.1*
+DESCRIPTION=Qt Declarative (Quick 2)
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=opengl +sql +widgets debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.3.1*[network,opengl=,sql=,widgets=] =dev-qt/qtshadertools-6.3.1*
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtdeclarative-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0016adc3c79b086a207f622d162ab977
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-6.3.1 b/metadata/md5-cache/dev-qt/qtmultimedia-6.3.1
new file mode 100644
index 000000000000..2eef745ba73f
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-qt/qtbase-6.3.1*[gui,network,widgets] =dev-qt/qtdeclarative-6.3.1* =dev-qt/qtshadertools-6.3.1* =dev-qt/qtsvg-6.3.1* gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 media-libs/libglvnd ) gstreamer? ( x11-base/xorg-proto )
+DESCRIPTION=Qt Multimedia
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=gstreamer debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.3.1*[gui,network,widgets] =dev-qt/qtdeclarative-6.3.1* =dev-qt/qtshadertools-6.3.1* =dev-qt/qtsvg-6.3.1* gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 media-libs/libglvnd )
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtmultimedia-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2641f88fda9b18261e76cf3924adab5f
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-6.3.1 b/metadata/md5-cache/dev-qt/qtpositioning-6.3.1
new file mode 100644
index 000000000000..7e24c31efac4
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtpositioning-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-qt/qtbase-6.3.1*[dbus,gui,widgets] =dev-qt/qtdeclarative-6.3.1* =dev-qt/qtserialport-6.3.1*
+DESCRIPTION=Physical position determination library for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.3.1*[dbus,gui,widgets] =dev-qt/qtdeclarative-6.3.1* =dev-qt/qtserialport-6.3.1*
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtpositioning-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7d4d0965b2b56214373007c3e408deee
diff --git a/metadata/md5-cache/dev-qt/qtquick3d-6.3.1 b/metadata/md5-cache/dev-qt/qtquick3d-6.3.1
new file mode 100644
index 000000000000..a052dfd4221e
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquick3d-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-qt/qtbase-6.3.1*[concurrent,network,widgets] =dev-qt/qtdeclarative-6.3.1* =dev-qt/qtshadertools-6.3.1* =dev-qt/qtquicktimeline-6.3.1* media-libs/assimp:=
+DESCRIPTION=Qt module and API for defining 3D content in Qt QuickTools
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.3.1*[concurrent,network,widgets] =dev-qt/qtdeclarative-6.3.1* =dev-qt/qtshadertools-6.3.1* =dev-qt/qtquicktimeline-6.3.1* media-libs/assimp:=
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtquick3d-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8c520392cdc7372966fabfc3a6f95ac7
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-6.3.1 b/metadata/md5-cache/dev-qt/qtquicktimeline-6.3.1
new file mode 100644
index 000000000000..aa445e25d252
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-qt/qtbase-6.3.1* =dev-qt/qtdeclarative-6.3.1*
+DESCRIPTION=Qt module for keyframe-based timeline construction
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.3.1* =dev-qt/qtdeclarative-6.3.1*
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtquicktimeline-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b87c878c11475947a8ac282f3e5ad930
diff --git a/metadata/md5-cache/dev-qt/qtserialport-6.3.1 b/metadata/md5-cache/dev-qt/qtserialport-6.3.1
new file mode 100644
index 000000000000..f26587a5edd2
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtserialport-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-qt/qtbase-6.3.1*[gui,widgets] virtual/libudev:=
+DESCRIPTION=Serial port abstraction library for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.3.1*[gui,widgets] virtual/libudev:=
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtserialport-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=993d496f3c435d7f503bc02bb443a134
diff --git a/metadata/md5-cache/dev-qt/qtshadertools-6.3.1 b/metadata/md5-cache/dev-qt/qtshadertools-6.3.1
new file mode 100644
index 000000000000..1b0a7eae9e74
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtshadertools-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-qt/qtbase-6.3.1*[gui]
+DESCRIPTION=Qt APIs and Tools for Graphics Pipelines
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.3.1*[gui]
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtshadertools-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=07373dfb3408650e85495e04fe9edbb1
diff --git a/metadata/md5-cache/dev-qt/qtsvg-6.3.1 b/metadata/md5-cache/dev-qt/qtsvg-6.3.1
new file mode 100644
index 000000000000..e4e3985837d9
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsvg-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-qt/qtbase-6.3.1*[gui,widgets] sys-libs/zlib:=
+DESCRIPTION=SVG rendering library for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.3.1*[gui,widgets] sys-libs/zlib:=
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtsvg-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5ea6cc64fed4cb463d396c01107f4a23
diff --git a/metadata/md5-cache/dev-qt/qttools-6.3.1 b/metadata/md5-cache/dev-qt/qttools-6.3.1
new file mode 100644
index 000000000000..b40acda74030
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qttools-6.3.1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-qt/qtbase-6.3.1*[network] assistant? ( =dev-qt/qtbase-6.3.1*[sql,widgets] ) designer? ( =dev-qt/qtbase-6.3.1*[widgets] ) distancefieldgenerator? ( =dev-qt/qtbase-6.3.1*[widgets] =dev-qt/qtdeclarative-6.3.1* ) pixeltool? ( =dev-qt/qtbase-6.3.1*[widgets] ) qdbus? ( =dev-qt/qtbase-6.3.1*[widgets] ) qdoc? ( sys-devel/clang:= ) qtdiag? ( =dev-qt/qtbase-6.3.1*[opengl,widgets] )
+DESCRIPTION=Qt Tools Collection
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=assistant designer distancefieldgenerator linguist pixeltool qdbus qdoc qtattributionsscanner qtdiag qtplugininfo debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.3.1*[network] assistant? ( =dev-qt/qtbase-6.3.1*[sql,widgets] ) designer? ( =dev-qt/qtbase-6.3.1*[widgets] ) distancefieldgenerator? ( =dev-qt/qtbase-6.3.1*[widgets] =dev-qt/qtdeclarative-6.3.1* ) pixeltool? ( =dev-qt/qtbase-6.3.1*[widgets] ) qdbus? ( =dev-qt/qtbase-6.3.1*[widgets] ) qdoc? ( sys-devel/clang:= ) qtdiag? ( =dev-qt/qtbase-6.3.1*[opengl,widgets] )
+REQUIRED_USE=linguist? ( designer )
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qttools-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=62680681509163e8e50e9c25983e8547
diff --git a/metadata/md5-cache/dev-qt/qtwayland-6.3.1 b/metadata/md5-cache/dev-qt/qtwayland-6.3.1
new file mode 100644
index 000000000000..1a36ef7b9898
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwayland-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/wayland-scanner >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/wayland =dev-qt/qtbase-6.3.1*[gui,opengl] =dev-qt/qtdeclarative-6.3.1* media-libs/libglvnd x11-libs/libxkbcommon
+DESCRIPTION=Wayland platform plugin for Qt
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/wayland =dev-qt/qtbase-6.3.1*[gui,opengl] =dev-qt/qtdeclarative-6.3.1* media-libs/libglvnd x11-libs/libxkbcommon
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtwayland-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=497933c5a1c7217083b0defdcccaf5ba
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-6.3.1 b/metadata/md5-cache/dev-qt/qtwebchannel-6.3.1
new file mode 100644
index 000000000000..4bf8468438bf
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-qt/qtbase-6.3.1*[concurrent] =dev-qt/qtdeclarative-6.3.1* =dev-qt/qtwebsockets-6.3.1*
+DESCRIPTION=Qt WebChannel
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.3.1*[concurrent] =dev-qt/qtdeclarative-6.3.1* =dev-qt/qtwebsockets-6.3.1*
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtwebchannel-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c72d25e986d96a8360c02433d5e56240
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-6.3.1 b/metadata/md5-cache/dev-qt/qtwebengine-6.3.1
new file mode 100644
index 000000000000..d74f5f6e571c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebengine-6.3.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/html5lib[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/html5lib[python_targets_python3_9(-)] ) ) dev-util/gperf dev-util/ninja dev-util/re2c net-libs/nodejs[ssl] sys-devel/bison sys-devel/flex >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtdeclarative-6.3.1* =dev-qt/qtwebchannel-6.3.1* media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libxcb:= x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( =dev-qt/qtpositioning-6.3.1* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse:= ) screencast? ( media-video/pipewire:= ) system-ffmpeg? ( media-video/ffmpeg:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtbase-6.3.1*[widgets] ) media-libs/libglvnd
+DESCRIPTION=Library for rendering dynamic web content in Qt6 C++ and QML applications
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
+IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtdeclarative-6.3.1* =dev-qt/qtwebchannel-6.3.1* media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libxcb:= x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( =dev-qt/qtpositioning-6.3.1* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-libs/libpulse:= ) screencast? ( media-video/pipewire:= ) system-ffmpeg? ( media-video/ffmpeg:= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtbase-6.3.1*[widgets] )
+REQUIRED_USE=designer? ( widgets )
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtwebengine-everywhere-src-6.3.1.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8750f99d2bbcf7d96162991174446aa3
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-6.3.1 b/metadata/md5-cache/dev-qt/qtwebsockets-6.3.1
new file mode 100644
index 000000000000..611526a75876
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-6.3.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-qt/qtbase-6.3.1*[network] =dev-qt/qtdeclarative-6.3.1*
+DESCRIPTION=Implementation of the WebSocket protocol for the Qt6 framework
+EAPI=8
+HOMEPAGE=https://www.qt.io/
+INHERIT=qt6-build
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtbase-6.3.1*[network] =dev-qt/qtdeclarative-6.3.1*
+RESTRICT=test
+SLOT=6/6.3
+SRC_URI=https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtwebsockets-everywhere-src-6.3.1.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	qt6-build	aea6db344535aafc2faccff4a671ab5b	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=09100504ba2841409a31061ff0c0682d
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 5083098953d7..f1e2544e748a 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/intel-graphics-compiler-1.0.11485 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11485-r2
index 563968c6d6ea..563968c6d6ea 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11485
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11485-r2
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 45126fb9b65e..004b23f04040 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/libtgvoip-2.4.4_p20220503 b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20220503
new file mode 100644
index 000000000000..64bd6b5f0ef5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20220503
@@ -0,0 +1,16 @@
+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 install prepare
+DEPEND=dev-libs/openssl:= media-libs/opus alsa? ( media-libs/alsa-lib ) dsp? ( media-libs/tg_owt:= ) pulseaudio? ( media-sound/pulseaudio )
+DESCRIPTION=VoIP library for Telegram clients
+EAPI=8
+HOMEPAGE=https://github.com/telegramdesktop/libtgvoip
+INHERIT=flag-o-matic autotools
+IUSE=+dsp +alsa pulseaudio
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+LICENSE=Unlicense
+RDEPEND=dev-libs/openssl:= media-libs/opus alsa? ( media-libs/alsa-lib ) dsp? ( media-libs/tg_owt:= ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=|| ( alsa pulseaudio )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/libtgvoip/archive/78a8e22bedb0d06004da8bafeba88b7474cb89a4.tar.gz -> libtgvoip-2.4.4_p20220503.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=51d88f1b24f4d3adbea0ace9fc39788a
diff --git a/metadata/md5-cache/media-libs/tg_owt-0_pre20220507 b/metadata/md5-cache/media-libs/tg_owt-0_pre20220507
new file mode 100644
index 000000000000..2d865c3d87f6
--- /dev/null
+++ b/metadata/md5-cache/media-libs/tg_owt-0_pre20220507
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-cpp/abseil-cpp-20211102.0:=[cxx17(+)] dev-libs/openssl:= dev-libs/protobuf:= media-libs/libjpeg-turbo:= >=media-libs/libvpx-1.10.0:= media-libs/openh264:= media-libs/opus media-video/ffmpeg:= dev-libs/crc32c screencast? ( dev-libs/glib:2 media-video/pipewire:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst )
+DESCRIPTION=WebRTC build for Telegram
+EAPI=8
+HOMEPAGE=https://github.com/desktop-app/tg_owt
+INHERIT=cmake flag-o-matic
+IUSE=screencast +X
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+LICENSE=BSD
+RDEPEND=>=dev-cpp/abseil-cpp-20211102.0:=[cxx17(+)] dev-libs/openssl:= dev-libs/protobuf:= media-libs/libjpeg-turbo:= >=media-libs/libvpx-1.10.0:= media-libs/openh264:= media-libs/opus media-video/ffmpeg:= dev-libs/crc32c screencast? ( dev-libs/glib:2 media-video/pipewire:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst )
+SLOT=0/20220507
+SRC_URI=https://github.com/desktop-app/tg_owt/archive/10d5f4bf77333ef6b43516f90d2ce13273255f41.tar.gz -> tg_owt-0_pre20220507.tar.gz https://archive.org/download/libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar/libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ab81bcaf25344fe757ee0fb50fe60116
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index a381d130763a..2622e94693b0 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/telegram-desktop-3.5.2-r1 b/metadata/md5-cache/net-im/telegram-desktop-3.5.2-r1
deleted file mode 100644
index 12559ee6cfee..000000000000
--- a/metadata/md5-cache/net-im/telegram-desktop-3.5.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/libdispatch dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20220117 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20220209[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-cpp/glibmm:2 dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) wayland? ( kde-frameworks/kwayland:= ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3*
-DESCRIPTION=Official desktop client for Telegram
-EAPI=8
-HOMEPAGE=https://desktop.telegram.org
-INHERIT=xdg cmake python-any-r1 optfeature flag-o-matic
-IUSE=+dbus enchant +hunspell +jemalloc screencast +spell wayland +X
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv
-LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
-RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/libdispatch dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20220117 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20220209[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-cpp/glibmm:2 dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) wayland? ( kde-frameworks/kwayland:= ) X? ( x11-libs/libxcb:= )
-REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) )
-SLOT=0
-SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v3.5.2/tdesktop-3.5.2-full.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=98b900acbf47ac487b007431c61686bf
diff --git a/metadata/md5-cache/net-im/telegram-desktop-4.0.2 b/metadata/md5-cache/net-im/telegram-desktop-4.0.2
new file mode 100644
index 000000000000..6acbc062f0e8
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-4.0.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/cmake-3.16 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/libdispatch dev-libs/openssl:= dev-libs/xxhash media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20220503 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20220507[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-cpp/glibmm:2 ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] ) qt6? ( dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?] dev-qt/qtsvg:6 dev-qt/qt5compat:6 wayland? ( dev-qt/qtwayland:6 ) ) X? ( x11-libs/libxcb:= ) dev-cpp/range-v3 =dev-cpp/ms-gsl-3*
+DESCRIPTION=Official desktop client for Telegram
+EAPI=8
+HOMEPAGE=https://desktop.telegram.org
+INHERIT=xdg cmake python-any-r1 optfeature
+IUSE=+dbus enchant +hunspell +jemalloc screencast +spell qt6 wayland +X
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
+RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/libdispatch dev-libs/openssl:= dev-libs/xxhash media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20220503 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20220507[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-cpp/glibmm:2 ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] ) !qt6? ( >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] ) qt6? ( dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?] dev-qt/qtsvg:6 dev-qt/qt5compat:6 wayland? ( dev-qt/qtwayland:6 ) ) X? ( x11-libs/libxcb:= )
+REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v4.0.2/tdesktop-4.0.2-full.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=20cc43ed0cb7fc739bfc79709e1b9734
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 4b47f175b937..774f1afbe592 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.36.5 b/metadata/md5-cache/net-libs/webkit-gtk-2.36.5-r1
index 2a5de604eb5d..d1a5d97bc587 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.36.5
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.36.5-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.36.5.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c5cfd24fce15ab6e2f3529a9f621016b
+_md5_=d516b2730ebce84e343e395057ae3db7
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 2318846c050e..a913f2225b48 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/unifi-7.2.91 b/metadata/md5-cache/net-wireless/unifi-7.2.91
new file mode 100644
index 000000000000..38d1b1b2610c
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-7.2.91
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=8
+HOMEPAGE=https://www.ubnt.com
+INHERIT=java-pkg-2 readme.gentoo-r1 systemd
+IUSE=systemd system-mongodb
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror
+SLOT=0/7.2
+SRC_URI=https://dl.ui.com/unifi/7.2.91-85c367a4aa/UniFi.unix.zip -> unifi-7.2.91.zip
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=526013c8a71f9bdca6fda4e325c1fa61
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 1bd7207158aa..360b5040fa60 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.43.0 b/metadata/md5-cache/sci-mathematics/lean-3.43.0
index 16444463f75a..6604520bc642 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.43.0
+++ b/metadata/md5-cache/sci-mathematics/lean-3.43.0
@@ -4,7 +4,7 @@ DEPEND=dev-libs/gmp:=
 DESCRIPTION=The Lean Theorem Prover
 EAPI=8
 HOMEPAGE=https://leanprover-community.github.io/
-INHERIT=cmake readme.gentoo-r1
+INHERIT=flag-o-matic cmake readme.gentoo-r1
 IUSE=debug +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/gmp:=
 SLOT=0/3
 SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.43.0.tar.gz -> lean-3.43.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1dbb54245f666317800e804dcaa55928
+_md5_=f0d389e88a1a23648dae7905e7812633
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.44.1 b/metadata/md5-cache/sci-mathematics/lean-3.44.1
index 700d4e4670f1..93a49584239c 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.44.1
+++ b/metadata/md5-cache/sci-mathematics/lean-3.44.1
@@ -4,7 +4,7 @@ DEPEND=dev-libs/gmp:=
 DESCRIPTION=The Lean Theorem Prover
 EAPI=8
 HOMEPAGE=https://leanprover-community.github.io/
-INHERIT=cmake readme.gentoo-r1
+INHERIT=flag-o-matic cmake readme.gentoo-r1
 IUSE=debug +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/gmp:=
 SLOT=0/3
 SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.44.1.tar.gz -> lean-3.44.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1dbb54245f666317800e804dcaa55928
+_md5_=f0d389e88a1a23648dae7905e7812633
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.45.0 b/metadata/md5-cache/sci-mathematics/lean-3.45.0
index e9367b471ae7..59b9b19feec4 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.45.0
+++ b/metadata/md5-cache/sci-mathematics/lean-3.45.0
@@ -4,7 +4,7 @@ DEPEND=dev-libs/gmp:=
 DESCRIPTION=The Lean Theorem Prover
 EAPI=8
 HOMEPAGE=https://leanprover-community.github.io/
-INHERIT=cmake readme.gentoo-r1
+INHERIT=flag-o-matic cmake readme.gentoo-r1
 IUSE=debug +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/gmp:=
 SLOT=0/3
 SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.45.0.tar.gz -> lean-3.45.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1dbb54245f666317800e804dcaa55928
+_md5_=f0d389e88a1a23648dae7905e7812633
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.9999 b/metadata/md5-cache/sci-mathematics/lean-3.9999
index f61517086a59..d5cef123a8d4 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.9999
+++ b/metadata/md5-cache/sci-mathematics/lean-3.9999
@@ -4,11 +4,11 @@ DEPEND=dev-libs/gmp:=
 DESCRIPTION=The Lean Theorem Prover
 EAPI=8
 HOMEPAGE=https://leanprover-community.github.io/
-INHERIT=cmake readme.gentoo-r1 git-r3
+INHERIT=flag-o-matic cmake readme.gentoo-r1 git-r3
 IUSE=debug +threads
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-libs/gmp:=
 SLOT=0/3
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1dbb54245f666317800e804dcaa55928
+_md5_=f0d389e88a1a23648dae7905e7812633
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.17 b/metadata/md5-cache/sci-mathematics/z3-4.8.17
index 6b47d6ee611f..abcb7219601c 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.17
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.17
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/Z3Prover/z3/
 INHERIT=cmake-multilib java-pkg-opt-2 python-single-r1
 IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/4.8
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.17.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	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=687a9952a51a33ddcd0e189d311996b8
+_md5_=205a56e48edcc13252039e15ef145e56
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 32105cce5c13..c3ccd2f75d6d 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/systemd-251.3 b/metadata/md5-cache/sys-apps/systemd-251.3
index a2e48c6f0396..809c6fc6bc48 100644
--- a/metadata/md5-cache/sys-apps/systemd-251.3
+++ b/metadata/md5-cache/sys-apps/systemd-251.3
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v251.3/systemd-stable-251.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=81969f3b06e929ff3d72178b498c28e6
+_md5_=abecc61c44abd64e5d7da73b0d8cf753
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-251.3 b/metadata/md5-cache/sys-apps/systemd-utils-251.3
index 1db4236acc48..1bd2ba4e50d7 100644
--- a/metadata/md5-cache/sys-apps/systemd-utils-251.3
+++ b/metadata/md5-cache/sys-apps/systemd-utils-251.3
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v251.3.tar.gz -> systemd-stable-251.3.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-251.2.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=3e5a9ed9640236ca7c17ab44aad507b1
+_md5_=d81f2bbf693b20b9759dcb04fffd2058
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 71505a6c128d..c1ebdd4eb257 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.26.1 b/metadata/md5-cache/sys-cluster/minikube-1.26.1
new file mode 100644
index 000000000000..ea816c940975
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/minikube-1.26.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-go/go-bindata >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile configure install postinst unpack
+DEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
+DESCRIPTION=Single Node Kubernetes Cluster
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
+INHERIT=bash-completion-r1 go-module toolchain-funcs
+IUSE=hardened libvirt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )
+RDEPEND=libvirt? ( app-emulation/libvirt:=[qemu] )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/zmedico/minikube/archive/refs/tags/v1.26.1-vendor.tar.gz -> minikube-1.26.1-vendor.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c365582772d7fec63d3feb481b3ce693
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 777f421e9c1a..94c676dc1805 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/clang-14.0.6-r1 b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
index 9c8e4dc517b6..9c1b6a98bfbd 100644
--- a/metadata/md5-cache/sys-devel/clang-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs
 IUSE=debug default-compiler-rt default-libcxx default-lld doc llvm-libunwind +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-14.0.6 default-compiler-rt? ( =sys-libs/compiler-rt-14.0.6* llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) default-libcxx? ( >=sys-libs/libcxx-14.0.6 ) default-lld? ( sys-devel/lld )
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ~sys-devel/llvm-14.0.6:14=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-14.0.6[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.6[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.6[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.6[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.6[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.6[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.6[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.6[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.6[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.6[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.6[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.6[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.6[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.6[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.6[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.6[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.6[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.6[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.6[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.6[llvm_targets_M68k] )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	67f55755cc49864ddaddee8d3c7bb68d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=98c8129815ff82707d8fa1dabd987c5a
+_md5_=2d803d961faf6acf9fd985895df8e9ba
diff --git a/metadata/md5-cache/sys-devel/clang-common-14.0.6 b/metadata/md5-cache/sys-devel/clang-common-14.0.6
index dfee4d56f88d..db25519dad54 100644
--- a/metadata/md5-cache/sys-devel/clang-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/clang-common-14.0.6
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=bash-completion-r1 llvm.org
 IUSE=verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	67f55755cc49864ddaddee8d3c7bb68d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=59693fa6ae0093b5596e564475d7c1de
+_md5_=4b96bac2e683306fd625bd17c582e0e5
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-14.0.6 b/metadata/md5-cache/sys-devel/clang-runtime-14.0.6
index 1e205c2990c1..f4dc28b6e279 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-14.0.6
+++ b/metadata/md5-cache/sys-devel/clang-runtime-14.0.6
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://clang.llvm.org/
 INHERIT=multilib-build
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-14.0.6:14.0.6[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-14.0.6:14.0.6[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-14.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-14.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=14.0.6
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0d014d33ab4ca74e73ae24cb322dc032
+_md5_=94ddda3d64ca4dc5dbc7b827518b36cd
diff --git a/metadata/md5-cache/sys-devel/llvm-14.0.6-r2 b/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
index ae690000ea54..08c16b3e8ef5 100644
--- a/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
+++ b/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
 IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common binutils-plugin? ( >=sys-devel/llvmgold-14 )
 RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm.org	67f55755cc49864ddaddee8d3c7bb68d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d4cda161478dbc321a0d8422f25a8ba5
+_md5_=71904d857ce316b61883687658df6726
diff --git a/metadata/md5-cache/sys-devel/llvm-common-14.0.6 b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
index 3a91edbd17bf..290f49319e21 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=llvm.org
 IUSE=verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
 _eclasses_=llvm.org	67f55755cc49864ddaddee8d3c7bb68d	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=b834f3b1d6dfaacaf3e7277b35cd75a7
+_md5_=94f9554c557a233570c499d2a1abe891
diff --git a/metadata/md5-cache/sys-devel/llvmgold-14 b/metadata/md5-cache/sys-devel/llvmgold-14
index a9f9fd72cacf..29c7a605c6b4 100644
--- a/metadata/md5-cache/sys-devel/llvmgold-14
+++ b/metadata/md5-cache/sys-devel/llvmgold-14
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=LLVMgold plugin symlink for autoloading
 EAPI=8
 HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:14[binutils-plugin] !sys-devel/llvm:0
 SLOT=0
-_md5_=c7c5f8d65f3bcfd8dad94cf75281d3b5
+_md5_=6eefe81c9d416e68fd2eb7f100552813
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 6f011ff778f2..a3771db9a575 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/udev-init-scripts-35 b/metadata/md5-cache/sys-fs/udev-init-scripts-35
index 38e3355cca01..ef8edbfa277c 100644
--- a/metadata/md5-cache/sys-fs/udev-init-scripts-35
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-35
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=udev startup scripts for openrc
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/udev-217 !<sys-apps/openrc-0.14
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/snapshot/udev-gentoo-scripts-35.tar.gz -> udev-init-scripts-35.tar.gz
-_md5_=36bcb6646a7160995c09c5ef719e6b50
+_md5_=423b66aa75294e6ef6c6cf7534b98988
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 92c7be410c4c..bfcf1d908687 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/glibc-2.36 b/metadata/md5-cache/sys-libs/glibc-2.36
new file mode 100644
index 000000000000..b967f809fa67
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.36
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DESCRIPTION=GNU libc C library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libc/
+INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
+IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RESTRICT=!test? ( test )
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.36.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.36-patches-1.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=323e5646d983b755b5728578ee00084c
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.6 b/metadata/md5-cache/sys-libs/libcxx-14.0.6
index 629e6a3a5db6..dc4b5c155535 100644
--- a/metadata/md5-cache/sys-libs/libcxx-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://libcxx.llvm.org/
 INHERIT=cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+libcxxabi +libunwind static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 arm arm64 ~riscv ~sparc x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-14.0.6[libunwind=,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(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
 REQUIRED_USE=libunwind? ( libcxxabi )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	67f55755cc49864ddaddee8d3c7bb68d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4dd5507f2c8494002aedce8aa5adadbe
+_md5_=cfda852183d427a96fc44b71653d6e55
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
index 354410773091..29922e4a495f 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://libcxxabi.llvm.org/
 INHERIT=cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+libunwind static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 arm arm64 ~riscv ~sparc x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[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(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[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(-)?] ) )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	67f55755cc49864ddaddee8d3c7bb68d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=feb3ecf2fdca77cb4b723cc4b75ca91c
+_md5_=0fa4d9b98cb317a13465e52ffd67e4d8
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6 b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6
index 5f49ba6fcf65..fb7ce6bcfd23 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/llvm-mirror/libunwind
 INHERIT=cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	38d6ec96711cea42a5cb1cc723a6e906	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	llvm.org	67f55755cc49864ddaddee8d3c7bb68d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a5b045e006cafe7a84b4cdd70775ee40
+_md5_=3a908d0cdde1ad7918c5e09003faf6c7
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index b62f3b226fae..850086195dd5 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/qutebrowser-3.0.0_pre9999 b/metadata/md5-cache/www-client/qutebrowser-3.0.0_pre9999
new file mode 100644
index 000000000000..f88ccc61fae1
--- /dev/null
+++ b/metadata/md5-cache/www-client/qutebrowser-3.0.0_pre9999
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cheroot[python_targets_python3_8(-)] dev-python/flask[python_targets_python3_8(-)] dev-python/hypothesis[python_targets_python3_8(-)] dev-python/pytest-bdd[python_targets_python3_8(-)] dev-python/pytest-mock[python_targets_python3_8(-)] dev-python/pytest-qt[python_targets_python3_8(-)] dev-python/pytest-rerunfailures[python_targets_python3_8(-)] dev-python/pytest-xdist[python_targets_python3_8(-)] dev-python/pytest-xvfb[python_targets_python3_8(-)] dev-python/tldextract[python_targets_python3_8(-)] qt6? ( dev-python/PyQt6[testlib] ) !qt6? ( dev-python/PyQt5[testlib] ) ) ) python_single_target_python3_9? ( test? ( dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cheroot[python_targets_python3_9(-)] dev-python/flask[python_targets_python3_9(-)] dev-python/hypothesis[python_targets_python3_9(-)] dev-python/pytest-bdd[python_targets_python3_9(-)] dev-python/pytest-mock[python_targets_python3_9(-)] dev-python/pytest-qt[python_targets_python3_9(-)] dev-python/pytest-rerunfailures[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] dev-python/pytest-xvfb[python_targets_python3_9(-)] dev-python/tldextract[python_targets_python3_9(-)] qt6? ( dev-python/PyQt6[testlib] ) !qt6? ( dev-python/PyQt5[testlib] ) ) ) python_single_target_python3_10? ( test? ( dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cheroot[python_targets_python3_10(-)] dev-python/flask[python_targets_python3_10(-)] dev-python/hypothesis[python_targets_python3_10(-)] dev-python/pytest-bdd[python_targets_python3_10(-)] dev-python/pytest-mock[python_targets_python3_10(-)] dev-python/pytest-qt[python_targets_python3_10(-)] dev-python/pytest-rerunfailures[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] dev-python/pytest-xvfb[python_targets_python3_10(-)] dev-python/tldextract[python_targets_python3_10(-)] qt6? ( dev-python/PyQt6[testlib] ) !qt6? ( dev-python/PyQt5[testlib] ) ) ) python_single_target_python3_11? ( test? ( dev-python/beautifulsoup4[python_targets_python3_11(-)] dev-python/cheroot[python_targets_python3_11(-)] dev-python/flask[python_targets_python3_11(-)] dev-python/hypothesis[python_targets_python3_11(-)] dev-python/pytest-bdd[python_targets_python3_11(-)] dev-python/pytest-mock[python_targets_python3_11(-)] dev-python/pytest-qt[python_targets_python3_11(-)] dev-python/pytest-rerunfailures[python_targets_python3_11(-)] dev-python/pytest-xdist[python_targets_python3_11(-)] dev-python/pytest-xvfb[python_targets_python3_11(-)] dev-python/tldextract[python_targets_python3_11(-)] qt6? ( dev-python/PyQt6[testlib] ) !qt6? ( dev-python/PyQt5[testlib] ) ) ) app-text/asciidoc test? ( python_single_target_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)] ) python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] >=dev-python/jinja-3.1.2[python_targets_python3_8(-)] >=dev-python/markupsafe-2.1.1[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] >=dev-python/pyyaml-6[python_targets_python3_8(-)] dev-python/zipp[python_targets_python3_8(-)] adblock? ( dev-python/adblock[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] >=dev-python/jinja-3.1.2[python_targets_python3_9(-)] >=dev-python/markupsafe-2.1.1[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] >=dev-python/pyyaml-6[python_targets_python3_9(-)] dev-python/zipp[python_targets_python3_9(-)] adblock? ( dev-python/adblock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/colorama[python_targets_python3_10(-)] >=dev-python/jinja-3.1.2[python_targets_python3_10(-)] >=dev-python/markupsafe-2.1.1[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] >=dev-python/pyyaml-6[python_targets_python3_10(-)] dev-python/zipp[python_targets_python3_10(-)] adblock? ( dev-python/adblock[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/colorama[python_targets_python3_11(-)] >=dev-python/jinja-3.1.2[python_targets_python3_11(-)] >=dev-python/markupsafe-2.1.1[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] >=dev-python/pyyaml-6[python_targets_python3_11(-)] dev-python/zipp[python_targets_python3_11(-)] adblock? ( dev-python/adblock[python_targets_python3_11(-)] ) ) qt6? ( dev-qt/qtbase:6[icu] python_single_target_python3_8? ( dev-python/PyQt6[python_targets_python3_8(-),dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/PyQt6_WebEngine[python_targets_python3_8(-),widgets] ) python_single_target_python3_9? ( dev-python/PyQt6[python_targets_python3_9(-),dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/PyQt6_WebEngine[python_targets_python3_9(-),widgets] ) python_single_target_python3_10? ( dev-python/PyQt6[python_targets_python3_10(-),dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/PyQt6_WebEngine[python_targets_python3_10(-),widgets] ) python_single_target_python3_11? ( dev-python/PyQt6[python_targets_python3_11(-),dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/PyQt6_WebEngine[python_targets_python3_11(-),widgets] ) ) !qt6? ( dev-qt/qtcore:5[icu] dev-qt/qtgui:5[png] python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-),dbus,declarative,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-),dbus,declarative,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[python_targets_python3_10(-),dbus,declarative,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[python_targets_python3_11(-),dbus,declarative,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_11(-)] ) ) widevine? ( www-plugins/chrome-binary-plugins ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.1.2[python_targets_python3_11(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/gpep517-8[python_targets_python3_8(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-8[python_targets_python3_9(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-8[python_targets_python3_10(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-8[python_targets_python3_11(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_11(-)] dev-python/wheel[python_targets_python3_11(-)] ) >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Keyboard-driven, vim-like browser based on Python and Qt
+EAPI=8
+HOMEPAGE=https://www.qutebrowser.org/
+INHERIT=distutils-r1 multiprocessing optfeature xdg git-r3
+IUSE=+adblock +qt6 widevine test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+LICENSE=GPL-3+
+PROPERTIES=live
+RDEPEND=python_single_target_python3_8? ( dev-python/importlib_resources[python_targets_python3_8(-)] ) python_single_target_python3_8? ( dev-python/colorama[python_targets_python3_8(-)] >=dev-python/jinja-3.1.2[python_targets_python3_8(-)] >=dev-python/markupsafe-2.1.1[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] >=dev-python/pyyaml-6[python_targets_python3_8(-)] dev-python/zipp[python_targets_python3_8(-)] adblock? ( dev-python/adblock[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/colorama[python_targets_python3_9(-)] >=dev-python/jinja-3.1.2[python_targets_python3_9(-)] >=dev-python/markupsafe-2.1.1[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] >=dev-python/pyyaml-6[python_targets_python3_9(-)] dev-python/zipp[python_targets_python3_9(-)] adblock? ( dev-python/adblock[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/colorama[python_targets_python3_10(-)] >=dev-python/jinja-3.1.2[python_targets_python3_10(-)] >=dev-python/markupsafe-2.1.1[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] >=dev-python/pyyaml-6[python_targets_python3_10(-)] dev-python/zipp[python_targets_python3_10(-)] adblock? ( dev-python/adblock[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/colorama[python_targets_python3_11(-)] >=dev-python/jinja-3.1.2[python_targets_python3_11(-)] >=dev-python/markupsafe-2.1.1[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] >=dev-python/pyyaml-6[python_targets_python3_11(-)] dev-python/zipp[python_targets_python3_11(-)] adblock? ( dev-python/adblock[python_targets_python3_11(-)] ) ) qt6? ( dev-qt/qtbase:6[icu] python_single_target_python3_8? ( dev-python/PyQt6[python_targets_python3_8(-),dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/PyQt6_WebEngine[python_targets_python3_8(-),widgets] ) python_single_target_python3_9? ( dev-python/PyQt6[python_targets_python3_9(-),dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/PyQt6_WebEngine[python_targets_python3_9(-),widgets] ) python_single_target_python3_10? ( dev-python/PyQt6[python_targets_python3_10(-),dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/PyQt6_WebEngine[python_targets_python3_10(-),widgets] ) python_single_target_python3_11? ( dev-python/PyQt6[python_targets_python3_11(-),dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/PyQt6_WebEngine[python_targets_python3_11(-),widgets] ) ) !qt6? ( dev-qt/qtcore:5[icu] dev-qt/qtgui:5[png] python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-),dbus,declarative,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-),dbus,declarative,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/PyQt5[python_targets_python3_10(-),dbus,declarative,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/PyQt5[python_targets_python3_11(-),dbus,declarative,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[python_targets_python3_11(-)] ) ) widevine? ( www-plugins/chrome-binary-plugins ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f81dffd847c92394399127b31034e2e5
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 7ea2bb1747b5..624e46383314 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14056 BLAKE2B 384ab1fa4a7f7fa60fa28f388fbf17530d39a6a06420e8f2936adf788e39eff3c93c062d5abaeeace41227318964140accd449e95c6b1abd99c33790b571a5b3 SHA512 8d70434ca6fc690e5e14608a138b2f6fb2a9f2975dd32475ff2d0054cfb0c075931ec146e77d9d54dd1c6888e2f888a3336c54a7e220c35ae2be9f9ad9b47b52
-TIMESTAMP 2022-08-02T19:39:47Z
+TIMESTAMP 2022-08-03T01:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLpfYNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLp0eRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klApog/9Hj4sFAqfiQrB8HXAjn8jmxv5tLnmw0Qq1IQgXJzvcu29jq4Paifji7+R
-LmDTGMsbL8FThDkWbdLbeawNLfFBUSKyKVYXVaUtXw0KEEvkn6PgIPWLKAd88F90
-mAu7MQOdpGfIy2SbrJUJw4HCzjywbzV2hzD6XTzqxduX7MHIWtn0Z1Lgiwmbzhy6
-Z8hPJU+mvRPf6kupfMG8AiymvmJMBEf6srlfXTcSYmPggUqwOISoj7xs/fKcEj0o
-UlFqouNXS5Te5K0lSoyjCRyT5YHSvCY4vYLVY7wpcuqQOW6gzcbTdSfzvklQQuti
-tXBjW5N8pUBax8AWe1FZbxePenHfQmRdTwA21/tP11oRaL2a6Z39D6cR8OijLZrM
-IwxaGTid/tH9rhyR869RRITIrGWZ8M4Fpu33Fpz6FqOxLZMf9OU1dEsPfD3lsn6F
-OtxLJG2WPL1s3muXpomwZ7lEKLb2/rJB1x2CBsH+mlTy95KOs+Aob7Jc52ciJJvu
-77rpxoOC/3w5UWAFNV+o6v7ZE+Kbm7NeAqwq4Wu5kN3bcBV3Wbl8u/wRwNAIGB6b
-ddLWwcphGXVJWk3MEvOh52hShClsdgMZ3/uy5kzSVnF8MmgjmPM9pWy+GhGNz8NH
-rVDzs16lp2vVOzb2dNwKqlvE90n+SFpNOjcRefsTxceE2oV0laE=
-=eqUj
+klDCIQ//eqGpLbb2/ZwG5nGJ9cDNHuza+pY+xheyCosSGJr/83jdgzNA/DKd4TuE
+R9YCGcr1pGDaNhff9R/19hV5h996QXadQNkq5An66vJP5caCw1u7RJRRYLgZO1vT
+4ZG6GH7o5PTTSWf41JhqoFbr43ICReQtsCJQPbFSBhyqWYBCPQfhtZ1cDv4nkmF6
+9hatNaCztOOocjyRmOPaVuEVBRrueQYtVM90vMElWBLZyPIedA73JV1e7q4xEaUP
+aw8oy8lBtFF4eHO/748o/cWHWl2H4xWORmvK2RCQpihqaajdYTvVcjcEFuXmO/vW
+chbccFE/hcM9+f2qcvRHUddvSz8AoFWoIueA6ak+9QmnkbbsNmoD93QTg5GdnMsp
+aCxqxsSTFe/kceL0b/7Z0oK2zJmBrudWhNNZ9WWTlMGgPM+bzMLFkhEP8C0iZjea
+2GT6K5bHlnCEJyWhB+Quh77npZldRHz0WZAyeQHidHFA8C476jYNp+4B0GJe/Cf8
+dqftkyPkzLmX/GzAyE0BOFOGyLoFSSz0JO/iciOSvo4D9/y12I5R5Zz7gsEGoGiD
+L7rg3RCqXkDLobjjBcXrTys/hsnBlesi4EGNmO/YlkKOUyzD6qZGqs2Ecr1zqOUh
+qX2i4FvKmIcw8lqBQBC1qk2ToOvkzA/MZ33p+58eSxda2a0QtPs=
+=ihOv
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index eb2f48ded6e5..ff2df3e96fbb 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 02 Aug 2022 19:39:44 +0000
+Wed, 03 Aug 2022 01:39:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 21c08f6eb7fc..0493277e9ddd 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Aug  2 07:39:43 PM UTC 2022
+Wed Aug  3 01:39:44 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 68538a1782e7..171acc914d73 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 02 Aug 2022 19:45:01 +0000
+Wed, 03 Aug 2022 01:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 800a7e3e7e40..47c6632eb806 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-9b0332d68d46ba2dc3f3a0f77b8f0a78663631d7 1659468790 2022-08-02T19:33:10+00:00
+020a3d4461eb733c50046cbaf395010156d133d8 1659486084 2022-08-03T00:21:24+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 8a24bb7b158f..034b0476a0a9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1659469201 Tue 02 Aug 2022 07:40:01 PM UTC
+1659490801 Wed 03 Aug 2022 01:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index eb2f48ded6e5..ff2df3e96fbb 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 02 Aug 2022 19:39:44 +0000
+Wed, 03 Aug 2022 01:39:45 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index c66c4ada5bc0..968107903615 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 53a216f78a4f..41519e73283e 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -6,8 +6,8 @@ AUX tdesktop-3.6.0-jemalloc-only-telegram.patch 1343 BLAKE2B bc257ee3bc3577b05a7
 AUX tdesktop-3.6.0-support-ffmpeg5.patch 3142 BLAKE2B f05816a8b26c3061c88b8814adc2402981836ab7853be1dad9c4eb74b621e1084a2167ad5ea86d500c98d627317ffd48288bcb4df897f5ca6858516ecf86c8f0 SHA512 811f42f8372102910be20ac92030b98ad98704cb1378a90d17a01b15dc4a9aa8e9b6bb179a9dc4d09687ad7b60030f0f7367f8058674244b080748bf2c913044
 AUX tdesktop-3.6.1-fix-kwayland-5.93.patch 1835 BLAKE2B dbc414e1543be96faff179288eb4bcc4acdfbe280ae51da11d254054adcc00f4c1387cdc9a24e026e06612d55765a1689b4bfc6381349b75053c4156a0cff71f SHA512 82855396f367f3669a34246a031626bba158d5361ec39e728c2d33f0d5b9ff5196c38a33551614848b5d439e25bbe45eb3795eaf7ca7442f5f27ab0bdeb0e72e
 AUX tdesktop-3.6.1-fix-use-after-free.patch 1627 BLAKE2B 867dde2d1d8d6535e2305f841fe97477bd08c37e96684196563f9ce6dbfb12c7b2941ddc3e00182126e24ec08e1692ec201006d2c46548fcbf2f9bae09dca532 SHA512 e52369b6aee6c772bef56b73cf4656813614694af714eb83432ffbe7a2234dde4be9888e927c1304350c5c31a0a9cf37a53ea41df2e9b47a00de6dc4433a1c1b
-DIST tdesktop-3.5.2-full.tar.gz 41216346 BLAKE2B 5f2570073e02c5aadbf5f9b6251f9b71e9a608d97763bd3a792d3c4836b68245410142face3446660b68e519bd7e71df0319cb1ff1ea1fed24327ac8db0e8d0b SHA512 adb95fb37fedba6344107e4dd789b88563e24e6a01c7b944d9e5365ceccff60d774eb31a2c1e39cd200ef6de83317fe654956cfecaa1e13c7b2fdbf4c38f057e
 DIST tdesktop-3.6.1-full.tar.gz 41226549 BLAKE2B 6922ae015e36f86597aaedf1212ed951d6313a8f5f76a8838ab7ef9e02afe0cbc428acd991488190bafdf28faf2a69a09a5a1e963b2aa6ed27ef941602e15d88 SHA512 dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba
-EBUILD telegram-desktop-3.5.2-r1.ebuild 4822 BLAKE2B 2511fe0122a1784d393ea19f3d0453ead0a2038c99c8b4d15f370e254f3bdd3f7dd349fc70c39a42c3ca67f7b9b4b984f452563ffe227956443d6f2d55ee0c1b SHA512 7d6d91c054a38b118f7ca028b6ceeb9b40312626cf2489f2abbc3b77bff1fbb409cc9d714ff3a299426272a33fc595ba44df696e2fc9fb23b0fb043ce7770519
+DIST tdesktop-4.0.2-full.tar.gz 41059443 BLAKE2B da4efb15c8a2d11719d3aa56c3a40b12f70c37577d2909c43e6029e10ca0bb1f8445ed68ed9acd532009c8e0a8f48fa13d2a51573a81f58a8a83b13427ffb631 SHA512 0078b627d06dd8e655bd2bcc222ecbb3b15b7d88f858810bccdca84793ad02a60f4a4bf3808838752d65d4f6cffa3ddb5f70c5afc8e94cb6edae52101362feeb
 EBUILD telegram-desktop-3.6.1-r1.ebuild 4886 BLAKE2B e82263eb280dbf9443beaeeaf960be7381953c69cfc6c800aae6b8d02a273350062dd42d31f85467990c71584c6f6d33ee811260ef202866cd4df9ef65e4b190 SHA512 3a700af06f41db67a8d33ed6e2def3ab38d95770b41b444921725ef00cb5fcced425adfa3bfb69942cee5539a8284fd587df495fb43b4d4673a5f62cfa2ceb27
-MISC metadata.xml 588 BLAKE2B 1b53c778dbad032cfaff286c58d495ff2c84c2862b4e29aba4120ec8fbe589323adb33351740150e7f62ef5c109992c7520a80d4d5c5e5a8a64adab4895ccac9 SHA512 b2b6cf121907705ebe568af9f384aee156551970d3ce11bccbea60d8b48753d9af439b7957d2fb15430f3723e96f77c7eb4864774fcba96a2acf214f00b1c79b
+EBUILD telegram-desktop-4.0.2.ebuild 5876 BLAKE2B d9ee18a8d35a0d6cf9b579bb9dd3ae40f12573054872223851cff67861b9bb2ec10c4460d8d8cfc365285150342fbbeacc96e52c0822062fb65f396747680c54 SHA512 0aee7f042dee7e98c35313d8a12ff02eafa25d6046b57f63f90d1130724f63adff93d6bb6c8fc0c3291b17c21f2119197117d567f2b261b62121cd11eb51951f
+MISC metadata.xml 637 BLAKE2B 643abb06bad4683b713dfd6a697e13540f911aef5b55ad79c41d8076dcca5a96ae40c80131329f8240a8d382c81c788142f71e5b8f8b8b0870a1767eb8fa3c22 SHA512 bfe3f00d0f6b3b65962475ae0641f527f115baaccb6069653c31fe1f2a0096a7e90bfe58ffc037edddb8541a898def866ce6b4036b4a592d6f8ed4a8decf1fb4
diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml
index 3f9fa364ab61..102293a68d35 100644
--- a/net-im/telegram-desktop/metadata.xml
+++ b/net-im/telegram-desktop/metadata.xml
@@ -12,5 +12,6 @@
 	<use>
 		<flag name="enchant">Enable the app-text/aspell spell-checking backend</flag>
 		<flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag>
+		<flag name="qt6">Build with Qt6 support</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.0.2.ebuild
index 757e0eab2ba4..930d3d186fc3 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.5.2-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.0.2.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
-inherit xdg cmake python-any-r1 optfeature flag-o-matic
+inherit xdg cmake python-any-r1 optfeature
 
 DESCRIPTION="Official desktop client for Telegram"
 HOMEPAGE="https://desktop.telegram.org"
@@ -16,8 +16,8 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
-IUSE="+dbus enchant +hunspell +jemalloc screencast +spell wayland +X"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="+dbus enchant +hunspell +jemalloc screencast +spell qt6 wayland +X"
 REQUIRED_USE="
 	spell? (
 		^^ ( enchant hunspell )
@@ -31,30 +31,33 @@ RDEPEND="
 	dev-libs/libdispatch
 	dev-libs/openssl:=
 	dev-libs/xxhash
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
-	>=dev-qt/qtimageformats-5.15:5
-	>=dev-qt/qtnetwork-5.15:5[ssl]
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtwidgets-5.15:5[png,X?]
 	media-fonts/open-sans
 	media-libs/fontconfig:=
-	~media-libs/libtgvoip-2.4.4_p20220117
+	~media-libs/libtgvoip-2.4.4_p20220503
 	media-libs/openal
 	media-libs/opus:=
 	media-libs/rnnoise
-	~media-libs/tg_owt-0_pre20220209[screencast=,X=]
+	~media-libs/tg_owt-0_pre20220507[screencast=,X=]
 	media-video/ffmpeg:=[opus]
 	sys-libs/zlib:=[minizip]
-	dbus? (
-		dev-cpp/glibmm:2
-		dev-qt/qtdbus:5
-		dev-libs/libdbusmenu-qt[qt5(+)]
-	)
+	dbus? ( dev-cpp/glibmm:2 )
 	enchant? ( app-text/enchant:= )
 	hunspell? ( >=app-text/hunspell-1.7:= )
 	jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] )
-	wayland? ( kde-frameworks/kwayland:= )
+	!qt6? (
+		>=dev-qt/qtcore-5.15:5
+		>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
+		>=dev-qt/qtimageformats-5.15:5
+		>=dev-qt/qtnetwork-5.15:5[ssl]
+		>=dev-qt/qtsvg-5.15:5
+		>=dev-qt/qtwidgets-5.15:5[png,X?]
+	)
+	qt6? (
+		dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?]
+		dev-qt/qtsvg:6
+		dev-qt/qt5compat:6
+		wayland? ( dev-qt/qtwayland:6 )
+	)
 	X? ( x11-libs/libxcb:= )
 "
 DEPEND="${RDEPEND}
@@ -69,21 +72,28 @@ BDEPEND="
 # dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
 
 PATCHES=(
-	"${FILESDIR}/tdesktop-3.5.2-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-3.6.0-jemalloc-only-telegram.patch"
 	"${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch"
 	"${FILESDIR}/tdesktop-3.5.2-musl.patch"
-	"${FILESDIR}/tdesktop-3.5.2-jemalloc-optional.patch"
-	"${FILESDIR}/tdesktop-3.6.1-fix-kwayland-5.93.patch"
 )
 
+# Current desktop-file-utils-0.26 does not understand Version=1.5
+QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop"
+
 pkg_pretend() {
 	if has ccache ${FEATURES}; then
-		ewarn
 		ewarn "ccache does not work with ${PN} out of the box"
 		ewarn "due to usage of precompiled headers"
 		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
 		ewarn
 	fi
+	if use qt6; then
+		ewarn "Qt6 support in gentoo is experimental."
+		ewarn "Please report any issues you may find, but don't expect"
+		ewarn "everything to work correctly as of yet."
+		ewarn "Qt6 ebuilds are available in the ::qt overlay."
+		ewarn
+	fi
 }
 
 src_prepare() {
@@ -95,20 +105,26 @@ src_prepare() {
 }
 
 src_configure() {
+	# DESKTOP_APP_DISABLE_JEMALLOC is heavily discouraged by upstream, as the
+	# glibc allocator results in high memory usage.
+	# https://github.com/telegramdesktop/tdesktop/issues/16084
+	# https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
+
+	# DESKTOP_APP_QT6=OFF force-enables DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
+	# This means that REQUIRED_USE="wayland? ( qt6 )", but a lot of people
+	# enable USE=wayland globally, so we instead silently disable it...
+
 	local mycmakeargs=(
 		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
 		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
-		-DDESKTOP_APP_QT6=OFF
+		-DDESKTOP_APP_QT6=$(usex qt6)
 
 		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus)
 		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
 		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
+		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
 		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex !spell)  # enables hunspell (recommended)
 		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
-
-		# This option is heavily discouraged by upstream.
-		# See files/tdesktop-*-jemalloc-optional.patch
-		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
 	)
 
 	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
@@ -153,6 +169,14 @@ pkg_postinst() {
 		ewarn "Do NOT report issues about RAM usage without enabling this flag first."
 		ewarn
 	fi
+	if use wayland && ! use qt6; then
+		ewarn "Wayland-specific integrations have been deprecated with Qt5."
+		ewarn "The app will continue to function under wayland, but some"
+		ewarn "functionality may be reduced."
+		ewarn "These integrations are only supported when built with Qt6,"
+		ewarn "which isn't available in ::gentoo as of writing."
+		ewarn
+	fi
 	optfeature_header
 	optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk
 }
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index bf652812360a..3c01d9e9b4db 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 16ff2c80132e..cc1a1e2fd09b 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,7 +1,8 @@
+AUX 2.36.5-fix-crash.patch 2636 BLAKE2B faaec5dcd7731553754bcfa5aa785d0b5969f6347872c3074b3c592739ca473f0e5928f92910ff314a8e1c4e1f1e0dd70c628d9d672ed807dc5198d638b88c8b SHA512 ae1acb301a049bd540e4b134a9b8957452fe530213037c01e770285ce5e93eda0df972c3011b9398545295e89e3827971de7b037ef5e0dc2b79dec96b7795c3c
 DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692
 DIST webkitgtk-2.36.4.tar.xz 26598964 BLAKE2B 7c79c394bca756b09324afae013775404f62543ed093314ebb82a10dbbc2c7a22277792349a0d24fd95077c770627d24ab73183ba4a97d168556f991d7a6a682 SHA512 c5365c682ba4e8e6ad891638b5a82e74e38fa0867ce6c8e4e08a9dc15b862a6d3edc096a049e0711306972d6162d79fe90a0e76d8b395001798005e4488467f2
 DIST webkitgtk-2.36.5.tar.xz 26602060 BLAKE2B 4a450356bb5e142f8c5c9d27433183532b7d3a2e451032cd837bf8a12ba58bd997eb4f2c6ff5ab37891af8485efb5d57aa02321448a93b0864c2a25b3b194cf8 SHA512 71be328aae93f1454d74371c3a614aab15190d2abc7dd7d7a003004c2f35a19d610d2613e64292f21e472d5112cba865ef019fecc2b4066eb87368c6d363b545
 EBUILD webkit-gtk-2.36.3.ebuild 7409 BLAKE2B e2f941a57bb827f86ae95e98af0187b0a4a301402470165be293e03efd9cd96834866bf7c69eefe3369d26a7926afb6b5b46061362b166652dcf29e581f120c5 SHA512 3d6226815a55d0b67550c6a0a405f7f4442715c528ed653858b6152f61ac36db6c080e9eb44fc504d61830a84da56a265e6f6dd2abb38227d9ff752393bd2cc8
 EBUILD webkit-gtk-2.36.4.ebuild 7427 BLAKE2B 7ae6ba5a5657542bd4aa9ee4a4346f7dda2ec1e0e370292a2826d976eab629d4d437ba231c7ec68fd397a2203ed4dd20824ab512ab361e6d232f61c6faf9b626 SHA512 9dce5c9d7009b097febf480d6c61c7b22ba406bf07bb07c0e74f51bc9adb4e8f0ed0d3ccd4dffea5d7a91740342ddba016c4a4d1fc3ad3275d4f5b208c849249
-EBUILD webkit-gtk-2.36.5.ebuild 7431 BLAKE2B 448433c468ab5cd2ed5d7f3e052f884096f68b467c1a715d7e76cd0bebb070360ea6f9b448de55d38ef4249809ff330e3dd84ed79fb0c60ff68453a1f0e7984c SHA512 94decf9608f83c87d3d46bcbbf06659089e3518325b36610c2ee42d172064a868b23e9f5a6aca9b0e6661b819238eae4e231e64c67b5541fdcb201fc2fa4d882
+EBUILD webkit-gtk-2.36.5-r1.ebuild 7476 BLAKE2B f25508d5f10a0e015f968103383f3c04fdeb5728a606986f593ae668f6e8d5890f7e989178454ab3ad27e4308a06a4faf4c13a4bc2e7a2a21755f8d976014a49 SHA512 3f800792ffdb7cd06be7048c6c55c29e0eed7bbf9b8a03504fa5a0eec0077edaf3672e869177bad80cdf79357703cf3a1a0134ab9f06bab28f1eece509dec2ac
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/files/2.36.5-fix-crash.patch b/net-libs/webkit-gtk/files/2.36.5-fix-crash.patch
new file mode 100644
index 000000000000..0f676a942d06
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.36.5-fix-crash.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/863008
+https://bugs.webkit.org/show_bug.cgi?id=243401
+
+From a6277d4834cce0dea2f999d4c06ffa57abfbb82d Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Mon, 1 Aug 2022 14:07:04 -0700
+Subject: [PATCH] REGRESSION(252485@main): [GTK]
+ webkit_web_context_get_default() crashes in Eclipse since webkit-gtk v2.36.5,
+ v2.36.4 was fine https://bugs.webkit.org/show_bug.cgi?id=243401
+
+Reviewed by Adrian Perez de Castro.
+
+Turns out WebKit's "main thread" may not actually be the real main
+thread. This is OK as long as it matches the GTK "main thread," and as
+long as the application is careful to iterate the default main context
+only on the WebKit/GTK "main thread," as as long as the application does
+not ever attempt to use these libraries on any other thread.
+
+The motivation to do this is if the programming language controls the
+real thread 1, as is the case with Java, where the Java main thread that
+applications can use to run GTK and WebKit is apparently not the same as
+the real main thread that's running the JVM. These applications have no
+control over what their "main thread" is, and it seems unkind to break
+them.
+
+I've checked in with the GTK developers, and consensus is that this
+is actually expected to work, so let's not break it.
+
+* Source/WTF/wtf/generic/MainThreadGeneric.cpp:
+(WTF::initializeMainThreadPlatform):
+(WTF::isMainThread):
+
+Canonical link: https://commits.webkit.org/253010@main
+---
+ Source/WTF/wtf/generic/MainThreadGeneric.cpp | 13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/Source/WTF/wtf/generic/MainThreadGeneric.cpp b/Source/WTF/wtf/generic/MainThreadGeneric.cpp
+index 3a9208b0f9ab..b51e2e456047 100644
+--- a/Source/WTF/wtf/generic/MainThreadGeneric.cpp
++++ b/Source/WTF/wtf/generic/MainThreadGeneric.cpp
+@@ -31,29 +31,22 @@
+  */
+ 
+ #include "config.h"
+-#if !OS(LINUX)
+ #include <pthread.h>
+-#endif
+ #if HAVE(PTHREAD_NP_H)
+ #include <pthread_np.h>
+ #endif
+-#if OS(LINUX)
+-#include <sys/syscall.h>
+-#include <sys/types.h>
+-#include <unistd.h>
+-#endif
+ 
+ #include <wtf/RunLoop.h>
+ 
+ namespace WTF {
+ 
+-#if !HAVE(PTHREAD_MAIN_NP) && !OS(LINUX)
++#if !HAVE(PTHREAD_MAIN_NP)
+ static pthread_t mainThread;
+ #endif
+ 
+ void initializeMainThreadPlatform()
+ {
+-#if !HAVE(PTHREAD_MAIN_NP) && !OS(LINUX)
++#if !HAVE(PTHREAD_MAIN_NP)
+     mainThread = pthread_self();
+ #endif
+ }
+@@ -62,8 +55,6 @@ bool isMainThread()
+ {
+ #if HAVE(PTHREAD_MAIN_NP)
+     return pthread_main_np();
+-#elif OS(LINUX)
+-    return getpid() == static_cast<pid_t>(syscall(SYS_gettid));
+ #else
+     return pthread_equal(pthread_self(), mainThread);
+ #endif
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild
index ac5ee1a431b0..ad7b4de216cf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild
@@ -153,6 +153,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	eapply "${FILESDIR}"/${PV}-fix-crash.patch
+
 	cmake_src_prepare
 	gnome2_src_prepare
 }
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 1d7ad9df7e93..446e023c1887 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index ed29a4381769..5ddea6311c78 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -7,7 +7,9 @@ AUX unifi.service-r2 233 BLAKE2B 95d87f040be667c5d5817bc9b6eabfa3d2ef454cfcdd60b
 DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee034471c512d04e4f91aa02688871857edf3c0ef538e601aaf8eccdd0c55193a9bde10924ddeff1fd333da355 SHA512 c2f677de819268366d65622238c1b8d6d8abcd5e06d6f1f635d9755573eff5a6aca0c84298a111b0da5e80bade8132e05339035edde3cc5fc08834f2d6c4b26e
 DIST unifi-7.1.67.zip 202078626 BLAKE2B 3fb7c2fa877ea61e44d2a455494d47099282c91e9bb515a9995d526ea5624d893e09534f305c5c72e011a98075990fcf1323e6bf1fc1949ef0d663c94f019a59 SHA512 3926d0c56f6b5e16f8da98fc1b049e0382c0cc785158955ca2b5ffed0fd464985bbc551694dc2b037b3fccc2867f2e875842791e541daf51b9f52678594ff359
 DIST unifi-7.1.68.zip 202099045 BLAKE2B f84a579c01ec0494e0e8b67a126947cd7bb0625c60d5f5026232e563ee84a4c0fdef827e5f8044de4e5d7fd970a50846dc91d7467196fc2f53bb27655bbb5212 SHA512 b4e71dd28bb645d7fb085546fc29019aa6f33780e559ed284216b7f330eaf5f41f5177e839a5a277d4d41a2242ffe16a44b582c51e74e469bacf96502d187a55
+DIST unifi-7.2.91.zip 171723619 BLAKE2B c2707cf570f279f95c9cf68bc7d4b95d91ff45caa75024d8093707e1cf718fd5205d7bbf6891d831ff8bebadbb10d05b6182478a07b04341fef220d58db7d3c8 SHA512 8a2ea6c1f57b52b09af74c26631bf3f5188cc44b6b9fabce7ea83922769715354a55d24b0509e127a4b357fc841c8bfefde326df37aedd4df0a878baf600efe7
 EBUILD unifi-6.5.55-r2.ebuild 2471 BLAKE2B 85ea582f14c30db8c8fa3f02057f8ed8c506338860b1c549ce7e2192423c4be8a087c19cdec05079731b8bfa045c63edc094e740b5ad7b0fe987635319aac7b5 SHA512 395d780fa97045cadebc193ef391576c5def6f06413940857902e792b5a39dceb93f7ee8a8b2d8162df395c132bdb89490460d2fa69191f6b87cf9282b6e7f7b
 EBUILD unifi-7.1.67.ebuild 2769 BLAKE2B e3633533bdd5de014c2df2462dac6617afa6dc72f89d8325715344bb7d1d1161aaa742f3d01d3db7590038ef9e167df80f94da2aebb7dc807ee5a26356cd8756 SHA512 15ad7e3815726a97da7a6c50d33c6402ae1d01c0b82be3b4df0bd1c492bf7b3cff9737fdce9ad734c8eb810b30366d729d471c58bcb26f4818d57335aae6a4dc
 EBUILD unifi-7.1.68.ebuild 2770 BLAKE2B 6d5defba1894e892a6a2ab0ceaea1fdeefc34cfaee8b4568ee70c242982aa4d0bbe394db3d97493ff76a1747119fe4807572b9dfdc4116f2357e11217b653fe6 SHA512 1b1ed3eed3bbd594da1dca2739e4a99dcba332f810b30c27bbc4f1f3b4b060233daa1a41cd07b3a88681411375771ca8bc2cb56f56170d70cf3050931d0c8fb0
+EBUILD unifi-7.2.91.ebuild 2770 BLAKE2B 75444f074ae3012a07185b4ca2f957d519ccddd04fbfe234ad3164d3b4ccf49ee0a8d61ae0d03b2efc4187eb94a57950127f1bc96b3b18732b278c309b17060c SHA512 baca5512aa3d35e0877a14266f146d24c2130960ee3c3c9db9ae50ce1dd4e0a8a72f30d429025639408021e5e3b0af8e34adc2ef7554664391a3e0d4cdabac57
 MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c
diff --git a/net-wireless/unifi/unifi-7.2.91.ebuild b/net-wireless/unifi/unifi-7.2.91.ebuild
new file mode 100644
index 000000000000..462e1bf13c59
--- /dev/null
+++ b/net-wireless/unifi/unifi-7.2.91.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set this var for any releases except stable
+RC_SUFFIX="-85c367a4aa"
+
+inherit java-pkg-2 readme.gentoo-r1 systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+S="${WORKDIR}/UniFi"
+
+KEYWORDS="-* ~amd64 ~arm64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="systemd system-mongodb"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Mac and Windows
+	rm -r lib/native/{Mac,Windows} || die
+
+	if [[ ${CHOST} != aarch64* ]]; then
+		rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries"
+	fi
+	if [[ ${CHOST} != armv7* ]]; then
+		rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries"
+	fi
+	if [[ ${CHOST} != x86_64* ]]; then
+		rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries"
+	fi
+
+	if [[ ${CHOST} == aarch64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == armv7* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == x86_64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+
+	default
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+	! use system-mongodb && doins -r bin
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar
+	java-pkg_dolauncher unifi --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=' --jar ace.jar --pwd '/usr/lib/unifi'
+
+	if use system-mongodb; then
+		systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service
+		newinitd "${FILESDIR}"/unifi-mongodb.initd unifi
+	else
+		systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
+		newinitd "${FILESDIR}"/unifi.initd-r2 unifi
+	fi
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 4e430ea123de..927caa0ca605 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 3f46a721e665..8ddd7647fae5 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -34,6 +34,7 @@ media-gfx/freecad
 # reverse-dependencies.
 dev-qt/qtwebengine
 dev-qt/qtwebview
+dev-python/PyQt6_WebEngine
 dev-python/PyQtWebEngine
 app-admin/calamares
 app-doc/zeal
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 5ea6a18a5ba1..2777f80b9ba1 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,9 +6,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Joonas Niilola <juippis@gentoo.org> (2022-08-02)
 # Doesn't compile with 'Xaw3d' use flag, #849947.
 app-text/xdvik Xaw3d
 
+# Joonas Niilola <juippis@gentoo.org> (2022-07-13)
 # Depends on an older enigmail that only supports python2, which is
 # being removed soon. #758344
 www-client/seamonkey crypt
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index b68a2f27b1b1..b777369fddc1 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,11 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Sam James <sam@gentoo.org> (2022-08-02)
+# Masked for testing. The split of some packages may still
+# change. bug #838970.
+qt6
+
 # Hans de Graaff <graaff@gentoo.org> (2022-07-16)
 # Mask ruby 2.6 as EOL
 ruby_targets_ruby26
diff --git a/profiles/package.mask b/profiles/package.mask
index 184dc5e98572..94171d0fe9ce 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,28 @@
 
 #--- END OF EXAMPLES ---
 
+# Jimi Huotari <chiitoo@gentoo.org> (2022-08-02)
+# Masked for testing. The split of some packages may still
+# change. bug #838970.
+dev-python/PyQt6
+dev-python/PyQt6_WebEngine
+dev-qt/qt5compat:6
+dev-qt/qtbase:6
+dev-qt/qtdeclarative:6
+dev-qt/qtlocation:6
+dev-qt/qtmultimedia:6
+dev-qt/qtpositioning:6
+dev-qt/qtquick3d:6
+dev-qt/qtquicktimeline:6
+dev-qt/qtserialport:6
+dev-qt/qtshadertools:6
+dev-qt/qtsvg:6
+dev-qt/qttools:6
+dev-qt/qtwayland:6
+dev-qt/qtwebchannel:6
+dev-qt/qtwebengine:6
+dev-qt/qtwebsockets:6
+
 # Sam James <sam@gentoo.org> (2022-08-02)
 # Multiple rendering/font issues reported: bug #844115, bug #851141.
 =app-text/ghostscript-gpl-9.56.1
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2645c28a1a6b..22bd563f44e2 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2387,6 +2387,28 @@ dev-python/PyQt5:websockets - Build bindings for the QtWebSockets module
 dev-python/PyQt5:widgets - Build bindings for the QtWidgets module
 dev-python/PyQt5:x11extras - Build bindings for the QtX11Extras module
 dev-python/PyQt5:xmlpatterns - Build bindings for the QtXmlPatterns module
+dev-python/PyQt6:dbus - Build bindings for the QtDBus module
+dev-python/PyQt6:designer - Build bindings for the QtDesigner module and enable the designer plugin
+dev-python/PyQt6:gui - Build bindings for the QtGui module
+dev-python/PyQt6:help - Build bindings for the QtHelp module
+dev-python/PyQt6:multimedia - Build bindings for the QtMultimedia module
+dev-python/PyQt6:network - Build bindings for the QtNetwork module
+dev-python/PyQt6:opengl - Build bindings for the QtOpenGL module
+dev-python/PyQt6:positioning - Build bindings for the QtPositioning module
+dev-python/PyQt6:printsupport - Build bindings for the QtPrintSupport module
+dev-python/PyQt6:qml - Build bindings for the QtQml module and enable the qml plugin
+dev-python/PyQt6:quick - Build bindings for the QtQuick module
+dev-python/PyQt6:quick3d - Build bindings for the QtQuick3D module
+dev-python/PyQt6:serialport - Build bindings for the QtSerialPort module
+dev-python/PyQt6:sql - Build bindings for the QtSql module
+dev-python/PyQt6:svg - Build bindings for the QtSvg module
+dev-python/PyQt6:testlib - Build bindings for the QtTest module
+dev-python/PyQt6:webchannel - Build bindings for the QtWebChannel module
+dev-python/PyQt6:websockets - Build bindings for the QtWebSockets module
+dev-python/PyQt6:widgets - Build bindings for the QtWidgets module
+dev-python/PyQt6:xml - Build bindings for the QtXml module
+dev-python/PyQt6_WebEngine:quick - Build bindings for the QtWebEngineQuick module
+dev-python/PyQt6_WebEngine:widgets - Build bindings for the QtWebEngineWidgets module
 dev-python/QtPy:declarative - Build bindings for the QtQml and QtQuick modules and enable the qmlscene plugin
 dev-python/QtPy:designer - Pull in bindings for the QtDesigner module and enable the designer plugin
 dev-python/QtPy:gui - Pull in bindings for the QtGui module
@@ -2603,12 +2625,33 @@ dev-qt/qt-docs:xmlpatterns - Install documentation for dev-qt/qtxmlpatterns
 dev-qt/qt3d:gamepad - Add support for gamepad hardware via dev-qt/qtgamepad
 dev-qt/qt3d:qml - Build QML/QtQuick bindings
 dev-qt/qt3d:vulkan - Enable support for Vulkan
+dev-qt/qtbase:X - Build the XCB platform plugin and enable X11 integration
+dev-qt/qtbase:brotli - Enable support for Brotli decompression
+dev-qt/qtbase:concurrent - Build Qt6Concurrent module
+dev-qt/qtbase:dbus - Build Qt6DBus module
+dev-qt/qtbase:egl - Enable EGL integration
+dev-qt/qtbase:eglfs - Build the EGL Full Screen/Single Surface platform plugin
+dev-qt/qtbase:evdev - Enable support for input devices via evdev
+dev-qt/qtbase:gssapi - Enable support for GSSAPI (virtual/krb5)
+dev-qt/qtbase:gtk - Build the GTK platform theme plugin
+dev-qt/qtbase:gui - Build Qt6Gui module
+dev-qt/qtbase:libinput - Enable support for input devices via dev-libs/libinput
+dev-qt/qtbase:libproxy - Use net-libs/libproxy for automatic HTTP/SOCKS proxy configuration
+dev-qt/qtbase:network - Build Qt6Network module
+dev-qt/qtbase:sql - Build Qt6Sql module
+dev-qt/qtbase:systemd - Enable native journald logging support
+dev-qt/qtbase:tslib - Enable support for touchscreen devices via x11-libs/tslib
+dev-qt/qtbase:tuio - Build plugin to receive touch events over the TUIO protocol
+dev-qt/qtbase:vulkan - Enable support for Vulkan
+dev-qt/qtbase:widgets - Build Qt6Widgets module
 dev-qt/qtbluetooth:qml - Build QML/QtQuick bindings and imports
 dev-qt/qtcharts:qml - Build QML/QtQuick bindings and imports
 dev-qt/qtcore:old-kernel - Disable syscalls not available on Linux kernels older than 4.11
 dev-qt/qtcore:systemd - Enable native journald logging support
 dev-qt/qtdatavis3d:qml - Build QML/QtQuick bindings and imports
 dev-qt/qtdeclarative:localstorage - Build the LocalStorage import for QtQuick (requires QtSql)
+dev-qt/qtdeclarative:opengl - Enable OpenGL support
+dev-qt/qtdeclarative:sql - Enable QtSQL support
 dev-qt/qtdeclarative:vulkan - Enable support for Vulkan
 dev-qt/qtdeclarative:widgets - Enable QtWidgets support
 dev-qt/qtdiag:network - Report network information
@@ -2640,6 +2683,16 @@ dev-qt/qtquickcontrols2:widgets - Enable QtWidgets support
 dev-qt/qtscript:scripttools - Build the QtScriptTools module (requires QtWidgets)
 dev-qt/qtsensors:qml - Build QML bindings
 dev-qt/qtspeech:flite - Enable text-to-speech synthesizer plugin using app-accessibility/flite engine
+dev-qt/qttools:assistant - Build Qt Assistant
+dev-qt/qttools:designer - Build Qt Designer
+dev-qt/qttools:distancefieldgenerator - Build Qt Distance Field Generator
+dev-qt/qttools:linguist - Build Qt Linguist
+dev-qt/qttools:pixeltool - Build Qt Pixeltool
+dev-qt/qttools:qdbus - Build the Qt D-Bus Interface and D-Bus Viewer
+dev-qt/qttools:qdoc - Build Qt Documentation Generator
+dev-qt/qttools:qtattributionsscanner - Build Qt Source Code Attribution Scanner
+dev-qt/qttools:qtdiag - Build Qt Diag
+dev-qt/qttools:qtplugininfo - Build Qt Plugin Info
 dev-qt/qtvirtualkeyboard:handwriting - Adds handwriting recognition integration support
 dev-qt/qtwayland:vulkan - Enable support for Vulkan-based server buffer integration
 dev-qt/qtwebchannel:qml - Build QML/QtQuick bindings and imports
@@ -5798,6 +5851,7 @@ net-im/teams:system-ffmpeg - Use the system-wide media-video/ffmpeg instead of b
 net-im/teams:system-mesa - Use the system-wide media-libs/mesa instead of bundled.
 net-im/telegram-desktop:enchant - Enable the app-text/aspell spell-checking backend
 net-im/telegram-desktop:hunspell - Enable the app-text/hunspell spell-checking backend
+net-im/telegram-desktop:qt6 - Build with Qt6 support
 net-im/telepathy-connection-managers:gadu - Enable Gadu Gadu protocol support.
 net-im/telepathy-connection-managers:icq - Enable ICQ IM protocol support.
 net-im/telepathy-connection-managers:irc - Enable Internet Relay Chat (IRC) support.
@@ -8640,6 +8694,7 @@ www-client/opera:proprietary-codecs - Enable codecs for patent-encumbered audio
 www-client/opera-beta:proprietary-codecs - Enable codecs for patent-encumbered audio and video formats.
 www-client/opera-developer:proprietary-codecs - Enable codecs for patent-encumbered audio and video formats.
 www-client/qutebrowser:adblock - Enable Brave's ABP-style adblocker library for improved adblocking
+www-client/qutebrowser:qt6 - Use Qt6 that provides a newer Chromium version
 www-client/qutebrowser:widevine - Unsupported closed-source DRM capability (required by Netflix VOD)
 www-client/seamonkey:chatzilla - Build Mozilla's IRC client (default on)
 www-client/seamonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 55cd4e2b1cb0..a68578f6d3e3 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/lean/Manifest b/sci-mathematics/lean/Manifest
index 91e3fc7c8f3a..dd7f7ad68b49 100644
--- a/sci-mathematics/lean/Manifest
+++ b/sci-mathematics/lean/Manifest
@@ -2,8 +2,8 @@ AUX lean-CMakeLists-fix_flags.patch 1285 BLAKE2B 0507e553c1acf2a53c5267932127117
 DIST lean-3.43.0.tar.gz 1909158 BLAKE2B 587995afb123e6c74a730f9709a001bab6b2ac82471dcf8b1219dda782853fcdb9735d16038b95a7950f6530dd3cf1e0b13e4d1044d723d3662217951b809928 SHA512 25cbad94b869bb39edaf9ed2478ffc298b130f22cb4db7c116212546583d670079ddde1b524a33499d00ac43fc82b6928e6801c83d613597aae255db9c45d9f3
 DIST lean-3.44.1.tar.gz 1911708 BLAKE2B 33dc94fb1f1eac2684b7a37fda3545ad6d4f6d703e7914c44b9a05fb57e55d4b9bef484ff1f6608f9bb0fe453ca28b7fa5c74e6bce135df06fb25ad6d9d3a37b SHA512 69ffd1a8519b476dd1879bfe2f8f8f4268a5490f11b581ee1e583382e6f03f947d958e8b5ee8ceead562945a406ee2dc9b0ae2da6f29f03a38828eadab88a4f8
 DIST lean-3.45.0.tar.gz 1913638 BLAKE2B f36548be556407cbf7b30a7988bb2454542543cafcd2d0f2af90f75f886d4b711c6955503f7241844ffff69400ec354a194cc345feca8f0dbcb06a673cc2d3d4 SHA512 c97c1dc6004823c73d8e40b5587ebbee7bd7a90b65ecdd3a976510d0d335b6df9a26916eedd5524f7137a32254a59dd5a6f15ce67f77d500926c9bc781aa5526
-EBUILD lean-3.43.0.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
-EBUILD lean-3.44.1.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
-EBUILD lean-3.45.0.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
-EBUILD lean-3.9999.ebuild 1760 BLAKE2B 21543910ba7f9eee7186e4db4ba439ce4e23cf72e49c936beb47fd0717cbcb276c41b03a651efc46a9855d1d9f2b0bd9904e34f52b3c6569eff0f757c6719c6a SHA512 bfb7062d09fff733cb5779b0f1f49c1ec7b1d90e48f12b2c524dc4c5189439e2de2773ac25f3621359a39cae5c2c6d338d2e6f0a1c892ebf1f5e4ad742ce9f2c
+EBUILD lean-3.43.0.ebuild 1786 BLAKE2B b487fa10df236d03e46cdfe785e06337d2b6b2f98c8492573e5f3196bd49d6331f69cc3fb232adfe7ebfb0a46e779e7b5b8d6efb4875fe1e5eaa90f7c56e8d60 SHA512 09c7d71a12e09d83c362c21c2f5f6958c1777a4553e585214e908ced9b1080d0c22abf050b22393030e00651bb6f156d7f108c3389bd03267383d4748d5ce661
+EBUILD lean-3.44.1.ebuild 1786 BLAKE2B b487fa10df236d03e46cdfe785e06337d2b6b2f98c8492573e5f3196bd49d6331f69cc3fb232adfe7ebfb0a46e779e7b5b8d6efb4875fe1e5eaa90f7c56e8d60 SHA512 09c7d71a12e09d83c362c21c2f5f6958c1777a4553e585214e908ced9b1080d0c22abf050b22393030e00651bb6f156d7f108c3389bd03267383d4748d5ce661
+EBUILD lean-3.45.0.ebuild 1786 BLAKE2B b487fa10df236d03e46cdfe785e06337d2b6b2f98c8492573e5f3196bd49d6331f69cc3fb232adfe7ebfb0a46e779e7b5b8d6efb4875fe1e5eaa90f7c56e8d60 SHA512 09c7d71a12e09d83c362c21c2f5f6958c1777a4553e585214e908ced9b1080d0c22abf050b22393030e00651bb6f156d7f108c3389bd03267383d4748d5ce661
+EBUILD lean-3.9999.ebuild 1786 BLAKE2B b487fa10df236d03e46cdfe785e06337d2b6b2f98c8492573e5f3196bd49d6331f69cc3fb232adfe7ebfb0a46e779e7b5b8d6efb4875fe1e5eaa90f7c56e8d60 SHA512 09c7d71a12e09d83c362c21c2f5f6958c1777a4553e585214e908ced9b1080d0c22abf050b22393030e00651bb6f156d7f108c3389bd03267383d4748d5ce661
 MISC metadata.xml 606 BLAKE2B 6478d84a762a59082fdea0a11a95b27c093782228c48dba58dc490ea9ac2cecef54cc3101dc98e385f3a29f85d84af21b7d2ae1a9f089ee0313158ecb44eb0e7 SHA512 02d2ac07b155c7a04c857d397d476a39864d02b10dd81c5830db5e21eb86c6dcff26da552a04717f5f587b326ddf8e2e8d27f1a138f88b391f0199d8004d8cb7
diff --git a/sci-mathematics/lean/lean-3.43.0.ebuild b/sci-mathematics/lean/lean-3.43.0.ebuild
index 5d8ee8eecd4b..6623228581a0 100644
--- a/sci-mathematics/lean/lean-3.43.0.ebuild
+++ b/sci-mathematics/lean/lean-3.43.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MAJOR=$(ver_cut 1)
 CMAKE_IN_SOURCE_BUILD="ON"
 
-inherit cmake readme.gentoo-r1
+inherit flag-o-matic cmake readme.gentoo-r1
 
 DESCRIPTION="The Lean Theorem Prover"
 HOMEPAGE="https://leanprover-community.github.io/"
@@ -37,6 +37,8 @@ src_configure() {
 		CMAKE_BUILD_TYPE="Release"
 	fi
 
+	filter-lto
+
 	local mycmakeargs=(
 		-DALPHA=ON
 		-DAUTO_THREAD_FINALIZATION=ON
diff --git a/sci-mathematics/lean/lean-3.44.1.ebuild b/sci-mathematics/lean/lean-3.44.1.ebuild
index 5d8ee8eecd4b..6623228581a0 100644
--- a/sci-mathematics/lean/lean-3.44.1.ebuild
+++ b/sci-mathematics/lean/lean-3.44.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MAJOR=$(ver_cut 1)
 CMAKE_IN_SOURCE_BUILD="ON"
 
-inherit cmake readme.gentoo-r1
+inherit flag-o-matic cmake readme.gentoo-r1
 
 DESCRIPTION="The Lean Theorem Prover"
 HOMEPAGE="https://leanprover-community.github.io/"
@@ -37,6 +37,8 @@ src_configure() {
 		CMAKE_BUILD_TYPE="Release"
 	fi
 
+	filter-lto
+
 	local mycmakeargs=(
 		-DALPHA=ON
 		-DAUTO_THREAD_FINALIZATION=ON
diff --git a/sci-mathematics/lean/lean-3.45.0.ebuild b/sci-mathematics/lean/lean-3.45.0.ebuild
index 5d8ee8eecd4b..6623228581a0 100644
--- a/sci-mathematics/lean/lean-3.45.0.ebuild
+++ b/sci-mathematics/lean/lean-3.45.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MAJOR=$(ver_cut 1)
 CMAKE_IN_SOURCE_BUILD="ON"
 
-inherit cmake readme.gentoo-r1
+inherit flag-o-matic cmake readme.gentoo-r1
 
 DESCRIPTION="The Lean Theorem Prover"
 HOMEPAGE="https://leanprover-community.github.io/"
@@ -37,6 +37,8 @@ src_configure() {
 		CMAKE_BUILD_TYPE="Release"
 	fi
 
+	filter-lto
+
 	local mycmakeargs=(
 		-DALPHA=ON
 		-DAUTO_THREAD_FINALIZATION=ON
diff --git a/sci-mathematics/lean/lean-3.9999.ebuild b/sci-mathematics/lean/lean-3.9999.ebuild
index 5d8ee8eecd4b..6623228581a0 100644
--- a/sci-mathematics/lean/lean-3.9999.ebuild
+++ b/sci-mathematics/lean/lean-3.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MAJOR=$(ver_cut 1)
 CMAKE_IN_SOURCE_BUILD="ON"
 
-inherit cmake readme.gentoo-r1
+inherit flag-o-matic cmake readme.gentoo-r1
 
 DESCRIPTION="The Lean Theorem Prover"
 HOMEPAGE="https://leanprover-community.github.io/"
@@ -37,6 +37,8 @@ src_configure() {
 		CMAKE_BUILD_TYPE="Release"
 	fi
 
+	filter-lto
+
 	local mycmakeargs=(
 		-DALPHA=ON
 		-DAUTO_THREAD_FINALIZATION=ON
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 1a601a4c3224..cbb67905554d 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -4,6 +4,6 @@ DIST z3-4.8.17.tar.gz 5232392 BLAKE2B 80dbb5d48811eb6022c0d0117d1e954bae7b27ff98
 DIST z3-4.9.1.tar.gz 5358020 BLAKE2B b707084424b615a43dcefbc395d6cf0519f3d6ea3ab1cc8b34b1810d5eb241afa22eae694e4dfc756fff42179a5dabe10052f88aab02953154ada8334f7e0b64 SHA512 0c44e10d039c3bf16591a7b94e3a3209bc334635106ac7ae4afda95541d13d4fc39214646662683c26b4874846e0d83813215e189ce5422d13f8ce7c2ac4db51
 EBUILD z3-4.10.1.ebuild 2616 BLAKE2B 675a78252eccdedc81057c7c5964cc3f8ff8701bcacdfd081246b1333b9c6b2fcdfea463e754a0a464560dcebf26a3ca0044b88f5de63e1a19b77d529a1e9554 SHA512 5e4b1ecbfe6b713d7a30d8dfef2b24f39246b66a0f535c94f3be04072c1928fae18b6f185a323db8bc0b5a301c4347233011874b038cf491d3bbf3137e717055
 EBUILD z3-4.10.2.ebuild 2616 BLAKE2B 675a78252eccdedc81057c7c5964cc3f8ff8701bcacdfd081246b1333b9c6b2fcdfea463e754a0a464560dcebf26a3ca0044b88f5de63e1a19b77d529a1e9554 SHA512 5e4b1ecbfe6b713d7a30d8dfef2b24f39246b66a0f535c94f3be04072c1928fae18b6f185a323db8bc0b5a301c4347233011874b038cf491d3bbf3137e717055
-EBUILD z3-4.8.17.ebuild 2614 BLAKE2B e69e8ede7cebd497598e854224bb1f3c9e93765df016aaf33efbfa56bd2508a773459c829a0343de6aa9cffcfb3e3da4eb62fbd7e438fae7aaf3af26288d4391 SHA512 6c9f47d73b9c016fc404c28656d4102a0f179c2e8b73f548aadbaf2847f211da41ec099b76f9f79602f19fd59eab4ee99ae66315bd47a35509158ad235e4fbac
+EBUILD z3-4.8.17.ebuild 2613 BLAKE2B 3f0b83c0ae6f25e7f048c056b72367a7b8230b7caf6b0b4d426dc823e89325b8f460e915d89d7b49400adfa282fc35105e24a048ccc54a59c3782baf4cb0358a SHA512 e7989ea9e2b77b956bde677b6e57afc37566c61aa1d8a9f42636e7055c2be92489282871d16671aa9af83f556db174da52528a921f0fbabf587b2c46b99704ac
 EBUILD z3-4.9.1-r1.ebuild 2616 BLAKE2B 675a78252eccdedc81057c7c5964cc3f8ff8701bcacdfd081246b1333b9c6b2fcdfea463e754a0a464560dcebf26a3ca0044b88f5de63e1a19b77d529a1e9554 SHA512 5e4b1ecbfe6b713d7a30d8dfef2b24f39246b66a0f535c94f3be04072c1928fae18b6f185a323db8bc0b5a301c4347233011874b038cf491d3bbf3137e717055
 MISC metadata.xml 617 BLAKE2B f940ac3d7c159dadf4398164b749eaded84c12af5553a154d97fd9bfb939c72e3122e08e11c1c9764514f59a87695534daff6628bd15be4de834c7cfdb65d7f9 SHA512 758df481a60606de12c5a450162ee89fd2f68f842675b3bf280f024fcd61232228476ac889e60c09e42ebae01ad855b32ad77793ba7fa5714861ccc5ca52bfc7
diff --git a/sci-mathematics/z3/z3-4.8.17.ebuild b/sci-mathematics/z3/z3-4.8.17.ebuild
index f97bc38fd53d..6383decc5301 100644
--- a/sci-mathematics/z3/z3-4.8.17.ebuild
+++ b/sci-mathematics/z3/z3-4.8.17.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e38359874d4d..b56c8e754f0b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index f8eb0c30033c..b5a32e336f19 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,4 +1,5 @@
 AUX 250.4-test-systemd-tmpfiles.standalone.patch 1369 BLAKE2B c0f2f51d0b7127a5a0161f9a56f4e94d9b4e983f9f496601ba4ce9197076556df4f699871480ce0cc0a4002b0c8a6fec6706a358b1b28ab75dcf216f2e408821 SHA512 18b9852cf9fe53e45ca0d3f051580e726aa39462c5477c7143523903c3836f131df44837ec19acfff10281bfe0e0b4c53ea4cb2ebed9e342f1289db07fc752ed
+AUX 251-glibc-2.36.patch 4101 BLAKE2B 79b05ed39a2c840358b2030fd5bba61a3c0786e376f7fc4dee133aa7539a55008ac57a58d5c11ef9e2a2f047b359b6ab2841ea0adc5977da066e5b6c2ae26cc2 SHA512 0c4a05129a3ce22432db6e189e87db71c73be517b7e4a10e2218a0b24f0fd5d8dff331249574e6e0e1958476db95315054320837b784ae6351473f5eecc20800
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
 AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
@@ -11,5 +12,5 @@ DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d3
 EBUILD systemd-utils-250.7.ebuild 11342 BLAKE2B 67a094e130be3b21a647a3db3a66ea0b35b6f4292fa98c3e81d6a2ecd09b291ef08efdbb048e73c5b141b1cf815a4d7a340c6b43c65aa6a3f5b31fa962b60f89 SHA512 2d88c146cebdc0ae5344c80cf807507e343e77ca37af9b0c28cd131ce2f532418e13773ae00a712d54302b8196e4b5696c1a213dbb2472931d79e1f8485b4537
 EBUILD systemd-utils-250.8.ebuild 11350 BLAKE2B faf9c2a6685159fe9352e88ecc5855f38c7806f4a2da41e2e5ad1ce6124a4fbb9b42a71c351070297a821b093856a4b75263865b1ffe0d7fe16ebdced0dfdc64 SHA512 6ebec4e3a65f50467bc3b5995acb0ab483723e87dcfef8d4c5a7b4f26d8116049ed2c4c78f3f03f9216af5dc87767e69195f0bbff909644bfa91e688bf602058
 EBUILD systemd-utils-251.2-r1.ebuild 11492 BLAKE2B d32e0222842f5981ee2aab1a3a67b1679e409b195503ad9f7ef185150e5fa2b98504c774f4bbcf5260523309d431582dc75fcf3d67818a981dbaffe40add999a SHA512 b2c1c51130c7ac90a98ae8af25167d2dc47dee6ec92342bd83159898f1a2170b4599c984d00430294cd4ac7895996e7b8682d111ff82148d574e613719b00588
-EBUILD systemd-utils-251.3.ebuild 11600 BLAKE2B 506dea49b8298a2ae656c9fc0d2eee8fcc4d0dd290a229118e83e23dd6ba5875c43e764b62ed837ab932f742936d237aa2befe6c28d2a741e2d7fbb58d9b617a SHA512 8bddb78d725c950c4871f490da11b6b5c4ba53d8e2aba347ddecf47b6efd19e5877e5993d9196121c87467c3c7a075d94f771cff9da80f4a355db617bae785d9
+EBUILD systemd-utils-251.3.ebuild 11654 BLAKE2B caf1e147e0f19a503310e88a3c14d116d107caa0926d090f6bdb51076c69969ac462cd1fb2dccb56a1e849d71d592023c212239074113cce1c520b3b763a4d21 SHA512 24d2ab96174430c7f2acb1d541a87888a0aef5f04cce08e9636ddd240a35041123b11b46c162d6d5ed30b0a8c8f7d1a50a9204e760567515873d219964537b26
 MISC metadata.xml 571 BLAKE2B 6b3a69524c5fd3fa0bbe534ccbf3598cedcbe51542d738237ca13b465fd342555f35b2ebd1d784b7a81664c58125e01404434ca48a07502343a24dd395618c4c SHA512 8184f6d8107be83d7411f63e86a8469c4b86c96bf4738ebfda8d654e4ecedf334b4319c9d442832c8373a34e7c35ca14b879e75eb4e006d48fa3d667be0a66e4
diff --git a/sys-apps/systemd-utils/files/251-glibc-2.36.patch b/sys-apps/systemd-utils/files/251-glibc-2.36.patch
new file mode 100644
index 000000000000..65693d747ca3
--- /dev/null
+++ b/sys-apps/systemd-utils/files/251-glibc-2.36.patch
@@ -0,0 +1,154 @@
+https://bugs.gentoo.org/863218
+https://github.com/systemd/systemd/issues/23984
+https://github.com/systemd/systemd/commit/3657d3a01c7e25ff86d7a4642065b367c4ff7484
+https://github.com/systemd/systemd/commit/0a58cd00454cc7b57b04f3a4a334584d743d7f7a
+
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Sat, 23 Jul 2022 10:38:49 +0000
+Subject: [PATCH] glibc: Remove #include <linux/fs.h> to resolve
+ fsconfig_command/mount_attr conflict with glibc 2.36
+
+--- a/meson.build
++++ b/meson.build
+@@ -511,7 +511,6 @@ decl_headers = '''
+ #include <uchar.h>
+ #include <sys/mount.h>
+ #include <sys/stat.h>
+-#include <linux/fs.h>
+ '''
+ 
+ foreach decl : ['char16_t',
+@@ -523,6 +522,17 @@ foreach decl : ['char16_t',
+         # We get -1 if the size cannot be determined
+         have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0
+ 
++        if decl == 'struct mount_attr'
++                if have
++                        want_linux_fs_h = false
++                else
++                        have = cc.sizeof(decl,
++                                         prefix : decl_headers + '#include <linux/fs.h>',
++                                         args : '-D_GNU_SOURCE') > 0
++                        want_linux_fs_h = have
++                endif
++        endif
++
+         if decl == 'struct statx'
+                 if have
+                         want_linux_stat_h = false
+@@ -538,6 +548,7 @@ foreach decl : ['char16_t',
+ endforeach
+ 
+ conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h)
++conf.set10('WANT_LINUX_FS_H', want_linux_fs_h)
+ 
+ foreach ident : ['secure_getenv', '__secure_getenv']
+         conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident))
+--- a/src/basic/fd-util.c
++++ b/src/basic/fd-util.c
+@@ -3,7 +3,9 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <linux/btrfs.h>
++#if WANT_LINUX_FS_H
+ #include <linux/fs.h>
++#endif
+ #include <linux/magic.h>
+ #include <sys/ioctl.h>
+ #include <sys/resource.h>
+--- a/src/core/namespace.c
++++ b/src/core/namespace.c
+@@ -7,7 +7,9 @@
+ #include <sys/file.h>
+ #include <sys/mount.h>
+ #include <unistd.h>
++#if WANT_LINUX_FS_H
+ #include <linux/fs.h>
++#endif
+ 
+ #include "alloc-util.h"
+ #include "base-filesystem.h"
+--- a/src/shared/mount-util.c
++++ b/src/shared/mount-util.c
+@@ -7,7 +7,9 @@
+ #include <sys/statvfs.h>
+ #include <unistd.h>
+ #include <linux/loop.h>
++#if WANT_LINUX_FS_H
+ #include <linux/fs.h>
++#endif
+ 
+ #include "alloc-util.h"
+ #include "chase-symlinks.h"
+
+From 0a58cd00454cc7b57b04f3a4a334584d743d7f7a Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 26 Jul 2022 20:03:12 +0900
+Subject: [PATCH] home: drop conflicted headers
+
+Fixes #24117.
+--- a/src/basic/missing_fs.h
++++ b/src/basic/missing_fs.h
+@@ -64,3 +64,8 @@
+ #ifndef FS_PROJINHERIT_FL
+ #define FS_PROJINHERIT_FL 0x20000000
+ #endif
++
++/* linux/fscrypt.h */
++#ifndef FS_KEY_DESCRIPTOR_SIZE
++#define FS_KEY_DESCRIPTOR_SIZE 8
++#endif
+--- a/src/home/homework-cifs.c
++++ b/src/home/homework-cifs.c
+@@ -1,5 +1,10 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ 
++#include <sys/mount.h>
++#if WANT_LINUX_FS_H
++#include <linux/fs.h>
++#endif
++
+ #include "dirent-util.h"
+ #include "fd-util.h"
+ #include "fileio.h"
+--- a/src/home/homework-luks.c
++++ b/src/home/homework-luks.c
+@@ -4,7 +4,6 @@
+ #include <poll.h>
+ #include <sys/file.h>
+ #include <sys/ioctl.h>
+-#include <sys/mount.h>
+ #include <sys/xattr.h>
+ 
+ #if HAVE_VALGRIND_MEMCHECK_H
+--- a/src/home/homework-mount.c
++++ b/src/home/homework-mount.c
+@@ -2,7 +2,9 @@
+ 
+ #include <sched.h>
+ #include <sys/mount.h>
++#if WANT_LINUX_FS_H
+ #include <linux/fs.h>
++#endif
+ 
+ #include "alloc-util.h"
+ #include "fd-util.h"
+--- a/src/home/homework.h
++++ b/src/home/homework.h
+@@ -1,13 +1,14 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ #pragma once
+ 
+-#include <linux/fs.h>
+ #include <sys/vfs.h>
+ 
+ #include "sd-id128.h"
+ 
++#include "cryptsetup-util.h"
+ #include "homework-password-cache.h"
+ #include "loop-util.h"
++#include "missing_fs.h" /* for FS_KEY_DESCRIPTOR_SIZE, do not include linux/fs.h */
+ #include "missing_keyctl.h"
+ #include "missing_syscall.h"
+ #include "user-record.h"
+
diff --git a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
index 21ec7a6de8f9..277f36c6be9c 100644
--- a/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-251.3.ebuild
@@ -105,7 +105,10 @@ QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
 
 src_prepare() {
 	local PATCHES=(
+		# bug #863218
+		"${FILESDIR}/251-glibc-2.36.patch"
 	)
+
 	if use elibc_musl; then
 		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
 		# Applied upstream in 251.3
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 0ec4d467398b..12ecefa23fea 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,5 +1,6 @@
 AUX 00-hostnamed-network-user.conf 227 BLAKE2B 0cc780a2ea9f31f08be01184704e4fa8b4b95e4c82b7e2dd4127f82c594a5cd7c8f865a83ae5f1284e58a7fd120ee9a9f4f586b7e479d21f1e8adf26e8e61238 SHA512 97e8decd802de8581fb546e3a714376fbd065108f3edfed54a1036d93df02f9947c358aec9aa4841a766c9120fa20c69eb7867bb4d2bd7339d8bd89c43235b2b
 AUX 251-format-string.patch 1038 BLAKE2B 2b7400516fd93bdaa887e6203b44e656ccc27ddd963264c2ae1a360c5899cbd42417e66f72fb8c02366a64371257d782d9c34e5288b17e357edebdb55da939c8 SHA512 d300bdcad16485a92c80df575c403fabbdcd4e8c71251e56147b0d85c2a2e8d271eb055b5f188a184cb652c22ce428176355f322e679b88bb8db90610e63c1a4
+AUX 251-glibc-2.36.patch 4101 BLAKE2B 79b05ed39a2c840358b2030fd5bba61a3c0786e376f7fc4dee133aa7539a55008ac57a58d5c11ef9e2a2f047b359b6ab2841ea0adc5977da066e5b6c2ae26cc2 SHA512 0c4a05129a3ce22432db6e189e87db71c73be517b7e4a10e2218a0b24f0fd5d8dff331249574e6e0e1958476db95315054320837b784ae6351473f5eecc20800
 AUX 251-revert-fortify-source-3-fix.patch 2059 BLAKE2B 5b34062821f2097fc622ffc66d83029267173b2b4131b29d9339644577b7e80c513c83f62d07ba3e030c2a861efe7d399bd871cc35803b39940f7ec0e7bacfec SHA512 14c5ac8d0343a4cb50de6c56124e515b159cf5f9bf358404ba41ec7a9c439206673e0d44888164ff3872236c7b8c74f5ea9544ea7a981a3b5930585dabcd4782
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
@@ -12,6 +13,6 @@ DIST systemd-stable-251.2.tar.gz 11434645 BLAKE2B a7e118649a7d27b789206ea9f6f2d0
 DIST systemd-stable-251.3.tar.gz 11435458 BLAKE2B 544238536848ab390b2476d5ad95d33998674be50020b8db0627bb9d0c86be6576c404ce786b01ceec86f1c75b174c6fc2d7e0d7fbab802a78f48c9d0915c2b8 SHA512 fb5b8dc1742562ef95469e90d406cfb6dfcb337860ad1208b460414b88ff0565071bde797d195faa62761206abc881829de6b1009e5d727cad2dfe0764310d5f
 EBUILD systemd-250.7.ebuild 16382 BLAKE2B 465a4e903c31401e7f0d8804dde61cca9df52176719f71f3f7b6997620ce01e6720bcf9a6505cd3cfe0cf399f6f215c4851a39683e04b1e47f6e4f500fe85018 SHA512 601674acd39e5b6135bf7c0a3495978e54254f590cefc1882f978830829e29d2ed848a3c9749477a7331e3c68eb59beb74e61dd1cbb89ada91b072bbb366325d
 EBUILD systemd-251.2.ebuild 15630 BLAKE2B e107322c07f313e0ec5bffaaace81074c71ad7d8ec33d71382ba9726552b0ebd587b4cd8b3b52093deb38e3d11b115eb41854cc76a43e9794e08eef0d724a30a SHA512 1b9cd6a6dd45185f40272a29a06bcd8eee8de4a0d9a2469aaf487d3bf476dee439170ee089bedce41abbe83bf98bc7f9ed752dcda441eff13bf60c41e2caf005
-EBUILD systemd-251.3.ebuild 15598 BLAKE2B 74279a36d028eda0f23fd9c00f576ca295a26841a91162e7f5e27152d622970e66ca81025d76e281ae1e5d7f870aff19df8e1cec4256433a059511185b026c17 SHA512 86b01c5359c4fa70805b87eda6312d6fe8cea762d7f2ada563b6ab5893a0ec556c007423915ddd800aa1a1cf144250071d7335168cec8156aa05d59f5ec7e56a
+EBUILD systemd-251.3.ebuild 15651 BLAKE2B 1847f057cac876067f28e32a5ba4e519b75e6dd2f47219caf7b3018660cebf8dd2720d2d330f125c69b4f1d9a198c13c21a830b8fc2b8327eda56b41da7ebd68 SHA512 7bf07834c83cdd5f524c2fbfed7b042b2c3304a6585b0f38f5e9a2ddaadddcb374139de640a7a17261f2f39b81913d5c74002294aeb56d74cbfd98a106376636
 EBUILD systemd-9999.ebuild 15462 BLAKE2B 1208bd9c96e23d479a545385db048e9f9aac405a5b011fe8de6af40e190ad4e855d69136bab6874d0e152baf5e22b2e03cd6ceb31a0d654c6cc1b7690a625d05 SHA512 1360af2b5fb12c687a773a572fa8a31f03efa7dc949ffae1ceb0f24c10b9e9f7792816f5e2362e9d82b315a6280c5bcddfff2514e33fbc0ffcfff1e0547fee22
 MISC metadata.xml 2755 BLAKE2B 54ce05794b190925dbe103ef494c904d23a3891765dcff82ee09bbe6bcafece47362e52522828277978309566eb8eea5b850afc6f58f18c628d3a6cf989bdc58 SHA512 23851ca77dabeb4a0b2c7e5853ba47550955369af5453c7af74e73515380b8fd0f570cf9d552127cff1934793b72e57581b13630c251431c9c612860b6a4d6bc
diff --git a/sys-apps/systemd/files/251-glibc-2.36.patch b/sys-apps/systemd/files/251-glibc-2.36.patch
new file mode 100644
index 000000000000..65693d747ca3
--- /dev/null
+++ b/sys-apps/systemd/files/251-glibc-2.36.patch
@@ -0,0 +1,154 @@
+https://bugs.gentoo.org/863218
+https://github.com/systemd/systemd/issues/23984
+https://github.com/systemd/systemd/commit/3657d3a01c7e25ff86d7a4642065b367c4ff7484
+https://github.com/systemd/systemd/commit/0a58cd00454cc7b57b04f3a4a334584d743d7f7a
+
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Sat, 23 Jul 2022 10:38:49 +0000
+Subject: [PATCH] glibc: Remove #include <linux/fs.h> to resolve
+ fsconfig_command/mount_attr conflict with glibc 2.36
+
+--- a/meson.build
++++ b/meson.build
+@@ -511,7 +511,6 @@ decl_headers = '''
+ #include <uchar.h>
+ #include <sys/mount.h>
+ #include <sys/stat.h>
+-#include <linux/fs.h>
+ '''
+ 
+ foreach decl : ['char16_t',
+@@ -523,6 +522,17 @@ foreach decl : ['char16_t',
+         # We get -1 if the size cannot be determined
+         have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0
+ 
++        if decl == 'struct mount_attr'
++                if have
++                        want_linux_fs_h = false
++                else
++                        have = cc.sizeof(decl,
++                                         prefix : decl_headers + '#include <linux/fs.h>',
++                                         args : '-D_GNU_SOURCE') > 0
++                        want_linux_fs_h = have
++                endif
++        endif
++
+         if decl == 'struct statx'
+                 if have
+                         want_linux_stat_h = false
+@@ -538,6 +548,7 @@ foreach decl : ['char16_t',
+ endforeach
+ 
+ conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h)
++conf.set10('WANT_LINUX_FS_H', want_linux_fs_h)
+ 
+ foreach ident : ['secure_getenv', '__secure_getenv']
+         conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident))
+--- a/src/basic/fd-util.c
++++ b/src/basic/fd-util.c
+@@ -3,7 +3,9 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <linux/btrfs.h>
++#if WANT_LINUX_FS_H
+ #include <linux/fs.h>
++#endif
+ #include <linux/magic.h>
+ #include <sys/ioctl.h>
+ #include <sys/resource.h>
+--- a/src/core/namespace.c
++++ b/src/core/namespace.c
+@@ -7,7 +7,9 @@
+ #include <sys/file.h>
+ #include <sys/mount.h>
+ #include <unistd.h>
++#if WANT_LINUX_FS_H
+ #include <linux/fs.h>
++#endif
+ 
+ #include "alloc-util.h"
+ #include "base-filesystem.h"
+--- a/src/shared/mount-util.c
++++ b/src/shared/mount-util.c
+@@ -7,7 +7,9 @@
+ #include <sys/statvfs.h>
+ #include <unistd.h>
+ #include <linux/loop.h>
++#if WANT_LINUX_FS_H
+ #include <linux/fs.h>
++#endif
+ 
+ #include "alloc-util.h"
+ #include "chase-symlinks.h"
+
+From 0a58cd00454cc7b57b04f3a4a334584d743d7f7a Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 26 Jul 2022 20:03:12 +0900
+Subject: [PATCH] home: drop conflicted headers
+
+Fixes #24117.
+--- a/src/basic/missing_fs.h
++++ b/src/basic/missing_fs.h
+@@ -64,3 +64,8 @@
+ #ifndef FS_PROJINHERIT_FL
+ #define FS_PROJINHERIT_FL 0x20000000
+ #endif
++
++/* linux/fscrypt.h */
++#ifndef FS_KEY_DESCRIPTOR_SIZE
++#define FS_KEY_DESCRIPTOR_SIZE 8
++#endif
+--- a/src/home/homework-cifs.c
++++ b/src/home/homework-cifs.c
+@@ -1,5 +1,10 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ 
++#include <sys/mount.h>
++#if WANT_LINUX_FS_H
++#include <linux/fs.h>
++#endif
++
+ #include "dirent-util.h"
+ #include "fd-util.h"
+ #include "fileio.h"
+--- a/src/home/homework-luks.c
++++ b/src/home/homework-luks.c
+@@ -4,7 +4,6 @@
+ #include <poll.h>
+ #include <sys/file.h>
+ #include <sys/ioctl.h>
+-#include <sys/mount.h>
+ #include <sys/xattr.h>
+ 
+ #if HAVE_VALGRIND_MEMCHECK_H
+--- a/src/home/homework-mount.c
++++ b/src/home/homework-mount.c
+@@ -2,7 +2,9 @@
+ 
+ #include <sched.h>
+ #include <sys/mount.h>
++#if WANT_LINUX_FS_H
+ #include <linux/fs.h>
++#endif
+ 
+ #include "alloc-util.h"
+ #include "fd-util.h"
+--- a/src/home/homework.h
++++ b/src/home/homework.h
+@@ -1,13 +1,14 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ #pragma once
+ 
+-#include <linux/fs.h>
+ #include <sys/vfs.h>
+ 
+ #include "sd-id128.h"
+ 
++#include "cryptsetup-util.h"
+ #include "homework-password-cache.h"
+ #include "loop-util.h"
++#include "missing_fs.h" /* for FS_KEY_DESCRIPTOR_SIZE, do not include linux/fs.h */
+ #include "missing_keyctl.h"
+ #include "missing_syscall.h"
+ #include "user-record.h"
+
diff --git a/sys-apps/systemd/systemd-251.3.ebuild b/sys-apps/systemd/systemd-251.3.ebuild
index f296bf73bc4e..6e5bdcbd47f9 100644
--- a/sys-apps/systemd/systemd-251.3.ebuild
+++ b/sys-apps/systemd/systemd-251.3.ebuild
@@ -244,6 +244,8 @@ src_prepare() {
 		# Breaks Clang. Revert the commit for now and force off F_S=3.
 		# bug #841770.
 		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
+		# bug #863218
+		"${FILESDIR}/251-glibc-2.36.patch"
 	)
 
 	if ! use vanilla; then
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index bf971f9cc6cb..d47d47139949 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/aboot/Manifest b/sys-boot/aboot/Manifest
index dd0206aef046..349370ef7cbe 100644
--- a/sys-boot/aboot/Manifest
+++ b/sys-boot/aboot/Manifest
@@ -11,4 +11,4 @@ DIST gentoo-headers-base-2.6.22.tar.bz2 4700338 BLAKE2B a264d7999ed7735e42ea21f8
 EBUILD aboot-1.0_pre20040408-r3.ebuild 2649 BLAKE2B 5bd3349ee67f9f3f6b5254386cc20da80bdebe08e6815e03c614231cdce59442677248c82674351be86838d9e39664d063f55b29231f72bc75a6812d6f069f6a SHA512 ce7545633ba5322d5f0f272973837bda883326f60cb9384922f419ef3061e70075aa0b7e737b9386ae42612bb1c2dc488ed73f20b0afa300012e3cf8228d0581
 EBUILD aboot-2.0_pre20210801.ebuild 2022 BLAKE2B 0a60c519407661b734146b9e4204714d9ad68d9675b0c1de15eac9e8eef6b5db219c98d9abc1b7127739b127835618e3ac74c300751fc3735a1183debd580bf1 SHA512 841d1ed7e6f98020632443da011f1ace98dec2fb71f02a27f1c7ed320f3fb37d34b481cd946675855e5fb820b1d3aa25e62635c2e3200cecf708a1bc319c57cb
 EBUILD aboot-9999.ebuild 1926 BLAKE2B 788056e318b044ac1b5f16bf864908f0faa8eaf3e9060ba5bb46f942f48bb313c95fd290c1b76c2775d97a79cfafbb3041cad3fa22fd8ad97863ad6ec7de6bde SHA512 4c9414846549d9405099d37fb697a48a2d29042f12fa06d42cb621675ad807a045ebb6c81f5591b3b660262d5d4beeb7a5248d806d0212bbe5d9e69a3bd2ee34
-MISC metadata.xml 339 BLAKE2B 35e599ad19c953888aa30d498be33e8d5788e8d34da3133d7170d42b5b815127c325dffc40ea38bb383b6d0d6894866b05c2386c97b9a1b248addf8a7be03259 SHA512 d33e65b6f82d8f46c3b9be8b554d3ea5ee1043e3057a3cafc6cf44f2e1b01adf10ce5b34f726d704bf152ee642b68053bce89dad2dcc0bf5434f9b54a037650a
+MISC metadata.xml 393 BLAKE2B 71f3be986704151fe590273c0b2d80f5f3e212ff1d71bdec0968057a90c58d3191b1347c131ba4de05dc3b1d427625629d00db81a79796bbe38ae4618b38d796 SHA512 6e1a6b217bedf6cec4fd662ce9b7a3445384b5d9ff15ae56ab4a30501ed7c045da83c6825f525470951c7e1190e5919563aedc0aa6c093a4645302a954132799
diff --git a/sys-boot/aboot/metadata.xml b/sys-boot/aboot/metadata.xml
index 9c4a69912874..c6fa30bd6c8e 100644
--- a/sys-boot/aboot/metadata.xml
+++ b/sys-boot/aboot/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Linux Alpha Development</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">mattst88/aboot</remote-id>
 		<remote-id type="sourceforge">aboot</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 0eccebb625ea..136ce788b745 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index 5ab6d7239991..6a28f303dc77 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1,7 +1,9 @@
 DIST minikube-1.25.1-vendor.tar.gz 104698545 BLAKE2B 2402594f1a876e16f36f4341136b71a84a8848c90d61789c85b1b962848e029363ec1efa051b0a08a28d38e82ee5fd52ceb0f2836078102a22de0d9cff4cc041 SHA512 661cd0261535728a119d5a0fa5f15c535092ae870f094e85dd03cbb5449ccef89c64dacec02373a7097f0a81bf2c23a91254f2257c09db54cb48249a785d06a5
 DIST minikube-1.25.2-vendor.tar.gz 103616191 BLAKE2B 6707011b208bf96670649192aef0100bee5780bc3321b41eddc12a62b2d4acbc566a8cdf557dae4a84b501c67b31ac35c77effb808bbc3ca56d65e7727977141 SHA512 2e964be6f0708a41ae1aaf1d47eabad8acf13ffafc5ae56cfd66f81ef94673d9661654c807bf2c8790ce5336f95f9fce377b82905e229e4d3534ed5d2622b5da
 DIST minikube-1.26.0-vendor.tar.gz 104726099 BLAKE2B b8dce4c567e370219c568e9b8298dc7d9b9e3b53330d644e943876683c19a80dbb77a938e3428f8662ac55f2359c473920d081c6ac8573ea79e30989ea8dcfb2 SHA512 76b6bc5a004a29864de6a0574a6abed18de6b92fd8a963576a284c8245fde31edf57fc82636299f4acaed0e69ca2134ded2e5606ed64b1de8d1a247e8c83ffa3
+DIST minikube-1.26.1-vendor.tar.gz 104831112 BLAKE2B 532856492a6b7759d3aaccf9baf9dd603b81953d8691d4df5aef8a667cde13d4035728e31ba52d440fb18661be94cf406ff101eed1a9fe1e2b86fc845a9268c5 SHA512 d9efe06a4912df67543246aae92ccfae62d7e0e25480761bbf0705d2867481d8cd89ea2441bd318e5ce0d682deaf5b81ae3a40000c270a0d6884ba07f69909f3
 EBUILD minikube-1.25.1.ebuild 2297 BLAKE2B 0bc47384147196b879b400a72263c83397075442d2ce6c93da0931329473699b5d12af4c4c989ca74ef6b97d11b1949f2956334b34a1144ae6cdc5032e43f9fb SHA512 e596b9eaff277be0782a02de06bbaf4c56596294d37d68dd4bff6047bd99cb4cf06488a235f0dfdc5a78c887ec6018b8a79fd2a601acef0ca267a7f7923948e5
 EBUILD minikube-1.25.2.ebuild 2297 BLAKE2B a28cdbca5fcb3d6c5f26cc2cbee198e6f3da06b8897633c0000194e56d3deb283b014b819deeb5a4bf0ffa78d60dc61988b58cc3d31194505f1d1a7eb1469f84 SHA512 6766905da7fcdfc0468f949320fb04c68754aaec3583c37a6e6d61f6cf636df896fef49bad4889afd3f707d4e81c48815323fb705a5884e02bec3a3f9be46020
 EBUILD minikube-1.26.0.ebuild 2297 BLAKE2B 1d5328379eed8a9915c885a1fe3d4efe97c64fd2381632ac4c2f2dfccf5d9a589b2cef5e89fd1872d31c03085946135eebaab3a0cfa4846950cb33d07838e369 SHA512 6b1108d9c1a4b741189c68da4ac38e1e3291573da3f808650bf43305abd8b86d1a0e51ab54e4cd1632a850513428e92f70f0a91ac9c014bb623f7a12d07aaa75
+EBUILD minikube-1.26.1.ebuild 2297 BLAKE2B f5f3f4b595803d92e0c7e3ddb38537a7d726793518a2463a6cb1b889221dc4103d65ed5d14a22196f76b939848be64930a09b4141274b7a6f2f66825a55f523e SHA512 c9ec7a8179a60ce1f24185457dd66c224520df0dd9e17e6999e394f26efa1970e7bad6d0dff368cc4ce420255c465b206f52ef680f8731f4b49adf83b28d0dde
 MISC metadata.xml 394 BLAKE2B fafba25060bc4bb387492659132b39d8b4fd7fbc2136de870eaa87ab9ee3ecaea732093904a3c580b80150da5c47f445fe3b5f85716c343904684dd1fbda2b94 SHA512 da62983710576f02082e75cd84648e47e97d1aae6b25e862fc0c4379b07976ac2838684760b7aebc77e775ff631fc9a57fabfd7997831d2112b58ad010dcd31f
diff --git a/sys-cluster/minikube/minikube-1.26.1.ebuild b/sys-cluster/minikube/minikube-1.26.1.ebuild
new file mode 100644
index 000000000000..029fbb4dba7b
--- /dev/null
+++ b/sys-cluster/minikube/minikube-1.26.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module toolchain-funcs
+GIT_COMMIT=62e108c3dfdec8029a890ad6d8ef96b6461426dc
+GIT_COMMIT_SHORT=${GIT_COMMIT:0:9}
+
+DESCRIPTION="Single Node Kubernetes Cluster"
+HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
+
+SRC_URI="https://github.com/zmedico/minikube/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 CC0-1.0 GPL-2 ISC LGPL-3 MIT MPL-2.0 WTFPL-2 ZLIB || ( LGPL-3+ GPL-2 ) || ( Apache-2.0 LGPL-3+ ) || ( Apache-2.0 CC-BY-4.0 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened libvirt"
+
+COMMON_DEPEND="libvirt? ( app-emulation/libvirt:=[qemu] )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-go/go-bindata"
+
+RESTRICT+=" test"
+S=${WORKDIR}/${P}-vendor
+
+src_configure() {
+	case "${ARCH}" in
+		amd64|arm*)
+			minikube_arch="${ARCH}" ;;
+		ppc64)
+			# upstream does not support big-endian ppc64
+			minikube_arch="${ARCH}le" ;;
+		*)
+			die "${ARCH} is not supported" ;;
+	esac
+	minikube_target="out/minikube-linux-${minikube_arch}"
+}
+
+src_compile() {
+	# out/docker-machine-driver-kvm2 target is amd64 specific
+	# but libvirt useflag is masked on most arches.
+	COMMIT=${GIT_COMMIT} \
+	COMMIT_NO=${GIT_COMMIT} \
+	COMMIT_SHORT=${GIT_COMMIT_SHORT} \
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	LDFLAGS="" \
+	emake \
+		$(usex libvirt "out/docker-machine-driver-kvm2" "") \
+		"${minikube_target}"
+}
+
+src_install() {
+	newbin "${minikube_target}" minikube
+	use libvirt && dobin out/docker-machine-driver-kvm2
+	dodoc -r site CHANGELOG.md README.md
+
+	if ! tc-is-cross-compiler; then
+		"${minikube_target}" completion bash > "${T}/bashcomp" || die
+		"${minikube_target}" completion fish > "${T}/fishcomp" || die
+		"${minikube_target}" completion zsh > "${T}/zshcomp" || die
+
+		newbashcomp "${T}/bashcomp" minikube
+		insinto /usr/share/fish/vendor_completions.d
+		newins "${T}/fishcomp" minikube.fish
+		insinto /usr/share/zsh/site-functions
+		newins "${T}/zshcomp" _minikube
+	fi
+}
+
+pkg_postinst() {
+	elog "You may want to install the following optional dependencies:"
+	elog "  app-emulation/virtualbox or app-emulation/virtualbox-bin"
+	elog "  sys-cluster/kubectl"
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index f6473876d92a..a5b040c968b0 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index e4a5c7435d00..accd2b86e302 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -4,6 +4,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD clang-common-13.0.1.ebuild 593 BLAKE2B f7d78facc226d949240f31d10bb01f6a2bbe3c806d7f7c22a78d715d29de74723bedccdeefd029d309b090afe63821e10a1bd27662ff156640820fbca1896bab SHA512 48e5c5f3d4716c15018aa246cf61fbf898c4c459b1f04710da155084a8cf5b8a6df7697c300d297ac48ee1a8a8cff9bc9b4fca712455032f78cb26e9f77ef955
 EBUILD clang-common-14.0.4.ebuild 542 BLAKE2B 8e3df146b77aa1c79bc682989f6ce50eac2b8bdfe5ccf89c383ccc48056a08d96da8e80d29e7f5422866d3ea13063a5fcf1d7942754cda312b35835d94584429 SHA512 415f44d996ad4cae3664a64d85a99364871b330e9864984c5b9b6bad8f8ca0a3537bb86415db266617cbe2cb30f66d36d9630285212110f3de7a68924bfa5169
-EBUILD clang-common-14.0.6.ebuild 542 BLAKE2B 8e3df146b77aa1c79bc682989f6ce50eac2b8bdfe5ccf89c383ccc48056a08d96da8e80d29e7f5422866d3ea13063a5fcf1d7942754cda312b35835d94584429 SHA512 415f44d996ad4cae3664a64d85a99364871b330e9864984c5b9b6bad8f8ca0a3537bb86415db266617cbe2cb30f66d36d9630285212110f3de7a68924bfa5169
+EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef
 EBUILD clang-common-15.0.0.9999.ebuild 463 BLAKE2B 78e3106b33b6a5b776a1ae91541ec295e08f284b9017684ea1481097be14084bea03013103163b9a1d059dcd261f85469e34f9e730b34cc957078fa645886f9a SHA512 94970664f46768b3373443c17a1cbdfccc6a75d5343f6effee228284931997129214bf0cc9ffcaa386878e7b405dfd7c876ca303bd1686e72197027ede6d37c8
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/clang-common/clang-common-14.0.6.ebuild b/sys-devel/clang-common/clang-common-14.0.6.ebuild
index c67dc212044e..38e08a5dea81 100644
--- a/sys-devel/clang-common/clang-common-14.0.6.ebuild
+++ b/sys-devel/clang-common/clang-common-14.0.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 PDEPEND="
 	sys-devel/clang:*
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 6ac3cf30ee02..600ee6511c5b 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,5 +1,5 @@
 EBUILD clang-runtime-13.0.1.ebuild 704 BLAKE2B a75c3997e7f744e1c50f7672bcd3564229fb1b55b8e2a5dac7ca38e8d390d61b76df6dec7134356ddf6487b63adb613ec7484240681f6c5cec9d7fe41912c353 SHA512 a1d245b587ec92bdca8b557d7e821d5f217bb1866a4804539305068d946c42355b1e84e3491d238b549c24822ad60aa872f761ef4418895b13d68f7574fef9f8
 EBUILD clang-runtime-14.0.4.ebuild 761 BLAKE2B 010c9e0263159894c4f70468235f381ec4101be5c17b848fbb89fd9368289cf9005feab4c3c5d368cf221db341bf10f28105038499ce7af2c3580c00e5d80717 SHA512 f6a10e56f891a7422926ad9a94930cc19bc4fb51b718609e5eff5119b34222626526c5404dcead50425c27f6af86a1abd9aef9e8e521bfeea7fdc97c9c3240fc
-EBUILD clang-runtime-14.0.6.ebuild 761 BLAKE2B 010c9e0263159894c4f70468235f381ec4101be5c17b848fbb89fd9368289cf9005feab4c3c5d368cf221db341bf10f28105038499ce7af2c3580c00e5d80717 SHA512 f6a10e56f891a7422926ad9a94930cc19bc4fb51b718609e5eff5119b34222626526c5404dcead50425c27f6af86a1abd9aef9e8e521bfeea7fdc97c9c3240fc
+EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded
 EBUILD clang-runtime-15.0.0.9999.ebuild 700 BLAKE2B fc3ea6d50378cd569aa9a2a30cae69dfe59524f7c9edf5a4f6e39d5d07568224625ad286e857d7d852aef95903cfe9804f54e83aa093269ca2287f57fba2ebb2 SHA512 0b88353d5a7fda68a034017bac76c37ef36d8477b52f4446e81ff01861d50f1140933b54058ad3a3bfa5cade8d8ad2c86cfe5c580b682a9bb03f2e471d3e99ed
 MISC metadata.xml 661 BLAKE2B 24688c511713ea102b83c71d226d519981b3aee0e05ef7a56d6a80be829efd843194e45cb4fd801f0bb976b6f1976386d6a2b05d2bc907fe2aa42b22b85b7d1f SHA512 2b5ab8783c90795f2e7d1673d876048ed9745f4911fb7a860df56deac13a6dfeba4581a84562eae54eff757c45042ca3fab75c7800313ae61df9ce69780a9294
diff --git a/sys-devel/clang-runtime/clang-runtime-14.0.6.ebuild b/sys-devel/clang-runtime/clang-runtime-14.0.6.ebuild
index 20942078cf05..9837077e6c50 100644
--- a/sys-devel/clang-runtime/clang-runtime-14.0.6.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-14.0.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 06aab4dcf594..e357665b5651 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -12,7 +12,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD clang-13.0.1.ebuild 11294 BLAKE2B 33760cbd488068389efed5c011b15288021d1f93a371d5114301a5f86e815b3a1e9ae21ed6304d90916778f2312db17339d85b6d76e5e8255614706ddc3a7cf6 SHA512 b49773a02c15c4e869682664bd5703d7e08f60be9558fdbd78da19be5d5a1158093729260106cffe4cd8a6295ba740e42cc43d07da00ed8ead14dc45899ce80a
 EBUILD clang-14.0.4.ebuild 11717 BLAKE2B 824af66d592b478e18f0597046d01587549ad83e3bb56d2fac6ca24757930cb1a583a33dda2d810d0512bcb58785f8a2f2cb107635760df8538c062a9ba2b8f0 SHA512 63cf4d51a5889651190a7c97c975e6af3d38a88c09507cc91ecb14020eaa5b4158e9acbede4501050a4b76dd2cc252380a5b0a79d6d608ee3d47139f7c502478
-EBUILD clang-14.0.6-r1.ebuild 11720 BLAKE2B 18a9c2fb940cb63b49fa9817402b42b8d2b98719bacce3061c0e45874555543f685bb91d5a0b1cbe6836d204bb853ba06a01c76150639eb3251cae07cc5b6ebd SHA512 9ccaa4b6f1a369bc26fa8fe274927255d19d2760808377099c6e16a60e0f287e59c6c0544950aa5224cfd8b0a2af6f690454265ce9622dbefdfa5dc59fa2b856
+EBUILD clang-14.0.6-r1.ebuild 11719 BLAKE2B 743e26b68f15e8b4aa7acfe4f7abd095fe42a3ba6dafdff278d0bfe06f57679490e0940a1029f97d5cc3f6d4ac8b44ea63283bbad1052623ee0048fdbbeb54e0 SHA512 ec6da9dcbed9f078307e8265362a5b39dac9d97d8aadbba16395ee7ddb442d34d1d2a1e9e880da41dbdb51fcf3c741c33ac469e5f6ffa4d091adb4d1743fa12b
 EBUILD clang-14.0.6.ebuild 11722 BLAKE2B fe559baac96ab7a231878a149cc3c153e85a313a36986727bf0b42ee34b71a7999bc89faf8fdb546a7d86d5eae46222c5bd562c04b3563aa20521a7ba7c1eb6c SHA512 4d711a74d2ce7a0b8d9354cbd84e8987d19715f6cb4b621b4f1ccd020fa8a443a95225f93df229a835e5fbc4b9c6749d02734df8d0f7fef63033b9e4969b60e2
 EBUILD clang-15.0.0.9999.ebuild 12204 BLAKE2B e4a9fbefeca8967edd37366d0eb8836694da5b08064e8e0e7a0ffb1c49abca2ee76e58a12f42497aa2b2f608a60a869a9cfcbe310e5cf66f70c46cd3f076a485 SHA512 8326ae79c6c60db0b63645aab3f5d1a22b44be27f86a1b4306a6a88db8af985d2af4ef840e69203c87f68be2b1e874596556993eb344b10c6ba19ca66f97c436
 MISC metadata.xml 1419 BLAKE2B 67e54312c45894825e644eec3b17f9d788a31beb8d8acf9fd5dfb604a02e35f01a0825d71547716e78b8aad9d4f7ca4d7f6a9085afc3235e3e4ed16dd46d526e SHA512 04981d6d909c239a8183cff0cd87418d88a1b3bb4c3848a88cb82164d0c5e234ab766d9a3339293502543c3ce92f7ab4fa9c3202fb45833429511e0f9d9ad584
diff --git a/sys-devel/clang/clang-14.0.6-r1.ebuild b/sys-devel/clang/clang-14.0.6-r1.ebuild
index ab2547c35e91..d112e1da063a 100644
--- a/sys-devel/clang/clang-14.0.6-r1.ebuild
+++ b/sys-devel/clang/clang-14.0.6-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x64-macos"
 IUSE="
 	debug default-compiler-rt default-libcxx default-lld doc
 	llvm-libunwind +pie +static-analyzer test xml
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index a9395fc84490..816cf355157f 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -4,6 +4,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD llvm-common-13.0.1.ebuild 608 BLAKE2B 1dfa0b25955f1f044b9980fb80f9d38eb9732a15f9bc1b352a0e75b809ad6d43db16fde3718c569b9152bfbbe2b0f71b7f9ff5306d5ae4b57a380ba003c98c86 SHA512 0702b3222f9733532ddd115f37268713ec2ebbb187b6a02e3423c1e966e594373e38c3c6f6f8eda549afae52922a3decb3126850ca0861cc3d4c8e7c0bdc5921
 EBUILD llvm-common-14.0.4.ebuild 603 BLAKE2B 8da70b849ba0ef764251a3b7aba17718e47713372471e3d5762299819627593130888c46dfdd38011e52600846127a7c0d3e8871026b170ac2f9c3d71dec4242 SHA512 27a2a4931e234fca856abb3adc957738b44a7eeae59540c80cee25453f1ca07a70e3a7845ad36ed6fd44de2dfa889278ff43d97c599e5d0a33b4a85e640f4755
-EBUILD llvm-common-14.0.6.ebuild 603 BLAKE2B 8da70b849ba0ef764251a3b7aba17718e47713372471e3d5762299819627593130888c46dfdd38011e52600846127a7c0d3e8871026b170ac2f9c3d71dec4242 SHA512 27a2a4931e234fca856abb3adc957738b44a7eeae59540c80cee25453f1ca07a70e3a7845ad36ed6fd44de2dfa889278ff43d97c599e5d0a33b4a85e640f4755
+EBUILD llvm-common-14.0.6.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f
 EBUILD llvm-common-15.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvm-common/llvm-common-14.0.6.ebuild b/sys-devel/llvm-common/llvm-common-14.0.6.ebuild
index 253cbabf645e..2be11dd95e44 100644
--- a/sys-devel/llvm-common/llvm-common-14.0.6.ebuild
+++ b/sys-devel/llvm-common/llvm-common-14.0.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	!sys-devel/llvm:0
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index a20df44abd03..616735ca8c08 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -14,7 +14,7 @@ DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d24995
 EBUILD llvm-13.0.1.ebuild 12248 BLAKE2B c738c2e0b31f6ac53eb8ac3db3d179e4facc143814643b110b531352c3edcd07f6772fb9598ea582c10f7aa0c86e8795f6299319be9978b60d1fa317722908a8 SHA512 af69d8c2a4dd83f25110ba308fa183da46e3593fe230f4a1cfc14607192342e28a5277bc444e63d8d7a6e77d40e3da8e85841d8572ed2c73789ebb625ebe722f
 EBUILD llvm-14.0.4.ebuild 12614 BLAKE2B bf141308bf2b7664bad6d95fcdfee8a39945647cc141d30d7dc6c03a3985051dc1b7414c478e4b2e660f561f735a7d3aae9adf54434e573de75e622418f0e812 SHA512 0673b883783c83d51b689c3cbd7389a83a8ece4f1924cf94512364ec54817e573b158f6a8763a186399df1a1f5ebf249a58323d6e5156d95407a5a97933e637a
 EBUILD llvm-14.0.6-r1.ebuild 12636 BLAKE2B a362de71cfa9259d777d37686aabd510a7101ec9f944aa3feb3e346d7e0f28e0bb728d9b6500140108a6aec1a81f2bc80b73706a9cc9ff79fc6f7c388f2c5714 SHA512 1e89be5645ff8ef7646ad612ef77aed1ec415f1c7e0a76481e7991ebb2ddd3aac63b7564ceac9c6cfd6059f002ccb1d03e4327e21ed63c7f96ece4c3a699e912
-EBUILD llvm-14.0.6-r2.ebuild 12631 BLAKE2B 55ca066385bc2ca1730b78eaae4d8e0fdcddbbca14b8b5756d3e5789410f31de3effc7077150453fbeae95d576721e81c7c535838cbbaad14c48611b0199b022 SHA512 b77da390e80c8abd3883941af7c445b0a60ef403ad6aeb38e6af5769b182b5584ff35ae8ac679f47047536907a263f82b63933f4b71116abd62f00badafde885
+EBUILD llvm-14.0.6-r2.ebuild 12630 BLAKE2B c02086c457a56c1fed1919284cd241325cdcf842f09767f1679e20fe9ffb61e20bb119e90dd3fb1b182720d6db972e0a7a3025b26fc67728af99b8981eb4d3db SHA512 244d61c979ef1187e3036fe066e16d42776375bbf9a0d6e0c08b0dbb0a71d6c44245a1ee5439f60cf5bab573f57d38980d115561a24a3e5f01373a90df2f2429
 EBUILD llvm-14.0.6.ebuild 12619 BLAKE2B a8ed599b9cdd7de9b5b84c8d9ff2f57a15b370860dfeacfb11396b3ed073452bd923f42c7fe25effb0e4fbfbc8326a06cddb35cbb28248e373ee9f026322899e SHA512 3e21863d291d52dde9b56e1a2b30134a9779ee23ae0ecf00a401803bb3e13c416188775ded38cf854e340bc080d481e21de8867974c4d67c8698cb39c4c7fad6
 EBUILD llvm-15.0.0.9999.ebuild 12466 BLAKE2B 5341af08398b78d3018bd19697fe7086efa78f6dadeb02eca671562562b7161c63b8fb2b8998f6897193d2869078f65920aeda16b951924c2ebabb1e0a44bbb6 SHA512 a4e296ac4be0827f7cea66f0710406f0296102c4df1be9a4e0c155c2fe07fd5b93520aa5183fc2acc13098805fb193aee6eb7262cb668dbbd0a8de52fc47dc43
 MISC metadata.xml 2654 BLAKE2B c27983265b6c9b33200ee42565648f30a6cc9c51be53a1cb82a3353d7c1f7aa9c9501c58254280c2880ff2d4992b4834e4b5e2f1c9b1c60e9b21945f234b9973 SHA512 b331d9186908762907f5713b00e357785b62afbee83afefac8701beb1a20f7ebd68df4a030bb82c6f9164719d4ccfcaf16c189833ad40e9f5900c36247d9cff2
diff --git a/sys-devel/llvm/llvm-14.0.6-r2.ebuild b/sys-devel/llvm/llvm-14.0.6-r2.ebuild
index 80b78588722d..01b9bbfd4b9d 100644
--- a/sys-devel/llvm/llvm-14.0.6-r2.ebuild
+++ b/sys-devel/llvm/llvm-14.0.6-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvmgold/Manifest b/sys-devel/llvmgold/Manifest
index a5478c1d12bc..a097fdb446af 100644
--- a/sys-devel/llvmgold/Manifest
+++ b/sys-devel/llvmgold/Manifest
@@ -1,4 +1,4 @@
 EBUILD llvmgold-13-r2.ebuild 591 BLAKE2B 28b122d41982961594bd1f70e9a666ace7e51e7d986007fea010e6920d6ed41571dcf345761cce2e0ff5baa6e6cc2c26da6770b56d467318371f039f5065588d SHA512 4af8bb97486371e74b915964125dc06542234b1d5cc3db4567ffe5ab1a6e6d29ac39bafa23b69aa3cb0fad97ed8b658fdba04cf137b65b9660e5079f4742fd4e
-EBUILD llvmgold-14.ebuild 577 BLAKE2B eadd69f8b475b7a847cb9db00780e4bb68a006893cfe58cd1b8d1e1c9870387f7862f5f8417a541c245d6b0126c5a33f16a29c234588ed8cfa4f5712be96744d SHA512 5938aa6433dfb0bb88e27dbd103482ab705dee09d6b2b5f8e49ea8569c27d993f56041ae741983ccd0be888f207cfc57a27641dfc16ff537647eb0e70d1c61ee
+EBUILD llvmgold-14.ebuild 576 BLAKE2B c9493f322fa0e387411df160c28078a514510e684f01c415a035c93868dd5a16ae718f10af0debe2e1a4112ea0864890a81a89ebf3fefc55ffdc89adc743524f SHA512 7cdb73379b9f6db22abde1f01043e28b8bfd797f3123f77d31ab3166e2c8d72747aad0963e8f6a41a0a01a19ea29eb468d869b5dbc7a35eb016a4a89c57715c3
 EBUILD llvmgold-15.ebuild 538 BLAKE2B 6b52842f7dfb1ea578c1878c49360c64eea77d4495a90a10bd9591fe47678f32b9accbed043d47a4f299e98b887cc329d6b74604011d931a6f9d2b810c24536e SHA512 8b7946b887064695a0d1a0df26dcdaca69f3c748fdc46ff3f82d0284785e82aeb467c610ba6b14bdce5c09ae9ab603d17f4e8cfe36e204e206a7d5d3e8e1e6d1
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvmgold/llvmgold-14.ebuild b/sys-devel/llvmgold/llvmgold-14.ebuild
index 2bb9e41263f6..484ce44cf3f7 100644
--- a/sys-devel/llvmgold/llvmgold-14.ebuild
+++ b/sys-devel/llvmgold/llvmgold-14.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 
 RDEPEND="
 	sys-devel/llvm:${PV}[binutils-plugin]
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b0bf4caf8e75..d60720beffe3 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index b4837ba6f5b5..876353f89f48 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -1,6 +1,6 @@
 DIST udev-init-scripts-34.tar.gz 3660 BLAKE2B 954b003c78b31649fef69213a5424098f40e17e7ed11f4ec1443247950ea60db8536f37ca603caa06e5c9f8bab07b5ac3cb8c9435144532a97ff04836c24da49 SHA512 ed48bcd0815e235b2b3fa38f857cd97f164aac7c6ea805be87890eb06a0d52064bd733da240c6e2a34c8c73e10fd047b5e53096de06f17bc81d8266d70c0cc9d
 DIST udev-init-scripts-35.tar.gz 3666 BLAKE2B fddae466428605ea930519e8a47e0ea91f89f9eacc1fd97c137d175142125b12c3d045aec68db35a463de444ac6d8c037cca55f9628f10576c968259d566a9e4 SHA512 da9d2093149967e2e1b9bc7190ddfd55a87c9ae2177e3216f7cb2694fc9b64037eb6f2599ad8a4b7594ef32ced88fbb319c92904bc72a81ea5404945f8a8378a
 EBUILD udev-init-scripts-34.ebuild 1495 BLAKE2B 0f17a5bb8b9fe6d0f1655a4434d110e13c9a2d0fb70295bc01fc63aac4ccb8ea062dee1a170220f04bc96f0ea677bd2d0611afe542dbead741a85e5f25093607 SHA512 1441b5f3de48aa861ad7e106d15e7ef334ea4d0d284bb9226b8121e6ba7722f05f67b405500319ea494a7c89c944d9f512277b7125d15d89b0d57494db114fba
-EBUILD udev-init-scripts-35.ebuild 1508 BLAKE2B 01b7e5636bdd7efca48e3f25a384757eca0f6bcb5fd772a2a9cbac5e19fcbec1089e3d29d2b40543b244f5315c190c1bfaf93234bcfd238cda13f1df558d2409 SHA512 1664e957651c4bdd61a4a5782b74c4aaccb70e0e67b639a26df7bf36969df2e654d66aa03d7ed2b17f388844054802c2f472098f38bd11090f2f6fefd117f10a
+EBUILD udev-init-scripts-35.ebuild 1506 BLAKE2B 08bb2e4f3ae180e2aa081dc611c77b1fb0b5f96c5641f5fd5b8676b214e7cd07f7f6d23ff387ea5cfb4a42bfca0c7308c50cb77ffe3bba682225017f731cb808 SHA512 8758c37f206af9c607e1fbbe6e4fbf82fcde347e2916137e84935196353aac1a39f22ebed59a4b695c36d5d3066f105c0c62d456fed1c6390a2924e883165576
 EBUILD udev-init-scripts-9999.ebuild 1505 BLAKE2B 80968b7298041d3812f1b205e8e34b76e8ad567ac4a09e94e843a67b10af1723e9c48949341d6d959fe401c1209729f3b7f39fc40f1ebb4ed406e5f29c04a34d SHA512 01ec1d7985c111ccf4fc386f774352edd4740d6cbfdd173b1294140cd1c381e9ca844c4daaf491815bcb720d14b4725a981e760839bed22c6585e9305acecf8f
 MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-35.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-35.ebuild
index d35ce96c5ccc..ca6a76b24d9c 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-35.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-35.ebuild
@@ -11,7 +11,7 @@ if [ "${PV}" = "9999" ]; then
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${OLD_P}"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 fi
 
 DESCRIPTION="udev startup scripts for openrc"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 703e48250fe5..f6154c4e621e 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 9d615ab6474c..1cf8da878438 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -28,6 +28,8 @@ DIST glibc-2.34.tar.xz 17301232 BLAKE2B 874031192f2f5a3b35c3f5b044a467d4be4e67e8
 DIST glibc-2.35-loongarch-patches-20220522.tar.xz 44728 BLAKE2B 09e7a061f3269ebd763cd700f7c23e6cd7aab738d87ee31f76a81281920c4e5e207964c79104cd75f0a2e07b77344c2a730a9063344aa1483cd3d9aeac87de40 SHA512 21f13892fb52ec753856d5559b032c2be3a76d1cf940127222f7aa878548ce7e6ea0d2ff8791ddb91aaa2b77ce17131cd2fb2ebbdaa99443bf0a6b4c81f7388d
 DIST glibc-2.35-patches-9.tar.xz 183612 BLAKE2B 921664953ed39560ab850754209dbda1f71fbcc5bcc9ec21c187385ea659b90ea055e60961eca266ab3cc81213ed04747aa925dd96a352676fa19d2e63306968 SHA512 24c9ecb6ad890c95bc0e7db3e0c1f20768c728ac0590450fad05aed578623bc33d256d2c4d14a8d8e5c5e9fed7acfab3683053d236f51886cd5a6de93f925ddc
 DIST glibc-2.35.tar.xz 18165952 BLAKE2B 623c728884f070cd87ffeb9203f74206197c52405ac9bc44f3dd519a3468b8e8ae2536c883e5d17d94417dbd1e91775de2e674314e4ff7424f9720026d6b7063 SHA512 e7336ce27561be5d7c217832a1136fb327e057bd8d3f92925b35c97e3e9f9e486948b5a1e03e5e4090772ef06437a074d10b82e68f17f1ad8f22077ee39e1b66
+DIST glibc-2.36-patches-1.tar.xz 16204 BLAKE2B f5d2700daf112b3bcb5c84db946e21d8f3c0c8138ef0a2054b42757d42374375627d326443525f5765dbfa2e97095f2cb13a98c5f97527cf50d234c824d5585c SHA512 b82763064972aff88a28e5a4518a8ef18db0ec273408d1c00f0d620421457155e340a85abcbdcc9b477e5e48f841113589ee056b5a54c6c83cd4dbc633d7cb49
+DIST glibc-2.36.tar.xz 18610836 BLAKE2B f8375e084043f032609e66fd98c234249df57a595c59672acb1bb8c69aed64d339d526611553449492b097cda900ad1d9bae8873d7f5932b10a9a0d8c9210c55 SHA512 9ea0bbda32f83a85b7da0c34f169607fb8a102f0a11a914e6bf531be47d1bef4f5307128286cffa1e2dc5879f0e6ccaef527dd353486883fa332a0b44bde8b3e
 DIST glibc-systemd-20210729.tar.gz 1480 BLAKE2B 37722c7579df782d890e44dbab99c3de52ab466eb9de80d82405e9bb5620bf39ffc8c5f466a435bdb86ef6d36dd7019c0736573916bda6c67d02a2581e0ec979 SHA512 efd75af58b50522c28cdac7abd1fc56555bc1bb042512c90d8340c1ec09c5791b3872a305bf83723252bbde5855b75d958c041083457765c4cfd170732d09238
 DIST glibc-systemd-20210814.tar.gz 1469 BLAKE2B 10fa7bcb46d4fdce9c0ab353cbd30871e9b09a347a13a9c9a3b5777f931aa3c826c158d2e49532c604d4a834f2fab4089b67495fb88d0398945dc50d45ad9ef1 SHA512 5346a9ea459a1e6ccf665389f2a294de1e16f1e3e05cdf07e3dd99ed0e4f6f8b52cc333d4bff3c75ac90ab6ce70cd4ab2b3e126f920ce7979abd6dda56315efc
 DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff
@@ -40,5 +42,6 @@ EBUILD glibc-2.32-r8.ebuild 44857 BLAKE2B d41468b9ca278945dc54ccc9b9ba7f61ac2d3d
 EBUILD glibc-2.33-r13.ebuild 48595 BLAKE2B aa38c687b3a092dd50445d37465561256685aa3730b344837cb6e8cdb6bd1d8cdd8686d2ec3e07a7e9dbd70a4a51c3d412b2cf47a8926c1f6765096309e7746f SHA512 c588e43520ae062a670c231ff7bc85b03949e75d0af498fda869b07363e93d05b7a6ff1214deb27c99981c2c7c278e3603be325f94256f2af82cdf90b9a8ebfc
 EBUILD glibc-2.34-r13.ebuild 49586 BLAKE2B 9ff8e86d5ff99695074111b80845f98c9d7d7847b68a1f5e86f477d01b8ca46a138fdf225846f1aebcca727394e1c9b8481827a8a7918727e8fd0a88b5f6d658 SHA512 75b2a878ff5cf1e3b0cf7174f8a145d50ea8c6d2021b32075bcfeaa2ff68e9b3bf31302e72754a7eed0aeb8b4e3fd20f07627f295431375e5f3eecace607f44e
 EBUILD glibc-2.35-r8.ebuild 49260 BLAKE2B 29030ed92b982083d30cedd818ab4884517bd78151234e38f78c4ae7d82e26f78ac679b5d9dd74eae0f8c658986a486919f669ef152c8b920bd1f882a09f91f4 SHA512 b38df54e6e3551695bfc7c045d09b1e72c4c8d213429291319a9c11551b2715bd8fd91023dda45964c25570ab4a84b469fe48d6c447f3f3fe3f8d43e70df0a1f
+EBUILD glibc-2.36.ebuild 49452 BLAKE2B 77286f3d97e6e8780891b67b69e9c8e1c69f86c5cbf1faad08fdb2aeec724a4fed2cf0a76f9e2e61a513f4d5069c5297167f96ec84817b41f82a691baea3f08d SHA512 cf68116b7e37cf2e74d5446b1ddd8ea59a321a990a767a26093c49a2fab047cfa7ab3aa24b3cdd99a222fa0993fd9802448802bd6f36a31e59410c8f83a5c27b
 EBUILD glibc-9999.ebuild 49452 BLAKE2B 77286f3d97e6e8780891b67b69e9c8e1c69f86c5cbf1faad08fdb2aeec724a4fed2cf0a76f9e2e61a513f4d5069c5297167f96ec84817b41f82a691baea3f08d SHA512 cf68116b7e37cf2e74d5446b1ddd8ea59a321a990a767a26093c49a2fab047cfa7ab3aa24b3cdd99a222fa0993fd9802448802bd6f36a31e59410c8f83a5c27b
 MISC metadata.xml 1937 BLAKE2B 3c40fcba241335a5a9ca1e53e339fdd51b9304d723b177117c508ff56d152e1ddecde3a0c0bc95b0654c4289d3a87090ba8342d687594c119b3bc127f77b41aa SHA512 056c639e4ecf0f8046363db19de01c580bc0f5d754868ab82cf4fdf576058877a4b28c1516afd08d1afa4ac107b4f35cf8fe681254788382c8387cf03915d1c7
diff --git a/sys-libs/glibc/glibc-2.36.ebuild b/sys-libs/glibc/glibc-2.36.ebuild
new file mode 100644
index 000000000000..b35b2febd192
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.36.ebuild
@@ -0,0 +1,1602 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
+# Please read & adapt the page as necessary if obsolete.
+
+PYTHON_COMPAT=( python3_{8..11} )
+TMPFILES_OPTIONAL=1
+
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing tmpfiles
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=1
+PATCH_DEV=dilfridge
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+else
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS=""
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20201208
+
+LOCALE_GEN_VER=2.22
+
+GLIBC_SYSTEMD_VER=20210729
+
+SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
+SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )"
+
+IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla"
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+# Minimum pax-utils version needed (which contains any new syscall changes for
+# its seccomp filter!). Please double check this!
+MIN_PAX_UTILS_VER="1.3.3"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# Note [Disable automatic stripping]
+# Disabling automatic stripping for a few reasons:
+# - portage's attempt to strip breaks non-native binaries at least on
+#   arm: bug #697428
+# - portage's attempt to strip libpthread.so.0 breaks gdb thread
+#   enumeration: bug #697910. This is quite subtle:
+#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
+#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
+#     via 'ps_pglobal_lookup' symbol defined in gdb.
+#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
+#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
+#     (unexported) is used to sanity check compatibility before enabling
+#     debugging.
+#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
+#   * normal 'strip' command trims '.symtab'
+#   Thus our main goal here is to prevent 'libpthread.so.0' from
+#   losing it's '.symtab' entries.
+# As Gentoo's strip does not allow us to pass less aggressive stripping
+# options and does not check the machine target we strip selectively.
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+# Lastly, let's avoid some openssh nastiness, bug 708224, as
+# convenience to our users.
+
+# gzip, grep, awk are needed by locale-gen, bug 740750
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
+	sys-devel/bison
+	doc? ( sys-apps/texinfo )
+	!compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
+"
+COMMON_DEPEND="
+	gd? ( media-libs/gd:2= )
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-util/systemtap )
+"
+DEPEND="${COMMON_DEPEND}
+	compile-locales? (
+		app-arch/gzip
+		sys-apps/grep
+		virtual/awk
+	)
+	test? ( >=net-dns/libidn2-2.3.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/gzip
+	sys-apps/grep
+	virtual/awk
+	sys-apps/gentoo-functions
+	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
+	!<net-misc/openssh-8.1_p1-r2
+"
+
+RESTRICT="!test? ( test )"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	BDEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.27
+		>=${CATEGORY}/gcc-6.2
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	BDEPEND+="
+		>=sys-devel/binutils-2.27
+		>=sys-devel/gcc-6.2
+	"
+	DEPEND+=" virtual/os-headers "
+	RDEPEND+="
+		>=net-dns/libidn2-2.3.0
+		vanilla? ( !sys-libs/timezone-data )
+	"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+# Ignore tests whitelisted below
+GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
+
+# The following tests fail due to the Gentoo build system and are thus
+# executed but ignored:
+XFAIL_TEST_LIST=(
+	# buggy test, assumes /dev/ and /dev/null on a single filesystem
+	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
+	# https://sourceware.org/PR25909
+	tst-support_descriptors
+
+	# The following tests fail only inside portage
+	# https://bugs.gentoo.org/831267
+	tst-system
+	tst-strerror
+	tst-strsignal
+)
+
+#
+# Small helper functions
+#
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+	is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+	is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	# We assume CC is already set up.
+	nonfatal emake glibc-test
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+			# For compatibility with older binaries at slight performance cost.
+			use stack-realign && export CFLAGS+=" -mstackrealign"
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# TODO: See cross-compile issues listed above for x86.
+			if [[ ${ABI} == x86 ]]; then
+				if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+					local t=${CTARGET_OPT:-${CTARGET}}
+					t=${t%%-*}
+					# Normally the target is x86_64-xxx, so turn that into the -march that
+					# gcc actually accepts. #528708
+					[[ ${t} == "x86_64" ]] && t="x86-64"
+					filter-flags '-march=*'
+					# ugly, ugly, ugly.  ugly.
+					CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+					export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+					einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
+				fi
+				# For compatibility with older binaries at slight performance cost.
+				use stack-realign && export CFLAGS_x86+=" -mstackrealign"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		ppc|ppc64)
+			# Many arch-specific implementations do not work on ppc with
+			# cache-block not equal to 128 bytes. This breaks memset:
+			#   https://sourceware.org/PR26522
+			#   https://bugs.gentoo.org/737996
+			# Use default -mcpu=. For ppc it means non-multiarch setup.
+			filter-flags '-mcpu=*'
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				cpu="sparc64"
+				case $(get-flag mcpu) in
+				v9)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				*)
+					cpu="sparcv9"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Allow users to explicitly avoid flag sanitization via
+	# USE=custom-cflags.
+	if ! use custom-cflags; then
+		# Over-zealous CFLAGS can often cause problems.  What may work for one
+		# person may not work for another.  To avoid a large influx of bugs
+		# relating to failed builds, we strip most CFLAGS out to ensure as few
+		# problems as possible.
+		strip-flags
+		# Lock glibc at -O2; we want to be conservative here.
+		filter-flags '-O?'
+		append-flags -O2
+	fi
+
+	strip-unsupported-flags
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# ld can't use -r & --relax at the same time, bug #788901
+	# https://sourceware.org/PR27837
+	filter-ldflags '-Wl,--relax'
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	# #829583
+	filter-lfs-flags
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# glibc's headers disallow -O0 and fail at build time:
+	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
+	replace-flags -O0 -O1
+
+	# glibc handles this internally already where it's appropriate;
+	# can't always have SSP when we're the ones setting it up, etc
+	filter-flags '-fstack-protector*'
+
+	# Similar issues as with SSP. Can't inject yourself that early.
+	filter-flags '-fsanitize=*'
+
+	# See end of bug #830454; we handle this via USE=cet
+	filter-flags '-fcf-protection='
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if just_headers ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	# Reset CC and CXX to the value at start of emerge
+	export CC=${__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}}
+	export CXX=${__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}}
+
+	# and make sure __ORIC_CC and __ORIG_CXX is defined now.
+	export __ORIG_CC=${CC}
+	export __ORIG_CXX=${CXX}
+
+	if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then
+
+		# If we are running in an otherwise clang/llvm environment, we need to
+		# recover the proper gcc and binutils settings here, at least until glibc
+		# is finally building with clang. So let's override everything that is
+		# set in the clang profiles.
+		# Want to shoot yourself into the foot? Set USE=custom-cflags, that's always
+		# a good start into that direction.
+		# Also, if you're crosscompiling, let's assume you know what you are doing.
+		# Hopefully.
+		# Last, we need the settings of the *build* environment, not of the
+		# target environment...
+
+		local current_binutils_path=$(env ROOT="${BROOT}" binutils-config -B)
+		local current_gcc_path=$(env ROOT="${BROOT}" gcc-config -B)
+		einfo "Overriding clang configuration, since it won't work here"
+
+		export CC="${current_gcc_path}/gcc"
+		export CXX="${current_gcc_path}/g++"
+		export LD="${current_binutils_path}/ld.bfd"
+		export AR="${current_binutils_path}/ar"
+		export AS="${current_binutils_path}/as"
+		export NM="${current_binutils_path}/nm"
+		export STRIP="${current_binutils_path}/strip"
+		export RANLIB="${current_binutils_path}/ranlib"
+		export OBJCOPY="${current_binutils_path}/objcopy"
+		export STRINGS="${current_binutils_path}/strings"
+		export OBJDUMP="${current_binutils_path}/objdump"
+		export READELF="${current_binutils_path}/readelf"
+		export ADDR2LINE="${current_binutils_path}/addr2line"
+
+		# do we need to also do flags munging here? yes! at least...
+		filter-flags '-fuse-ld=*'
+		filter-flags '-D_FORTIFY_SOURCE=*'
+
+	else
+
+		# this is the "normal" case
+
+		export CC="$(tc-getCC ${CTARGET})"
+		export CXX="$(tc-getCXX ${CTARGET})"
+
+		# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
+		# can't detect them automatically due to ${CHOST} mismatch and fallbacks
+		# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
+		export NM="$(tc-getNM ${CTARGET})"
+		export READELF="$(tc-getREADELF ${CTARGET})"
+
+	fi
+
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other. (Why does the comment talk about CFLAGS if the code
+	# acts on CC?)
+	export __GLIBC_CC=${CC}
+	export __GLIBC_CXX=${CXX}
+
+	export __abi_CFLAGS="$(get_abi_CFLAGS)"
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="${__GLIBC_CC} ${__abi_CFLAGS} ${CFLAGS} ${LDFLAGS}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="${__GLIBC_CXX} ${__abi_CFLAGS} ${CFLAGS}"
+
+	if is_crosscompile; then
+		# Assume worst-case bootstrap: glibc is buil first time
+		# when ${CTARGET}-g++ is not available yet. We avoid
+		# building auxiliary programs that require C++: bug #683074
+		# It should not affect final result.
+		export libc_cv_cxx_link_ok=no
+		# The line above has the same effect. We set CXX explicitly
+		# to make build logs less confusing.
+		export CXX=
+	fi
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	echo "${b}"
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ -z ${ROOT} ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	# Users have had a chance to phase themselves, time to give em the boot
+	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
+		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
+		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
+		die "Lazy upgrader detected"
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if [[ -d "${ESYSROOT}"/usr/lib/include ]] ; then
+			# bug #833620, bug #643302
+			eerror "Found ${ESYSROOT}/usr/lib/include directory!"
+			eerror "This is known to break glibc's build."
+			eerror "Please backup its contents then remove the directory."
+			die "Found directory (${ESYSROOT}/usr/lib/include) which will break build (bug #833620)!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			# Do not run this check for pkg_pretend, just pkg_setup and friends (if we ever get used there).
+			# It's plausible (seen it in the wild) that Portage will (correctly) schedule a linux-headers
+			# upgrade before glibc, but because pkg_pretend gets run before any packages are merged at all (not
+			# just glibc), the whole emerge gets aborted without a good reason. We probably don't
+			# need to run this check at all given we have a dependency on the right headers,
+			# but let's leave it as-is for now.
+			if [[ ${EBUILD_PHASE_FUNC} != pkg_pretend ]] ; then
+				ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+				if ! eend_KV ${build_kv} ${want_kv} ; then
+					echo
+					eerror "You need linux-headers of at least ${want_kv}!"
+					die "linux-headers version too low!"
+				fi
+			fi
+		fi
+	fi
+}
+
+upgrade_warning() {
+	if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z ${ROOT} ]]; then
+		local oldv newv=$(ver_cut 1-2 ${PV})
+		for oldv in ${REPLACING_VERSIONS}; do
+			if ver_test ${oldv} -lt ${newv}; then
+				ewarn "After upgrading glibc, please restart all running processes."
+				ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)."
+				ewarn "Alternatively, reboot your system."
+				ewarn "(See bug #660556, bug #741116, bug #823756, etc)"
+				break
+			fi
+		done
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	upgrade_warning
+}
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+	setup_env
+
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+
+	use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patches || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
+	use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
+}
+
+src_prepare() {
+	local patchsetname
+	if ! use vanilla ; then
+		if [[ ${PV} == 9999* ]] ; then
+			patchsetname="from git master"
+		else
+			patchsetname="${RELEASE_VER}-${PATCH_VER}"
+		fi
+		einfo "Applying Gentoo Glibc Patchset ${patchsetname}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}"
+	find . -name configure -exec touch {} +
+
+	# move the external locale-gen to its old place
+	mkdir extra || die
+	mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
+
+	eprefixify extra/locale/locale-gen
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}"
+}
+
+glibc_do_configure() {
+
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP READELF; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+
+	echo
+	local myconf=()
+
+	# Use '=strong' instead of '=all' to protect only functions
+	# worth protecting from stack smashes.
+	myconf+=( --enable-stack-protector=$(usex ssp strong no) )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
+	case ${CTARGET} in
+		x86_64-*) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		--sysconfdir="$(host_eprefix)/etc"
+		--localstatedir="$(host_eprefix)/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_enable crypt)
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+
+		# locale data is arch-independent
+		# https://bugs.gentoo.org/753740
+		libc_cv_complocaledir='${exec_prefix}/lib/locale'
+
+		# -march= option tricks build system to infer too
+		# high ISA level: https://sourceware.org/PR27318
+		libc_cv_include_x86_isa_level=no
+		# Explicit override of https://sourceware.org/PR27991
+		# exposes a bug in glibc's configure:
+		# https://sourceware.org/PR27991
+		libc_cv_have_x86_lahf_sahf=no
+		libc_cv_have_x86_movbe=no
+
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
+		echo 'main(){}' > "${T}"/test.c
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	case ${CTARGET} in
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	local myconf=()
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+do_src_compile() {
+	emake -C "$(builddir nptl)"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+
+	local myxfailparams=""
+	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
+		for myt in ${XFAIL_TEST_LIST[@]} ; do
+			myxfailparams+="test-xfail-${myt}=yes "
+		done
+	fi
+
+	# sandbox does not understand unshare() and prevents
+	# writes to /proc/, which makes many tests fail
+
+	# we give the tests a bit more time to avoid spurious
+	# bug reports on slow arches
+
+	SANDBOX_ON=0 LD_PRELOAD= TIMEOUTFACTOR=16 emake ${myxfailparams} check
+}
+
+do_src_test() {
+	local ret=0
+
+	glibc_src_test
+	: $(( ret |= $? ))
+
+	return ${ret}
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	# Give tests more time to complete.
+	export TIMEOUTFACTOR=5
+
+	foreach_abi do_src_test || die "tests failed"
+}
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local inplace=""
+
+	if [[ "${root}" == "--inplace-glibc" ]] ; then
+		inplace="--inplace-glibc"
+		root="$2"
+	fi
+
+	local locale_list="${root%/}/etc/locale.gen"
+
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root%/}/usr/share/i18n/SUPPORTED"
+	fi
+
+	set -- locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
+		--destdir "${root}"
+	echo "$@"
+	"$@"
+
+	popd >/dev/null
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	# Avoid stripping binaries not targeted by ${CHOST}. Or else
+	# ${CHOST}-strip would break binaries build for ${CTARGET}.
+	is_crosscompile && dostrip -x /
+	# gdb thread introspection relies on local libpthreas symbols. stripping breaks it
+	# See Note [Disable automatic stripping]
+	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
+
+	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		# riscv
+		ilp32d  /lib/ld-linux-riscv32-ilp32d.so.1
+		ilp32   /lib/ld-linux-riscv32-ilp32.so.1
+		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
+		lp64    /lib/ld-linux-riscv64-lp64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+			# ELFv2 (glibc does not support ELFv1 on LE)
+			ppc64   /lib64/ld64.so.2
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+			# ELFv1 (glibc does not support ELFv2 on BE)
+			ppc64   /lib64/ld64.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# In the LSB 5.0 definition, someone had the excellent idea to "standardize"
+	# the runtime loader name, see also https://xkcd.com/927/
+	# Normally, in Gentoo one should never come across executables that require this.
+	# However, binary commercial packages are known to adhere to weird practices.
+	# https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-AMD64/LSB-Core-AMD64.html#BASELIB
+	local lsb_ldso_name native_ldso_name lsb_ldso_abi
+	local lsb_ldso_abi_list=(
+		# x86
+		amd64	ld-linux-x86-64.so.2	ld-lsb-x86-64.so.3
+	)
+	for (( i = 0; i < ${#lsb_ldso_abi_list[@]}; i += 3 )) ; do
+		lsb_ldso_abi=${lsb_ldso_abi_list[i]}
+		native_ldso_name=${lsb_ldso_abi_list[i+1]}
+		lsb_ldso_name=${lsb_ldso_abi_list[i+2]}
+		has ${lsb_ldso_abi} $(get_install_abis) || continue
+
+		if [[ ! -L ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} && ! -e ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} ]] ; then
+			dosym ${native_ldso_name} "$(alt_prefix)/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name}"
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+	cd "${WORKDIR}"/extra/locale
+	dosbin locale-gen
+	doman *.[0-8]
+	insinto /etc
+	doins locale.gen
+
+	keepdir /usr/lib/locale
+
+	cd "${S}"
+
+	# Install misc network config files
+	insinto /etc
+	doins posix/gai.conf
+
+	if use systemd ; then
+		doins "${WORKDIR}/glibc-systemd-${GLIBC_SYSTEMD_VER}/gentoo-config/nsswitch.conf"
+	else
+		doins nss/nsswitch.conf
+	fi
+
+	# Gentoo-specific
+	newins "${FILESDIR}"/host.conf-1 host.conf
+
+	if use nscd ; then
+		doins nscd/nscd.conf
+
+		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		use systemd && systemd_dounit nscd/nscd.service
+		newtmpfiles nscd/nscd.tmpfiles nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen --inplace-glibc "${ED}/"
+		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+
+	if ! use static-libs ; then
+		einfo "Not installing static glibc libraries"
+		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+	fi
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	# first let's find the actual dynamic linker here
+	# symlinks may point to the wrong abi
+	local newldso=$(find . -maxdepth 1 -name 'ld*so.?' -type f -print -quit)
+
+	einfo Last-minute run tests with ${newldso} in /$(get_libdir) ...
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		${newldso} --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ -n ${ROOT} ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+
+	if [[ -L ${EROOT}/usr/lib/locale ]]; then
+		# Help portage migrate this to a directory
+		# https://bugs.gentoo.org/753740
+		rm "${EROOT}"/usr/lib/locale || die
+	fi
+
+	# Keep around libcrypt so that Perl doesn't break when merging libxcrypt
+	# (libxcrypt is the new provider for now of libcrypt.so.{1,2}).
+	# bug #802207
+	if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then
+		PRESERVED_OLD_LIBCRYPT=1
+		cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" "${T}/libcrypt$(get_libname 1)" || die
+	else
+		PRESERVED_OLD_LIBCRYPT=0
+	fi
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
+	fi
+
+	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
+		use compile-locales || run_locale_gen "${EROOT}/"
+	fi
+
+	upgrade_warning
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if grep -E -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+
+	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
+		cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die
+		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
+
+		elog "Please ignore a possible later error message about a file collision involving"
+		elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep"
+		elog "the upgrade working, but it also needs to be overwritten when"
+		elog "sys-libs/libxcrypt is installed. See bug 802210 for more details."
+	fi
+}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 87d9c0e0ae8a..45856a11a6e7 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -8,6 +8,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD libcxx-13.0.1.ebuild 6780 BLAKE2B 575c9089d74bddc871e97147c53f7c298cd1683b989eba6b50601b45693c11d0647e3bd6f70c0a75caaea7ee3fea2f88f1bbad444d7f1785a62175337659e2e3 SHA512 f0ff78e48acca25cb925aee5106fba0d547ab8522ccfd65e2198d4f481f83abbadc415ac3808e45387fc945980f9892fdbda3b6a26d54163cebfa4f12fa17172
 EBUILD libcxx-14.0.4.ebuild 6958 BLAKE2B e756b18011f0097115d4bc692fc4eb84c84d0ac68694b4611e4f73a032cb3b04e1137f7089b7b7dc4d0b37d1463465a791e468110c3c61438728eb90e7b9425f SHA512 fc0bde903c11f74f78f1d432bb0f5c15d002fd8c390719c6e4b9d77f1459c0397346b97c3cc51d75b34a486adb9b7992e646e5d043b3f278e46560d56e9d43cd
-EBUILD libcxx-14.0.6.ebuild 6961 BLAKE2B 9f04467faee5cd162906a77764b3ee4af20f3f7b7821c00a078293c922912111f88ba479bbc9effc363284bfafcac71ec9a42db26ea73c8469670408b3de0d96 SHA512 40fdd13646e02c3fb2cd54dab00a5ff41e7b8fa523d197119aac5e19d0540b35cf5d5bbc770d2511179807883af122f764e2da9918e685ae5b811930dfeb47ad
+EBUILD libcxx-14.0.6.ebuild 6960 BLAKE2B d95e91e206ef8b9173368016b15f6d6457f6892db5bacffd0b551365198e572cc0f492e3aa4e3b5cba902163572b424b713de68f7afede6115daa1920fb3c267 SHA512 61370b6464aa7f54c0f13a38922e5e05100817ca65fee5231acd0384693b3ef88a5e611b53bebea3931e9b9f8f5f0513475504a8ab62942316375196a1eae718
 EBUILD libcxx-15.0.0.9999.ebuild 6065 BLAKE2B 3816a2235860d89f5afcfaeaccc1d84a115ad0a06526f3b4383247e165cc1917737fa5c9c66d1189871ed60371c50db93d8194daaaa8c2b708d8dc0ec810c571 SHA512 22e742b874b9403f64eee8eee76552cd145ed4eca65523bd47b2bdddbb2a9436982c010bc10980ada9bb4a63a5d8663eec2d124a3517355eccbdd22b32f85bfb
 MISC metadata.xml 828 BLAKE2B 40af456df8ac1cfdb66fd62a217abbb4ca837956529906118c35232000435d9e991d18dd0332b7b95eed70d4c7610c7a1aee80af8ba511763edc1423749a4aa4 SHA512 257f8fd05fcade26ca02305356b67c8e2d67a87b180e38a189a659212093b07b9a710b871fbaab894dba9eba5fe450b76c52cc82f6405c24cc1ab2df3abe8bfd
diff --git a/sys-libs/libcxx/libcxx-14.0.6.ebuild b/sys-libs/libcxx/libcxx-14.0.6.ebuild
index 3b379bb31495..09ef1beb4a22 100644
--- a/sys-libs/libcxx/libcxx-14.0.6.ebuild
+++ b/sys-libs/libcxx/libcxx-14.0.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~riscv sparc x86 ~x64-macos"
 IUSE="+libcxxabi +libunwind static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="libunwind? ( libcxxabi )"
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 695114ada490..a315d08fce2a 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -4,6 +4,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD libcxxabi-13.0.1.ebuild 3605 BLAKE2B 7bdc8ecd9c35cdc247f08f9d5687d7362013be7c9c5afe006817cb5a384d4dd272bc686c6fe2ddf2a9bde5be8d1fa185ae60da940fded833a356f76e6105feb8 SHA512 69c4564fc68e3037620de0ce0cda29093bff9eb919f48f4760558edd1031c0d198991e6346774244701679aa0619d6afd814ec80d0d66265418408416621d9d0
 EBUILD libcxxabi-14.0.4.ebuild 3522 BLAKE2B f62a0fabd80aeb3f67cc8a199b8b945cf6bcf42d7fa8287eb90a695a0f18129e43c6c31a15e350a999e482d372ac36612d94b25759a242b8a890e18ada743679 SHA512 74ebf7281951e8911ae842f6a1b6adf3dc0b906d17fc6cbec1c362aa8d7ae193c5f44ec1dfc1a3c40360c86f963533c6139012d4bd0ab2db5be98918d9627fa6
-EBUILD libcxxabi-14.0.6.ebuild 3522 BLAKE2B f62a0fabd80aeb3f67cc8a199b8b945cf6bcf42d7fa8287eb90a695a0f18129e43c6c31a15e350a999e482d372ac36612d94b25759a242b8a890e18ada743679 SHA512 74ebf7281951e8911ae842f6a1b6adf3dc0b906d17fc6cbec1c362aa8d7ae193c5f44ec1dfc1a3c40360c86f963533c6139012d4bd0ab2db5be98918d9627fa6
+EBUILD libcxxabi-14.0.6.ebuild 3521 BLAKE2B 3f5bb6329c14a608fb52e2429ba4acbff8ec2c490d832beae73956a4323c896e8d7030261fb845002cf1682bd7331cbb0e31df2ea214dda583cd004ae6c2f9db SHA512 92e061f2f4736f8a6fcc5240870dbdb4574a2945d77de0f00d6c7fd2011e76edf63084bb7ee6c32f038a708c5d1df4753aaa936470d0670cd772113f38cef62a
 EBUILD libcxxabi-15.0.0.9999.ebuild 3303 BLAKE2B 75a33d5039be0e5400680a7144c9cb50bf7b7fe6fb0edadf1d8d929a3bfeff2f752b08c4a9ba11ee46355b9a353da7b586449521edf779fd5edfcdd78db2ade0 SHA512 3f7851502ea769fad89ef013fbf42b9e8763f25139f4440dbadda8b559d14b7b3aff09c388233a3906d8895a76308f6fd9fa7900cf2535567c4b271083c9692f
 MISC metadata.xml 557 BLAKE2B 4f6b0acb7cfdf74971a6fd96051d9f9020141c6117333a8de42bd043935b7bff8d9942faabdf3b1c94597c460393f64eb7d3f7b7d49f39ecfd0094de460f563e SHA512 67a812ef768e681ae77ef6e13bccffcbe53b41e94901f0558b3c7acaf896605ca670c4bb5a690bd9afa3b5a76271341710520a6abc0024c18f437fabde20e847
diff --git a/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild b/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild
index 627710e80b91..fa07ba2e8fb5 100644
--- a/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~riscv sparc x86 ~x64-macos"
 IUSE="+libunwind static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index b691e8cdb38e..0a9dfca122e1 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -5,6 +5,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD llvm-libunwind-13.0.1.ebuild 3810 BLAKE2B c215ba47340bda6a466f6ffcdf978d0d3ab4f4f1f456114f854f53dd3dd04d197ee235c4623d0a3d6e0f26022fef909be2ad04e93679ce357c396c94dc7d3a49 SHA512 96827c5f5838898ac368b79677b6e17fb0545a6a5239f8262622034843777ad4f071f9f80e3c33e0e1a2df334abcefbd7e867c5957d2bf72a1b8416b5b7ac714
 EBUILD llvm-libunwind-14.0.4.ebuild 3200 BLAKE2B 884692225751f6315f794655e2fbfeae7eb18e13b613f819e45ed485acb33daead6fe6b418df1e77167d5f243e5aaae4c8a415568e87b0aa315ae3b48aa43aa3 SHA512 e01166633fd76113dbc216b6755956a0f28d8a67d641cf5bc1195be49c23b89aa24d9f0fd974304f8a06ec41fdb7cc17a909a07f651604cf0bcd2fe549eaf922
-EBUILD llvm-libunwind-14.0.6.ebuild 3200 BLAKE2B 884692225751f6315f794655e2fbfeae7eb18e13b613f819e45ed485acb33daead6fe6b418df1e77167d5f243e5aaae4c8a415568e87b0aa315ae3b48aa43aa3 SHA512 e01166633fd76113dbc216b6755956a0f28d8a67d641cf5bc1195be49c23b89aa24d9f0fd974304f8a06ec41fdb7cc17a909a07f651604cf0bcd2fe549eaf922
+EBUILD llvm-libunwind-14.0.6.ebuild 3199 BLAKE2B 2ca75082a1708903e4a83cba6c526934e324f3a5886b4ebe31db53daf4ba9e0e07b975c7471f5f3a51fac4ca67ad63731635031e0438a8329ad00158954dc58b SHA512 0d65b118e2876d6a8f9c3c5898f41a5d10e5d042f2277be390df7c03c9aff5529e5af3e0004d3d3be5261894a2eaa486266d0be710eeea385b20ba588c0d62cf
 EBUILD llvm-libunwind-15.0.0.9999.ebuild 3021 BLAKE2B be3b0ee26470c838caee43b7dbfcba897af644a586d87bce92833f988f3f5496b9b30da32e33cd29c214be4c3786babd9c890add057d470f09ca6c4493a1d11d SHA512 a353f815c9a2f467d643793777954eb8b5b4cf07a94d1315913b80961c52613351273e24e5aacae02c91993702d6cd3ac221264f009e031ad6ad83e722764115
 MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.ebuild
index 7e4660c1fddc..a2b5d0e6cd04 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index a83a47a7011a..5b73dacb6419 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 08d831041adc..89c57c51f549 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,5 @@
 DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B 5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad SHA512 4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
 EBUILD qutebrowser-2.5.2.ebuild 4386 BLAKE2B 46da9c624ce3e90ba1538686b52996d3c0886c99a52631694788b39acc7e2541a55417e03252314d3dd7e2106b1bba81b5f32279adfbe06b602d721a2b5c7efb SHA512 60924de2de77291d9b547693080c5edf1c4367aa3840db69ac7cb01ac241dc3b5a7c0897160b4031435d13f70f8b925722fb36cf33d6a487556c00ccb9167103
+EBUILD qutebrowser-3.0.0_pre9999.ebuild 6030 BLAKE2B b37b8c3e3b712985fd39a69000ba41c0ea4a338ee00bc2c246b80f215270584b27a9d80c1195417aaf8053db295dfb0dba8fc390e61b545baed6aec5791903f3 SHA512 f057a3e7e0588742289d3b8c639d9feeac32fcd901746fc21453318e998c3cf2d06e011b87f331cf3e10613d4c3bc0bb644b6e17c862b6e6caae40a428263a13
 EBUILD qutebrowser-9999.ebuild 4387 BLAKE2B ff92d8705c2369729256a8de911634de9988c65cc8910da495d014c30a52d4e61722ade884c3989c4dbe506889ceb616b4e1794cdd860adf9d151dcce8b57b85 SHA512 0f074d74305762383bc647d3e883bee4d1b376d659844e4e2afe1867fc7b81da85c4e140f70e22fb268407d18e0166f813dbfe62fbeba085f8d8befce35027fe
-MISC metadata.xml 945 BLAKE2B e796d777d56a5452b6652d77e011dfb160684f6e7498d0c4fad583bb828ecd111c25be5d80ed906b9b579e6ccd33315fc20a727342df0fb1b66b1a71effcea25 SHA512 80a65a391a84208042d9e7a6e0b5e8644ed07d5e389cd6a7b314b961dca5cff6406c5556693b34dcd275acfb27d05d9e40f77e9d503f9e3e8054ab6b6763932d
+MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index 44b66f5f9007..224624c5a073 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -24,6 +24,7 @@
 	<use>
 		<flag name="adblock">Enable Brave's ABP-style adblocker library
 			for improved adblocking</flag>
+		<flag name="qt6">Use Qt6 that provides a newer Chromium version</flag>
 		<flag name="widevine">Unsupported closed-source DRM capability
 			(required by Netflix VOD)</flag>
 	</use>
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
new file mode 100644
index 000000000000..50f156d349ff
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 multiprocessing optfeature xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git"
+	EGIT_BRANCH="qt6-v2"
+else
+	SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
+HOMEPAGE="https://www.qutebrowser.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+adblock +qt6 widevine"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8)
+	$(python_gen_cond_dep '
+		dev-python/colorama[${PYTHON_USEDEP}]
+		>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+		>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-6[${PYTHON_USEDEP}]
+		dev-python/zipp[${PYTHON_USEDEP}]
+		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+	qt6? (
+		dev-qt/qtbase:6[icu]
+		$(python_gen_cond_dep '
+			dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
+			dev-python/PyQt6_WebEngine[${PYTHON_USEDEP},widgets]')
+	)
+	!qt6? (
+		dev-qt/qtcore:5[icu]
+		dev-qt/qtgui:5[png]
+		$(python_gen_cond_dep '
+			dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
+			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]')
+	)
+	widevine? ( www-plugins/chrome-binary-plugins )"
+BDEPEND="
+	$(python_gen_cond_dep '
+		test? (
+			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+			dev-python/cheroot[${PYTHON_USEDEP}]
+			dev-python/flask[${PYTHON_USEDEP}]
+			dev-python/hypothesis[${PYTHON_USEDEP}]
+			dev-python/pytest-bdd[${PYTHON_USEDEP}]
+			dev-python/pytest-mock[${PYTHON_USEDEP}]
+			dev-python/pytest-qt[${PYTHON_USEDEP}]
+			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+			dev-python/tldextract[${PYTHON_USEDEP}]
+			qt6? ( dev-python/PyQt6[testlib] )
+			!qt6? ( dev-python/PyQt5[testlib] )
+		)')"
+[[ ${PV} == *9999 ]] && BDEPEND+=" app-text/asciidoc"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	if use widevine; then
+		# Qt6 knows Gentoo's, but pass to ensure libdir, EPREFIX, and for Qt5
+		local widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
+		sed "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${widevine}'" \
+			-i ${PN}/config/qtargs.py || die
+	fi
+
+	# ensure run the requested Qt backend
+	sed -i '/^_WRAPPERS = /,/^]/c\_WRAPPERS = [ "PyQt'$(usex qt6 6 5)'" ]' \
+		${PN}/qt/machinery.py || die
+
+	# let eclass handle python
+	sed -i '/setup.py/d' misc/Makefile || die
+
+	# live version lacks pre-generated docs
+	[[ ${PV} != *9999 ]] || ${EPYTHON} scripts/asciidoc2html.py || die
+
+	# disable unnecessary tests/plugins that need extras (_ignore not enough)
+	sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
+		-e '/pytest-instafail/d' -e 's/--instafail//' \
+		-i pytest.ini || die
+	if [[ ${PV} == *9999 ]]; then
+		rm tests/unit/scripts/test_run_vulture.py || die
+	else
+		rm tests/unit/scripts/test_problemmatchers.py || die
+	fi
+}
+
+python_test() {
+	local -x PYTEST_QT_API=pyqt$(usex qt6 6 5)
+
+	local EPYTEST_DESELECT=(
+		# end2end and other IPC tests are broken with "Name error" if
+		# socket path is over ~104 characters (=124 in /var/tmp/portage)
+		# https://github.com/qutebrowser/qutebrowser/issues/888 (not just OSX)
+		tests/end2end
+		tests/unit/misc/test_ipc.py
+		# not worth running dbus over
+		tests/unit/browser/test_notification.py::TestDBus
+		# bug 819393
+		tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
+		# calls eclass' python2 "failure" wrapper
+		tests/unit/misc/test_checkpyver.py::test_old_python
+		# qtargs are mangled with USE=widevine
+		$(usev widevine tests/unit/config/test_qtargs.py)
+	)
+
+	# single thread is slow, but do half+1 given spikes ram usage quickly
+	local jobs=$(($(makeopts_jobs) / 2 + 1))
+
+	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
+	epytest -n ${jobs} -k 'not _bench and not _matches_tree and not _warning'
+}
+
+python_install_all() {
+	emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+	rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die
+	fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md}
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	einstalldocs
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	has_version "${CATEGORY}/${PN}[qt6]" && QUTEBROWSER_HAD_QT6=
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "PDF display support" www-plugins/pdfjs
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts"
+		elog "have additional dependencies not covered by this ebuild, for example"
+		elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp."
+	fi
+
+	if [[ ! -v QUTEBROWSER_HAD_QT6 ]] && use qt6; then
+		elog "USE=qt6 is enabled using the qt6-v2 branch, it is work-in-progress"
+		elog "and some issues are to be expected. Can follow upstream progress at:"
+		elog "  https://github.com/qutebrowser/qutebrowser/issues/7202 [qt6 general]"
+		elog "  https://github.com/qutebrowser/qutebrowser/tree/qt6-v2 [used branch]"
+		elog
+		elog "You may optionally want to backup your ~/.local/share/${PN} before"
+		elog "it is converted to use Qt6 WebEngine (one-way conversion). ${PN}"
+		elog "will also warn about this on launch for a last chance to abort."
+	fi
+
+	# TODO: left-out given be confusing while IUSE is masked anywhere
+#	if use !qt6; then
+#		ewarn "USE=qt6 is disabled, be warned that Qt5's WebEngine uses an older"
+#		ewarn "chromium version. While it is relatively maintained for security, it may"
+#		ewarn "cause issues for sites/features designed with a newer version in mind."
+#	fi
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-08-03 03:20:23 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-08-03 03:20:23 +0100
commit	83cfc3cac0511042177fc061cc188c99bf900be9 (patch)
tree	5034fb6788fbc83794da9ca9541a6bd4fe6ea974
parent	ca45ec83b5d77af14152011046f506005a8a71aa (diff)