gentoo auto-resync : 05:11:2022 - 03:17:06

186 files changed, 3130 insertions, 399 deletions

diff --git a/Manifest b/Manifest
index 89188e726bca..7db201780ee2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29596 BLAKE2B f1d2f762e7609e1804288f39861420f9fd1a0c40bb1c03db1af92e7e13101cc4393b1e5665225423c473c505d6a67cec8fa3ab281a169993b2bbaa60cf701ff8 SHA512 5cfb6fa7b0682cfbd06bfd6093653c2842c2d7cf8b8ba843b5bc15bb28a5b62e7e3cff961b326fd407319cdc1e144e7539d2a605ae0af71ca71a4dd0e1e009ec
-TIMESTAMP 2022-11-04T20:39:57Z
+MANIFEST Manifest.files.gz 29590 BLAKE2B 3dad404b6f306b9b0a07c973873381c0974e2d470173e0dfe453d37def9286368388ffe7ba03dc0077939d69459f371bd53f73bb071b400cc5df331bd450a563 SHA512 1134547d2d70105f04d9af680001fe0b7becf43d7a8fb3ac25c74e88e4243d591ef62e0fb27adeac05dbc1674aa727d399423a224fabf1d403defdec571bb2d6
+TIMESTAMP 2022-11-05T02:39:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNleJ1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNlzP5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAHjhAAlj8/zY7L8ebdAfbg97kMS8yg+N9xcVABH7H3lMbykahCCsiXcsnpo7bR
-T7HKBKqbyIwuyN4kMwI/tL2ePALEE2a24u9hQziWIAYkcufOWeTuSI3feMHAS+gF
-YB12iJ01XHcFSY5YrREL015ANYY/4FM8H6epKKtyIx2O6T7kRxh1lejgP4joZZz9
-XFftk8J+yKMvaZ4EDkNv6Y6FCO0Z3hHlrL+/4Tebe1yFiRNSt2lLsbr0Em5ScDwS
-M0ORV6qPa1AWulopXgGJUflnILLen5hTAh/s1hV2n5yQx8LMWoNZypgPUT9//mvJ
-s6PhHLID4T1IQiaU4+1WMlhRqeAmicWyrlfAafq013yklcCSos44MN/PLI6rYXKq
-TE2OqO6nsfjYBjVIcgSzaMfPqfFmgfI5jHNsAWzW31xLfETFc7JXn4Vg8rT5e9Zd
-tPdrRPcrv6a04ptgT7LL1X/USaef0Xk7cdhov4zcYuo+/9WxwVDHXNdIHVokOw/h
-rYMWiHMuvTCs1rmKhwbBfAph1g/QmT5uD3LQm4XABWf6U0B67q0xRXmGAHAHacoJ
-qLm6Sa2dhPsVTsVw+ZdbyY30X3M3283xM/XjduGFDzyT00TuM/Yv8+ExnY7z32Qq
-C5uZEp1YshsKKUDc4wyiOPjqEetPt22+1CdezRDVuApaPu+NEno=
-=r7S8
+klCd4A//dfSsFGRzxEiHi/8qC80q1k1DTmbEgdIT0kPHz/IRhnFSt6wN1uGoT+W3
+nQJnyXvMi+j/w1Y44dN0ImbBQLO8XmksnqrHalg1dFKSDbkVIdN+lno0uEwuOGT6
+cw/OLyF09+u3c08m/C+Oi+PTldEX4AixABaMPLBDCvHxgUzmBEtUFCcl93ZZ3JXp
+jh64fWJWKLrRjmdDb9y47c06uYEkb6dSUlgNoo9nE8I6Qj5mG+lEcvKN3BObvzyh
+SE9J2E+LMnW5GGXqTZqyKsS4ENLfXy/WhSeiSWgsmFh2SSHLoWxPZuL5unXskoWW
+FWV5ZcdpvquGGAOYYy6wpwXitFwYt5xFr8z9Pkwe8aUDYIs4acg8pE+kucPMIio8
+ay8oMqqOUxMNs7RlXDzTL0t6a2JwCXEiRA/Nroe7FDIiM0j0ULmlbtFFwZls0QUf
+R8Bovnyfe3kVZCfryoiuprov7bSbYb97NfTdMjHcSlPgIhBfNSoL7SLWNbbkLvYm
+HIzhSFDm9dOR2w8wQQCr7P2Qks66Oytc/M4a6WHyGNAecrXAjYtQ3fIRpHV6JWBX
+OVFn5sS1N1Affc44vq9bKOB+vgh8RvEYC2SGnCgjfB9MJSmZR/s5W1Et8bv9MxK3
+97jdVtsTTg3hDgFhN8atPln2mjOZ5Y6NNyQ5S2KleIBVldnBWZw=
+=kqf2
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index a890cf8b36d4..4b22521eb810 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 63f4cb8c6d01..a8e3f3bc7790 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 42191db6c758..dcf494f48cb2 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1,7 +1,10 @@
+DIST helm-3.10.1-deps.tar.xz 125283080 BLAKE2B 3a7354a910174a2b6e80da90da37c7e5884273cdec2657e101e444587f92fcdda243e3539c481a1339bc1c20314ded1126b7953064758756d590bd82fb9bca42 SHA512 99ad12cc7b7b873f3b1988e5f9d53c55b8d54a29081804e6d4f9b233aebaeb9d0454c7e5aff9ca4a370fda96f4fda8f40e5fade3af4075da15340e44ee8f3973
 DIST helm-3.8.1-deps.tar.xz 374838312 BLAKE2B 13700d77faef89828a98b0410f1539c4370848d3f741881dfff4fb6d08b50d152052b4c1fa7ce4fe19d1d08583530c89f9e8ca35ede178b08c05dbecbdf36fbb SHA512 5686ca6c3f9b114032dda78842c3e3d2012f97d5721455aedc204ffae8a6bdafcb5191beaaca0e89cb827a7846fe65658d4440c2982b36b008e8aa235be41736
 DIST helm-3.9.4-deps.tar.xz 126444776 BLAKE2B b506593f17afcc1c4e70b99eed44c2142c114503c92f01c19ae7bbf92867899a9058d80806bb16ff470e1c81bf2490183651d522a242487aa1c5ce29d7f63ad3 SHA512 ed07887c740d74b66d489eb5e0419a3e61cfc575684a8c02b507cb297bdbc12d80beb6a13b502349c3fc9806db16e0d2625d3f13747baf68d108cca22eb9c7c7
+DIST k8s-helm-3.10.1.tar.gz 701955 BLAKE2B 869e93ffdedbfd0dc405b287ca6fcd7dc3943f6d51b13c5482a48589235ada7e080aa8d0fcbd3b640e486c90e795bf563a5c6367f4f6116be6357a6cd1052113 SHA512 5d72ef0031b9988ad3d263ed349dd0e1770ccdbeb0e05e057f375a5b6c3bdf5d214f8d7bd004b8500846269e4acdde6f51206d8c422a4a4af7341baa6cdd348e
 DIST k8s-helm-3.8.1.tar.gz 715683 BLAKE2B 2b0fc2a844f848e2a696be54224c1ca6027bf461c0885b3e082b57a09117b6ebc2500b35f1e6ad03cdc7ad4d0f18b3b6c24a1e79782b1b0492effc6a80031a93 SHA512 c4c3c8272ac4d83fad7dcdd41f81e9123ee71b01b6ebf352c3f3836048d7d240e144a52fd78e156c1957020bb1e4a868059486a4a4c3d37e4be150203a1e6158
 DIST k8s-helm-3.9.4.tar.gz 704880 BLAKE2B c96e474ca882fe0b7ba5d9045f04a4e6af62f4d9d3c735f0ae89d03eac06c0c8118ba1b7ffcb7594ad23707c88c7e10d781de4701b8300e124ae767f8917dae1 SHA512 8a02d094744036bcbfeefdd369b2e5e725c0e08cc2891e07aaebf4656fc62030e91ea00b97c1f8ebe33f2e436927d380b24e416509c944468165d35c892bf846
+EBUILD helm-3.10.1.ebuild 978 BLAKE2B d3d36fbcd394736366b66850182274b2f0997547571fa45a58299d275175ed61aa90247a71ce5d6550adb5f21b620c6f68614189cee61483ca83824a1f9cfd3b SHA512 362cd589b088d817de4df455f315e72763381f449fa0d097c79a8d60fb2936ff2c2f956f2cab2e51a30fdf39d6e3037f77bec029fc4b9667ba7a5878805ca4df
 EBUILD helm-3.8.1.ebuild 970 BLAKE2B 75f992b41d1b1680f444d5a73e714fb404276f19ea6f0ec822f8526da7e6a02e27130fbe66c87a059f378794a18d792c3ba6b455f8cc52af58e6d1f5fe9a4b0b SHA512 9642bfa50f7d572ec38def3d3c9d743f2abef929c4bd30bd3c969223e89c1aedf14109ff3ef97a2f7f2ddcf5a906c79d53aed3ce8250149b6f35d017b5e8f17f
 EBUILD helm-3.9.4.ebuild 977 BLAKE2B d4ec967245e4ebeeb53416d381c6eebde244fd785d0201754ec0fd462353885cd601cb4410cec8e608773258adf93f01cf56d46d4e0e550e138b853c08e61cfd SHA512 479a7d0827015d7d23c1c959c78b377d4ddc2d0eb94d105a2a06efee42f19912cbe0e45c322ed3bdf9771defd980b2fea42d3c1ca641cac1ffb5eccac341553d
 MISC metadata.xml 323 BLAKE2B 5001082c76e55c24c27deced68a33a8fc8c9514b65116aa076ade0bacab00103a19e0807af8187b7bd8b761e64f20c4fab74b998e0f9ec473fb8d2bc9cbe4412 SHA512 a039551d398af15db8fb487b058ad569731376c51f8a23c245e4c14cd8924b960a2dcb286618c9365d21d219a271f1e0c6bcab712cf88920f4fc7fded832d800
diff --git a/app-admin/helm/helm-3.10.1.ebuild b/app-admin/helm/helm-3.10.1.ebuild
new file mode 100644
index 000000000000..9cc7aee7c8c7
--- /dev/null
+++ b/app-admin/helm/helm-3.10.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+GIT_COMMIT=9f88ccb6aee40b9a0535fcc7efea6055e1ef72c9
+GIT_SHA=9f88ccb6
+MY_PV=${PV/_rc/-rc.}
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/helm/helm https://helm.sh"
+SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RESTRICT=" test"
+
+src_compile() {
+	emake \
+		GOFLAGS="${GOFLAGS}" \
+		LDFLAGS="" \
+		GIT_COMMIT=${GIT_COMMIT} \
+		GIT_SHA=${GIT_SHA} \
+		GIT_TAG=v${MY_PV} \
+		GIT_DIRTY=clean \
+		build
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN}
+	dodoc README.md
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 710081740af2..8458d0f18ce6 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,9 +1,11 @@
+AUX sudo-1.9.12-CVE-2022-43995.patch 2162 BLAKE2B c7de0e562aebe7dbb92e793cab7527a43ae6125fd48cffa776a5bb0da57d80d5dff1c7d26c23bc5f647b578c5fe5959913c23f7f9ec84f7a5f887bcb47aa8b2c SHA512 d3e3b74a98a42cd3c55cf0ed5da43dcd5158ec54e614bc41eb8e63b77fbb1a11991cf9d7f705f077b8c474331cd8762bfef717d4c32771eb44789123ffa87714
 AUX sudo-1.9.12-mips-build.patch 1148 BLAKE2B 6c31a0095b7d615b0f8001f2484e2df5aa975b025bb4747344e1b9d55a0544f3e89f02cd7ebfd5a4cdf1712e1887b97ff3443a98ec6884724f70f3505c7ef05d SHA512 da98b5a163f8e843a8aed7736b84c50985180910a3d78a5014c91e958d0d8571f374d8b98803733864b6cbf3c8a938f8655063f491b55411c03f2c34352f505f
 DIST sudo-1.9.11p3.tar.gz 4826520 BLAKE2B f8508f65b514abd9979a11628d8bc0e085b2625993281e7d1f8794a576e88970bda6939d2f2f50d9485f00276970aba3489b19c102eca5625e389c9610f338dd SHA512 ad5c3d623547d1e3016e1a721676fee6d6b7348e77b2c234041e0af40c7220e8934c8c27beef0d12fa6df11708d37de711dacfefc135d26de46abca7f91c55d1
 DIST sudo-1.9.11p3.tar.gz.sig 566 BLAKE2B 8caf03b051222f0446eaf333b48563aa18d52acbd9f7e2d880f0a97043df1ec8d25d87cfd7b1b9543ab8f52f5dacff4cf031fe3e6b94593d576d1d351eb05aa4 SHA512 ea728cddbab50746a2cbb8ce6cb55df3def1c5e806a1d91ec6f2d65c8d246079bdb5799b961ab0da1cc2c347a36d93cc00d32c10856141a467b25e1224876e50
 DIST sudo-1.9.12.tar.gz 4906320 BLAKE2B dfe7e45dab9848e7eec30b9c3e96683b2a90c02c8468507a338cda26d8b28206f511c63c2330e1a33e2b0b2d263211d7e2b222d5729dc0670eaafea09603e586 SHA512 34ee165baa2e37ba2530901d49bf0dad30159f27aeccd2519d4719bf93be8281edff71220a49ba2e41dacaa3c58031de1464df48d75a8caea7b9568a76f80b67
 DIST sudo-1.9.12.tar.gz.sig 566 BLAKE2B 98c80addcea18d320a54473e34111411dc3e67bdec45ae1c34e98c5a95a0e0377b08e7d42d9cbf92f68160f6e5dfb2990e6cd3c773ba20484b15aecfe3104433 SHA512 67c2c0234345ff17ed9bef2a974a37dd7e4ba791bda4e6f1cc90620d6541e4549e1e2a8525b4092bc615ae035cd2f97eb4165e2e671a3056ac10585709045ae2
 EBUILD sudo-1.9.11_p3-r1.ebuild 7412 BLAKE2B 1ddfa12c7fed0f71ba2ed700009aee4dfbdf08aaee350e61e67e0ede62904f0eac97233285b94c820dd3da75c4fc4aa09c31673db42b973f3ac18519ec8fd814 SHA512 13254ff59e0360c2979d6e31d3f9491560cd43a03b03628640426a9535ecde6568706db7037cb4b1e4e74fb555381cc2d42d24b2a4b2b97d7d142179e61df46e
+EBUILD sudo-1.9.12-r1.ebuild 7511 BLAKE2B 49bb251a2a59282c794cd0ef4d48aec76e4c3e2551632cb4b79a5b13239cabab9216e939393f05217da2492876b484801da2864fd36ab26599f73d085f3275c4 SHA512 8126f0bb3579842aa0b8de02a984dbf2ecaa7231e46f6777b5a453c5589d14463df1de7ccc66d373dbc976aa057b1bacc59f8db7a6cbc53ef29bdbf01d3280b1
 EBUILD sudo-1.9.12.ebuild 7470 BLAKE2B 167e7eb6aa3ab20ab4dbfa1e082afa5dd69c44bf43f42aa519e88952c56114b73347a65840365021612f8b4e87ef23d4c6ec4952fde8db38bc1cd4e5b10c5a48 SHA512 e653968c91d7219b60daf53dce5bd2fb16997635b35f07b22fe0974a18c7304b72ad526c5418a5603d315b2ec2667621dfcdc6dcbbf4245739109038a3da179a
 EBUILD sudo-9999.ebuild 7420 BLAKE2B b0b6e8f5e645b6a9b082693ebbfdb2f5ee6e5fc9564b0e74cd9fa03fe061f10c3816f3073bf2922cbfe6e9f8fae78f292fd0fdc1fec213ec6939e879e59259cb SHA512 f3f70b8015ee9a42261514c9206ddf8f91a1eb58a70fd67154884c972cbfec302135a0ae5a3bbfea99f28e953683bdf05deede217a91bf56dae78f385c1748df
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/files/sudo-1.9.12-CVE-2022-43995.patch b/app-admin/sudo/files/sudo-1.9.12-CVE-2022-43995.patch
new file mode 100644
index 000000000000..2601669eecfd
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.9.12-CVE-2022-43995.patch
@@ -0,0 +1,53 @@
+Bug: https://bugs.gentoo.org/879209
+Upstream: https://github.com/sudo-project/sudo/commit/bd209b9f16fcd1270c13db27ae3329c677d48050
+
+From bd209b9f16fcd1270c13db27ae3329c677d48050 Mon Sep 17 00:00:00 2001
+From: "Todd C. Miller" <Todd.Miller@sudo.ws>
+Date: Fri, 28 Oct 2022 07:29:55 -0600
+Subject: [PATCH] Fix CVE-2022-43995, potential heap overflow for passwords < 8
+ characters. Starting with sudo 1.8.0 the plaintext password buffer is
+ dynamically sized so it is not safe to assume that it is at least 9 bytes in
+ size. Found by Hugo Lefeuvre (University of Manchester) with ConfFuzz.
+
+---
+ plugins/sudoers/auth/passwd.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c
+index b2046eca2..0416861e9 100644
+--- a/plugins/sudoers/auth/passwd.c
++++ b/plugins/sudoers/auth/passwd.c
+@@ -63,7 +63,7 @@ sudo_passwd_init(struct passwd *pw, sudo_auth *auth)
+ int
+ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_conv_callback *callback)
+ {
+-    char sav, *epass;
++    char des_pass[9], *epass;
+     char *pw_epasswd = auth->data;
+     size_t pw_len;
+     int matched = 0;
+@@ -75,12 +75,12 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c
+ 
+     /*
+      * Truncate to 8 chars if standard DES since not all crypt()'s do this.
+-     * If this turns out not to be safe we will have to use OS #ifdef's (sigh).
+      */
+-    sav = pass[8];
+     pw_len = strlen(pw_epasswd);
+-    if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len))
+-	pass[8] = '\0';
++    if (pw_len == DESLEN || HAS_AGEINFO(pw_epasswd, pw_len)) {
++	strlcpy(des_pass, pass, sizeof(des_pass));
++	pass = des_pass;
++    }
+ 
+     /*
+      * Normal UN*X password check.
+@@ -88,7 +88,6 @@ sudo_passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_c
+      * only compare the first DESLEN characters in that case.
+      */
+     epass = (char *) crypt(pass, pw_epasswd);
+-    pass[8] = sav;
+     if (epass != NULL) {
+ 	if (HAS_AGEINFO(pw_epasswd, pw_len) && strlen(epass) == DESLEN)
+ 	    matched = !strncmp(pw_epasswd, epass, DESLEN);
diff --git a/app-admin/sudo/sudo-1.9.12-r1.ebuild b/app-admin/sudo/sudo-1.9.12-r1.ebuild
new file mode 100644
index 000000000000..04850cee909d
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.12-r1.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pam libtool tmpfiles toolchain-funcs
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} == 9999 ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc
+	inherit verify-sig
+
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
+	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
+		verify-sig? (
+			https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
+			ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
+		)"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
+	fi
+
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+
+DEPEND="
+	sys-libs/zlib:=
+	virtual/libcrypt:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1:=
+		sasl? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap:=[sasl]
+		)
+	)
+	pam? ( sys-libs/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( sys-libs/libselinux )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ssl? ( dev-libs/openssl:0= )
+	sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+	${DEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+BDEPEND+="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	?? ( pam skey )
+	?? ( gcrypt ssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+PATCHES=(
+	"${FILESDIR}"/${P}-mips-build.patch
+	"${FILESDIR}"/${P}-CVE-2022-43995.patch
+)
+
+src_prepare() {
+	default
+
+	elibtoolize
+}
+
+set_secure_path() {
+	# First extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+
+	case "${SECURE_PATH}" in
+		*/usr/sbin*)
+			;;
+		*)
+			SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+			;;
+	esac
+
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# Then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:${thisp}
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# Finally, strip gcc paths, bug #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do
+				[[ ${thisp} == ${e} ]] && continue 2 ;
+			done
+			newpath+=:${thisp}
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+}
+
+src_configure() {
+	local SECURE_PATH
+
+	set_secure_path
+
+	# bug #767712
+	tc-export PKG_CONFIG
+
+	# - audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# - plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	local myeconfargs=(
+		# We set all of the relevant options by ourselves (patched
+		# into the toolchain) and setting these in the build system
+		# actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
+		# (it'll downgrade to =2). So, this has no functional effect on
+		# the hardening for users. It's safe.
+		--disable-hardening
+
+		# requires some python eclass
+		--disable-python
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/run/sudo
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable sasl)
+		$(use_enable ssl openssl)
+		$(use_with ldap)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with pam)
+		$(use_with pam pam-login)
+		$(use_with secure-path secure-path "${SECURE_PATH}")
+		$(use_with selinux)
+		$(use_with sendmail)
+		$(use_with skey)
+		$(use_with sssd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP.md
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP.md for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins docs/schema.OpenLDAP sudo.schema
+	fi
+
+	if use pam ; then
+		pamd_mimic system-auth sudo auth account session
+		pamd_mimic system-auth sudo-i auth account session
+	fi
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	# bug #652958
+	fperms 0711 /var/db/sudo
+
+	# Don't install into /run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/run || die
+
+	# bug #697812
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process sudo.conf
+
+	# bug #652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in ${ROOT}/etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index a503eb857108..5ef8d437d3ac 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest
index 561f70f83f79..52363d621794 100644
--- a/app-backup/rear/Manifest
+++ b/app-backup/rear/Manifest
@@ -2,5 +2,5 @@ AUX rear-2.6-Makefile.patch 879 BLAKE2B 60db156e4ac420f6d370b65c4a32b503f0ad958f
 DIST rear-2.6.tar.gz 750866 BLAKE2B de803951c040bb85d4659fc81ffb9264b2771a45675aca4eb0a6318201802475014c2b760415ac61ab734286f5e1e84b0c858df166b9be356384a243a7badb78 SHA512 0b6deac8f1b4adc3bcfcd19e82b5e5719df1c1c2347e3dde9bb47b6086856ebf5d08e485b876633190bb6f92a0e1c567bb65a30554205a32eec4b929e5815a6c
 DIST rear-2.7.tar.gz 852253 BLAKE2B 9652887c13fd91d4f7ca96d8ff851750045b837268bde70da8bfac32950039116a04b89d46f57dd40dd92f55e7ca284ce751b1b71340f1c96c0f5ec5496b3966 SHA512 9cabc6c5ddb01934740b73098a80bf1e0c03140ac1fce7c399752c1145bb743573033f6e34ae59a13e34fa873c8e992ce50316ee0260d23667614d5250daa087
 EBUILD rear-2.6.ebuild 1341 BLAKE2B 9225b61b38ca9bfd84143bce96c1d31bdee68e771a34c33a066667645fe75bdac16d259d3391e5e425d68307bd3905bbadf46d3fa2a9ba29c58671c3cfba8f8f SHA512 99ecd0c4ab1b17606947f5b199055b09c5f71777954498a963f8407d8d35cf6060e944e0c03dc205c686039e100b8d3a8051aa41fb616182762aec33008b45d8
-EBUILD rear-2.7.ebuild 1349 BLAKE2B 3605d7ed2e712d1b1e12f5d21b6ace82e8c556a81fa9ff82df67a5dcb7f43c7bd8572b0f80a81046b97210f4885e6bb81c7b84b7804ddc3615849dda9eccf002 SHA512 664bd6aab8e63ae3f976ad04169efa3f8e9c30172238a2077616af4c543a933fa127a40243b9b60923f8b16108e4c3589325da08723bb1270605ac56cde9e6be
+EBUILD rear-2.7.ebuild 1348 BLAKE2B eaca6fd51a6144a376a3ac0daa783bfc034f695a48d8b312b1ec8bd9cdc9a0aaa967d969370e201c45eb30424da70d7dc1c6c52a72e6fa582b4994afc72545c2 SHA512 f9330fe8b12f079f1ac20fb244378dd51257bec067827497a2fdf58621287614d8373d71d5f74ae41cfde5256a7d3a4b8e2ea618ef6be236484d432f9b10f488
 MISC metadata.xml 1045 BLAKE2B 59ce313d456183f805f681c22c7ecfc507f974bde9d6572e46526ebf0a659a0919b7cd1095c8a233b0f1dd3cd7552b7f8d313a12568f1a2847dab9e03c3b1603 SHA512 252d80bf8f0adc59464d055f56c3dc8b3afbbfb4377f4680b08ba3834e0a350915a8961d3f5ff0541ce2778f4c472da93201e98b45fa5d25cf3eaca6820b300f
diff --git a/app-backup/rear/rear-2.7.ebuild b/app-backup/rear/rear-2.7.ebuild
index 4af6aaf7f73d..acdfadf8be1f 100644
--- a/app-backup/rear/rear-2.7.ebuild
+++ b/app-backup/rear/rear-2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="udev"
 
 RDEPEND="
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 4fc3cdc18c77..dc11eda8096b 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/apptainer/Manifest b/app-containers/apptainer/Manifest
index 3c94d5758d30..bdece40b45ee 100644
--- a/app-containers/apptainer/Manifest
+++ b/app-containers/apptainer/Manifest
@@ -1,4 +1,6 @@
 AUX apptainer-1.0.2-trim_upstream_cflags.patch 1142 BLAKE2B 7238229b70a8ac37f3401a163d19dc705adb6a4ab6355e4eaa386ad5c639bfc1443cf61507112a53b66816399ca5fe2c32de964dd602ea16c5dfbf9003343f8c SHA512 1351ee000274567bb5a63aa740fbc43510d84ccad42c9af0c555943b99d93d86a2b036801c1681b93548a874bda1bab3304c2bf0da83bbca102a71e82574a032
 DIST apptainer-1.1.2.tar.gz 12896912 BLAKE2B 29a8df78617661e0a181955942e8321c112a69efaf15f4bb3e1563cc0789197916a3be1eb5396fb608d57b0edd5d5de2a70a2bda935095d8d511410660ebc106 SHA512 3fad253379a87ea790f22a14aec703296f606255d4ce847454a59f9dba0b9a6fc449489e7760c4696c1df90fc6abec198934310c1b762e33a83c72cafc7cb370
+DIST apptainer-1.1.3.tar.gz 12896905 BLAKE2B 100989c40625739d2c6e12ed73f41065d66c388015ebf9328f1f4d80421de46a907149ed1e8ca735bbb08d1fffcb35fe7e1db23d14466fdf6227f012d9fc82b5 SHA512 d6602cee3db9bd279b09a4cd4939a2e5474b53bcd323c181abcaedd671cefcdb47575801867fde2de5ae457aca6dc3318c2128eed20b2634bedcb3af9a06e915
 EBUILD apptainer-1.1.2.ebuild 2452 BLAKE2B ad348c5bc7cc3097e69a43313c6118c57dc76b499cfa38a82ed9e07bd9668f9bdcdd1ff92d37f8d566fd85e8df8a2cf94d7abb629bbb7583ddc375ec47a1b583 SHA512 3bc7302d9d4448fa493f77646aa1fcd85a0c19b8b50c54bdaf47310b41ec28c01dc8137229e1c39e56838912fcc9b996c515bbf04caba23dcdcc16839f95b2f5
+EBUILD apptainer-1.1.3.ebuild 2453 BLAKE2B ba3d96ffed78dd9b60b0ae69109a870d625918f21ab3147eb0fdb4614d3a5c71e13d6ffd3118441643554688bfdf23cd74bdefa7499c68a44e1658ce6c72eae9 SHA512 3dce29816981e44180a2d8593bc69970e4d9731a071fa2516eedfed60a24b360334b103130c55e1ca2ef9b2471bd228e4540864c3ce437ac93175a51f258e54f
 MISC metadata.xml 454 BLAKE2B 7891b6acae30424b8b6877166b856c1113a13e40ebec9051935df10a0650bf941f52d75bdb6a4258795e07b080082979469b8b8242d2ddd56c52f9c5b6759f0e SHA512 ef53c2dee45734f36403ab71549494f3c24707bc183353e4bd9c548a97b3ab5d7877f4fc9d311d9e86ab249cbdb379f0a1a211ee36afda99fd552f0a5cac30bb
diff --git a/app-containers/apptainer/apptainer-1.1.3.ebuild b/app-containers/apptainer/apptainer-1.1.3.ebuild
new file mode 100644
index 000000000000..3134281dcb06
--- /dev/null
+++ b/app-containers/apptainer/apptainer-1.1.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="The container system for secure high-performance computing"
+HOMEPAGE="https://apptainer.org/"
+SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples +network suid systemd"
+
+# Do not complain about CFLAGS etc. since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+DEPEND="app-crypt/gpgme
+	>=dev-lang/go-1.17.6
+	dev-libs/openssl
+	sys-apps/util-linux
+	sys-fs/cryptsetup
+	sys-fs/squashfs-tools
+	sys-libs/libseccomp
+	!suid? (
+		sys-fs/e2fsprogs[fuse]
+		sys-fs/squashfuse
+	)"
+RDEPEND="${DEPEND}
+	!sys-cluster/singularity"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~SQUASHFS"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-trim_upstream_cflags.patch
+)
+
+DOCS=( README.md CONTRIBUTORS.md CONTRIBUTING.md )
+
+src_configure() {
+	local myconfargs=(
+		-c "$(tc-getBUILD_CC)" \
+		-x "$(tc-getBUILD_CXX)" \
+		-C "$(tc-getCC)" \
+		-X "$(tc-getCXX)" \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--runstatedir="${EPREFIX}"/run \
+		--localstatedir="${EPREFIX}"/var \
+		$(usex network "" "--without-network") \
+		$(use_with suid)
+	)
+	./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig"
+}
+
+src_compile() {
+	emake -C builddir
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C builddir install
+	keepdir /var/${PN}/mnt/session
+
+	if use systemd; then
+		sed -i -e '/systemd cgroups/ s/no/yes/' "${ED}"/etc/${PN}/${PN}.conf || die "Failed to enable systemd use in configuration"
+	else
+		sed -i -e '/systemd cgroups/ s/yes/no/' "${ED}"/etc/${PN}/${PN}.conf || die "Failed to disable systemd use in configuration"
+	fi
+
+	einstalldocs
+	if use examples; then
+		dodoc -r examples
+	fi
+}
+
+pkg_postinst() {
+	if ! use suid; then
+		local oldver
+		for oldver in ${REPLACING_VERSIONS}; do
+			if ver_test "${oldver}" -lt 1.1.0; then
+				ewarn "Since version 1.1.0 ${PN} no longer installs setuid-root components by default, relying on unprivileged user namespaces instead. For details, see https://apptainer.org/docs/admin/main/user_namespace.html"
+				ewarn "Make sure user namespaces (possibly except network ones for improved security) are enabled on your system, or re-enable installation of setuid root components by passing USE=suid to ${CATEGORY}/${PN}"
+				break
+			fi
+		done
+	fi
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 9427f3e76f9f..012dfab6556f 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest
index f34582711c38..febbb9591f9c 100644
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@@ -1,7 +1,3 @@
-DIST ibus-m17n-1.4.10.tar.gz 642940 BLAKE2B f00b4392925a6ad24e5cbfc266d13a68e4b7641a4f70c93bb381d4bea13d03b40af659e2ba27533ce7514477aed2744eaac0b1aa25d7c4280fda8adf1ee5dde7 SHA512 7e8ab477de7fb75fbbcdd25d6f13b0dc1fdaae6ab23a2c5c18de7eadcd88c3ff4d441a32f58d4b4bde0d20685d45dd57fa24c5e61361ad5b6bbb29075949d396
-DIST ibus-m17n-1.4.13.tar.gz 646334 BLAKE2B 1fac0920adde05977e9f3f3993a17a8257992f493272c71a56f6b946d89245cc9353e20275a2bda94d6a627d0afc9a71aff0d1edba42c2ee8bbe4ce6ea962852 SHA512 5753a8c1888a2fefa87986d7396d3ad56e3e1109c0dd01fadcaf1e7a7a056dc45323d204f9b5a548900752e1bfc69d638076f51884a8948fa5ba16c7a17d5640
 DIST ibus-m17n-1.4.17.tar.gz 646856 BLAKE2B e2a1c93afa5adf76689a6883b5b2a08a8ebc4f122ae484797df9ae9fd220023c188a894789069f83ba598a321e3d6c89045f278f1b1f51988c34728e005ba5cd SHA512 794dfce969f447354a092758d20999637e3d0a1006f8e078845ae3e79b63b7a467f9f28a7bdeeac4f4709d6750e7156efbc3d341bfa574ac7002266d0dce2b95
-EBUILD ibus-m17n-1.4.10.ebuild 801 BLAKE2B efcc1d3eada14d85fa8c81cbeb1c94b38b626c53bd7e94749b481c21f3a9fcfcbbfdadc52fbaa594ab542f2eee34ad9629e19672c222f83fd69cd69db1dd3cd8 SHA512 3af87daa9a79b2bc0a9475a45aef9011d5c2ede82f6878ca9cce8b6bd4471e1dd3da316cec4d1e603b8d14c98208115aac7bb504c00fa29df9ad4c8a826baff6
-EBUILD ibus-m17n-1.4.13.ebuild 803 BLAKE2B 6bdd0fe9346a907b2291c3df2a4289d826fd1417db6c6419bcab2eb459b0b860e5e9921d428b400637029f3a7bca914032f6aa428bba4926bcf14fc5e9fdebf3 SHA512 a953de9583a6e475518297e665efc9fe3afb9314f96f85b21a91c6e9560f1a1eb7194b51d0a02b6a6b9ec57ed0edc3d17430b83235333135d6cec4178ef686fb
-EBUILD ibus-m17n-1.4.17.ebuild 803 BLAKE2B 6bdd0fe9346a907b2291c3df2a4289d826fd1417db6c6419bcab2eb459b0b860e5e9921d428b400637029f3a7bca914032f6aa428bba4926bcf14fc5e9fdebf3 SHA512 a953de9583a6e475518297e665efc9fe3afb9314f96f85b21a91c6e9560f1a1eb7194b51d0a02b6a6b9ec57ed0edc3d17430b83235333135d6cec4178ef686fb
+EBUILD ibus-m17n-1.4.17.ebuild 801 BLAKE2B efcc1d3eada14d85fa8c81cbeb1c94b38b626c53bd7e94749b481c21f3a9fcfcbbfdadc52fbaa594ab542f2eee34ad9629e19672c222f83fd69cd69db1dd3cd8 SHA512 3af87daa9a79b2bc0a9475a45aef9011d5c2ede82f6878ca9cce8b6bd4471e1dd3da316cec4d1e603b8d14c98208115aac7bb504c00fa29df9ad4c8a826baff6
 MISC metadata.xml 555 BLAKE2B b9dd5e7d4f230dde589a7e73333d14d52dae05d0e549dbde75332807434fc7c73ee7fe468dd919762527ac65f16c7a484b8d8b5c629c24dbe695c19c96b9abba SHA512 311891667bea4f2d4797440920ba2779a7f54766d3967edb25cb65b30800164a33192babdf7aadaa9adfeade385852d7d8d2a9a039b7c4ecbd2e9ed0a553fe89
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.10.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.10.ebuild
deleted file mode 100644
index da3b9ae13bd6..000000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.10.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="M17N engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk nls"
-
-DEPEND="app-i18n/ibus
-	dev-libs/m17n-lib
-	gtk? ( x11-libs/gtk+:3 )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	>=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk gtk 3.0)
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.13.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.13.ebuild
deleted file mode 100644
index 1466a2deebfc..000000000000
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.13.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="M17N engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk nls"
-
-DEPEND="app-i18n/ibus
-	dev-libs/m17n-lib
-	gtk? ( x11-libs/gtk+:3 )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	>=dev-db/m17n-db-1.7"
-BDEPEND="sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with gtk gtk 3.0)
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.17.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.17.ebuild
index 1466a2deebfc..da3b9ae13bd6 100644
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.17.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk nls"
 
 DEPEND="app-i18n/ibus
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index f875b0dcbd83..8e1e30792638 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-table-1.16.11.tar.gz 1518653 BLAKE2B fec1deed7b96492bc9cead734b5063e47d553f690f9c71362a213a81f905f176811d9f397ae72c4a40815611d47df90b5a2bb56851ac28d5ca2dc2efc405716b SHA512 f5da239a05337f368769e7679a0639e73812021579467a195795678d68cf8d70b1f9bd4d31739c60298d60c9da6291c704e592750677ecc59734dd8c4292bf43
 DIST ibus-table-1.16.12.tar.gz 1519559 BLAKE2B c0e236ae58cbcc7c52bc29f30f2be5ed02590bab96fb9866bb829986fef9e01964b3f4b55caa1d417840372b0c3c230a93713aa774272375b5cd21a2a851bba8 SHA512 edbbb4842a6b49cdf8a830187422b7042c47b9ddf4876eb114acdb1e449024a6f4f48d46cb97d4420d65dffc14b3e3e9400d31b92ac68ccd2e9a327151dcaa3f
-EBUILD ibus-table-1.16.11.ebuild 1037 BLAKE2B 6c6f34f6b9424d05e7af4e9c872f9a80bef1d3262b8d3355d66242ae296452b1f0787f29728e4c63137b58fff27b160de8c628d72750af4ed99120b26c1fa40d SHA512 05f427e142b4898a42f294045ebc56010651e143c9296bcbc2dea0b2c0de277df663a17017513f4079764e1f84ce4762976cf3d46fb89ea0a19c392eea63a707
-EBUILD ibus-table-1.16.12.ebuild 1039 BLAKE2B bfa60c06635c734fc91125a997f134541fd481f37b81ab94b89c12f1262839a98e1ebdf67f340e1d59879bacc4db500444bd40c440216c31ac41e1cd5468f670 SHA512 67bcb9a5a1bd5730dc9de788f34566c27ef22167658e0510b80082a9740ab4cefb02c53d73a60bb3acfe5339e89dbd1362fede169d3e6b9fc6926551b39ea637
+DIST ibus-table-1.16.13.tar.gz 1532633 BLAKE2B c47b7c1b523554993a007e6b4701d7ee92a000503004bdbc3832a8b3540bb440e9c51eee61f83fd04eb921cd84fedac84cb6b77effd305531aa8d43f980f275a SHA512 d060619c81ff3d610140593a47fed6b430f32f0e5927d824d36bd082d394e473f6d534f7b9b0d0100f878001b7e8b4384e1770c5e1887976cfe248bba5bb6318
+EBUILD ibus-table-1.16.12.ebuild 1037 BLAKE2B 6c6f34f6b9424d05e7af4e9c872f9a80bef1d3262b8d3355d66242ae296452b1f0787f29728e4c63137b58fff27b160de8c628d72750af4ed99120b26c1fa40d SHA512 05f427e142b4898a42f294045ebc56010651e143c9296bcbc2dea0b2c0de277df663a17017513f4079764e1f84ce4762976cf3d46fb89ea0a19c392eea63a707
+EBUILD ibus-table-1.16.13.ebuild 1039 BLAKE2B bfa60c06635c734fc91125a997f134541fd481f37b81ab94b89c12f1262839a98e1ebdf67f340e1d59879bacc4db500444bd40c440216c31ac41e1cd5468f670 SHA512 67bcb9a5a1bd5730dc9de788f34566c27ef22167658e0510b80082a9740ab4cefb02c53d73a60bb3acfe5339e89dbd1362fede169d3e6b9fc6926551b39ea637
 MISC metadata.xml 315 BLAKE2B eeff056ce020201cb6e59f0f160232486fd94cc9de7cc90980155f9ef97988199d592b01190b13b013433853fbc25d9c4e5e29fe33fb74aa4239318cfac312fd SHA512 3329cc73468815ecf7f122ee8e8b81ca7295abcfeab95082841ae460c7ca76fdf2cb3d01b1548795bb525ce855052f512b8b2d77fa3afd302f41c156edf35de0
diff --git a/app-i18n/ibus-table/ibus-table-1.16.12.ebuild b/app-i18n/ibus-table/ibus-table-1.16.12.ebuild
index 7314f41b0540..dcbbc265378a 100644
--- a/app-i18n/ibus-table/ibus-table-1.16.12.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.16.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-table/ibus-table-1.16.11.ebuild b/app-i18n/ibus-table/ibus-table-1.16.13.ebuild
index dcbbc265378a..7314f41b0540 100644
--- a/app-i18n/ibus-table/ibus-table-1.16.11.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.16.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 881ca8deb186..371e51750063 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,7 @@
 DIST ibus-typing-booster-2.19.0.tar.gz 11127967 BLAKE2B 0efc148c55ca329b69db280fee9606d4773c48258ec0c5249992e802a1a6baa67577b884865f27a4145c044929a80b1d1e0d1cbffddc548539ba52f6d83b51c4 SHA512 e5852ff30fd5c7ebde5909a8f0af0292fc20e73eaf737bbb3b34af5c24144eb7c58fdb77bfbd3cc7f08110d0fb7ad9fe0a353eb52619da7f8e72d7a901e9004b
 DIST ibus-typing-booster-2.19.6.tar.gz 11053584 BLAKE2B 3cab4a044fd8ba9593c336e4fa578f9a476f8b28921923f974fa9805918fdd2542c8cc706316f91bebddedf43c0ae35b418ea554e52f018afe24ad4802601deb SHA512 261b438a07d1621e8f81d362137a1b2f4022cc090488917dfe56129aaf811e607d56e58aca6cf8808c164049ebb3f9c246e8076ff69d24a474685fe1c277d1b1
+DIST ibus-typing-booster-2.19.7.tar.gz 11055420 BLAKE2B 7e303905d6417dcff67968311b287218d68ff94932f64b82fe224131f8c8f70254e679254bda2c372aeecab15042f51046d62de4887d197d30cb2478136a7cf8 SHA512 0dd7a5aeeed0791a7c5053f6a09abf04590664fc691b0ca11dea1a11ea4109f7cfe907995219b5974b72c21df58670bd1b7ee893acb7b72fd56b3ee23df4fcc4
 EBUILD ibus-typing-booster-2.19.0.ebuild 1150 BLAKE2B 7dbb9179f77c4a6d5dc619a9a33488c048bf4caee8dae5d58781c2210cff7b063f9b1192dd865e3820f38168e5559284783c97e16b7774e6c7a87f6e872b7b62 SHA512 6887d95b52245276feced655d8e0fe407c618fbe60eb48fc5abb44402498aaeab25b6639f0f460d67fe546476ab36cd2c381e127f03ac63a35a0e8f11f3d81d5
 EBUILD ibus-typing-booster-2.19.6.ebuild 1152 BLAKE2B 02705b507534b72948c798a9f6d714574b90a7f46d8722f75f95216d5866f0fdbd4acb77b1c8a18470c594445c6ba585b344bf0e0719ecd6fb181ad5a3a49b71 SHA512 55892d6d65034d285589b718ae2512cf3de0a85ab0560ed8189bd8dd80de08f6a385c28b6a5aa5adb3e6fc1662daa965257f4eb3cfa1032dbf371b8c902142bc
+EBUILD ibus-typing-booster-2.19.7.ebuild 1152 BLAKE2B 02705b507534b72948c798a9f6d714574b90a7f46d8722f75f95216d5866f0fdbd4acb77b1c8a18470c594445c6ba585b344bf0e0719ecd6fb181ad5a3a49b71 SHA512 55892d6d65034d285589b718ae2512cf3de0a85ab0560ed8189bd8dd80de08f6a385c28b6a5aa5adb3e6fc1662daa965257f4eb3cfa1032dbf371b8c902142bc
 MISC metadata.xml 331 BLAKE2B e076fda3780cbfebae0a799bcc320de0417dfc2a726320c014d253163625da4fd629b180442449368e316e134bf2024f7e03373f2ca0342c4b63a11c63475697 SHA512 f79eaa01a0ad3005064928ef7fbaed4bc98f8850ca36b23309096647b6158c7500e0075f149e4e764a89af99a8fe342eb6a1d9b83a347557300545ecf870e4d8
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.19.7.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.19.7.ebuild
new file mode 100644
index 000000000000..58166b805e3c
--- /dev/null
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.19.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Completion input method for IBus"
+HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
+SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/m17n-lib
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	')"
+RDEPEND="${DEPEND}
+	>=dev-db/m17n-db-1.7"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index e886fbd07639..cb0924229dab 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/starship/Manifest b/app-shells/starship/Manifest
index ec966aedbac8..d06ecd991d54 100644
--- a/app-shells/starship/Manifest
+++ b/app-shells/starship/Manifest
@@ -485,5 +485,5 @@ DIST zvariant-3.6.0.crate 68075 BLAKE2B 63259b289453c224e57275728db7ce32a8a0bd84
 DIST zvariant_derive-3.4.1.crate 10938 BLAKE2B 971977459df2890d2148cb2a3677fdf2618a5fcc89f22f6c8807ed1c18469846b36a9414717c61ba2492d7a2d56da711456b983c945d6568d31650693e0c371f SHA512 491fdd47cffdf452b32bf81c650ce402c6e63af1040a0cd6ab02b0831400925ecef4dd7041f4b45be54efb84aa81975fd46d8b4bbfd02b45544406de55f8a7bf
 DIST zvariant_derive-3.6.0.crate 10957 BLAKE2B dbab1fdcd6e86a08c011bb6dd3d0c8c849c3ab001ba2ca33369d5dbd3337e85b6e93b35bc8bb8663f30fd579725b0f3b2b9b0e92b91eb40579a143a1dc100cfb SHA512 97751c9dc75cc58fbb5325d993e800a446479d47cf505a6de725993dc859ba6c7e257b2fa29b7c9da2e884dc46a1b512b57b45fdac3219cf9517c877931cda67
 EBUILD starship-1.10.2.ebuild 7920 BLAKE2B 5d6342c234ec4adec48ec79482021b4d6f3db07ad7a3da42dfbf0aab2fabbe152fb5e145883ae01df7b91187ff000a85b08bfc17821a2662dfa188246154537d SHA512 26bc419f2409974493433089824fdae6532e308cb03679bc1cd6fb91018966e917c3959996f68293d3d5942b64eb036c49c63679f0168c9681fd871a67db8cce
-EBUILD starship-1.10.3.ebuild 7974 BLAKE2B 0078ba251f7aada13e92f757e2965e298c56b4ed7ce1a3cde68b39ffc4327e3a43780272b9b20685874c5d39179b808454ea168e605b8f4ffae2388e31fd2ba5 SHA512 ccc8eeb60d0d8721aaa618e6a1db63eabbaf3aad8abafddb48eee40f092de048c255274c19da44f180ca5e04cdda76777e6d55f82b87b33d0c75650176156aa5
+EBUILD starship-1.10.3.ebuild 7973 BLAKE2B 6d6ef8c1b37c43c4e46687dc4c6bc68352814f121f2f11cbc4890434f4bab9adf2069db063267a8ea06644ec371f57e081f41d61e9eb07cb340e77413a33a889 SHA512 7c88e02c0c64fe07a4de90d5fa48f5351843a118f328c829f0d760f0d3677cf243017fdb1c30fe2040bbe7ba4248ab60160455fa3447d6a1a606ee02d101b202
 MISC metadata.xml 738 BLAKE2B 84ca83a5db6b67fe44f8a192499231851af9b7a7d1d279d4a2660147bee375332e3818633c310a0d9848e714e326e8fe6fe2c2dc7a8e99dd643a637bc46efb71 SHA512 f9ce6f2d5d4fc1cffc524ee25df289e33574a98b32b35ab7221e9ea193835ca6038c87093218d0a5ccb43fbb28e524535b8280491da8e72d88d1f1a96b3c7bb2
diff --git a/app-shells/starship/starship-1.10.3.ebuild b/app-shells/starship/starship-1.10.3.ebuild
index 94efc12ef8ab..bc533b456e59 100644
--- a/app-shells/starship/starship-1.10.3.ebuild
+++ b/app-shells/starship/starship-1.10.3.ebuild
@@ -385,7 +385,7 @@ SRC_URI="
 LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND=">=virtual/rust-1.59"
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 71387f1b90a7..1bcfdeaac387 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 0c72216b8ebd..df7395453e44 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,4 +1,5 @@
 AUX dvisvgm-2.14-Add-missing-cstdint-includes-for-GCC-13.patch 2368 BLAKE2B ace726ea5eb8364b1a5fdf18649b3b5096b915db87528a8016f59ec1b5ac0d2290502cc2ecf116cda4ccc8a308847a1f1b7cf01d535ade5ed878249fe8022e7b SHA512 ce9c08f3f7c902a6a2127b43420b07d016d821bafd3650a36c3f08acd5650ad204f55346a46928ea445c55be562549b81c3eec494917ca1b76b3d54ec388e610
+AUX dvisvgm-2.14-configure-autoreconf.patch 10069 BLAKE2B afc456c40d73e19d260ad1b3574d2284787f3489eb129a900846c052f441e5cb658316d85448d56b65a5a79e72573e1cac5ce0d70563ea5abab3ee193a5afcbd SHA512 e5038d84ac08097fe43c891494037e327357617800a861a87d83c6fdccce318ba3229660ea32bbd15c363696a4c0a74f68773be10ac02a6e9ab000a4ff3fcfd6
 AUX dvisvgm-2.14-configure-clang16.patch 681 BLAKE2B cc91e791f4846e9d0fcc9aab8d528bc55c4f3408e52ca5773b79bc91237acd78968717b0477e5ca65ee64ee3e0025539fec6c6a6d8b576894f2a9a3550237179 SHA512 19d6199ba2237c0a41e3cc0a203f6fca840dd87da1e88d50efba1c0f1eda274c71e61d88bc470995fefd6676955860b5f6a1069b6d7db9d6a23a9e01c3722b36
 AUX dvisvgm-2.14-ghostscript.patch 7790 BLAKE2B b9220dbbc39ba015f17f4b330dcffe4506a233753faa4b99b5e70fdc42aaff739b649c6f2d91056db7380dd352e7e694557c92710d0a7adc076cd48ca218102a SHA512 5b4acabfdca5748d28a579c27b294bb247d126dcabbef2d8e385b0b091587ff34a7dfd81e19dfd4cabee4d5b6f3206e9c69a7182a45f4201310fbbda4f288504
 DIST dvisvgm-2.12.tar.gz 3164951 BLAKE2B 249f1ee43444ac95ed512eac803ab073e1ec04a58266fc569a272014510ab373890fdc7be2207d2037742f4192e266eb214078c0bb448de953ffdf5c29deabba SHA512 3f0ca530f24a8866839d71093dc6fd84f2a0f984d06cdd189425aeeb7c7e7e3c9e283d1fe2e7e9ec79845f36c8bd4d973224a321b8ad39da229a3b4fd59b7008
@@ -6,5 +7,5 @@ DIST dvisvgm-2.13.tar.gz 3174723 BLAKE2B bee6efd0fd32b1b0c116820df955a3b76cfd795
 DIST dvisvgm-2.14.tar.gz 3192670 BLAKE2B 16b290db680c57babba06d97250b26925223984af807695a5b24b2e134a0d41e0b7292efd47e6781e75c4790c3e6482d3447e8a5ad7e25b9b36526ba033d15d4 SHA512 874d2d3deed2b1c1cd3e459a53d43533e7fc19613ad2ade09fdf303cedfecd8091d944933c30a7107aad2e8901cc23f1debd4e36031a90b1ad8ba2f56d2a3ba6
 EBUILD dvisvgm-2.12.ebuild 1133 BLAKE2B 682c6f278485d685080c7cd998a0e55a39e52a8bddca2fd0ffe3a1964773a283bfaaf16771eb66fc850e5755842a8ad325c40bc96e6bb2cac8c4a8547e80d463 SHA512 74a88a33242e5f7b7511f97557b2f70afdb3e28d1cf51a53789e552a215671d58229378d65bddd342da3bf4cef6b6539674753fe0fd46970f4835d416bfe70da
 EBUILD dvisvgm-2.13.ebuild 1149 BLAKE2B 7a169d678e8f57eba8a15243116d053f6a2acc04346f69a13d2b97291d9089f4f86961ecadc20b1e4a4465c993814975f0eddbbd4089d1da5927425c263cc762 SHA512 4a408fb8dc501c660f581ce8369c5ae1605230e2fe2f57dcfb90a29a33f5a22df193ce846d841fad7510a86ac0b0e6401e25687a3f423dcc466c06a19654a400
-EBUILD dvisvgm-2.14-r1.ebuild 1435 BLAKE2B 91233901d5e6dea414888b8ccdf24031164477a1a8f42b0ee2cdffe73ded6df9a9a8ecf28a3d0e43009b0b4b05045e19fa55b1a36a576e23c8f2a2f666df2bbd SHA512 1681ece4850e425e9bce936c1b2aaf1a621958d87b8584d03b12b1187f9aa84a9a4c41be878a66737459f8110da3b3b33b1270c72fcb745995c2620940d29eae
+EBUILD dvisvgm-2.14-r1.ebuild 1650 BLAKE2B 0167cd67ac95180b961c03ed87e9d9a6d7b7a3dbfb202d5b92a90489b0ec29d96d802e0e39e78598d9b3e9b1cdfd6e2f34a4aede62257eec2aec202f4ff944c9 SHA512 8233979908127a3d3b6ac94b30f2945ee8edcf7f10cf53a4758d140c7f51b1a78187278c7931a18a9129f07f23e8931cb20b230a03a1c2284a86ed8dc29cc3f7
 MISC metadata.xml 383 BLAKE2B d4d13b1caf7ebbd81baf9d911434c0ca57f5b9c5d5c136c0ae569341c511e61fbbaf9211accff192d86bdcedca81ad9f6dab2e23f65778a0b2b7c4be0a286a1e SHA512 563b8459b11497c84145cd7dca5cfa38cafbd5bbeb2c2709080633e785509073b96d1ee999fa87b4263f2babefe32b030361fb537b9016cc3eb5ccf423639573
diff --git a/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild b/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild
index 7c440a044d8a..2e70826ca37e 100644
--- a/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild
@@ -47,12 +47,17 @@ PATCHES=(
 	"${FILESDIR}"/${P}-ghostscript.patch
 	"${FILESDIR}"/${P}-Add-missing-cstdint-includes-for-GCC-13.patch
 	"${FILESDIR}"/${PN}-2.14-configure-clang16.patch
+	"${FILESDIR}"/${PN}-2.14-configure-autoreconf.patch
 )
 
 src_prepare() {
-	default
-
 	# Drop once configure patch merged for clang 16
+	local macro
+	for macro in ax_check_compile_flag.m4 ax_code_coverage.m4 ax_cxx_compile_stdcxx.m4 ; do
+		cp "${BROOT}"/usr/share/aclocal/${macro} m4/ || die
+	done
+
+	default
 	eautoreconf
 }
 
diff --git a/app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch b/app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch
new file mode 100644
index 000000000000..6641d3e2cae5
--- /dev/null
+++ b/app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch
@@ -0,0 +1,383 @@
+https://github.com/mgieseki/dvisvgm/pull/202
+
+From 2dc8627a0864ea1543027e577ad96676a56bf4c5 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 4 Nov 2022 20:04:43 +0000
+Subject: [PATCH 1/4] Cleanup obsolete m4 dist hack
+
+autoconf & automake, at least nowadays, handle including m4/
+correctly in dist tarballs (from `make dist`).
+
+Previously, dist tarballs lacked m4/ax_*.m4 and therefore `autoreconf -fi`
+would break the Makefile with:
+```
+make[3]: Entering directory '/var/tmp/portage/app-text/dvisvgm-2.14-r1/work/dvisvgm-2.14/libs/clipper'
+Makefile:664: *** missing separator.  Stop.
+```
+
+On that line is an unexpanded @CODE_COVERAGE_RULES@.
+
+Bug: https://bugs.gentoo.org/879539
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,7 +5,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ EXTRA_DIST = COPYING
+-SUBDIRS = libs m4 src tests doc
++SUBDIRS = libs src tests doc
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ if USE_BUNDLED_LIBS
+--- a/configure.ac
++++ b/configure.ac
+@@ -228,7 +228,6 @@ AC_CONFIG_FILES([
+ 	libs/variant/Makefile
+ 	libs/woff2/Makefile
+ 	libs/xxHash/Makefile
+-	m4/Makefile
+ 	src/Makefile
+ 	src/version.hpp
+ 	src/optimizer/Makefile
+--- a/m4/Makefile.am
++++ /dev/null
+@@ -1,4 +0,0 @@
+-M4_EXTRA_DIST = \
+-	ax_check_compile_flag.m4 \
+-	ax_code_coverage.m4 \
+-	ax_cxx_compile_stdcxx.m4
+
+From 2b03bccde2dd8a1b101f793159663446dd522ac9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 4 Nov 2022 20:27:35 +0000
+Subject: [PATCH 2/4] Update to newer autoconf-archive (AX_*) macros
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,6 +3,8 @@
+ ##
+ ## Process this file with automake.
+ 
++include $(top_srcdir)/aminclude_static.am
++
+ AUTOMAKE_OPTIONS = foreign
+ EXTRA_DIST = COPYING
+ SUBDIRS = libs src tests doc
+--- a/configure.ac
++++ b/configure.ac
+@@ -205,6 +205,7 @@ AS_IF([test "x$enable_manpage" != "xyes"],
+ AM_CONDITIONAL([BUILD_MANPAGE], [test "x$enable_manpage" = "xyes"])
+ 
+ AX_CODE_COVERAGE
++
+ AS_IF([ test "$enable_code_coverage" = "yes" ], [
+ 	# disable optimization
+ 	changequote({,})
+--- a/libs/brotli/Makefile.am
++++ b/libs/brotli/Makefile.am
+@@ -81,7 +81,6 @@ libbrotli_a_SOURCES = \
+ 
+ AM_CFLAGS = -Wall -I$(srcdir)/include
+ 
+-@CODE_COVERAGE_RULES@
+ endif
+ 
+ EXTRA_DIST = LICENSE
+--- a/libs/clipper/Makefile.am
++++ b/libs/clipper/Makefile.am
+@@ -6,6 +6,4 @@ AM_CXXFLAGS = -Wall
+ 
+ clipper.cpp: clipper.hpp
+ 
+-@CODE_COVERAGE_RULES@
+-
+ CLEANFILES = *.gcda *.gcno
+--- a/libs/ff-woff/Makefile.am
++++ b/libs/ff-woff/Makefile.am
+@@ -85,6 +85,4 @@ EXTRA_DIST = LICENSE
+ 
+ AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge $(ZLIB_CFLAGS)
+ 
+-@CODE_COVERAGE_RULES@
+-
+ CLEANFILES = *.gcda *.gcno
+--- a/libs/md5/Makefile.am
++++ b/libs/md5/Makefile.am
+@@ -6,7 +6,6 @@ AM_CXXFLAGS = -Wall
+ 
+ md5.c: md5.h
+ 
+-@CODE_COVERAGE_RULES@
+ endif
+ 
+ CLEANFILES = *.gcda *.gcno
+--- a/libs/potrace/Makefile.am
++++ b/libs/potrace/Makefile.am
+@@ -17,7 +17,6 @@ libpotrace_a_SOURCES = \
+ 
+ AM_CFLAGS = -Wall -I$(srcdir)
+ 
+-@CODE_COVERAGE_RULES@
+ endif
+ 
+ CLEANFILES = *.gcda *.gcno
+--- a/libs/woff2/Makefile.am
++++ b/libs/woff2/Makefile.am
+@@ -28,7 +28,6 @@ libwoff2_a_SOURCES = \
+ 
+ AM_CXXFLAGS = -Wall -I$(srcdir)/include -I$(srcdir)/../brotli/include
+ 
+-@CODE_COVERAGE_RULES@
+ endif
+ 
+ EXTRA_DIST = LICENSE
+--- a/libs/xxHash/Makefile.am
++++ b/libs/xxHash/Makefile.am
+@@ -6,7 +6,6 @@ AM_CXXFLAGS = -Wall
+ 
+ xxhash.c: xxhash.h xxh3.h
+ 
+-@CODE_COVERAGE_RULES@
+ endif
+ 
+ CLEANFILES = *.gcda *.gcno
+--- /dev/null
++++ b/m4/ax_ac_append_to_file.m4
+@@ -0,0 +1,32 @@
++# ===========================================================================
++#   https://www.gnu.org/software/autoconf-archive/ax_ac_append_to_file.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_AC_APPEND_TO_FILE([FILE],[DATA])
++#
++# DESCRIPTION
++#
++#   Appends the specified data to the specified Autoconf is run. If you want
++#   to append to a file when configure is run use AX_APPEND_TO_FILE instead.
++#
++# LICENSE
++#
++#   Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 10
++
++AC_DEFUN([AX_AC_APPEND_TO_FILE],[
++AC_REQUIRE([AX_FILE_ESCAPES])
++m4_esyscmd(
++AX_FILE_ESCAPES
++[
++printf "%s" "$2" >> "$1"
++])
++])
+--- /dev/null
++++ b/m4/ax_ac_print_to_file.m4
+@@ -0,0 +1,32 @@
++# ===========================================================================
++#   https://www.gnu.org/software/autoconf-archive/ax_ac_print_to_file.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_AC_PRINT_TO_FILE([FILE],[DATA])
++#
++# DESCRIPTION
++#
++#   Writes the specified data to the specified file when Autoconf is run. If
++#   you want to print to a file when configure is run use AX_PRINT_TO_FILE
++#   instead.
++#
++# LICENSE
++#
++#   Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 10
++
++AC_DEFUN([AX_AC_PRINT_TO_FILE],[
++m4_esyscmd(
++AC_REQUIRE([AX_FILE_ESCAPES])
++[
++printf "%s" "$2" > "$1"
++])
++])
+--- /dev/null
++++ b/m4/ax_add_am_macro_static.m4
+@@ -0,0 +1,28 @@
++# ===========================================================================
++#  https://www.gnu.org/software/autoconf-archive/ax_add_am_macro_static.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_ADD_AM_MACRO_STATIC([RULE])
++#
++# DESCRIPTION
++#
++#   Adds the specified rule to $AMINCLUDE.
++#
++# LICENSE
++#
++#   Copyright (c) 2009 Tom Howard <tomhoward@users.sf.net>
++#   Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 8
++
++AC_DEFUN([AX_ADD_AM_MACRO_STATIC],[
++  AC_REQUIRE([AX_AM_MACROS_STATIC])
++  AX_AC_APPEND_TO_FILE(AMINCLUDE_STATIC,[$1])
++])
+--- /dev/null
++++ b/m4/ax_am_macros_static.m4
+@@ -0,0 +1,38 @@
++# ===========================================================================
++#   https://www.gnu.org/software/autoconf-archive/ax_am_macros_static.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_AM_MACROS_STATIC
++#
++# DESCRIPTION
++#
++#   Adds support for macros that create Automake rules. You must manually
++#   add the following line
++#
++#     include $(top_srcdir)/aminclude_static.am
++#
++#   to your Makefile.am files.
++#
++# LICENSE
++#
++#   Copyright (c) 2009 Tom Howard <tomhoward@users.sf.net>
++#   Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 11
++
++AC_DEFUN([AMINCLUDE_STATIC],[aminclude_static.am])
++
++AC_DEFUN([AX_AM_MACROS_STATIC],
++[
++AX_AC_PRINT_TO_FILE(AMINCLUDE_STATIC,[
++# ]AMINCLUDE_STATIC[ generated automatically by Autoconf
++# from AX_AM_MACROS_STATIC on ]m4_esyscmd([LC_ALL=C date])[
++])
++])
+--- /dev/null
++++ b/m4/ax_file_escapes.m4
+@@ -0,0 +1,30 @@
++# ===========================================================================
++#     https://www.gnu.org/software/autoconf-archive/ax_file_escapes.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_FILE_ESCAPES
++#
++# DESCRIPTION
++#
++#   Writes the specified data to the specified file.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Tom Howard <tomhoward@users.sf.net>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 8
++
++AC_DEFUN([AX_FILE_ESCAPES],[
++AX_DOLLAR="\$"
++AX_SRB="\\135"
++AX_SLB="\\133"
++AX_BS="\\\\"
++AX_DQ="\""
++])
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -225,6 +225,4 @@ $(srcdir)/psdefs.cpp: psdefs.ps
+ 
+ psdefs.ps: ;
+ 
+-@CODE_COVERAGE_RULES@
+-
+ CLEANFILES = *.gcda *.gcno
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -421,6 +421,4 @@ XMLStringTest_LDADD = $(TESTLIBS)
+ EXTRA_DIST += check-conv genhashcheck.py normalize.xsl
+ TESTS += check-conv
+ 
+-@CODE_COVERAGE_RULES@
+-
+ CLEANFILES = *.gcda *.gcno hashcheck.cpp
+
+From 8689f1ceb2284038627668e70ec7e15f99220a5c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 4 Nov 2022 22:42:58 +0000
+Subject: [PATCH 4/4] Upgrade to Autoconf 2.69
+
+autoconf 2.69 is still pretty old and this only affects
+folks who want to run autoreconf anyway.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ #
+ # Process this file with autoconf to produce a configure script.
+ 
+-AC_PREREQ(2.59)
++AC_PREREQ([2.69])
+ AC_INIT([dvisvgm],[2.14],[martin.gieseking@uos.de])
+ DATE="August 2022"
+ AC_CONFIG_SRCDIR(src)
+@@ -18,13 +18,11 @@ AC_DEFINE_UNQUOTED([TARGET_SYSTEM], ["$target"])
+ 
+ # Checks for programs.
+ AC_PROG_CC
+-AC_PROG_CC_C99
+ AC_PROG_CXX
+ AX_CXX_COMPILE_STDCXX([11])
+ AM_PROG_AR
+ LT_INIT
+ 
+-AC_PROG_RANLIB
+ AC_LANG(C)
+ 
+ AX_CHECK_COMPILE_FLAG([-Wmismatched-tags -Wno-mismatched-tags], [CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags"])
+@@ -147,7 +145,7 @@ AC_CHECK_LIB(z, gzopen)
+ 
+ # Check for header files.
+ AC_HEADER_DIRENT
+-AC_HEADER_STDC
++
+ AC_CHECK_HEADERS_ONCE([libintl.h stdlib.h string.h strings.h unistd.h])
+ 
+ # Check for typedefs, structures, and compiler characteristics.
+
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 8d1898dc271d..38cb94ddc958 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 9e19eb4a2c77..f1ecd8c0cfe6 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -73,5 +73,5 @@ DIST rustc-1.63.0-src.tar.xz.asc 801 BLAKE2B b6c133768e368a7aeb0a4612a4c824d13f9
 DIST rustc-1.64.0-src.tar.xz 137841332 BLAKE2B 8acd9e0a4632ba2114018a5cd3f2d544324c601c246658f60a9e0be513c40375434d0a416f0bfd4d24493eae3fec7c9f5bb52d008c88cde14de503a3b6873dd1 SHA512 919f40acd8c6eaaef399aa3248503bea19feb96697ab221aaede9ee789ce340b47cb899d1e0e41a31e5d7756653968a10d2faaa4aee83294c9f1243949b43516
 DIST rustc-1.64.0-src.tar.xz.asc 801 BLAKE2B 69f7bd7600d99794859c6fad4b44f0e98868e4e16041d6fe81d9d09a8435c75abac67a735adb0b81a2d9f85651841d404bc1ef4cd64fccd75e8a25d6d95729d0 SHA512 a831e3941849add1082c5b47b619ea87405b875d6eeb90a35f42742a511d124c29503debd17dcc8c6aa9e03a754ab51c3a15e99192bdd0dd1b8a59af9b6eb0b8
 EBUILD rust-1.63.0-r1.ebuild 23703 BLAKE2B c49c010a8b6b947148cad4df27ada9b52b045826238568d298fae2ef74be466ba3a8b8cce1c8d727b74727c888c3c8d3be7afa908ee8dc567c467b0f0cfd329e SHA512 b5c88034b71d09b227a725521e84247c89594b56df5871c93a35543b5440ba700e2553cc07a98467bc6b9664159e2cf273417ab88a6eb3039780dbc8c8ebdb2b
-EBUILD rust-1.64.0-r1.ebuild 23977 BLAKE2B a961154829964e4bf6540f545d216dcff959281e5ca8561184a0fd9e3d939cb0181d62f1411cf7df2ae381f875a890233940db383cf0307f9c1c6a7a4a5e9008 SHA512 8c37d87d10fc37e3cc6967e88e3697a37fda0876c26ffa893ef16d0be2bdd0b8c46448d75960dd6625098d453d22edf4e0a344e8563a7d5b7d7d2b293f7ca1d8
+EBUILD rust-1.64.0-r1.ebuild 23867 BLAKE2B b9d8aa35b84e668fb038fb813bfc6bc2bae4dce945e381cff0645a1fa9463a8cd30aa92e0018a407263929bd0da169191de136e634c9edacccd1ac0ffb69337b SHA512 4a174b1d34e6f7bfd860629d0bc06e99a7accf9eb7c7bf51f10db8b255237c63b3a5aee1291dd2ceb404676a67f5e507a7414ecc132c5926ee292cc047b0ced4
 MISC metadata.xml 1770 BLAKE2B d5881dc5ea39a5bfff7c74fa883dc1a6370db572568e10fce81467c2f2a17018de48123dfa7993d6d9644305bfc5ef5b0f445ef40362065fce943efb4af2e761 SHA512 c914e1a0cee95fa5cb332240f3eb6fbee73e5d8baabfa6bdcdc3e852c9480fea0686e435b969e14f45d8c791655edc6e6a7df2259ac99b6a6e63af65b09fa57e
diff --git a/dev-lang/rust/rust-1.64.0-r1.ebuild b/dev-lang/rust/rust-1.64.0-r1.ebuild
index 4ecd5bb436ec..ae62f705a4da 100644
--- a/dev-lang/rust/rust-1.64.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.64.0-r1.ebuild
@@ -622,12 +622,8 @@ src_test() {
 	for i in "${tests[@]}"; do
 		local t="src/test/${i}"
 		einfo "rust_src_test: running ${t}"
-		if ! (
-				IFS=$'\n'
-				env $(cat "${S}"/config.env) RUST_BACKTRACE=1 \
-				"${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \
+		if ! RUST_BACKTRACE=1 "${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \
 				-j$(makeopts_jobs) --no-doc --no-fail-fast "${t}"
-			)
 		then
 				failed+=( "${t}" )
 				eerror "rust_src_test: ${t} failed"
@@ -641,11 +637,7 @@ src_test() {
 }
 
 src_install() {
-	(
-	IFS=$'\n'
-	env $(cat "${S}"/config.env) DESTDIR="${D}" \
-		"${EPYTHON}" ./x.py install	-vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
-	)
+	DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
 
 	# bug #689562, #689160
 	rm -v "${ED}/usr/lib/${PN}/${PV}/etc/bash_completion.d/cargo" || die
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fcbf1b106e42..134439a49424 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/qxlsx/Manifest b/dev-libs/qxlsx/Manifest
new file mode 100644
index 000000000000..d5f96323ff42
--- /dev/null
+++ b/dev-libs/qxlsx/Manifest
@@ -0,0 +1,7 @@
+AUX qxlsx-1.4.4-libdir.patch 968 BLAKE2B db6cdaf278bb910e674f7a1ec7c09276f64b5f961fb3086c842983a527c7e48cd3d8b37a721a07d85b10ab2bb3afedfc9352c5fe9ee415d7909e783b340075f5 SHA512 206feaff02df1b21339b685450f679372b4db7dde19b049958fa99a5c7b7fb0623e95897ae98e7891dbc860c3a8465621d9453dce69aa60334a73b4a3dd1c63f
+AUX qxlsx-1.4.4-qtdefs.patch 737 BLAKE2B c104e0f129beaca20726ce939c881e79af7606f5f34869dccae4a24cb03848551d91e463f754af16bdec866ece0c540593507c5d67c4d50dd48c874f318a3334 SHA512 4bb08a1ad0e1b0dadf1047d27de814ebc32fa14284fb8411dcd0a3a0485a767962d66598faa3829d2af7b4cd9f79d65b73ca587a8773811c53c58991f5e5a359
+AUX qxlsx-1.4.4-qtversion.patch 3193 BLAKE2B 1e9534bf4361ff0927ed77ba58c38e0ffa219245dc2cd8b314da1ff8c6331a80190df2c97fc67babae112f40e74d4f9d4369ac21c474c0c9df596d5788f312d7 SHA512 c8d46be8a08bf1134403ccea329b021b4cb5e2e6394ff11230b02b1316396490ccc4cab17a7970df7be6fb4329afd7d4184acadb9b2adab938274a3fe5c58f34
+AUX qxlsx-1.4.4-soversion.patch 682 BLAKE2B defb2375ec4ff00e6f042cdf20b52d7983d77806a335b301a1c799679d2da887b88458ed3e024bc085c26d6f6a9f8450868076d969eed8f608b80f30dfe8f14c SHA512 5434a4da6f58fd2aad1ade38b00ce8f48df73e519ef375b9bc7b014cfeb4601912bdc81e9b13529147b97800d6b0ff97fc8669a774f0dcb7814d5189fe90c6d1
+DIST qxlsx-1.4.4.tar.gz 4703732 BLAKE2B 0acf5e708f4dc981723a34b524c820a53a66cb13bf1ce5a1086106230e45dcac2ea6587b3c4ca039de491565ac886a2e5bd1225ee39437ee89a2ff7560da6fd7 SHA512 e6c3dd8822f2a8ab8bcd1a7434db7b202291e3d8de407e4629bdfc1afef507b57da4bc4a715d57b8d75915ce4b623189269083824c35d8e02d49d3e8909cceee
+EBUILD qxlsx-1.4.4.ebuild 1122 BLAKE2B 5459d5af1c8e07fe7c2c87be4cdf1db10e87e58a3feb4355689a79d2277353262b4e8dcae899483be90438200f5c21bd59819e848559ebefbe0c72c0d93bc5b7 SHA512 3887a950077b7624debb4e2764c65dfc73aed99a203cecae67dc8cee046b534c7650aac099795d194356d5a33cdf59f00eeb8feaeca1d371cbdef670b01dcf4f
+MISC metadata.xml 451 BLAKE2B 72b39f0c97bb2d329e87abf678364a963a0e1cceda24106ed304f50258418595349f2b88ad5d34b82677dda655d20b05176d7bd8b2e2ca2215bcf1264b5412cc SHA512 5e9172c378f82bd9fbe16f8acbc877934ebac97d5603ad471f5ad0e4c729f69fb7942125ad7cd70047a28b78b63f3fc670023018cee113061ed2a668c5fd2897
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-libdir.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-libdir.patch
new file mode 100644
index 000000000000..ffdf8483f41a
--- /dev/null
+++ b/dev-libs/qxlsx/files/qxlsx-1.4.4-libdir.patch
@@ -0,0 +1,26 @@
+From 5d1059941f85365019ed08254e79abdb4ba80ee5 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov@google.com>
+Date: Sun, 4 Sep 2022 01:22:30 +0100
+Subject: [PATCH] Install library to the correct lib dir
+
+---
+ QXlsx/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
+index a6b1944..fc32918 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,9 +181,9 @@ set_target_properties(QXlsx PROPERTIES
+ 
+ install(TARGETS QXlsx
+     EXPORT QXlsxTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    RUNTIME DESTINATION bin COMPONENT runtime
+-    ARCHIVE DESTINATION lib COMPONENT devel
+-    PUBLIC_HEADER DESTINATION include/QXlsx COMPONENT devel
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
++    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/QXlsx COMPONENT devel
+ )
+ 
+ install(EXPORT QXlsxTargets
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtdefs.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-qtdefs.patch
new file mode 100644
index 000000000000..15795c645d47
--- /dev/null
+++ b/dev-libs/qxlsx/files/qxlsx-1.4.4-qtdefs.patch
@@ -0,0 +1,24 @@
+From 8e83402db866ae7a67582da28aa68c83545f13c8 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov@google.com>
+Date: Fri, 26 Aug 2022 01:36:53 +0100
+Subject: [PATCH] Don't force Qt definitions onto users
+
+It breaks users who use "signals" keyword and convert const char* to
+QString.
+---
+ QXlsx/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
+index aa774b1..a6b1944 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -140,7 +140,7 @@ add_library(QXlsx
+ 
+ add_library(QXlsx::QXlsx ALIAS QXlsx)
+ 
+-target_compile_definitions(QXlsx PUBLIC
++target_compile_definitions(QXlsx PRIVATE
+     -DQT_NO_KEYWORDS
+     -DQT_NO_CAST_TO_ASCII
+     -DQT_NO_CAST_FROM_ASCII
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-qtversion.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-qtversion.patch
new file mode 100644
index 000000000000..f94aa6e46414
--- /dev/null
+++ b/dev-libs/qxlsx/files/qxlsx-1.4.4-qtversion.patch
@@ -0,0 +1,92 @@
+commit e3565f2b3999ead739066b33fa0fd346eb072d87
+Author: Alexey Sokolov <sokolov@google.com>
+Date:   Sun Oct 2 22:46:03 2022 +0100
+
+    Support installing qt5 and qt6 versions in parallel
+
+diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
+index 5640d8a..8d34020 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,8 +15,8 @@ include(GNUInstallDirs)
+ 
+-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui REQUIRED)
+ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui REQUIRED)
++set(EXPORT_NAME QXlsxQt${QT_VERSION_MAJOR})
+ 
+-if (QT_MAJOR_VERSION EQUAL 6)
++if (QT_VERSION_MAJOR EQUAL 6)
+     set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
+ else()
+     set(CMAKE_CXX_STANDARD 11 CACHE STRING "")
+@@ -166,7 +167,7 @@ if (BUILD_SHARED_LIBS)
+     target_compile_definitions(QXlsx PUBLIC QXlsx_SHAREDLIB)
+ endif()
+ 
+-target_link_libraries(${PROJECT_NAME}
++target_link_libraries(QXlsx
+    Qt${QT_VERSION_MAJOR}::Core
+    Qt${QT_VERSION_MAJOR}::GuiPrivate
+ )
+@@ -180,39 +181,38 @@ PUBLIC
+ )
+ 
+ set_target_properties(QXlsx PROPERTIES
+-    EXPORT_NAME QXlsx
++    OUTPUT_NAME ${EXPORT_NAME}
+     VERSION ${PROJECT_VERSION}
+     SOVERSION 0.${PROJECT_VERSION}
+     PUBLIC_HEADER "${QXLSX_PUBLIC_HEADERS}"
+ )
+ 
+ install(TARGETS QXlsx
+-    EXPORT QXlsxTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    EXPORT ${EXPORT_NAME}Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
+     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/QXlsx COMPONENT devel
+ )
+ 
+-install(EXPORT QXlsxTargets
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QXlsx/
+-    FILE QXlsxTargets.cmake
++install(EXPORT ${EXPORT_NAME}Targets
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}/
++    FILE ${EXPORT_NAME}Targets.cmake
+     NAMESPACE QXlsx::
+     COMPONENT devel
+ )
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/qxlsx-config.cmake.in
+-    ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfig.cmake
++    ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}Config.cmake
+     @ONLY
+ )
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/qxlsx-config-version.cmake.in
+-    ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfigVersion.cmake
++    ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}ConfigVersion.cmake
+     @ONLY
+ )
+ install(
+     FILES
+-        ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfig.cmake
+-        ${CMAKE_CURRENT_BINARY_DIR}/QXlsxConfigVersion.cmake
+-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/QXlsx/
++        ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}Config.cmake
++        ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}ConfigVersion.cmake
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}/
+ )
+-
+ include(CPackConfig)
+diff --git a/QXlsx/cmake/modules/qxlsx-config.cmake.in b/QXlsx/cmake/modules/qxlsx-config.cmake.in
+index 1aab813..d72276b 100644
+--- a/cmake/modules/qxlsx-config.cmake.in
++++ b/cmake/modules/qxlsx-config.cmake.in
+@@ -10,5 +10,5 @@
+ SET(prefix "@CMAKE_INSTALL_PREFIX@")
+ SET(exec_prefix "@CMAKE_INSTALL_PREFIX@")
+ SET(QXlsx_FOUND "TRUE")
+-    
+-include("${CMAKE_CURRENT_LIST_DIR}/QXlsxTargets.cmake")
++
++include("${CMAKE_CURRENT_LIST_DIR}/@EXPORT_NAME@Targets.cmake")
diff --git a/dev-libs/qxlsx/files/qxlsx-1.4.4-soversion.patch b/dev-libs/qxlsx/files/qxlsx-1.4.4-soversion.patch
new file mode 100644
index 000000000000..eff465497930
--- /dev/null
+++ b/dev-libs/qxlsx/files/qxlsx-1.4.4-soversion.patch
@@ -0,0 +1,23 @@
+From 647acc3c4d431278f3d2867a41a06d57f1978e63 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov@google.com>
+Date: Sat, 8 Oct 2022 23:47:23 +0100
+Subject: [PATCH] Set soversion to version
+
+Since there's no ABI guarantees, as mentioned in #243
+---
+ QXlsx/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/QXlsx/CMakeLists.txt b/QXlsx/CMakeLists.txt
+index 8ddfd20..5640d8a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -182,7 +182,7 @@ PUBLIC
+ set_target_properties(QXlsx PROPERTIES
+     EXPORT_NAME QXlsx
+     VERSION ${PROJECT_VERSION}
+-    SOVERSION 0
++    SOVERSION 0.${PROJECT_VERSION}
+     PUBLIC_HEADER "${QXLSX_PUBLIC_HEADERS}"
+ )
+ 
diff --git a/dev-libs/qxlsx/metadata.xml b/dev-libs/qxlsx/metadata.xml
new file mode 100644
index 000000000000..12de43e54308
--- /dev/null
+++ b/dev-libs/qxlsx/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">QtExcel/QXlsx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/qxlsx/qxlsx-1.4.4.ebuild b/dev-libs/qxlsx/qxlsx-1.4.4.ebuild
new file mode 100644
index 000000000000..2abdd125d872
--- /dev/null
+++ b/dev-libs/qxlsx/qxlsx-1.4.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multibuild cmake
+
+DESCRIPTION="Excel file(*.xlsx) reader/writer library using Qt"
+
+HOMEPAGE="https://github.com/QtExcel/QXlsx"
+SRC_URI="https://github.com/QtExcel/QXlsx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+# soversion
+SLOT="0/0.${PV}"
+KEYWORDS="~amd64"
+
+IUSE="qt5 qt6"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5=
+	)
+	qt6? (
+		dev-qt/qtbase:6=[gui]
+	)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/QXlsx-${PV}/QXlsx"
+PATCHES=(
+	"${FILESDIR}/${P}-libdir.patch"
+	"${FILESDIR}/${P}-qtdefs.patch"
+	"${FILESDIR}/${P}-soversion.patch"
+	"${FILESDIR}/${P}-qtversion.patch"
+)
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	my_src_configure() {
+		local mycmakeargs=(
+			-DQT_VERSION_MAJOR="${MULTIBUILD_VARIANT/qt/}"
+		)
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 895e21b108ab..eda318cbaff4 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/geki2-KXL/Manifest b/games-action/geki2-KXL/Manifest
index 2366e744bf01..da08ce920cb5 100644
--- a/games-action/geki2-KXL/Manifest
+++ b/games-action/geki2-KXL/Manifest
@@ -1,6 +1,7 @@
 AUX geki2-KXL-2.0.3-cflags.patch 302 BLAKE2B 3dbb6703d2aca0d3d0331fba2b5e0a592ee9026b4cfbad5572ccfee3a754e0ed44c43ecb32d7e4f85accf3be6202e576b96c84f510b271156939e56125082008 SHA512 a1f4aa507c730b20723d1fbf213a6e12fb84a43596da21be50d8501a2164114b05bb771584b926fd343b841a62aab8053b06ef31fa9c1ba2f7358ff1bbf80b6d
-AUX geki2-KXL-2.0.3-clang.patch 466 BLAKE2B f9bcab21f2d72e10e162f3b9ca0a49d661b0d023a328a95acd323c387683db482931cc60e411fa7f3dbd03357c632cdfb3f73c20c169ec3a9820bd3559d91c78 SHA512 772f4030127fd7b624e55884dce1455bdc261b4e982f0f849b537a5b4397d9f7405ca32371158af2dfcf5a58cecab70561e7e45ff1041f2ef310c9d8792291c4
+AUX geki2-KXL-2.0.3-clang.patch 279 BLAKE2B d146d9ea36e25bbf899a71389e05c350df53ca00e54ff348c4590a44f446ee04c0e5cac7607cf1c51fcc9372da426ca87dd32f752eb4c154fd5163c285a9a02d SHA512 ca33f7e8c1a8e54a85d713ebd5ce2f98494d3339ae98c409a693b70a0491a94559c224edbca3e9823bf86a5b4f78d9dba18b81a5ad4a12d442513df4dcff055a
+AUX geki2-KXL-2.0.3-clang16.patch 287 BLAKE2B a4357c6ea20aa34e42cd41a3a32bf5cced1c0f3822c3646990ce1cffe4af423535f5e4c036f73247c5ed94c3dcc1a6fecca067f9ba39f8e2caf6e3f75925c4e6 SHA512 9defb506144e238e42e0ce0d18090f17e6011b945b1be2cba0ed0622c92831d21ae6f6d99bd779e8c1ce906141b87eb57646a7f3514c4e42a4adc3557608a445
 DIST geki2-KXL-2.0.3.tar.gz 708419 BLAKE2B 4b155a518e8dc662ff831c25ec83e3c2f912403f21ca048310b6351e489182ede7001804a5cfc6df475a8291fe37596483680c601e1149ec2968ba6837ecf6b2 SHA512 15d97e72f7490b0a1fa32f3ce002f99fe88183664cb3833bb6a2513de26a0dfb0cd2e723c59d0b6bdd9620b200da2e0e7612d44c02fd1be8721441417a9cb3e5
 DIST geki2-KXL.png 883 BLAKE2B 584a8d91d3c6c5fc924a1f8aed1e52c621dd68b0ea149d58ce17251e8caa0b092bd7cf880d3023338b97d3bbb2a30223ed303ed5f511f8e533fc0fa6b168aec2 SHA512 20d58e6cc3fd5b6283e6042f8660c73b5a938157ab871dd78e7a2ea2c1187ecae63bcfd46b885255181028531ebbba2c2bf93138e311adf7be10026497a85b74
-EBUILD geki2-KXL-2.0.3-r4.ebuild 1053 BLAKE2B 9d85a2561aa50f2723600b7efd476e3dd2573dfbe18f5a5314286e33cbd451319cf9df2f95192f6d8f47cade16f4945d64960526161eb00be023d01210b1b4b7 SHA512 00746762f9f49025b8fc68023874bba6dc9509bde28e3c42a35a2314c81c2bc01e6bdb5946fd790c1da4ec76dd069edabd42b6183d04cd98a90bcaaf66766c9e
+EBUILD geki2-KXL-2.0.3-r5.ebuild 1087 BLAKE2B 4b552fd1aa8ae9e41a05318131ba2a158cb83c6a15b233bb919ecd1acb3778979267bc1ed800f1b6f82d8ff0246fff5e50fd696f726caf5dfaab32d2dcd37d0c SHA512 0476eddd8f9542b79263860ed524475c331e62240474f29ecfee57ff26a6eb6ef874188b8cd402012f7f9ab2d9c303d1e789b462da0989803fb264d016e6c26f
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch
index 5d621e2de638..ff7f45fc09f3 100644
--- a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch
@@ -1,13 +1,7 @@
-Use void so that clang does not complain about missing (unused)
-return value, and also add missing string.h.
 https://bugs.gentoo.org/730848
 --- a/src/ranking.c
 +++ b/src/ranking.c
-@@ -1,2 +1,3 @@
- #include <pwd.h>

-+#include <string.h>

- #include "geki2.h"

-@@ -7,3 +8,3 @@
+@@ -7,3 +7,3 @@
   **********************/

 -int ScoreRanking(void)

 +void ScoreRanking(void)

diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang16.patch b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang16.patch
new file mode 100644
index 000000000000..fb7892f3b68d
--- /dev/null
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang16.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/874639
+--- a/src/geki2.h
++++ b/src/geki2.h
+@@ -11,2 +11,4 @@
+ #include <stdlib.h>

++#include <string.h>

++#include <time.h>

+ #include <sys/types.h>

+--- a/src/load.h
++++ b/src/load.h
+@@ -11,2 +11,3 @@
+ void LoadStageData(void);

++void UnLoadStageData(void);

+ 

diff --git a/games-action/geki2-KXL/geki2-KXL-2.0.3-r4.ebuild b/games-action/geki2-KXL/geki2-KXL-2.0.3-r5.ebuild
index 781b3790bff7..8f7fda9fe303 100644
--- a/games-action/geki2-KXL/geki2-KXL-2.0.3-r4.ebuild
+++ b/games-action/geki2-KXL/geki2-KXL-2.0.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,6 +26,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-cflags.patch
 	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_prepare() {
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 5d8c2049bb69..7e541d874844 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/kobodeluxe/Manifest b/games-arcade/kobodeluxe/Manifest
index be5211b9554a..b76d2dc01d1d 100644
--- a/games-arcade/kobodeluxe/Manifest
+++ b/games-arcade/kobodeluxe/Manifest
@@ -1,6 +1,8 @@
 AUX kobodeluxe-0.5.1-clang.patch 670 BLAKE2B bebded939e08b4a5184170c1527b4e9135e1c4be8ba3b788576778aab337f21eb96556ac7aefa8f3da76145abad1219a0840a8f58bf5dc8394b9b428f535b7c1 SHA512 7d36f7e537de05868107f34b1645db8f16e01317ab443d1cfb84eb4ab0ff8771e522539e37190bc555208e7ec996b90f4cfb130781232432d9d8a53fad18ca67
 AUX kobodeluxe-0.5.1-glibc2.10.patch 219 BLAKE2B 78c45966711049c7715ae0efd18289be82b4ea3965d85338ab81c79f07785273a6d767cf471deace08722b3ab9b8581a45201e30343b9e6ad784d820256b7dd9 SHA512 77624a0e18958d76c938e9d1becb72803079364612056687fb955cc912bda9b4443c7e6245abb6a32cc3ff96b04c63993e3cd114f73115254efe7b50f749a45c
 AUX kobodeluxe-0.5.1-glibc29.patch 2408 BLAKE2B c3abfe3594b2c43428d4e49a34285680a1ae2ac40106aac255aa2da846a67ecbcfcf8f5d8af48ca0adbf627d188f6a8941d6b4f75df3bdad39fff4d869b324e1 SHA512 de2014b9a0607ddb5853c63eb4c14daf4f14d2158697348d952305db09b4a8f84a3a918cd730085f01120b7cbcfae076afd73c559c1ddd46f5a9777c89e76897
+AUX kobodeluxe-0.5.1-midi-crash-fix.patch 482 BLAKE2B d58a2fb2e6fbf54d81b9493121b483dd03b88ebebb972665206f546f299fe767bd50e135780f593f3d3dd4db9c375f440db7fac83ed5fd1c5851f94e8e28ed09 SHA512 13802a7cbb0e6588e054ccc44581b25bd21e4d7461749e218416e80e5c010ad817bf47a73ca27a6b0ff6cf7a7b2909e0467d3460e64cf0c32fce448012538340
 DIST KoboDeluxe-0.5.1.tar.bz2 1781752 BLAKE2B d7f08ab9603b861f8992629bac9a65051a3c5fee6822f1951d57cbc5c31055a6cefeed098637dda84c0a1538645f47816848d767a4fa7916726b5784dfbc0414 SHA512 fc107e4367fd300574823aa40c68311d95de3a403d7c930963b8754aac14293f0624996fd77c4de0677921d11883047b68dd95df81eeb03078c37426ebd58afd
 EBUILD kobodeluxe-0.5.1-r3.ebuild 1287 BLAKE2B c9fa3c9613716f16c651528af844f4167a4c52ea76426b4c1b970a074871f054ba649ef3a0b97090ce600ee42bc544b9c968495faa9852d813b9827ab1b8c4ac SHA512 a6347dd89c4b5d72324340cb177d42e2efdd2374a81d820c6104e621a75186b6286cd051a87c52ad07fec0092e28bb9e129ee5f0906279eaed2fd1cf6fdb4885
+EBUILD kobodeluxe-0.5.1-r4.ebuild 1569 BLAKE2B b7a77871bc2f9ce1a79dd1c2015b5ff25bf886adc86bc162bee9f5304758d996762edecbf5e8d3d22f5233d03078e91e7f1d6ec64e5499ecdd5b40afcdb3d438 SHA512 ffd24c10068547d1bd25bb567055fd9614ae856e69b74e315c2788f8422d13c17ae43af659bb416947a541a78cdaddc1bdade7428affc3efa1c036b0853bff3d
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-midi-crash-fix.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-midi-crash-fix.patch
new file mode 100644
index 000000000000..0b0fd10d9b08
--- /dev/null
+++ b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-midi-crash-fix.patch
@@ -0,0 +1,13 @@
+diff -up KoboDeluxe-0.5.1/sound/a_midicon.c~ KoboDeluxe-0.5.1/sound/a_midicon.c
+--- KoboDeluxe-0.5.1/sound/a_midicon.c~	2015-06-03 20:31:31.000000000 +0200
++++ KoboDeluxe-0.5.1/sound/a_midicon.c	2015-06-03 20:47:40.836311461 +0200
+@@ -120,7 +120,8 @@ static inline void __press(unsigned ch,
+ {
+ 	m[ch].next[key] = -1;
+ 	m[ch].prev[key] = m[ch].last;
+-	m[ch].next[m[ch].last] = (char)key;
++	if (m[ch].last != -1)
++		m[ch].next[m[ch].last] = (char)key;
+ 	m[ch].last = (char)key;
+ }
+ 
diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r4.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r4.ebuild
new file mode 100644
index 000000000000..e3d86250f0f4
--- /dev/null
+++ b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop
+
+MY_P="KoboDeluxe-${PV/_/}"
+DESCRIPTION="An SDL port of xkobo, a addictive space shoot-em-up"
+HOMEPAGE="http://www.olofson.net/kobodl/"
+SRC_URI="http://www.olofson.net/kobodl/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
+IUSE="opengl"
+
+DEPEND="media-libs/libsdl[joystick]
+	media-libs/sdl-image[png]
+	opengl? ( virtual/opengl )
+"
+RDEPEND="${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc29.patch
+	"${FILESDIR}"/${P}-glibc2.10.patch
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-midi-crash-fix.patch
+)
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	unpack ./icons.tar.gz
+}
+
+src_prepare() {
+	default
+
+	# Fix paths
+	sed -i \
+		-e 's:\$(datadir)/kobo-deluxe:$(datadir)/kobodeluxe:' \
+		-e "s:\$(sharedstatedir)/kobo-deluxe/scores:${EPREFIX}/var/games/kobodeluxe:" \
+		configure || die "sed configure failed"
+
+	sed -i \
+		-e 's:kobo-deluxe:kobodeluxe:' \
+		data/gfx/Makefile.in \
+		data/sfx/Makefile.in || die "sed data/Makefile.in failed"
+}
+
+src_configure() {
+	econf $(use_enable opengl)
+}
+
+src_install() {
+	default
+
+	for size in 16 22 32 48 64 128; do
+		newicon -s "${size}" icons/KDE/icons/${size}x${size}/kobodl.png KoboDeluxe.png
+	done
+	make_desktop_entry kobodl "Kobo Deluxe" KoboDeluxe
+
+	keepdir /var/games/kobodeluxe
+	fowners -R :gamestat /var/games/kobodeluxe/ /usr/bin/kobodl
+	fperms g+s /usr/bin/kobodl
+	fperms -R g+w /var/games/kobodeluxe
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c24ee9652422..4ed01e1a08ca 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/blib/Manifest b/media-libs/blib/Manifest
index 07c228aeb01e..ed2a660b7d01 100644
--- a/media-libs/blib/Manifest
+++ b/media-libs/blib/Manifest
@@ -1,3 +1,4 @@
+AUX blib-1.1.7-deprecated.patch 409 BLAKE2B 8fd46eae8511441442f1da04e38b27dc63f03f485bb8610667cb162e29fdba51996de58ec8046e227c48e90e2ef6785edaeb7dfbea55338f7b10639194d33ed9 SHA512 7b1e845db80ff2071d4e20ed40b5f5349978a9e8a5f68fa09ca51a69dc596e4752c838092fc24bf8226da95acb1f34477a3ff5d4ac2bb2844e83bd7cc6e229f3
 DIST blib-1.1.7.tar.gz 570809 BLAKE2B 4b6c6738dd67a81b09ff0a280d3522d8cd41046b6eebe0ff4d6bf78df49fa3aa20382e0b02b3ee17c8c536fe34445a85a80433a39a87c2f0f650612fcd37914a SHA512 060fe2ff453c1dd073ff6105217618157da54416243b0f086a4f1324028b2fc222f6f732de1914d0e2e82df3565801b68d1ff49df4e6b89cd409bad73eb01ad6
-EBUILD blib-1.1.7-r2.ebuild 994 BLAKE2B 2f9c78c4600ccf51439ed6fc98cdff2df648c2203693111ee963a68e3680fb2d85d2e333a122c66dffc9a5afe8ceea71137fb412685836bf5de551427636a695 SHA512 73bfc1c89c2b9338c8061c7432f6042649200ccb2e6a08624167769c80202d148a24a06131aeab4d8befd14951969f333825678e2c8935afa069da3c00bbf0c9
+EBUILD blib-1.1.7-r3.ebuild 1078 BLAKE2B 71275b3dafd020a5bb627c5148677871e8fe2be567dc063a3278bf4a3ffd22a6655cddd3f3e1b58f1a00926094086386606aedb12d01b9063e0194cd678a0293 SHA512 27161f6947681f4ade56d37d891367dbb8b51a90c501b1e3ae69b4b3d61f63c4df513127583468712d4a5593ea29b98464a2cf5959fa5bf08cf1bed68f8e293a
 MISC metadata.xml 220 BLAKE2B 6f39345ea8474519439cc9768baf57bf07c0d8051eba252c30638ce35f30f8cbd1ecb06f7448893fa72ab9338630c83211fd366d66136b6ed090558fb376982c SHA512 3a2781821a74f9512a2b1fa55c8982a23f880b96b1707fdedf129d37685c2793eefe75a8080afe2bac64ed44d5f24648e6a25e163f87fe76a2b6be76b995647a
diff --git a/media-libs/blib/blib-1.1.7-r2.ebuild b/media-libs/blib/blib-1.1.7-r2.ebuild
deleted file mode 100644
index 972273ede564..000000000000
--- a/media-libs/blib/blib-1.1.7-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="blib is a library full of useful things to hack the Blinkenlights"
-HOMEPAGE="http://www.blinkenlights.de"
-SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aalib gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2:2
-	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
-	gtk? ( >=x11-libs/gtk+-2.4.4:2 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	# Drop DEPRECATED flags, bug #391105
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		blib/Makefile.am blib/Makefile.in \
-		gfx/Makefile.am gfx/Makefile.in \
-		modules/Makefile.am modules/Makefile.in \
-		test/modules/Makefile.am test/modules/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-directfb \
-		--disable-static \
-		$(use_enable aalib) \
-		$(use_enable gtk gtk2)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/blib/blib-1.1.7-r3.ebuild b/media-libs/blib/blib-1.1.7-r3.ebuild
new file mode 100644
index 000000000000..fd6cbbc9415e
--- /dev/null
+++ b/media-libs/blib/blib-1.1.7-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Library full of useful things to hack the Blinkenlights"
+HOMEPAGE="http://www.blinkenlights.de"
+SRC_URI="http://www.blinkenlights.de/dist/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="aalib gtk"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	aalib? ( media-libs/aalib )
+	gtk? (
+		app-accessibility/at-spi2-core:2
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-deprecated.patch
+)
+
+src_prepare() {
+	default
+
+	# drop DEPRECATED flags, bug #391105
+	sed -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		-i {blib,gfx,{,test/}modules}/Makefile.{am,in} || die
+}
+
+src_configure() {
+	local econfargs=(
+		$(use_enable aalib aa)
+		--disable-directfb
+		$(use_enable gtk)
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/blib/files/blib-1.1.7-deprecated.patch b/media-libs/blib/files/blib-1.1.7-deprecated.patch
new file mode 100644
index 000000000000..13e43aedadf1
--- /dev/null
+++ b/media-libs/blib/files/blib-1.1.7-deprecated.patch
@@ -0,0 +1,14 @@
+This disables deprecated functions, then proceeds to use newly
+deprecated functions. Given GTK2 is now EOL and unchanging,
+there's no reason to avoid these without migration to newer GTK.
+
+https://bugs.gentoo.org/874642
+https://bugs.gentoo.org/391105 (see also)
+--- a/test/test-module.c
++++ b/test/test-module.c
+@@ -23,5 +23,4 @@
+ #include <string.h>
+ 
+-#define GTK_DISABLE_DEPRECATED
+ 
+ #include <gtk/gtk.h>
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index f8c5e98c60fc..58772cc7e1c8 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -3,6 +3,6 @@ AUX xine-lib-1.2.12-fix-mmap-crash.patch 535 BLAKE2B 6b6782a7923754c29daf8263bc2
 DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
 EBUILD xine-lib-1.2.11-r2.ebuild 5281 BLAKE2B afa42f71427c1d9458d1b2b4fabd3ba68d0cf9c82dc69ae4daa17bfcf7ea5ea7699f7fe6956f4ed7885fa857b3c39b63079405f917a03ea9b1f0527595295e5c SHA512 f6fe20473016ff9643e67f67d511bd11f225c59d3f3aeb6bc345bc6d168fc1992010d834f56c3c61cc4e4003e2b4ebed66f6f1beb0548595b991ccbe2623ecb1
-EBUILD xine-lib-1.2.12-r4.ebuild 5480 BLAKE2B f6c38b5b27c33760d5b2b4a777e5e2f2c4a4d0e7d9966ab2228c58375c7e5ca13e98dd3d32ae69ac842ca05e5ca773f632ccf75b6ed667e6c4d1af875ff2815b SHA512 5e598bb89ce097cba3cf14b8c4875c431d5bb5d828005bc401753fa3ec276889a1ec44194245f3880c2751429551d2bfcd89f387e86a96eb6104d547438bab13
-EBUILD xine-lib-1.2.9999.ebuild 5377 BLAKE2B ec30a8d0052e49519fe67f0a200cb0423db0ad12f63af07850ddc0d9b5175acd3b81457b4935ef3ec11a9188cca5962f957e3beb4e7f4b70931a1e9b9eb94969 SHA512 1d1ae4feba2c7e84dbe333bd035f5a61e43a12169b94d2216f4d27483559f5277120e4912a8c0a4ddf296fbafc26ae556bb9ea2a5d0377b257f6c76073cd402f
+EBUILD xine-lib-1.2.12-r4.ebuild 5482 BLAKE2B 10a1849a047646b23fa62af7b95442c78fad0c65dbaf27a58212d25648485d3e6452353ef33f132374d15bd9b78137ffa401f9789f7799e50fe88df8478d3dfa SHA512 015585840acc62f016217bd31517f4fc6462ca8d2eefa246d69ab03f6379ea7c107b3446533c33d0250e819a998e826aeac2860cfccdc13eedd0e2c4b18e1d4d
+EBUILD xine-lib-1.2.9999.ebuild 5377 BLAKE2B b5af78172db530d865874fb2fb90b51a9a850e980ecda40a4b6f6d8d358bc923d3ec7e320be888cf0e86d92d247408400994c2bdeca4a3fffed8e9ced5f98b9b SHA512 15e1a316b38c5876b2f7a7426927201e79537ee338bf7e055989d95709f2406160e1f00923fcbc5abe703c5186aab52de69f2f01a643e074742e0902c42b98fd
 MISC metadata.xml 2784 BLAKE2B 636cdb7ad93aa8941a36a23b9bc70cde66878f7628cab7e697582733b8ce85d58c09a5c63fcfbc009f098001399407055c449412dabd52178548c0c41d572c5a SHA512 5b644f501953bbc34020f0955991363d558a23a9610eb37f46499bd2d5415849a10a3306625e50d5cfdf094e67a38da5175bb981387841bae63c33ae74e17757
diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
index eeef0113e84e..9269a240c709 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r4.ebuild
@@ -94,7 +94,7 @@ RDEPEND="
 	X? (
 		x11-libs/libX11
 		x11-libs/libXext
-		x11-libs/libxcb
+		x11-libs/libxcb:=
 	)
 	xinerama? ( x11-libs/libXinerama )
 	xv? ( x11-libs/libXv )
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 3b2359bfed24..2935680fc418 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic libtool
 
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9fe6dda7e364..be637c972402 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/jack-example-tools/Manifest b/media-sound/jack-example-tools/Manifest
new file mode 100644
index 000000000000..34bb50dd64a4
--- /dev/null
+++ b/media-sound/jack-example-tools/Manifest
@@ -0,0 +1,3 @@
+DIST jack-example-tools-3.tar.gz 125686 BLAKE2B b0fbb68f2a21711113516a6754e13230b009f21d73a4fa8b94f2e8e81b71f6d95c246eae88d479daf3f4f6e0ccf3eb8295ff1b1b76603676c6d8b09d0594f9db SHA512 2fe33c4fc294a4e4e2c0c271d5e2f28bac162939c25536902c772fcc919d2a0923fcefd27305f3fce283edfe043d2da7773b66988a1f14f8670d5cac90c8d7e9
+EBUILD jack-example-tools-3.ebuild 1414 BLAKE2B 2ce0b80cf4f3da2265bfe10d1fee8981ed1b33ff279809a2257c003dab451e99c1472cbe47c458e64789e338bce085a4b18c6d90e7afba62b8c3ce7764dc1e5c SHA512 96d828a993a4af2aa12e284e21ca807538407aa4108d03c46b6c98cb6731d869dba7d5e70c4b84aa0b30b5edb0819ba4c252b7d268b73bbf42843987ab7bece9
+MISC metadata.xml 731 BLAKE2B 7c83aa6f9f1e4c7c43d6104cd089a69755c72577e728592ccedb8153687257c267609636832797d7dbfdac7f73bf55a3f0a195baaac442bf919f783589fb98b2 SHA512 1db07c3ba14f3a096c333630690e2b6bb1fd060fafe9aa132d7e455a5f89351b3074112eaac24bddf0e8697c0a8008ca4de192c78947cacea43a3aa2b71ef492
diff --git a/media-sound/jack-example-tools/jack-example-tools-3.ebuild b/media-sound/jack-example-tools/jack-example-tools-3.ebuild
new file mode 100644
index 000000000000..387a9b8f5083
--- /dev/null
+++ b/media-sound/jack-example-tools/jack-example-tools-3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Official examples and tools from the JACK project"
+HOMEPAGE="https://jackaudio.org/"
+SRC_URI="https://github.com/jackaudio/jack-example-tools/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ zalsa? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="alsa jack-net jack-netsource opus +readline sndfile zalsa"
+
+RDEPEND="
+	virtual/jack
+	alsa? (
+		media-libs/alsa-lib
+		media-libs/libsamplerate
+	)
+	jack-net? (
+		|| (
+			media-sound/jack2[libsamplerate]
+			media-video/pipewire[jack-sdk(-)]
+		)
+	)
+	jack-netsource? (
+		media-libs/libsamplerate
+		opus? ( media-libs/opus[custom-modes] )
+	)
+	readline? ( sys-libs/readline:= )
+	sndfile? ( media-libs/libsndfile )
+	zalsa? (
+		media-libs/alsa-lib
+		media-libs/zita-alsa-pcmi
+		media-libs/zita-resampler:=
+	)
+	!<media-sound/jack-audio-connection-kit-0.126.0
+	!<media-sound/jack2-1.9.21"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature alsa alsa_in_out)
+		$(meson_feature jack{-,_}net)
+		$(meson_feature jack{-,_}netsource)
+		$(meson_feature readline readline_support)
+		$(meson_feature sndfile jack_rec)
+		$(meson_feature zalsa)
+		$(usex jack-netsource \
+			$(meson_feature opus opus_support) \
+			-Dopus_support=disabled)
+	)
+
+	meson_src_configure
+}
diff --git a/media-sound/jack-example-tools/metadata.xml b/media-sound/jack-example-tools/metadata.xml
new file mode 100644
index 000000000000..3b4295e2da37
--- /dev/null
+++ b/media-sound/jack-example-tools/metadata.xml
@@ -0,0 +1,20 @@
+<?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>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="jack-net">Build jack_net_* example clients</flag>
+		<flag name="jack-netsource">Build jack_netsource for configuring network sources</flag>
+		<flag name="zalsa">Build the zalsa internal client using <pkg>media-libs/zita-resampler</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">jackaudio/jack-example-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 16d6c10dbf01..95f2d1529dae 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,4 +1,7 @@
+AUX jack2-1.9.21-python3.11.patch 635 BLAKE2B 8e9168c2d44e087c20f0b6b1ac7a08bf957a5427f3c396e88ba3d0918e636500265e8182a39a8831b9cd37f9db3e86ff3ff6222e191d18f110b964a36c446982 SHA512 be0bb5fb4d65f99dc8355393a02c79ac36f64f7bb0e36a0e6c08ca99cc5c5340a5457fa13e7937d70349a4e0b86074c69232f69cab26779a7e53de5710b4b7fe
 DIST jack2-1.9.19.tar.gz 988780 BLAKE2B 37536e23f97ea8a3bf62fe77e35a4a40c5d88cea1197a2f72c4ab31cbbc689fcf99a1d51bb0ee96122c618464eefe1ca8479dc53ab7de9e6570cb4009cf2a7a1 SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
+DIST jack2-1.9.21.tar.gz 1006157 BLAKE2B 052486300bd17860964115427d4b5755ce7a4e4607bf9eb4e2b94d5b0cc61cf6a6b56d3a3eae9e91a1195a3316dd1f1ec1357275803805957e4b6f7a76424e24 SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557
 EBUILD jack2-1.9.19.ebuild 2406 BLAKE2B 43cef82b53dc0f37ca9114e90a1419031ba5bf7fa7fd02f8f5a5c9e87c3b030b97b16c063f20f593740c88ec077f4690d493059cd827e3e86ee63e155ff2e8fa SHA512 1e6ae9ceb32b43b2008d9f2687a8e8dbc42f6a099d36c096b5a30aa6c9b4e1cf9e494b343724454e0fc2f764fea195aec6a7466ecbdba953e2d024c1a51a21dd
-EBUILD jack2-9999.ebuild 2412 BLAKE2B 65194019b04dc690d6010c8ac55c5988cea668126a8dc70ee9f263bd4836ab24d2a5b415dba4c29b184a85bff6291a8ddef288c0241613775104abe8171125a5 SHA512 62abc0b9716462d37c5625bfd6ec2b9d1fe1e2598400a0c33b9bd5d0d365378339d1a907084e1803baacf85768255c3f064b0a865d25a2d0292dbea33753f24d
-MISC metadata.xml 558 BLAKE2B ed8d67f5415217b100f387357fc1aab1cbe86e85b13c3b62a0a2f9635a69393cae4448cbee23f98cf82c1b4fe8ead065bd454ba2e1bbc3ec792b04fdd4f41801 SHA512 fe988bb462c83872e12031977f135454b331e41ec293cdb7a3247a52b170321d5c438fe5fdc54be93d7dc81a72ecd6e963a901e31d1bd40e9aa9644871b85bf9
+EBUILD jack2-1.9.21.ebuild 2598 BLAKE2B 30670a94216baba2d8ba5efde9fd1f8039256e864d180545f7c4d9150bffad016306b30c88efb0b3f03594f804a7a9ff79d83ec101b16178516ccbd3111774bf SHA512 c4c70f5f8afdbaa4a66a955118b939f3ecb8bcda38da2f777b8e7c9460ccd3a2fea39e0280e5750420aeb1874f37598d28d73b79b8ee3defb626d54b83e712df
+EBUILD jack2-9999.ebuild 2447 BLAKE2B 7d8a8a69e3bc2e15e355ee9a6ea43cb5673024d1e540bda2e5b447ba1dd3e4c09de9190cd346f302c7ff0c9acfc275fee5b861218a5a43ac22717acc4167c614 SHA512 4c7523fcc1e0116aadce1f92b9441f0bff768483942513bfd043223ee5b78e09f138db60be9599ec624321632278dcdf5fd65d2825dafbc89d12b4d5fd0e5167
+MISC metadata.xml 780 BLAKE2B 2cbd15be73cfc17162ab0cd6d5311bb4ab48f19dae7224df11712a9ab91fbbbba383e80fe3c99f3a1bb0ee91015144799f58652c782bce1405d5b7a4f8e203ee SHA512 ac8d68929de1d11a39d89ca0ccc0e330790596af7f58fe5305c328dddc74438ec465beca11cce7244e8f2421a446aab900b90b018dd73d688dae7062d26d0e16
diff --git a/media-sound/jack2/files/jack2-1.9.21-python3.11.patch b/media-sound/jack2/files/jack2-1.9.21-python3.11.patch
new file mode 100644
index 000000000000..f4aafcf16aed
--- /dev/null
+++ b/media-sound/jack2/files/jack2-1.9.21-python3.11.patch
@@ -0,0 +1,19 @@
+'U' is default and deprecated since python-3.3, becomes a failure in 3.11.
+
+Just a quick fix (rather than bump waf) while waiting for upstream's
+plans to migrate to meson:
+https://github.com/jackaudio/jack2/issues/898
+--- a/waflib/ConfigSet.py
++++ b/waflib/ConfigSet.py
+@@ -314,3 +314,3 @@
+ 		tbl = self.table
+-		code = Utils.readf(filename, m='rU')
++		code = Utils.readf(filename, m='r')
+ 		for m in re_imp.finditer(code):
+--- a/waflib/Context.py
++++ b/waflib/Context.py
+@@ -664,3 +664,3 @@
+ 	try:
+-		code = Utils.readf(path, m='rU', encoding=encoding)
++		code = Utils.readf(path, m='r', encoding=encoding)
+ 	except EnvironmentError:
diff --git a/media-sound/jack2/jack2-1.9.21.ebuild b/media-sound/jack2/jack2-1.9.21.ebuild
new file mode 100644
index 000000000000..a4ebc078d4c1
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.21.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+else
+	SRC_URI="https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="https://jackaudio.org/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="2"
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
+
+DEPEND="
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
+	metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${DEPEND}
+	dbus? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+		')
+	)
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit
+	!media-video/pipewire[jack-sdk(-)]"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+# tools were formerly provided here, pull to maintain expectations
+PDEPEND="tools? ( media-sound/jack-example-tools )"
+
+DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.21-python3.11.patch
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang waf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# clients crash if built with lto
+	# https://github.com/jackaudio/jack2/issues/485
+	filter-lto
+
+	local wafargs=(
+		--alsa=$(usex alsa)
+		--celt=no
+		$(usev classic --classic)
+		--db=$(usex metadata)
+		$(usev dbus --dbus)
+		--doxygen=$(multilib_native_usex doc)
+		--firewire=$(usex ieee1394)
+		--iio=no
+		--opus=$(usex opus)
+		--portaudio=no
+		--samplerate=$(usex libsamplerate)
+		--winmme=no
+
+		# obsolete options, migrated to media-sound/jack-example-tools
+		# and will be removed entirely next version
+		--example-tools=no
+		--readline=no
+		--sndfile=no
+		--zalsa=no
+	)
+
+	waf-utils_src_configure "${wafargs[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	use dbus && python_fix_shebang "${ED}"/usr/bin/jack_control
+}
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index eb214ebbb404..49be304b89f7 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -1,97 +1,102 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
+inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
 
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="https://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/archive/v${MY_PV}/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="https://jackaudio.org/"
 
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="2"
+IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( classic dbus )"
 
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
+DEPEND="
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	dbus? (
 		dev-libs/expat[${MULTILIB_USEDEP}]
 		sys-apps/dbus[${MULTILIB_USEDEP}]
 	)
-	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
-	metadata? ( sys-libs/db:* )
+	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
+	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
+	metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
 	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	dbus? (
+		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-python/dbus-python[${PYTHON_USEDEP}]
 		')
 	)
 	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
+	!media-sound/jack-audio-connection-kit
+	!media-video/pipewire[jack-sdk(-)]"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+# tools were formerly provided here, pull to maintain expectations
+PDEPEND="tools? ( media-sound/jack-example-tools )"
 
 DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.21-python3.11.patch
+)
+
 src_prepare() {
 	default
+
 	python_fix_shebang waf
 	multilib_copy_sources
 }
 
 multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
+	# clients crash if built with lto
+	# https://github.com/jackaudio/jack2/issues/485
+	filter-lto
+
+	local wafargs=(
+		--alsa=$(usex alsa)
 		--celt=no
-		--db=$(usex metadata yes no)
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes no)
+		$(usev classic --classic)
+		--db=$(usex metadata)
+		$(usev dbus --dbus)
+		--doxygen=$(multilib_native_usex doc)
+		--firewire=$(usex ieee1394)
 		--iio=no
-		--opus=$(usex opus yes no)
+		--opus=$(usex opus)
 		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
+		--samplerate=$(usex libsamplerate)
 		--winmme=no
 	)
 
-	waf-utils_src_configure ${mywafconfargs[@]}
+	waf-utils_src_configure "${wafargs[@]}"
 }
 
 multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+	waf-utils_src_compile
 }
 
 multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+	waf-utils_src_install
 }
 
 multilib_src_install_all() {
-	python_fix_shebang "${ED}"
+	use dbus && python_fix_shebang "${ED}"/usr/bin/jack_control
 }
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml
index 0c2531717ee9..70cba767c741 100644
--- a/media-sound/jack2/metadata.xml
+++ b/media-sound/jack2/metadata.xml
@@ -1,16 +1,21 @@
 <?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>
 	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">jackaudio/jack2</remote-id>
-	</upstream>
 	<use>
 		<flag name="classic">Enable building of jackd</flag>
 		<flag name="metadata">Enable metadata API</flag>
 		<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
+		<flag name="tools">Pull basic tools (e.g. jack_lsp/connect) from <pkg>media-sound/jack-example-tools</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jackaudio/jack2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d6dd2cb36e4a..b0a2d66c78af 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d90dc6b77487..43c25db73d32 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Nov 2022 20:39:53 +0000
+Sat, 05 Nov 2022 02:39:53 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c46c9d385abf..522fb6a2f05f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 536084 BLAKE2B c89e49fb5e75661a7da4bc1a8267e8936701fe518e99a96ea46c267fe11ac6fcc34a3029874ea964f0a67189423224c5aba6dc5cc7a56cf0d5889ea2d47d781f SHA512 75913d485440890ef20577369af3828f92411599dd916f9c5792517c2a36a196afc4bb5153abea2e3a2bc4b763ff2159dd5b7d79a6de88fdec6368ba79776c6f
-TIMESTAMP 2022-11-04T20:39:56Z
+TIMESTAMP 2022-11-05T02:39:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNleJxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNlzP5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCWOQ/+IKv6ZOGMYXXqz4JhjhGMPuMiUhCkaDQYOa4wZAJxr6qSJ1YqoyWhp47p
-w6lD7H0uCSDdufZN5/5ZcuiF8K9zuaq5EZhstKkzpkan87GQ+QwOw0nkWJi7zw8r
-1NuA5/jszhjypWursYZOAljYJMguVz838w9VbROsAVdl/UDZB337Q+3NZl2rYEVk
-vZpAr/G4Ha5ZfzwY85dSalQevomMqpQr/uHufw1cYeY7s4z3eVEQr+mSEO5h1CeF
-GSUpLN2GLnNFRuM2jvzVpYLDXQ6Buy4paDT/1BH0rkdtgFe9zFlqoRAg981TCRw0
-ZEs27s6Xb+Yza/4ALQbDk8BUqve6rmXfCNAPre5LngQFVLY6edxoyeScWvK8LidR
-TFcyLJz/Ou5DDhKVWo4dcsf/OTTWJMboSWqI9p4GMq0Lzrcc3aSDtW+9iX8QiUSw
-fbJTBuLP3cRe6V/uwqzhnTSylEKvc2Kr58ebzqa0Znl5V3xaP3pbvioWjyo/0sqO
-+pOYXsXIBh8yfcoK7GgzrYjhd3gGHrFwX5Cy1NZfXmjYDiO37TtQY2zLLIsMmkXM
-HqJeh0yhZiyFiKd64j01WnSw0ma/8QNJ2o75VtMA0hp3EudLka6oUf9DJrP8mmlU
-QJ5ZvKnKkgFOjknKArQ8MPCwe9hjkVYhqA5HVwNYCbnruwQjJWk=
-=x8lz
+klCHGw/+OS71ytFTjpaz9smXst/0wsEZI4LcNgziamsmEscrlGmcmePdJYWK2yL1
+gIcnwlBOjUZHLdWxtCF3wZN2WlLTivBxXeuP7WWjLZT1ySUF6uKII7otgbWrUBxr
+Rbo0aWCckfwFaXFmA1or16VNE05NDyB0WQxLS8BDkNJoWXXclCfFPSFHx5oJ9MIZ
+nabH8aUUY7thyUzRgkqQOp26ESI1OUODR9C2kU7pD5qzu/WNHV800WZbmmYlUQ00
+6XF422BcQ/oJrRJvdx+R7inbMT37aaC9FXsw0HCTtKM4vzKaVvy7zC4PnRxnhYvR
+Zn5xVvMb10pPYcNiiNieJUmeM+rbb+PNUl1Nb7YbcrMWILKjiEuUop6zuCdQsO0q
+sfkDV6ezDujVu0J/w+5e/DMaszQiKSgr4kvM90/Jgi4hD6TcaQ2444WW9bIWvZeZ
+ioZhZQiC2sTP4M4hCWqFPiK7qk8tkzB7wciHFo936UHa7Vk4KTQKH2iVxewMtD8w
+51oLKTE1/f1KdnmiMKkYkKS2KInPV276TaCAVnzlH9f3WesriUbZ2wuIa/oWP3H5
+kf7ZXePtiai70rxqI7luzBr7dQSPs6wF2NtWs1KxqUt12OrgQZ9K7OLI4kLRUxdo
+/J9LYthAPqWNodIAGSzHOuZjBpeFgot1qmL6j2JAO626teIcpBw=
+=A3bQ
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d90dc6b77487..43c25db73d32 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Nov 2022 20:39:53 +0000
+Sat, 05 Nov 2022 02:39:53 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index dcb3777c30f9..0df79fb93c3b 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 3edf5974e8d7..cddcdce4dc33 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/helm-3.10.1 b/metadata/md5-cache/app-admin/helm-3.10.1
new file mode 100644
index 000000000000..6b2f3afc816f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/helm-3.10.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Kubernetes Package Manager
+EAPI=8
+HOMEPAGE=https://github.com/helm/helm https://helm.sh
+INHERIT=bash-completion-r1 go-module
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=Apache-2.0
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/helm/helm/archive/v3.10.1.tar.gz -> k8s-helm-3.10.1.tar.gz https://dev.gentoo.org/~williamh/dist/helm-3.10.1-deps.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	15312495dc4fd84f8c37bbe228ea2abd	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=e643a2917802b776f3eec4ed0eeb78f7
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.12-r1 b/metadata/md5-cache/app-admin/sudo-1.9.12-r1
new file mode 100644
index 000000000000..2d21cd9e5985
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.9.12-r1
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-sudo ) sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=8
+HOMEPAGE=https://www.sudo.ws/
+INHERIT=pam libtool tmpfiles toolchain-funcs verify-sig
+IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris
+LICENSE=ISC BSD
+RDEPEND=sys-libs/zlib:= virtual/libcrypt:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1:= sasl? ( dev-libs/cyrus-sasl net-nds/openldap:=[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sys-libs/libselinux ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
+REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
+SLOT=0
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.12.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.12.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.12.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.12.tar.gz.sig )
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=fb992ad9d191469a14231be8cd130ea5
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 41f69a7d8cef..5aa5a519b3ce 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/rear-2.7 b/metadata/md5-cache/app-backup/rear-2.7
index e82eb8e6ad00..77d347c27484 100644
--- a/metadata/md5-cache/app-backup/rear-2.7
+++ b/metadata/md5-cache/app-backup/rear-2.7
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=http://relax-and-recover.org/ https://github.com/rear/rear/
 INHERIT=optfeature udev
 IUSE=udev
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-cdr/cdrtools app-shells/bash net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/sed sys-apps/util-linux sys-block/parted sys-boot/syslinux udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://github.com/rear/rear/archive/2.7.tar.gz -> rear-2.7.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=67a8e2cbb7bb04963a1872e9153a0b0f
+_md5_=1ecd14de66248ca9a27f2733ce23b5cb
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 3282028fb17e..e6da41821168 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/apptainer-1.1.3 b/metadata/md5-cache/app-containers/apptainer-1.1.3
new file mode 100644
index 000000000000..5db146537636
--- /dev/null
+++ b/metadata/md5-cache/app-containers/apptainer-1.1.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=app-crypt/gpgme >=dev-lang/go-1.17.6 dev-libs/openssl sys-apps/util-linux sys-fs/cryptsetup sys-fs/squashfs-tools sys-libs/libseccomp !suid? ( sys-fs/e2fsprogs[fuse] sys-fs/squashfuse )
+DESCRIPTION=The container system for secure high-performance computing
+EAPI=8
+HOMEPAGE=https://apptainer.org/
+INHERIT=linux-info toolchain-funcs
+IUSE=examples +network suid systemd
+KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=app-crypt/gpgme >=dev-lang/go-1.17.6 dev-libs/openssl sys-apps/util-linux sys-fs/cryptsetup sys-fs/squashfs-tools sys-libs/libseccomp !suid? ( sys-fs/e2fsprogs[fuse] sys-fs/squashfuse ) !sys-cluster/singularity
+SLOT=0
+SRC_URI=https://github.com/apptainer/apptainer/releases/download/v1.1.3/apptainer-1.1.3.tar.gz
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=4faa086daa749cee20cdbad56ea64aeb
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index b82becbe27aa..6f1440f4281a 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/ibus-m17n-1.4.10 b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.10
deleted file mode 100644
index 7a67d78077a9..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst
-DEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl )
-DESCRIPTION=M17N engine for IBus
-EAPI=8
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2-utils xdg
-IUSE=gtk nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) >=dev-db/m17n-db-1.7
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus-m17n/releases/download/1.4.10/ibus-m17n-1.4.10.tar.gz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=23309a21e808fd8b314ab6f7206a04ca
diff --git a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.13 b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.13
deleted file mode 100644
index d235d56a320e..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure postinst postrm preinst
-DEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl )
-DESCRIPTION=M17N engine for IBus
-EAPI=8
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2-utils xdg
-IUSE=gtk nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) >=dev-db/m17n-db-1.7
-SLOT=0
-SRC_URI=https://github.com/ibus/ibus-m17n/releases/download/1.4.13/ibus-m17n-1.4.13.tar.gz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=772e47982c0d8562dc9ae48d2d5b0c69
diff --git a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.17 b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.17
index 99efcccdf120..fe52766c1635 100644
--- a/metadata/md5-cache/app-i18n/ibus-m17n-1.4.17
+++ b/metadata/md5-cache/app-i18n/ibus-m17n-1.4.17
@@ -7,10 +7,10 @@ HOMEPAGE=https://github.com/ibus/ibus/wiki
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2-utils xdg
 IUSE=gtk nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-i18n/ibus dev-libs/m17n-lib gtk? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) >=dev-db/m17n-db-1.7
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus-m17n/releases/download/1.4.17/ibus-m17n-1.4.17.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=772e47982c0d8562dc9ae48d2d5b0c69
+_md5_=23309a21e808fd8b314ab6f7206a04ca
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.16.12 b/metadata/md5-cache/app-i18n/ibus-table-1.16.12
index 9cc16d430734..670dd7f26b48 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-1.16.12
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.16.12
@@ -7,7 +7,7 @@ HOMEPAGE=https://github.com/ibus/ibus/wiki
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2-utils python-single-r1 xdg
 IUSE=nls python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite(+)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) virtual/libiconv nls? ( virtual/libintl )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.16.12/ibus-table-1.16.12.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=df8c62047e2879990930f5dba183b1fb
+_md5_=a768dd00c267ad251af9d668b7652bcb
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.16.11 b/metadata/md5-cache/app-i18n/ibus-table-1.16.13
index 8b4ea68e1876..e5f10112dbcf 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-1.16.11
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.16.13
@@ -7,12 +7,12 @@ HOMEPAGE=https://github.com/ibus/ibus/wiki
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2-utils python-single-r1 xdg
 IUSE=nls python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite(+)] ) python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) virtual/libiconv nls? ( virtual/libintl )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.16.11/ibus-table-1.16.11.tar.gz
+SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.16.13/ibus-table-1.16.13.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a768dd00c267ad251af9d668b7652bcb
+_md5_=df8c62047e2879990930f5dba183b1fb
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.19.7 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.19.7
new file mode 100644
index 000000000000..037799750bde
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.19.7
@@ -0,0 +1,18 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] )
+DESCRIPTION=Completion input method for IBus
+EAPI=8
+HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2-utils python-single-r1 xdg
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite(+)] ) dev-libs/m17n-lib python_single_target_python3_8? ( app-i18n/ibus[python(+),python_targets_python3_8(-)] dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pyenchant[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-i18n/ibus[python(+),python_targets_python3_9(-)] dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pyenchant[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-i18n/ibus[python(+),python_targets_python3_10(-)] dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pyenchant[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) >=dev-db/m17n-db-1.7
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.19.7/ibus-typing-booster-2.19.7.tar.gz
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=00e7e2ac0d8312474428fb542606f864
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 2fa91bbcc59a..8b339ca2d776 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/starship-1.10.3 b/metadata/md5-cache/app-shells/starship-1.10.3
index 9717697df58b..10c1de199aa6 100644
--- a/metadata/md5-cache/app-shells/starship-1.10.3
+++ b/metadata/md5-cache/app-shells/starship-1.10.3
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://starship.rs/
 INHERIT=cargo flag-o-matic
 IUSE=debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense WTFPL-2 ZLIB
 SLOT=0
 SRC_URI=https://github.com/starship/starship/archive/refs/tags/v1.10.3.tar.gz -> starship-1.10.3.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/android_system_properties/0.1.4/download -> android_system_properties-0.1.4.crate https://crates.io/api/v1/crates/anyhow/1.0.62/download -> anyhow-1.0.62.crate https://crates.io/api/v1/crates/arc-swap/1.5.1/download -> arc-swap-1.5.1.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/async-broadcast/0.4.1/download -> async-broadcast-0.4.1.crate https://crates.io/api/v1/crates/async-channel/1.7.1/download -> async-channel-1.7.1.crate https://crates.io/api/v1/crates/async-executor/1.4.1/download -> async-executor-1.4.1.crate https://crates.io/api/v1/crates/async-io/1.8.0/download -> async-io-1.8.0.crate https://crates.io/api/v1/crates/async-lock/2.5.0/download -> async-lock-2.5.0.crate https://crates.io/api/v1/crates/async-recursion/0.3.2/download -> async-recursion-0.3.2.crate https://crates.io/api/v1/crates/async-task/4.3.0/download -> async-task-4.3.0.crate https://crates.io/api/v1/crates/async-trait/0.1.57/download -> async-trait-0.1.57.crate https://crates.io/api/v1/crates/atoi/1.0.0/download -> atoi-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/btoi/0.4.2/download -> btoi-0.4.2.crate https://crates.io/api/v1/crates/bumpalo/3.11.0/download -> bumpalo-3.11.0.crate https://crates.io/api/v1/crates/byte-unit/4.0.14/download -> byte-unit-4.0.14.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.2.1/download -> bytes-1.2.1.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/castaway/0.2.2/download -> castaway-0.2.2.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.22/download -> chrono-0.4.22.crate https://crates.io/api/v1/crates/clap/3.2.20/download -> clap-3.2.20.crate https://crates.io/api/v1/crates/clap_complete/3.2.4/download -> clap_complete-3.2.4.crate https://crates.io/api/v1/crates/clap_derive/3.2.18/download -> clap_derive-3.2.18.crate https://crates.io/api/v1/crates/clap_lex/0.2.4/download -> clap_lex-0.2.4.crate https://crates.io/api/v1/crates/clru/0.5.0/download -> clru-0.5.0.crate https://crates.io/api/v1/crates/cmake/0.1.48/download -> cmake-0.1.48.crate https://crates.io/api/v1/crates/combine/4.6.6/download -> combine-4.6.6.crate https://crates.io/api/v1/crates/compact_str/0.4.1/download -> compact_str-0.4.1.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.4/download -> concurrent-queue-1.2.4.crate https://crates.io/api/v1/crates/const_format/0.2.26/download -> const_format-0.2.26.crate https://crates.io/api/v1/crates/const_format_proc_macros/0.2.22/download -> const_format_proc_macros-0.2.22.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.4/download -> cpufeatures-0.2.4.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam/0.8.2/download -> crossbeam-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.10/download -> crossbeam-epoch-0.9.10.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.6/download -> crossbeam-queue-0.3.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.11/download -> crossbeam-utils-0.8.11.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/dashmap/5.3.4/download -> dashmap-5.3.4.crate https://crates.io/api/v1/crates/deelevate/0.2.0/download -> deelevate-0.2.0.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/dlv-list/0.3.0/download -> dlv-list-0.3.0.crate https://crates.io/api/v1/crates/downcast/0.11.0/download -> downcast-0.11.0.crate https://crates.io/api/v1/crates/dunce/1.0.2/download -> dunce-1.0.2.crate https://crates.io/api/v1/crates/dyn-clone/1.0.9/download -> dyn-clone-1.0.9.crate https://crates.io/api/v1/crates/either/1.8.0/download -> either-1.8.0.crate https://crates.io/api/v1/crates/enumflags2/0.7.5/download -> enumflags2-0.7.5.crate https://crates.io/api/v1/crates/enumflags2_derive/0.7.4/download -> enumflags2_derive-0.7.4.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/event-listener/2.5.3/download -> event-listener-2.5.3.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/filedescriptor/0.8.2/download -> filedescriptor-0.8.2.crate https://crates.io/api/v1/crates/filetime/0.2.17/download -> filetime-0.2.17.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fragile/1.2.1/download -> fragile-1.2.1.crate https://crates.io/api/v1/crates/futures-core/0.3.23/download -> futures-core-0.3.23.crate https://crates.io/api/v1/crates/futures-io/0.3.23/download -> futures-io-0.3.23.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-sink/0.3.23/download -> futures-sink-0.3.23.crate https://crates.io/api/v1/crates/futures-task/0.3.23/download -> futures-task-0.3.23.crate https://crates.io/api/v1/crates/futures-util/0.3.23/download -> futures-util-0.3.23.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/gethostname/0.2.3/download -> gethostname-0.2.3.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/git-actor/0.11.4/download -> git-actor-0.11.4.crate https://crates.io/api/v1/crates/git-attributes/0.3.3/download -> git-attributes-0.3.3.crate https://crates.io/api/v1/crates/git-bitmap/0.1.2/download -> git-bitmap-0.1.2.crate https://crates.io/api/v1/crates/git-chunk/0.3.1/download -> git-chunk-0.3.1.crate https://crates.io/api/v1/crates/git-config/0.7.1/download -> git-config-0.7.1.crate https://crates.io/api/v1/crates/git-date/0.1.0/download -> git-date-0.1.0.crate https://crates.io/api/v1/crates/git-diff/0.18.1/download -> git-diff-0.18.1.crate https://crates.io/api/v1/crates/git-discover/0.4.2/download -> git-discover-0.4.2.crate https://crates.io/api/v1/crates/git-features/0.22.3/download -> git-features-0.22.3.crate https://crates.io/api/v1/crates/git-glob/0.3.2/download -> git-glob-0.3.2.crate https://crates.io/api/v1/crates/git-hash/0.9.8/download -> git-hash-0.9.8.crate https://crates.io/api/v1/crates/git-index/0.4.3/download -> git-index-0.4.3.crate https://crates.io/api/v1/crates/git-lock/2.1.1/download -> git-lock-2.1.1.crate https://crates.io/api/v1/crates/git-object/0.20.3/download -> git-object-0.20.3.crate https://crates.io/api/v1/crates/git-odb/0.32.0/download -> git-odb-0.32.0.crate https://crates.io/api/v1/crates/git-pack/0.22.0/download -> git-pack-0.22.0.crate https://crates.io/api/v1/crates/git-path/0.4.1/download -> git-path-0.4.1.crate https://crates.io/api/v1/crates/git-quote/0.2.1/download -> git-quote-0.2.1.crate https://crates.io/api/v1/crates/git-ref/0.15.4/download -> git-ref-0.15.4.crate https://crates.io/api/v1/crates/git-refspec/0.1.1/download -> git-refspec-0.1.1.crate https://crates.io/api/v1/crates/git-repository/0.23.1/download -> git-repository-0.23.1.crate https://crates.io/api/v1/crates/git-revision/0.4.4/download -> git-revision-0.4.4.crate https://crates.io/api/v1/crates/git-sec/0.3.1/download -> git-sec-0.3.1.crate https://crates.io/api/v1/crates/git-tempfile/2.0.4/download -> git-tempfile-2.0.4.crate https://crates.io/api/v1/crates/git-traverse/0.16.4/download -> git-traverse-0.16.4.crate https://crates.io/api/v1/crates/git-url/0.7.3/download -> git-url-0.7.3.crate https://crates.io/api/v1/crates/git-validate/0.5.5/download -> git-validate-0.5.5.crate https://crates.io/api/v1/crates/git-worktree/0.4.3/download -> git-worktree-0.4.3.crate https://crates.io/api/v1/crates/guess_host_triple/0.1.3/download -> guess_host_triple-0.1.3.crate https://crates.io/api/v1/crates/hash_hasher/2.0.3/download -> hash_hasher-2.0.3.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/human_format/1.0.3/download -> human_format-1.0.3.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.46/download -> iana-time-zone-0.1.46.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indexmap/1.9.1/download -> indexmap-1.9.1.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-close/0.3.7/download -> io-close-0.3.7.crate https://crates.io/api/v1/crates/io-lifetimes/0.7.3/download -> io-lifetimes-0.7.3.crate https://crates.io/api/v1/crates/is_debug/1.0.1/download -> is_debug-1.0.1.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.3/download -> itoa-1.0.3.crate https://crates.io/api/v1/crates/js-sys/0.3.59/download -> js-sys-0.3.59.crate https://crates.io/api/v1/crates/jwalk/0.6.0/download -> jwalk-0.6.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.132/download -> libc-0.2.132.crate https://crates.io/api/v1/crates/libz-sys/1.1.8/download -> libz-sys-1.1.8.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.6/download -> linked-hash-map-0.5.6.crate https://crates.io/api/v1/crates/linux-raw-sys/0.0.46/download -> linux-raw-sys-0.0.46.crate https://crates.io/api/v1/crates/local_ipaddress/0.1.3/download -> local_ipaddress-0.1.3.crate https://crates.io/api/v1/crates/lock_api/0.4.8/download -> lock_api-0.4.8.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/mac-notification-sys/0.5.6/download -> mac-notification-sys-0.5.6.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memmap2/0.5.7/download -> memmap2-0.5.7.crate https://crates.io/api/v1/crates/memmem/0.1.1/download -> memmem-0.1.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.3/download -> miniz_oxide-0.5.3.crate https://crates.io/api/v1/crates/mockall/0.11.2/download -> mockall-0.11.2.crate https://crates.io/api/v1/crates/mockall_derive/0.11.2/download -> mockall_derive-0.11.2.crate https://crates.io/api/v1/crates/nix/0.23.1/download -> nix-0.23.1.crate https://crates.io/api/v1/crates/nix/0.25.0/download -> nix-0.25.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/notify-rust/4.5.8/download -> notify-rust-4.5.8.crate https://crates.io/api/v1/crates/nu-ansi-term/0.46.0/download -> nu-ansi-term-0.46.0.crate https://crates.io/api/v1/crates/num-derive/0.3.3/download -> num-derive-0.3.3.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.13.1/download -> once_cell-1.13.1.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/open/3.0.2/download -> open-3.0.2.crate https://crates.io/api/v1/crates/ordered-float/2.10.0/download -> ordered-float-2.10.0.crate https://crates.io/api/v1/crates/ordered-multimap/0.4.3/download -> ordered-multimap-0.4.3.crate https://crates.io/api/v1/crates/ordered-stream/0.0.1/download -> ordered-stream-0.0.1.crate https://crates.io/api/v1/crates/os_info/3.5.0/download -> os_info-3.5.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.3.0/download -> os_str_bytes-6.3.0.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/path-slash/0.2.1/download -> path-slash-0.2.1.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/pathsearch/0.2.0/download -> pathsearch-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.3.0/download -> pest-2.3.0.crate https://crates.io/api/v1/crates/pest_derive/2.3.0/download -> pest_derive-2.3.0.crate https://crates.io/api/v1/crates/pest_generator/2.3.0/download -> pest_generator-2.3.0.crate https://crates.io/api/v1/crates/pest_meta/2.3.0/download -> pest_meta-2.3.0.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/polling/2.3.0/download -> polling-2.3.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/predicates/2.1.1/download -> predicates-2.1.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.3/download -> predicates-core-1.0.3.crate https://crates.io/api/v1/crates/predicates-tree/1.0.5/download -> predicates-tree-1.0.5.crate https://crates.io/api/v1/crates/proc-macro-crate/1.2.1/download -> proc-macro-crate-1.2.1.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.43/download -> proc-macro2-1.0.43.crate https://crates.io/api/v1/crates/process_control/3.5.1/download -> process_control-3.5.1.crate https://crates.io/api/v1/crates/prodash/19.0.1/download -> prodash-19.0.1.crate https://crates.io/api/v1/crates/quick-error/2.0.1/download -> quick-error-2.0.1.crate https://crates.io/api/v1/crates/quick-xml/0.24.0/download -> quick-xml-0.24.0.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.6.0/download -> regex-1.6.0.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.27/download -> regex-syntax-0.6.27.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-ini/0.18.0/download -> rust-ini-0.18.0.crate https://crates.io/api/v1/crates/rustix/0.35.9/download -> rustix-0.35.9.crate https://crates.io/api/v1/crates/rustversion/1.0.9/download -> rustversion-1.0.9.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schemars/0.8.10/download -> schemars-0.8.10.crate https://crates.io/api/v1/crates/schemars_derive/0.8.10/download -> schemars_derive-0.8.10.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver/1.0.13/download -> semver-1.0.13.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/serde/1.0.144/download -> serde-1.0.144.crate https://crates.io/api/v1/crates/serde_derive/1.0.144/download -> serde_derive-1.0.144.crate https://crates.io/api/v1/crates/serde_derive_internals/0.26.0/download -> serde_derive_internals-0.26.0.crate https://crates.io/api/v1/crates/serde_json/1.0.85/download -> serde_json-1.0.85.crate https://crates.io/api/v1/crates/serde_repr/0.1.9/download -> serde_repr-0.1.9.crate https://crates.io/api/v1/crates/sha-1/0.10.0/download -> sha-1-0.10.0.crate https://crates.io/api/v1/crates/sha1/0.6.1/download -> sha1-0.6.1.crate https://crates.io/api/v1/crates/sha1/0.10.1/download -> sha1-0.10.1.crate https://crates.io/api/v1/crates/sha1-asm/0.5.1/download -> sha1-asm-0.5.1.crate https://crates.io/api/v1/crates/sha1_smol/1.0.0/download -> sha1_smol-1.0.0.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/shadow-rs/0.16.3/download -> shadow-rs-0.16.3.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/shell-words/1.1.0/download -> shell-words-1.1.0.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook/0.3.14/download -> signal-hook-0.3.14.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/smallvec/1.9.0/download -> smallvec-1.9.0.crate https://crates.io/api/v1/crates/socket2/0.4.6/download -> socket2-0.4.6.crate https://crates.io/api/v1/crates/starship-battery/0.7.9/download -> starship-battery-0.7.9.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strum/0.22.0/download -> strum-0.22.0.crate https://crates.io/api/v1/crates/strum_macros/0.22.0/download -> strum_macros-0.22.0.crate https://crates.io/api/v1/crates/syn/1.0.99/download -> syn-1.0.99.crate https://crates.io/api/v1/crates/systemstat/0.2.0/download -> systemstat-0.2.0.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.2.1/download -> terminal_size-0.2.1.crate https://crates.io/api/v1/crates/terminfo/0.7.3/download -> terminfo-0.7.3.crate https://crates.io/api/v1/crates/termios/0.3.3/download -> termios-0.3.3.crate https://crates.io/api/v1/crates/termtree/0.2.4/download -> termtree-0.2.4.crate https://crates.io/api/v1/crates/termwiz/0.15.0/download -> termwiz-0.15.0.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.32/download -> thiserror-1.0.32.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.32/download -> thiserror-impl-1.0.32.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/time/0.3.14/download -> time-0.3.14.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/toml_edit/0.14.4/download -> toml_edit-0.14.4.crate https://crates.io/api/v1/crates/tracing/0.1.36/download -> tracing-0.1.36.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.22/download -> tracing-attributes-0.1.22.crate https://crates.io/api/v1/crates/tracing-core/0.1.29/download -> tracing-core-0.1.29.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.4/download -> ucd-trie-0.1.4.crate https://crates.io/api/v1/crates/uds_windows/1.0.2/download -> uds_windows-1.0.2.crate https://crates.io/api/v1/crates/uluru/3.0.0/download -> uluru-3.0.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-bom/1.1.4/download -> unicode-bom-1.1.4.crate https://crates.io/api/v1/crates/unicode-ident/1.0.3/download -> unicode-ident-1.0.3.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.21/download -> unicode-normalization-0.1.21.crate https://crates.io/api/v1/crates/unicode-segmentation/1.9.0/download -> unicode-segmentation-1.9.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/uom/0.30.0/download -> uom-0.30.0.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/urlencoding/2.1.2/download -> urlencoding-2.1.2.crate https://crates.io/api/v1/crates/utf8-width/0.1.6/download -> utf8-width-0.1.6.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/versions/4.1.0/download -> versions-4.1.0.crate https://crates.io/api/v1/crates/vtparse/0.6.2/download -> vtparse-0.6.2.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.82/download -> wasm-bindgen-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.82/download -> wasm-bindgen-backend-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.82/download -> wasm-bindgen-macro-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.82/download -> wasm-bindgen-macro-support-0.2.82.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.82/download -> wasm-bindgen-shared-0.2.82.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/which/4.3.0/download -> which-4.3.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.24.0/download -> windows-0.24.0.crate https://crates.io/api/v1/crates/windows/0.37.0/download -> windows-0.37.0.crate https://crates.io/api/v1/crates/windows/0.39.0/download -> windows-0.39.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.37.0/download -> windows_aarch64_msvc-0.37.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.39.0/download -> windows_aarch64_msvc-0.39.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.24.0/download -> windows_i686_gnu-0.24.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.37.0/download -> windows_i686_gnu-0.37.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.39.0/download -> windows_i686_gnu-0.39.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.24.0/download -> windows_i686_msvc-0.24.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.37.0/download -> windows_i686_msvc-0.37.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.39.0/download -> windows_i686_msvc-0.39.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.24.0/download -> windows_x86_64_gnu-0.24.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.37.0/download -> windows_x86_64_gnu-0.37.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.39.0/download -> windows_x86_64_gnu-0.39.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.24.0/download -> windows_x86_64_msvc-0.24.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.37.0/download -> windows_x86_64_msvc-0.37.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.39.0/download -> windows_x86_64_msvc-0.39.0.crate https://crates.io/api/v1/crates/winres/0.1.12/download -> winres-0.1.12.crate https://crates.io/api/v1/crates/winrt-notification/0.5.1/download -> winrt-notification-0.5.1.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate https://crates.io/api/v1/crates/zbus/2.3.2/download -> zbus-2.3.2.crate https://crates.io/api/v1/crates/zbus_macros/2.3.2/download -> zbus_macros-2.3.2.crate https://crates.io/api/v1/crates/zbus_names/2.2.0/download -> zbus_names-2.2.0.crate https://crates.io/api/v1/crates/zvariant/3.6.0/download -> zvariant-3.6.0.crate https://crates.io/api/v1/crates/zvariant_derive/3.6.0/download -> zvariant_derive-3.6.0.crate
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a75b852fbfbc746fe56054f815e7a537
+_md5_=17b11368e0a4e24490b3b7f3c9772bbb
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 4a40a5c6c1af..120168351d8a 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/dvisvgm-2.14-r1 b/metadata/md5-cache/app-text/dvisvgm-2.14-r1
index 521199dbfa0f..3233ca0952ed 100644
--- a/metadata/md5-cache/app-text/dvisvgm-2.14-r1
+++ b/metadata/md5-cache/app-text/dvisvgm-2.14-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mgieseki/dvisvgm/releases/download/2.14/dvisvgm-2.14.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=31bf8bd26199b6050cfd09cfa24092b1
+_md5_=676e06aba1207c44fd0e4a1e5d1b0d33
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 4baedd9e3a43..9d69c405d817 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/rust-1.64.0-r1 b/metadata/md5-cache/dev-lang/rust-1.64.0-r1
index 8a8daef5c5bc..5150f2e2ba19 100644
--- a/metadata/md5-cache/dev-lang/rust-1.64.0-r1
+++ b/metadata/md5-cache/dev-lang/rust-1.64.0-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=stable/1.64
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.64.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.64.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.63.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.63.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.63.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.63.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.63.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.63.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.63.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.63.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.63.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=e3482e010b2acf873b0ea2463a48ecb1
+_md5_=8a1d25e4e4eed47cabff02e9ec591ef3
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index de4daa20c912..ccbe9a724981 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/qxlsx-1.4.4 b/metadata/md5-cache/dev-libs/qxlsx-1.4.4
new file mode 100644
index 000000000000..8b4092b3f41e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/qxlsx-1.4.4
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5= ) qt6? ( dev-qt/qtbase:6=[gui] )
+DESCRIPTION=Excel file(*.xlsx) reader/writer library using Qt
+EAPI=8
+HOMEPAGE=https://github.com/QtExcel/QXlsx
+INHERIT=multibuild cmake
+IUSE=qt5 qt6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5= ) qt6? ( dev-qt/qtbase:6=[gui] )
+REQUIRED_USE=|| ( qt5 qt6 )
+SLOT=0/0.1.4.4
+SRC_URI=https://github.com/QtExcel/QXlsx/archive/v1.4.4.tar.gz -> qxlsx-1.4.4.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=10661284fff66d3954a2812d794d3952
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index ea46f258cffe..cafb4e0ced2e 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/geki2-KXL-2.0.3-r4 b/metadata/md5-cache/games-action/geki2-KXL-2.0.3-r5
index 291272cd65f6..174d41f45896 100644
--- a/metadata/md5-cache/games-action/geki2-KXL-2.0.3-r4
+++ b/metadata/md5-cache/games-action/geki2-KXL-2.0.3-r5
@@ -11,4 +11,4 @@ RDEPEND=acct-group/gamestat dev-games/KXL media-fonts/font-adobe-100dpi media-fo
 SLOT=0
 SRC_URI=mirror://gentoo/geki2-KXL-2.0.3.tar.gz mirror://gentoo/geki2-KXL.png
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	7eb20ad915a0a318176d51bc2508ff5c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f24768125e13925d9cb912344e4b2858
+_md5_=2408787d3d7ca53629ea43b56f907478
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index cca0a0e96a6b..ad7bd8199376 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/kobodeluxe-0.5.1-r4 b/metadata/md5-cache/games-arcade/kobodeluxe-0.5.1-r4
new file mode 100644
index 000000000000..f5ad396b663d
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/kobodeluxe-0.5.1-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=media-libs/libsdl[joystick] media-libs/sdl-image[png] opengl? ( virtual/opengl )
+DESCRIPTION=An SDL port of xkobo, a addictive space shoot-em-up
+EAPI=8
+HOMEPAGE=http://www.olofson.net/kobodl/
+INHERIT=desktop
+IUSE=opengl
+KEYWORDS=~alpha ~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick] media-libs/sdl-image[png] opengl? ( virtual/opengl ) acct-group/gamestat
+SLOT=0
+SRC_URI=http://www.olofson.net/kobodl/download/KoboDeluxe-0.5.1.tar.bz2
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c
+_md5_=61beba3ce61768cf7f736b24db6dddb9
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 73566ef9e954..2895631d5735 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/blib-1.1.7-r2 b/metadata/md5-cache/media-libs/blib-1.1.7-r2
deleted file mode 100644
index f95fc822eef5..000000000000
--- a/metadata/md5-cache/media-libs/blib-1.1.7-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2:2 aalib? ( >=media-libs/aalib-1.4_rc4-r2 ) gtk? ( >=x11-libs/gtk+-2.4.4:2 ) virtual/pkgconfig
-DESCRIPTION=blib is a library full of useful things to hack the Blinkenlights
-EAPI=6
-HOMEPAGE=http://www.blinkenlights.de
-IUSE=aalib gtk
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2:2 aalib? ( >=media-libs/aalib-1.4_rc4-r2 ) gtk? ( >=x11-libs/gtk+-2.4.4:2 )
-SLOT=0
-SRC_URI=http://www.blinkenlights.de/dist/blib-1.1.7.tar.gz
-_md5_=4dc32ecfba481574a9acc835742b0709
diff --git a/metadata/md5-cache/media-libs/blib-1.1.7-r3 b/metadata/md5-cache/media-libs/blib-1.1.7-r3
new file mode 100644
index 000000000000..05f4ace8a1e0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/blib-1.1.7-r3
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 aalib? ( media-libs/aalib ) gtk? ( app-accessibility/at-spi2-core:2 media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango )
+DESCRIPTION=Library full of useful things to hack the Blinkenlights
+EAPI=8
+HOMEPAGE=http://www.blinkenlights.de
+IUSE=aalib gtk
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf:2 aalib? ( media-libs/aalib ) gtk? ( app-accessibility/at-spi2-core:2 media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango )
+SLOT=0
+SRC_URI=http://www.blinkenlights.de/dist/blib-1.1.7.tar.gz
+_md5_=aeab86084d168feea3ba7ff58e8f857a
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.12-r4 b/metadata/md5-cache/media-libs/xine-lib-1.2.12-r4
index 45a8b588a438..03c0e9176f7e 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.12-r4
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.12-r4
@@ -1,6 +1,6 @@
 BDEPEND=app-arch/xz-utils >=sys-devel/libtool-2.2.6b virtual/pkgconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-base/xorg-proto x11-libs/libXt ) xv? ( x11-base/xorg-proto ) xvmc? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto )
+DEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-base/xorg-proto x11-libs/libXt ) xv? ( x11-base/xorg-proto ) xvmc? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto )
 DESCRIPTION=Core libraries for Xine movie player
 EAPI=8
 HOMEPAGE=http://xine.sourceforge.net/
@@ -8,9 +8,9 @@ INHERIT=flag-o-matic libtool
 IUSE=a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc nls
 KEYWORDS=amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
+RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
 SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.12.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4f0121c14dca136b0fd6682d3d9489e7
+_md5_=802d19cfa86abd9f95f2036f321cca86
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.9999 b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
index 0b1506661251..71a8d5317eb7 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.9999
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
@@ -2,7 +2,7 @@ BDEPEND=app-arch/xz-utils >=sys-devel/libtool-2.2.6b virtual/pkgconfig >=app-por
 DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-base/xorg-proto x11-libs/libXt ) xv? ( x11-base/xorg-proto ) xvmc? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto )
 DESCRIPTION=Core libraries for Xine movie player
-EAPI=7
+EAPI=8
 HOMEPAGE=http://xine.sourceforge.net/
 INHERIT=flag-o-matic libtool autotools mercurial
 IUSE=a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=39a3b356d2c3d6b75618aaaecd00894e
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=07866ad1da30bc212f3dd509e4ab8a82
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 0e6f0e9bb33f..322d0a0d0b8c 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/jack-example-tools-3 b/metadata/md5-cache/media-sound/jack-example-tools-3
new file mode 100644
index 000000000000..2ae7208e774f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/jack-example-tools-3
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=virtual/jack alsa? ( media-libs/alsa-lib media-libs/libsamplerate ) jack-net? ( || ( media-sound/jack2[libsamplerate] media-video/pipewire[jack-sdk(-)] ) ) jack-netsource? ( media-libs/libsamplerate opus? ( media-libs/opus[custom-modes] ) ) readline? ( sys-libs/readline:= ) sndfile? ( media-libs/libsndfile ) zalsa? ( media-libs/alsa-lib media-libs/zita-alsa-pcmi media-libs/zita-resampler:= ) !<media-sound/jack-audio-connection-kit-0.126.0 !<media-sound/jack2-1.9.21
+DESCRIPTION=Official examples and tools from the JACK project
+EAPI=8
+HOMEPAGE=https://jackaudio.org/
+INHERIT=meson
+IUSE=alsa jack-net jack-netsource opus +readline sndfile zalsa
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ zalsa? ( GPL-3+ )
+RDEPEND=virtual/jack alsa? ( media-libs/alsa-lib media-libs/libsamplerate ) jack-net? ( || ( media-sound/jack2[libsamplerate] media-video/pipewire[jack-sdk(-)] ) ) jack-netsource? ( media-libs/libsamplerate opus? ( media-libs/opus[custom-modes] ) ) readline? ( sys-libs/readline:= ) sndfile? ( media-libs/libsndfile ) zalsa? ( media-libs/alsa-lib media-libs/zita-alsa-pcmi media-libs/zita-resampler:= ) !<media-sound/jack-audio-connection-kit-0.126.0 !<media-sound/jack2-1.9.21
+SLOT=0
+SRC_URI=https://github.com/jackaudio/jack-example-tools/archive/refs/tags/3.tar.gz -> jack-example-tools-3.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=97cc121178e1238f18dec3c62f68bc8c
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.21 b/metadata/md5-cache/media-sound/jack2-1.9.21
new file mode 100644
index 000000000000..da60a6c92c95
--- /dev/null
+++ b/metadata/md5-cache/media-sound/jack2-1.9.21
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[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-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Jackdmp jack implemention for multi-processor machine
+EAPI=8
+HOMEPAGE=https://jackaudio.org/
+INHERIT=flag-o-matic python-single-r1 waf-utils multilib-minimal
+IUSE=+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 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 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+PDEPEND=tools? ( media-sound/jack-example-tools )
+RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[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-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit !media-video/pipewire[jack-sdk(-)]
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( classic dbus )
+SLOT=2
+SRC_URI=https://github.com/jackaudio/jack2/archive/refs/tags/v1.9.21.tar.gz -> jack2-1.9.21.tar.gz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	waf-utils	dc1ca5e725dffa4b41dd0c232d74cdba
+_md5_=65aaba3f2b1feb3cd0a8fc95a52013c1
diff --git a/metadata/md5-cache/media-sound/jack2-9999 b/metadata/md5-cache/media-sound/jack2-9999
index 41a06f3ac9fe..8d89cec7cf4e 100644
--- a/metadata/md5-cache/media-sound/jack2-9999
+++ b/metadata/md5-cache/media-sound/jack2-9999
@@ -1,15 +1,16 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[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-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[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-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Jackdmp jack implemention for multi-processor machine
-EAPI=7
+EAPI=8
 HOMEPAGE=https://jackaudio.org/
-INHERIT=python-single-r1 waf-utils multilib-minimal git-r3
-IUSE=alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=GPL-2
+INHERIT=flag-o-matic python-single-r1 waf-utils multilib-minimal git-r3
+IUSE=+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=GPL-2+ LGPL-2.1+
+PDEPEND=tools? ( media-sound/jack-example-tools )
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[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-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( classic dbus )
+RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[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-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit !media-video/pipewire[jack-sdk(-)]
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( classic dbus )
 SLOT=2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	waf-utils	dc1ca5e725dffa4b41dd0c232d74cdba
-_md5_=3065f9e0b04118b7230309acb391aee5
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	waf-utils	dc1ca5e725dffa4b41dd0c232d74cdba
+_md5_=e78b48b3a3d10f104522d0e1d33d02e5
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index dcf66587e85a..c46c07626bd5 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/nessus-bin-10.4.0 b/metadata/md5-cache/net-analyzer/nessus-bin-10.4.1
index 3e84595fd8c6..bfc0cebdf405 100644
--- a/metadata/md5-cache/net-analyzer/nessus-bin-10.4.0
+++ b/metadata/md5-cache/net-analyzer/nessus-bin-10.4.1
@@ -8,6 +8,6 @@ KEYWORDS=-* ~amd64
 LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
-SRC_URI=Nessus-10.4.0-es8.x86_64.rpm
+SRC_URI=Nessus-10.4.1-es8.x86_64.rpm
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	rpm	f73e907469f65e52192f110dec72dce0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=86de51d49f2f42f3fc9b3a84f01e00fd
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 102d8e386870..6e375454c8a3 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.38.2 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.2
new file mode 100644
index 000000000000..76b39701fcba
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.2
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=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=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.2.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2cb047e9af7abf8ed8ce0d014891ab8b
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.2-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.2-r410
new file mode 100644
index 000000000000..39ad58114f82
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.2-r410
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=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=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4.1/0
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.2.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f91a90ac296034f72a1f3752067ee100
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.2-r500 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.2-r500
new file mode 100644
index 000000000000..12cb32106b41
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.2-r500
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP >=app-portage/elt-patches-20170815 app-arch/xz-utils >=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=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+DESCRIPTION=Open source web browser engine
+EAPI=8
+HOMEPAGE=https://www.webkitgtk.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] gui-libs/gtk:4 >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=5/0
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.2.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=154cfb298c4f5db0393ed9fc2187ebfa
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 5217fa25870f..3bd1e66010d0 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.22.0 b/metadata/md5-cache/net-p2p/syncthing-1.22.1
index 17a04b5f5e74..3d5be71d070a 100644
--- a/metadata/md5-cache/net-p2p/syncthing-1.22.0
+++ b/metadata/md5-cache/net-p2p/syncthing-1.22.1
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense
 RDEPEND=acct-group/syncthing acct-user/syncthing tools? ( >=acct-user/stdiscosrv-1 >=acct-user/strelaysrv-1 ) selinux? ( sec-policy/selinux-syncthing )
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/syncthing/syncthing/archive/v1.22.0.tar.gz -> syncthing-1.22.0.tar.gz https://dev.gentoo.org/~marecki/dists/net-p2p/syncthing/syncthing-1.22.0-deps.tar.xz
+SRC_URI=https://github.com/syncthing/syncthing/archive/v1.22.1.tar.gz -> syncthing-1.22.1.tar.gz https://dev.gentoo.org/~marecki/dists/net-p2p/syncthing/syncthing-1.22.1-deps.tar.xz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	go-module	15312495dc4fd84f8c37bbe228ea2abd	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fb3332e99c0c9851dc0ac3018a612c84
diff --git a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r3 b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r3
new file mode 100644
index 000000000000..330c63cb6197
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A torrent file parser
+EAPI=8
+HOMEPAGE=https://github.com/Fuuzetsu/torrentinfo
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Fuuzetsu/torrentinfo/archive/v1.8.6.tar.gz -> torrentinfo-1.8.6.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=60c409cfeb8c28fe36ae639f7d39a222
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index e981a301e478..07af9dd70cb4 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/calcmysky-0.2.1 b/metadata/md5-cache/sci-astronomy/calcmysky-0.2.1
new file mode 100644
index 000000000000..eaabccc6c889
--- /dev/null
+++ b/metadata/md5-cache/sci-astronomy/calcmysky-0.2.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-cpp/eigen:3 media-libs/glm qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) qt6? ( dev-qt/qtbase:6[gui,opengl,widgets,-gles2-only] )
+DESCRIPTION=Simulator of light scattering by planetary atmospheres
+EAPI=8
+HOMEPAGE=https://github.com/10110111/CalcMySky
+INHERIT=multibuild cmake
+IUSE=qt5 qt6
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-cpp/eigen:3 media-libs/glm qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5[-gles2-only] dev-qt/qtwidgets:5[-gles2-only] ) qt6? ( dev-qt/qtbase:6[gui,opengl,widgets,-gles2-only] )
+REQUIRED_USE=|| ( qt5 qt6 )
+SLOT=0/14
+SRC_URI=https://github.com/10110111/CalcMySky/archive/refs/tags/v0.2.1.tar.gz -> calcmysky-0.2.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=94c1d58600cd0c69d27f33047c4a9528
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-1.1 b/metadata/md5-cache/sci-astronomy/stellarium-1.1
new file mode 100644
index 000000000000..7dc19ce86d63
--- /dev/null
+++ b/metadata/md5-cache/sci-astronomy/stellarium-1.1
@@ -0,0 +1,18 @@
+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-lang/perl doc? ( app-doc/doxygen[dot] ) nls? ( !qt6? ( dev-qt/linguist-tools:5 ) qt6? ( dev-qt/qttools:6[linguist] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=media-fonts/dejavu sys-libs/zlib gps? ( sci-geosciences/gpsd:=[cxx] ) media? ( virtual/opengl ) !qt6? ( dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sci-astronomy/calcmysky:=[qt5] gps? ( dev-qt/qtpositioning:5 dev-qt/qtserialport:5 ) media? ( dev-qt/qtmultimedia:5[widgets] dev-qt/qtopengl:5 ) scripting? ( dev-qt/qtscript:5 ) telescope? ( dev-qt/qtserialport:5 ) webengine? ( dev-qt/qtwebengine:5[widgets] ) xlsx? ( dev-libs/qxlsx:=[qt5] ) ) qt6? ( dev-qt/qtbase:6=[gui,network,widgets] dev-qt/qtcharts:6 sci-astronomy/calcmysky:=[qt6] gps? ( dev-qt/qtpositioning:6 dev-qt/qtserialport:6 ) media? ( dev-qt/qtmultimedia:6[gstreamer] ) scripting? ( dev-qt/qtdeclarative:6 ) telescope? ( dev-qt/qtserialport:6 ) webengine? ( dev-qt/qtwebengine:6[widgets] ) xlsx? ( dev-libs/qxlsx:=[qt6] ) ) telescope? ( sci-libs/indilib:= ) !qt6? ( dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) ) qt6? ( dev-qt/qtbase:6=[concurrent] )
+DESCRIPTION=3D photo-realistic skies in real time
+EAPI=8
+HOMEPAGE=https://stellarium.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake desktop flag-o-matic python-any-r1 xdg virtualx
+IUSE=debug deep-sky doc gps media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx test
+KEYWORDS=~amd64
+LICENSE=GPL-2+ SGI-B-2.0
+RDEPEND=media-fonts/dejavu sys-libs/zlib gps? ( sci-geosciences/gpsd:=[cxx] ) media? ( virtual/opengl ) !qt6? ( dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sci-astronomy/calcmysky:=[qt5] gps? ( dev-qt/qtpositioning:5 dev-qt/qtserialport:5 ) media? ( dev-qt/qtmultimedia:5[widgets] dev-qt/qtopengl:5 ) scripting? ( dev-qt/qtscript:5 ) telescope? ( dev-qt/qtserialport:5 ) webengine? ( dev-qt/qtwebengine:5[widgets] ) xlsx? ( dev-libs/qxlsx:=[qt5] ) ) qt6? ( dev-qt/qtbase:6=[gui,network,widgets] dev-qt/qtcharts:6 sci-astronomy/calcmysky:=[qt6] gps? ( dev-qt/qtpositioning:6 dev-qt/qtserialport:6 ) media? ( dev-qt/qtmultimedia:6[gstreamer] ) scripting? ( dev-qt/qtdeclarative:6 ) telescope? ( dev-qt/qtserialport:6 ) webengine? ( dev-qt/qtwebengine:6[widgets] ) xlsx? ( dev-libs/qxlsx:=[qt6] ) ) telescope? ( sci-libs/indilib:= )
+REQUIRED_USE=|| ( !media !qt6 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v1.1/stellarium-1.1.1.tar.gz deep-sky? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.17/catalog-3.17.dat -> stellarium-dso-catalog-3.17.dat ) doc? ( https://github.com/Stellarium/stellarium/releases/download/v1.1/stellarium_user_guide-1.1-1.pdf ) stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=40494736b966a9052d9cd842ae28439e
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 6278bf025c4e..bbd0887a530a 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/chromium-107.0.5304.29 b/metadata/md5-cache/www-client/chromium-107.0.5304.87
index f4fe5ebdfc7a..c2a7b0394bbc 100644
--- a/metadata/md5-cache/www-client/chromium-107.0.5304.29
+++ b/metadata/md5-cache/www-client/chromium-107.0.5304.87
@@ -10,7 +10,7 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=BSD
 RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
-SLOT=0/beta
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-107.0.5304.29.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-107-patchset-1/chromium-107-patchset-1.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
+SLOT=0/stable
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-107.0.5304.87.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-107-patchset-1/chromium-107-patchset-1.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c20f0737ac2ed4173954766c72b6060f
+_md5_=2d100156002a6871fcfd18c94b8016ac
diff --git a/metadata/md5-cache/www-client/google-chrome-106.0.5249.119 b/metadata/md5-cache/www-client/google-chrome-107.0.5304.87
index 1469f13b2712..c8dfd2b82f83 100644
--- a/metadata/md5-cache/www-client/google-chrome-106.0.5249.119
+++ b/metadata/md5-cache/www-client/google-chrome-107.0.5304.87
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_106.0.5249.119-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_107.0.5304.87-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ff76c50c5b863e304c36e4ec23297205
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-107.0.5304.29 b/metadata/md5-cache/www-client/google-chrome-beta-108.0.5359.30
index 939d343890aa..000fd2e5cf36 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-107.0.5304.29
+++ b/metadata/md5-cache/www-client/google-chrome-beta-108.0.5359.30
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_107.0.5304.29-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_108.0.5359.30-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5a60e12e83b7e93af00bfed9f56f9135
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-108.0.5343.2 b/metadata/md5-cache/www-client/google-chrome-unstable-109.0.5396.2
index 43e140b7b239..c7942fa1c8ba 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-108.0.5343.2
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-109.0.5396.2
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_108.0.5343.2-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_109.0.5396.2-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5a60e12e83b7e93af00bfed9f56f9135
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index e9dccfe283df..37a5eba300ef 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-106.0.5249.119 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-107.0.5304.87
index 13455ebd9430..15696b793ed5 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-106.0.5249.119
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-107.0.5304.87
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_106.0.5249.119-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_107.0.5304.87-1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
 _md5_=63079fa95734c111159210df04e4b0cb
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-107.0.5304.29_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-108.0.5359.30_beta
index ba6e93b0852e..62342208467b 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-107.0.5304.29_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-108.0.5359.30_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_107.0.5304.29-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_108.0.5359.30-1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
 _md5_=280d4365f7d545b5db4b59005ac2ef69
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-108.0.5343.2_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-109.0.5396.2_alpha
index 0ce72986b7ac..8db204b89419 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-108.0.5343.2_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-109.0.5396.2_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_108.0.5343.2-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_109.0.5396.2-1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
 _md5_=280d4365f7d545b5db4b59005ac2ef69
diff --git a/metadata/md5-cache/www-plugins/pdfjs-2.14.305 b/metadata/md5-cache/www-plugins/pdfjs-2.14.305
index 0877e2a3cf56..ac31cfffbc5e 100644
--- a/metadata/md5-cache/www-plugins/pdfjs-2.14.305
+++ b/metadata/md5-cache/www-plugins/pdfjs-2.14.305
@@ -3,8 +3,8 @@ DEFINED_PHASES=install
 DESCRIPTION=A PDF reader in JavaScript
 EAPI=8
 HOMEPAGE=https://mozilla.github.io/pdf.js/
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mozilla/pdf.js/releases/download/v2.14.305/pdfjs-2.14.305-dist.zip -> pdfjs-2.14.305.zip
-_md5_=b13dbdfbae0390ee2e8589463a070c28
+_md5_=83e6cb418130e229f819cbf9003746b8
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index f7c5c4446fa2..e6e91b5e42a9 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.9.2 b/metadata/md5-cache/x11-terms/mlterm-3.9.2
index 9fd6414a0b86..b251c57095ac 100644
--- a/metadata/md5-cache/x11-terms/mlterm-3.9.2
+++ b/metadata/md5-cache/x11-terms/mlterm-3.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=virtual/libcrypt:= X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty ) cairo? ( x11-libs/cairo[X(+)] ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) xft? ( x11-libs/libXft ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DEPEND=virtual/libcrypt:= X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty[api(+)] ) cairo? ( x11-libs/cairo[X(+)] ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) xft? ( x11-libs/libXft ) virtual/pkgconfig nls? ( sys-devel/gettext )
 DESCRIPTION=A multi-lingual terminal emulator
 EAPI=8
 HOMEPAGE=http://mlterm.sourceforge.net/
@@ -7,9 +7,9 @@ INHERIT=desktop
 IUSE=+X bidi brltty cairo debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft
 KEYWORDS=amd64 ppc ppc64 ~riscv x86
 LICENSE=BSD
-RDEPEND=virtual/libcrypt:= X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty ) cairo? ( x11-libs/cairo[X(+)] ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) xft? ( x11-libs/libXft )
+RDEPEND=virtual/libcrypt:= X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty[api(+)] ) cairo? ( x11-libs/cairo[X(+)] ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) xft? ( x11-libs/libXft )
 REQUIRED_USE=|| ( X fbcon wayland )
 SLOT=0
 SRC_URI=mirror://sourceforge/mlterm/mlterm-3.9.2.tar.gz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c
-_md5_=f4b9ff740aa6e4ab64084bc5704bd801
+_md5_=6d7f74ef5202158eff598c8a4e50bec9
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 4848430c8e33..c66ab1bbf86a 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-11-04T20:39:56Z
+TIMESTAMP 2022-11-05T02:39:58Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNleJxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNlzP5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCP8Q/9FtakinJhzMHNVbEjxrUtq/SCQiIxXTqLZ3EiEeNMbQmqGH9wUd13W62i
-lh02cK+PlFAMbzK4bZC1GLvx9OKTKdA+fQVxDIkQRseYd+N/D1IiiwOiIVd1THDr
-+dC3skpT2tniDB0kc93Ipn2mkq56XrbTSfNePcXZI3hxZPiSJuhi7itmr+SqHPTi
-0OZI1JsVeiQpXtrWNkEBe1NZ+MJbIr2GVEt2Oi/f4BzFB4CCueq63Rq7+Z8oskCF
-sD8YkAbPPsENmyszLSMVOXY+e8htiZUw0ya+nRN/fTDzTlL2x674pNgM/1XEj+8I
-RgHZVCXcLSz8vF3gN7AzwisbvzlsGaq0JNpd8W1H5U+KrD+FvfqIHYb8fbONzPco
-OfdV7z+xlx9cQJjs/a8CjeiirUQb1vLcHCDJqQdN6IKX08YPtQCAJrnF7L/zLTSJ
-kkQ0J6q3opZ7B55vUHvKNj8ZS+paZ3x2FrW7jCQgMw96D9rulYOJ5LLX378TIJ8P
-SUmqfBF8fwOMFo1WYSwciyqB9DI61AjR18JATxn0ckBqbamDR5Gtl/M4C1D008eU
-H+fEQoSIeSZALYr6CRZBMd6zfDESaAnW0nD/jzPv73H1l0JQJgxTO8SLBV/rjFYG
-fwqfCrv4za1qns1t19PFNKg967rkNTMAGxxSs6IEHmYi83jisYk=
-=NOkA
+klC2cg/+Jriy8M3VYPTxEDozzl0+BWKGdOPwfNQyUI9VeXz76OnULlB2JXXBZyYR
+oeEAQs84y9KcO0YvK9H2cs5zXQ39QTXQBL+QD7xll9OyUhiIfX+KhWhjlJghlqnY
+Qi2yGE6jqbJNqCvd/r6U9kVlu/4s0mSKy7NvDvyVH/zFu1mqCsvVMpVhIlx6ljJg
+H2agpIC8AhjcarVK7AY6PfdnASnmuYn249Bjq/8ZQJtxSc8v4m7ka+VrDhflT1wg
+5i+fbKh60JqO1nofCMSJZyXjLXr+lNV9Hyiat5Gmr9GzbeUitNcuL7QK8q2qKRkt
+kk2DTlGHCzbhH+Xj5W2Zi4lZzttcLRyQ5QDTsFUpZEL5G6OdDp47x/lQM1fhF4fO
+zvjlhj+cPNIWZqMhQ08GFEm4mK0EKVcatnoiuIxMo7XiA5Qz0eb20gnh5FypkqpE
+fuAoPunhtKJYpvo72tIlvf9mW7peG/91qYyGaRlgJ9uztxUY/FVsx+n8NesDTjZr
+9zx3xPsoanfpJrnuPplkKaeKoM6M3Dg0kDfVIQkD2vsQ2A2jSkaQq11kawn8sFnc
+sl8nUtp7Cr3kULGHBZI3UJAfFEhNPPrCBEtnk04Vzp9XBi4eKu96MslaEX2gh8o5
+7cV+5gUDikXb6/vtzgvlxf5nNf60CGPcNH2UFg6s6zst6H1iAmU=
+=nfdR
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d90dc6b77487..43c25db73d32 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Nov 2022 20:39:53 +0000
+Sat, 05 Nov 2022 02:39:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ef30caa4a432..0b61bb3448c3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Nov  4 08:39:53 PM UTC 2022
+Sat Nov  5 02:39:53 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d1d53da50f4f..362390bdfa48 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Nov 2022 20:45:01 +0000
+Sat, 05 Nov 2022 02:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 1e11c2e2112a..3c3f47505d58 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c514f5901c40dddc87448420868a9ec4759ba963 1667593431 2022-11-04T20:23:51+00:00
+17a467511e1bdb30dc7080856449db6d25bf28a2 1667615354 2022-11-05T02:29:14+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e6e9ecd386a3..5bce50737e91 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1667594401 Fri 04 Nov 2022 08:40:01 PM UTC
+1667616001 Sat 05 Nov 2022 02:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d90dc6b77487..43c25db73d32 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 04 Nov 2022 20:39:53 +0000
+Sat, 05 Nov 2022 02:39:53 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 364332929efa..83a07f1d89ca 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 99523ede8ecf..79d799ab6dfd 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1,4 +1,4 @@
 AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4
-DIST Nessus-10.4.0-es8.x86_64.rpm 52986576 BLAKE2B ab722a4747b8e228511e5c12025a3e719b2b78236d42847a2558849c34c1c924e97bc4db2f5febe56f1b2df0617471b673679bd43a80c83b650958faf2663acd SHA512 74737a73d21ab274a08a24d0db589215663f08662376b7a4be09ba2bb2de2ccbf6c2110c72b97e29318153f1f5a63c2613aa25c9d0066902a5425562f0039d6c
-EBUILD nessus-bin-10.4.0.ebuild 2077 BLAKE2B 1a2dd1f02110ed588a05ef33d16e0c498f5b16babc4faec6207f0a4ca0d9f5036283bd686c4933488e0b0b8e4501eb1769e788a4196c76d6e1bae039a20b3882 SHA512 0d03b55443e563fd13df14f46a22e9c2604831e8e38a5d3d885436289e79b76736d21796c2bfd70d26d3e41b3467a43d124e61d65bc000f9066f4d4722ee1c7f
+DIST Nessus-10.4.1-es8.x86_64.rpm 53119552 BLAKE2B b28cb948c5b31701e33d02ad4b64b71ac675bc9c05d3c4df6e83b1eaad3fddc365b35c63819ac8b14aa4971c8a57ae9b868bd6a776e6aae7bef33f39ad3d700f SHA512 de7a9139ae20306ed8df8acd03c2d20165a77e2862c3db84a807f6cf69399f294e86bd2b9b8b8281fc28a42b7b58d7143e04d4f8cc850940078194a203fc8754
+EBUILD nessus-bin-10.4.1.ebuild 2077 BLAKE2B 1a2dd1f02110ed588a05ef33d16e0c498f5b16babc4faec6207f0a4ca0d9f5036283bd686c4933488e0b0b8e4501eb1769e788a4196c76d6e1bae039a20b3882 SHA512 0d03b55443e563fd13df14f46a22e9c2604831e8e38a5d3d885436289e79b76736d21796c2bfd70d26d3e41b3467a43d124e61d65bc000f9066f4d4722ee1c7f
 MISC metadata.xml 346 BLAKE2B 5e72f68ab557c56cc09cedcaaa9760f3619723bd6fc58b8ecc921526b1b42b6b65e971876ec569c1e68a26e55def24767c5d896fd9eb6a706041b485a8885023 SHA512 ab7e122c344a3f5078b2d497ed36a63f6af74fcfa7f2b98d6299ec7c82e7cbaf427da8fa595e6445e49ee041114ac581fb5b1d703f16fc70a54ee98375062e82
diff --git a/net-analyzer/nessus-bin/nessus-bin-10.4.0.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.4.1.ebuild
index 185df57e95c4..185df57e95c4 100644
--- a/net-analyzer/nessus-bin/nessus-bin-10.4.0.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-10.4.1.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 76cd74efb4aa..f724a84abd1d 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 e6340b96984c..7528cfd1c2a7 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,6 +2,7 @@ DIST webkitgtk-2.36.7.tar.xz 26594424 BLAKE2B 1f7450e47bffa3875aa4448925a013ec90
 DIST webkitgtk-2.36.8.tar.xz 26610100 BLAKE2B d3862fdf18b6095c32af517b7bd175797375fff8a9d68f04d773375c0c3cea284c23466f25e3e53811ef622974f58211b4b11cb32a47ff08951cdd65b085b815 SHA512 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036
 DIST webkitgtk-2.38.0.tar.xz 32997240 BLAKE2B 6612d2192b8865af625af297c88caf02e329d51e9c166b931b8bc6061f36fb1f1f2b06407adad0aa7bf5beaafe707c1d9a64d437e2ed99ed8ff1865c09f8e0dc SHA512 8380d11eedec3c4eedf3a0f5591fd279ee42b28a38aaa13d7eb88f8a004cbe8aac7dc8f19409440e5c1272ad1555a781f1242bca6c89beed2dc5fd2de5f3d525
 DIST webkitgtk-2.38.1.tar.xz 33006384 BLAKE2B 404ff4e52331f9fe929922a23bed8ab5a70cb2a6523ae23c390415bfbd3c88797f91f95b74c9c8301f462bff708c85dc7155d6b37d2c3a66d4794ca184e1ca7c SHA512 d81e85a5a43c33a63f88964907053888bb971c8fa1fe7fc90f71461c440458a21e09730c558be2b5efe42e02eb1c3d789a2571dc6d795f9c6d95fd499683a9e2
+DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b70cbe98b861e86e9f2052be3fcff3ff2ff3df078e76b1691e0dfce6861a92a78a35a6f27e21eaef2dc2c5763c4095c SHA512 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37
 EBUILD webkit-gtk-2.36.7.ebuild 7425 BLAKE2B 1f261d15a60f1d07895652c369cdf572cea2bdd19236abd2a2de2b31b1f8994a644d85185368a07a708c7c4e956f4547b12ae14a8befd5b1c33fd02ebfb1b9fa SHA512 459a52070c6c83950dd278c3325bc83d184314ec4e613ccf3f34fc9cd4ce7d45d854a892452e9f620da37937050c470e21614daac03189cf082cfb07f50d92a6
 EBUILD webkit-gtk-2.36.8.ebuild 7431 BLAKE2B dae5715e2d558348b040967a2aec6bb48da85da9a308322c8c7c56a511a0e9a95dc5e7fc4e58ffb175d5a239da017da4a0de8fc905c7997689d87ad85a1e8e75 SHA512 7681c899912ed9e2c4d2418d8363f7f17d76c04905dc71acd1f51709fb10766b6765d4f306d22eb6f5cf00166c72151d41b6154052203edf67d58a5e47b58efc
 EBUILD webkit-gtk-2.38.0-r410.ebuild 7759 BLAKE2B d410fc8f19be0435fe429d70943345fb45f3f0cddf851d79498f6f3dce2cebe15e7ede05aa064f85bf07a2173875d1d85e2b1412fee7e4f0eb5af77f1fd53fc9 SHA512 779f2f9c4073cc294d7e3b907a843b3c9452c83140da0e6519eab4f69aab0b81106a6151df2ba066a21c396444b53e0cea6f984f5997374a888aaaaf4ed24b95
@@ -10,4 +11,7 @@ EBUILD webkit-gtk-2.38.0.ebuild 7485 BLAKE2B a748a1089fe164a8a827e262040ba316d85
 EBUILD webkit-gtk-2.38.1-r410.ebuild 7808 BLAKE2B e7f002be09d32397ad11090bb0b2b8ef75fec74a2502cb9f426e9e4ab47f25de54914225edd53cc056e8dab32b70c74885f635bb8921582726963f83ef04f1b4 SHA512 cea61f06a256c54eeeb023da302b42a0487d41d0740ba8dc3970b14434367a0237d8db27d9db141b1b8ebdd881d5064145b7c17c61bb8f85c849e25da5f820ad
 EBUILD webkit-gtk-2.38.1-r500.ebuild 7687 BLAKE2B fd64d39a1168369187cf12db3a4f37d8ccb278aa5786111216d92b656a55313c8172acfc434edf912962ac612e6126f37078eb02e45b6b6d4576abe8f7446e57 SHA512 9779819e48b1f5837ddc6e25108645fd56f48203e0327d52611a826559665f32bb7796eee8986dc2275d328e63183d12e45471c0c822f26e89e0a68681be7cfd
 EBUILD webkit-gtk-2.38.1.ebuild 7534 BLAKE2B d600cc109f42ff2d6bc1f39233db47fff1b699da865f96a7143c89d62100ee9829da1a9349c734dbc92e97a225404bbe9c8cdcc5295d92c46e34db5214b6564d SHA512 56c0a953ec79956fed0cfe68042eaa66ef2fea96ac5f65c51123e0383cc283c42d00dac1c5a452e01899d91951e1e7af958a99b2ef85331fa0ebaf97d8528a51
+EBUILD webkit-gtk-2.38.2-r410.ebuild 7779 BLAKE2B f5415e2ab57fb4623f636670de0fc02af597efab866203fb335709125581d623c64c3c6908508533768eaefc8becb1a01e9957c10c4f83b6e9a485185173f3cb SHA512 7a810ae7a1fe0a134b78729cea9d87ad3f1c748c879061b280329454503153154a67f89eda1495679b2e56f12c85d3d8764cd0c89be46a12e3823d89ed8a3397
+EBUILD webkit-gtk-2.38.2-r500.ebuild 7658 BLAKE2B 65fb997ab14875ccc6173baf4fe872efddd4a8731f7a7fa03cea7e22f44b3504dbf0c84d08eabfa786c19ebc99231d54102171bd456b0cdb924ee8af55a40d67 SHA512 44b37ee47cd471c5124dfd4c0c5dc5c02cbb3d1e02ee603b5dbbd2ced4b60f2734da58fa01edc2d37b5af06c0bb81be607c1533e075912b597bde979829e703d
+EBUILD webkit-gtk-2.38.2.ebuild 7505 BLAKE2B 829536c0492340ed7b76758e0797515cdddef9b3680aca7e255e708a16ce9cc0ea9680d790203ce1ffce166dcd83a0e886a4e9a30b07c57709e9eae960422340 SHA512 7e9c6fea93104affde93a81af6ff2fd3f51180e6e2f921f9f804b4af3544753bedf04dec49c53fe3d925a9e7c05379ad63fbd3c26081dd0665d6ccfbfeb72224
 MISC metadata.xml 756 BLAKE2B ac278b1ed9ad7d7dcce220e686ef4c67c79f7d4c25e43e0fedaad14925eb03c74140e49a4e86d2146d6d467f14a737fb2ff1e90b506ab4d43b79d3462d58cb24 SHA512 584ce6c8dc66e3e3b3677dbffe8b2a58bb81146f3dc8eaf830597781f03580e0b94620322834b6e558ac9fcb06b3eda02645803f63d78e88104ecc0950c6f369
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
new file mode 100644
index 000000000000..529800cbc326
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r410.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=ON
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/gtk-doc/html
+	# This will install API docs specific to webkit2gtk-4.1
+	doins -r "${S}"/Documentation/{jsc-glib,webkit2gtk,webkit2gtk-web-extension}-${SLOT%/*}
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild
new file mode 100644
index 000000000000..521249210dfd
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2-r500.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="5/0" # soname version of libwebkit2gtk-5.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+# Softblocking webkit-gtk-2.38:4 as we going to use webkit-2.38:4.1's WebKitDriver binary
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	gui-libs/gtk:4
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-3.0.8:3.0[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+	!<net-libs/webkit-gtk-2.38:4
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=ON # wbkit2gtk-5.0
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-5.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=OFF
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
new file mode 100644
index 000000000000..6db10244f97d
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3
+	sys-libs/zlib:0
+	>=app-accessibility/at-spi2-core-2.46.0:2
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_PDFJS=$(usex pdf)
+		-DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
+		-DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_DOCUMENTATION=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.0 and use the webkit2gtk-4.1
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index a4b11e4d5c74..b565cad6198c 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 9b301ce78012..1990ec9cb8e9 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -11,8 +11,8 @@ AUX syncthing.initd-r2 1288 BLAKE2B a1c74a4de5bfe61fe4e57f7be358a4ba2df28a92fd48
 AUX syncthing.logrotate 101 BLAKE2B af499a6979e5c61cc4791932e247fe7f25baffbbf690907a2e2b8c2954da72154a885759589249c541f36b2740980f3fcd3e99db0d3f6d5a1bacee8c1574f9bc SHA512 73a5f7062b48ab4c7b343b43367b1999f8e133eadb624bd5e3e147ae41f135ded6acb4c617db2d385311441c9a52c288333791308c36762cb5273a853cce5a67
 DIST syncthing-1.21.0-deps.tar.xz 96707392 BLAKE2B 3cbf6d98758a453f16717ec974cb1fdb3ce2e5b2634fcc49a2385f047cf477fad6def173965d3b1b37554d58f95fa73d370a2d1c0a2e58f4b2a8fa580774a2ff SHA512 0d0d4bdfbed7d821364f87f53dee5557f015117b1cf96da9f9e2a9487c7b19a2126b6be8c604370ed4a83ab15612b4386cd1572bf48a673abf5b66c6fde92064
 DIST syncthing-1.21.0.tar.gz 6319691 BLAKE2B 390a06ff41ed1b023941d958d8112f9c503c296cc47a5bb6d6baa55d81f6cbd431c725cc6493b041a96734e56c9a267c6a3b4c564b67ab320cd7f9d46e173320 SHA512 ad613da2c3aaa4792703e69dde0ab3ace3a92f20b968a2d7c02d6ec3b6ce2d53a6c3d6b64c41c58ca8296bf722e689cd8ca34c05fd0dd32d8005d31b5f860d58
-DIST syncthing-1.22.0-deps.tar.xz 97369828 BLAKE2B ad8fbaf51f6d07f1f034e52c457c4a6da432faee43cb66fe23c77a49d01e333403616aadd7643bcbbcef6403e3574a0a30dbf0e6bffb196ae30ba1bc70602577 SHA512 da054614abed605b54bbdb189d9c352a887c817c72f123fc6dde66923fc7d0bed551055c17eae4b88f1f347c3f85362b436267bb2ac9adb8297c3257777d9b38
-DIST syncthing-1.22.0.tar.gz 6345841 BLAKE2B 96c17290c971224d90be661cb80f95fceddee61dd9c90437d051ac48954802fd66ae0178f784238e99f0c63cdaf5c12768bcd679bb91a4728fa86536a24f90a7 SHA512 151119ad526e4c9cddb6889449c43fcc7f91dd3c4bd44cb5e4f40839c55202d8fcd8dff9212e4f0fdf0176c97dfe904d3cf68fdd7c609942344a13f534652c0d
+DIST syncthing-1.22.1-deps.tar.xz 96691264 BLAKE2B 6e53008ea0fc1fd719db4be4f9430fd805f59babb86d47f933f470bfa27757c50bea907ac9fd5290ef9180375e1bc747cd4b3c426406944f2b1eab16a24b58df SHA512 974c880bbac0712254387d9c24a7c72b6d6683005bafc649b7994dd676a906cb9eff5efeb70704e7c5b053e368a026db38efd8f5f78415d299e49b7f8dcd772c
+DIST syncthing-1.22.1.tar.gz 6332134 BLAKE2B d05af17fdff2c3b4bee63aea550d38dac71637f862daaf350ff1fa50d9815039a49e1ba1c18a9062e7fe962006ca62c3335739923a6e0efc3867c19339b2841e SHA512 6f1f83f489bc6e155fef4ed6e876d2afe63f1b6233c324a0fe77702118df11c4b8d3c61e11dbff79ead8f0d12a4abe3af9fa7659dd72ba2c83fee2f524d7a780
 EBUILD syncthing-1.21.0.ebuild 2897 BLAKE2B 748f73dfa7ba3452218faaea3fde4a2b2c61e4f87f0a780a50c02a45bd339113554debcda41caee9f08e095e8f201972e6db9abb26d7cdaed3929a011457fd05 SHA512 85b360bec619a80cac79fcd7e8bac4b2d85597137ee3dbbc0a0ab5d8b3b718ae668851c325a9889d331d028bed6e0d7da862c32e9d673ccf605f326c18881a4c
-EBUILD syncthing-1.22.0.ebuild 2902 BLAKE2B 0a1e2f08da90723d279aa2efc4baf14d876b1997da4ca214e0eeb4b9fa1dcb831bfda756fc4f7105534b2123a1e7f555d668cc82495a3a285cd52ce00e75201e SHA512 c4d5258e7972ec814d0c2a556e0f50a350e940a1969403e8b2be0f56abf2e11951001d25aaf06da42fdac6dc79176bde5340e275cbb529ebd8118ac44d03b893
+EBUILD syncthing-1.22.1.ebuild 2902 BLAKE2B 0a1e2f08da90723d279aa2efc4baf14d876b1997da4ca214e0eeb4b9fa1dcb831bfda756fc4f7105534b2123a1e7f555d668cc82495a3a285cd52ce00e75201e SHA512 c4d5258e7972ec814d0c2a556e0f50a350e940a1969403e8b2be0f56abf2e11951001d25aaf06da42fdac6dc79176bde5340e275cbb529ebd8118ac44d03b893
 MISC metadata.xml 870 BLAKE2B 9d6abd4129ab6ab9ece49e3cb74b6537cf185c5e7e0d7cf893543ea6e75be83e534a8d3f4d042aeb778f9284c9ed7a6f2d60461593ae46f65901a42a3582acc2 SHA512 ef4f1fb81733a7c53f4deb239de1d01d4d2710cf92cb4abfb49659f64bfe5a080c3ab50ec9ec9bda531d0ca87f2f5b9ac80fe1beba1eaaccd1971b1759b3e93a
diff --git a/net-p2p/syncthing/syncthing-1.22.0.ebuild b/net-p2p/syncthing/syncthing-1.22.1.ebuild
index 4f3b90d5f252..4f3b90d5f252 100644
--- a/net-p2p/syncthing/syncthing-1.22.0.ebuild
+++ b/net-p2p/syncthing/syncthing-1.22.1.ebuild
diff --git a/net-p2p/torrentinfo/Manifest b/net-p2p/torrentinfo/Manifest
index a443686a1d61..062c9c608ef8 100644
--- a/net-p2p/torrentinfo/Manifest
+++ b/net-p2p/torrentinfo/Manifest
@@ -1,4 +1,6 @@
 AUX torrentinfo-1.8.6-fix-tests.patch 934 BLAKE2B 6204fd3d04f7c8ddd4f4e9b9c64683003a4eb19f06fe5d7b7f76d3cdcb356b279ca4ac2d226080422f7bf98711d591b6b054d25539f3aa4096ad25ba970d6ef8 SHA512 d878048fe01bea0260f6b3045e77f88a6fb94ed11e15996fa3389119d8315657f77d2434d2c67b3ab58c83d4741f11c22723f0e9abbd06f4ab0df82cffc1b064
+AUX torrentinfo-1.8.6-remove-nose.patch 1120 BLAKE2B 063bbe273418ea1f21e680d0bd531a4dde222a8a819485e8b816c6c071e2b352d6cb5b8073d928652eb6e84af03193b668fc1b8616bb88564a737fdc9b488263 SHA512 e53ff5d90581557dc922f8365b2887f1a992ef14c81ff1bccf3cb795ef801067e7b47862406715c175798dd8ddcbecdc48de36f7820906fb68e5e720dbf6e090
 DIST torrentinfo-1.8.6.tar.gz 22232 BLAKE2B 04159e4e54fbe979a1a73e1dee39c9b7f9def389c44e3886fd28707646a2bc4c6a4dfadd5494ef9283427959da1c36260828693a0008e09993786d8639813bcf SHA512 7f36f6c80876cbd70ea9e1331195c8a30a6546406f345402d4bec5c58afb9b03a3b60189b8d177a63a7047c3ede7fc18d8fc47ecb1bcbb726dd01b7cb2a6efb2
 EBUILD torrentinfo-1.8.6-r2.ebuild 719 BLAKE2B 4db25adb75202804460015033a36b08ef591201643241a3c533142f114cde839637e7fb6842f6ca0b6cc746eac4247a8b93ea8fea5e1a1e7b5e7413493c526e5 SHA512 e9205639874b8d57fdcf4427c5e5d387f7bb15218d007615e657ec52ff2a29013772a163670bf4270ea11869c17c5ab08ffeb35850c034818692773edae6051c
+EBUILD torrentinfo-1.8.6-r3.ebuild 652 BLAKE2B 816122184ad276d8b81612819cd782e2f03a7f1e0b63a81a68520707237de240712307b7d63f3710af9217d0cce653fb660176f8451f217f4688c08fc05fb1b7 SHA512 8b5dc4b5b020cf8adab8c3ef6c97043e83e438599a97f43ed9d792256530a6f310ea5d40c9923e272ba194942fd56d4640970a9f5d2cca80f2d9993936e74689
 MISC metadata.xml 515 BLAKE2B b36c6d7d836beaf1b24d3a2af4ee6b7f06e6394184b189e300dabf39c22ae389ffc9d8f0bf938dea193fb75311c7f46aa4ec314273f4ebc9216a379e610409ed SHA512 483b2af67e183b6a461bdbac5966e49ac084117ff060ca1ae4dc3b96108f52e97cdd636263fd448316d74f259d1617b8ef68f1a65bcf8d2b2d121a5982af3386
diff --git a/net-p2p/torrentinfo/files/torrentinfo-1.8.6-remove-nose.patch b/net-p2p/torrentinfo/files/torrentinfo-1.8.6-remove-nose.patch
new file mode 100644
index 000000000000..260b5c494321
--- /dev/null
+++ b/net-p2p/torrentinfo/files/torrentinfo-1.8.6-remove-nose.patch
@@ -0,0 +1,38 @@
+From ce97e73493bded33bf83934bd7affd49aff58379 Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Sat, 5 Nov 2022 02:54:34 +0100
+Subject: [PATCH] Remove dependency on nose, fixes #17
+
+Also rename the test file so that it uses a standard name that pytest
+autodetects.
+---
+ test/{tests.py => test_torrentinfo.py} | 5 -----
+ 1 file changed, 5 deletions(-)
+ rename test/{tests.py => test_torrentinfo.py} (99%)
+ mode change 100755 => 100644
+
+diff --git a/test/tests.py b/test/test_torrentinfo.py
+old mode 100755
+new mode 100644
+similarity index 99%
+rename from test/tests.py
+rename to test/test_torrentinfo.py
+index 9e67c9c..ba9bbc7
+--- a/test/tests.py
++++ b/test/test_torrentinfo.py
+@@ -27,7 +27,6 @@
+     from io import StringIO
+ 
+ import unittest
+-import nose
+ import re
+ import torrentinfo
+ 
+@@ -704,7 +703,3 @@ def test_is_printable_ascii_success(self):
+         test_string = 'perfectly printable ascii'
+         torrentinfo.dump(test_string, self.config, 0, newline=False)
+         self.assertEqual(self.out.getvalue(), test_string)
+-
+-
+-if __name__ == '__main__':
+-    nose.main(buffer=True)
diff --git a/net-p2p/torrentinfo/torrentinfo-1.8.6-r3.ebuild b/net-p2p/torrentinfo/torrentinfo-1.8.6-r3.ebuild
new file mode 100644
index 000000000000..877569c19445
--- /dev/null
+++ b/net-p2p/torrentinfo/torrentinfo-1.8.6-r3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A torrent file parser"
+HOMEPAGE="https://github.com/Fuuzetsu/torrentinfo"
+SRC_URI="https://github.com/Fuuzetsu/torrentinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	# https://github.com/Fuuzetsu/torrentinfo/pull/16
+	"${FILESDIR}/${P}-fix-tests.patch"
+	# https://github.com/Fuuzetsu/torrentinfo/pull/18
+	"${FILESDIR}/${P}-remove-nose.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index bf6909c4b0b1..ace1128c5e30 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 8b2edec403b9..bb1c0370ebfe 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,10 +17,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Ionen Wolkens <ionen@gentoo.org> (2022-11-04)
-# www-plugins/pdfjs is not stable yet
-www-client/qutebrowser pdf
-
 # Kai-Chun Ning <kaichun.ning@gmail.com> (2022-05-23)
 # Dependency media-libs/intel-hybrid-codec-driver is only available on unstable
 # branch
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 55d0cb78a907..29f4d02ab808 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2022-11-04)
+# media-libs/libffado is not keyworded here yet.
+media-sound/jack2 ieee1394
+
 # WANG Xuerui <xen0n@gentoo.org> (2022-10-04)
 # Sanitizers partially supported on this architecture.
 #
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 590fe3df865a..ed1d330d8a57 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4628,9 +4628,13 @@ media-sound/herrie:xspf - Enable support for reading and saving XSPF playlists
 media-sound/hydrogen:archive - Use libarchive instead of libtar
 media-sound/hydrogen:portmidi - Add portmidi support
 media-sound/jack-audio-connection-kit:pam - Add basic realtime configuration via sys-auth/realtime-base
+media-sound/jack-example-tools:jack-net - Build jack_net_* example clients
+media-sound/jack-example-tools:jack-netsource - Build jack_netsource for configuring network sources
+media-sound/jack-example-tools:zalsa - Build the zalsa internal client using media-libs/zita-resampler
 media-sound/jack2:classic - Enable building of jackd
 media-sound/jack2:metadata - Enable metadata API
 media-sound/jack2:pam - Add basic realtime configuration via sys-auth/realtime-base
+media-sound/jack2:tools - Pull basic tools (e.g. jack_lsp/connect) from media-sound/jack-example-tools
 media-sound/kid3:acoustid - Build acoustic fingerprinting plugin using media-libs/chromaprint
 media-sound/kid3:mpris - Enable support for MPRIS2 interface using dev-qt/qtdbus
 media-sound/klick:rubberband - Enable rubberband support
@@ -7092,9 +7096,12 @@ sci-astronomy/siril:libconfig - Require dev-libs/libconfig to read old configura
 sci-astronomy/siril:wcs - Add supprt astrometry features using sci-astronomy/wcslib
 sci-astronomy/stellarium:deep-sky - Install extra deep sky objects catalog (may affect performance)
 sci-astronomy/stellarium:media - Enable sound and video support
+sci-astronomy/stellarium:scripting - Enable JS scripting via dev-qt/qtscript in Qt5 or using Qml via dev-qt/qtdeclarative in Qt6
+sci-astronomy/stellarium:show-my-sky - Enable a better atmosphere model via sci-astronomy/calcmysky
 sci-astronomy/stellarium:stars - Install extra star catalogs
 sci-astronomy/stellarium:telescope - Enable telescope control via sci-libs/indilib
 sci-astronomy/stellarium:webengine - Show online results about the selected star in an embedded window using dev-qt/qtwebengine
+sci-astronomy/stellarium:xlsx - Support XLSX (Excel) files via dev-libs/qxlsx
 sci-astronomy/swarp:cfitsio - Link with sci-libs/cfitsio
 sci-astronomy/wcslib:fits - Enable support for the FITS format through sci-libs/cfitsio
 sci-astronomy/wcslib:pgplot - Builds PGBSOX routines, needs sci-libs/pgplot library
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 30ebbf058519..367815180770 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/calcmysky/Manifest b/sci-astronomy/calcmysky/Manifest
new file mode 100644
index 000000000000..41084953bc2d
--- /dev/null
+++ b/sci-astronomy/calcmysky/Manifest
@@ -0,0 +1,3 @@
+DIST calcmysky-0.2.1.tar.gz 2161314 BLAKE2B b0aa1abc75f59c9c16429749bb8669e49e17e3dc7716bb78f472a9181c7d77a2c82c2f3800529f620604f233f88855908b0b55d824bf259d0912e157b9537faf SHA512 3915b965ee656b259ce7f158dfdd3c9c11a6c3ff907307899ae55e88ad6c1ccfbec8e0a1f784f5232fb0cb2c8300422fa25b8b1d4d11639d3ebb8c76d67059e5
+EBUILD calcmysky-0.2.1.ebuild 1193 BLAKE2B e12fb400bcf40d90fb612685b8eb6d7c257ca6e0140bb6159fd9c3ee7735701665be8667252c423cf67486e8eebb0c1ca8caee4cffb1a7afbab0f89eb0e2b1f8 SHA512 535c0a08f7ce74159dc19e8c47ebef10d92114dcc1578c54e5e718850218c8dcfdf1e8698745e0853ff83c37204432dfffdb539daccb90b35f1189f8a94e5ba8
+MISC metadata.xml 582 BLAKE2B dbfe97e6d7c27ec436cd080f0d9c7969f4a13a174db9637970dc19d9ca3c6387e3de1f97093fb8699e22f77927daa49e10709bfe14b91ade50e3d8bc449bfcb2 SHA512 ec397bf939ac6935284ae74ceca2cd253b9558d963ab627153cd5360bff6f506a8cfe53cbf49a38a59a71fd3013f25138c44d1034aed134f0d1995d021ad7408
diff --git a/sci-astronomy/calcmysky/calcmysky-0.2.1.ebuild b/sci-astronomy/calcmysky/calcmysky-0.2.1.ebuild
new file mode 100644
index 000000000000..47c8b4a34689
--- /dev/null
+++ b/sci-astronomy/calcmysky/calcmysky-0.2.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multibuild cmake
+
+DESCRIPTION="Simulator of light scattering by planetary atmospheres"
+HOMEPAGE="https://github.com/10110111/CalcMySky"
+SRC_URI="
+	https://github.com/10110111/CalcMySky/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-3"
+# subslot is soversion
+SLOT="0/14"
+KEYWORDS="~amd64"
+
+IUSE="qt5 qt6"
+REQUIRED_USE="|| ( qt5 qt6 )"
+
+DEPEND="
+	dev-cpp/eigen:3
+	media-libs/glm
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtopengl:5[-gles2-only]
+		dev-qt/qtwidgets:5[-gles2-only]
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,opengl,widgets,-gles2-only]
+	)
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/CalcMySky-${PV}"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) )
+}
+
+src_configure() {
+	my_src_configure() {
+		local mycmakeargs=(
+			-DQT_VERSION="${MULTIBUILD_VARIANT/qt/}"
+		)
+
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant my_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	multibuild_foreach_variant cmake_build check
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/sci-astronomy/calcmysky/metadata.xml b/sci-astronomy/calcmysky/metadata.xml
new file mode 100644
index 000000000000..ef26156cdf6d
--- /dev/null
+++ b/sci-astronomy/calcmysky/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-astronomy@gentoo.org</email>
+		<name>Gentoo Astronomy Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">10110111/CalcMySky</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index ca3434e49bbf..8daf9e3d1107 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -2,13 +2,18 @@ AUX stellarium-0.20.3-unbundle-indi.patch 3217 BLAKE2B 9de42cc423655ef8280fc5d40
 AUX stellarium-0.20.3-unbundle-zlib.patch 844 BLAKE2B 24468924728aa9f77ebb2a48d87ecef2eb98768dabc8fcf914972da70feca1dc1de9e32e658afdfb796c769244a2882be8a46c4b9145c6e0109498a5f090baae SHA512 e8a645a302f890e0590369ea6b1642fe38f91b20a3076f8c5201b2b23581394dccc6a0b56e2423e3ab45e926e1a3266bf1fb24e0647ea05e59219147e8b53a1d
 AUX stellarium-0.22.2-ccache.patch 340 BLAKE2B 0365157d357d55d321b297a61911dd52e7230faa9a4460c1373543e0e6021a2651ddff15457e35c966ee207db56fe4ba0cdc2dc4f9cba2255a8be9c75b2cc02b SHA512 62aa2767f02602b787560c48fa72de3c9d7ed09529abfa60bd7f11651913ea5ecabfa2ed1087a0aae16ec5b6a7f8706956d641a11fd7e29133f69041492a51b8
 AUX stellarium-0.22.2-unbundle-qtcompress.patch 7561 BLAKE2B c9bc4b051fcd26949ecd805c5e235015bbd58e23d7afb92e0576e4eee41ce567ce8f31fa4512f03824493083a56c851b19ec81f806b437916b05853ccdf43f28 SHA512 7c00dac2184ec97177a65fd4d5b10af9b915da86dd72c187633060609e5080186079563b555ecbdb742f6880c37b3d489b6c1f2cde5167fc446353746c474758
+AUX stellarium-1.1-qxlsx.patch 538 BLAKE2B 0d604477ad04c23daf5b112690da0be0853e283ee670ac874d2b6d1e288e2370bcade10b30ef5efcfb18829b109d0e9297a2f39d3294b54e2379d635da799f85 SHA512 ea309f4221a8fb32680af30c4c26acbf302753ae891bbdddab83e91c1fd574ae09ff5958935798532d76ba2147eb0c2c36b6e2a7c09f81ca66c0120ef6e2fb2e
 DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb
 DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723f677d0dda98d27c50791d9825c0e0feca7b00f0cb82ce362bc83f3e8dc2260d14e81e4a070cbbfa44f2107ba SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0
 DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977
 DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
 DIST stellarium-0.22.2.tar.gz 409151525 BLAKE2B c49abfb17a8bf7b120d8a0dffbe58b83e18f86b7ef2764cddc946e0cbaad9bf01adaf8d008557108f6354ed11d79e56d94c92c2a07befbd955aed8d201b68292 SHA512 ed905f58e1ff8b257b1e054ca76c83470915b00a04f7925b63784aa62b74e972f332e0b7dc605ffc17bb6516ef4f045943cb564d9637238726b9d7ceb2d44dda
+DIST stellarium-1.1.1.tar.gz 413806998 BLAKE2B bd5679aa32edfa44807e941d0febcb1c1749eada6c2834cb16de4cc9850735c3033122fd1e4afc8b8550441b8a8f70865f6a7b3eb178bf906c8b64d7829ea3f6 SHA512 4564b8df21afb5d266c21e4d59a5df52a0695f102dc68d59d37ea29e520495132c7fb01235ceac5d68b0812fc05d35b5f8c7a5c337c55007ce562f770e3a3612
 DIST stellarium-dso-catalog-3.16.dat 28678822 BLAKE2B 130513b5dcb0d06dd605ed62d6bdf12bfd636a5e5f5c33f02c7adb77a6712245a98ce3d56332fce6fea0f18c9b7915af4bb3d9812b1fd09bfc036d4135cef4f5 SHA512 9320d2a3c9af93d19cc4414f371991993793b78315448cafcd83b82de6dc16715b0cab2ddeafca667af31a9086420cbe758708333e5b95215de8a46305324c41
+DIST stellarium-dso-catalog-3.17.dat 28678790 BLAKE2B 8ec14dd34c749a5bea19cc5567b2d703a7e5d4192eda6636fcec9fb2ef0301fd654aefdf4b33db70210da73eb9e385ace2265a57199f5660ec7034887fdcc80f SHA512 c0c679bd9de9e7ac000be5902d3a1e863853e8f9c382186253dd2d77a658fe93a9e2e206ecd1396f64b7b6cd4e738ecc2e11ea43bc6f71a098a44eb77875978a
 DIST stellarium_user_guide-0.22.2-1.pdf 35082446 BLAKE2B c9bb7f344a9377fe86b714904aa713c7e6cda59d31f8e547b571da0a057d141fa1b998b4adb3dbdcee0bb7a152b6f6e18b58a4a08c345dc0e77efca6ffb5a801 SHA512 45adfe53fa9c7432952152d95ab96a446a6459348fa6724fff83aababb0c967d9467cc0ca3bd24b834fd189fb69c782e521d94528a60a704062aa445e749a4a5
+DIST stellarium_user_guide-1.1-1.pdf 36567672 BLAKE2B d1b7f9c8d8974aeabe92e3127c84a79b92dd9c3a0057b7831a1851c7fc88c13ec456375847e90576448a5dbe655846142637c91067cc10df20ae2b9373190e8e SHA512 2dbcf4100c1f24770fa23b2995103b94f0736eacca76031cecac582364948a4cb0e32aabdb554a30a7a64ed53eaa3538d59d7af2434eb74a04d562f1453bc89d
 EBUILD stellarium-0.22.2.ebuild 4063 BLAKE2B c5068f6b138eddcef9a1690f1645bb8b597ee3642507cd5098bf5a1a1de93e23407ba476229fb1025dfb33e2a7fd291cbbcd2c019a0b9e96ad4a24afc438ee3b SHA512 fbacac381f17706fe72ee905e2eca8dd5699e8ab0b38971baaba13f4ffa31cab5d10b38ecbb0b73dd5cf2a135a19f887132d5d62c88222be4fb58cdcf4b29a63
-MISC metadata.xml 1331 BLAKE2B 858e48ee46003e8f9d5cb7c6dfe0dd0dab5126c069592c7edbdf2ddf0e3b281d4e5cab5cf21b6197dbde7d7a152225999773265cc4319a4550f15ee2c9903626 SHA512 7e801dbdccaef56276bde6a96bfd61811e6d6b6fcba21238d889d8b882afb9e983ed921dd4d30015107cc48afe6539c19a7bb6692300800ed9f8cc5e4166b5e7
+EBUILD stellarium-1.1.ebuild 4738 BLAKE2B b17aa799a1dfe2b9b4be8861496c4c05e7ed0e9b3b10de4a1fb2ec38fea6ba21e92210ea8cc3bdcfd5ed4b1d0df669a1a9167a615e6207e715f45ec297b94f87 SHA512 0630e7d4a7937e25da41f4fa51d3197349457a56adf3d0763274984fc5525d89743a41c0580dc9dee08ca0447ad112262c5f40fa97722b6915f8cee743a86a57
+MISC metadata.xml 1667 BLAKE2B dd7848212ed755809c49cdba0ed63138b5f6f188240f71601e113894fded940ed3ea3850028915700961789f150ea7f5d91a4ff6c4570b753dbe6ff397b81b46 SHA512 bea670b08be632304aab3b9d456bce249f2109195e6e309bd703778e5a93561e552212c900897b72e293a3d81d188afabd5e1d8c213334f6d01b1dc035badca6
diff --git a/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch b/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch
new file mode 100644
index 000000000000..f3e4c9c38ab7
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -815,7 +815,7 @@ IF(ENABLE_XLSX)
+      # TODO: switch to something like vcpkg or conan, and plain find_package,
+      # without the fallback of cmake downloading the dep itself.
+      # But some libraries are not available there yet.
+-     CPMFindPackage(NAME QXlsx
++     CPMFindPackage(NAME QXlsxQt${QT_VERSION_MAJOR}
+ 	 URL https://github.com/QtExcel/QXlsx/archive/refs/tags/v1.4.4.zip
+ 	 URL_HASH SHA256=3efbd6f63a1ffd521c535dce7b5a5a7e9ebd23db51e6ae8e3e2eb89796e57675
+ 	 DOWNLOAD_ONLY yes
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index a164ddaabccc..d4860f0597dd 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -22,9 +22,12 @@
 	<use>
 		<flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag>
 		<flag name="media">Enable sound and video support</flag>
+		<flag name="scripting">Enable JS scripting via <pkg>dev-qt/qtscript</pkg> in Qt5 or using Qml via <pkg>dev-qt/qtdeclarative</pkg> in Qt6</flag>
+		<flag name="show-my-sky">Enable a better atmosphere model via <pkg>sci-astronomy/calcmysky</pkg></flag>
 		<flag name="stars">Install extra star catalogs</flag>
 		<flag name="telescope">Enable telescope control via <pkg>sci-libs/indilib</pkg></flag>
 		<flag name="webengine">Show online results about the selected star in an embedded window using <pkg>dev-qt/qtwebengine</pkg></flag>
+		<flag name="xlsx">Support XLSX (Excel) files via <pkg>dev-libs/qxlsx</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">Stellarium/stellarium</remote-id>
diff --git a/sci-astronomy/stellarium/stellarium-1.1.ebuild b/sci-astronomy/stellarium/stellarium-1.1.ebuild
new file mode 100644
index 000000000000..e10dc3e47f19
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-1.1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://stellarium.org/"
+MY_DSO_VERSION="3.17"
+SRC_URI="
+	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.1.tar.gz
+	deep-sky? (
+		https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
+	)
+	doc? (
+		https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
+	)
+	stars? (
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
+	)"
+
+LICENSE="GPL-2+ SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug deep-sky doc gps media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx"
+# Qt6 QAudioOutput crashes on startup; qt 6.4.0
+# https://bugreports.qt.io/browse/QTBUG-108221
+REQUIRED_USE="|| ( !media !qt6 )"
+
+# Python interpreter is used while building RemoteControl plugin
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	doc? ( app-doc/doxygen[dot] )
+	nls? (
+		!qt6? ( dev-qt/linguist-tools:5 )
+		qt6? ( dev-qt/qttools:6[linguist] )
+	)
+"
+RDEPEND="
+	media-fonts/dejavu
+	sys-libs/zlib
+	gps? ( sci-geosciences/gpsd:=[cxx] )
+	media? ( virtual/opengl )
+	!qt6? (
+		dev-qt/qtcharts:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5=
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		sci-astronomy/calcmysky:=[qt5]
+		gps? (
+			dev-qt/qtpositioning:5
+			dev-qt/qtserialport:5
+		)
+		media? (
+			dev-qt/qtmultimedia:5[widgets]
+			dev-qt/qtopengl:5
+		)
+		scripting? ( dev-qt/qtscript:5 )
+		telescope? ( dev-qt/qtserialport:5 )
+		webengine? ( dev-qt/qtwebengine:5[widgets] )
+		xlsx? ( dev-libs/qxlsx:=[qt5] )
+	)
+	qt6? (
+		dev-qt/qtbase:6=[gui,network,widgets]
+		dev-qt/qtcharts:6
+		sci-astronomy/calcmysky:=[qt6]
+		gps? (
+			dev-qt/qtpositioning:6
+			dev-qt/qtserialport:6
+		)
+		media? (
+			dev-qt/qtmultimedia:6[gstreamer]
+		)
+		scripting? ( dev-qt/qtdeclarative:6 )
+		telescope? ( dev-qt/qtserialport:6 )
+		webengine? ( dev-qt/qtwebengine:6[widgets] )
+		xlsx? ( dev-libs/qxlsx:=[qt6] )
+	)
+	telescope? ( sci-libs/indilib:= )
+"
+DEPEND="${RDEPEND}
+	!qt6? (
+		dev-qt/qtconcurrent:5
+		test? ( dev-qt/qttest:5 )
+	)
+	qt6? ( dev-qt/qtbase:6=[concurrent] )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
+	"${FILESDIR}/stellarium-0.22.2-ccache.patch"
+	"${FILESDIR}/stellarium-1.1-qxlsx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	use debug || append-cppflags -DQT_NO_DEBUG #415769
+
+	rm -r src/external/zlib/ || die
+
+	# for glues_stel aka libtess I couldn't find an upstream with the same API
+
+	local remaining="$(cd src/external/ && echo */)"
+	if [[ "${remaining}" != "glues_stel/" ]]; then
+		eqawarn "Need to unbundle more deps: ${remaining}"
+	fi
+}
+
+src_configure() {
+	filter-lto # https://bugs.gentoo.org/862249
+
+	local mycmakeargs=(
+		-DCPM_LOCAL_PACKAGES_ONLY=yes
+		-DENABLE_GPS="$(usex gps)"
+		-DENABLE_MEDIA="$(usex media)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_QT6="$(usex qt6)"
+		-DENABLE_QTWEBENGINE="$(usex webengine)"
+		-DENABLE_SHOWMYSKY=$(usex show-my-sky)
+		-DENABLE_SCRIPTING=$(usex scripting)
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_XLSX="$(usex xlsx)"
+		-DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		cmake_build apidoc
+	fi
+}
+
+src_install() {
+	if use doc ; then
+		local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
+		dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
+	fi
+	cmake_src_install
+
+	# use the more up-to-date system fonts
+	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+	if use stars ; then
+		insinto /usr/share/${PN}/stars/default
+		doins "${DISTDIR}"/stars_4_1v0_2.cat
+		doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
+	fi
+	if use deep-sky ; then
+		insinto /usr/share/${PN}/nebulae/default
+		newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
+	fi
+	newicon doc/images/stellarium-logo.png ${PN}.png
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 0c532b36e1ea..44dc46c053a7 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index d06161cbeed9..d71a196b3d6b 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -17,12 +17,12 @@ DIST chromium-106-patchset-3.tar.xz 6672 BLAKE2B 4c56702e84c761b5b4e5ea84a3e9bed
 DIST chromium-106.0.5249.103.tar.xz 1611232904 BLAKE2B 8c16faf7b450a9e55e19c607afc7252d6fb013d1735ff1fe8e4d54953fcc3bf7a5a5416ae0bbdf8cb15074841a63ad4485e1ff24fdf557e5b76bafd483f7418d SHA512 a01d34473e2fda00389aceb7a1024573c4346423e7a5de3398508130bf9f2f1aff22c23bbd613cc2bb46f0a907f19887b28decdb9d57bccdb5d3f7a14d1866db
 DIST chromium-106.0.5249.119.tar.xz 1611067204 BLAKE2B 39132fbb82cfd46e631ce77ae0334756d23f7b870b8ab2d2adac206cd754e229c8f10ed73a08bd64c8868b85e47f27f03089bbdba028a9d537daf95165814843 SHA512 9f2d01c9a670a36eff3de4423a7cf3b59b10053e17275646cff7438ce02c5b96b6d79640d5e58b499c419e019f09442bec7ecbd9e6b1cbd7632f9eb864d4f138
 DIST chromium-107-patchset-1.tar.xz 5736 BLAKE2B 581ca307d63635ef91aaa907aeebb8c735be6d6bbfcc3fe064fed7531b8848b5d918e017031ee606ed3bd8f0fc23aa6d2f8af4b36d33483dbeee2b5c8eacac82 SHA512 acbfb41c31a510a689cad3b0686e24925b018bd7a2a8f56f74b730dc36d878c266a11b3bb76b131e66f7b859f483ff00e16cbaae1b2b6944010c7396310c03b8
-DIST chromium-107.0.5304.29.tar.xz 1688306728 BLAKE2B 2e00ce9cdfe41ed20004ccdf11f7d0f5824f1b23ac706e18c3891ff189983815f1ccbd26e1a12862db0688f6bc045fcf49d7694043883a608b182994cd8f2cec SHA512 871c373b44b18167126deef82ec835e33772c27d5c9d89585a1752efdcade8696c3be5d2735999838b13e3ce2e06d431f30f3591e861d1dcd7a80281817851eb
+DIST chromium-107.0.5304.87.tar.xz 1688896996 BLAKE2B bca3506b55f29be6d40db8d4b1350a1703b1899136a2d66159619c202a37e6bf0d35fa21f79125c21bd079ed8002a6e41721f31578c7c48b12e1c4084a1e0b34 SHA512 9db2f8ea4f4f0c2a9791d1e03552f7fc3843338f1272975593347cdf85db283f55ad84fdda564609d52d95c36f4de8d662d24df7cc2e6dcf69d184765469233a
 DIST chromium-108-patchset-2.tar.xz 6480 BLAKE2B 2a40bb741fdd305b3525b790f82c2b36f6c909680788527a31aa2a11f519ff630aa12ffe7c53553b717f1909978c77e7db07a02a86c8e7d12d63375402802d7a SHA512 3fe182f0f928baaf0f5521efa8763080de765240b5608d5126e84e49335eb5edc788ab406aa71f5fa97c371afe1f6808e93e2e082c7f65169b5f157ff6c3e00b
 DIST chromium-108.0.5343.2.tar.xz 1669214708 BLAKE2B e022bb908b15a5ae645d23cc5ab1e268ab87b77af3ae9ac352f6dc2fc9ba36f9e212cd53f4e3fdb18bb114f89ffada3f0fbee2b2fd46b6824fccaa68e21d930a SHA512 ff74eae98a44ebfc77a729ee65b4d338fcc39f04f2168247eed039d5c19c945d90c2b6aa5a12ca96d493c5116c2dcf9c959c74ffe2dc25ea6717176f699342b2
 DIST chromium-profiler-0.1.tar 269066240 BLAKE2B 6897387b63ff9a724b67f2e8799fe803dc75da376da809e752d19d6f5cf98bd84ac24161d07ac4a967577279e9ad5a8a46f0825332a7ee933a27693d6dc95611 SHA512 3fb6132599d28455d1b5c04d856ea7623e49b0b0b96f021c31d0952c4ba57d69d0a1cae6f0b91470a235221c89cc0d3bb38303ff02594ed0739712e6e2f8dbcc
 EBUILD chromium-106.0.5249.103.ebuild 37270 BLAKE2B 13ad40c93d25cd91db1a8ffb2fb9dff4dcb5e50397614e702a8ffb3a8b70d7c583b7e89788901ddb5d14dc02dfa92aeca07ef146ff5bc187f85649ce2091be18 SHA512 82dde6f70eba78c8e5d3d1997996f0b9a38772574d3d67bee6970663322526201837d351b5d0984676c3ae6b1afccabb93107e90e453de741d262d49b132d188
 EBUILD chromium-106.0.5249.119.ebuild 37270 BLAKE2B 13ad40c93d25cd91db1a8ffb2fb9dff4dcb5e50397614e702a8ffb3a8b70d7c583b7e89788901ddb5d14dc02dfa92aeca07ef146ff5bc187f85649ce2091be18 SHA512 82dde6f70eba78c8e5d3d1997996f0b9a38772574d3d67bee6970663322526201837d351b5d0984676c3ae6b1afccabb93107e90e453de741d262d49b132d188
-EBUILD chromium-107.0.5304.29.ebuild 37538 BLAKE2B 3391fc5cf9dfab2dfd7a59f59d377944f1b273acb3c7fa8a684ec9bf3a426c8fc926bb24692bf1ee89106ccff5f8588f3ece67b987008ed42b93060038848752 SHA512 627a88aa77d972647a7c0b901a2d271b4788374c793008d50289bfc5f3f94af23ca0feeb919e89daf3d58afd8cb23c113ad0e54c9eecd814b0d55d2f9152cd67
+EBUILD chromium-107.0.5304.87.ebuild 37540 BLAKE2B c10662118a823d49989cfc8ef95c417c49610692127689cf261f296a0e77a2fc89ac1b08b1812e106ebbfc1c90bf46236c866d98db13f43aca8c4491019ea7c9 SHA512 57f32537ff3b460e5b404e2b4a8c90832e58f1744284243418465c78d3c22f4c4443f91b09fcc3559b5bc5fb54c9a3b4f2dd207a48b28217dc1def24dd2f6ff4
 EBUILD chromium-108.0.5343.2.ebuild 37495 BLAKE2B a35fc374748a5adc9c199777a03685166c1454a3c230c2408c3f4e9e9fdd98c03c0fde983621c8bc69050593d2269fae11bb3bc791583e08c379a25fda0b991f SHA512 86b4b3223f14eb6560357936ea13240637e63219e3574f58bb51b2664462dc1e4d66bd97d4719d4ea138cc371b8c8230d1a24c0cdac6e237dc06a0d34de91c1f
 MISC metadata.xml 2128 BLAKE2B f78ae4671e2a0c0df19c9c43b8500b2de2226ee6b3979dd060d6430872c33072c380ea2438063a68b5aa413bce265d3c5b04097e09b11dfd92fe0067e66dfeea SHA512 4693a4782ea679520e4a09a5d4905dc202fc8d422757864069c455692b56101acb68aca588f3c8e07597ef3c6dd37dab7c7b1184c6d1c0f907d838f99097a4fe
diff --git a/www-client/chromium/chromium-107.0.5304.29.ebuild b/www-client/chromium/chromium-107.0.5304.87.ebuild
index ba1a82534fb6..4e27afddcbc0 100644
--- a/www-client/chromium/chromium-107.0.5304.29.ebuild
+++ b/www-client/chromium/chromium-107.0.5304.87.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 	pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )"
 
 LICENSE="BSD"
-SLOT="0/beta"
+SLOT="0/stable"
 KEYWORDS="~amd64 ~arm64"
 IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
 REQUIRED_USE="
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index a9cdd40d6299..9b07e11b074a 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_107.0.5304.29-1_amd64.deb 92716112 BLAKE2B 33639ce65caecb9418b5556505fd57d3728e105fd7e350421840835fe86a5276498220494a2110ccd97e6929eae446e78a105d469d2e60a675b3eafe911fac84 SHA512 e28ffb903cb687dca5b2d1cdc7f754e01e51015ec672af5117d838f1c853d19fdc5b8fc0fb90398b0dadbd680d9651d9db950435b11d9712ed817eccfb0646f1
-EBUILD google-chrome-beta-107.0.5304.29.ebuild 2806 BLAKE2B 82e4335c41d1ee4da1294f3347411fd4ca6a467b9978b0eb18f2361e4c3926303880da39df21ac6439392a0214d43da98f680515fac2db628c61d69160d41701 SHA512 432c17513412573ff0b15006b5a4ffcd5fc854ef2a358c6d14a019f45f1995177f4b159f2833a6d4731dc0de8037f177f35865e70177909a878f3491cc41cc81
+DIST google-chrome-beta_108.0.5359.30-1_amd64.deb 92393248 BLAKE2B 9e11139650a0cf8242673002b528c0a858b3279e282a648d51e1c7ef5480569205aed5924e92126bb824a541040e1a51a13d6ced04f8844f9f12a5e9434cd060 SHA512 b8857938da29eb4d36dfec0bc33543dadf2273a1c2f6d72c2b5c5e748c5a72384fbd938993918fbbc9b8517b3f8f4216087dd93da93a5643ca2b2dc077c8c76b
+EBUILD google-chrome-beta-108.0.5359.30.ebuild 2806 BLAKE2B 82e4335c41d1ee4da1294f3347411fd4ca6a467b9978b0eb18f2361e4c3926303880da39df21ac6439392a0214d43da98f680515fac2db628c61d69160d41701 SHA512 432c17513412573ff0b15006b5a4ffcd5fc854ef2a358c6d14a019f45f1995177f4b159f2833a6d4731dc0de8037f177f35865e70177909a878f3491cc41cc81
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-107.0.5304.29.ebuild b/www-client/google-chrome-beta/google-chrome-beta-108.0.5359.30.ebuild
index b1fd61130859..b1fd61130859 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-107.0.5304.29.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-108.0.5359.30.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index ee6df23589d8..dcd1b1af25e1 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_108.0.5343.2-1_amd64.deb 92647740 BLAKE2B 4c50bd1f433f9698fcac61270d5e596b04899db3f4ab351de3c0bd5959208ccdd6c948f6bfcb23cb0747380b0301f516742374e82746a18a3f8c6e3b96cf2033 SHA512 f398a692456c0e2177c4d842237876cfa56360e99fe6611cb37d80093c54e724d43ea50c87b7250617f87e0f3ca62f6c3ea307646b7fef55178e94c690466d15
-EBUILD google-chrome-unstable-108.0.5343.2.ebuild 2806 BLAKE2B 82e4335c41d1ee4da1294f3347411fd4ca6a467b9978b0eb18f2361e4c3926303880da39df21ac6439392a0214d43da98f680515fac2db628c61d69160d41701 SHA512 432c17513412573ff0b15006b5a4ffcd5fc854ef2a358c6d14a019f45f1995177f4b159f2833a6d4731dc0de8037f177f35865e70177909a878f3491cc41cc81
+DIST google-chrome-unstable_109.0.5396.2-1_amd64.deb 93730984 BLAKE2B 11630c22b483dd57cd1903e7b89dfd367a04b6bf3ac294d411b518d110e029fadd43e76a4502aff217fb1b29d9a755f57c19af06ea50a56e2784c3c45047c63b SHA512 af3462b332aca05a6fb07285893ebd269a8f4cd58571cb7d9dd7d55ceaf117e07c5bdc63a43ad79165a6c3e7fa831a08ab298eb5cbca477cff2b902cde6b3d5b
+EBUILD google-chrome-unstable-109.0.5396.2.ebuild 2806 BLAKE2B 82e4335c41d1ee4da1294f3347411fd4ca6a467b9978b0eb18f2361e4c3926303880da39df21ac6439392a0214d43da98f680515fac2db628c61d69160d41701 SHA512 432c17513412573ff0b15006b5a4ffcd5fc854ef2a358c6d14a019f45f1995177f4b159f2833a6d4731dc0de8037f177f35865e70177909a878f3491cc41cc81
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-108.0.5343.2.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-109.0.5396.2.ebuild
index b1fd61130859..b1fd61130859 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-108.0.5343.2.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-109.0.5396.2.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 6c291f0bd42b..350c0f580237 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_106.0.5249.119-1_amd64.deb 92250408 BLAKE2B 0e9758627b3a015c06fa48ba1403c86f4f680e4ea70824d546a03ac9941cac3b5b363fd4e94d64901c15905836e391010dc67bc0e7e44e6d0bcf5f34e349a870 SHA512 b0c408977cb9f1bae5595fc0e8908b41c0f07cd0abe6fea66dcfbd64516feb7a729f20ede3c3c44dd6db2eeb7fd1213461f9eff3b623e72902ed273877408acf
-EBUILD google-chrome-106.0.5249.119.ebuild 2805 BLAKE2B ee542fcf80833dc447c3b0c5ae5431a8e4d9bb1d194a649bb19b8efc4e06db35851a3d910b476d73478326fb064e74a23a8d24ec024ee1da3549643a0b765061 SHA512 3ccf99e1300f5dc448f66694ae2b6af1938aae64c25a972059c6fe2087673d29ed9f6d5c953ac1decfdb1366b21bc85797fcc8a5e3baf50e6c63db1be93495f8
+DIST google-chrome-stable_107.0.5304.87-1_amd64.deb 92931088 BLAKE2B 344da2abb7f030216d84caa0a79ccd994a8094e5ed65bd490c76ef414ebc29fca0f290e831b5805fd419e130a8d3c269f6676335e026b5e742e90782a23399e1 SHA512 07b443bc1382431da84f6812b7e19f1149aa195fb8b3d28834630cc5964fb9d12124abbf4ec1c98d5c0513cdf16c2a3f16a74518c984aaf57ca418b3cd36a4e2
+EBUILD google-chrome-107.0.5304.87.ebuild 2805 BLAKE2B ee542fcf80833dc447c3b0c5ae5431a8e4d9bb1d194a649bb19b8efc4e06db35851a3d910b476d73478326fb064e74a23a8d24ec024ee1da3549643a0b765061 SHA512 3ccf99e1300f5dc448f66694ae2b6af1938aae64c25a972059c6fe2087673d29ed9f6d5c953ac1decfdb1366b21bc85797fcc8a5e3baf50e6c63db1be93495f8
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome/google-chrome-106.0.5249.119.ebuild b/www-client/google-chrome/google-chrome-107.0.5304.87.ebuild
index debf03942e48..debf03942e48 100644
--- a/www-client/google-chrome/google-chrome-106.0.5249.119.ebuild
+++ b/www-client/google-chrome/google-chrome-107.0.5304.87.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 0ef5d91de2ca..5091c5e64327 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index fb378d971a51..26024e3afb9a 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_107.0.5304.29-1_amd64.deb 92716112 BLAKE2B 33639ce65caecb9418b5556505fd57d3728e105fd7e350421840835fe86a5276498220494a2110ccd97e6929eae446e78a105d469d2e60a675b3eafe911fac84 SHA512 e28ffb903cb687dca5b2d1cdc7f754e01e51015ec672af5117d838f1c853d19fdc5b8fc0fb90398b0dadbd680d9651d9db950435b11d9712ed817eccfb0646f1
-DIST google-chrome-stable_106.0.5249.119-1_amd64.deb 92250408 BLAKE2B 0e9758627b3a015c06fa48ba1403c86f4f680e4ea70824d546a03ac9941cac3b5b363fd4e94d64901c15905836e391010dc67bc0e7e44e6d0bcf5f34e349a870 SHA512 b0c408977cb9f1bae5595fc0e8908b41c0f07cd0abe6fea66dcfbd64516feb7a729f20ede3c3c44dd6db2eeb7fd1213461f9eff3b623e72902ed273877408acf
-DIST google-chrome-unstable_108.0.5343.2-1_amd64.deb 92647740 BLAKE2B 4c50bd1f433f9698fcac61270d5e596b04899db3f4ab351de3c0bd5959208ccdd6c948f6bfcb23cb0747380b0301f516742374e82746a18a3f8c6e3b96cf2033 SHA512 f398a692456c0e2177c4d842237876cfa56360e99fe6611cb37d80093c54e724d43ea50c87b7250617f87e0f3ca62f6c3ea307646b7fef55178e94c690466d15
-EBUILD chrome-binary-plugins-106.0.5249.119.ebuild 1178 BLAKE2B 7e2302efe34d64e47dc50e2030eca39e319040087a38f8ae74c1c6bdfb7caec7cf198c53d83b6134ada98292c79c55a3b19ab88ae74d34023310f921652fefdc SHA512 55691ac6f5b345ad9ba9b3d531f8612d9f062bb531057c95e719fca4f447cd872ad74c575251d31331b6176c3165dbf367f5a7711dd21623663093e056aa9411
-EBUILD chrome-binary-plugins-107.0.5304.29_beta.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
-EBUILD chrome-binary-plugins-108.0.5343.2_alpha.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
+DIST google-chrome-beta_108.0.5359.30-1_amd64.deb 92393248 BLAKE2B 9e11139650a0cf8242673002b528c0a858b3279e282a648d51e1c7ef5480569205aed5924e92126bb824a541040e1a51a13d6ced04f8844f9f12a5e9434cd060 SHA512 b8857938da29eb4d36dfec0bc33543dadf2273a1c2f6d72c2b5c5e748c5a72384fbd938993918fbbc9b8517b3f8f4216087dd93da93a5643ca2b2dc077c8c76b
+DIST google-chrome-stable_107.0.5304.87-1_amd64.deb 92931088 BLAKE2B 344da2abb7f030216d84caa0a79ccd994a8094e5ed65bd490c76ef414ebc29fca0f290e831b5805fd419e130a8d3c269f6676335e026b5e742e90782a23399e1 SHA512 07b443bc1382431da84f6812b7e19f1149aa195fb8b3d28834630cc5964fb9d12124abbf4ec1c98d5c0513cdf16c2a3f16a74518c984aaf57ca418b3cd36a4e2
+DIST google-chrome-unstable_109.0.5396.2-1_amd64.deb 93730984 BLAKE2B 11630c22b483dd57cd1903e7b89dfd367a04b6bf3ac294d411b518d110e029fadd43e76a4502aff217fb1b29d9a755f57c19af06ea50a56e2784c3c45047c63b SHA512 af3462b332aca05a6fb07285893ebd269a8f4cd58571cb7d9dd7d55ceaf117e07c5bdc63a43ad79165a6c3e7fa831a08ab298eb5cbca477cff2b902cde6b3d5b
+EBUILD chrome-binary-plugins-107.0.5304.87.ebuild 1178 BLAKE2B 7e2302efe34d64e47dc50e2030eca39e319040087a38f8ae74c1c6bdfb7caec7cf198c53d83b6134ada98292c79c55a3b19ab88ae74d34023310f921652fefdc SHA512 55691ac6f5b345ad9ba9b3d531f8612d9f062bb531057c95e719fca4f447cd872ad74c575251d31331b6176c3165dbf367f5a7711dd21623663093e056aa9411
+EBUILD chrome-binary-plugins-108.0.5359.30_beta.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
+EBUILD chrome-binary-plugins-109.0.5396.2_alpha.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-106.0.5249.119.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-107.0.5304.87.ebuild
index a8c4f73dffbd..a8c4f73dffbd 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-106.0.5249.119.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-107.0.5304.87.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-107.0.5304.29_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-108.0.5359.30_beta.ebuild
index 48788b628112..48788b628112 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-107.0.5304.29_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-108.0.5359.30_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-108.0.5343.2_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-109.0.5396.2_alpha.ebuild
index 48788b628112..48788b628112 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-108.0.5343.2_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-109.0.5396.2_alpha.ebuild
diff --git a/www-plugins/pdfjs/Manifest b/www-plugins/pdfjs/Manifest
index bf1c19d243c2..65c69e87ecc5 100644
--- a/www-plugins/pdfjs/Manifest
+++ b/www-plugins/pdfjs/Manifest
@@ -1,5 +1,5 @@
 DIST pdfjs-2.14.305.zip 5644865 BLAKE2B 8c8cb282732108e340d75bc575f067d0b9a1040ee49f5febb274270eb706d42f1f61f884467235741969ca5e7e4271903ebaa8e4c09ad2011bab8d2a94182bfc SHA512 9feb730b16b51985b828e12acfa35f2dbcc8c42b0294c477267cd5a2e2d2f65bb994aaa529759238847d6693fe479baedf75fdca27c071fbdc5c0e15081e1c5e
 DIST pdfjs-3.0.279.zip 5716493 BLAKE2B 885f823d5d585728a4a1152d3a421630a97b0a69fb0f463de45dcd323fdb93f74923301c4efaa9dbffb0da61d3210360dd0b5a53618283ca5d190e7ac9fc2646 SHA512 dcaea92a1f8eca67ff6a7dad2664441ddea74907435dcb1ca52416d4692e50d81548a54c36a094e4151427350affebc0a2e32df9183e5ecd41035b54643d852b
-EBUILD pdfjs-2.14.305.ebuild 474 BLAKE2B 91a27ba2b71bf340bd63c041ea3cf49323009fef1b84b89cf0f6bb1a91b71e360fc955ee2e923491e03433b38de80007d8bb792914024b1d89f043e6f1465b37 SHA512 c4665bbfc82415606495f9a6ccf631f9208074b934633814d46d5d01edfb847950c98aed43b998f3d7c8ca1aba1722da8cdfd494abeba44ed4b5e4eb6be817b8
+EBUILD pdfjs-2.14.305.ebuild 473 BLAKE2B 7770421679625ff9461c3dcab83b60708225c390ed0f438cb63bec63e16f8eb44145bc2dd366b90a24b7b8ee0bc891cff204777fe38a8a643e7d197ae024a470 SHA512 1afc138c2db7895d62f94c9f343a771aba198f070910bb98713562d62aaa6ae1eec84916f0dc9d332b484cedf506d70617a0952b544f60cec49fbf79b4fd5ed7
 EBUILD pdfjs-3.0.279.ebuild 474 BLAKE2B 91a27ba2b71bf340bd63c041ea3cf49323009fef1b84b89cf0f6bb1a91b71e360fc955ee2e923491e03433b38de80007d8bb792914024b1d89f043e6f1465b37 SHA512 c4665bbfc82415606495f9a6ccf631f9208074b934633814d46d5d01edfb847950c98aed43b998f3d7c8ca1aba1722da8cdfd494abeba44ed4b5e4eb6be817b8
-MISC metadata.xml 332 BLAKE2B b729018cedc119a18ac5517fe7e9aecfcf848225330353da1aa33139a5ce33b9074e9a8a40bc9ce371d49d940dd5158866d26c63703f4d0f9e92ae7bf8b938c2 SHA512 1979b99c935c10801a9342ecc7abdb7d0b72abc9069a512d4da4d396fda2f9d22f8c0d29a907b489830c92cafcd2d9ffed6d77302ad3a16801bcbccf9da80fc9
+MISC metadata.xml 356 BLAKE2B e03a5d8c7e7af1708a9ae47b956b90dfb3bfb66b0128eb0576d8f3bdae75c10454b13af22be43d8f797aeedfaa0786d4b960eaa373ba3d652ecfdb2664b646ab SHA512 af8d23494092bb8720f57051cf537f7490e7172716d02712d95dc7910facf632f8b68d2a70fd28cec2d4de828f04a5e8e1fe80feece22fdee6e3ca5c7b911ead
diff --git a/www-plugins/pdfjs/metadata.xml b/www-plugins/pdfjs/metadata.xml
index 60b4815c4975..5d1118a6d3f5 100644
--- a/www-plugins/pdfjs/metadata.xml
+++ b/www-plugins/pdfjs/metadata.xml
@@ -5,6 +5,7 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">mozilla/pdf.js</remote-id>
 	</upstream>
diff --git a/www-plugins/pdfjs/pdfjs-2.14.305.ebuild b/www-plugins/pdfjs/pdfjs-2.14.305.ebuild
index 34038e4308fb..91a845a731df 100644
--- a/www-plugins/pdfjs/pdfjs-2.14.305.ebuild
+++ b/www-plugins/pdfjs/pdfjs-2.14.305.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index d4c9984bb5ee..77586aa96eaf 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index a2c51a0513fc..3dc610a68d62 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,4 +1,4 @@
 AUX mlterm-font.patch 606 BLAKE2B 5d9989a2656a0375e79c189db88167f443c3f7ee6f7f8b83972b65cc59b455fcb2c2ee6c4a25c82bb48cb2610d7453a5552b0eb5a17bd80eed947418a038b252 SHA512 60e625e554341feda77a926f3a59c4858ab19a810eeba39810701c429a504666643e1a614586b88379fe2d42606865f0afa8da6c14c1499a52aa1200e8bd5c4a
 DIST mlterm-3.9.2.tar.gz 4259208 BLAKE2B 161d496326abd58e8dabedd4c49e0e17ade77956fd0be6f450d5adf2953fe04a2c62a40d3694296d12cdea1274410e17a64cc62f88b953d894cce216425b29f3 SHA512 3076dafbc98a01738d88acf0e0f52e15d33862b3e9b7a851a4496f1be07ee9e51103daf7842954bcae1f1ba62bd6645b0bd60af7f66ee98721bdf3786b9fcbaf
-EBUILD mlterm-3.9.2.ebuild 2980 BLAKE2B be6236f65bcb739ff477476586aa34eba1eebda0a7541cb53dab64f5115c0fe9bc86f079bb89a3ddb2cbd8f083c7940ae8d96df65478ef7c7bdd735a6b41b157 SHA512 ce2232186b250af4f1b1be0a30623a45efa2ecf95995dc5db68e3996ec53ecf816588e852e8fd2c5cd92a425ddff040b027e2d500d0cabf264ec57f21d516d9b
-MISC metadata.xml 1228 BLAKE2B 600f0a03fd1aea37dbfc7d3fffdd79ec278b06c84970901ae0e4a134c2c7cc0402d01b4eb645e2f0a94e61324d7817af37f9abb2245dde812c2fe32b919f9c8e SHA512 0312bdacecfa2e168a0382dfe2575054941a77bb6d624f47d978802bf12659cda58b730c7315dbd87da8b372d22195d98e59379f59370a2a2f1f3da837bbff78
+EBUILD mlterm-3.9.2.ebuild 2988 BLAKE2B 59e3a253040ecbab108e3b213e6f792835a0a7a5218030719e7a64ae697905a38d409db4f9d767d51c973fa7398a0225af93c0bbeccb22129892bc822ad59347 SHA512 0e7baa0d749843c051c0102f38c3e51924bb8b168ed44053fb7ce42d1f98827647fa90f431f87f7daff4d7e0457bcd4d78ae62ff6b7f82ea0b8a3a93177e333c
+MISC metadata.xml 1228 BLAKE2B 788a19c8b676d0d5991cd80809f67f526edf6343ab897bc6287cc51f100b4e82bc5cffea0d2165ed3dc7950d0302579005763b0679aaaad5aaabdb8947a94d94 SHA512 d2efc5096992c50c00437cb5e735a12959e6e577b11c9f3d653ca2123ad04923db38c796bc3eaabd79772f521096784404b68a324712f749a15fbd81ae33eabe
diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
index d37c8487f82b..b7970330fb70 100644
--- a/x11-terms/mlterm/metadata.xml
+++ b/x11-terms/mlterm/metadata.xml
@@ -19,7 +19,7 @@
 		<flag name="wayland">Enable support for Wayland</flag>
 	</use>
 	<upstream>
-		<remote-id type="sourceforge">mlterm</remote-id>
 		<remote-id type="github">arakiken/mlterm</remote-id>
+		<remote-id type="sourceforge">mlterm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/mlterm/mlterm-3.9.2.ebuild b/x11-terms/mlterm/mlterm-3.9.2.ebuild
index e0c765700c4f..4b0544ea7dec 100644
--- a/x11-terms/mlterm/mlterm-3.9.2.ebuild
+++ b/x11-terms/mlterm/mlterm-3.9.2.ebuild
@@ -22,7 +22,7 @@ RDEPEND="virtual/libcrypt:=
 		x11-libs/libX11
 	)
 	bidi? ( dev-libs/fribidi )
-	brltty? ( app-accessibility/brltty )
+	brltty? ( app-accessibility/brltty[api(+)] )
 	cairo? ( x11-libs/cairo[X(+)] )
 	fbcon? ( media-fonts/unifont )
 	fcitx? ( app-i18n/fcitx )