gentoo auto-resync : 09:09:2022 - 16:40:34

241 files changed, 2817 insertions, 3395 deletions

diff --git a/Manifest b/Manifest
index 2a3824187714..f1ab865ff4a2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29614 BLAKE2B d8858508395d26669d8bd1a9fa1be17847d7469652aad65aeb665fb867076fac589ff033cb534516fff366493eb4fa9e6e533be42bd23c286b3013990a38fc1e SHA512 3c5d4681656e839b5b02198e6be846ba9e3217d254c3f6a528522b4d51bcf9a50199f0be2602f35951257bf0b979ee2875df066592cb627e349838482ac02380
-TIMESTAMP 2022-09-09T08:40:05Z
+MANIFEST Manifest.files.gz 29588 BLAKE2B 6c6bbc73c942a4e1a560f01028b0db6d548a7358ac31ae9c1ab8495fd252574bbd3826a91da09812cbca656d95aeb613c6a95a7033ce3b11c651985c020720d1 SHA512 bd200163629842e3029cddba92c6109350e8f998eb1c9d123f66eb3f6e020f1a08ebdecfaf0f9ffcf1237ef18c0fac8f2923b07df44e0690bf2b40796c085516
+TIMESTAMP 2022-09-09T14:40:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMa++VfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMbUEZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDE9RAAo/L9HtM7OzPY2t03mdOOJ6pKV3aeoIiQQOiKjbpJ3oGjwFy5fThvBYhd
-7Xq1Dwz9DVUdSOyDjC/U3Ii+dm9o6vWwsJDCw0/KzvYDy6VqE6zGQDRwjrjSCHxK
-sKpKNlO3q8pf0P9/ih/qQMIHS73a/TPuwvwRBVRApDNq+0CAAo/u4Ijk01dW1CU2
-Q/u7RwtlNuUatVsPxnoqfFqOwN26kNKtPIvnN0X6lntVRJJHOPIlc7UOwNgwucH9
-VQ109gZMXylHp42QYsIxxxQFpEzK4pbmpPRWUDrq7GJxAB5+SLN0rGh87Wqjp3H0
-MrZLe7oFjz3Xsx5G9j0XqzklmaTrNzps7dkDuW+iDtLoBGgFERLkNcR3ij9TYwBA
-mx9QdWbJQ8R3/B75vsBT27F8mQZaw7WmnCM4Qv8T9Bd0QZXUT9IICg+ECJi9hEy0
-9d+iBI4Lg2rs7UakjWhSffFMSnZ+kxO8DigjLrPoPp74p8AuqZ2brtE5QjryTEIY
-i66j/XBl+hIoJQoekiqq63eSSxtLustEW7TSo+QfcKDC0JsH+vdVUmGn0INDW/GJ
-GfGnpqCFtQf5SK5vtkd6FXfjHk+zeUH169/remXj9qejXYqmXFRVySITHWHG21jI
-2pnec3KnfQsyA7OXc2DZH/bkjyqL14LtXDiAYJIP6lMhYUQq2r0=
-=5PJH
+klD5MA//QNDq+pKEkTXWDF4SKst3cbnBIlB+INJZUzpJzpDqsLOrB+mSFCLPzJVr
+Tk/SWdHNqqQ/Qax/mk6bD6KLAFVO39afon2ihRgxbk7NnOK17N6dUiwxu0+ACUKi
+yyei1T80205UZnESuK1qMEFPppGZhRb+zqkT6E+AC8CWh2MbXAismfJlHVcD4R0k
+8wsZ1RIQ9BPOO8xupL2HzFiI1MpQzo3JbgLrw/qZY2+NVUpH2VFINa6CRT5Yc+W7
+LqITQWo0aIe159T/BkNHE8hsjrkSGFfBF6na8bpsGmriLxEiRMkRMjAAQ+p4mwnc
+x35Cy7x1qYOT/qTDUgLkfIXn6UlOnv8bCn0biiUkKlMvizMqQOw7thcRn6mfeQE2
+9LKgu+3qvo72uE0ldd2Vy4gPPwlswWWAeOFxxEu/Rdiq+4UX3XiCds9j4rFsHY0j
+XYtSoCqVUJcPOKL+SSU4w2xILS3eCSmIwzwfmX5iUoDnLx/dywzaUputIXzSC1Pu
+H05jJd/vBkxEIgxEqfLUj2mkdkNWY4Ms09D6nW/XenEmfpEsnVQO+eaM9KFwCJ0A
+GQKnBH99oIjpQ7GGF+TIyXi6LrA5diGHc0RvgU6GLCzheWexGNUNPrpgcmglmaXM
+qBmagXmnFHoDmB2QYJGH0qoEPKH4pAf/KH8hEeM2v8NTg/QISdY=
+=8gFY
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 1179ae6bc8bf..3df59daa9133 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 013b3e0346a9..634a3403d6b4 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 8703d4f8c031..ba9f26da49ba 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -1,7 +1,7 @@
 AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc
 AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972ed67bff74365b72e5e7df16199b439e5ad785b731eaa9a3eff5cfa6c9084c1b212b2359e9b8a14b1d0952ec6a560746acfbe594a2267e0ac SHA512 b23d899754762e29221b537c303e65a3b84e4a580d502f96870e8927ab2ef79b557f2c5638cfc4557ea5dfb6bea82b9776c6a67e65fda8a02138d3c57dfc00e6
 DIST borgmatic-1.6.6.tar.gz 323601 BLAKE2B b40d8f00e3b7bbd343336cf4c6992e34d8289de451c184717827e8e43519b84d4bb9b8cff6a835a7cc502d2e93045f0196d744e4b6ad800de1276e11c3189cec SHA512 f1a6dfa344ebee89e88f1aa6b43d8493c80815c637d8e0f7f6314462fd511b576e62246d957023ab2f9a68875d2818e2b8ef00cbf3339dc35a93d6ebad0bed19
-DIST borgmatic-1.7.1.tar.gz 333344 BLAKE2B 0076fac9a01715d24dd8dfa9ca93099c94cfe33f65850c089a337b3f95b6c52706d0e6b15200532c0fcca9401f97c02d6ebabd700e42f5d9bb3516e04e7fa0a4 SHA512 6cf0c71a88f0f893f63bb2de7c466af87cad3eff57a6105a6bece2c1acddb962fa14c4d63944c37a3465dc3c09151003daa28e5045a897875552ff7de227d5fc
+DIST borgmatic-1.7.2.tar.gz 333772 BLAKE2B fd628e9c77547686d4edf5d1066d3c171575f4d923ebc5205c5eb64f3a960e94c121282e9f4fb02b1291a81011a18dc393c6d13a07f215585459e7a5b55f8107 SHA512 6ec12ec25ae4d0210bb9114795c1ea292d8236f9e68c9425e24ee7b580796504e4c317a3fcf778806a33bbd3db68669beb4ef7a88ec538c1bd432db9a2845b3e
 EBUILD borgmatic-1.6.6.ebuild 1904 BLAKE2B b03ba369e333dc898f8b7901ee651470ccd83d05c37becedbc2f6ddea0b5d29515eb5331015645b1b5f17b921dc180907d1a02edf96a6a1546db4d444f01b415 SHA512 dc5208c3fbed40f6617effc59539e1fcf1cc166ce4083f8a0475b22b0f1a8e70e4f0dcaf35c3acecd6ee6c08b1dd32961d59284b2baba565ea4c558f0bfcebab
-EBUILD borgmatic-1.7.1.ebuild 2133 BLAKE2B 6f2dfcb4e7822ee1de43a961888ed326b52fa2ed10b291b3aa04a0a510f28598e86d08694274275f52743aec9ff368efbe7c9db11feff7692534aa87b5963805 SHA512 461dde9ae021a879a997cab17caba0303011804fb656f5e884cb271e3d7913759166261f43d2684da80355a3bf9be6aaf89f0be9b1243bbe43a916397f95325b
+EBUILD borgmatic-1.7.2.ebuild 2133 BLAKE2B 6f2dfcb4e7822ee1de43a961888ed326b52fa2ed10b291b3aa04a0a510f28598e86d08694274275f52743aec9ff368efbe7c9db11feff7692534aa87b5963805 SHA512 461dde9ae021a879a997cab17caba0303011804fb656f5e884cb271e3d7913759166261f43d2684da80355a3bf9be6aaf89f0be9b1243bbe43a916397f95325b
 MISC metadata.xml 380 BLAKE2B bd4f6eb451caa6b36d51dff099c7885ad2c30f2f9f5397e12049a28214601d67853f0dc604e6e42a566b8bf57acf0d9e39c685af8743cce72ec3b5b07adea72e SHA512 1d2c0a22d3b844b58ed35f3fae261a1d6906e5e1b0e69bbe364e0409f335b44f04089ea1d0e6144e2ddfcf066cc8ad85d14c0b22a28ddd22d235c48e1401569f
diff --git a/app-backup/borgmatic/borgmatic-1.7.1.ebuild b/app-backup/borgmatic/borgmatic-1.7.2.ebuild
index 85a3ea05cce7..85a3ea05cce7 100644
--- a/app-backup/borgmatic/borgmatic-1.7.1.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.7.2.ebuild
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 52424f6c4381..4f667f6aea02 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/mkp224o/Manifest b/app-crypt/mkp224o/Manifest
index c5c576446d46..1d68d792a06c 100644
--- a/app-crypt/mkp224o/Manifest
+++ b/app-crypt/mkp224o/Manifest
@@ -1,5 +1,3 @@
-DIST mkp224o-1.5.0-src.tar.gz 1378324 BLAKE2B 19d38fbf23328607fa428ec9329cdc909b210b4235d85e14ff372347c9b408ecf22d41dac7122bdae06725d7bca0c3d53c81cc27272c47517e714e9b8e0625dd SHA512 aa5adc91e695dbfd8ece5fdfe3ca370056d4390a5186326b35ee37402040fa24675ede5389c48b79a1e57b624b86024ff72957741fef175602f7721f20c5cc14
 DIST mkp224o-1.6.1-src.tar.gz 1387615 BLAKE2B 271424dcee44b5b1e1a35346a0cc1c37ee5d430231fe93e0b936ac994c892f0406ea361be763732db8a8397684ecad70e26c34f5553a415e7ed0592417672310 SHA512 d0c21ee5fb5f7b2950e1c39af5dc62b1e26aef0917b53169e9c3f9a99a7febe70bb2f96ada612c71bdbdbf8cad9c1f407d175af49fca40eedd68bbe8112970a5
-EBUILD mkp224o-1.5.0.ebuild 766 BLAKE2B 8138ab3b1467e1f2164b5ffac561a7d62bdebb99c53624e5a9c9b936fb839f18615ab7165f35a0bc38c6986af1cfbc8b01dc635426db2a5d05db077f752ef232 SHA512 b678d1d3167979e9f7507b6a4359356cf859160026892fc7e3489355b9201557139223e912ccf6f09aa3e770a2577c24ad071b82bbab476e72540ff0217ddacd
 EBUILD mkp224o-1.6.1.ebuild 765 BLAKE2B 2d16049b3c2908ec65619bf440fc3954cfe3f17609c923610f1b615e4e0b15c329f2bea8e4ded94f15823ad9becc38510e826e5a8ad082af0f7db2c637d3537e SHA512 cce2783db03fabe87cc751aebeedbbce9151d64d7bb8ebe8b7edb230e4990f2267f8bcbce2340e409fe9d0343c9d51ff74573d678003795ebd7346ad26c0d125
 MISC metadata.xml 441 BLAKE2B 2d6b436d30726fdaca9272dba7629a64a36a64d84516be74d87d66d93d87c0dbbdf356254c372e2e090d0ed97a64a60483c3b91aa6a9a3944099337b1b699bda SHA512 36de72bdf964af4056ed9bf21bacfccbc56b3f4a668a4ccd307f74c8aefdb5d66c03504b86762f6d686ecf44a27b77b0119dfaf3d198a8c60d408055e52aee80
diff --git a/app-crypt/mkp224o/mkp224o-1.5.0.ebuild b/app-crypt/mkp224o/mkp224o-1.5.0.ebuild
deleted file mode 100644
index 4e71a3ec031b..000000000000
--- a/app-crypt/mkp224o/mkp224o-1.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Vanity address generator for v3 Tor hidden service addresses"
-HOMEPAGE="https://github.com/cathugger/mkp224o"
-SRC_URI="https://github.com/cathugger/${PN}/releases/download/v${PV}/${PN}-${PV}-src.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="cpu_flags_x86_sse2 pcre2"
-
-DEPEND="
-	dev-libs/libsodium:=
-	pcre2? ( dev-libs/libpcre2:= )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( OPTIMISATION.txt README.txt )
-
-src_configure() {
-	local myeconfargs=(
-		--enable-regex=$(usex pcre2)
-		--enable-statistics
-	)
-	use cpu_flags_x86_sse2 && myeconfargs+=( --enable-donna-sse2 )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	einstalldocs
-	dobin ${PN}
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 2e831010d3f4..d7dfb8cf0d1a 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index 30a4a77b0c17..cb6fbd874109 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -4,9 +4,11 @@ AUX jq-1.6-segfault-fix.patch 868 BLAKE2B 922960b595f84447c8a4b0c70a414dfd26104a
 AUX jq-1.7-runpath.patch 572 BLAKE2B 31daf5c3062a446c9e745f065b90add1d23fb6738076becbb67cc3412bdff6b062a66502e453900366d0c4feef90925ffe220acd4d8672c96b611895185a3808 SHA512 00958a570efdc54af7105299576cf528d8091fac0a9aa63bb362a9852d0923d7c0d5207e9349eea29dc7d782547b192554c36b9cd1b50dfdcdbf622c46f7d1e0
 AUX jq-1.7-visible-null.patch 1428 BLAKE2B 109f45fc72bb927fb67202aadbcb61869d427f3598e2dd14eb47ab1983cf5a9978c873d1357e6ba3a23b931ce0b10dbe67498ee83b3375c2c67a3f97980cdfbf SHA512 39067401436538d85c65a51de3bcad99868d4c0b50d27717ccbfdbd7fbb8b011447fd6a326b4849ef94f57422692f032c8fab2974f8ca888b69a316616c26498
 AUX jq-1.7-warnings.patch 1302 BLAKE2B a38e9df57a74b8a19d70fe7d5aeb191e60bfb118f42f2ed3126626d601bd87549aa5c310c825687310e2eddb708e8c32a557f89f8073ac88ab8113cec3bb3468 SHA512 d5796a30684091aeeb0faa26170b675d9827a662299b122d0026e9ae237135636806aea5638e9b7d2dd5508cdd0726767f70d840e33894a8865f4acbb31ec14d
+AUX jq-1.7_pre20201109-fix-configure-test.patch 2324 BLAKE2B daccf3a6ea7868bdb85264528139ae44ba41321fe3dfd2667efc9e3343d14d8b5f1da45b996091a58ee83be863a24c7fd120f054dcbf7842df4fd9aef6642927 SHA512 ec9570e741ee996befcc4fcc411fa08fb569bf6b9cb1aa10ccbbe5a59d755f9ccc535c46dc2eb055955a4f142653184dcaa9142f0a2962c484a062231d3bd0d9
 AUX jq-1.7_pre20201109-no-git-bdep.patch 540 BLAKE2B 745496f01bbc19ede3f5c17be4a7384664ab990eca053d0b4521f1c863af97f9f64afeeb600109ba0f44f155497954c48c6907df198c24d503006c42aada2a97 SHA512 64cc678b5d0850aa9ffc4cd4ef340fa22b3ce120a8b302757528633a7dd785aad1559a0b0abd3e0b1fe3b0d92cfcc388910c84f7cdefca876c864b01358ac04f
 DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
 DIST jq-1.7_pre20201109.tar.gz 1181867 BLAKE2B 9db187ab927b635c43fbc6191aeffa00451b12253ae023bbabe6fba5fdf8fb393f8450ee2011ef58cb93e2f27994d454fac967984a721439aaac93259c02f7f1 SHA512 f2997d70edb36d0a23b71a7d933a763cedd7c74ffa3129c2a6cb7189aaff1c5095cdc51062b7cd119324ec2c83ebae6ff0b7da3941315303b7a31146b9eb285a
 EBUILD jq-1.6-r3.ebuild 2000 BLAKE2B e3d647a6c444db493d291f586d2accd96c34df232dcffc6137e66bbd7cbf7d164dac43d5d783e2666e6ff1135f9583dd2b1a48826808058295abf7c1ff2a311c SHA512 746bbeff6451adbd25916d5c0aad6630a5c2728841731d918b29bf7e4ea679b36b0b61489c8e5aa5bdd8e0a093b117fe04788a4046bbfc39039cb5c510e7cd69
+EBUILD jq-1.7_pre20201109-r1.ebuild 2438 BLAKE2B b25860c0d8eb96b90fa79cfbe7f3fdc23b6376d0142dbc0fee9224aa3793c64d4345c18d49e88440884432885d68facef23724fbc279559f81d44fa835e1e821 SHA512 965be67264be11a74a2ce6486c2271062731eda59eadfd470a8fc29aac93d3c7bcb9fe677551926b9e14111cdc97205e5f1345b74bc3c949c148076d242b2813
 EBUILD jq-1.7_pre20201109.ebuild 2379 BLAKE2B 0745f1cb7d163845251d5c413d188a07e214b58474be66a30d10ff9af8eb3d521efd154136bb5921e3074f7dbd884b1a6749615d887813a946e0ae85083f1642 SHA512 5727657759ac7e3172caafb3e9c3d0a3990de4054994197b60db6dbc7c1d645cec99bb531ea66927dbd51fa396018605e14f097f3fdf9a01d6dc69ff829eb01a
 MISC metadata.xml 621 BLAKE2B 25da1d13b32964ec540f4e25f8d29807e5f954d3e47ace2143abfdd192382153e05947c4ccae46dd3c3608cc083ad1701f6aa66ab3b6b3c6866e858eab342be5 SHA512 955c6e85739c4b46f02e9f194a7534cd90e098014ee8df42587d3bc357ee25da45db830ea2736724c7f962b137e604b9818c7fe6c4427dadbb9d58ef4682da2b
diff --git a/app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch b/app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch
new file mode 100644
index 000000000000..8be52042bcc4
--- /dev/null
+++ b/app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch
@@ -0,0 +1,54 @@
+https://github.com/stedolan/jq/pull/2480
+
+From 40bbd419ad8d1bd9cbe8b17063c323f8a40ab327 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 6 Sep 2022 09:59:31 -0700
+Subject: [PATCH 1/2] configure: Pass _XOPEN_SOURCE when checking for strptime
+
+Include sys/time.h for gettimeofday since thats where its in glibc
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -139,7 +139,10 @@ AC_FUNC_ALLOCA
+ 
+ AC_FIND_FUNC([isatty], [c], [#include <unistd.h>], [0])
+ AC_FIND_FUNC([_isatty], [c], [#include <io.h>], [0])
++OLD_CFLAGS=$CFLAGS
++CFLAGS="$CFLAGS -D_XOPEN_SOURCE"
+ AC_FIND_FUNC([strptime], [c], [#include <time.h>], [0, 0, 0])
++CFLAGS=$OLD_CFLAGS
+ AC_FIND_FUNC([strftime], [c], [#include <time.h>], [0, 0, 0, 0])
+ AC_FIND_FUNC([setenv], [c], [#include <stdlib.h>], [0, 0, 0])
+ AC_FIND_FUNC([timegm], [c], [#include <time.h>], [0])
+@@ -147,7 +150,7 @@ AC_FIND_FUNC([gmtime_r], [c], [#include <time.h>], [0, 0])
+ AC_FIND_FUNC([gmtime], [c], [#include <time.h>], [0])
+ AC_FIND_FUNC([localtime_r], [c], [#include <time.h>], [0, 0])
+ AC_FIND_FUNC([localtime], [c], [#include <time.h>], [0])
+-AC_FIND_FUNC([gettimeofday], [c], [#include <time.h>], [0, 0])
++AC_FIND_FUNC([gettimeofday], [c], [#include <sys/time.h>], [0, 0])
+ AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define to 1 if the system has the tm_gmt_off field in struct tm])],
+                 [], [[#include <time.h>]])
+ AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[Define to 1 if the system has the __tm_gmt_off field in struct tm])],
+
+From cda1734bed3b048c01452c798877d05b8c2f4c15 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 6 Sep 2022 10:00:59 -0700
+Subject: [PATCH 2/2] builtin: Replace _BSD_SOURCE with _DEFAULT_SOURCE
+
+newer glibc has remove _BSD_SOURCE and wants it to be replaced with _DEFAULT_SOURCE
+
+Fixes
+/usr/include/features.h:194:3: warning: "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-W#warnings]
+warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/src/builtin.c
++++ b/src/builtin.c
+@@ -1,4 +1,4 @@
+-#define _BSD_SOURCE
++#define _DEFAULT_SOURCE
+ #define _GNU_SOURCE
+ #ifndef __sun__
+ # define _XOPEN_SOURCE
+
diff --git a/app-misc/jq/jq-1.7_pre20201109-r1.ebuild b/app-misc/jq/jq-1.7_pre20201109-r1.ebuild
new file mode 100644
index 000000000000..6c0d7ed19c9b
--- /dev/null
+++ b/app-misc/jq/jq-1.7_pre20201109-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+COMMIT_HASH="a17dd3248a666d01be75f6b16be37e80e20b0954"
+
+DESCRIPTION="A lightweight and flexible command-line JSON processor"
+HOMEPAGE="https://stedolan.github.io/jq/"
+#SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
+SRC_URI="https://github.com/stedolan/jq/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+LICENSE="MIT CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
+IUSE="+oniguruma static-libs test"
+
+ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/
+DEPEND="
+	>=sys-devel/bison-3.0
+	sys-devel/flex
+	oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] )
+"
+RDEPEND="
+	!static-libs? (
+		oniguruma? ( ${ONIGURUMA_MINPV}[static-libs?] )
+	)
+"
+PATCHES=(
+	"${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
+	"${FILESDIR}"/jq-1.7-runpath.patch
+	"${FILESDIR}"/jq-1.7-warnings.patch
+	"${FILESDIR}"/jq-1.7-visible-null.patch
+	# https://bugs.gentoo.org/776385
+	"${FILESDIR}"/jq-1.7_pre20201109-no-git-bdep.patch
+	"${FILESDIR}"/jq-1.7_pre20201109-fix-configure-test.patch
+)
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( oniguruma )"
+
+src_prepare() {
+	sed -e '/^dist_doc_DATA/d; s:-Wextra ::' -i Makefile.am || die
+	sed -r -e "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
+		-i configure.ac || die
+
+	# jq-1.6-r3-never-bundle-oniguruma makes sure we build with the system oniguruma,
+	# but the bundled copy of oniguruma still gets eautoreconf'd since it
+	# exists; save the cycles by nuking it.
+	sed -e '/modules\/oniguruma/d' -i Makefile.am || die
+	rm -rf "${S}"/modules/oniguruma || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		# don't try to rebuild docs
+		--disable-docs
+		--disable-valgrind
+		--disable-maintainer-mode
+		--enable-rpathhack
+		$(use_enable static-libs static)
+		$(use_with oniguruma oniguruma yes)
+	)
+	econf "${econfargs[@]}"
+}
+
+src_test() {
+	if ! LD_LIBRARY_PATH="${S}/.libs" nonfatal emake check; then
+		if [[ -r "${S}/test-suite.log" ]]; then
+			eerror "Tests failed, outputting testsuite log"
+			cat "${S}/test-suite.log"
+		fi
+		die "Tests failed"
+	fi
+}
+
+src_install() {
+	local DOCS=( AUTHORS NEWS README.md )
+	default
+
+	use static-libs || { find "${D}" -name '*.la' -delete || die; }
+}
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index b58abb943d17..ddd8a295efec 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index be703f3b80fe..db6522a16d32 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -2,6 +2,5 @@ AUX libplist-2.2.0-fmin.patch 1102 BLAKE2B ce8c76a369ae1ddc54016bbc941efeafa96d0
 AUX libplist-2.2.0-pkgconfig-lib.patch 305 BLAKE2B 67da57f080454e8b01408872ab76b66703e0339052f64c3738964b02e6a389b03aac65d7d6ca30bfd78b1366c4a7fec843b039b32269db0a4e7e95850638e34d SHA512 1c2c628f178ed64a8f7e1dd84657d7d365e980a2b2d8af9dd6bbe55d245997cf51974d9ed451eafb715299097029886f7ec0a863f199a72bf15f50281c9bfab7
 AUX libplist-2.2.0-strict-aliasing.patch 1128 BLAKE2B d38552a76f0e098c6df6eb8a4d71c7bf0fe4a41aeff87730d691497203c7057ffd84356ec671041dc02ef3762bbe2cd0cfa27d465a5be0a15ebf86e3ca91d789 SHA512 e00ab3cf2f0d0829c16e1d4b1fd4bce1265a740d872aee4d0112fb45c2919413c493ad70753a7186b27fbfe154f9826ac2024e142e9410c51a69d7e1ea782245
 DIST libplist-2.2.0.tar.bz2 126808 BLAKE2B 7c3ec04aaa52eca33ae28851a6524c9ea531df939feef0f10827c8c2de78a6ccd856ea4d8a568b146ccb5de96f70dd5accec34aa2fdd61f9e6eba01256c0b518 SHA512 641bfd3ec0565f104d3a2d1ebdf6137bc9252b67ce90550e24ab0deeee4e820e119ba4f8f1ba04a0358d995d196fa61e35f2f0ee8ba37fc0270752ae842ab1f5
-EBUILD libplist-2.2.0-r3.ebuild 2659 BLAKE2B dc5c90aa4770d424f161cfcb67a2c0e9da7e0956489d0e60ea593891f01494bd8e196ae4c795a40700c17982896eb0db958afe82cef3edd448aa83d775b44eb0 SHA512 e44f5ed00b475d6c1deb94a97b51b6c9944107c1b7fdaab7ed4293a0e28d5d48bf270f42868bea2ae8b67128538988aa60f26497c9b3a9e75f46e536fd94fdc3
 EBUILD libplist-2.2.0-r4.ebuild 2717 BLAKE2B 0e30d17df74d4a1f14c485f921058e684d740bd442585e87eb5757bfcf988ff2bcfcaae8a42eede7749e6544573389830d34a6e62e84417b02d7da4cac77febb SHA512 971c4dabe3089ceb19bb57eb8618255560e6e2683daf02d33bc0a3fc9ef668c361bd48ad72974627ff6015013f3a0fe0e4bdbdeb5b12d5d55bc7f46b98f03dd1
 MISC metadata.xml 411 BLAKE2B 739995675d95e408b7ddd6092af57e2cd39a9aa129271de40119350926a75200962ccc35c463d304cfd3fc396f4a4e04ecdef752a506bbc576365c9b689a8d1b SHA512 82db103987ba57112cd18557114d82be89a1c3cc6da43334b16a1b22023fc5961be3c2abc3213be046ee370d3285717cf9c267ae97309065fe888f39fd75355c
diff --git a/app-pda/libplist/libplist-2.2.0-r3.ebuild b/app-pda/libplist/libplist-2.2.0-r3.ebuild
deleted file mode 100644
index 03073cf397f3..000000000000
--- a/app-pda/libplist/libplist-2.2.0-r3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-inherit autotools python-r1 toolchain-funcs
-
-DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/2.0-3"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv x86"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}"/libplist-2.2.0-fmin.patch
-	"${FILESDIR}"/libplist-2.2.0-pkgconfig-lib.patch
-)
-
-BUILD_DIR="${S}_build"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ECONF_SOURCE="${S}"
-
-	do_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		pushd "${BUILD_DIR}" >/dev/null || die
-		econf --disable-static "${@}"
-		popd >/dev/null || die
-	}
-
-	do_configure_python() {
-		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
-		do_configure "$@"
-	}
-
-	# Don't prefer clang.
-	tc-export CC CXX
-
-	do_configure --without-cython
-	use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
-	local native_builddir=${BUILD_DIR}
-	ln -s "${native_builddir}/src/libplist-2.0.la" \
-		"${native_builddir}/src/libplist.la" || die
-
-	python_compile() {
-		emake -C "${BUILD_DIR}"/cython \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			plist_la_LIBADD="${native_builddir}/src/libplist-2.0.la"
-	}
-
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake
-	use python && python_foreach_impl python_compile
-	popd >/dev/null || die
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	python_install() {
-		emake -C "${BUILD_DIR}/cython" \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			DESTDIR="${D}" install
-	}
-
-	local native_builddir=${BUILD_DIR}
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	use python && python_foreach_impl python_install
-	popd >/dev/null || die
-
-	einstalldocs
-
-	if use python ; then
-		insinto /usr/include/plist/cython
-		doins cython/plist.pxd
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# temporary fix for 2.2.0 release:
-	# bug #733082,
-	# https://github.com/libimobiledevice/libplist/issues/163
-	# upstream commit 137716df3f197a7184c1fba88fcb30480dafd6e0
-	dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
-	dosym ./libplist++-2.0.so.3.3.0 /usr/$(get_libdir)/libplist++.so
-	dosym ./libplist-2.0.so.3.3.0 /usr/$(get_libdir)/libplist.so
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5c2d94b4ae0d..c4f5db9a2887 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index af7430804f35..b9e4b85d9737 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,7 +1,9 @@
-AUX po4a-0.67-man.patch 620 BLAKE2B 1c49579a504303d208038d5ebd13d416bc7a56f827c7d4d97243a4a7e37bd544966784f1b05c98b124cf1c0fc5b81b40d1fbd44e2d1c7404efbcc4e60190df0e SHA512 7b85130981255550fbb2ce6d3fd06aecb26ebb6429fd9c7af12de684c3d3136e02b5efb22e2613948ac0f6ab0a88f68be359a1ff44293288a0b2ff6b83185d4a
-AUX po4a-man.patch 577 BLAKE2B e2f9263b5c92b798224a1ae9ba9e3358bbf755f0573c34512151e7110517ecd7570b7946291de945f8f6557f6ff4b33c2d4f7900c4937ea284fe11e23f50c8a4 SHA512 5d88645d35234723f3b397953bf1aaaa8160fa591dd86430663f270ad10e4d5cceb7957774ce741bc0a46f37120473cb511eab88e78c0826717a4c5761d1c13a
+AUX po4a-0.66-man.patch 577 BLAKE2B e2f9263b5c92b798224a1ae9ba9e3358bbf755f0573c34512151e7110517ecd7570b7946291de945f8f6557f6ff4b33c2d4f7900c4937ea284fe11e23f50c8a4 SHA512 5d88645d35234723f3b397953bf1aaaa8160fa591dd86430663f270ad10e4d5cceb7957774ce741bc0a46f37120473cb511eab88e78c0826717a4c5761d1c13a
+AUX po4a-man.patch 620 BLAKE2B 1c49579a504303d208038d5ebd13d416bc7a56f827c7d4d97243a4a7e37bd544966784f1b05c98b124cf1c0fc5b81b40d1fbd44e2d1c7404efbcc4e60190df0e SHA512 7b85130981255550fbb2ce6d3fd06aecb26ebb6429fd9c7af12de684c3d3136e02b5efb22e2613948ac0f6ab0a88f68be359a1ff44293288a0b2ff6b83185d4a
 DIST po4a-0.66.tar.gz 4240059 BLAKE2B 1d88665b8aa0d7f81854c97265f483934adc51503c2d33252d6ae08a00fddfa8aaa6e9c652f764ae46bf14fea3bcd1093f923fcbf08d96e97296954199e9b900 SHA512 f72e1267cbd6ced01ecc362c327b1634c47dff15398b48644548d28e01ba91108d5626e6d4abcfcb360697e4c0affa3228c6993653ce8f257acbbb3d7ae20fc4
 DIST po4a-0.67.tar.gz 4466869 BLAKE2B c4dab0e40e7f5eb24ec85abf8a02131144b181d9b783a5dccc30221d1cc3a493f16d7c2faf8284c6d2f2259661a6f2c280624e5fd16e2d4d0bf878f8291ef7b5 SHA512 6445db615ac1a2e752daca7dca0c44a88e74c7a26c06ba8e7cb6bdeeaacce78cb74a671579dd95ee8341d817e16717e8cf99022a37c5d152e0c9828bd6aae3d9
-EBUILD po4a-0.66.ebuild 1410 BLAKE2B 3360106a062390feb034ef7d88ac8ca120af0ca26d488a1ae1e8469a436bc006fb5d7b45bf6832bc9999183c7164478bc6bddbe80a3f6fdd54e049d14167e242 SHA512 6bd92229677a105f47a41642fa13c174eadfd2089d6d195674e1cc6a565893c5c881e1be2c43fa871bf8f47eaf2b4783600256e84879f15ef0f088348beb3939
-EBUILD po4a-0.67.ebuild 1329 BLAKE2B 6460d5b311b56a3e2c30f542a4c594b7d310d0068b39a8cf66fbddbace81b09d9d4d23afd30c3fbfd889c087336116c394c685b95106ff13ef7dbd9277e1b234 SHA512 ff49c68309f43ab60459899f400521aafbe53e18d2108c2db499779ace88b450b851baa49cca67b1943a3aeca47b9d900f1608af8fcb370a02bb52262aa886da
+DIST po4a-0.68.tar.gz 4605485 BLAKE2B fe649a28c0c181f53d7eb3f583d4a7dffe4fc22fb316c1c534b672a267eef16ccdf39a77caff3a2d75b7bfcb36e68c49229aaddeb8dff5ee475b71b58402200e SHA512 d7c60a3647d8f4265ce6f016d33430c72775ae19eb2efb240532545b08280368fea70db3360131f6537eb7cc72c19299dff4b6f938ac09cbef1b2db1a93d996e
+EBUILD po4a-0.66.ebuild 1409 BLAKE2B 0eed07c6501a75d23c90e50e5c957de542f55313ea8cd0a70d5b7f044e821d01c588a45b8294aeaa8d96bf7a341e7615d768657547e629d5206137b0cbba406a SHA512 b27e2187f4db0dbb912c33d1f028f3ca4a4283238a268ad41aba6f706fdbce787bca894c3db2dc9a67717b237583b4092f1fb8f692f627e84e8193990afe880d
+EBUILD po4a-0.67.ebuild 1330 BLAKE2B ca3e5e22ddc844504d710a23739c32cd2c76feb770d0c0d15d90820c172f1f225a1cbd6f43357b681232bf23a6707859c9f6c0bf33ad615920ce0420a3e61e40 SHA512 9fbf472a377f966aaef64ecb1fbf2601d9591c86852d549036fbdac0c58159d0895190cd078a7842614f9d34c9011ffa08a5298cb8fb55566233e042283981c0
+EBUILD po4a-0.68.ebuild 1330 BLAKE2B ca3e5e22ddc844504d710a23739c32cd2c76feb770d0c0d15d90820c172f1f225a1cbd6f43357b681232bf23a6707859c9f6c0bf33ad615920ce0420a3e61e40 SHA512 9fbf472a377f966aaef64ecb1fbf2601d9591c86852d549036fbdac0c58159d0895190cd078a7842614f9d34c9011ffa08a5298cb8fb55566233e042283981c0
 MISC metadata.xml 327 BLAKE2B e4ac438b10bde7e247b0f098c104aa9956b264df04c81d10aff0f0a0ae45184a953443062f38bbc5fe0c7fd9a4e48219c5e0a76c5bb0b4fee9edf51e35ad50ec SHA512 934e9519050daf07edfee9e4a0041d808ea5eec4d414b738f1e2b909e821b83c8c7b39a15170041a9aba31df1c1a0b6323bd245507f7c9bea9556a332c6939ec
diff --git a/app-text/po4a/files/po4a-0.66-man.patch b/app-text/po4a/files/po4a-0.66-man.patch
new file mode 100644
index 000000000000..40927dbda818
--- /dev/null
+++ b/app-text/po4a/files/po4a-0.66-man.patch
@@ -0,0 +1,18 @@
+--- a/Po4aBuilder.pm
++++ b/Po4aBuilder.pm
+@@ -232,7 +232,6 @@
+         }
+         $parser->parse_from_file ($file, $out);
+ 
+-        system("gzip -9 -f $out") and die;
+         unlink "$file" || die;
+     }
+ 
+@@ -250,7 +249,6 @@
+ 		print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
+ 		system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
+ 	    }
+-            system ("gzip -9 -f $outdir/$outfile.$section") and die;
+         }
+         unlink "$file" || die;
+     }
diff --git a/app-text/po4a/files/po4a-0.67-man.patch b/app-text/po4a/files/po4a-0.67-man.patch
deleted file mode 100644
index 6c79ebf77dd2..000000000000
--- a/app-text/po4a/files/po4a-0.67-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Po4aBuilder.pm
-+++ b/Po4aBuilder.pm
-@@ -234,7 +234,6 @@
-         }
-         $parser->parse_from_file ($file, $out);
- 
--        system("gzip -9 -f $out") and die;
-         unlink "$file" || die;
-     }
- 
-@@ -253,7 +252,6 @@
-             print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
-             system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
-             }
--                system ("gzip -9 -f $outdir/$outfile.$section") and die;
-             }
-             unlink "$file" || die;
-         }
diff --git a/app-text/po4a/files/po4a-man.patch b/app-text/po4a/files/po4a-man.patch
index 40927dbda818..6c79ebf77dd2 100644
--- a/app-text/po4a/files/po4a-man.patch
+++ b/app-text/po4a/files/po4a-man.patch
@@ -1,6 +1,6 @@
 --- a/Po4aBuilder.pm
 +++ b/Po4aBuilder.pm
-@@ -232,7 +232,6 @@
+@@ -234,7 +234,6 @@
          }
          $parser->parse_from_file ($file, $out);
  
@@ -8,11 +8,11 @@
          unlink "$file" || die;
      }
  
-@@ -250,7 +249,6 @@
- 		print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
- 		system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
- 	    }
--            system ("gzip -9 -f $outdir/$outfile.$section") and die;
+@@ -253,7 +252,6 @@
+             print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
+             system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
+             }
+-                system ("gzip -9 -f $outdir/$outfile.$section") and die;
+             }
+             unlink "$file" || die;
          }
-         unlink "$file" || die;
-     }
diff --git a/app-text/po4a/po4a-0.66.ebuild b/app-text/po4a/po4a-0.66.ebuild
index 0c39ceb095cc..075e72ec5e4e 100644
--- a/app-text/po4a/po4a-0.66.ebuild
+++ b/app-text/po4a/po4a-0.66.ebuild
@@ -37,7 +37,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
 		virtual/latex-base
 	)"
 
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+PATCHES=( "${FILESDIR}"/${P}-man.patch )
 
 DIST_TEST="do"
 
diff --git a/app-text/po4a/po4a-0.67.ebuild b/app-text/po4a/po4a-0.67.ebuild
index 4fe9ab68c59f..300d739e1730 100644
--- a/app-text/po4a/po4a-0.67.ebuild
+++ b/app-text/po4a/po4a-0.67.ebuild
@@ -38,7 +38,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2
 		virtual/latex-base
 	)"
 
-PATCHES=( "${FILESDIR}"/${P}-man.patch )
+PATCHES=( "${FILESDIR}"/${PN}-man.patch )
 
 DIST_TEST="do"
 
diff --git a/app-text/po4a/po4a-0.68.ebuild b/app-text/po4a/po4a-0.68.ebuild
new file mode 100644
index 000000000000..300d739e1730
--- /dev/null
+++ b/app-text/po4a/po4a-0.68.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK zh_Hant"
+
+inherit perl-module plocale
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/opensp
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/Pod-Parser
+	dev-perl/SGMLSpm
+	dev-perl/Syntax-Keyword-Try
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	sys-devel/gettext"
+DEPEND="${RDEPEND}"
+BDEPEND="app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	sys-devel/gettext
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		dev-perl/Test-Pod
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+	plocale_find_changes "${S}/po/bin" '' '.po'
+
+	rm_locale() {
+		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+	}
+	plocale_for_each_disabled_locale rm_locale
+
+	perl-module_src_prepare
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index d56126ea9522..4661867a732c 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/libmcpp/Manifest b/dev-cpp/libmcpp/Manifest
index 164641f2e791..fc3320d99fc5 100644
--- a/dev-cpp/libmcpp/Manifest
+++ b/dev-cpp/libmcpp/Manifest
@@ -1,5 +1,7 @@
 AUX libmcpp-2.7.2-fix-build-system.patch 1008 BLAKE2B d9a87af2faada430c9bd09bb6d4e70f51385725b45dd380b6eecd67e82ed6f2e001f3768b03e08864055fe4119187cf26efd3f09463c64072a9647f63ad251d1 SHA512 25e2e9cd8d18080947a84c0d76f0b34d74b289ccc7c6172278908c026dd6f7379ebb268aae79c3e8ab458f3883aa212e54a137cbaab336c1277acdad07a13a01
+AUX libmcpp-2.7.2-fix-configure-checks.patch 1056 BLAKE2B 94dddb9fb10f9cbab18dd08a02ae15816f3cff4e7d8f2331114f02b817a2c69f509ced868c7c8e7d46e45bad44bbf922026383672865b50c3981fbe40633f116 SHA512 5b1eaba11112e37cbc5a635f872d5a749948573f413758c312485dace26e7c563dc5ea35e5029c105fb6a24000a3b79b5e4b49f99e3bc54cbe7263d355ad0744
 DIST mcpp-2.7.2.tar.gz 1533457 BLAKE2B 4368fd1c667923ab3b60ce79f8421c549a9d9105957ca87b9ba49be513cb1be7f220a3ddbaf306e860014d5211af480d07170d912d3d4a80345d8eab45fd6c00 SHA512 1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235
 DIST mcpp_2.7.2-5.debian.tar.xz 7528 BLAKE2B 92f455809cfb49d97ca4e62c7087ebe2ebe0ce835e8f12d6e93b1df2ec1e15472f242637f320be2b6bada85b193545fcf3608e8c9a935805a5f052909d3c6f0b SHA512 08509945048ccc4525ecd61d3f901a4d81fe73c1db84c26b76664d5127970af45662a168b99836b58467afc7202a1a20e0dfe8954a87e4cd1368f2136d7955be
+EBUILD libmcpp-2.7.2_p5-r1.ebuild 915 BLAKE2B 85d15c78cbc7ac2dcf03849409535bddfeaf7ef4fb553fef5697b836a02869ca5aff3aa8896fb533712261181e8051bad91d36a178b4cfdff5dea1a5a83c55b9 SHA512 3e402b4583392dd5af09d1969ddcd1503ebdd3809b768de3bee138327ccc5833e4cbcf0a62ec2fa7a4f4f524fbd5db101f881f6c7986f98756014f0263081d97
 EBUILD libmcpp-2.7.2_p5.ebuild 898 BLAKE2B 4a5b392157fc360b6e8c0d298ae60398e1a93bbab822a9223cd2b2dd03205721e5ec2c00d5d81b2528186cdb642740e0fed33e24a6fcc15c35cdf1c77d59c400 SHA512 9ed7a1084c2db560dd5d987e0a111a612761ec63b0fd46ada41c5013792a822af8863895a2633ba6f29e2fe8040fe02c1006fd1bf6f96a05c35232a84e7247ca
 MISC metadata.xml 242 BLAKE2B c3104b4c49aa49dc9855ea0b1469084d84e3c66395bd368859edefe22ff374525cc05752f56acc5e6976cda7564f54fc736d91019a143d74d5598bfad7595c41 SHA512 122762f21cf0e354a83c94569028bc356ab1af71727787d8bd1402a67690bf0a3a32ebd6304a249febfe942f5f0a1b1e2c07d81b31a05a8abae530e00c21e3e9
diff --git a/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch
new file mode 100644
index 000000000000..e7bb77d6cf41
--- /dev/null
+++ b/dev-cpp/libmcpp/files/libmcpp-2.7.2-fix-configure-checks.patch
@@ -0,0 +1,34 @@
+https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-devtools/mcpp/files/0001-configure-Fix-checks-for-system-headers.patch?id=6721430ca97aa98208cc1c450e4e8c4c274ca840
+
+From c1e9f2f3d086e0df3c10a2468fd7b37fd0c5038c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 7 Sep 2022 00:02:08 -0700
+Subject: [PATCH] configure: Fix checks for system headers
+
+Define _DEFAULT_SOURCE in system.c so unistd.h can expose readlink API
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -152,7 +152,7 @@ fi
+ 
+ dnl Checks for header files.
+ 
+-AC_CHECK_HEADERS( [unistd.h, stdint.h, inttypes.h])
++AC_CHECK_HEADERS( [unistd.h stdint.h inttypes.h])
+ 
+ dnl Checks for typedefs, and compiler characteristics.
+ 
+--- a/src/system.c
++++ b/src/system.c
+@@ -36,6 +36,8 @@
+  *      1. specify the constants in "configed.H" or "noconfig.H",
+  *      2. append the system-dependent routines in this file.
+  */
++
++#define _DEFAULT_SOURCE
+ #if PREPROCESSED
+ #include    "mcpp.H"
+ #else
diff --git a/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild
new file mode 100644
index 000000000000..beab5412fb93
--- /dev/null
+++ b/dev-cpp/libmcpp/libmcpp-2.7.2_p5-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PN=${PN/lib/}
+MY_P=$(ver_cut 1-4 ${MY_PN}-${PV})
+
+DESCRIPTION="A portable C++ preprocessor"
+HOMEPAGE="http://mcpp.sourceforge.net"
+SRC_URI="mirror://sourceforge/mcpp/${MY_P}.tar.gz"
+SRC_URI+=" mirror://debian/pool/main/m/${MY_PN}/${MY_PN}_${PV/_p/-}.debian.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~x86 ~x86-linux ~x64-macos"
+
+PATCHES=(
+	# bug #718808
+	"${WORKDIR}"/debian/patches/
+
+	"${FILESDIR}"/${PN}-2.7.2-fix-build-system.patch
+	"${FILESDIR}"/${PN}-2.7.2-fix-configure-checks.patch
+)
+
+src_prepare() {
+	default
+
+	# bug #778461
+	sed -i 's/-lmcpp/libmcpp.la/' src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-mcpplib
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index eefb3f25dd5f..ed0591004752 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/avrdude/Manifest b/dev-embedded/avrdude/Manifest
index e550ada6a2fe..bac268cb7156 100644
--- a/dev-embedded/avrdude/Manifest
+++ b/dev-embedded/avrdude/Manifest
@@ -1,7 +1,3 @@
-DIST avrdude-6.3.tar.gz 909744 BLAKE2B 3c253571a50c423989fc3fd9c5d6fe11b67fad9ca0d94f4bee0de7309fc22ccfe64102fff74fad47ffcb1874870c0aafd0c003df63285bd05c30efd384f5ef9e SHA512 b671008388d6a552e71066fec46429bc7f6639e8eac41113bcbba5a56212b78be31fcf04956b31e11c6b14888b0f6e825f7458395b9ff4fc28406074c7ded2b2
 DIST avrdude-7.0.tar.gz 2354082 BLAKE2B 44cc6cb82abd4e44f9e7f72901cd9b2a13c9e7635582993ea9a01ea482709ca6a8a3454980446d1196a67cec19a021133d5821731618350336f81fce09d7c049 SHA512 ca3338e6f2f0efc102e70f72531efbd237c5f7bc282d8db5530038f9e20b18a7c2682343bb2baff08c81f8959b066323a444dd64c2362a340a9d9708f90770e0
-DIST avrdude-doc-6.3.pdf 255521 BLAKE2B 3b6a3485b996f0923c00c54970e86c3ab9f40e8a5bd962f5d3e4f87c23c90b61f002b46af9766cc0f117583a54d519c5d8739cb5f8bca0776320243679989716 SHA512 f33b15f6a9247f6646ba8a861f1e86f5d43b1b44438fb95bd53764a73f0c450f669dcb43b6b587390ddbc22dafa02758ddc330a7aab1651ccca7c8da8e00b755
-DIST avrdude-doc-6.3.tar.gz 39823 BLAKE2B 170ad1eab743435eb414a2d6547be6c86e4d75aed83836eb29285a8d11a43f7eb878104b3b7a70b528522a415a96a841686d07e82b151fc6f726c1f56d54e801 SHA512 b7abd9d0068d2933a1907655832930c455093b4ffbdc2b6fb2405a821cad0ba1c4de3aa5fa0ea7c9b53d06cfa6d5b5658d30a18a4f5c3884d0e15c171a097b29
-EBUILD avrdude-6.3-r1.ebuild 1604 BLAKE2B ee08eb332a7c39e4c6fe962b385feed5194ce7ccbf3fee00735e71525f9034de3cb501cb2073ceb27cdfc9c6e1bd8d0d33971f0b126cf336e304d353ab460230 SHA512 cff807fb969f08f298692ca01d62420f76c59a36b986c58c951e0625384077857f6ce7e3516b6a4622709f2c0655302a378f92ba4fcfde01844eb172ed8ada0e
 EBUILD avrdude-7.0.ebuild 1774 BLAKE2B cc39193e02269b3ec525b57942f9d069f4b80a13e25b2c47b1e340e2845786e54f7e251d3b3ed48bf20b33254f045f5829c2042f0b6219fdfbf635dfb65a83a4 SHA512 488740f59590b1b8729f20aabdb58220585a6cb564f8f9ee9df770dcd418acedf16ff72cdd06a0e6e7dc1e106c3b3f36161a64bb2b06d961e6f10a69a21f4c23
 MISC metadata.xml 445 BLAKE2B 022417895def5659b262f5b522881b7c3cd9d45129e3adb8bfe598b8301591f6367595ec529ad812c3d814e801939a0f7b41d7dedf101cdd487741f43a2d5a72 SHA512 2d68e3db08f4a8d74b03cdac07ad45c00fe37794fd7cdaeb8ccd0a9dd0972fb0a60e37c8f37f4801b657ee415f4966d591854fc7176a4e274e9ad60b3cbba012
diff --git a/dev-embedded/avrdude/avrdude-6.3-r1.ebuild b/dev-embedded/avrdude/avrdude-6.3-r1.ebuild
deleted file mode 100644
index 3f5bb0d68788..000000000000
--- a/dev-embedded/avrdude/avrdude-6.3-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_DOC_PV=6.3
-DESCRIPTION="AVR Downloader/UploaDEr"
-HOMEPAGE="https://savannah.nongnu.org/projects/avrdude"
-
-if [[ ${PV} == *9999* ]] ; then
-	ESVN_REPO_URI="svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude"
-	inherit autotools subversion
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-	KEYWORDS="amd64 arm ppc ppc64 x86"
-fi
-
-SRC_URI+=" doc? (
-	mirror://nongnu/${PN}/${PN}-doc-${MY_DOC_PV}.tar.gz
-	mirror://nongnu/${PN}/${PN}-doc-${MY_DOC_PV}.pdf
-)"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc ftdi ncurses readline"
-
-RDEPEND="
-	virtual/libelf
-	virtual/libusb:1
-	virtual/libusb:0
-	ftdi? ( dev-embedded/libftdi:= )
-	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == *9999* ]] && eautoreconf
-}
-
-src_configure() {
-	# somehow this doesnt get set when cross-compiling and breaks build
-	tc-export AR
-
-	export ac_cv_lib_ftdi_ftdi_usb_get_strings=$(usex ftdi)
-	export ac_cv_lib_ncurses_tputs=$(usex ncurses)
-	export ac_cv_lib_readline_readline=$(usex readline)
-
-	econf --disable-static
-}
-
-src_compile() {
-	# The automake target for these files does not use tempfiles or create
-	# these atomically, confusing a parallel build. So we force them first.
-	emake lexer.c config_gram.c config_gram.h
-	emake
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		newdoc "${DISTDIR}/${PN}-doc-${MY_DOC_PV}.pdf" avrdude.pdf
-		dodoc -r "${WORKDIR}/avrdude-html/"
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-embedded/libjaylink/Manifest b/dev-embedded/libjaylink/Manifest
index 93a6d9b25529..dd12ef52e9f9 100644
--- a/dev-embedded/libjaylink/Manifest
+++ b/dev-embedded/libjaylink/Manifest
@@ -1,5 +1,5 @@
 DIST libjaylink-0.2.0.tar.bz2 59078 BLAKE2B 7928875248972bc00ec46511861e160491f7a53f729e0fbfe3a6d08335532fffc9e285e8a354a390037bebe696b6740bdc422164238947baf5e0fcf8f55c0dd5 SHA512 5a8c458982fdea2025aa3ce774d41cc58a283824dcd90a94531ee5e6ca50d9961b0ebb40a6dd3a97fdfcb44625437d685151560185449c3161fe399e0651da44
-DIST libjaylink-0.3.0.tar.bz2 61075 BLAKE2B 84946fbe0a061117f92b8011c0b5eeb30f8f74817128a5fd6a6d519c7a0f07f447d87d0fe72d7a47d17ab2fa33cdc3820e0c556f75c5dedad30faf5e6cf5739d SHA512 714de9297fb59eccee7eb461f37b20459991bffd31aac8eb20014f00716bb94ff4cda96a3d1746419c7722b6b7d97e7a42df9fb3b5c4f83a3f1ac79647159426
+DIST libjaylink-0.3.1.tar.bz2 61062 BLAKE2B 7a220b7e1ae1818b9d65d6bb92b282516ce6e4144ce77ee8b77088ebc92f9a091ae04a78c043afaa90ee9f737baa7c2fcd0a9237b60662af0d858fb24cef1c5e SHA512 4964e522cb59f59db444ca350529dd3695e2ccb451f7607e2c14074bafe47688f35b2e8b3304170a611db2d21040f3f98c95def179cf4f95733287986811fd78
 EBUILD libjaylink-0.2.0.ebuild 823 BLAKE2B c388faf02a0292265ff13db4ded9aca6d912de9952cd7b7fe043eea361ce334c07f663a67901525af24afc60b4b7c72057fd092ad2b93aaeb908ca959dd62913 SHA512 c55fcab380cbc8c0e1442c959d60180dbd972857e369ad19d7ce68ef6d03364fb53d6410b525f164b2ca8059b4745b3c361a77792ab5e9a9637863b5f9595068
-EBUILD libjaylink-0.3.0.ebuild 819 BLAKE2B 6a17f87c8067b5e99cef4c66ed60d1c587a82d2a9ff8ca560e098f9c180b4f3f62484a20cb4707b665fb2cb3a141b8bbca14a99aab760bd36d5634d35cbb7f21 SHA512 872cf96a5c017ef2fcdfaf97f81e0f98026e787af1664353b7d9e85fb9f9863193b2391ad43b115ee9d6d661ff93fa7d748b107371f50bb7cfdd6abfd34315fe
+EBUILD libjaylink-0.3.1.ebuild 819 BLAKE2B 6a17f87c8067b5e99cef4c66ed60d1c587a82d2a9ff8ca560e098f9c180b4f3f62484a20cb4707b665fb2cb3a141b8bbca14a99aab760bd36d5634d35cbb7f21 SHA512 872cf96a5c017ef2fcdfaf97f81e0f98026e787af1664353b7d9e85fb9f9863193b2391ad43b115ee9d6d661ff93fa7d748b107371f50bb7cfdd6abfd34315fe
 MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
diff --git a/dev-embedded/libjaylink/libjaylink-0.3.0.ebuild b/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild
index 8601f4cec5f0..8601f4cec5f0 100644
--- a/dev-embedded/libjaylink/libjaylink-0.3.0.ebuild
+++ b/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild
diff --git a/dev-embedded/picprog/Manifest b/dev-embedded/picprog/Manifest
index 8742983cb632..88f077b98192 100644
--- a/dev-embedded/picprog/Manifest
+++ b/dev-embedded/picprog/Manifest
@@ -1,3 +1,3 @@
 DIST picprog-1.9.1.tar.gz 76452 BLAKE2B 7c6c5d1eda83c9bdc2c9a3c32c97d06b983cb335d2d37e291fabce3955603adcad293934f2cf1964af1e062b800a6e392f97f80ae1dfd94c03bbc269fafb0785 SHA512 1f24c372aa149d86dd4778904f0abb782510168ce36676b820a5b675f53a7207f62cdcb374c8ec2c60fc51fdfd5780ad9f8f464365403d3d2232187dade91887
-EBUILD picprog-1.9.1.ebuild 585 BLAKE2B 7f01092b05016cc405850474e092aaf6fd71e72f490b2d6ab0b040ee7d6afff76073e14de38a31c34c288eb0b2495e1233b5131b57dede10446d21067f5bf53b SHA512 e7b35ae6d5430d1ba6f6481ae9a0b78cb0477237d9077aa3175492b623024d01ea793f6641f47d2a9db78ed1e7a216bed7b94759314650989a0b5dec78103b74
+EBUILD picprog-1.9.1.ebuild 585 BLAKE2B 84e3e36dc25acab174e6c7614f168e7e145b73e67f0b8f077bb20863d2b45d11bdb03bc96a993886eb4cc69be0bb11f1ac43c508cd0c06a596932491e61fcade SHA512 ac77bff91c141511ac3486452680b896415048526415b379c9841d0c4016ab84dd19dcb9f34e30adb7474b2778a733a25581abb91f9d625a7968098ae59c4365
 MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
diff --git a/dev-embedded/picprog/picprog-1.9.1.ebuild b/dev-embedded/picprog/picprog-1.9.1.ebuild
index 1959d42a4d8a..a179455eae85 100644
--- a/dev-embedded/picprog/picprog-1.9.1.ebuild
+++ b/dev-embedded/picprog/picprog-1.9.1.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="A PIC16, PIC18 and dsPIC microcontroller programmer software for the serial port"
-HOMEPAGE="http://www.iki.fi/hyvatti/pic/picprog.html"
-SRC_URI="http://www.iki.fi/hyvatti/pic/${P}.tar.gz"
+HOMEPAGE="http://hyvatti.fi/~jaakko/pic/picprog.html"
+SRC_URI="http://hyvatti.fi/~jaakko/pic/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 35d506669e3d..808271160e1b 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index df22e539396a..6d421fba19ce 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -2,11 +2,7 @@ AUX crystal-0.26.1-gentoo-tests-sandbox.patch 943 BLAKE2B 5998c494c55f1039111ed0
 AUX crystal-0.27.0-extra-spec-flags.patch 493 BLAKE2B 84270f431db778bfe4b3b9b291278960ad8e7f18a4e519eb38aea55f2777cd5bc183e2a7035b4364586bf69ca3ec40d52dcf0d5e5fcaf04ef91cd3d1efff2000 SHA512 95390bdc9e594bb8496a807287ea8225cfc13a1ad7d49a42c791cb94f641939b0002ec7dcdeb8d62565906c035c40e9e0d744ea7e8f4695dd07b66e5b66327da
 AUX crystal-0.27.0-gentoo-tests-long-unix-2.patch 469 BLAKE2B 66bcc1d0dd9582cac4ba89a2ccc2c7a2ac3ff4994cd687191470f2d481f9a6e3a91aaaf705f92f7600118a9cda015a9554056520502df7ae6462e111665c7330 SHA512 d840ac343ef566e404dc84e908bead5a020dfd88b8c0432f17bceea8d710d435626dc72b4be6622dbcd683a149bca16e781320cf74fc3f2598f84d169c6f7faa
 AUX crystal-0.27.0-gentoo-tests-long-unix.patch 3317 BLAKE2B df1040abdb587ac3fffb8129d4f1bafc492e38ad5dcfdea5cfbf4426849b099c4d94dac61c93ae7fcae46b60dea1809f52ad373efcd89796a3c1f119614063c1 SHA512 a9ed819a864465e062b4d6a568f14fbb8adc1db01071c79164dede8b2b8d83e07b785cd8196826097de5119e0bdc7d6e194cf4e10cc677bd2bdf158d124c2ad2
-AUX crystal-1.1.0-verbose.patch 803 BLAKE2B 2fa91a0d3f5dda1cd2790a09a32dad212d471ed42eea3786ba9216fdff46f78630c45b0130fab36bde9435b857cd57d348a2df72520a8ef7fe1115da477a6855 SHA512 ea3b0ebfa28f345f904a8a829eec9c83b8bc2d764b5ae3640a4d60902ebe2aba1f58cb04a9a50dd7359784bfed0e1a154b31875323178b477089d7ba25cde4ec
-DIST crystal-1.2.2-1-linux-x86_64.tar.gz 28611412 BLAKE2B 95593120b00b09b0a250917cbfd0841a77ead5e768ad483a900452678be5b231408017c4ac668df4de675612a008a385ed0dbf6ea216aec0343f8b5e8ede3e98 SHA512 7fdb247074723f52f8dfb9d2e18eef1ceb6fcf595bd12ec7304eb292716c4462ee34d2d87eac56302053dd4d8cd2beccde3dc5bfa3c75e6e832813afecfadcde
-DIST crystal-1.2.2.tar.gz 2621720 BLAKE2B abd196aab8d874e7a26116b92b046893c5f03d3ad7a28902fd2bbc3fe8e801f4c5d6766397583864bc3b7642f5c508e7ea0beb82661f87943c8a9914e014e71b SHA512 855f9c103f05d1ebb03d146d93362849a15ea67a64c993219f7c66438585b590caa53a9482daf81810920b39795c9f5c3e2a0caf316b3d62826e2540fd5fb60e
 DIST crystal-1.5.0-1-linux-x86_64.tar.gz 29749716 BLAKE2B f1a84e89bb1c92349dc6e66088cd60298a7de25a5b42876b06ab8460e277db8fe53fa5477e8189f5382ad98b571df25978437c5619260f58ac721d1235882025 SHA512 49ff065bd084c4d8ad4835e79bd7679d76f4ee641ad8955c110f585429297a3343a6e7406fbacfbea18d91fd7ebbef40f61e1db66c249ca653d43b46dce68636
 DIST crystal-1.5.0.tar.gz 2909586 BLAKE2B beb6bf0b8950317fa1883fa5c281ecf205f3a2c545b99e489ab07420534fa14ff1feb2a506a961304280cfcae1142faffd42acedd6845b96f439a6407e09106b SHA512 9f1915834c0218b05c6197325df1fc52d5d6a94ba1b83629ac07df4073271d777c1f6acfa7286eafb645e9118702ff856dfe590c8b2a3d91eb6929e88275f7f0
-EBUILD crystal-1.2.2.ebuild 2585 BLAKE2B 64f32da32aaf41bf10930c5e00bbf4cd8cf4305729a6e1cd75b6ccddb0cf4e0c278c45281d8283326aeb2968c62c1df723b5033d723191aa71a8d4ed40df1b30 SHA512 a0f48476a929458ed17df957a429b92f692bca7a58d1696d407323de60a1ade0384b75e0b6c7ab145c04ea4f9fc2df938982631150c81ef47365e7bec1d78cd0
 EBUILD crystal-1.5.0.ebuild 2544 BLAKE2B cfe10041668fb42053f97f2fa8bf0cf339c6a30d5110d34080d5b3bec6a6f7a8a99a61a41245136e81b09f370201c339fedd528c88900945dd725a1614e2e2d1 SHA512 c364de37b0c28d72cc5b057c5a88e1452e9cffe4b885d7297b74d3e9b2d05e25b54e9cdaadb302357eccef0607c7ca22691f438c96cdf44ee68e04fa15cfed1c
 MISC metadata.xml 822 BLAKE2B 75fb394e2c4ccb7ed15df03b68f5adab6b40555dfd1f8a6349e144154162fb9bbdcf6d094d77ed8a477aea817401140bc800871ad86ef74393e7fb8462a21fe7 SHA512 7114e89e86a4fc1018647e77c54834ea4fbb717275573dbc5aedbf051b06da286cfa274ef5449eb4568f9e905eb1a58f11b1cfb50bb7316fd4b6d895d274cc4d
diff --git a/dev-lang/crystal/crystal-1.2.2.ebuild b/dev-lang/crystal/crystal-1.2.2.ebuild
deleted file mode 100644
index 7758bb838f9a..000000000000
--- a/dev-lang/crystal/crystal-1.2.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LLVM_MAX_SLOT=13
-inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-
-BV=${PV}-1
-BV_AMD64=${BV}-linux-x86_64
-
-DESCRIPTION="The Crystal Programming Language"
-HOMEPAGE="https://crystal-lang.org"
-SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc debug llvm-libunwind"
-
-# Upstream test suite not reliable
-RESTRICT=test
-
-DEPEND="
-	dev-libs/boehm-gc[static-libs,threads]
-	dev-libs/gmp:=
-	dev-libs/libatomic_ops
-	dev-libs/libevent
-	dev-libs/libpcre
-	dev-libs/pcl:=
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-	!llvm-libunwind? ( sys-libs/libunwind:= )
-"
-RDEPEND="${DEPEND}
-	dev-libs/libxml2
-	dev-libs/libyaml
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0-verbose.patch
-	"${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch
-	"${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch
-)
-
-src_configure() {
-	local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin
-	if [[ ! -d ${bootstrap_path} ]]; then
-		eerror "Binary tarball does not contain expected directory:"
-		die "'${bootstrap_path}' path does not exist."
-	fi
-
-	MY_EMAKE_COMMON_ARGS=(
-		$(usex debug "" release=1)
-		progress=true
-		stats=1
-		threads=$(makeopts_jobs)
-		verbose=1
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		AR="$(tc-getAR)"
-		LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-		PATH="${bootstrap_path}:${PATH}"
-		CRYSTAL_PATH=src
-		CRYSTAL_CONFIG_VERSION=${PV}
-		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
-	)
-
-	# crystal uses 'LLVM_TARGETS' to override default list of targets
-	unset LLVM_TARGETS
-}
-
-src_compile() {
-	emake "${MY_EMAKE_COMMON_ARGS[@]}"
-	use doc && emake docs
-}
-
-src_test() {
-	# EXTRA_SPEC_FLAGS is useful to debug individual tests
-	# as part of full build:
-	#    USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal
-	emake std_spec "${MY_EMAKE_COMMON_ARGS[@]}" "EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/crystal
-	doins -r src/.
-	dobin .build/crystal
-
-	insinto /usr/share/zsh/site-functions
-	newins etc/completion.zsh _crystal
-
-	dodoc -r samples
-
-	if use doc ; then
-		docinto api
-		dodoc -r docs/.
-	fi
-
-	newbashcomp etc/completion.bash ${PN}
-}
diff --git a/dev-lang/crystal/files/crystal-1.1.0-verbose.patch b/dev-lang/crystal/files/crystal-1.1.0-verbose.patch
deleted file mode 100644
index 4e68afd1a94d..000000000000
--- a/dev-lang/crystal/files/crystal-1.1.0-verbose.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -29,3 +29,3 @@ SOURCES := $(shell find src -name '*.cr')
- SPEC_SOURCES := $(shell find spec -name '*.cr')
--override FLAGS += $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(static),--static )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )$(if $(target),--cross-compile --target $(target) )
-+override FLAGS += $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(static),--static )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )$(if $(target),--cross-compile --target $(target) )$(if $(verbose),--verbose )
- SPEC_FLAGS := $(if $(verbose),-v )$(if $(junit_output),--junit_output $(junit_output) )
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 433033b25d5e..dc4fde820524 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -5,12 +5,9 @@ AUX elixir-1.11.4-fix-elixir-test.patch 1170 BLAKE2B 05707d9d095f95d6d0fe3b21bd4
 AUX elixir-1.11.4-fix-logger-translator-with-otp-24-11222.patch 2355 BLAKE2B 4189a7f8189d595db3a194edbf54d448fbf13665d29a3ad6eb7a8c5909c17cd53958f5b675666f9219aff016dc0c6aa04f815e80ad7de919c05d5d515a82e717 SHA512 713af811385379982b35054301f4032fada4e27e63de7a8344323d36eee7b52bc519a73c61554c33ebba97b88b6abbc14daa65111ff53caec73b0c06c542230b
 AUX elixir-1.11.4-update-warnings-for-OTP-master-10807.patch 5564 BLAKE2B a3e3a43c041df9842071beea4700f68fe4b2da0af4318711511e568599a31cd086544c8b2cb3b4a72232c1e26a8b2f29e97f80fa02e5c2a9de04c952c3c5fb92 SHA512 5c3f10588ad8c8f3bad92c500eb0db452ac2c72ac640674a0e6fecae6064ffd5a3d1cddea6e5bcb56d723043ce8586df4cb1538873f56854a5d05c70eebac12b
 AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc
-DIST elixir-1.11.4.tar.gz 2396885 BLAKE2B f63e835991420bce8cacd38a920637aa5656c0372bd09e8c0a357a24bcca9a06350973f1453f482d3854a48712471c55389c3bd530df46a19c20a359376b779d SHA512 5dc940a31a31ae1c1537f874c15e58311cc0b0452f61e923bdfde0a5cfef3d8003eb3e85be320eb0acfb7bc0c0c0dc8ac965dec6727257c244048268fbf38ceb
 DIST elixir-1.12.3.tar.gz 2461828 BLAKE2B cdae9bd7f3463b89dd737ce943d57b7f9801bf382500a274332e1cb87902ecc37bd6e7a53af4dd5c1cd6e6d9d64171e226e676cd8023252c86fdf028d80dd383 SHA512 945e33ca9c3e50015531f87630c1bc1b9966acc64bbf7d01c8c4f8cfc104ee1e08113f572f0ad6a9f5e8ee37e33144e58b2ac33dc0a2b01e1355fc5f8b1b9329
 DIST elixir-1.13.3.tar.gz 2922197 BLAKE2B 47c98ffe24d11ea161e9b9fa55d3c8ee1c2234848707aeeaf715eb02a61b7d3e8784bf2599b4129a824edf004d1edda2f0a42252710d957cc0213202f86dc06d SHA512 88bf585e18bfefa54c1c771247ec489bc96d16cc0f88384e9c0c981ddb665cd7efccd49383b4de1fbbd823ecd0a5e65d76e3065c9ce3c45f2f4feccd01ace48e
 DIST elixir-1.13.4.tar.gz 2912984 BLAKE2B 3849e7be7d1ba54ac3f96690f158b60a3b7da720e85a6c2ef38b078da795c1debaff319133eae6d5e77a7159f452b2ee6a7ad9ebbf7339391e4ee9ae8838d848 SHA512 cd3a28cd227bf60f09500563b7ad4700b2688e0361f975268d5fa81b530aee80ed4f8640335bf08a8c544a2f5d79dbf96c97f281bd3bf4582466a73a9d2edbec
-EBUILD elixir-1.11.4-r1.ebuild 1096 BLAKE2B a94f4bfc202bd0765296efdc82ef0665085c502d6dbf3d05ee1f12ee3fa5d3b3ae38d70bb6b2db272e3977838147296934c9616caa8e535b5f4f994842aac92d SHA512 9e201821797a284cd214cfb963b15af00c2de951fba16471e05dc7fa13b42e8b1de9329693d3393bbca10005c091cdab20e753d25c063903e89ea04063deae00
-EBUILD elixir-1.11.4.ebuild 943 BLAKE2B a523b08050cbefaeee8093b145dcbe17fdc74b19ec96d22a546d20788fe1d0048719f3fa307c995164a2c5a2bbae96d69e59a59f58d548a6b979787b454e8c08 SHA512 cd83ec4bcfe2f791c4ee4a4eba97d53aa78396849fc5fada8f2bd7a01b69eb9fd315a65a85b0eac67f1f4ee367e43406292673022ca47ab293572af6b87307e4
 EBUILD elixir-1.12.3.ebuild 933 BLAKE2B 0e11ce540d27904a54643dd76e7d3e1146f1fec96e81c237e9082a54c6b656bc0a63731251b912bfed0bee405548c9d57a5756e0ff5b5743eeb2390746533a1c SHA512 51e9057967268729c7ccd66e08ac50297e01ef9018df3478b7f7d76257712f6d91b40cc6964684e5deb495b2e03de22055fdaa23ff99d131a691a5f66ee2e528
 EBUILD elixir-1.13.3.ebuild 883 BLAKE2B b87948972fcfaa1c0229fe6ffdf4925ba82e92e86987b3d71ff0745b7c0927b1c3f44f5fe845d745a31cc5d8a0f50005de5b09f47212966f9aab431d7e8e4e35 SHA512 a45e5fa9ef66d13846b0a45dde787de8b2f4396f2206d4145a122975cc6a18eb0c80b0f8988a448d98df2f546e2fd22257ddbb0f5964ddb6108455c905f609cc
 EBUILD elixir-1.13.4.ebuild 890 BLAKE2B 45c4e7d60a766b40688893e362dd7b73964cf7110b7cd8a90a77600a5f6969cf04adfa143ee5c459964e156efc6b453b9d3df0223f84441fc48acc369c974fd8 SHA512 0434f9375e00ba6c04bba08a994b54db0eb5ddd80590a1a2a51d26222237b3cf57027dd3e3c03acc1ef506a74bf9b422772ce04e00089ab553a8fb0c1aa06383
diff --git a/dev-lang/elixir/elixir-1.11.4-r1.ebuild b/dev-lang/elixir/elixir-1.11.4-r1.ebuild
deleted file mode 100644
index a4fe19d9ec0d..000000000000
--- a/dev-lang/elixir/elixir-1.11.4-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Elixir programming language"
-HOMEPAGE="https://elixir-lang.org"
-SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 ErlPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-lang/erlang-21:0=[ssl]
-"
-# 'mix' tool collides with sci-biology/phylip, bug #537514
-RDEPEND="${DEPEND}
-	!!sci-biology/phylip
-"
-DEPEND+="
-	test? ( dev-vcs/git )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch
-	"${FILESDIR}"/${PN}-1.10.3-no-Q.patch
-	"${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch
-	"${FILESDIR}"/${PN}-1.11.2-mksh.patch
-	"${FILESDIR}"/${P}-fix-elixir-test.patch
-	"${FILESDIR}"/${P}-update-warnings-for-OTP-master-10807.patch
-	"${FILESDIR}"/${P}-fix-logger-translator-with-otp-24-11222.patch
-)
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
-	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
-}
diff --git a/dev-lang/elixir/elixir-1.11.4.ebuild b/dev-lang/elixir/elixir-1.11.4.ebuild
deleted file mode 100644
index f5439a725a0a..000000000000
--- a/dev-lang/elixir/elixir-1.11.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Elixir programming language"
-HOMEPAGE="https://elixir-lang.org"
-SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 ErlPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~sparc x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-lang/erlang-21:0=[ssl]
-	<dev-lang/erlang-24
-"
-# 'mix' tool collides with sci-biology/phylip, bug #537514
-RDEPEND="${DEPEND}
-	!!sci-biology/phylip
-"
-DEPEND+="
-	test? ( dev-vcs/git )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch
-	"${FILESDIR}"/${PN}-1.10.3-no-Q.patch
-	"${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch
-	"${FILESDIR}"/${PN}-1.11.2-mksh.patch
-)
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
-	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
-}
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index e039397a7e14..43b7d5e79656 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -8,24 +8,18 @@ AUX epmd.service-r1 159 BLAKE2B ec50e4bfd89dc2d35fc2e549c695f9aae163d3df4d3c7a0d
 AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f907e6f8b1ec2730d2b98aad5405383742563e050bc6ffaae22d55a22998658460109fac9f6628458f5e976e9fbfe71cc26f1d64 SHA512 0fd7cbef64a9a54e0959d49b50096f9abc6fcede4360c153631c7f649f5c41b35ffb1f2d06f80964bf49421464bcc43c96147c227d60cf413c51b3e89ae9ad24
 AUX erlang-23.3.4.14-emacs28-compat.patch 6237 BLAKE2B b5b8f0c7bfd1f217805d7279d85b7d09189d069814afde10b32446031c221aaac58aa7adaf993da7261c1d8889b5bef6cabbfc73b4062a6eeadae5e0d923c39d SHA512 e47364afaf8d29b1e9e1f6548bfe5efa110e56777d9db87fefd24ee201d5689f46e3e4d34c32b3a95353411500ae10fc1064f9ed155d5d6d97f442d749e38f9b
 AUX erlang-24.0.2-serial-configure.patch 586 BLAKE2B 3ad4fcbf35310dc11e8aaddca95a467414c60390a7e170c83d0775230a5a815212c6ddce55e98721b02e03511f80e67cfbd60e4b06bc86c615bb3a51d5015ec5 SHA512 abc81ef2a0b23fbe82542efefb1cbb12b1143e9282f7114ea929c18a5c02f2053caabb05ef9838d40b40f3ca59b06955528b122092438ee3d4ef6a8b567fc335
-DIST erlang-23.3.4.12.tar.gz 57278064 BLAKE2B 3620dd2e49cfd75e49bf573ad1a8f8952c232ce2bf734ee845d8e8bb26053e34df96b472a9490c1cdf77ae6c106732f6a68b2f5d31808fd941bddb616004819f SHA512 d4f468393116d2d24a5170d7efe04305d221baccccfc273d4740b701ec23d1e55268cc49eeb99722afa636431e6e50faa5c11758484aa71e29c2fb3ed7c2ad25
-DIST erlang-23.3.4.15.tar.gz 57510217 BLAKE2B c07a1de91389774a8c62a0618567c0b8f8cad98674a1a2a737ed16d42a5a7c48cd7f53b433d44175c0a5abfbcc276b8cae389b165ae5343fa6d7a2aba9a930dc SHA512 a79c4deb8261a4c3e165198794dd0833d3e33bfc9ec36627b245f425cbdd354b82a018fe68debc68d4514972b3a4d171c8d4503bfbd73a678b0bd0c5b8343439
 DIST erlang-24.3.3.tar.gz 59296830 BLAKE2B 1792274c77001b6f49e84f1584620a247cf3acdf075a8d581403f31a2b4cfe32e7b8104d325f3c1a999595d94484cb74b7996a35599e9ef8935931a133a554f6 SHA512 5e8ce0ebd50c1c67ca29ce9405fc18f5461793b20a1732418bc8fac404078044deb72526682aab92ee3e737bc9dc9e94e6be162a088e2cb7cc68c14b1d76454e
 DIST erlang-24.3.4.2.tar.gz 59532491 BLAKE2B 28c48f1a3197a151010a775286cf0b775567301411b8480b32cfb39c68978de5586b63c245fe58bff8034ebc04fcc3b002dee7c953127ecf581ed6d716587ae4 SHA512 78bc2dc67fe60d3ea6049c361a017c054e12b0adeeae890b0a1ee5301744505593bd19f3731acebff8312b323a3bd21a1359507d122fc34f0eb85eefb3aac88c
 DIST erlang-25.0.2.tar.gz 59800286 BLAKE2B 4344ff5a21a6c0139842067d10d82435f504a5bd3b4112137f92ad06d7bff21352244c80eadad4a9efbc29692ac2be2a81b87ddde9b29433d1461a1148a733c7 SHA512 717406816b4428fb8bd808a9d25575b7e33a05e6aed5428295682ba8576d53f1433bd1b1593236943e592e673ed2168047873127cfd293b5522636c514328f43
 DIST erlang-25.0.3.tar.gz 59811038 BLAKE2B 81176f415e814b57f298782d2ae77ebf68c1493753b747b29409d95f811dc501ec5301975e90ec464ef611c3f06cf066d36b34f21e92bae10e5f02fe3f87c8b7 SHA512 d6c83722bd86e20568b879cb770e95e37b6227b932e4e74e50bbb9dc426b1f7f5286600a182011baa2b83ff7f006717ee62812959f133868765d819ddf57399f
 DIST erlang-25.0.4.tar.gz 59812650 BLAKE2B cebba32e859ec4ff0868de506771449a6d5d053d50d8f4a2cf84f9bc90da1e14ae320420b3c33f6febd5977fd1ccff98b55d3ee1a0c4b90e674e912883cb0f29 SHA512 8d9d12496d55181c0d866bbd97576551d1d78232fe34b845e8efbfbd4e95ce8426e73221d8126d12453959cd8adc5e07f121aaa93f3a5696074b43c69291d363
-DIST erlang_doc_html_23.3.tar.gz 36224657 BLAKE2B 7e2a3e16f4cfa0f15c01074740e02af7a45b480b4a94e764463717658ab7e5d0281f928c3ec585582b10168645e3e06cfe72cf6a0ba1b88f539b80f2b7ad99be SHA512 8be4aae46839239604b875b39339e7b6b6c677c099b3d749d5f1041c4508c1c3b4aa8136a93df12b1e5cb6333ef907276f5965c9726ed2b9e77a6043c8ef53b1
 DIST erlang_doc_html_24.3.tar.gz 36645792 BLAKE2B ef90b7d05ed43656ab1ffdbbd0833c9da08a867ad7a99ec0f7f1eb59697c1f9cd5ccd150b2e564af80b2098f063da0c76121d4444b5444e603581442ad1c7bc8 SHA512 b8d3832ffdbdede656b362d719474f7b9ff04a32ea7235e77d63755629cf9305c203cd6cd9ae089171b2cee694f9641d6ed5d0197e2acf893a31d25696096f1e
 DIST erlang_doc_html_25.0.tar.gz 37051192 BLAKE2B 2d79ccb3b850b199de0a7da83c6358b9f3cf63826aeddb54307640129c1f96689200895c3c3ec52f503362945e7c6083a7317cd4ea57dc7d6772844801843c74 SHA512 6ce8423705f86fb2cd403e9c51089d7b2569ba93498f9143b5dbac85eb10b403c4bc948f8a68e55c40116cdd9a93f050bb037f94fc3c8651175d9065d2c598be
-DIST erlang_doc_man_23.3.tar.gz 1456501 BLAKE2B 414bedee0e316d97b26d9d6418b799a9434a22e9980e7d3a83e2478d184d63d1633c0e10d0e180d929a3cacd82b4d703be86cbc8e99996037f6b37ea122f7a8c SHA512 6c661c210ffec4752afe624fa46700a0f62cc6589b74b859ab1dfde77d289e992988ac8744f7b4126d7512cd6d0aab3321f710a6324552b259bd7acd5b54a05e
 DIST erlang_doc_man_24.3.tar.gz 1680242 BLAKE2B 3311eb6ed6dcaa2d611adf7a08269f67e3f31d106f6b6d04e5cc91efa8efc382ddb6b230f218fa543390bf4ec37f477e0c4979c82632ebfb6ccda8c5de1fbc41 SHA512 72876911a1ec82071225e7b71de0462254becd64892a5459239b9e44b20601f6b6990a12cd36a8320e81e5307bcf7b5e5057e42baec12403be4a0eda00cdf62c
 DIST erlang_doc_man_25.0.tar.gz 1711510 BLAKE2B 743efa8edbeeb99e37e227c1e5e3be1825a391007e1c220ba22163c528edda8941b1dca0951cc02aff016dda0d52f3a6ff4fdbbbe279ce067c7a1993997ce6b4 SHA512 c6b6490961228893253e11d5bb88cbd30ba2cb1c13819a85db6699b437f0327fb55962accb6b602a4ec5ffc423882205d05873b064fb3e4c52950a423706fb09
-EBUILD erlang-23.3.4.12-r1.ebuild 4499 BLAKE2B f5d60f5e4daf2766f1a8dce36ddfce00e220bb771ffb02da6448ae4526d499f433dff704d9381c9aa73cd9e3ccd0899a83441a394c0372e791786a7193694fdd SHA512 fd0a6b91636133698c5d9c9348e5db379547f84f5b1fe9a7541f5d8de3ae4205cc0ea0727d76d885908e1d19ae84dcbd2743d749e11bad4c9f76fdec0b82a7da
-EBUILD erlang-23.3.4.15.ebuild 4556 BLAKE2B 814062c5bef24e854efcbecc84743aff69103e6f03ab6aa98e6e0aeb31924f54ce1adf22c2f68a5a1ee811cf84c9ac97cdf5a59cd38c02f4c00b998cf5113022 SHA512 ba33d1a2e9bf1ffcf8fd57929cd5e09dab4ac7ff5f4d2f8560ee88c90c7dd5e8e71d2ed956677842cf0f53711c92452273ec463d856ac8f270e6eeccdbf1ae4b
 EBUILD erlang-24.3.3-r1.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
 EBUILD erlang-24.3.4.2.ebuild 4788 BLAKE2B a770984061152835a9452bd8d57f13394d6af4198d4291d6b78d14a03b48d5ef886fa696b5372e32e7927e6bd7466a2be1a505922ea1b7772e1bad69f35a622c SHA512 60f3edf46bf5169b0c205bafa1bb9858dbc3e1cc190616111bdb7950139e9a6adba3d61aa11f490ba98406a7a2b02d261a86b1583474a5ac48b339bcf4ab4125
 EBUILD erlang-25.0.2.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
 EBUILD erlang-25.0.3.ebuild 4970 BLAKE2B a956aa549e09eed55901972ff211d542f6a6f51d330e42925fee1d028ccd2f97d4754d8bdcb6439df282c458e8854f87d8cc7122fc4d811c161c7c08f1ffacc2 SHA512 63b75adc44342017727236021034fc0ca198f6466627f85047794102937e1c598b6361c3ce59db2184b279b33aee173103a1c85148b25741907d9e769d946526
 EBUILD erlang-25.0.4.ebuild 4970 BLAKE2B a956aa549e09eed55901972ff211d542f6a6f51d330e42925fee1d028ccd2f97d4754d8bdcb6439df282c458e8854f87d8cc7122fc4d811c161c7c08f1ffacc2 SHA512 63b75adc44342017727236021034fc0ca198f6466627f85047794102937e1c598b6361c3ce59db2184b279b33aee173103a1c85148b25741907d9e769d946526
-MISC metadata.xml 735 BLAKE2B 6deb116831085a15f4a06368d1d1f3e9d57501799236c7d1fe9fa8aa9a72da0151e92fa13e14427177679c361f8849379784e9c0124f28468f71e2eb54b78bbc SHA512 8ac9f9f29494b5aa9ff023460009c8b69cc3dbc4cc88ab419b62f715066ea3789a4575eab545eed5a430a95f4d0709e069fd240f2cb256eca4dfca7ce3838ab8
+MISC metadata.xml 674 BLAKE2B a5ba4a16a6fc7cc3300471f3415c87b5563aca5af2392194401092a6c8a7888ee024526f25cd5ca20c754ced631444e49d51cad001dc4e985ef95a6aacac7164 SHA512 a830c15318fc227627aac8537d42a5ecccebd7e3cf1837d4d13cd10367a0f48d99d08480aff3e1491919dcbb42c29b38aa28b44435d50f1397e6b6aaf6fb053b
diff --git a/dev-lang/erlang/erlang-23.3.4.12-r1.ebuild b/dev-lang/erlang/erlang-23.3.4.12-r1.ebuild
deleted file mode 100644
index d87e1a997ebf..000000000000
--- a/dev-lang/erlang/erlang-23.3.4.12-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-
-inherit elisp-common java-pkg-opt-2 systemd wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-# We use this subslot because Compiled HiPE Code can be loaded on the exact
-# same build of ERTS that was used when compiling the code.  See
-# http://erlang.org/doc/system_principles/misc.html for more information.
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	acct-group/epmd
-	acct-user/epmd
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	emacs? ( >=app-editors/emacs-23.1:* )
-	java? ( >=virtual/jdk-1.8:* )
-	odbc? ( dev-db/unixODBC )
-	sctp? ( net-misc/lksctp-tools )
-	ssl? ( >=dev-libs/openssl-0.9.7d:0= )
-	systemd? ( sys-apps/systemd )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/18.2.1-wx3.0.patch
-	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	./otp_build autoconf || die
-}
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local myconf=(
-		--disable-builtin-zlib
-		$(use_enable hipe)
-		$(use_enable kpoll kernel-poll)
-		$(use_with java javac)
-		$(use_enable sctp)
-		$(use_with ssl ssl "${EPREFIX}"/usr)
-		$(use_enable ssl dynamic-ssl-lib)
-		$(use_enable systemd)
-		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	local path="$1"
-	local var_name="$2"
-	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
-	local erl_libdir_rel="$(get_libdir)/erlang"
-	local erl_libdir="/usr/${erl_libdir_rel}"
-	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
-	local erl_erts_ver="$(extract_version erts VSN)"
-	local my_manpath="/usr/share/${PN}/man"
-
-	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
-	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		# Note: we explicitly install docs into:
-		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
-		# To maintain that layout we gather everything in 'html-docs'.
-		# See bug #684376.
-		mkdir html-docs || die
-		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
-		docompress -x /usr/share/doc/${PF}
-	else
-		local DOCS=("README.md")
-	fi
-
-	einstalldocs
-
-	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
-	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
-	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
-	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
-	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${erl_libdir}/Install" || die
-
-	insinto "${my_manpath}"
-	doins -r "${WORKDIR}"/man/*
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	newenvd - "90erlang" <<-_EOF_
-		MANPATH="${my_manpath}"
-	_EOF_
-
-	if use emacs ; then
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init-r2 epmd
-	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
-	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-23.3.4.15.ebuild b/dev-lang/erlang/erlang-23.3.4.15.ebuild
deleted file mode 100644
index 4ec3b42e084e..000000000000
--- a/dev-lang/erlang/erlang-23.3.4.15.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-
-inherit elisp-common java-pkg-opt-2 systemd wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-# We use this subslot because Compiled HiPE Code can be loaded on the exact
-# same build of ERTS that was used when compiling the code.  See
-# http://erlang.org/doc/system_principles/misc.html for more information.
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	acct-group/epmd
-	acct-user/epmd
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	emacs? ( >=app-editors/emacs-23.1:* )
-	java? ( >=virtual/jdk-1.8:* )
-	odbc? ( dev-db/unixODBC )
-	sctp? ( net-misc/lksctp-tools )
-	ssl? ( >=dev-libs/openssl-0.9.7d:0= )
-	systemd? ( sys-apps/systemd )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/18.2.1-wx3.0.patch
-	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-23.3.4.14-emacs28-compat.patch
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	./otp_build autoconf || die
-}
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local myconf=(
-		--disable-builtin-zlib
-		$(use_enable hipe)
-		$(use_enable kpoll kernel-poll)
-		$(use_with java javac)
-		$(use_enable sctp)
-		$(use_with ssl ssl "${EPREFIX}"/usr)
-		$(use_enable ssl dynamic-ssl-lib)
-		$(use_enable systemd)
-		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	local path="$1"
-	local var_name="$2"
-	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
-	local erl_libdir_rel="$(get_libdir)/erlang"
-	local erl_libdir="/usr/${erl_libdir_rel}"
-	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
-	local erl_erts_ver="$(extract_version erts VSN)"
-	local my_manpath="/usr/share/${PN}/man"
-
-	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
-	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		# Note: we explicitly install docs into:
-		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
-		# To maintain that layout we gather everything in 'html-docs'.
-		# See bug #684376.
-		mkdir html-docs || die
-		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
-		docompress -x /usr/share/doc/${PF}
-	else
-		local DOCS=("README.md")
-	fi
-
-	einstalldocs
-
-	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
-	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
-	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
-	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
-	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${erl_libdir}/Install" || die
-
-	insinto "${my_manpath}"
-	doins -r "${WORKDIR}"/man/*
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	newenvd - "90erlang" <<-_EOF_
-		MANPATH="${my_manpath}"
-	_EOF_
-
-	if use emacs ; then
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init-r2 epmd
-	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
-	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index 3f54798ac7dc..5d7e897a2877 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Matthew Smith</name>
 	</maintainer>
 	<use>
-		<flag name="hipe">HIgh Performance Erlang extension</flag>
 		<flag name="kpoll">Enable kernel polling support</flag>
 	</use>
 	<longdescription>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 98fadd0d2c8f..0f2c71e45d2a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 0aa4dcebfe85..f0d462954aed 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -10,5 +10,5 @@ AUX boost-1.80.0-unordered-fix.patch 7067 BLAKE2B 1a465a764dd510ec7bbbee4a2d5ca1
 DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
 DIST boost_1_80_0.tar.bz2 115869904 BLAKE2B 507e811be7659442c41bc2d99811bd02a236dc94932e1a7a8cf256243b479f2d2707819cd99e016a51c9dadc215713e803afdd9ea4c105af8d5d2d28d3d06a1f SHA512 829a95b463473d69ff79ea41799c68429bb79d3b2321fbdb71df079af237ab01de9ad7e9612d8783d925730acada010068d2d1aa856c34244ee5c0ece16f208f
 EBUILD boost-1.79.0.ebuild 10641 BLAKE2B 44e43c096af4e3e30d96cffbd21df7111f76453f53b5cc604171addeda32b9cd05560b0c375f8cede3223c95ff07afc9efcfdd8faada0524dd45b4330ea6f591 SHA512 b81c002b0493a966ff11bad777cf73d5a4bef08f6ae4f3a68aa9de82d2c86cf33af89dbfd62a9a502b123c9c63f3f497fa5b6959e9fa1172f114bc5d800ac05f
-EBUILD boost-1.80.0.ebuild 10807 BLAKE2B 247d471e76f02fbcef7a1de9ee0dc104a39a8c57f4cec5fea1bc8686a556a55a1a3b7c135a7cc81ef607a729cf9f23222473fe1ac954608acc9edb8f8947ded7 SHA512 ba08bb9728ed5c1327f6bfa71a22eb64c8b99646b8385de25701853ec487c4661b76eb8c19728dded07e7ea0bd1c3578e7fb0b101492df5b8088cc935253ae21
+EBUILD boost-1.80.0.ebuild 10806 BLAKE2B 58ccdd3dc1ca80d2584d650e7579d806d1abecc819858d8e509e1c76a146bbb470284afa1c856d6d4273c71f1883299852d8efb226cada0a5ae5f456730a9d87 SHA512 f7a9792a1b15b63691f9e8d7b08c83457a190f32739d7b7d6ac6735033009757ae304ea90cec2d00f5efca88e6f9bcc375e6ed6177fffc8a5d81dae9e4713eb7
 MISC metadata.xml 1350 BLAKE2B 5fd10a89cb215629c0a7a0dfd134b3d187312e49c2f77a77666f9c30128f0feec1a82dac64bec80b0f3e20f0f9648924290323e818738da07e1ce8a3112398fa SHA512 3a3584abd5be99dc70daa63bf86ff716ba310dcc7f3aa8bbae5be3e20762ed856eaf372ee9dbdab4c00bc3622288d96816eaef9f639f07cf245de501da917f65
diff --git a/dev-libs/boost/boost-1.80.0.ebuild b/dev-libs/boost/boost-1.80.0.ebuild
index 81b191cdb53f..e0c8fcaf0060 100644
--- a/dev-libs/boost/boost-1.80.0.ebuild
+++ b/dev-libs/boost/boost-1.80.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # the tests will never fail because these are not intended as sanity
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index ed1b7d62b2f0..94e4d75b524b 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,7 +1,9 @@
 AUX ell-0.51-musl-build-time.patch 1449 BLAKE2B 7012ac17e87b9e2cb1a4a16b723bc7b77022921ac1b2a6610ad68380ba73bc07bfbd4508ad18e53d70a4247a6720e6e8ab4082209c7046a00257715731ec0ba9 SHA512 cbeda9501f8ce2ceed0043416dc06e705aa8e07e0897ee866b8892290ba255ffb1dcba3e4e09a22c9e98386214f83bc33df770bfc502286f828e19a0da6c7d40
 DIST ell-0.51.tar.xz 544744 BLAKE2B ae9cd3bc2d892109f5ae1a602f0f711b350ceb10ce2a7fcced5ce4bca63986a69c350013fc08eed29c9c626cc892b70ba997dda321d7c6c089d465850fabd5e1 SHA512 c2fd2ea9858542e23d46eba96045e1c924531b6a436401e86d838ffee39d0062923861c2898dae76ec9bfb325327c97b13799d81a2324982928b07b1fb898595
 DIST ell-0.52.tar.xz 548816 BLAKE2B 9c2ac4128fe770c1d1a1532fca8a5e36fcb620b9908177acb4fa8f35cea733374199fbe55ae78aac25ff5e37ee71044b6296a38fbbf7ff23fa867e2a338b8287 SHA512 e3cad20e42b71a7c1aae2c8bebe025f7a2bd0e594738aba96ffe8b316e216eb57dc86a5f0b0837d8141b16cae4f150c7b472c60d455feec5d7eb340b960c26d4
+DIST ell-0.53.tar.xz 550296 BLAKE2B d68952a0d899d8d346aa9e491b19fc5fbe845fd607446b4c16f09816c3d8b38f576a08cf994fdc49d794847277cdbe6483a147146ed4adaafa47c269846d78b5 SHA512 4ebe79834acabaec411bece7d81f50d7d6ea8f5d330769bbeb20596df6c2885ff584f589b6f5bbf9607e1a52158151d6940d4a1438b4aa610d42c38882366ed7
 EBUILD ell-0.51.ebuild 1331 BLAKE2B 7d6a254dbf13ae781be3f9f4e4240590cac8f9bc36267bb84f5fda9d7035b01007bc4106d04537daa5fd2828cda7f1343a5f3ccc8258349c01cbdc41344981cf SHA512 287bfa2f891a9097fb7fbf11c96037fa7f875afe1a268863a8a21d77d0c0bcdfb8a7a83044c010a5fa767cd1bf21b7187e8ead14719428db074c8588b1c24cf8
 EBUILD ell-0.52-r1.ebuild 1175 BLAKE2B 6f34b0b7cd415715039cda1a0fe1387c329cd4f704e96b99adce6b6ea7ae2059a08a24b0041a45cd455b1ec491c7ebc585b414b4afea0182feec5c5fc7c3bb7e SHA512 5a6e778aae87e96794ce29a103e4e4f0591ee8519960a1eefcc3e92d0eb931a2d77fbcbfdf142d0d60da63a4f4e65f31601841282d4fbfabe22af9f4c51ae40e
+EBUILD ell-0.53.ebuild 1181 BLAKE2B 882b8780ae8199afea4dda01eedb6e01120646b25fc46b7b7924b6472029abd6716fcd686571234105444a62994f2241ae6577937c6e2bbe3b36222161d7466b SHA512 f8797a2b189c08c3cf29ebf1519970ed4bde3009c0ea3ed21829eface5f7e1fd8a8d541440b858447cb9431e4bc95a31f5178b39230a18c43e3b48b8e4b55155
 EBUILD ell-9999.ebuild 1181 BLAKE2B 882b8780ae8199afea4dda01eedb6e01120646b25fc46b7b7924b6472029abd6716fcd686571234105444a62994f2241ae6577937c6e2bbe3b36222161d7466b SHA512 f8797a2b189c08c3cf29ebf1519970ed4bde3009c0ea3ed21829eface5f7e1fd8a8d541440b858447cb9431e4bc95a31f5178b39230a18c43e3b48b8e4b55155
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.53.ebuild b/dev-libs/ell/ell-0.53.ebuild
new file mode 100644
index 000000000000..8cffe5864e18
--- /dev/null
+++ b/dev-libs/ell/ell-0.53.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="pie test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( sys-apps/dbus )"
+
+CONFIG_CHECK="
+	~TIMERFD
+	~EVENTFD
+	~CRYPTO_USER_API
+	~CRYPTO_USER_API_HASH
+	~CRYPTO_MD5
+	~CRYPTO_SHA1
+	~KEY_DH_OPERATIONS
+"
+
+src_prepare() {
+	default
+	sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
+		unit/test-dbus*.c unit/dbus.conf || die
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable pie)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
index 685c88263c92..25642c69c59a 100644
--- a/dev-libs/libgpiod/Manifest
+++ b/dev-libs/libgpiod/Manifest
@@ -1,6 +1,6 @@
 DIST libgpiod-1.4.1.tar.xz 314936 BLAKE2B 8949c4a96f69a83a479f5951e6f1eb8fee56db700e72320131c365a5d736a48700fb42b7ecc2b676cec54887eaa650075f45ec1f0b803de914958cefd3863db8 SHA512 2a9c58a46fb3c2e2dd15cc4ba52f589b44e5ae4547226eeb68a8e5bea6292d38aaf0889cc639e0979e12e129bb944bb42d9258f10292f59d074660e7c2d56d04
 DIST libgpiod-1.6.3.tar.xz 326068 BLAKE2B eda5409f2db3914ede92690589643211eca3002f8dc53a7c48213602f28158084c8eb8061319923f7a51c7d91650ff58b81b059323b5b9133a28b0bb04f6904d SHA512 f7e48662d02904f3f25976d61aa2cf4af0b8a52f65f184f23dfb6916bde9b86634b211f2696d3459a4f902ba5a79621b2fc47d18d487fd7a159018fe8933e370
 EBUILD libgpiod-1.4.1.ebuild 1165 BLAKE2B 190c2b8c0bfaf71973fb722717798b663ca73486f2b9724bfe53f4931169cf055451a7bf7fdabccc0689c5e0e148c99596cf3081b75ebdb759de4c562c07ae55 SHA512 b77d0c3b7f7354b99bb648312fb794253cdda9bdf333d29c34e563e4965555a35c201d3568a7881cd123a81fe7a8f48568680c60e2cdcdb728128eb1057a3846
-EBUILD libgpiod-1.6.3-r1.ebuild 1245 BLAKE2B 44b84731ba022664d4ef008a1e4c09d36fb97871b0f34ffddc2d5398d2a2bf7ba1d35b688faf8cb96526d7183d73b8768a94044e7c806df4e60a35c25f63b628 SHA512 f73e26192b56c9727972e9cdd645b97d029e517a2dcd8e9670efd6f8a2f8056137993a83ad924eb20c559052b1261e2d5cce8c9498f704b68429ab536dbfc271
-EBUILD libgpiod-1.6.3-r4.ebuild 1057 BLAKE2B 900e49b3e673c8d227e650bbb54329bf5a25be79714e3ee4ba81099b1b3891648d62d4fc2a31f9de5a4402ca8dc58b9141ad20705d7e454ba6a1fea77f61dc01 SHA512 37e8aa6b5f1ba0df5824d2c51118c3de6de8b49859673420a9c57d52151065aa014b700b7a6a31a951c6c183864bf70ff58ec8ea35d0d3c552b73990a594bb2c
+EBUILD libgpiod-1.6.3-r1.ebuild 1242 BLAKE2B ba051b6fa13eeca8250040d2150343826cbd99369bc5be1db7779da86aada258e8173294bb369a9c27e882825f6b959f4a9e992de477ed876273d37ff6a76c1e SHA512 3f8eb6bf52e1d0505452183d6659f3d50b17b2192d643a0a32c8840f1e6a4cb17c124709c71a2e36a12ba8b93974efe34d6c5c19fb66695b4bdbea4c211459c5
+EBUILD libgpiod-1.6.3-r4.ebuild 1179 BLAKE2B 0ce08199599057a55bb24552ff41837b460117a7795cb9eb8c8caa1e666260a94925978b51ff489638d59d89a7bdfc6a46fe423fa48c47519c1be7f03b43b341 SHA512 783afa3e15506463f07ba91ec9cc292d0e68ff82afaaf897066fecf9e9f98e1faa107f8e128b42a26a0876a698af2a32aa0c72e67a69168d2f0bc9573ffa96eb
 MISC metadata.xml 344 BLAKE2B 3c4f791ae16ba0fa5e2d061ee5aa6795f39b4b2224643b564fcb5f2368a42e349a8d1fa57413a475d48f7038371af321d4758be99658842246403212a22321f3 SHA512 b2d8068c46c3478e2d2251d74f81657c7fcbc320b8d35a56f36e609a118f6858eb62c7905da35ba39c0ae2c98a6bcd0c13418bb9f14176c0d887b5df505a4374
diff --git a/dev-libs/libgpiod/libgpiod-1.6.3-r1.ebuild b/dev-libs/libgpiod/libgpiod-1.6.3-r1.ebuild
index 8830c7759db5..2cb895596af0 100644
--- a/dev-libs/libgpiod/libgpiod-1.6.3-r1.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.6.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 # Reflects the ABI of libgpiod.so
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="static-libs +tools cxx python test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild b/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
index 98464819a577..cf58ecdba373 100644
--- a/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.6.3-r4.ebuild
@@ -19,6 +19,14 @@ RESTRICT="!test? ( test )"
 #  --enable-tests          enable libgpiod tests [default=no]
 #  --enable-bindings-cxx   enable C++ bindings [default=no]
 #  --enable-bindings-python
+DEPEND="
+	test? (
+		>=dev-libs/glib-2.50
+		>=sys-apps/kmod-18
+		>=sys-apps/util-linux-2.33.1
+		>=virtual/libudev-215
+	)
+"
 
 pkg_setup() {
 	CONFIG_CHECK="~GPIO_CDEV_V1"
diff --git a/dev-libs/tree-sitter-c/Manifest b/dev-libs/tree-sitter-c/Manifest
index 57b9210acd20..bf6dd1563516 100644
--- a/dev-libs/tree-sitter-c/Manifest
+++ b/dev-libs/tree-sitter-c/Manifest
@@ -1,5 +1,3 @@
-DIST tree-sitter-c-0.20.1.tar.gz 244061 BLAKE2B 94cb11c80fd54a89b3c6c3ebc7937fdaa077a11c5128866e0e43c970bacc3b7f14743b3f19ceca515ef70d4499d2d3893fce6d948ce9a42bf2f499c58844a8da SHA512 b2f5b6d54fe05e7706708b50a5dd821a5669a121c916da4de3f80b6c57ebdd99f12f37c80051a8719f9737d4b0c00542aee62b45823dbb878acd4e02974f7a67
 DIST tree-sitter-c-0.20.2.tar.gz 249711 BLAKE2B f5f0ef1b15ba0fc216c082c973d6a52e79affb6075bc7fcf04e7ff93209b4624f4e9b414440fe6d20c0ea0bed5f3d96f538237c2fa365b919d6c280f98cc54b4 SHA512 ac559ee1d29bb77ce3cade02cfa4ed95c24cea7b84844df6521ebbf6213894c6f91499eb782e04e5e778091300f0043d59b9324a78d72d9bea4f40cc67d56cc1
-EBUILD tree-sitter-c-0.20.1.ebuild 280 BLAKE2B 2ffa82c71779586e1d17db3d0e8b075ad53d49927aab613a936653b1c70e3227d60481e1a78fcfca200718a1f526fa1704362907097a146e79abf68b3304edab SHA512 c0791c8673d269daed621431aa4ba38a9f28ad13a012cdd3a9d41df0d0b1556fec4ddfca48067eea94b13b159256d9c0eb8f99f7bc8dfbcf5338544f38efe8a3
 EBUILD tree-sitter-c-0.20.2.ebuild 280 BLAKE2B bab7c214cf78d4b44ad03665139162c6a1fea8e3e33f8b68bb07b2ab02163d61966bc964ff19feabdef3e65d850b69d46aef5a2b08889d3888399abfd8470544 SHA512 20a5b181c585ff85f7ade897da0eefe56f612424f94f693c4474cc9b3297f6233d5daf05df375b4a2a076aac61af232b15eb63167be5d141d96bee764aecafec
 MISC metadata.xml 443 BLAKE2B c991c80494cc1964b793eb2ff67aaf92cd85c5d18c1a223bd61b09e9714a314c3594af86cfcaf55e11d5788e80f68578e8b7ffadfe63c0ab0adb2d250b05bb16 SHA512 e62b93fb4eb9f7a0bf2cdc2f8a25fc099f55289c040eec3d4f51a26e2497d6c6695e110e9019d435227856ef33da97677845e6a6b21fa0cb964acb309202c166
diff --git a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.1.ebuild b/dev-libs/tree-sitter-c/tree-sitter-c-0.20.1.ebuild
deleted file mode 100644
index 5ef6110324c0..000000000000
--- a/dev-libs/tree-sitter-c/tree-sitter-c-0.20.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="C grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-c"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-python/Manifest b/dev-libs/tree-sitter-python/Manifest
index 3e07e2ce0412..329f4bffbc8d 100644
--- a/dev-libs/tree-sitter-python/Manifest
+++ b/dev-libs/tree-sitter-python/Manifest
@@ -1,5 +1,3 @@
-DIST tree-sitter-python-0.19.1_p20211112.tar.gz 141155 BLAKE2B ee524faca6bebf6c7f27d34ba418c4494877d6cf33a17b4ac0e5c148db58a8e17b2ec8ba992139b72e1fc88c9c93bcdb6a8cbd4a47b9cc65ad3097e08b4ee339 SHA512 25d5b3f8bac1daf8c9971278b8c209f2d953310cd31afd2e375d48354845930e553d0067dd9c0e93565d1996a803d0b5445f48720b0bc7f3d38e73f40cdbbc90
 DIST tree-sitter-python-0.20.0.tar.gz 155192 BLAKE2B 1b81eb80dc5a69124ba8579f905b83290b233b7aa7f41b13ead293ade576b4c2f4cb4ca52d34f1bd59131e6b0ff2a3058d8119bedc235fe6a8afd49b0856580e SHA512 6eff62f40a0cf95c9acb8bd571ed5d74ab9db7d15104a039273861c28f932c79d5e4d32e3017ed38fe35a8e92660f46bcdab8091a2dd2cc0d9699598a6d46606
-EBUILD tree-sitter-python-0.19.1_p20211112.ebuild 340 BLAKE2B 8c8f3adf3cde7fecc1228886b2e9bde51e36a16b0bbcf5027c8763666d6ae1748c7f3345ff5ad3308fe7f293a9a964fb00b7f5d6771c2aa01be798ddaf6ab8a8 SHA512 7ef197eeb4080aa48f9576e182381fce2b728a696fc3cb3c1473d0277fb7436e90628b128678d4071586a3a5d299abe81d2c05e24e1c06e0dc8d7f4a072d2ecc
 EBUILD tree-sitter-python-0.20.0.ebuild 290 BLAKE2B 684139dc89752f3e9610de4b72ed0c5e327ec1cec4fe9f6ecc22bafc1e9853f508dfd415f7cb868d91519c5c1605dba9d4aea9fa12dc41539dd055695b292058 SHA512 fa9ed2ea177cc82b4fc4f0102cf9950cf57d8c2515a218494fdc5ed77329aa4a63fded54fa47bfffd93d1cca4423bfcdec030cd2ba5f946ff5b16697eab7e0ac
 MISC metadata.xml 561 BLAKE2B 940672a7aee286697c4ce7511e489d0eb01be80fe5814bfc46d8dffa16c628618691a9d613782c88066b54ee961e050b200763af88539918a2c953a501ddc99c SHA512 c3e7a47cd19750d2d2d8d1cbf800fc92ce9166bd2babf0704743a41c2415eb7d9023ae0f1fe8c9e555e785d75794b821f63b09c75ef9b9c0e982434d6dbe1c1b
diff --git a/dev-libs/tree-sitter-python/tree-sitter-python-0.19.1_p20211112.ebuild b/dev-libs/tree-sitter-python/tree-sitter-python-0.19.1_p20211112.ebuild
deleted file mode 100644
index e24b3667a61c..000000000000
--- a/dev-libs/tree-sitter-python/tree-sitter-python-0.19.1_p20211112.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TS_PV="24b530ca158d2782ea9046e756057a412e16b52f"
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Python grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-python"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-rust/Manifest b/dev-libs/tree-sitter-rust/Manifest
index f58ff6efb92a..79d3d24a97a4 100644
--- a/dev-libs/tree-sitter-rust/Manifest
+++ b/dev-libs/tree-sitter-rust/Manifest
@@ -1,5 +1,3 @@
-DIST tree-sitter-rust-0.20.0.tar.gz 308481 BLAKE2B cb5e8b210ab58ae0a771deb82f1963a8001310673b44203df20425df443f179289bff29dbab9f58e5450f0d1a2ec377ba7601204ffeac7c461c03be90789fc5e SHA512 1c7283e973f50989980a5a05217d664e87665c5ea2338978deaf0cf88f624c45fde8162848c68bb3b8836d32cbf9be80b1da6fa7aa03fa3cab8d8efb49e3694c
 DIST tree-sitter-rust-0.20.1.tar.gz 308918 BLAKE2B b226bf6eb2c282f62d3eef0598db38dc54d03ed2ea07313fffbb6c9d955cccc71bef5513b8b2c56460989789e9f4293fb27a2db152b5afa56085348427fe9ad5 SHA512 de799d76dbcbc7f68ab8560f747c3df3950dd3e640ac60cd44d65a60b23e118e271370e2b1b84d2d830c2d70341b5714f5f52592709ba15f6b164c05f3798f07
-EBUILD tree-sitter-rust-0.20.0.ebuild 286 BLAKE2B cb0ea2b972649a98f1ba9ea4865090950bef36c95971b0694fcb6f6bb85102c54c116b5d4f30633439352137b55ba8c0971ac34d57e68146eb1c78393d54686b SHA512 0d683371ab4a696625e4583e6f7c4f02c8067d80085f074f678ef82d8c16c3ea4b79fcab47b02c9e240f0764ef6c1e7304e145ab34d1b8f4f0c31692271fda2c
 EBUILD tree-sitter-rust-0.20.1.ebuild 286 BLAKE2B f5d762c771e3fe9e2be49e58a45d3d1f418e2575cbbe8508c33669c23e2ada5dcb13dfffa08aa192eddddbabee6594a3ac4c76214532f77c5d882cf7954213f9 SHA512 afad591ff15e02c1a2bc5ab5c24638ce3a0161b78a66bcf1fcf24267ee53cc5a4211647cee8cb59df3df7dd6fbef2892acac94989fdee7ae46505370aaf6f4e9
 MISC metadata.xml 559 BLAKE2B d585950ceaa197145c3a2df759e97a8a50114c0caf0b7492e3e16f26251751f694000acaf6231ae826cfa57e99153eb27f09773d2805af40df4dbd3825dbe46c SHA512 97b7d3b6bcc3da3c7fc6d4111e2a1e02fd84ec778a18a22570ae303052d01b4beebba83eb6df0174bd6fc29b8101d88ee20a5f78b855ce713311d87e1c0be312
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.0.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.0.ebuild
deleted file mode 100644
index b23c7b8febda..000000000000
--- a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit tree-sitter-grammar
-
-DESCRIPTION="Rust grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-typescript/Manifest b/dev-libs/tree-sitter-typescript/Manifest
index 8d3f8758344b..59fed9c17a9e 100644
--- a/dev-libs/tree-sitter-typescript/Manifest
+++ b/dev-libs/tree-sitter-typescript/Manifest
@@ -1,5 +1,3 @@
-DIST tree-sitter-typescript-0.20.0.tar.gz 769336 BLAKE2B 12f5ac1f29963eda7a34d08832ca263cf91fd6a8335c998d9d1795851bd30d4a43ade36d004ffcb287c73b63e691582a79d640e24050df4f778fa308f5b0665e SHA512 99cbcabf58717eb17346b2139320f0d13846f1f335a81ed01fee6e748cd0d867218a9cc8d216162c3b9b9da86487024bedbced67e91adadab207633c25dc7e1a
 DIST tree-sitter-typescript-0.20.1.tar.gz 767713 BLAKE2B 25921ef20ec82bacf9858fd2bdca5d79f19ee132a48ad523ce4ea9d5141c2d314ec76d81a7d1751a6fab3651c3b3a2e0e2a469fc5168a5961310ee412e22ad4f SHA512 4d57308e84964bbf136868285141c4cd28ae0bbddef7973849679f8b8b85f00cd1bb5a4db7fd7b5cbd6a090b56193c8120bfd134358d33597a60a9145c694de0
-EBUILD tree-sitter-typescript-0.20.0.ebuild 361 BLAKE2B ef413e5a555ca0965e07abac101f18b6b8505bb8a85562187f395c97879ba24cb3e59e33e549b7df9a5861b93238fd80ee41c4a26b43488ac0b5ba5ccbba2c26 SHA512 a79de0d2ec96f2f4ebf3ccd503178e72a90125f45285dcdfe2bb733619d64c10245c773bd1bd6bed1a91cc0252cac1eea68477d656135d3bd3eb6a676b2eeeeb
 EBUILD tree-sitter-typescript-0.20.1.ebuild 340 BLAKE2B 23e05366c098a727c7e8f9551de9bc766959cad872a35b2bebeeb0ed6f140b571a1962775fa9350f925d29c1bc105a9ea1382c3d70e46520b234c566e7cef008 SHA512 7511b7e7dc9190b7143790ce9a134d9b44eb69729e5d5ce39a782305981f7cd0fd65bad58daa476e4c9fc5809064f1341d880373b7b8d369fd3ede70325175d3
 MISC metadata.xml 452 BLAKE2B 398c3e5901b36a7b49377e93dabce04d29f095eb6d0c5ddd5ebc29ad892121d2a4fce20bd4587737c7bc4f039aba0add3d01545993e0ae539ad9540d2832fbd9 SHA512 a9e3bee239e3abd86cd1bb00d318ef5e6529230b49ce0767e4b417e6abae0ee43637dbbacc27bce5e4f8f79d996aceea1ba0ed9afa1d3cc072f9bd502fcc0432
diff --git a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.0.ebuild b/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.0.ebuild
deleted file mode 100644
index a504afd74bf7..000000000000
--- a/dev-libs/tree-sitter-typescript/tree-sitter-typescript-0.20.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TS_PV=rust-0.20.0
-inherit tree-sitter-grammar
-
-DESCRIPTION="TypeScript grammar for Tree-sitter"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter-typescript"
-S="${WORKDIR}"/${PN}-${TS_PV}/typescript/src
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index d0f522667ab8..0f6ba5b5e38d 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,5 +1,7 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
 DIST tree-sitter-0.20.6.tar.gz 2924556 BLAKE2B 17348717441497ea7fc91419a0e8796d077b9acda2b584e9c3e1ac4a7a3f1fa3f84d5b749f21144d0593aaa7bf2e7ff9665539e91c6e81cda4359850e0fcdb14 SHA512 f0fb1e0073867c2a6e69b230e07e5eec32a2b30d3c711ec188526e287d6a1ef06de266d476482f900ec7c9ff6c11909899fd35a802e96f0befc6e99815502377
+DIST tree-sitter-0.20.7.tar.gz 2928761 BLAKE2B 280083381ce4f5949ab1ca1412026cac79bcf28b488147150d934b70cdc7804466c8032d50254f1ff4457b55a33fe0dceef66fd053cd32bbf844dc8280e896ab SHA512 dd306f7304cb5f87c05eab3bf5c9c4c13bfed7766a164eafe3159adbc6cca4e66fbdb6880f48dfc668408fbefc14b0147aa2231db085a72f526ac51b681b7c26
 EBUILD tree-sitter-0.20.6.ebuild 1021 BLAKE2B b36aa0a4a1563751dd8315f27f01203693f543f22513d21e269087050898d5a9cfc67c856147ef407718257634214678e12e820af645217a52deb26229a4ce3c SHA512 c229498f68a38d73b7ed14c3d0ecb8261c789651b858a6c73a70056a6b12b36d1dac69f1af82258052dd309543aa0da2dcff6329b08715bb3c7127732a316f97
+EBUILD tree-sitter-0.20.7.ebuild 1076 BLAKE2B 25214314f76ee0a4a72ed0ad997467ce5b98c409738fda4eb4ded2b715cbb03cf653a58e98dd18405193817d82890ea666c81b7e82a117582832709f4b87e125 SHA512 5e3cd25beefffc779bea70a7442e90cb4679e3582a6453188c9268c5bac680e505b821785c5ed295181046a87eb241ba96e8eaaf1768c5bcac71b227eba7d315
 EBUILD tree-sitter-9999.ebuild 1029 BLAKE2B c335042cf6c9155c2fad5c9c3eb9b508956b077cb22ee9e20f2f612a4afb2e0ec3797b149bb2b085c70e9d9110b6cdcb818aa4b66afff9d8fe54b40a5921699a SHA512 3284675110336a56485f5b4577e5461cbcf2e400deb4a4de5b107b248d8271f5e382dd247d1679c0be70e0ffb5f8820592e54c83f37807ae301b21f63d17b3de
 MISC metadata.xml 927 BLAKE2B 1b94b1e0f323461151d82920b4185cdee4aff41ff751f170d893b80f62423545adfd5efd8cc920c933f599089fbd72423ffdb4e43dc51f975bbc4eebe601abd1 SHA512 88e936a507fbd1154c1c167f6fc343ded2e3e6d2c073d2efce9a2e1c98ac1877e5c1197a903a597b403b444189cf2e4b519c4cf144a8eb1ad050c0a8b07ae101
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.7.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.7.ebuild
new file mode 100644
index 000000000000..c768f2c14017
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" )
+
+# see Makefile:1
+QA_PKGCONFIG_VERSION="0.6.3"
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		  PREFIX="${EPREFIX}/usr" \
+		  LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		  install
+}
+
+pkg_postinst() {
+	optfeature "building and testing grammars" dev-util/tree-sitter-cli
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 506b131a47ef..2d5148db210b 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/lambda-term/Manifest b/dev-ml/lambda-term/Manifest
index 39b5827f8c30..c693978ccd68 100644
--- a/dev-ml/lambda-term/Manifest
+++ b/dev-ml/lambda-term/Manifest
@@ -1,3 +1,3 @@
 DIST lambda-term-3.1.0.tar.gz 144714 BLAKE2B a84af472834f33ce0a88b0e21f13db66e5b28576a959c0c2e173da045d4c408c183c9eb9664678de7574b840bd129284e406af3d7392ceb0b8be3e53973214bd SHA512 b1601749214747504a248392ec81ce20f4cd44bddbf14424e40725e6d506d925320fc7ef7f4ce58e876769d858c5e3882664e27ca33a9dc74d29a4a22ed0d705
-EBUILD lambda-term-3.1.0.ebuild 527 BLAKE2B 3aadced723cdbcd444ccc779680cd897df77663981fd3b4f3421ed779d8c6fe86ba7e7d5feba5ef935b8e5d6c75504463012c48437d0a43d43e22dc4a345b8b4 SHA512 2a7946f7b32c4f6732d33cd9df1e3cd3c1dc87646a1321046d6503f229a3d4cc14850899c7383442be0268ee0b2887e67686b3d2c04a001ffad4dbd22e603b51
+EBUILD lambda-term-3.1.0.ebuild 533 BLAKE2B 2eff8937debc2ed3fcdfca40483fee94e2d8443a5fbbb3f52f7278c9a5f88e011d555e9fafeec4d39c85c96568b752e9a35f5134af9f0252eee5f2893df04e43 SHA512 e53683b52d81612f3698b4bfdae3e0f4bc55f652ef17c842583e732c020ef17ec30df48ab86d5c2b08bfca7c63a76b4633cf58a337c87f913928e96cc2711016
 MISC metadata.xml 979 BLAKE2B b9b1298397f0b376d54f7d5920d47a58e11f1345d04a376273c9ba21fe7c80c3a3058ba4e73502092a0a63d8dd9e493002c76bf031ecba23112adc04e8c49b62 SHA512 7160fadbd00ba69a20e10a16ab30a53f2e348c866bc45466dd064d05c99e4b0abc3f19831b86f0711e791c9cafc6a9c25fc2f0956a3fabd98509189d1e926688
diff --git a/dev-ml/lambda-term/lambda-term-3.1.0.ebuild b/dev-ml/lambda-term/lambda-term-3.1.0.ebuild
index 82fa0daf8691..899ce30cf1b4 100644
--- a/dev-ml/lambda-term/lambda-term-3.1.0.ebuild
+++ b/dev-ml/lambda-term/lambda-term-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE="+ocamlopt"
 
 RDEPEND="
 	dev-ml/camomile:=
-	dev-ml/lwt:=
+	>=dev-ml/lwt-5.4:=
 	dev-ml/lwt_log:=
 	dev-ml/mew_vi:=
 	dev-ml/react:=
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 639d3a851104..1651c632c8bc 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/b2/Manifest b/dev-util/b2/Manifest
index 0ee09a27b500..1028aefbcca7 100644
--- a/dev-util/b2/Manifest
+++ b/dev-util/b2/Manifest
@@ -6,5 +6,5 @@ AUX b2-4.9.2-odr.patch 1109 BLAKE2B 0bf70f2b2237369acd5089d1d1c6e1362f1d3528b036
 AUX b2-4.9.2-respect-user-flags.patch 461 BLAKE2B e5a9e0293afb7bde189c03677189ef11e0c1c07b8e02d598dc7e4d02f9fe1bf7079e94adb4150cd551ce0bf39b8c5710cb2f6b4bc685588900c4644127836fb2 SHA512 54af91eecd42cc8e5a079e29f1f3d9a8ebc8a6587254038167f531ddb217108d49161689bd45e1ed7e92eb7cfed53addeee2971e16e41d02fe3904b071bd96b9
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST b2-4.9.2.tar.gz 975882 BLAKE2B 83c2ef85c9f1ae20922541ca8c344316f1660ee069426e3a9907c0a19e1c94db470c67d0c29a1f31788eddb86ab414ab06b9713f8ea53d974d1d8f0ca29f4aa5 SHA512 eab180770608b863dcf6a5fbc626e1733cf4353cf62f4189bd28258a03591fdb7853f5dddb4d3dad60f1bb06db5415025b792a30c2c65f7b1278f61e33f903e3
-EBUILD b2-4.9.2.ebuild 1854 BLAKE2B e17af45defc21419b4248ff77103d9da3eedf3b0245066c8594a5c03c9108b1172124928078ed8f6af636f7691eedd280cf2de1e9cc30eb8568ea5f2839ea36e SHA512 bab0c0fad7228f65110f1a98bcd90779c047bcd7d9e81730e3763ed92facff62c44dd561df2fb8a6bd31059fbc6c6db4166dd3ecce3a937efe60c12cd7d84abf
+EBUILD b2-4.9.2.ebuild 1853 BLAKE2B 04efa1b777c6726d00f91c41f33f4186c02d91052c7bb696c2c27985a6da37fd3aec28fe2f760f6404fe0d244bee4938df961d6e8d835f544a3e4b9d5498da70 SHA512 b0e2605e25e769b84c402fcc2bc816e40cd21e470330ca84558f808c66b7a3df429df994a64b76a9406b6408b193c08e50aaf6711007dbd033c0600bcc2bb8af
 MISC metadata.xml 320 BLAKE2B e32bcf6d7bfe5e8a0f36d34022d49ef8baf1d4c0324fa7e7b25e1fa41ac81c21e010a8e49d456b7ce6027c51af57b6b07f3bdc8b7e05daa18b288c63a58a171e SHA512 767da992cd650d91b393848e73d6f0626febcb02eba350a16d390e8416a2832c49b1ca2608be98a9f4abd9ae2078a7f1a543a387be139e5533f90d82171796bf
diff --git a/dev-util/b2/b2-4.9.2.ebuild b/dev-util/b2/b2-4.9.2.ebuild
index 4ba3473c4327..d099df235ed1 100644
--- a/dev-util/b2/b2-4.9.2.ebuild
+++ b/dev-util/b2/b2-4.9.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index fe2650f605aa..90a4fb72e686 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,7 +1,6 @@
 AUX rebar-3.18.0-bootstrap-vendored.patch 1292 BLAKE2B e91914c48e355e675be853282e5d9daf588dbf2c3ee57b71489d34336933a56b9638e5672d70f0d8649b2e55d90658b718e6a917bad74e6e6f0596819fc06e14 SHA512 487bc63e3951e06ffc4b55bed770f6ef82cd8465cacad21ef26c0642547e0663dc879d9b9f8021abf4242bfbf537a24d1e83f97def84511dbd50c88d0cb37480
 AUX rebar-erlang23.diff 602 BLAKE2B 761b7e35408487698b27b0169989937305e9c7db14b49f5cbd411f4cfe19525a82e50d3c105f38d1fedc75f4c51d264fbf4a4a496b9bbce826b994241073fea3 SHA512 5f57f199dcd5544dec48119feeb288c2d6f5f0a45307b09489a37702609f6e79db08982764bd07f898c7858d45d8c154e314fab131b70996c95a1473561ba8c4
 DIST bbmustache-1.12.2.tar 17920 BLAKE2B a91df2d85533de4ad2df661b19e5dea67e84b73fd0192ecac43b8c9163beeb4444872af605ad298b104725687f2a5a2107b0d142a4654213f7b817903c06aca2 SHA512 aecba4e354bdd5e09756cf9cd8c1e55af832f0e121c4c8000b71bc9a46485a4cdd86d13aae4f1838588be228745003a324956fdd440fb4c48b987cc58a9e238c
-DIST certifi-2.8.0.tar 153088 BLAKE2B 1718b805a2c340586c908059bd1e38cc5175f534136efcf6022ba970cd6f00100ef209953aa2718f2b25e76b895ddcf57c71690660f85ea519eb353d24ec612d SHA512 1c484afdf7664eb92df90251bb451208c08e76179e5654a2b069388a72889aac75e941ef626eaeec7fe0a74fdbacf359aeab5330eebd43e333ad513998e46e76
 DIST certifi-2.9.0.tar 156160 BLAKE2B b2599590e18da52685fd953b62f54ec1db7fac749d202bd4ec865a5477348bbcb93712af89b9206723da7bd33339461205a43b4cd30f486074b617ddd92ab8cb SHA512 d8c2f62b3b5a626735bbdaf3fb553bafe2cd1c736a378240633f0970c35079ce610ad3458d3e43c79f244c670b5e197554ddf8a71944bdc0975213db693a5583
 DIST cf-0.3.1.tar 10240 BLAKE2B 0a13aca11772ea8b7a9ed6a5908a013b82248a64ca633c616ed75b3ccc0e7d52199480e53519f96c1767ceef9c863da16840ad90d1d7c6235cb6ea3291d35b8d SHA512 232fa9cd175e54599c035b087a6d44c9afb4135a5509b7498ebce8becec333cd670d0e06a3bf9e30d54c7c609ad2aecd42fc40e667cf95e68b7dc228e1fd85d8
 DIST cth_readable-1.5.1.tar 19968 BLAKE2B ecaab32aec9e327a2e39ab7312bbaf07c5ab4a88916ed6d84e064897d49f148486b9d95a761d9243cbb8b3cc0a779c9075f1eba179db0ec5e22502176e8c10e5 SHA512 8abd3f7255634e29584559e0d4b811e2af3ed047a10f32a7e2b899abd02f0ab3cef117d3ef6c9db38d34fed6285a1f47356b647350c9b636f011445d3914da7f
@@ -11,12 +10,9 @@ DIST getopt-1.0.1.tar 19456 BLAKE2B 9b9deb22ddb10170603d4743190f80f7152b70b1eafc
 DIST meck-0.8.13.tar 34304 BLAKE2B f2bb100bdea75079351610edd572ea7ced1503c02f86ed3378ec00e023ee63b729e859dfb3aefd521eb50541d4fc3ce70f1425beae8dd32d2dd2adb68618cc57 SHA512 adcfd3fdf69d4926dc1d9c2f0b477c8977bddba8b8ffdbfedcf1b5dc3c1af47b39b1c6263c922a43efede90f145f009d71b27178597320522960c5ebbd84a15a
 DIST providers-1.9.0.tar 14848 BLAKE2B a50e97faee63bb62335005e61e63de0a1b9ebf467f61e316fd0002485fbc6a102689bd0881878db95972a367ac2ee56c603bfcdd0b8e5efc6dfeee7e177fea8d SHA512 7227855164124425b89996b0295a786e36bbc2fadee9949d0b3d9ad518b3be9204650e5fa9e027e72cc4c2d2e8b968bddfc2015ceaf4cc00d865a35132defe76
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
-DIST rebar-3.18.0.tar.gz 436403 BLAKE2B 827fcb8a3fb9f3b93a19260696546697f766ea83a498cf79943568dd811c2afcd05a1c666b6813116428d0c1e6f522617244b69fe19cebda2701efdc3ec68763 SHA512 4fcaa1867fba7462df0b9a64fa442f4a887e83530635fdcd19f4b5dcee14ace3e7403c27f35e5e6055fb6bf89c98a91a3ff1e2036ab6e67e3de028f91233e4ed
 DIST rebar-3.19.0.tar.gz 442286 BLAKE2B 834bd25fb301a3362ba281638ae5680c1d7315971e85ba1b90cd3f0452ad1d1f6064c0d197d960c1a88af539ddda955bbef6747d71c1c69103af2938a9b28a04 SHA512 43928e2b96ca9361af2ec0b6ceb82f4429e29990054e1cbe2f1d4e293748243d16a8d2b809200ce443408a82fd3227b2cfe02efc14941d1cdd3d3c9a689fa0ea
-DIST relx-4.6.0.tar 75776 BLAKE2B 1e9b6043781ee2835f2cd7ff37755456de63e34702fa1e2d8c5326bc58f953700f1a5acf4b1bf073b4d30ff2587d4fdc505a0c1dc0848675ed98a10b9277df1a SHA512 a0ae0447815e78b7f296b721be1430897305bb21b8b183191ed1bb0cc33ee1060f5b1ee2452d86ff7a782f29450896e8b01e90f00847c7e4bad62f3c5a786678
 DIST relx-4.7.0.tar 76288 BLAKE2B 99af942824344a617dc19b771d5db697fd8d8a19776a670da96c62852df75c9d68236bffee05ce84390f63cef34ee305fffc864bb2a5a4c2acfd02cef2122c27 SHA512 cd7bc3535d012f8e2bf98cf9a68c03425903c137557c18599a27d80722471353623e616787fed791760c0ec6ec51379e060a57777521be33ef84b37b3693f9c3
 DIST ssl_verify_fun-1.1.6.tar 14848 BLAKE2B 31f8a92881803b1b93e2f65cf070449cd53af21b50f6aae7a9d036e28c17b2c093b2cb6238279191663ba011aab7fd604af8366ed8ae91b7b1d7c333f9de9ea8 SHA512 65980368629357ec16b37fd8ea1d42f7dbd7fa86318b329bec756e868b70eb4c93cf1bfe3dd34e1b6c011086ba32e11981d61e18fdad78564b77664e4d155a47
 EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed87416b7e42a48e83acd5f07956ce14e8fed23f782bbba6437139da730c2cdabe7d0c523a447966b43c6e2dabf8033 SHA512 95cd7d605d4a3fe6940be8fe90d42db7b413bd0b1983a4ed44cd511308244e64e88d49a70306c9262556a1717402c41e42849c7420f1e958dfc300ce631eb382
-EBUILD rebar-3.18.0-r1.ebuild 2462 BLAKE2B 9bdf8762c0a0dedf4ebb5626b5403dbcb847b97cfaa18474fa91d815a816b7c9f926a7e3fd78be27c8fd03f81efaa131e391366405ce053171bebc6c8bdcdd8e SHA512 a005414b5f1fb40fd17a5fa4e0233d50e20d7750cc5eb95831af2090a136fa2f09a1d841690787814636ada855b760cb3303fc0c547ce7af7ee8bbd2b334287c
 EBUILD rebar-3.19.0.ebuild 2462 BLAKE2B 52b97493bde303b742e274dd294bde9df57a89b4bd4bce81034599e2297a73198373e9588da48fe54dc58e57b3100025a75fb78117c91fa76190a3b8795f8ffe SHA512 93c6921f3d94ebcf7d37f9e4f0d68717cb4e7e7924fac52297f95162940ba4ca8e2160b42cf37139721ad9c51ce63ab9cde1b71ba29491db2c1b409cc5e69c79
 MISC metadata.xml 361 BLAKE2B d58dbad87667d782d0b5d81f0d9166b4e93dc0dea86b7b665acd6463c945949425746085f1a36cc952ad0ca3bcd7acb949a855c2aa57eae8a18bfd16120da1ae SHA512 aa1aae5e0688d6e921d4018714a37f079a333282baff352d7faeef3b1810471be421c99a705b1b97de0cb5c846efb69b3ec4f018033cb56efc307164fb8871c3
diff --git a/dev-util/rebar/rebar-3.18.0-r1.ebuild b/dev-util/rebar/rebar-3.18.0-r1.ebuild
deleted file mode 100644
index 06e277d964b5..000000000000
--- a/dev-util/rebar/rebar-3.18.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN}3
-
-inherit bash-completion-r1
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://www.rebar3.org https://github.com/erlang/rebar3"
-SRC_URI="
-	https://github.com/erlang/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	https://repo.hex.pm/tarballs/bbmustache-1.12.2.tar
-	https://repo.hex.pm/tarballs/certifi-2.8.0.tar
-	https://repo.hex.pm/tarballs/cf-0.3.1.tar
-	https://repo.hex.pm/tarballs/cth_readable-1.5.1.tar
-	https://repo.hex.pm/tarballs/erlware_commons-1.5.0.tar
-	https://repo.hex.pm/tarballs/eunit_formatters-0.5.0.tar
-	https://repo.hex.pm/tarballs/getopt-1.0.1.tar
-	https://repo.hex.pm/tarballs/providers-1.9.0.tar
-	https://repo.hex.pm/tarballs/relx-4.6.0.tar
-	https://repo.hex.pm/tarballs/ssl_verify_fun-1.1.6.tar
-	test? ( https://repo.hex.pm/tarballs/meck-0.8.13.tar )
-"
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-LICENSE="Apache-2.0 MIT BSD"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/erlang[ssl]
-	!dev-util/rebar-bin
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# The build directory (where dependencies are usually stored) gets
-	# cleared before each build.  Make the fetch function first look in
-	# a _checkouts directory before going out over the net.
-	"${FILESDIR}"/${PN}-3.18.0-bootstrap-vendored.patch
-)
-
-src_unpack() {
-	# Unpack the rebar sources like normal, but extract the hex.pm
-	# dependencies separately.  The outer tarball contains another
-	# tarball named contents.tar.gz that actually contains the code.
-
-	local archive
-	for archive in ${A}; do
-		case "${archive}" in
-			# Assume that the .tar files are our hex.pm dependencies.
-			*.tar)
-				local dest="${S}"/_checkouts/"${archive%-*}"
-
-				mkdir -p "${dest}" || die
-
-				# Extract the inner tarball
-				tar -O -xf "${DISTDIR}"/"${archive}" contents.tar.gz |
-					tar -xzf - -C "${dest}"
-
-				assert
-				;;
-			*)
-				unpack "${archive}"
-				;;
-		esac
-	done
-}
-
-src_compile() {
-	./bootstrap || die
-}
-
-src_test() {
-	./rebar3 ct || die
-}
-
-src_install() {
-	dobashcomp priv/shell-completion/bash/${MY_PN}
-	dobin ${MY_PN}
-	dodoc rebar.config.sample
-	doman manpages/${MY_PN}.1
-
-	insinto /usr/share/fish/completion
-	newins priv/shell-completion/fish/${MY_PN}.fish ${MY_PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins priv/shell-completion/zsh/_${MY_PN}
-}
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index 4ce20735cf54..73a20c936105 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -83,6 +83,7 @@ DIST tinyvec-1.1.1.crate 39896 BLAKE2B 7655703bb7c3eda6a4bfb78c46cd10d5bd195ccc9
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST tree-sitter-0.20.6.tar.gz 2924556 BLAKE2B 17348717441497ea7fc91419a0e8796d077b9acda2b584e9c3e1ac4a7a3f1fa3f84d5b749f21144d0593aaa7bf2e7ff9665539e91c6e81cda4359850e0fcdb14 SHA512 f0fb1e0073867c2a6e69b230e07e5eec32a2b30d3c711ec188526e287d6a1ef06de266d476482f900ec7c9ff6c11909899fd35a802e96f0befc6e99815502377
+DIST tree-sitter-0.20.7.tar.gz 2928761 BLAKE2B 280083381ce4f5949ab1ca1412026cac79bcf28b488147150d934b70cdc7804466c8032d50254f1ff4457b55a33fe0dceef66fd053cd32bbf844dc8280e896ab SHA512 dd306f7304cb5f87c05eab3bf5c9c4c13bfed7766a164eafe3159adbc6cca4e66fbdb6880f48dfc668408fbefc14b0147aa2231db085a72f526ac51b681b7c26
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
@@ -107,4 +108,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD tree-sitter-cli-0.20.6.ebuild 2926 BLAKE2B f92a2937d094f4f357aedad06f6bd714f7c881b521a4e5c9b360dcc288844b11343b0d7bee922502e4d0fbd64df96ff74298289b333f2f63d483a8c98841edde SHA512 7472165b035d24e7108ed13e4cea1e75bd686d5ad32c9320ec45ae0c4c5ae047489861cf0607b6a1890fedf966625df83148fd692ed66b12ce658a29459bce2c
+EBUILD tree-sitter-cli-0.20.7.ebuild 2898 BLAKE2B 4ffc144fb80272cb2e461f19c0c01d060ca1925b41799402e61853280c3116c04f6c3231b117777e64ccf93df480a1a4914d8894e21533bf8b7264499c242429 SHA512 175579886d081b8862c09f46542750e689a59a87e5982249ce92b9ff43d5118e85e2057941fe7c15bf023bb8143cb9f05bcce5cedfd2850d7eea658e8e931b25
 MISC metadata.xml 678 BLAKE2B e000f4502ed07b8fffcbf05a9dcf0730407d70a00ddf289b8ffdd9e6d28df6481f7e6eec3416aa1278ad9602c098bde72bcaad4f7819c9554c39baf045555dc8 SHA512 37e64d773a4b01b34208b65be600e6f46c7633571d7ad39210b7957f41f31b296565304a4dc8a4ec0518489a89b1bf7a1b204111c4d428307b562e3f6d0575f8
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
new file mode 100644
index 000000000000..6ee876a33d2b
--- /dev/null
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=tree-sitter
+MY_P=tree-sitter-${PV}
+CRATES="
+	aho-corasick-0.7.15
+	ansi_term-0.11.0
+	ansi_term-0.12.1
+	anyhow-1.0.40
+	arrayref-0.3.6
+	arrayvec-0.5.2
+	ascii-1.0.0
+	atty-0.2.14
+	autocfg-1.0.1
+	base64-0.13.0
+	bitflags-1.2.1
+	blake2b_simd-0.5.11
+	bumpalo-3.6.1
+	cc-1.0.67
+	cfg-if-1.0.0
+	chrono-0.4.19
+	chunked_transfer-1.4.0
+	clap-2.33.3
+	constant_time_eq-0.1.5
+	crossbeam-utils-0.8.3
+	ctor-0.1.20
+	diff-0.1.12
+	difference-2.0.0
+	dirs-3.0.1
+	dirs-sys-0.3.5
+	either-1.6.1
+	form_urlencoded-1.0.1
+	getrandom-0.1.16
+	getrandom-0.2.2
+	glob-0.3.0
+	hashbrown-0.9.1
+	hermit-abi-0.1.18
+	html-escape-0.2.6
+	idna-0.2.2
+	indexmap-1.6.1
+	itoa-0.4.7
+	js-sys-0.3.48
+	lazy_static-1.4.0
+	libc-0.2.86
+	libloading-0.7.0
+	log-0.4.14
+	matches-0.1.8
+	memchr-2.3.4
+	num-integer-0.1.44
+	num-traits-0.2.14
+	once_cell-1.7.0
+	output_vt100-0.1.2
+	percent-encoding-2.1.0
+	ppv-lite86-0.2.10
+	pretty_assertions-0.7.2
+	proc-macro2-1.0.24
+	quote-1.0.9
+	rand-0.8.3
+	rand_chacha-0.3.0
+	rand_core-0.6.2
+	rand_hc-0.3.0
+	redox_syscall-0.1.57
+	redox_syscall-0.2.5
+	redox_users-0.3.5
+	regex-1.4.3
+	regex-syntax-0.6.22
+	remove_dir_all-0.5.3
+	rust-argon2-0.8.3
+	rustc-hash-1.1.0
+	ryu-1.0.5
+	same-file-1.0.6
+	semver-1.0.5
+	serde-1.0.130
+	serde_derive-1.0.130
+	serde_json-1.0.63
+	smallbitvec-2.5.1
+	strsim-0.8.0
+	syn-1.0.67
+	tempfile-3.2.0
+	textwrap-0.11.0
+	thiserror-1.0.25
+	thiserror-impl-1.0.25
+	thread_local-1.1.3
+	time-0.1.43
+	tiny_http-0.8.0
+	tinyvec-1.1.1
+	tinyvec_macros-0.1.0
+	toml-0.5.8
+	unicode-bidi-0.3.4
+	unicode-normalization-0.1.17
+	unicode-width-0.1.8
+	unicode-xid-0.2.1
+	url-2.2.1
+	utf8-width-0.1.4
+	vec_map-0.8.2
+	walkdir-2.3.1
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasm-bindgen-0.2.71
+	wasm-bindgen-backend-0.2.71
+	wasm-bindgen-macro-0.2.71
+	wasm-bindgen-macro-support-0.2.71
+	wasm-bindgen-shared-0.2.71
+	web-sys-0.3.48
+	webbrowser-0.5.5
+	which-4.1.0
+	widestring-0.4.3
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Command-line tool for creating and testing tree-sitter grammars"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz
+$(cargo_crate_uris)"
+S="${WORKDIR}"/${MY_P}/cli
+
+LICENSE="Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Test seems to require files (grammar definitions) that we don't have.
+RESTRICT="test"
+
+BDEPEND="~dev-libs/tree-sitter-${PV}"
+RDEPEND="${BDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${MY_PN}"
+
+src_prepare() {
+	default
+
+	# Existing build.rs file invokes cc to rebuild the tree-sitter library.
+	# Link with the system one instead.
+	cp "${FILESDIR}"/tree-sitter-cli-0.20.2-r1-build.rs \
+	   "${WORKDIR}"/${MY_P}/lib/binding_rust/build.rs || die
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index c86dfd6f9102..3c460b47d1a0 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/stagit/Manifest b/dev-vcs/stagit/Manifest
index 4abe009fba11..0b322ded50c6 100644
--- a/dev-vcs/stagit/Manifest
+++ b/dev-vcs/stagit/Manifest
@@ -1,6 +1,4 @@
 AUX stagit-1.1-pkg-config.patch 578 BLAKE2B b25ff1e3bbb4eed09aec97bef30f965a3cdf50ebd05ee42e65aaefc9b090f38debadcbe4e81dfac7af3b00765d8905bcecbf1477e1df9b5a607f69a2576cd74d SHA512 19d2336729eb34fc8ddb330a8655e9d1ba736d415c2735a21cc9ac6ba66cbf48e52fe8c72e67c9eb8e5b6a7427c51ed3a89b2ebef5f400788a1f60e7109edded
-DIST stagit-1.1.tar.gz 19648 BLAKE2B f77f7d79a475d5e7eda734fb0dc5f4006156df90c0019b0cc664efe8a5e0b988e2c9f0bf36efcbabbb06d7c59e6ad81434184c2c73bfef28849261251eb052b8 SHA512 e75d47b84d2783f7396a932b402a4dd36572027931559eae908861f9b8c658f43f5110bdfc81c5a0b65be3a0c53939ba9adabcc1e36fe88a6dab54b929526e0f
 DIST stagit-1.2.tar.gz 19818 BLAKE2B 610a1313f2b5e09c75bb43dfabda35164c43277b0b74e3b63c0f345b55035df8b4590494a4f36bc6e1ac8fe387942d2e12941cdd6116f82d3c929ebd5dd44fc7 SHA512 f9d9f157145b47a14b5ff098e3db261b4739145e5e7cf2a273e188fc8617681dc9b7b9737de2182334bb9a50bef061ebee452ccbc1e013e14f2ef8c4a4c32d0b
-EBUILD stagit-1.1.ebuild 631 BLAKE2B c7cd3ad40e86f7be2f65571c5d425e6c8a5454456878f5784abb8eb44f7a240bda5beb57631ecfda4287451370b1a290b5b9ac8e35ea9a95ff38c17e19ae05dd SHA512 758631e6fa7f44aae36c4a39b5f87b14e121bc718f9a0d0ca00bc2c4815474c90fcd11526511aa0933297630f40ba76155224e84b7017a5effec8b0fa6db749f
 EBUILD stagit-1.2.ebuild 630 BLAKE2B 8b9d335fa4574b3f4bfd174ede6d85480fd0e20ee456b29ed485b79fbecfd132e4b02d86582e188213a38d77169987932a903ef89dca8aca429bba09dddc5a03 SHA512 497b1b440ef65b0a220ee1c714c95082a43575458104605e7ec0d7a958f326a5ffc07ba328ae5789bd6e46d03b08b1af8867170aa6aca7436f19b9ffd3885fb3
 MISC metadata.xml 248 BLAKE2B 2a8d109f789d4f561986cfd5830c49c96b715e2fd50c0340e5c7ca385f72d09c0accf9102e1e1338e971400861d3baa95c083623231cbe96dc9e8163639dee25 SHA512 46a1388868fb5dcf5e3f85cbe8438d441c8a1ff291fcceb1cb4cf20a505e84e945c73967342eb7faadbaa51a7630977d9d447fe16505395fe7a05024e6242185
diff --git a/dev-vcs/stagit/stagit-1.1.ebuild b/dev-vcs/stagit/stagit-1.1.ebuild
deleted file mode 100644
index c820b61e2951..000000000000
--- a/dev-vcs/stagit/stagit-1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Generates static HTML pages for a Git repository"
-HOMEPAGE="https://codemadness.org/stagit.html"
-SRC_URI="https://codemadness.org/releases/stagit/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-libs/libgit2:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.1-pkg-config.patch )
-
-src_install() {
-	emake DESTDIR="${D}" \
-		  DOCPREFIX="${EPREFIX}"/usr/share/doc/${PF} \
-		  MANPREFIX="${EPREFIX}"/usr/share/man \
-		  PREFIX="${EPREFIX}"/usr \
-		  install
-}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index b64741ad2522..cc831aa57eb9 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest
index 6de1d57abf9c..12d8ba116a49 100644
--- a/games-emulation/mupen64plus-core/Manifest
+++ b/games-emulation/mupen64plus-core/Manifest
@@ -1,4 +1,5 @@
 AUX mupen64plus-core-2.5.9-fix-gcc10-fno-common.patch 520 BLAKE2B 1a72237a46105840d90e25a551e5ffab3f35f8df9f975da6f65c135847aac71fbf2e7fb9899c05720cb29b31ea85a15d86167c95993b93d763fea585ae0a4bff SHA512 95860397c764a6a21faaab45e13f68aa6b5da15ff1b96a430a263aaac918495b27a923c639166a9f124c0e3f3d2af6a3947aed34c3a590abc2e3033ef8460bd9
+AUX mupen64plus-core-2.5.9-pitch.patch 1257 BLAKE2B bc0852417539f391fa73aff7b63dfee7bfb8f99a7b7e06b90163f39093878f361701354ff5901e8366f8f99236d6a50dde2ddaaf9aec7e48cbc27dc414f8e0af SHA512 e84bce7d9b017eda8818444c99037f6c6ee069329d944658f6f500564e45bf080818f8dd05975f20a0ef835d7934c7ea8c92f4183668fba7120d0343f2cc5678
 DIST mupen64plus-core-src-2.5.9.tar.gz 1618486 BLAKE2B 6d43789873c6866dc7d268e4a2cc1febc4a8ce6615a51e4dabfc3d3715aaaa6bf8d7c157ddccd45ae3b57852388c591b86d1cf401c7d78962ec6780272ef912d SHA512 8087211eb3301e356e1529c1702c965aca5e9191a5a3efe604f2e2f7470da44c8c3be506ba1f0aa96b209baa8faf011ca153566540e96c278fe63a330b791f20
-EBUILD mupen64plus-core-2.5.9-r2.ebuild 2694 BLAKE2B 6b6b47227511577a7873b053b3d7854b0d1473b63ee78ba201d00a30b82107fe69dd1b05d354916531c5e248c804251a99a33c66cd16a34e516d3d6ab0c4b00c SHA512 1afc8b7f1a25e50a3ecf6f8ecd6e9dfe41d305bc44d51b347b0a330938313c6679c1f591aa544b5bde28eedf30eabe5ac3a0ddcfd9be48d78f1774cb45d56780
+EBUILD mupen64plus-core-2.5.9-r3.ebuild 2710 BLAKE2B 393e63b93c64abf01f4be1d399e6793a8d7b640e995c1a0f123e3415c57b51a5ea2f8caf8f3f7140ae20bbf153a2ce8fcde3558ea1d7a175b02d823c25b81a70 SHA512 1580e1f1cfaeb69504307785ee2e37bb7f770665a9dd78694c054a72569d5f89799b2578e494958624c3209e01e1f86311ce91596d1cccee2f39104cf7edbdd2
 MISC metadata.xml 987 BLAKE2B d2c505ca12b65934e5debaa4f52876cc4a3903cf3ce084dacaf9be307a41c3ab1f6a1fb165377fe37b31065e6a901fd8432f92814eba4c4bdd43ad30da3a7467 SHA512 e0aa4b6c8f2b60c7c8aac793995b17de3892df48e3b4a8bd3ff8a938fc64a3bc7e4dcd4a659dce94dba1debc2beb71971187fed03ff0c723c4ba7b0a57d34db4
diff --git a/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-pitch.patch b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-pitch.patch
new file mode 100644
index 000000000000..449e4252dae2
--- /dev/null
+++ b/games-emulation/mupen64plus-core/files/mupen64plus-core-2.5.9-pitch.patch
@@ -0,0 +1,29 @@
+From 8fac78d8cb54da960ca85a49547dcc4fb952457d Mon Sep 17 00:00:00 2001
+From: VarNepvius <14352929+VarNepvius@users.noreply.github.com>
+Date: Tue, 6 Sep 2022 20:31:03 +0200
+Subject: [PATCH] Fix wrong pitch argument in call to SDL_CreateRGBSurfaceFrom.
+
+---
+ src/api/vidext_sdl2_compat.h | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/api/vidext_sdl2_compat.h b/src/api/vidext_sdl2_compat.h
+index 06d778dd9..071a64402 100644
+--- a/src/api/vidext_sdl2_compat.h
++++ b/src/api/vidext_sdl2_compat.h
+@@ -474,8 +474,14 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
+         if (SDL_GL_MakeCurrent(SDL_VideoWindow, SDL_VideoContext) < 0) {
+             return NULL;
+         }
++
++        /* Pitch: size of of line in bytes */
++        /* Add 7 to bpp before division, to ensure correct rounding towards infinity
++         * in cases where bits per pixel do not cleanly divide by 8 (such as 15)
++         */
++        int pitch = (bpp + 7) / 8 * width;
+         SDL_VideoSurface =
+-            SDL_CreateRGBSurfaceFrom(NULL, width, height, bpp, 0, 0, 0, 0, 0);
++            SDL_CreateRGBSurfaceFrom(NULL, width, height, bpp, pitch, 0, 0, 0, 0);
+         if (!SDL_VideoSurface) {
+             return NULL;
+         }
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r3.ebuild
index 459fd3cd6239..38e80fb81924 100644
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r2.ebuild
+++ b/games-emulation/mupen64plus-core/mupen64plus-core-2.5.9-r3.ebuild
@@ -1,41 +1,50 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-MY_P=${PN}-src-${PV}
 inherit toolchain-funcs
 
+MY_P=${PN}-src-${PV}
 DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, core library"
 HOMEPAGE="https://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+SRC_URI="
+	https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0/2-sdl2"
 KEYWORDS="~amd64 ~x86"
 IUSE="debugger gles2-only lirc new-dynarec opencv +osd cpu_flags_x86_sse"
+REQUIRED_USE="gles2-only? ( !osd )"
 
-RDEPEND="media-libs/libpng:0=
-	media-libs/libsdl2:0=[joystick,opengl,video]
-	sys-libs/zlib:0=[minizip]
-	gles2-only? ( media-libs/libsdl2:0[gles2] )
-	lirc? ( app-misc/lirc:0 )
+DEPEND="
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick,opengl,video]
+	sys-libs/zlib[minizip]
+	gles2-only? ( media-libs/libsdl2[gles2] )
+	lirc? ( app-misc/lirc )
 	opencv? ( media-libs/opencv:= )
 	osd? (
 		media-fonts/dejavu
-		media-libs/freetype:2=
-		virtual/opengl:0=
-		virtual/glu:0=
-	)"
-DEPEND="${RDEPEND}"
+		media-libs/freetype:2
+		virtual/opengl
+		virtual/glu
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
 BDEPEND="
 	cpu_flags_x86_sse? ( dev-lang/nasm )
-	virtual/pkgconfig"
-
-REQUIRED_USE="gles2-only? ( !osd )"
-S=${WORKDIR}/${MY_P}
+	virtual/pkgconfig
+"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.5.9-fix-gcc10-fno-common.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-gcc10-fno-common.patch
+	"${FILESDIR}"/${P}-pitch.patch
+)
 
 src_prepare() {
 	default
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 476bac6362e9..7d9c00178e10 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 66761680d59b..752cd87c1291 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -6,71 +6,6 @@ AUX icon/thunderbird-r2.desktop 882 BLAKE2B eb9c2e381b67319d9cd53f26e9b406f55de8
 AUX thunderbird-r1.sh 2896 BLAKE2B 140047417b24e959fe6388c4913457f8e3e786158b7394abf7442b0d2e83de21238e58983845a23b855e1aab60c9289e1a12af430eac9a8b2d9929da97de2852 SHA512 f9b989152a8a3ac274033722c77ec19374085654ad6c85ea4db6f8af8f4b2066d6d9f82b610be2db341c8ac867547f54f806ca6571258ed98dd9e2527d21b357
 DIST firefox-102esr-patches-02j.tar.xz 19688 BLAKE2B f26b8dd2613712ab49db34247c432769386ac066238b86c0eea367cebbd167334f822866129d0874efc35da4da686e6185881649b0b3095dede28ec8c658a3b2 SHA512 456cd2b7d9f907080afb5225d353154117624fa938f24dcfae7ada03f5b39572e5d6d6e1a4bba7825465b48f6d38b04e5c0f69556c82d4ebbe1463e11dc809d7
 DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c
-DIST thunderbird-102.2.1-af.xpi 550105 BLAKE2B e9bc1b0daed89d6ba0c0098a07efa028a348a83cc770aecf90583600963a9131d4131fca95ec0b20bec3bc92b15eb4c1dcbbb3339b5c64dae86472b44f911b2e SHA512 3d01ed1ed68515d8c3e4dd74f98dfd624be3dc1c825bbdc21ba387f84741960d5cb35f3e26b05bf44c4682ab02f52570ae235bb4173f41832a1734a87abf8bf2
-DIST thunderbird-102.2.1-ar.xpi 653972 BLAKE2B 7778728e756c61af75a32f1737f39ef56c462045d83c4c5f90e312be429325bc0f0256514e7a55e8c3afbf1609716708952ed12fa7f1120de4d76b281721728e SHA512 3dcf18dd2c3233d0698f47211cb6ab02e86a4104cf7885e048dba9e18dd9353f95477d657def270c8b54eb1f9a47c550254c1011b8eb260add12a94bcf763ab2
-DIST thunderbird-102.2.1-ast.xpi 570833 BLAKE2B 811d65e39bf4739a8b69c33ec2010768264f8094ca20fcc31d4b96ba319eef8a41261dd164db79e5558dbd14d8aabea0b0f5e762db3256c828b79840cb3339f6 SHA512 a256e8a63e2551dabd278b7e1d863716efa35836031af0b8beec22e4e0c8cfdc9606ffc436617f4e7d2c252742937c6df5321b6482a44e40578e1bec27b48e28
-DIST thunderbird-102.2.1-be.xpi 685076 BLAKE2B d5b71f3e531d01c46b9c11f43ad6673b372be9de5c700fe9f4ed93b7509bd9bbed67eadd49b1d129506bff28d9477ab0e867589a9b16c7193e5e116492e99847 SHA512 93c0e3696630db05b4621be539c2ee58282e47e22341a6d61b24e3014db02f55b0c140b2d4d527ea4ce789bd18f2a2ac9db55ebd9013e47872effc56334202ac
-DIST thunderbird-102.2.1-bg.xpi 681980 BLAKE2B c41bafad4c0e0e56ae4c4929a3f949dfac870db0359b19371d43046d54cb0bc9b5601fe89f05567a145da225d249c0e50e1fd91d09113a69fd93d1a657206fa9 SHA512 ca75408cb7a6fc15f757868fe518a9aff50a4a2f015ccc743e4e335b048385164071600dfa4b6f171022dad2a3b7c3528e8a5764b1f3e2474fad3d4bf2c04f31
-DIST thunderbird-102.2.1-br.xpi 612641 BLAKE2B 5ad584a0244f6a5349e51dfd9b7b53148c8e7d58b61eaaa5e45f53ab00549cf3fc1c6c32f05efd999afa61b542ec575eed5c5b436b8595072b8013dad397dc78 SHA512 aaf8ee6514a8b5d05fc62d5d1237328802def64dbb338559b37eaa8dd7a312a7c130020a9b29008f2b06cfd0f08099895cccf28ef663b9a21b297dd93d585664
-DIST thunderbird-102.2.1-ca.xpi 635815 BLAKE2B 76556396519512017cb896b191895e001f3421bf4ed5c753014a8fd5ef22fce0575ca8e91c79d55d51b5bfbc594e05f77dbad2d545938bbcba3cfad86e92553d SHA512 5a70b04712260deb62e007532b93fe4c864fa582756e0c97be02cc708e4acf56953b29cf3002ebd07713a56451ab5e0e447c27bd47cd5ce3e27a48ccb621811d
-DIST thunderbird-102.2.1-cak.xpi 642306 BLAKE2B 411799a35ad29924702cf288501cdf236480ff7b897dee6e474275afe5c5585278eea54185344422ed1af9ead466f033c5c8d0357c6b6cd8f85bf80992e92e40 SHA512 0e44bf866f29dfdae03f0c9ec15dd6d61febeb122440cf6081fc04fcc098e4de169ba2dd4ea678c212fd97b94c5398dbaa77b09c1770b2b1d76f05319ae403e0
-DIST thunderbird-102.2.1-cs.xpi 706772 BLAKE2B 0b26a59f7b459837b145d1b92a4e9465a434c5d1cb6ab397db83a9ec98bf089bfc43e8a2b5c504a2cba859de981fb65917b47708f4bb99b8e07e95bbbcea107e SHA512 6959e16e49608ea988cdecb798886a0ee1b5f378f69c8de4033b516735499fff75133f6caf5a3ad455e4c7ca84a02045163cd604ecb449cb00935ce54b4bcf3e
-DIST thunderbird-102.2.1-cy.xpi 682669 BLAKE2B 23d17b7ccf0b8ba40396af52debb2b027edd4e633bc9e3b86cd77386919fa39f307bd14e8c3ab05cc0a45d1c8ae7eabd5aa39c98db7e62f0aa1bc9ff57ea8839 SHA512 eecac4e0bcc97182d79813588b42d74621f0af59631e872323f945257db65776f783d7c0f5ebaa56a65543ca89a98e022cfc0b3ce312bcef78933746fcf405c1
-DIST thunderbird-102.2.1-da.xpi 668472 BLAKE2B 827dabf445edaf997cfced4c8f012a310d3ad83972c1dce903470302cf247490980281cda541ea816a10533d35a7e3ec5b43ea2a988b8082891ea1d1d63469a2 SHA512 77fdf0a28e2d74d8b502273381ec5d34615d8e1784e960fd5d4c381b1702d2a3be43e7627e955ff6e53d2aea247496a5058d70f1444dbe6eda1f7afbdcad4077
-DIST thunderbird-102.2.1-de.xpi 702890 BLAKE2B a50a707074189a75f875f1dbe3ac255ceb2dfe45cbb09001afc86cf44ec9c97170639b3e3423c93a955beb7d7dd03822bee0ca4d4e1d97d5cdca635f3ae4e939 SHA512 7f7a26c216964fa6194ac513bd7e0b698e5b1497591458ec2f8b7dda110957b23533aa2ba7dee0d4dd576bb661764e448f53a3ff704250844c8ee44d7a3d1199
-DIST thunderbird-102.2.1-dsb.xpi 716113 BLAKE2B fef710ded898276afff2ed5aafc2b5c17e48592b5eb111354bb1a3d443db38bbb9982cf4e851f923cb81b7e4fba61646861bf153378efcb2dd3baffc32df296a SHA512 c708c1e26aef41dd563571fe7b1aad2fdad3e0317e2bcc0271260de46f364fa338c4215055ace0a54519dd0a91eec8292e9164f13e58c682160bbda23e15c7ee
-DIST thunderbird-102.2.1-el.xpi 812220 BLAKE2B 95516daade088ee344efb096f40eda726740d2c9a5f86ca7ee162d4355a082e93eefd31a61f1b232990c89a4f2a33a2783d1095d08ea2c0f7b30ff93f5dd4009 SHA512 9a511c96fb789fca8c5380878ed62442551643e74f31a32f692c3216ac73aec705c5e62b69a813985090ba36ed9c04a862263b75965a6e85a2dfe11c26d23774
-DIST thunderbird-102.2.1-en-CA.xpi 642442 BLAKE2B d1f9755cb9717d2f050b0a9f9ab90f4e7beb3f16347c1c2031bd13148d15febc97bd0d147e08ce4328641ef7563775f2ae3925a7d531ed61fe252ae14f539cbf SHA512 1a6f4ef6dd0e4f9993293e6a0153745774eca0428ec2a8ab8f0665f6ebee9a78aea14bbfbc55cb4b87bf73eae6904ebed19fece50c62e86f788a4fc53d5d5840
-DIST thunderbird-102.2.1-en-GB.xpi 643348 BLAKE2B 3e573d3165c5c26fa58fe57a6e8b856ba19254f57439fbc35b439d765555bd03eb576244834970c86aa0c60e966b33444b568064e0b995970aebf49d2c2a0775 SHA512 9a6578616ce8976ab97af832890e488d3c9aaf357b4ffe53135824aff6f09268ee764d770876f5aa434b3a506b24f565bb8734c3a0aa9cdaf60065c29411d314
-DIST thunderbird-102.2.1-es-AR.xpi 692820 BLAKE2B a5fb6f2d770994a2559779ee1496ec3ac7ab7cee6ef82bdaf97f77ee31a10db69efdcb34f771788427576f048a36b96974271eb6a3ce23de79c2c1f8077bd0eb SHA512 4512c3d2a269d5aa5827fea8d4967738dcecf459766db3a0aa06761a219aea0681e73c5d2133d51978dec06c60e82518c089c1e75ed89823d71fffc68eaa73cf
-DIST thunderbird-102.2.1-es-ES.xpi 648799 BLAKE2B 2e86cabdd6f69493d9751935c70e06194519ce0e726d6679e4ebf95223835e9e08a66e0b0059d1ff0058ba6d8fda51ac620cf1ac9b7544bda1b0857a17cfeb08 SHA512 14b6c312273b53381063672f6134ef47865a08583c29f11c1e8b1be8701996855e5509d89cba9d8270b6c386e2dc15c5460eac68a78f24e4c1c85c1d6ce649df
-DIST thunderbird-102.2.1-es-MX.xpi 695514 BLAKE2B 6b29d56e0621b48390e6913a7083345103cad19e92e21a03dc8266b13b6a12999b4091eb6fdb1bddb43330978952e420ea36cc7ce2f7c4e2a070dbc919833f6b SHA512 6c95f8369237f2629ece753746f1061ec37d6262d3f5c7472858aed6f9e6d291cb3dc79afa51ca3fc0fe413fe052853f1747991fb829d472a9bc1bf7ff3f28ef
-DIST thunderbird-102.2.1-et.xpi 666174 BLAKE2B 1418a9d70a7a0855e0c67ddbd4eb3fa30364e57b80f680c6fbdfa252ff5fdac319c9916fe1b239b92e130c94f65c1891821ed49a4e1d6e8d17fb48a978beb71f SHA512 fdcb218f572443ffaa8887e1f28041a12b9b24b520bbeb6c1c2928481caba9ed9618fe89b53d05adf5cf9f6d0baee8837e12530773d3202fdc06bfe91abd1a42
-DIST thunderbird-102.2.1-eu.xpi 677898 BLAKE2B 3da5de50f1db75ca336448127ec25165b30baedccba645913fa43406c39e9f31b9e93f1418149c6ebdc14f7d255e5e1cacb0b22be89881e513bc0cfebf95b0b1 SHA512 d98f8b2afb0a6973362a396dc6f637497ede8ce1d6ba986dfd4daf60e456e0fc1299049b0434ac8456e33ec46e856db12486581597f171ad040351e9afc8a881
-DIST thunderbird-102.2.1-fi.xpi 668660 BLAKE2B 5d0017ba20e9861513947dfd984c1119a12feea37b3ccb7270f13c43e019f8a408efcbe59cb7b5e15003c550bd332e69c7b72b282038c1bf2608968cf29b2118 SHA512 720335ba39fceb95cc176499bb214c9c25b8beb52e1a86c4f50fb21c892c58bf883e5d4683306c1975bb83b9de48a1a490c29d113ded8619301dced3cfad2318
-DIST thunderbird-102.2.1-fr.xpi 705312 BLAKE2B afa226e5d85c387c1acce6bb099bc4a00ad53dbf553541f7459f3605380a235d3fac3ab751559b4ba2afaa7ce6d8d78f43c8ca52429d3a1fbd847dceb51a3b4c SHA512 5254bad21421cb67de203459477325b3959d57e3a5809634dcf0bf6a9be8a15445f89ef566642eb4b1b22f14bf432b6104c0e0e9c962f8c54c740644d3f02a7f
-DIST thunderbird-102.2.1-fy-NL.xpi 687950 BLAKE2B 4fd79f230d25880272235f41428baa2957ae96d3c704cdd748ece9bd70165dc96fb63f13d28724a22d35174fd73991a9165b220f936c684cfc27426ab7173252 SHA512 0a2e78f8a4b19612db54efe636122cfadc9be15ac1e434ba6ae15f05f01db152c56b045c93b381ecf8145db23e8d3f519ee27f629759ef3ec5f41e7f01414ff8
-DIST thunderbird-102.2.1-ga-IE.xpi 606319 BLAKE2B 242131fa8bce326aae8f4e32862f3fe2484c701263b5ecd3639e7a043d28433d4aa0fbabcdbc9e425b04ecb8eb14201a1dea6ad3f6cab99b79d3ef1736e0f5ed SHA512 4227d74014d6b382762ae5fa21beddd1094ca2509b3ae309525db6b77b6429ded5dd013e405c7ae4732f6f151ee650a82b6c7c41666159cbc0ce1cfde804e28e
-DIST thunderbird-102.2.1-gd.xpi 630866 BLAKE2B 77af416f25e53fa8efcc84c98b696bc599f683093647172f3af634397ea931a248018cb6d89169e7db7f83d4e2a7fd6057357f9633569da54884b398c5d62085 SHA512 1a71a7291d4cb7187694acf606240d584bd4b7983126b34eef8427110acf6e554a02fb9a3463f509676ae39ccbba1a9912adefabd33ebb49fe8f7fc2ba8c7b59
-DIST thunderbird-102.2.1-gl.xpi 663759 BLAKE2B 88e39afe4154b42a27bf023a4c9afb5d915dd4674b8e7792d5e58e7d9ca28fdd404525a6f5d37f6ecb8fdfb0e2d5affa55eff14cbbec70dbaded1075c26f9793 SHA512 1b5401f297c3e16dd82ac846b673ab7f750c097d59a54e78ff30ba1d267127c191a7e9b51df5d7de726d17ae4a0338be37c11dc9ab0fb20552ce5869084e4b66
-DIST thunderbird-102.2.1-he.xpi 661738 BLAKE2B c9d28bff019e1c55adf9793c7b42d0b2686520b39816d593f58b4cb309261b170a7479c515e2017c02dbd8ecc000c6ddb67e88e796b616042facd122d8731541 SHA512 d450fbe618bbea069922360e885e2a2e70864e03b7bbf02dd3d5f43d5803b062b4367de9f36fa0e841e2f97f77d0185a37d5fc3b11f1f62380a6a12e88ef988b
-DIST thunderbird-102.2.1-hr.xpi 661213 BLAKE2B 823a23a8202dfc27405c473de86acdfff94fcc248e99d54f523f3a1b62db003530a25845a0db023f3ac3abc6c5f2f4b7f2dd4a02848e4793e9703a1789859de8 SHA512 670c6e54fe1094aa907dcd58898d253f22c010ea1fd8e3b72e815f4502143f1cbb2c52c02579fc23963769432c62d7f8a4428fa0180eeb694bb2335e9a9195c6
-DIST thunderbird-102.2.1-hsb.xpi 712946 BLAKE2B ec3b08ce32e3b3d3c2c285d2fca55ba1206ef0123f1899707906c35fd3be220692d24b234f04ad3a434e3d647d1221ffe57347cda31fcadcf8ff0d0245d578f8 SHA512 50f5a1ccab590ea618ace8c3264175a26b356fb683c4809455d722f9de319ea91bb96fce20ce215b751390dd1cae63cd5b3f30381b6543002b10a520dbac3297
-DIST thunderbird-102.2.1-hu.xpi 715823 BLAKE2B d0c19291dff98e33697210ef5b06b8b12241243acb152de018ed975c0ec67619e8f662174d660b582c31ecee78fb5fc563cb94790269303cf4890ad6e976f5de SHA512 6b2fad69d4247d8bf10ed955b68c8788c406eefef48467cffa66906fefc203d691c13286dab1a5e128a523624cc66691c6fff5d9da986f7cccd8a3890ef0a22c
-DIST thunderbird-102.2.1-id.xpi 639688 BLAKE2B 2fdfea50798344bfff2fb66c5b88d6e8908627799e0cc943ba0e6991800f5fb68ca1ad3e72a4ef3125ca2b25bd03dfd1c781f55a8ed1befe77bd62add1c1820b SHA512 88db7b33ef9cd19abca5f71ae693fa92949634422b27d76f4028e8a64dec2fd4904160a6edd20fa0da699ccf88a33a132068d203dbf0cb480ec67918a00d284b
-DIST thunderbird-102.2.1-is.xpi 679301 BLAKE2B e90303dae3486de9ef6b6b03bb1924b9f2fbc392fc5a0c96dcb17bd01bcdc5d5a3e69ac46795ce28494152f6fd0e86a16a90a4f94dacf8dfd9858e874f532353 SHA512 87f493aed4fe67485a5242bef82a4152f7261578db07ac1aa1425ec3e06d041f9c9bbad4071676c4cd30d855fcfc33f9a6bd3c9ed5a5267dd0c7c6ada8647005
-DIST thunderbird-102.2.1-it.xpi 597643 BLAKE2B 4a714d65eb00dc269444a2a15ced0fb6d71ca4469c2a5c1be35886cee37687f8ab2fde643443b5d4872a096b0985eae709e2b993f6d641358c75e756b8233c92 SHA512 26871667226ad4506f42880ad4a9bf2114e530162475c70edaa372a65968875d00587e904574b8785578e0e0c9c053c8bc2f44d869c61dd3fb6caa6070aa5a51
-DIST thunderbird-102.2.1-ja.xpi 734595 BLAKE2B 641dd8dabb969f332a384e1c52f3ed68f4178f223288555022c8a30df020ffe4015f4515d0e35940de2f52e7715485b023997fa745909495e8cbffafe11a8966 SHA512 4a9fed720296759a853867c762b8bd28b3d0ecf5284a743af71186c2ff47652c8ef986028397b2b1c64c0a32f969d89cc33ac16a547294ddc7eccb7b2e1e25ef
-DIST thunderbird-102.2.1-ka.xpi 749215 BLAKE2B 4f0a78a61edf38a26f14d723f0db06a172f067fc375a71ffd264e2106033b27a6399f44707b3778305b2e2aed32ec091aa937745dbed97c53e372890ce73f44c SHA512 99b4849bea2efe7a50056d17b3043e505cd7488085ea8f13133e63e5de1cb169b51a14bc908dcce3a1a55a4cdd2e7e889a46b5ed07fbe4465474a336f7616c84
-DIST thunderbird-102.2.1-kab.xpi 688250 BLAKE2B 84d364501980689deb0bd069d8334a8149b589a474308e55018f55e728731a462803e90387ac753dde7ded0f50b41ec1eb96ca104e3d46729be4ce439cca2d20 SHA512 cddd2ad7a4c94361ee2cf37437591613f883515b73617bc79ef26c4d81fec47b5f879117406e78ca194c3285380f7dae1a3f006feeea9b1ae60be36200013b54
-DIST thunderbird-102.2.1-kk.xpi 730864 BLAKE2B 220d5df99aad395b70457f275fea01ee3e5b864072c54c9a36e2f86c151c4a3dd6d27fccc2c271d4c429ea7f0123689a803f0b522807d827da37306e1f503ba9 SHA512 6cf042fbb654e178cb8906df98ae11d33e466b0194774ecf272f45430e1142e62cc41fb079e057b42635c7ae53dd46531a08c05bd10ddde85152d751ccf139bd
-DIST thunderbird-102.2.1-ko.xpi 693030 BLAKE2B c905bae92bf8494612f57f8f4aa9cd73a71a66e6c9ecd790e15e8e73f646818cc5c973da8e0409b0145735a3ed8e1b6aec079dd80a7a3d5869731571a4f29bab SHA512 2ea50b6ece8d75203f009d050185867257575ac50fdccbac22bdeeeb87f0d1ec7b2150b7235c0c987a026e70a47aafcf63ced190ce98f765d43af7380be72bd8
-DIST thunderbird-102.2.1-lt.xpi 681567 BLAKE2B eaa9bf3d881dad8acef7fb50615f84acdf88795cdf5d6d053ac82269cf425c75e2b22f375dff8781e8b0bbb8298af0ae5ae6a78d3e7e2651345381c938689af7 SHA512 1ff9e5ca556a2c768751b7720444da077e5d5be920ead102d725335793cd40a67dab3cb40b49243345614ea02958de667e3fa1d30b91c9771803508eaaf6a8ad
-DIST thunderbird-102.2.1-lv.xpi 609152 BLAKE2B 6f4967d1f6c8c37c0d2954d2b1f79882c7516903fc4515341b7a4b97f4e6c18fbf45c6164ea17c450668ca28f3ce21a5112926d45c525472c905fb4d12f7a1da SHA512 d9cdc204f3b21a16096cf6748d17cdcd3823ca159760db3f8a1f96d2779eff4bfcc77ad379662977ed01042d2d704f1623730238cc513a24ae382b45e75f6dfd
-DIST thunderbird-102.2.1-ms.xpi 569973 BLAKE2B 769f35a8b585f7cdd8a16d037af4e99a4a459a5e65eb8c3fb343be41f32bf6326842722f96ac57c7ca863b9bcb2935fb0c18863bd58b2f9b0c75847d0565d706 SHA512 038a4ba119bf17e6c05ebe8e10de3e2f8ee2f793fa6cb5e04ed6460c4323199ded2bacfdb053c408c8d701e64779308960613eafd70c15d1f41c3b1ae22db073
-DIST thunderbird-102.2.1-nb-NO.xpi 647802 BLAKE2B 7dfa2304b9cfe31b93a3c11ca173d4c1c9b25a78801abc26c1123e53c03afba32fd1f394d5c7447b1628beec1ed7e4e35ec02c545c289bf819ff776731bb4913 SHA512 25a0a8a8f5db211ab48adf25c1b0b787702d2cac373f30f562f46103e1ac32dd2af2186ab95e42d5fcfcc9217e4f26e855be7aa32f7b31ec508ccd609c27057c
-DIST thunderbird-102.2.1-nl.xpi 679619 BLAKE2B dc6a48b8d27d4768d9d83afd979da28b02dfb7dadbc17d0a80dfcf666cf56ad511492935ff49b260d0dfd23778f33bb15c13d7195682cd43ba9d88e7e12d40ec SHA512 bcc6b146ff1b6bfd14bf4e25c0d96e2b8a607c61b95c63e933a0b12915582705399cbe2ed4c698fc98c28e5728914c7c6e830ef9955ceeb472374c6c26475597
-DIST thunderbird-102.2.1-nn-NO.xpi 655077 BLAKE2B 5a3d94963aaa58f278a55430767f490cf8bcb3997c4fc9b743de36839d567b59bc56b5a3a1c518ef38f360b97f73e99a8863e8e173637f710c5568aebcda167a SHA512 74ee35dbf115fb88f0f66d86f1eae8ae7830a4d1921a58653b387c7f59a57fd257726a9d499e00f032387eb3b0b24a4ea7e767e3fe6e5e37eb93a1671105bd4c
-DIST thunderbird-102.2.1-pa-IN.xpi 644807 BLAKE2B d8e44ba3e404d29044f33484ab6316f05e8cd9c30caca79753323e116e9b0b4a4d2d29b0f0f3220c653a8bd22f61a8215088f57c1a3a54c2ad0fa1b627493999 SHA512 263fded44773747a11772c3be8f218f8d774ca2e5b53c7e3abe7abfa0d7a1b90892893a40547790ed5f83970895ef6f3fed6c622a8c2d7038059674218d365ae
-DIST thunderbird-102.2.1-pl.xpi 691781 BLAKE2B f76b2ae62824f2963e779e846b57d5a3c2b22f9ac3ea338092bcb6f15ca6e5df2e6876c1616754d9d063027bec876373d6a2b7b733a3bf6dea0f44730cec1ea0 SHA512 4832bd0b2f68ce6b192b8dccb1735e7341f67df731f97834c04bcabce48a85eefc5a9b90af26acde93f0db638cce8c04e60364c56da9d913a7340f29f1adedf3
-DIST thunderbird-102.2.1-pt-BR.xpi 687262 BLAKE2B a0e5801d64c0efc4c8709bf06f69fde1a65e23b3f4625f88aad0aadb9920fab8e2de79c7d6967ec37d6c3c4bbf9d4e0dc4acfe89f7c29c1994b6e862c67ecdb0 SHA512 a62c865a59fdd60498cb223b8d1852e4ab20c7432ca5128d145bb2fabac83178d2e0a6e82ac3bee93435cce15c4919191291e53f4dfa0d8a19ac6732ab2a8fb9
-DIST thunderbird-102.2.1-pt-PT.xpi 665589 BLAKE2B 5a7a471071096c0a47929224be82d8ce8bd5af0b6aba60f91bc51cd49a25c0c453de03513d0a69fcc40100165396b8859d02ea8ad0c5dd0bd573426c014fc21e SHA512 566f2f932648e9288b9bcfb75a4d9799dfed94e18cc17c0992a8c587083d1cfbd9aa9398ca4e26f4b9a73b63f6790b8352a2c304d00958bee9cb9ac7ecbe8525
-DIST thunderbird-102.2.1-rm.xpi 680752 BLAKE2B 297a20b1611a737463e097860dddeb2c66b49b810c7a3dec8801a6174735935cef9fc4d24121ee7b231648b352fbd9128105a07b3afafd28c1c482b178bb05f5 SHA512 745b8f1aa2946c15aaf331dd207dbd3be5acc725feba47c5135475475db6da2ba58259b4043ce451a9c5b54b1e21bde2482005e33792248d5dee4d068bd3b7a9
-DIST thunderbird-102.2.1-ro.xpi 651252 BLAKE2B 20fdca39e7d2decd88f94ab374f74f3332abcdef0fbb0518d8b4107e58ce1f40fe5f139c77e2510252f315832ccf3cf0087e7adaedaa5b03614b483d4c196be5 SHA512 0e9ceac3d12d3a81becaa6fa41aec97691e8e2179417c48c3ee4ae8e8eac45827d2bdd3d1475731d0bda3aa3009d4640b9336499bd894d98c740b504871b5819
-DIST thunderbird-102.2.1-ru.xpi 797369 BLAKE2B 89acad260dad71d846d05da21004745992543072edbd36e0e50105e0bf6812b48724c411c88e281d339572f75f1bc7c3eee462e917bef8ac9e65360a6803c60c SHA512 62ca30f53c1682869c45793e0f4a403d26b956219f260072b6fc6eeac9c4118b988e616bfd5d5c1d3cac22ddb71f8b7db24ba7ef6fed6465871684ec32240513
-DIST thunderbird-102.2.1-sk.xpi 715673 BLAKE2B 7db6d3163584b8ef8cf97f073480e06b8a78972924451b583ad66fab7398b74e89443d04e1a7ee80ee75530371c54a6567ee35269ba84ced02d676a1300d8156 SHA512 2357be4eec0c7892ab6479dff2b2856643b22449650a6f3c84be0f0693060a4954479d4c723d98c18adee13fa7a2a9be32eacc5bebb20e13bcb39a812f601846
-DIST thunderbird-102.2.1-sl.xpi 679736 BLAKE2B 83cab4e69c99c24e1653bae9215ca4b9f3fdf4f47008025054a414a1b3b46781668cb5a52f66e6b57bc6f27e1c91e408a57debbc114f4db32e7c53101883dba6 SHA512 16638e4df392909340d6f1ea1a284035df1112cfd27dd927ee04f321fa6ffdb0f1a93f47462c1242c9b3c1caa96095a094ae8d0e36a740b704e5bc33617f34f8
-DIST thunderbird-102.2.1-sq.xpi 690437 BLAKE2B 7b501a37555438d6091bef95d92dbca500d232f00754b1bea3b27f004480496aad885ebd34082f97b951fb21675dc93d32c146ff2d7c75c5a2a2db1bf90d7a07 SHA512 ea416bcb450de42e033c728f1c620a6b250c037e757fd27add62f6c53f7a67e42522e19d0a889ea04c64ca51d2551d1e9e2f7a6ab3118fa23c8298fd2ff620ad
-DIST thunderbird-102.2.1-sr.xpi 699187 BLAKE2B 2ba6b3882afabf9806c958fc801908890b70b56677db943ff8069201b3ca9b53a97977f3d967ffe9dab2a4026fbc0f9fa8eb759dc1c6ed48991093f01876d423 SHA512 76bbc071efc26c65630f00d8f0b1964489a33c4da22ed3a32c6cb4c2a8fa54090522cfccedb9bbb9e95e61806f4d62bb67dc617f2f934236dc3d81b36b747b85
-DIST thunderbird-102.2.1-sv-SE.xpi 683269 BLAKE2B fecc1619b2b408c1b8f56c9ca9d1744a8e59bed5faa850f68d1c7d2efc333777bd7e42f43081bebbc280bc8266eb584e96cd5c12a119ff16172b1af9dbb9a11b SHA512 684610cc4598d09e3f9db631d0373eddf6a56a61c7adda1b2f658bfec7ce2668c101dc882dcf53a1780b153a5d79bf5f7e289d05ca08163f71bf0b8ce2006b5b
-DIST thunderbird-102.2.1-th.xpi 734935 BLAKE2B 373e2f7eb84ce78af057e0650603f1e0e675bee47b29807be715b10e468f1e08f9068c99f54fead1bdff214b10354804173d23e336429e0ee9ace77419ca9aea SHA512 a0de3b0c799e432fefc2c3b7962720b2e4bc759e88ab8f6a7cfdc748ca3f0b2bd4d130ad454db4bc23c60331ebae5dd881fd689bcffcbb7e302e739957b3e2de
-DIST thunderbird-102.2.1-tr.xpi 690951 BLAKE2B 1c017489e9b974c8573d4cf918b1337fcc4c69ac51fe80372e64a537ce150514f979714bd96b36ddf4edb74381c6f36fd22f1fe6ea163433b26dc0393a0e434f SHA512 2436f9e8d5617a8cd6e4c885020eeef2c86dec2d777fe9faab9413a11cda07ee1fe72235fa9937e2d911a38e73baedfc139309a57e2daaf2c7b10ed71d7b4009
-DIST thunderbird-102.2.1-uk.xpi 790045 BLAKE2B 08d71f78a7e3bd9b7e0c2d0f482b6fe3db3bde9e8749c832eaa3ef3f4507ce7ff75c52048949f398a57303788ff97bda033b825b6ad122193c83ea56002d39ab SHA512 d52ea74907380e1ad9b9ad8a9dc49b8687f59b445f74d7b649d6abf57794df5f83ca3201985a2dab9fc80478461540d1cc40e63e0fc2f4b43d1554dda90fc0d3
-DIST thunderbird-102.2.1-uz.xpi 586791 BLAKE2B 0f692b6937d38db766c5ab51a3223f979845f12fd53b040864b9ded4e5554c8f584ac4ecd20b00961c2197411766f351da0f90a6850e1912a466a24e5e1e10b5 SHA512 68a9d8d253c75da028a6e155d64fcef550b00cdb696602a824fbe53566c94d163b25ca6743721854b82d9d61336a27341528f1d0acdb8ea05db044006cb323c7
-DIST thunderbird-102.2.1-vi.xpi 721452 BLAKE2B d7a225305a51d837a019d6679d0f6c6bae08edcf18b0e44a448e1173ff17094702d381c3a844f05165c08b0b589b8666e95825480a1f16f5ce62f93a4c9575c2 SHA512 5cc7b7a3b314cde1337af6bb5ce73620a7880a790f96b2be1766439033c806f201dc0e97f74f7bfdd410ea9cf985faf5f1dee2d3a512e48d378faa673ec2b5f8
-DIST thunderbird-102.2.1-zh-CN.xpi 718569 BLAKE2B 83d586f5ac233d8fc7b58e90fe43d006a5342ac5ea916ff90e733465b93dcaac1102b22ba509cb13bbf20bdf85cb6a273252862baaf386de7d43c81412ed56c9 SHA512 0c9d1b26cd3f127aa2d308375088f623d1d84b2bef5b6ea949aa28690d0567089a793e1aadf6baf1595845c9836c4589bb3b096543121947eabf735a7a576ff5
-DIST thunderbird-102.2.1-zh-TW.xpi 723809 BLAKE2B ecf4e2a43b96ac2c4b1962522ee5d7dbbba04899dba8965ca19cc6227be7c22d1268889e7fc180155c52ca5eb8eca55adadae9d708b6a87427e003f7bdeb9ce0 SHA512 3be070c1acf7606b4fa124a4285454f0e3d5d2c4db4c1da22092bcbbeaa8e0f8a256a86568ef2582bd735fd4c44196dfd6fb7514aa27528afa2d309af043e554
-DIST thunderbird-102.2.1.source.tar.xz 501438680 BLAKE2B 4d37c3fba8fc4e09fbc53c5153de1fa18dda621428c38079be827f015f6afc1a6241e3cb4f5d65fcac2128f1dc4ea336c185aeca35e67f4a9acaf529808dba93 SHA512 7b69cfffb5de56690cbbd97f6b627733072dee498a15adfece990f9019df8df948762ce8eb2ca2d91ef12ff56262fb1905476d8a477aed70bc71cd2f9f986ea4
 DIST thunderbird-102.2.2-af.xpi 551019 BLAKE2B 1d531ec1cc1d1ec8131a851611d07833b2085fee672b8ef2fbd3afd31dd2a529e021e3774e93c9a269a401348bc7bbc1ea3240aab64cf43c737f415f7c6a518c SHA512 859e1b5ef3f3a25eb1a18f16d9b29177bc16cf3b87cabed70f29412d836e05426e9997baba52c2b92238e15297a6e2a8b0ebb4ab00a0d8938e2c96cdeee34007
 DIST thunderbird-102.2.2-ar.xpi 655343 BLAKE2B c4b58bd6ad024b1d4f59973507c321cfb6d9d5be63ae9dc606a68cd19ec3af36648f8c57b3562f43b6b015aa4d998e58916366863a3bea6e8f1331fc111e5ae2 SHA512 52962d371852ca8a2af452ba8d27b9f963d1cac4ba2c7675990cdc51c4f0666c8a5985c94a58d56e1cfede5d95409bdbea0d5d0e7ef20d400057ee610cd3ea1f
 DIST thunderbird-102.2.2-ast.xpi 571773 BLAKE2B ef01cf049ea05985d98b273871039ae9bae917bef48a799993a75418e15b7fc412bc110ba4b77177d4d52c32cffd69206635c749b25d90bef8ecf8b652f70bec SHA512 f0baf717491cf326b732f9af819373ef1b8fdf286b20f10b28d0e50528f38d030ac30fd72b8805f2cb32214e2f9226e6fb1f5dac953bac85700dbf917d2ff6f1
@@ -200,7 +135,6 @@ DIST thunderbird-91.13.0-vi.xpi 725528 BLAKE2B 1b85c9add75e6101b2d41c68673ed123a
 DIST thunderbird-91.13.0-zh-CN.xpi 730903 BLAKE2B 51259b77a32d37f665d3692ca4f21088cd51020c5dd319bdee59ce8467621640e830f51d44caedda0bbf1328522ca586f831046c3d15c759e53e2fa59367f990 SHA512 b89c58ea8279c5bb4ddf612c5d54a2d76a5a4d1e90bd7138040b2e86414d95f02eb494b72d4fd8f83525d68f80cb5f1c0c25d7022feb9a6e27ea115c93f65689
 DIST thunderbird-91.13.0-zh-TW.xpi 731945 BLAKE2B 76d5b5b9fe50f5c6e4c4fb8198491da688aab2d0781019d6d91a0fefda056075c3bd4e94b7617a1068aa7d6934d8eeb2730b7dad5f8e6e55067f651f950a2f87 SHA512 95b6cbb404ccc87ab02cc44ca612c1201bb28d19ebc1957b1a25b35ccd8983dd104985483a6ac1caec2a8cb949244593e15b63e3a20af6def0e25d23684aff89
 DIST thunderbird-91.13.0.source.tar.xz 403859320 BLAKE2B fc0b1d3866ae7f65e1ecb59341895e0f9ad2c811c748a9fc3cde623ccbf7d5e2d29391d39eca20f4ece251cdc1fc7be0f9213e6fb525f7b19165a0bc95dcf15e SHA512 e73d3db4333ad659ec1ab249bd261e8c28301c125d0c39b473c83f8fccace6d4916a2bfef14fc20c065055ff6bbd3ca618b5aab178241b53509543640dcd541a
-EBUILD thunderbird-102.2.1.ebuild 33537 BLAKE2B f0f1315066b906f09c8a2e19752afeb11e6e4678e2a5bf3661170c64a762a405f46c5354c15f813bcb8e2422465699c5290db9a82fcd4fdc9d003f5d239b65f4 SHA512 ce9bb6ad7bca88a446ff7f32e0f0822e6d5f0efc61d17f4d06b7659c80e4f675ac4558076638e35f0f6ded22e6b1c3d814bb85d1c2e5c354f5799b775d008254
-EBUILD thunderbird-102.2.2.ebuild 33537 BLAKE2B f0f1315066b906f09c8a2e19752afeb11e6e4678e2a5bf3661170c64a762a405f46c5354c15f813bcb8e2422465699c5290db9a82fcd4fdc9d003f5d239b65f4 SHA512 ce9bb6ad7bca88a446ff7f32e0f0822e6d5f0efc61d17f4d06b7659c80e4f675ac4558076638e35f0f6ded22e6b1c3d814bb85d1c2e5c354f5799b775d008254
+EBUILD thunderbird-102.2.2.ebuild 33687 BLAKE2B 949b9b2ddc05ceafb7a55feab9760edde0aab0b6de3458528c9f5f0c3d2214ced2dba5fce27e299644fb64608cc8dd20495e5669633b4fc351f7b21000a38b4b SHA512 bdbf44d65dfcbed2e7907b9518819ba4326be94c70be8fb3c8061e8b10d0014b5a8cde4309a6084f64c8e2f683857c139df896595045031ce9b9a9b456e235b1
 EBUILD thunderbird-91.13.0.ebuild 32760 BLAKE2B eca6bb6ad4a3c2cce82926f76410e8543f7c9edb32c4cad7b19fb6a0175384f0bab5706fa42697367011655c3ea9b537386a432059e4766d6a7c5764af6f3e32 SHA512 b941bc14b6d7a23d142eb4c21f8af8641ad2aaa800ed0b56d717ad5ca57988f30b7bee2a4ee4801b09ec25b2523b2d0ace457d358521d2efa4b8d27e237d01ad
 MISC metadata.xml 2209 BLAKE2B 5bdf2fabb2b6006e2d1ed2271d6ced3ec06982a3d992effe203b850bc3feb1f7c2854a3e6e1e746f6dd780d1a3c35c860f2af09f8fd491f68e743116f2976501 SHA512 bc633d3f53994730d2ef98ee4a5a0417ecf7af4fb73250460f93b5256ca3c2ae3842a0ff516208d0e5bc34cd6054bd44a4d894d07f88344a9db341daae35556e
diff --git a/mail-client/thunderbird/thunderbird-102.2.1.ebuild b/mail-client/thunderbird/thunderbird-102.2.1.ebuild
deleted file mode 100644
index 5b45a09b43e3..000000000000
--- a/mail-client/thunderbird/thunderbird-102.2.1.ebuild
+++ /dev/null
@@ -1,1169 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-FIREFOX_PATCHSET="firefox-102esr-patches-02j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils \
-	llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.thunderbird.net/"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Thunderbird-only USE flags.
-IUSE+=" +system-librnp"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wifi? ( dbus )"
-
-# Thunderbird-only dependencies.
-TB_ONLY_DEPEND="!<x11-plugins/enigmail-2.2
-	selinux? ( sec-policy/selinux-thunderbird )
-	!system-librnp? ( dev-libs/jsoncpp )
-	system-librnp? ( dev-util/librnp )"
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.24.3
-	net-libs/nodejs
-	virtual/pkgconfig
-	virtual/rust
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )"
-
-COMMON_DEPEND="${TB_ONLY_DEPEND}
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libffi:=
-	>=dev-libs/nss-3.79
-	>=dev-libs/nspr-4.34
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa
-	media-video/ffmpeg
-	sys-libs/zlib
-	virtual/freedesktop-icon-theme
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/libxcb:=
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango
-	x11-libs/pixman
-	dbus? (
-		dev-libs/dbus-glib
-		sys-apps/dbus
-	)
-	jack? ( virtual/jack )
-	libproxy? ( net-libs/libproxy )
-	sndio? ( >=media-sound/sndio-1.8.0-r1 )
-	system-av1? (
-		>=media-libs/dav1d-1.0.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-gfx/graphite2-1.3.13
-		>=media-libs/harfbuzz-2.8.1:0=
-	)
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wayland? (
-		x11-libs/gtk+:3[wayland]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon[wayland]
-	)
-	wifi? (
-		kernel_linux? (
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-			sys-apps/dbus
-		)
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES es-MX et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	if use lto; then
-		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
-	fi
-
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums audioipc
-	moz_clear_vendor_checksums audioipc-client
-	moz_clear_vendor_checksums audioipc-server
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		AS=llvm-as
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=comm/mail
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-gpsd \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-updater \
-		--enable-js-shell \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	if use system-librnp; then
-		mozconfig_add_options_ac "+system-librnp" --enable-compile-environment
-		mozconfig_use_with system-librnp
-	fi
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
-	else
-		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-
-		if use wayland; then
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
-			pref("gfx.x11-egl.force-enabled",          false);
-			EOF
-		else
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
-			pref("gfx.x11-egl.force-enabled",          true);
-			EOF
-		fi
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
-	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	optfeature_header "Optional runtime features:"
-	optfeature "encrypted chat support" net-libs/libotr
-}
diff --git a/mail-client/thunderbird/thunderbird-102.2.2.ebuild b/mail-client/thunderbird/thunderbird-102.2.2.ebuild
index 5b45a09b43e3..4aba732165ec 100644
--- a/mail-client/thunderbird/thunderbird-102.2.2.ebuild
+++ b/mail-client/thunderbird/thunderbird-102.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 FIREFOX_PATCHSET="firefox-102esr-patches-02j.tar.xz"
 
-LLVM_MAX_SLOT=14
+LLVM_MAX_SLOT=15
 
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -88,6 +88,14 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/rust
 	|| (
 		(
+			sys-devel/clang:15
+			sys-devel/llvm:15
+			clang? (
+				=sys-devel/lld-15*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
+			)
+		)
+		(
 			sys-devel/clang:14
 			sys-devel/llvm:14
 			clang? (
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 98dce4ac0afc..d1cffb957dd9 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/gofont-mono/Manifest b/media-fonts/gofont-mono/Manifest
index 1f605042f273..27cf7352b280 100644
--- a/media-fonts/gofont-mono/Manifest
+++ b/media-fonts/gofont-mono/Manifest
@@ -1,3 +1,5 @@
 DIST gofont-mono-0_pre20220306.tar.xz 157504 BLAKE2B 8eb8648d5300835fc59df73db9f19d7064bb2ba2df9a1b18c9f22ad217c20ff12681e64080c600ed7b604c007d12bdd5aed98b36e3637c27ca3a66a1c48b8f78 SHA512 09e682c0c9c16402e75bc60da2a8136af78dc433c06261cd23047a1ba219f1b495464f3798f3f8fcc809cc68b993497613dd235b254f69bf3f5399b8d62dbecd
+DIST gofont-mono-2.010.tar.xz 385424 BLAKE2B 221c58feedd353aff6ef935109fdccb2cfe5745d116a3575a2df11d188154e0b8c460a2bd512c4db5bb1286593ee6258daab2b48570922e3a066f9d7b3265894 SHA512 d5eff21085ff72002c0c57690d9e9e1fa1d8ff8e6706bdc2bdbad90f9202e2c872a6a02346c6dbfb6c48ca2739d563d5f5dc5752230acdb7f00ce06b3e131327
 EBUILD gofont-mono-0_pre20220306.ebuild 465 BLAKE2B 2e85e6031339cc645f8ae83bd5bb3bd8c8cb2fc64f5ff3b5f86ae497a5c43254240f4484dbaeb1289ec763c3777b5c6de1ea6d7db8ffa1dfe592f6d0e7c4568f SHA512 29b55b379409b4275f2e862f4d6be281670a0aa48946076b74fe105a4b960b8bc5884b3badbaa3e0a0ecee2bafbc8e1a4ae38fbd12a9002b8d20064fde1430ac
+EBUILD gofont-mono-2.010.ebuild 465 BLAKE2B 4d3da3770ac2e15833ab31d8fb779a1176d3350c7a15a0b019f05d0502a797b7f51820b67129484838e7c12fa0bcf136d8e4b479a5820d93788c26b1b6a62cec SHA512 d82da3375a670a2819710570c3071884e5ba8af218175c04d5a2934ee4bfd0d989468cb83958d17dfa259f23ec77eea625d84105d8bf1659ccef5350c950f849
 MISC metadata.xml 321 BLAKE2B d9c3be9eb551e037b7a9c01e05e5b6ffe30858f9df7f60237de1fe29f6451fb5467ce93298333e745157aedc43353d71c333b10b5fbcf430b94c6aee5ae81e89 SHA512 a5b964af10461a2401f952e02fa606e545a165373b8b5d85665a47d709e1cee3e3f96b4a355aa2dddd86951ed0f44d9e76537675454c5342562fe54da35b7533
diff --git a/media-fonts/gofont-mono/gofont-mono-2.010.ebuild b/media-fonts/gofont-mono/gofont-mono-2.010.ebuild
new file mode 100644
index 000000000000..c6f47c39ea98
--- /dev/null
+++ b/media-fonts/gofont-mono/gofont-mono-2.010.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+# fonts extracted from go/image repository at commit
+# 41969df76e82aeec85fa3821b1e24955ea993001.
+
+DESCRIPTION="Monospace typeface created for the Go programming language"
+HOMEPAGE="https://go.dev/blog/go-fonts"
+SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~loong"
+
+FONT_SUFFIX="ttf"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 8e707ed8ebc8..0f86784fc0e2 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
index 040dd9727adf..b841e8db4d28 100644
--- a/media-gfx/solvespace/Manifest
+++ b/media-gfx/solvespace/Manifest
@@ -2,8 +2,6 @@ AUX solvespace-3.0-use-system-mimalloc.patch 2152 BLAKE2B 242a4aefcf2ebf985503b6
 AUX solvespace-3.1-use-system-mimalloc.patch 1330 BLAKE2B c7e1c4d58f8739a7d15fe5fdb6c26323bd8da4a485af34dd4152f157a98352eb00fbf1e9c1bfae01567fef93bc96776d1fd05451fd0903963d7070d1a8f10013 SHA512 ff2dfd0f7620630fd633e74b3c0992b6b7fa3ec47145358eccfddadce6f32c9c3351665424b51cb016a2e472b3e887762c7a07bacc00a129aa6c01890cb8cc78
 DIST libdxfrw-0.6.3-0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz 691804 BLAKE2B 84c90a591fac71144e9e13aace7c1a00dfc1bd6f27b0bcde6b60541f5b5d3ccc04ae1c759f60cb467445cc884840d04bf4613b5cc553fbbf6951cac33a084d50 SHA512 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
 DIST mimalloc-2.0.6-f819dbb4e4813fab464aee16770f39f11476bfea.tar.gz 1129745 BLAKE2B 95ea6e64afaa6931e18a22db45ba39d554917e109028adb624120442329bb458d24d7f22a233931c5e15b8b0ce4cc5130b0d4cba0db270a9c84453afd70c33e9 SHA512 b02a76d8a7668a4d3dc8c761473f609060b834761918b58d2143d54dbeb4c342e213010f9402d1c55035b04860936c2f8df73b84e111f5e90b3d58db62c5f85f
-DIST solvespace-3.0.tar.gz 2734860 BLAKE2B 2efc9d98723c60abdb1c76ac086c40ff2f9b8bc9c315978731493d115fa55a080176ef48d930e3b503c0de0604dbfd2bc3bd99a581f359eb07a23034d09f84bf SHA512 b07b41fac1d67c5350082600a2f09e3fa611a1273e0c93ff93d11a7a1dbf550ff33465686eaff04fdb8350d1fe854ab0301d8723ef31cc65c687ba59cb89187f
 DIST solvespace-3.1.tar.gz 2764243 BLAKE2B 764637f84a187c6a86cf65cd672466f48e1e5abd9d335945fc47f2ea48f7d22a94f6840a6019f2380e8416e903bb55f97d9adb18fa6f2e7a94933c2a5b51ef6c SHA512 76794c4b103036f423471c72209521c273b40edcf9a725d2407e757b8dded033863f58640f1bcdf19d7dd1b296334f8745a632875e06604fa4d5b261dd23ba98
-EBUILD solvespace-3.0-r2.ebuild 1832 BLAKE2B 2fae3d74dd6a1a146617a8a3a05d8d069ee593ab864a12f547d733b06bc793a9be37354b6609a9e495c6c4f6e940b7b87f7cf1ca25bcf8213bde68a06eb72300 SHA512 8537e77f57acd7be0177487d95f25c433f82357936346a1029e86cc56ac2adb1faaa805c853f079517de1cde6ea6e29c01c19397303b57eabd84ced564cd9867
 EBUILD solvespace-3.1-r1.ebuild 2739 BLAKE2B e6cbd0798e4c7ebf2a2b96ee6d9312aaeb2e110364b4f5dc32daa9b3f654c9f77fff28018ea86f1d375831e26f1c2339e73a724a3b61e2da0fa50ededdfc661b SHA512 ddfa091c1723dc00db0abab5fb131ae06171deb2dcc06e176b22a93f94cd457c9e5dca442a2b94f5c9a0f849ac7d6da15555ed5e74d1e67a11c82d160e879e0d
 MISC metadata.xml 1256 BLAKE2B 9d5213ff5f2f484ab96cb7c1fca7c756fce7f7d35a536ccfa28e5d73560b018e22ec22d25d9bf36cf4f463553b3da55a99baf9e1e15cb7f75d11dd2befd5498f SHA512 0fba9cc8899227f1aa955b7380b32580a4fbbdbcca31ea674c2fd31bd6115be41edaf3201c2a043934e19e4df3d44828ec9127ee559768487e9769bb26e953ce
diff --git a/media-gfx/solvespace/solvespace-3.0-r2.ebuild b/media-gfx/solvespace/solvespace-3.0-r2.ebuild
deleted file mode 100644
index f94aea515954..000000000000
--- a/media-gfx/solvespace/solvespace-3.0-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# solvespace's libdxfrw is quite heavily modified and incompatible with
-# the upstream libdxfrw.
-DXFRW_COMMIT="0b7b7b709d9299565db603f878214656ef5e9ddf"
-DXFRW_PV="0.6.3"
-DXFRW_P="libdxfrw-${DXFRW_PV}-${DXFRW_COMMIT}"
-
-inherit cmake toolchain-funcs xdg
-
-DESCRIPTION="Parametric 2d/3d CAD"
-HOMEPAGE="http://solvespace.com"
-SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/solvespace/libdxfrw/archive/${DXFRW_COMMIT}.tar.gz -> ${DXFRW_P}.tar.gz"
-
-# licenses
-# + SolveSpace (GPL-3+)
-# |- Bitstream Vera (BitstreamVera)
-# + libdxfrw (GPL-2+)
-
-IUSE="openmp"
-KEYWORDS="amd64 ~x86"
-LICENSE="BitstreamVera GPL-2+ GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	dev-cpp/atkmm:0
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:3.0[X]
-	dev-cpp/pangomm:1.4
-	dev-libs/glib:2
-	dev-libs/json-c:=
-	dev-libs/libsigc++:2
-	dev-libs/libspnav[X]
-	dev-libs/mimalloc:=
-	media-libs/fontconfig
-	media-libs/freetype:2[X]
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/gtk+:3[X]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0-use-system-mimalloc.patch )
-
-# This is shown to the user in the UI and --version.
-MY_HASH="0e0b0252e23dd5bd4ae82ababcc54c44aee036d6"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	rm -r extlib/libdxfrw || die
-	mv "${WORKDIR}"/libdxfrw-${DXFRW_COMMIT} extlib/libdxfrw || die
-
-	sed -i '/include(GetGitCommitHash)/d' CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OPENMP=$(usex openmp)
-		-DGIT_COMMIT_HASH=${MY_HASH}
-	)
-
-	cmake_src_configure
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 700407c5097e..c90069c5658b 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index fd130e21a421..a7f0b6fdfb77 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2022 08:40:01 +0000
+Fri, 09 Sep 2022 14:40:02 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index faba2610c8f4..07c4a5df0d09 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 525759 BLAKE2B 487aaba91a7a713d59ac9586bbe0ffaeb7bf01fde9781422d78f1d1e009e745a8cea346fbefedc07f275060c3798240f56799ae9f182d10305c04a36eac8db25 SHA512 9ad37d1ae3ef248f0c465e37bce58b95e6f9da024c5d52c9ede183ff971546b15abed0e4dd4ca83a4f69fd2c722ad188eb583dd8d8337d8d99ae3e7c776b7da4
-TIMESTAMP 2022-09-09T08:40:04Z
+TIMESTAMP 2022-09-09T14:40:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMa++RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMbUEZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD1EA/+ODpZRstGfaF+nNXpxKbdHaoxnU0F6S9nMt/hSSNGpxSPAANQjMt+HCfU
-CXWatnxOVnF2iv4vNF5m4zrIiCF0BrgeY4aAb+gDkUN5Z1tqm9FvvDTeaGJv826L
-L+HIvla2nKUtccwTDMX6qTKsuoj7s2Ulvwm0qldoXS4BqqXkV6IodUpyhUe7DE0L
-j828nKH0kMv3qSsO/HmexbNrAesT5s7WNCB7cpDLrvshU6QBJWhmB9V748Cv7Hui
-ZZjBJaFQ1QX9R7OvWqsdpZ7L/DOkTxtPgulfEvj1dGLrLGUPUgDypWJFMzesggjB
-9S/LHCPrCKTuZzYkPjCU9W6elwM/n/ZSE2bBqh1urZExQWx7HlaeRg/k3ByJEDQt
-f5+Sx66Kh3FV2TlBDqDqG53W4jDoFlI+HYbZFEb9BeQ84sKADpdPhiKIQrppwJWX
-78CoYbMugFf5hj8VYmkTPAz4GKgWDip8yf2L06c6ssSSJRDbNhlMnOkI+ggyaIzc
-nB3ZxGOxshYBT12cqXuHHVzUIL3BdIvUwR/XK/y1RbYgV/Pje4AxcjQKwMyOgLyw
-yBr/uewd2/EK8W0nFpUL9M2mGRGx3mKNrXdI0AxPZ7IFHL0sLpWuH9fP3CtO1XmG
-MR5VpwThKq2Is1ALqvGBitQ7ZLwSS38RIjP9vPUIuNcnJem7vI8=
-=UuVH
+klC3txAAibiaCLvlYjy1X/019fpCVVPLL4wfYz73FNX1/jxH4e3msAt3yUp28clX
+PXjvppkGmekXQrcOQoj4B3GkGs0fP39chH+VmMOwgU1sOG1RW9/zM4uk6sjZwBUd
+hv8pF/8laUEmLemVsNh+1B0whBX5J4/6C7RcnQL0qXhoVzTWwcIWfqiAtEN+l6qM
+Ji8uROTbp6kX7QcG5J3R5AgfT8/LLUDN9On1kyGiu9xPQbhLZyTfDYhlvaE/Q5U2
+D2BAAgtEhGRtROoi1eqDhI5ZQuUUtSuc6AjzZ0yVqX0doNQTlWmzM085Ykm+kT13
+VgLOOzYGrJF/uXraweJrMwLeXT/mfKAOLvGa94B3690iE/tE1GA1X/b/6j3fzgMZ
+iozUSdyYt4YVVeIujAH/iobyF7OqnUP8SoSFG5cJadDsNd0CXLXpwnPx25bvYuEN
+Pl4rUC3fFNyeItfHQfL2zGsnvABBb7UIXn4vXxhtlHzb9wzdyfjV6UnGNS5oCz2r
+wMTgXeXg0gb65zOvPkly4Osm6nIYkYFT2Fet2YkoeZFbVC27AqeCc6YjX2OKHevQ
+olDql9WbLrUqxcVkXjHY21TCNpFtEjLK9UsNvQBdaIkhCnbOeyMb8SPGQBthzi1o
+itdr96tMBFtuU2HtzONio8QkTfgzydrnZhFTBgE9foLq62uEuAA=
+=YFRs
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index fd130e21a421..a7f0b6fdfb77 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2022 08:40:01 +0000
+Fri, 09 Sep 2022 14:40:02 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index ad6ea35811ef..a2846cbff01d 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 6ea146476349..4e814801e5d6 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/borgmatic-1.7.1 b/metadata/md5-cache/app-backup/borgmatic-1.7.2
index 13e33261308f..10cdf5caa900 100644
--- a/metadata/md5-cache/app-backup/borgmatic-1.7.1
+++ b/metadata/md5-cache/app-backup/borgmatic-1.7.2
@@ -11,6 +11,6 @@ RDEPEND=app-backup/borgbackup python_single_target_python3_8? ( <dev-python/colo
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.7.1.tar.gz
+SRC_URI=mirror://pypi/b/borgmatic/borgmatic-1.7.2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
 _md5_=172a24f07f87e21209a805b70abe95ff
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 628df86be025..f46f4b8a123a 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/mkp224o-1.5.0 b/metadata/md5-cache/app-crypt/mkp224o-1.5.0
deleted file mode 100644
index 33e29d548b35..000000000000
--- a/metadata/md5-cache/app-crypt/mkp224o-1.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/libsodium:= pcre2? ( dev-libs/libpcre2:= )
-DESCRIPTION=Vanity address generator for v3 Tor hidden service addresses
-EAPI=8
-HOMEPAGE=https://github.com/cathugger/mkp224o
-IUSE=cpu_flags_x86_sse2 pcre2
-KEYWORDS=amd64
-LICENSE=CC0-1.0
-RDEPEND=dev-libs/libsodium:= pcre2? ( dev-libs/libpcre2:= )
-SLOT=0
-SRC_URI=https://github.com/cathugger/mkp224o/releases/download/v1.5.0/mkp224o-1.5.0-src.tar.gz
-_md5_=ff9845b98297cbda02d5941f3b082321
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 121b6982a9ba..bef936ac7a28 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/jq-1.7_pre20201109-r1 b/metadata/md5-cache/app-misc/jq-1.7_pre20201109-r1
new file mode 100644
index 000000000000..c85b5e5144b7
--- /dev/null
+++ b/metadata/md5-cache/app-misc/jq-1.7_pre20201109-r1
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=>=sys-devel/bison-3.0 sys-devel/flex oniguruma? ( >=dev-libs/oniguruma-6.1.3:=[static-libs?] )
+DESCRIPTION=A lightweight and flexible command-line JSON processor
+EAPI=7
+HOMEPAGE=https://stedolan.github.io/jq/
+INHERIT=autotools
+IUSE=+oniguruma static-libs test
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos
+LICENSE=MIT CC-BY-3.0
+RDEPEND=!static-libs? ( oniguruma? ( >=dev-libs/oniguruma-6.1.3[static-libs?] ) )
+REQUIRED_USE=test? ( oniguruma )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/stedolan/jq/archive/a17dd3248a666d01be75f6b16be37e80e20b0954.tar.gz -> jq-1.7_pre20201109.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=03e52aa1188cf2f71b259a07483aa7e9
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index 6c1368a0689f..8b0764da3eb4 100644
--- a/metadata/md5-cache/app-pda/Manifest.gz
+++ b/metadata/md5-cache/app-pda/Manifest.gz
diff --git a/metadata/md5-cache/app-pda/libplist-2.2.0-r3 b/metadata/md5-cache/app-pda/libplist-2.2.0-r3
deleted file mode 100644
index 1f98c20653f2..000000000000
--- a/metadata/md5-cache/app-pda/libplist-2.2.0-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig python? ( >=dev-python/cython-0.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
-DESCRIPTION=Support library to deal with Apple Property Lists (Binary & XML)
-EAPI=7
-HOMEPAGE=https://www.libimobiledevice.org/
-INHERIT=autotools python-r1 toolchain-funcs
-IUSE=python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 ~riscv x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-SLOT=0/2.0-3
-SRC_URI=https://cgit.libimobiledevice.org/libplist.git/snapshot/libplist-2.2.0.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d4bef9307cf0e842073c8b0bdedf2882
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 492d3a07d9c8..e7b86373af57 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/po4a-0.66 b/metadata/md5-cache/app-text/po4a-0.66
index a4ebbd0ae824..c021b961ae10 100644
--- a/metadata/md5-cache/app-text/po4a-0.66
+++ b/metadata/md5-cache/app-text/po4a-0.66
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.66/po4a-0.66.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	plocale	7ce00136a77130df46fbbd5966f98a61	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=51fb1814cbea37b14df797f4f102d994
+_md5_=b6fd889f247e6cc4231649c5b9841532
diff --git a/metadata/md5-cache/app-text/po4a-0.67 b/metadata/md5-cache/app-text/po4a-0.67
index 8e15515d7fc0..54aa249e1304 100644
--- a/metadata/md5-cache/app-text/po4a-0.67
+++ b/metadata/md5-cache/app-text/po4a-0.67
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.67/po4a-0.67.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	plocale	7ce00136a77130df46fbbd5966f98a61	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=26703598b385abddae7002bcc32257c7
+_md5_=6431fd51125c4cc57d0f6450b8f8866d
diff --git a/metadata/md5-cache/app-text/po4a-0.68 b/metadata/md5-cache/app-text/po4a-0.68
new file mode 100644
index 000000000000..5be277ffa0b6
--- /dev/null
+++ b/metadata/md5-cache/app-text/po4a-0.68
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build sys-devel/gettext test? ( app-text/docbook-sgml-dtd:4.1 dev-perl/Test-Pod virtual/latex-base ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/Pod-Parser dev-perl/SGMLSpm dev-perl/Syntax-Keyword-Try dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-lang/perl
+DESCRIPTION=Tools to ease the translation of documentation
+EAPI=8
+HOMEPAGE=https://po4a.org/
+INHERIT=perl-module plocale
+IUSE=test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/Pod-Parser dev-perl/SGMLSpm dev-perl/Syntax-Keyword-Try dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-lang/perl:=
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.68/po4a-0.68.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	plocale	7ce00136a77130df46fbbd5966f98a61	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=6431fd51125c4cc57d0f6450b8f8866d
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 080933a6a9ca..2744ad9647c3 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/libmcpp-2.7.2_p5-r1 b/metadata/md5-cache/dev-cpp/libmcpp-2.7.2_p5-r1
new file mode 100644
index 000000000000..90e7cc457198
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/libmcpp-2.7.2_p5-r1
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=A portable C++ preprocessor
+EAPI=8
+HOMEPAGE=http://mcpp.sourceforge.net
+INHERIT=autotools
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~x86 ~x86-linux ~x64-macos
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://sourceforge/mcpp/mcpp-2.7.2.tar.gz mirror://debian/pool/main/m/mcpp/mcpp_2.7.2-5.debian.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c860c4d1c43a20c64e404a2f77c865d1
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 3b37435ccad7..d5517eff91e8 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/avrdude-6.3-r1 b/metadata/md5-cache/dev-embedded/avrdude-6.3-r1
deleted file mode 100644
index 5aeb7c5bea83..000000000000
--- a/metadata/md5-cache/dev-embedded/avrdude-6.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/libelf virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= )
-DESCRIPTION=AVR Downloader/UploaDEr
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/avrdude
-INHERIT=toolchain-funcs
-IUSE=doc ftdi ncurses readline
-KEYWORDS=amd64 arm ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/libelf virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= )
-SLOT=0
-SRC_URI=mirror://nongnu/avrdude/avrdude-6.3.tar.gz doc? ( mirror://nongnu/avrdude/avrdude-doc-6.3.tar.gz mirror://nongnu/avrdude/avrdude-doc-6.3.pdf )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9d8135f97ff2665411bcffae515f12dc
diff --git a/metadata/md5-cache/dev-embedded/libjaylink-0.3.0 b/metadata/md5-cache/dev-embedded/libjaylink-0.3.1
index 31d2a6788434..077dc4959bc9 100644
--- a/metadata/md5-cache/dev-embedded/libjaylink-0.3.0
+++ b/metadata/md5-cache/dev-embedded/libjaylink-0.3.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=virtual/libusb:1
 SLOT=0
-SRC_URI=https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/0.3.0/libjaylink-0.3.0.tar.bz2
+SRC_URI=https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/0.3.1/libjaylink-0.3.1.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	f3a0a3964e2028a140c181f00eea9712
 _md5_=4723fe643ea7ef67acab4d819ddd1f49
diff --git a/metadata/md5-cache/dev-embedded/picprog-1.9.1 b/metadata/md5-cache/dev-embedded/picprog-1.9.1
index 953f90cd0027..fc14a63c7740 100644
--- a/metadata/md5-cache/dev-embedded/picprog-1.9.1
+++ b/metadata/md5-cache/dev-embedded/picprog-1.9.1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=A PIC16, PIC18 and dsPIC microcontroller programmer software for the serial port
 EAPI=7
-HOMEPAGE=http://www.iki.fi/hyvatti/pic/picprog.html
+HOMEPAGE=http://hyvatti.fi/~jaakko/pic/picprog.html
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 SLOT=0
-SRC_URI=http://www.iki.fi/hyvatti/pic/picprog-1.9.1.tar.gz
+SRC_URI=http://hyvatti.fi/~jaakko/pic/picprog-1.9.1.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d2f45d94d10b75765e0b62d252740097
+_md5_=846b8e4614d299e1ff2cb004b1ad0b5f
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 914fa836ec4e..1ce16ca583dc 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/crystal-1.2.2 b/metadata/md5-cache/dev-lang/crystal-1.2.2
deleted file mode 100644
index 3978b9bfece0..000000000000
--- a/metadata/md5-cache/dev-lang/crystal-1.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install setup test
-DEPEND=dev-libs/boehm-gc[static-libs,threads] dev-libs/gmp:= dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre dev-libs/pcl:= <sys-devel/llvm-14:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) !!sys-devel/llvm:0
-DESCRIPTION=The Crystal Programming Language
-EAPI=7
-HOMEPAGE=https://crystal-lang.org
-INHERIT=bash-completion-r1 llvm multiprocessing toolchain-funcs
-IUSE=doc debug llvm-libunwind
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/boehm-gc[static-libs,threads] dev-libs/gmp:= dev-libs/libatomic_ops dev-libs/libevent dev-libs/libpcre dev-libs/pcl:= <sys-devel/llvm-14:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) dev-libs/libxml2 dev-libs/libyaml
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/crystal/archive/1.2.2.tar.gz -> crystal-1.2.2.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/1.2.2/crystal-1.2.2-1-linux-x86_64.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=15a01a24bdd270aaba855d1d673df3d4
diff --git a/metadata/md5-cache/dev-lang/elixir-1.11.4 b/metadata/md5-cache/dev-lang/elixir-1.11.4
deleted file mode 100644
index 3de60a33d4d9..000000000000
--- a/metadata/md5-cache/dev-lang/elixir-1.11.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/erlang-21:0=[ssl] <dev-lang/erlang-24 test? ( dev-vcs/git )
-DESCRIPTION=Elixir programming language
-EAPI=7
-HOMEPAGE=https://elixir-lang.org
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0 ErlPL-1.1
-RDEPEND=>=dev-lang/erlang-21:0=[ssl] <dev-lang/erlang-24 !!sci-biology/phylip
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.11.4.tar.gz -> elixir-1.11.4.tar.gz
-_md5_=084c6f8ec842a6726fadbda074737461
diff --git a/metadata/md5-cache/dev-lang/elixir-1.11.4-r1 b/metadata/md5-cache/dev-lang/elixir-1.11.4-r1
deleted file mode 100644
index dea727ea9e5d..000000000000
--- a/metadata/md5-cache/dev-lang/elixir-1.11.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/erlang-21:0=[ssl] test? ( dev-vcs/git )
-DESCRIPTION=Elixir programming language
-EAPI=8
-HOMEPAGE=https://elixir-lang.org
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0 ErlPL-1.1
-RDEPEND=>=dev-lang/erlang-21:0=[ssl] !!sci-biology/phylip
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.11.4.tar.gz -> elixir-1.11.4.tar.gz
-_md5_=6ef91a954a821de16e9514ecf77387a2
diff --git a/metadata/md5-cache/dev-lang/erlang-23.3.4.12-r1 b/metadata/md5-cache/dev-lang/erlang-23.3.4.12-r1
deleted file mode 100644
index f0bce9756ca9..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-23.3.4.12-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=7
-HOMEPAGE=https://www.erlang.org/
-INHERIT=elisp-common java-pkg-opt-2 systemd wxwidgets
-IUSE=doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets java
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/23.3.4.12
-SRC_URI=https://github.com/erlang/otp/archive/OTP-23.3.4.12.tar.gz -> erlang-23.3.4.12.tar.gz http://erlang.org/download/otp_doc_man_23.3.tar.gz -> erlang_doc_man_23.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.3.tar.gz -> erlang_doc_html_23.3.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
-_md5_=346a0ef3a9fd2664e524533b3141624e
diff --git a/metadata/md5-cache/dev-lang/erlang-23.3.4.15 b/metadata/md5-cache/dev-lang/erlang-23.3.4.15
deleted file mode 100644
index a344f38b559d..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-23.3.4.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=7
-HOMEPAGE=https://www.erlang.org/
-INHERIT=elisp-common java-pkg-opt-2 systemd wxwidgets
-IUSE=doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets java
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/23.3.4.15
-SRC_URI=https://github.com/erlang/otp/archive/OTP-23.3.4.15.tar.gz -> erlang-23.3.4.15.tar.gz http://erlang.org/download/otp_doc_man_23.3.tar.gz -> erlang_doc_man_23.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.3.tar.gz -> erlang_doc_html_23.3.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
-_md5_=d967748078d0d8fbe0e15f021d48a769
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index f5d5f29475f7..46465484c17f 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/boost-1.80.0 b/metadata/md5-cache/dev-libs/boost-1.80.0
index 3dccb48aefcc..943dc582e77f 100644
--- a/metadata/md5-cache/dev-libs/boost-1.80.0
+++ b/metadata/md5-cache/dev-libs/boost-1.80.0
@@ -6,6 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.boost.org/
 INHERIT=flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
 IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=Boost-1.0
 RDEPEND=!<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
@@ -13,4 +14,4 @@ RESTRICT=test
 SLOT=0/1.80.0
 SRC_URI=https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c717cce7917ad2c661c7f60713fdae7b
+_md5_=a3641c73083f4f199efe79654fce3f46
diff --git a/metadata/md5-cache/dev-libs/ell-0.53 b/metadata/md5-cache/dev-libs/ell-0.53
new file mode 100644
index 000000000000..65afdee810c4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ell-0.53
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=test? ( sys-apps/dbus )
+DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
+EAPI=7
+HOMEPAGE=https://01.org/ell
+INHERIT=flag-o-matic linux-info
+IUSE=pie test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.53.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=f7c4bf479b2ab1941c0eaedaa4b1925b
diff --git a/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r1 b/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r1
index f3c5aca000a1..c1506a185178 100644
--- a/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r1
+++ b/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/
 INHERIT=linux-mod multilib-minimal
 IUSE=static-libs +tools cxx python test dist-kernel 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 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.6.3.tar.xz
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	6ff232574f0bcad33767903505553e8d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c1abee0a2d5e31a337346aa051d64223
+_md5_=515f89aa2beea155a0b30a1f364fb9fd
diff --git a/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r4 b/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r4
index 0fed13264cb8..89f870487321 100644
--- a/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r4
+++ b/metadata/md5-cache/dev-libs/libgpiod-1.6.3-r4
@@ -1,4 +1,5 @@
 DEFINED_PHASES=configure install setup
+DEPEND=test? ( >=dev-libs/glib-2.50 >=sys-apps/kmod-18 >=sys-apps/util-linux-2.33.1 >=virtual/libudev-215 )
 DESCRIPTION=C library and tools for interacting with the linux GPIO character device
 EAPI=8
 HOMEPAGE=https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/
@@ -10,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.6.3.tar.xz
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8593a2692b578ec6c0b18ebaed6ddf04
+_md5_=bd899a29dd3cddb655e6f1d92824f88c
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.20.7 b/metadata/md5-cache/dev-libs/tree-sitter-0.20.7
new file mode 100644
index 000000000000..d05eb28ac375
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/tree-sitter-0.20.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing library
+EAPI=8
+HOMEPAGE=https://github.com/tree-sitter/tree-sitter
+INHERIT=optfeature toolchain-funcs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.20.7.tar.gz -> tree-sitter-0.20.7.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4bd87831ec3ae02a309c703bf7a06154
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.1 b/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.1
deleted file mode 100644
index dc4a24c2e8be..000000000000
--- a/metadata/md5-cache/dev-libs/tree-sitter-c-0.20.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/tree-sitter
-DESCRIPTION=C grammar for Tree-sitter
-EAPI=8
-HOMEPAGE=https://github.com/tree-sitter/tree-sitter-c
-INHERIT=tree-sitter-grammar
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.1.tar.gz -> tree-sitter-c-0.20.1.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	tree-sitter-grammar	7ea5209555eb31addcb41eeacff59fec
-_md5_=91765889d4c1c28d6adfbcbf22b14031
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-python-0.19.1_p20211112 b/metadata/md5-cache/dev-libs/tree-sitter-python-0.19.1_p20211112
deleted file mode 100644
index 63666123419a..000000000000
--- a/metadata/md5-cache/dev-libs/tree-sitter-python-0.19.1_p20211112
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/tree-sitter
-DESCRIPTION=Python grammar for Tree-sitter
-EAPI=8
-HOMEPAGE=https://github.com/tree-sitter/tree-sitter-python
-INHERIT=tree-sitter-grammar
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/tree-sitter/tree-sitter-python/archive/24b530ca158d2782ea9046e756057a412e16b52f.tar.gz -> tree-sitter-python-0.19.1_p20211112.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	tree-sitter-grammar	7ea5209555eb31addcb41eeacff59fec
-_md5_=fb3ac12191efe4abd703775f8c1f0ac4
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.0
deleted file mode 100644
index 48ff5d20217e..000000000000
--- a/metadata/md5-cache/dev-libs/tree-sitter-rust-0.20.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/tree-sitter
-DESCRIPTION=Rust grammar for Tree-sitter
-EAPI=8
-HOMEPAGE=https://github.com/tree-sitter/tree-sitter-rust
-INHERIT=tree-sitter-grammar
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/tree-sitter/tree-sitter-rust/archive/v0.20.0.tar.gz -> tree-sitter-rust-0.20.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	tree-sitter-grammar	7ea5209555eb31addcb41eeacff59fec
-_md5_=82d5fa6c84a7dda48945e002e62baff3
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.0 b/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.0
deleted file mode 100644
index 0f949b3adefb..000000000000
--- a/metadata/md5-cache/dev-libs/tree-sitter-typescript-0.20.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/tree-sitter
-DESCRIPTION=TypeScript grammar for Tree-sitter
-EAPI=8
-HOMEPAGE=https://github.com/tree-sitter/tree-sitter-typescript
-INHERIT=tree-sitter-grammar
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/tree-sitter/tree-sitter-typescript/archive/rust-0.20.0.tar.gz -> tree-sitter-typescript-0.20.0.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	tree-sitter-grammar	7ea5209555eb31addcb41eeacff59fec
-_md5_=3092ddc7cc0a81982e4c21a2256f5daf
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 9f7afdb0bf54..5c934b688a86 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/lambda-term-3.1.0 b/metadata/md5-cache/dev-ml/lambda-term-3.1.0
index c47ae9ea932a..b27dc0044ab9 100644
--- a/metadata/md5-cache/dev-ml/lambda-term-3.1.0
+++ b/metadata/md5-cache/dev-ml/lambda-term-3.1.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/camomile:= dev-ml/lwt:= dev-ml/lwt_log:= dev-ml/mew_vi:= dev-ml/react:= dev-ml/zed:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/camomile:= >=dev-ml/lwt-5.4:= dev-ml/lwt_log:= dev-ml/mew_vi:= dev-ml/react:= dev-ml/zed:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Terminal manipulation library for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-community/lambda-term
@@ -8,8 +8,8 @@ INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-ml/camomile:= dev-ml/lwt:= dev-ml/lwt_log:= dev-ml/mew_vi:= dev-ml/react:= dev-ml/zed:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/camomile:= >=dev-ml/lwt-5.4:= dev-ml/lwt_log:= dev-ml/mew_vi:= dev-ml/react:= dev-ml/zed:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/3.1.0
 SRC_URI=https://github.com/ocaml-community/lambda-term/archive/3.1.0.tar.gz -> lambda-term-3.1.0.tar.gz
 _eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=79465c392ef7a2aaa6839a70b74e78e9
+_md5_=9054264d270d22bdfde5de80bbb23c4e
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 1b8f1682efa3..0629fffbc1dd 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/b2-4.9.2 b/metadata/md5-cache/dev-util/b2-4.9.2
index afc78a7160ea..736b90962382 100644
--- a/metadata/md5-cache/dev-util/b2-4.9.2
+++ b/metadata/md5-cache/dev-util/b2-4.9.2
@@ -4,10 +4,11 @@ EAPI=8
 HOMEPAGE=https://www.bfgroup.xyz/b2/
 INHERIT=edo flag-o-matic toolchain-funcs
 IUSE=examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Boost-1.0
 RDEPEND=!dev-util/boost-build
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bfgroup/b2/archive/refs/tags/4.9.2.tar.gz -> b2-4.9.2.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=352634f111500da66223eb77b32bf6a5
+_md5_=630e921473517652c2eaa7e1e15e704e
diff --git a/metadata/md5-cache/dev-util/rebar-3.18.0-r1 b/metadata/md5-cache/dev-util/rebar-3.18.0-r1
deleted file mode 100644
index f90f12ba62c4..000000000000
--- a/metadata/md5-cache/dev-util/rebar-3.18.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=dev-lang/erlang[ssl] !dev-util/rebar-bin
-DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
-EAPI=8
-HOMEPAGE=https://www.rebar3.org https://github.com/erlang/rebar3
-INHERIT=bash-completion-r1
-IUSE=test
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 sparc x86
-LICENSE=Apache-2.0 MIT BSD
-RDEPEND=dev-lang/erlang[ssl] !dev-util/rebar-bin
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=https://github.com/erlang/rebar3/archive/refs/tags/3.18.0.tar.gz -> rebar-3.18.0.tar.gz https://repo.hex.pm/tarballs/bbmustache-1.12.2.tar https://repo.hex.pm/tarballs/certifi-2.8.0.tar https://repo.hex.pm/tarballs/cf-0.3.1.tar https://repo.hex.pm/tarballs/cth_readable-1.5.1.tar https://repo.hex.pm/tarballs/erlware_commons-1.5.0.tar https://repo.hex.pm/tarballs/eunit_formatters-0.5.0.tar https://repo.hex.pm/tarballs/getopt-1.0.1.tar https://repo.hex.pm/tarballs/providers-1.9.0.tar https://repo.hex.pm/tarballs/relx-4.6.0.tar https://repo.hex.pm/tarballs/ssl_verify_fun-1.1.6.tar test? ( https://repo.hex.pm/tarballs/meck-0.8.13.tar )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=604ef7b644dba55e82b5bc942b00a242
diff --git a/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7 b/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7
new file mode 100644
index 000000000000..0b37f14f895a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/tree-sitter-cli-0.20.7
@@ -0,0 +1,15 @@
+BDEPEND=~dev-libs/tree-sitter-0.20.7 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Command-line tool for creating and testing tree-sitter grammars
+EAPI=8
+HOMEPAGE=https://github.com/tree-sitter/tree-sitter
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 CC0-1.0 ISC MIT
+RDEPEND=~dev-libs/tree-sitter-0.20.7
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.20.7.tar.gz -> tree-sitter-0.20.7.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.15/download -> aho-corasick-0.7.15.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.40/download -> anyhow-1.0.40.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/ascii/1.0.0/download -> ascii-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.0.1/download -> autocfg-1.0.1.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.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.11/download -> blake2b_simd-0.5.11.crate https://crates.io/api/v1/crates/bumpalo/3.6.1/download -> bumpalo-3.6.1.crate https://crates.io/api/v1/crates/cc/1.0.67/download -> cc-1.0.67.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.0/download -> chunked_transfer-1.4.0.crate https://crates.io/api/v1/crates/clap/2.33.3/download -> clap-2.33.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.3/download -> crossbeam-utils-0.8.3.crate https://crates.io/api/v1/crates/ctor/0.1.20/download -> ctor-0.1.20.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/dirs/3.0.1/download -> dirs-3.0.1.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.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/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.2/download -> getrandom-0.2.2.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.18/download -> hermit-abi-0.1.18.crate https://crates.io/api/v1/crates/html-escape/0.2.6/download -> html-escape-0.2.6.crate https://crates.io/api/v1/crates/idna/0.2.2/download -> idna-0.2.2.crate https://crates.io/api/v1/crates/indexmap/1.6.1/download -> indexmap-1.6.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/js-sys/0.3.48/download -> js-sys-0.3.48.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.86/download -> libc-0.2.86.crate https://crates.io/api/v1/crates/libloading/0.7.0/download -> libloading-0.7.0.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.4/download -> memchr-2.3.4.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.7.0/download -> once_cell-1.7.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.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/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/pretty_assertions/0.7.2/download -> pretty_assertions-0.7.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.24/download -> proc-macro2-1.0.24.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.3/download -> rand-0.8.3.crate https://crates.io/api/v1/crates/rand_chacha/0.3.0/download -> rand_chacha-0.3.0.crate https://crates.io/api/v1/crates/rand_core/0.6.2/download -> rand_core-0.6.2.crate https://crates.io/api/v1/crates/rand_hc/0.3.0/download -> rand_hc-0.3.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.5/download -> redox_syscall-0.2.5.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/regex/1.4.3/download -> regex-1.4.3.crate https://crates.io/api/v1/crates/regex-syntax/0.6.22/download -> regex-syntax-0.6.22.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-argon2/0.8.3/download -> rust-argon2-0.8.3.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/semver/1.0.5/download -> semver-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.130/download -> serde-1.0.130.crate https://crates.io/api/v1/crates/serde_derive/1.0.130/download -> serde_derive-1.0.130.crate https://crates.io/api/v1/crates/serde_json/1.0.63/download -> serde_json-1.0.63.crate https://crates.io/api/v1/crates/smallbitvec/2.5.1/download -> smallbitvec-2.5.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.67/download -> syn-1.0.67.crate https://crates.io/api/v1/crates/tempfile/3.2.0/download -> tempfile-3.2.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.25/download -> thiserror-1.0.25.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.25/download -> thiserror-impl-1.0.25.crate https://crates.io/api/v1/crates/thread_local/1.1.3/download -> thread_local-1.1.3.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tiny_http/0.8.0/download -> tiny_http-0.8.0.crate https://crates.io/api/v1/crates/tinyvec/1.1.1/download -> tinyvec-1.1.1.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.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download -> unicode-normalization-0.1.17.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.2.1/download -> url-2.2.1.crate https://crates.io/api/v1/crates/utf8-width/0.1.4/download -> utf8-width-0.1.4.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.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.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.71/download -> wasm-bindgen-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.71/download -> wasm-bindgen-backend-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.71/download -> wasm-bindgen-macro-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.71/download -> wasm-bindgen-macro-support-0.2.71.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.71/download -> wasm-bindgen-shared-0.2.71.crate https://crates.io/api/v1/crates/web-sys/0.3.48/download -> web-sys-0.3.48.crate https://crates.io/api/v1/crates/webbrowser/0.5.5/download -> webbrowser-0.5.5.crate https://crates.io/api/v1/crates/which/4.1.0/download -> which-4.1.0.crate https://crates.io/api/v1/crates/widestring/0.4.3/download -> widestring-0.4.3.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=18b89d8a246dd441b75059c3f3ae1874
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index e3338f60adca..63dc79f4ee3d 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/stagit-1.1 b/metadata/md5-cache/dev-vcs/stagit-1.1
deleted file mode 100644
index e9b087caf518..000000000000
--- a/metadata/md5-cache/dev-vcs/stagit-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install
-DEPEND=dev-libs/libgit2:=
-DESCRIPTION=Generates static HTML pages for a Git repository
-EAPI=8
-HOMEPAGE=https://codemadness.org/stagit.html
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-libs/libgit2:=
-SLOT=0
-SRC_URI=https://codemadness.org/releases/stagit/stagit-1.1.tar.gz
-_md5_=dcb16d09ba82c4eb5adec21e513151f2
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 8e5b9812b5d5..5f7c78ce1227 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r2 b/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r2
deleted file mode 100644
index 91aafc204067..000000000000
--- a/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=cpu_flags_x86_sse? ( dev-lang/nasm ) virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libpng:0= media-libs/libsdl2:0=[joystick,opengl,video] sys-libs/zlib:0=[minizip] gles2-only? ( media-libs/libsdl2:0[gles2] ) lirc? ( app-misc/lirc:0 ) opencv? ( media-libs/opencv:= ) osd? ( media-fonts/dejavu media-libs/freetype:2= virtual/opengl:0= virtual/glu:0= )
-DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, core library
-EAPI=7
-HOMEPAGE=https://www.mupen64plus.org/
-INHERIT=toolchain-funcs
-IUSE=debugger gles2-only lirc new-dynarec opencv +osd cpu_flags_x86_sse
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/libpng:0= media-libs/libsdl2:0=[joystick,opengl,video] sys-libs/zlib:0=[minizip] gles2-only? ( media-libs/libsdl2:0[gles2] ) lirc? ( app-misc/lirc:0 ) opencv? ( media-libs/opencv:= ) osd? ( media-fonts/dejavu media-libs/freetype:2= virtual/opengl:0= virtual/glu:0= )
-REQUIRED_USE=gles2-only? ( !osd )
-SLOT=0/2-sdl2
-SRC_URI=https://github.com/mupen64plus/mupen64plus-core/releases/download/2.5.9/mupen64plus-core-src-2.5.9.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d99c06c3c393f408c64a45d862e65f9d
diff --git a/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r3 b/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r3
new file mode 100644
index 000000000000..5413a6112742
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/mupen64plus-core-2.5.9-r3
@@ -0,0 +1,16 @@
+BDEPEND=cpu_flags_x86_sse? ( dev-lang/nasm ) virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libpng:= media-libs/libsdl2[joystick,opengl,video] sys-libs/zlib[minizip] gles2-only? ( media-libs/libsdl2[gles2] ) lirc? ( app-misc/lirc ) opencv? ( media-libs/opencv:= ) osd? ( media-fonts/dejavu media-libs/freetype:2 virtual/opengl virtual/glu )
+DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, core library
+EAPI=8
+HOMEPAGE=https://www.mupen64plus.org/
+INHERIT=toolchain-funcs
+IUSE=debugger gles2-only lirc new-dynarec opencv +osd cpu_flags_x86_sse
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libpng:= media-libs/libsdl2[joystick,opengl,video] sys-libs/zlib[minizip] gles2-only? ( media-libs/libsdl2[gles2] ) lirc? ( app-misc/lirc ) opencv? ( media-libs/opencv:= ) osd? ( media-fonts/dejavu media-libs/freetype:2 virtual/opengl virtual/glu )
+REQUIRED_USE=gles2-only? ( !osd )
+SLOT=0/2-sdl2
+SRC_URI=https://github.com/mupen64plus/mupen64plus-core/releases/download/2.5.9/mupen64plus-core-src-2.5.9.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=77a069ba03247d1f9463fc0f223cbe56
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 2c14aaef8c49..d0301a4dbab2 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/thunderbird-102.2.1 b/metadata/md5-cache/mail-client/thunderbird-102.2.1
deleted file mode 100644
index cbba958c45e4..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-102.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig virtual/rust || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp ) dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Thunderbird Mail Client
-EAPI=8
-HOMEPAGE=https://www.thunderbird.net/
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi +system-librnp l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp ) dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) )
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/source/thunderbird-102.2.1.source.tar.xz -> thunderbird-102.2.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/af.xpi -> thunderbird-102.2.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/ar.xpi -> thunderbird-102.2.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/ast.xpi -> thunderbird-102.2.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/be.xpi -> thunderbird-102.2.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/bg.xpi -> thunderbird-102.2.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/br.xpi -> thunderbird-102.2.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/ca.xpi -> thunderbird-102.2.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/cak.xpi -> thunderbird-102.2.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/cs.xpi -> thunderbird-102.2.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/cy.xpi -> thunderbird-102.2.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/da.xpi -> thunderbird-102.2.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/de.xpi -> thunderbird-102.2.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.2.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/el.xpi -> thunderbird-102.2.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.2.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.2.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.2.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.2.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.2.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/et.xpi -> thunderbird-102.2.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/eu.xpi -> thunderbird-102.2.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/fi.xpi -> thunderbird-102.2.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/fr.xpi -> thunderbird-102.2.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.2.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.2.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/gd.xpi -> thunderbird-102.2.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/gl.xpi -> thunderbird-102.2.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/he.xpi -> thunderbird-102.2.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/hr.xpi -> thunderbird-102.2.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.2.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/hu.xpi -> thunderbird-102.2.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/id.xpi -> thunderbird-102.2.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/is.xpi -> thunderbird-102.2.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/it.xpi -> thunderbird-102.2.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/ja.xpi -> thunderbird-102.2.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/ka.xpi -> thunderbird-102.2.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/kab.xpi -> thunderbird-102.2.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/kk.xpi -> thunderbird-102.2.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/ko.xpi -> thunderbird-102.2.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/lt.xpi -> thunderbird-102.2.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/lv.xpi -> thunderbird-102.2.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/ms.xpi -> thunderbird-102.2.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.2.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/nl.xpi -> thunderbird-102.2.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.2.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.2.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/pl.xpi -> thunderbird-102.2.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.2.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.2.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/rm.xpi -> thunderbird-102.2.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/ro.xpi -> thunderbird-102.2.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/ru.xpi -> thunderbird-102.2.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/sk.xpi -> thunderbird-102.2.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/sl.xpi -> thunderbird-102.2.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/sq.xpi -> thunderbird-102.2.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/sr.xpi -> thunderbird-102.2.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.2.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/th.xpi -> thunderbird-102.2.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/tr.xpi -> thunderbird-102.2.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/uk.xpi -> thunderbird-102.2.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/uz.xpi -> thunderbird-102.2.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/vi.xpi -> thunderbird-102.2.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.2.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.1/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.2.1-zh-TW.xpi )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2823784d49ab4db4e9b322b6eba38df7
diff --git a/metadata/md5-cache/mail-client/thunderbird-102.2.2 b/metadata/md5-cache/mail-client/thunderbird-102.2.2
index af27bc6a5386..0485703ebd98 100644
--- a/metadata/md5-cache/mail-client/thunderbird-102.2.2
+++ b/metadata/md5-cache/mail-client/thunderbird-102.2.2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig virtual/rust || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig virtual/rust || ( ( sys-devel/clang:15 sys-devel/llvm:15 clang? ( =sys-devel/lld-15* pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] ) ) ) ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
 DEPEND=!<x11-plugins/enigmail-2.2 selinux? ( sec-policy/selinux-thunderbird ) !system-librnp? ( dev-libs/jsoncpp ) system-librnp? ( dev-util/librnp ) dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) !!sys-devel/llvm:0
 DESCRIPTION=Thunderbird Mail Client
@@ -13,4 +13,4 @@ REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/source/thunderbird-102.2.2.source.tar.xz -> thunderbird-102.2.2.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/af.xpi -> thunderbird-102.2.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/ar.xpi -> thunderbird-102.2.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/ast.xpi -> thunderbird-102.2.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/be.xpi -> thunderbird-102.2.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/bg.xpi -> thunderbird-102.2.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/br.xpi -> thunderbird-102.2.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/ca.xpi -> thunderbird-102.2.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/cak.xpi -> thunderbird-102.2.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/cs.xpi -> thunderbird-102.2.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/cy.xpi -> thunderbird-102.2.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/da.xpi -> thunderbird-102.2.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/de.xpi -> thunderbird-102.2.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.2.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/el.xpi -> thunderbird-102.2.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.2.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.2.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.2.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.2.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.2.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/et.xpi -> thunderbird-102.2.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/eu.xpi -> thunderbird-102.2.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/fi.xpi -> thunderbird-102.2.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/fr.xpi -> thunderbird-102.2.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.2.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.2.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/gd.xpi -> thunderbird-102.2.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/gl.xpi -> thunderbird-102.2.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/he.xpi -> thunderbird-102.2.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/hr.xpi -> thunderbird-102.2.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.2.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/hu.xpi -> thunderbird-102.2.2-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/id.xpi -> thunderbird-102.2.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/is.xpi -> thunderbird-102.2.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/it.xpi -> thunderbird-102.2.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/ja.xpi -> thunderbird-102.2.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/ka.xpi -> thunderbird-102.2.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/kab.xpi -> thunderbird-102.2.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/kk.xpi -> thunderbird-102.2.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/ko.xpi -> thunderbird-102.2.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/lt.xpi -> thunderbird-102.2.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/lv.xpi -> thunderbird-102.2.2-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/ms.xpi -> thunderbird-102.2.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.2.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/nl.xpi -> thunderbird-102.2.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.2.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.2.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/pl.xpi -> thunderbird-102.2.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.2.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.2.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/rm.xpi -> thunderbird-102.2.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/ro.xpi -> thunderbird-102.2.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/ru.xpi -> thunderbird-102.2.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/sk.xpi -> thunderbird-102.2.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/sl.xpi -> thunderbird-102.2.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/sq.xpi -> thunderbird-102.2.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/sr.xpi -> thunderbird-102.2.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.2.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/th.xpi -> thunderbird-102.2.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/tr.xpi -> thunderbird-102.2.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/uk.xpi -> thunderbird-102.2.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/uz.xpi -> thunderbird-102.2.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/vi.xpi -> thunderbird-102.2.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.2.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.2.2/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.2.2-zh-TW.xpi )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2823784d49ab4db4e9b322b6eba38df7
+_md5_=552779d0b301c58666dc251292859c47
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 6233dfa68cbc..5289f8115e39 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/gofont-mono-2.010 b/metadata/md5-cache/media-fonts/gofont-mono-2.010
new file mode 100644
index 000000000000..6e688069309a
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/gofont-mono-2.010
@@ -0,0 +1,13 @@
+BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=install postinst postrm setup
+DESCRIPTION=Monospace typeface created for the Go programming language
+EAPI=8
+HOMEPAGE=https://go.dev/blog/go-fonts
+INHERIT=font
+IUSE=X
+KEYWORDS=~amd64 ~loong
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~matthew/distfiles/gofont-mono-2.010.tar.xz
+_eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
+_md5_=242b3574b7f6c2d801372bdeca46e886
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index ce58696ab12d..9890adb3fc03 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/solvespace-3.0-r2 b/metadata/md5-cache/media-gfx/solvespace-3.0-r2
deleted file mode 100644
index efc0039f2d04..000000000000
--- a/metadata/md5-cache/media-gfx/solvespace-3.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=dev-cpp/atkmm:0 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0[X] dev-cpp/pangomm:1.4 dev-libs/glib:2 dev-libs/json-c:= dev-libs/libsigc++:2 dev-libs/libspnav[X] dev-libs/mimalloc:= media-libs/fontconfig media-libs/freetype:2[X] media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X]
-DESCRIPTION=Parametric 2d/3d CAD
-EAPI=8
-HOMEPAGE=http://solvespace.com
-INHERIT=cmake toolchain-funcs xdg
-IUSE=openmp
-KEYWORDS=amd64 ~x86
-LICENSE=BitstreamVera GPL-2+ GPL-3+
-RDEPEND=dev-cpp/atkmm:0 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0[X] dev-cpp/pangomm:1.4 dev-libs/glib:2 dev-libs/json-c:= dev-libs/libsigc++:2 dev-libs/libspnav[X] dev-libs/mimalloc:= media-libs/fontconfig media-libs/freetype:2[X] media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X]
-SLOT=0
-SRC_URI=https://github.com/solvespace/solvespace/archive/v3.0.tar.gz -> solvespace-3.0.tar.gz https://github.com/solvespace/libdxfrw/archive/0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz -> libdxfrw-0.6.3-0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=41d12617355a69966d9875509fd5c671
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index d017072a2a65..8ef182d1665d 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/mu-1.8.5 b/metadata/md5-cache/net-mail/mu-1.8.5
deleted file mode 100644
index 5a579cf3a2e4..000000000000
--- a/metadata/md5-cache/net-mail/mu-1.8.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=8
-HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
-INHERIT=elisp-common meson
-IUSE=emacs readline
-KEYWORDS=amd64 arm arm64 x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/releases/download/v1.8.5/mu-1.8.5.tar.xz
-_eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fc0d9b1662fe8ff6d1790cd8e61b9de0
diff --git a/metadata/md5-cache/net-mail/mu-1.8.6 b/metadata/md5-cache/net-mail/mu-1.8.6
deleted file mode 100644
index ab6b64d7d612..000000000000
--- a/metadata/md5-cache/net-mail/mu-1.8.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=8
-HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
-INHERIT=elisp-common meson
-IUSE=emacs readline
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/releases/download/v1.8.6/mu-1.8.6.tar.xz
-_eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=dfa9e0c06815205ff73c0f186524599c
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 1e4f26a29d7e..42a35ade4da5 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/xmrig-6.16.4 b/metadata/md5-cache/net-misc/xmrig-6.16.4
deleted file mode 100644
index 424bcf620b94..000000000000
--- a/metadata/md5-cache/net-misc/xmrig-6.16.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= )
-DESCRIPTION=RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner
-EAPI=7
-HOMEPAGE=https://xmrig.com https://github.com/xmrig/xmrig
-INHERIT=cmake systemd
-IUSE=cpu_flags_x86_sse4_1 donate hwloc opencl +ssl
-KEYWORDS=amd64 arm64
-LICENSE=Apache-2.0 GPL-3+ MIT
-RDEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= ) !arm64? ( sys-apps/msr-tools )
-SLOT=0
-SRC_URI=https://github.com/xmrig/xmrig/archive/v6.16.4.tar.gz -> xmrig-6.16.4.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bea75ef8be7bf4f73106a0f3572ebf98
diff --git a/metadata/md5-cache/net-misc/xmrig-6.17.0 b/metadata/md5-cache/net-misc/xmrig-6.17.0
deleted file mode 100644
index 56886bb97704..000000000000
--- a/metadata/md5-cache/net-misc/xmrig-6.17.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= )
-DESCRIPTION=RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner
-EAPI=7
-HOMEPAGE=https://xmrig.com https://github.com/xmrig/xmrig
-INHERIT=cmake systemd
-IUSE=cpu_flags_x86_sse4_1 donate hwloc opencl +ssl
-KEYWORDS=amd64 arm64
-LICENSE=Apache-2.0 GPL-3+ MIT
-RDEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= ) !arm64? ( sys-apps/msr-tools )
-SLOT=0
-SRC_URI=https://github.com/xmrig/xmrig/archive/v6.17.0.tar.gz -> xmrig-6.17.0.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bea75ef8be7bf4f73106a0f3572ebf98
diff --git a/metadata/md5-cache/net-misc/zerotier-1.10.1 b/metadata/md5-cache/net-misc/zerotier-1.10.1
new file mode 100644
index 000000000000..091499acbba6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/zerotier-1.10.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/json-glib net-libs/libnatpmp >=net-libs/miniupnpc-2:=
+DESCRIPTION=A software-based managed Ethernet switch for planet Earth
+EAPI=8
+HOMEPAGE=https://www.zerotier.com/
+INHERIT=flag-o-matic systemd toolchain-funcs
+IUSE=cpu_flags_arm_neon
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSL-1.1
+RDEPEND=dev-libs/json-glib net-libs/libnatpmp >=net-libs/miniupnpc-2:=
+SLOT=0
+SRC_URI=https://github.com/zerotier/ZeroTierOne/archive/1.10.1.tar.gz -> zerotier-1.10.1.tar.gz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c5b69560487527e0a2c34f4d045714dc
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 5289082f2ccd..eaa9504d4ae0 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-8.1.0 b/metadata/md5-cache/net-proxy/mitmproxy-8.1.0
deleted file mode 100644
index aa6aa780e19d..000000000000
--- a/metadata/md5-cache/net-proxy/mitmproxy-8.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/click-7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/parver-0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-asyncio-0.17.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-arch/brotli-1.0.0[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-37.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=www-servers/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An interactive, SSL-capable, man-in-the-middle HTTP proxy
-EAPI=8
-HOMEPAGE=https://mitmproxy.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=app-arch/brotli-1.0.0[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/asgiref-3.2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/certifi-2015.11.20.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-37.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flask-1.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/h2-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperframe-6.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/kaitaistruct-0.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ldap3-2.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/passlib-1.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.14.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/publicsuffix-2.20190205[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urwid-2.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wsproto-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zstandard-0.11.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/openssl:0 >=www-servers/tornado-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v8.1.0.tar.gz -> mitmproxy-8.1.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=856bd44722d2034466ad188dafaf2e5f
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 4862bed5f953..713f35767612 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/iwd-1.30 b/metadata/md5-cache/net-wireless/iwd-1.30
new file mode 100644
index 000000000000..c35286392da0
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/iwd-1.30
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.53
+DESCRIPTION=Wireless daemon for linux
+EAPI=7
+HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
+INHERIT=flag-o-matic linux-info systemd
+IUSE=+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +crda +monitor ofono standalone systemd wired
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.53 acct-group/netdev net-wireless/wireless-regdb crda? ( net-wireless/crda ) standalone? ( systemd? ( sys-apps/systemd ) !systemd? ( virtual/resolvconf ) )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.30.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=38f09f81827c1aca56d7228a60783aa1
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 2f43948ebbb2..f9bd3913fe25 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.36 b/metadata/md5-cache/sys-apps/portage-3.0.36
new file mode 100644
index 000000000000..ffd35dc0f3a7
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-3.0.36
@@ -0,0 +1,18 @@
+BDEPEND=app-arch/xz-utils test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[bzip2(+),threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-epytext[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=The package management and distribution system for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+INHERIT=distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 >=sys-apps/file-5.41 >=sys-apps/coreutils-6.4 )
+RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[bzip2(+),threads(+)] )
+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://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.36.tar.bz2
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6c07f27909150a45e897f0a73f535fd7
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 8b2ead798da6..36ec304c6b7a 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/ucx-1.13.0 b/metadata/md5-cache/sys-cluster/ucx-1.13.0
index 5d14631d357e..2b43eee84270 100644
--- a/metadata/md5-cache/sys-cluster/ucx-1.13.0
+++ b/metadata/md5-cache/sys-cluster/ucx-1.13.0
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/binutils-libs:= numa? ( sys-process/numactl )
 SLOT=0
 SRC_URI=https://github.com/openucx/ucx/archive/v1.13.0.tar.gz -> ucx-1.13.0.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6fc82cde266dab7be2ef2362c341f7f4
+_md5_=00c154a1a1bf419b8f61b7f8c8f13194
diff --git a/metadata/md5-cache/sys-cluster/ucx-1.13.1 b/metadata/md5-cache/sys-cluster/ucx-1.13.1
new file mode 100644
index 000000000000..6d0db2e6f79a
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ucx-1.13.1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure prepare pretend setup
+DEPEND=sys-libs/binutils-libs:= numa? ( sys-process/numactl )
+DESCRIPTION=Unified Communication X
+EAPI=8
+HOMEPAGE=https://www.openucx.org
+INHERIT=autotools toolchain-funcs
+IUSE=+numa +openmp
+KEYWORDS=~amd64 -riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=sys-libs/binutils-libs:= numa? ( sys-process/numactl )
+SLOT=0
+SRC_URI=https://github.com/openucx/ucx/releases/download/v1.13.1/ucx-1.13.1.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d6b8b93fa9b86051628aec166c70f0a8
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 1763dfc6f25f..1ebec997abc0 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/mold-1.3.1 b/metadata/md5-cache/sys-devel/mold-1.3.1
deleted file mode 100644
index 683955cc16bf..000000000000
--- a/metadata/md5-cache/sys-devel/mold-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare pretend test
-DEPEND=>=dev-cpp/tbb-2021.4.0:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
-DESCRIPTION=A Modern Linker
-EAPI=8
-HOMEPAGE=https://github.com/rui314/mold
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~riscv
-LICENSE=AGPL-3
-RDEPEND=>=dev-cpp/tbb-2021.4.0:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
-SLOT=0
-SRC_URI=https://github.com/rui314/mold/archive/refs/tags/v1.3.1.tar.gz -> mold-1.3.1.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6b495f0b3e9af0e2f9a6b007dcce9265
diff --git a/metadata/md5-cache/sys-devel/mold-1.3.1-r1 b/metadata/md5-cache/sys-devel/mold-1.3.1-r1
deleted file mode 100644
index 07360027fcd7..000000000000
--- a/metadata/md5-cache/sys-devel/mold-1.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare pretend test
-DEPEND=>=dev-cpp/tbb-2021.4.0:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
-DESCRIPTION=A Modern Linker
-EAPI=8
-HOMEPAGE=https://github.com/rui314/mold
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~riscv
-LICENSE=AGPL-3
-RDEPEND=>=dev-cpp/tbb-2021.4.0:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
-SLOT=0
-SRC_URI=https://github.com/rui314/mold/archive/refs/tags/v1.3.1.tar.gz -> mold-1.3.1.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=51de55121de4f173045eb32b33f20db4
diff --git a/metadata/md5-cache/sys-devel/mold-1.4.0 b/metadata/md5-cache/sys-devel/mold-1.4.0
deleted file mode 100644
index 8464beda92db..000000000000
--- a/metadata/md5-cache/sys-devel/mold-1.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare pretend test
-DEPEND=>=dev-cpp/tbb-2021.4.0:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
-DESCRIPTION=A Modern Linker
-EAPI=8
-HOMEPAGE=https://github.com/rui314/mold
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~riscv
-LICENSE=AGPL-3
-RDEPEND=>=dev-cpp/tbb-2021.4.0:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
-SLOT=0
-SRC_URI=https://github.com/rui314/mold/archive/refs/tags/v1.4.0.tar.gz -> mold-1.4.0.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6b495f0b3e9af0e2f9a6b007dcce9265
diff --git a/metadata/md5-cache/sys-devel/mold-1.4.2 b/metadata/md5-cache/sys-devel/mold-1.4.2
new file mode 100644
index 000000000000..8e867e17c10a
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/mold-1.4.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=sys-libs/zlib system-tbb? ( >=dev-cpp/tbb-2021.4.0:= ) !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
+DESCRIPTION=A Modern Linker
+EAPI=8
+HOMEPAGE=https://github.com/rui314/mold
+INHERIT=cmake toolchain-funcs
+IUSE=system-tbb
+KEYWORDS=~amd64 ~riscv
+LICENSE=AGPL-3 Apache-2.0 BSD-2
+RDEPEND=sys-libs/zlib system-tbb? ( >=dev-cpp/tbb-2021.4.0:= ) !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
+SLOT=0
+SRC_URI=https://github.com/rui314/mold/archive/refs/tags/v1.4.2.tar.gz -> mold-1.4.2.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ebf280ef60c4285505d2d6474d584c6c
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 12de4a396e4e..42390dc8e9c4 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.4.3 b/metadata/md5-cache/sys-libs/libsmbios-2.4.3
index 560653e278f6..15a6699dda07 100644
--- a/metadata/md5-cache/sys-libs/libsmbios-2.4.3
+++ b/metadata/md5-cache/sys-libs/libsmbios-2.4.3
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=test? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-util/cppunit-1.9.6 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) virtual/pkgconfig doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 )
+DEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) virtual/pkgconfig doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext )
 DESCRIPTION=Provide access to (SM)BIOS information
 EAPI=7
 HOMEPAGE=https://github.com/dell/libsmbios
 INHERIT=autotools flag-o-matic python-single-r1
-IUSE=doc graphviz nls +python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=doc graphviz nls +python static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 ~arm64 ~ia64 ~riscv x86
 LICENSE=|| ( GPL-2+ OSL-2.1 ) BSD Boost-1.0
-RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) test? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dell/libsmbios/archive/v2.4.3.tar.gz -> libsmbios-2.4.3.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=34484de7e22f8386a916f394f8297a57
+_md5_=d9d39c7fa10bf8c43f1e3576538d90f3
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.3_p20220903 b/metadata/md5-cache/sys-libs/ncurses-6.3_p20220903
new file mode 100644
index 000000000000..083640dfca17
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ncurses-6.3_p20220903
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst test unpack
+DEPEND=gpm? ( sys-libs/gpm[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=Console display library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/
+INHERIT=flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig
+IUSE=ada +cxx debug doc gpm minimal profile +stack-realign static-libs test tinfo trace abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=sys-libs/ncurses-5.9-r4:5 !<sys-libs/slang-2.3.2_pre23 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=mirror://gnu/ncurses/ncurses-6.3.tar.gz https://invisible-island.net/archives/ncurses/ncurses-6.3.tar.gz verify-sig? ( mirror://gnu/ncurses/ncurses-6.3.tar.gz.sig ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211026.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211026.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211030.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211030.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211106.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211106.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211113.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211113.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211115.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211115.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211120.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211120.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211127.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211127.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211204.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211204.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211211.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211211.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211219.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211219.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211225.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211225.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220101.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220101.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220115.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220115.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220122.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220122.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220129.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220129.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220205.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220205.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220212.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220212.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220219.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220219.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220226.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220226.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220305.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220305.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220312.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220312.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220319.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220319.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220326.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220326.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220402.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220402.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220409.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220409.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220416.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220416.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220423.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220423.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220430.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220430.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220501.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220501.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220507.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220507.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220514.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220514.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220521.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220521.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220529.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220529.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220604.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220604.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220612.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220612.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220618.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220618.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220625.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220625.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220703.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220703.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220709.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220709.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220716.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220716.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220724.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220724.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220729.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220729.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220806.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220806.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220813.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220813.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220820.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220820.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220827.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220827.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220903.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220903.patch.gz.asc ) https://dev.gentoo.org/~sam/distfiles/sys-libs/ncurses/ncurses-6.3_p20220903-patches.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=ee0c6b9dae98c40b5b0bc266e6c865d1
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.3_p20220903-r1 b/metadata/md5-cache/sys-libs/ncurses-6.3_p20220903-r1
new file mode 100644
index 000000000000..1337eb362224
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ncurses-6.3_p20220903-r1
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst test unpack
+DEPEND=gpm? ( sys-libs/gpm[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=Console display library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/
+INHERIT=flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig
+IUSE=ada +cxx debug doc gpm minimal profile +stack-realign static-libs test tinfo trace abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
+LICENSE=MIT
+RDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=sys-libs/ncurses-5.9-r4:5 !<sys-libs/slang-2.3.2_pre23 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=mirror://gnu/ncurses/ncurses-6.3.tar.gz https://invisible-island.net/archives/ncurses/ncurses-6.3.tar.gz verify-sig? ( mirror://gnu/ncurses/ncurses-6.3.tar.gz.sig ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211026.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211026.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211030.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211030.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211106.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211106.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211113.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211113.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211115.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211115.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211120.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211120.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211127.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211127.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211204.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211204.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211211.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211211.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211219.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211219.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211225.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211225.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220101.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220101.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220115.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220115.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220122.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220122.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220129.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220129.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220205.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220205.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220212.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220212.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220219.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220219.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220226.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220226.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220305.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220305.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220312.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220312.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220319.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220319.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220326.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220326.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220402.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220402.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220409.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220409.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220416.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220416.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220423.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220423.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220430.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220430.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220501.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220501.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220507.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220507.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220514.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220514.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220521.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220521.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220529.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220529.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220604.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220604.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220612.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220612.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220618.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220618.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220625.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220625.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220703.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220703.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220709.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220709.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220716.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220716.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220724.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220724.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220729.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220729.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220806.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220806.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220813.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220813.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220820.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220820.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220827.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220827.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220903.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220903.patch.gz.asc ) https://dev.gentoo.org/~sam/distfiles/sys-libs/ncurses/ncurses-6.3_p20220903-patches.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=b689e5a6ac7955ffac78835ada8e3e1b
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index d245f6a19f59..785e9078ce9f 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/prowlarr-0.4.5.1960 b/metadata/md5-cache/www-apps/prowlarr-0.4.5.1960
new file mode 100644
index 000000000000..78c67918873e
--- /dev/null
+++ b/metadata/md5-cache/www-apps/prowlarr-0.4.5.1960
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DESCRIPTION=An indexer manager/proxy to integrate with your various PVR apps
+EAPI=8
+HOMEPAGE=https://wiki.servarr.com/prowlarr
+INHERIT=systemd
+KEYWORDS=-* ~amd64 ~arm ~arm64
+LICENSE=GPL-3
+RDEPEND=acct-group/prowlarr acct-user/prowlarr dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite
+RESTRICT=bindist strip test
+SLOT=0
+SRC_URI=amd64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v0.4.5.1960/Prowlarr.develop.0.4.5.1960.linux-core-x64.tar.gz ) arm? ( https://github.com/Prowlarr/Prowlarr/releases/download/v0.4.5.1960/Prowlarr.develop.0.4.5.1960.linux-core-arm.tar.gz ) arm64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v0.4.5.1960/Prowlarr.develop.0.4.5.1960.linux-core-arm64.tar.gz )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8933f7c94037bf162308769f9704f092
diff --git a/metadata/md5-cache/www-apps/radarr-4.2.3.6575 b/metadata/md5-cache/www-apps/radarr-4.2.3.6575
new file mode 100644
index 000000000000..dedc256ee484
--- /dev/null
+++ b/metadata/md5-cache/www-apps/radarr-4.2.3.6575
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DESCRIPTION=A fork of Sonarr to work with movies a la Couchpotato
+EAPI=8
+HOMEPAGE=https://www.radarr.video
+INHERIT=systemd
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=acct-group/radarr acct-user/radarr media-video/mediainfo dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite
+RESTRICT=bindist strip test
+SLOT=0
+SRC_URI=amd64? ( https://github.com/Radarr/Radarr/releases/download/v4.2.3.6575/Radarr.develop.4.2.3.6575.linux-core-x64.tar.gz ) arm? ( https://github.com/Radarr/Radarr/releases/download/v4.2.3.6575/Radarr.develop.4.2.3.6575.linux-core-arm.tar.gz ) arm64? ( https://github.com/Radarr/Radarr/releases/download/v4.2.3.6575/Radarr.develop.4.2.3.6575.linux-core-arm64.tar.gz )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8f8c19c08b92f00ea341e68cc76f3b87
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 212861922125..c05d42d1d0f7 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/firefox-102.2.0 b/metadata/md5-cache/www-client/firefox-102.2.0
index 6ffd816d5906..d20d6d855344 100644
--- a/metadata/md5-cache/www-client/firefox-102.2.0
+++ b/metadata/md5-cache/www-client/firefox-102.2.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig virtual/rust || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig virtual/rust || ( ( sys-devel/clang:15 sys-devel/llvm:15 clang? ( =sys-devel/lld-15* pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] ) ) ) ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
 DEPEND=!www-client/firefox:0 !www-client/firefox:rapid screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79.1 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) !!sys-devel/llvm:0
 DESCRIPTION=Firefox Web Browser
@@ -13,4 +13,4 @@ REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus ) screencast? ( wa
 SLOT=esr
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/source/firefox-102.2.0esr.source.tar.xz -> firefox-102.2.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/af.xpi -> firefox-102.2.0esr-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ar.xpi -> firefox-102.2.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ast.xpi -> firefox-102.2.0esr-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/be.xpi -> firefox-102.2.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/bg.xpi -> firefox-102.2.0esr-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/br.xpi -> firefox-102.2.0esr-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ca.xpi -> firefox-102.2.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/cak.xpi -> firefox-102.2.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/cs.xpi -> firefox-102.2.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/cy.xpi -> firefox-102.2.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/da.xpi -> firefox-102.2.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/de.xpi -> firefox-102.2.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-102.2.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/el.xpi -> firefox-102.2.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-102.2.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-102.2.0esr-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-102.2.0esr-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-102.2.0esr-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/et.xpi -> firefox-102.2.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/eu.xpi -> firefox-102.2.0esr-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/fi.xpi -> firefox-102.2.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/fr.xpi -> firefox-102.2.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-102.2.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-102.2.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/gd.xpi -> firefox-102.2.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/gl.xpi -> firefox-102.2.0esr-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/he.xpi -> firefox-102.2.0esr-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/hr.xpi -> firefox-102.2.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-102.2.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/hu.xpi -> firefox-102.2.0esr-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/id.xpi -> firefox-102.2.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/is.xpi -> firefox-102.2.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/it.xpi -> firefox-102.2.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ja.xpi -> firefox-102.2.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ka.xpi -> firefox-102.2.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/kab.xpi -> firefox-102.2.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/kk.xpi -> firefox-102.2.0esr-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ko.xpi -> firefox-102.2.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/lt.xpi -> firefox-102.2.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/lv.xpi -> firefox-102.2.0esr-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ms.xpi -> firefox-102.2.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-102.2.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/nl.xpi -> firefox-102.2.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-102.2.0esr-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-102.2.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/pl.xpi -> firefox-102.2.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-102.2.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-102.2.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/rm.xpi -> firefox-102.2.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ro.xpi -> firefox-102.2.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ru.xpi -> firefox-102.2.0esr-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/sk.xpi -> firefox-102.2.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/sl.xpi -> firefox-102.2.0esr-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/sq.xpi -> firefox-102.2.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/sr.xpi -> firefox-102.2.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-102.2.0esr-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/th.xpi -> firefox-102.2.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/tr.xpi -> firefox-102.2.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/uk.xpi -> firefox-102.2.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/uz.xpi -> firefox-102.2.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/vi.xpi -> firefox-102.2.0esr-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-102.2.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-102.2.0esr-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ach.xpi -> firefox-102.2.0esr-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/an.xpi -> firefox-102.2.0esr-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/az.xpi -> firefox-102.2.0esr-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/bn.xpi -> firefox-102.2.0esr-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/bs.xpi -> firefox-102.2.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-102.2.0esr-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/eo.xpi -> firefox-102.2.0esr-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-102.2.0esr-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-102.2.0esr-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/fa.xpi -> firefox-102.2.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ff.xpi -> firefox-102.2.0esr-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/gn.xpi -> firefox-102.2.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-102.2.0esr-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-102.2.0esr-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-102.2.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ia.xpi -> firefox-102.2.0esr-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/km.xpi -> firefox-102.2.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/kn.xpi -> firefox-102.2.0esr-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/lij.xpi -> firefox-102.2.0esr-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/mk.xpi -> firefox-102.2.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/mr.xpi -> firefox-102.2.0esr-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/my.xpi -> firefox-102.2.0esr-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-102.2.0esr-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/oc.xpi -> firefox-102.2.0esr-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/sco.xpi -> firefox-102.2.0esr-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/si.xpi -> firefox-102.2.0esr-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/son.xpi -> firefox-102.2.0esr-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/szl.xpi -> firefox-102.2.0esr-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ta.xpi -> firefox-102.2.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/te.xpi -> firefox-102.2.0esr-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/tl.xpi -> firefox-102.2.0esr-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/trs.xpi -> firefox-102.2.0esr-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/ur.xpi -> firefox-102.2.0esr-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/linux-x86_64/xpi/xh.xpi -> firefox-102.2.0esr-xh.xpi )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0d8941649df570160c9c634e702fb9f3
+_md5_=caa1de25931f05c60188869c82ba5c32
diff --git a/metadata/md5-cache/www-client/firefox-104.0.2 b/metadata/md5-cache/www-client/firefox-104.0.2
index 657c82f48440..351ae9e56d46 100644
--- a/metadata/md5-cache/www-client/firefox-104.0.2
+++ b/metadata/md5-cache/www-client/firefox-104.0.2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig virtual/rust || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig virtual/rust || ( ( sys-devel/clang:15 sys-devel/llvm:15 clang? ( =sys-devel/lld-15* pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] ) ) ) ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
 DEPEND=!www-client/firefox:0 !www-client/firefox:esr screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.81 >=dev-libs/nspr-4.34.1 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) X? ( x11-libs/libICE x11-libs/libSM ) !!sys-devel/llvm:0
 DESCRIPTION=Firefox Web Browser
@@ -13,4 +13,4 @@ REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus ) || ( X wayland )
 SLOT=rapid
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/104.0.2/source/firefox-104.0.2.source.tar.xz -> firefox-104.0.2.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-104-patches-02j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-104-patches-02j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-104-patches-02j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/af.xpi -> firefox-104.0.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ar.xpi -> firefox-104.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ast.xpi -> firefox-104.0.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/be.xpi -> firefox-104.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/bg.xpi -> firefox-104.0.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/br.xpi -> firefox-104.0.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ca.xpi -> firefox-104.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/cak.xpi -> firefox-104.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/cs.xpi -> firefox-104.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/cy.xpi -> firefox-104.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/da.xpi -> firefox-104.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/de.xpi -> firefox-104.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-104.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/el.xpi -> firefox-104.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-104.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-104.0.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-104.0.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-104.0.2-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/et.xpi -> firefox-104.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/eu.xpi -> firefox-104.0.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/fi.xpi -> firefox-104.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/fr.xpi -> firefox-104.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-104.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-104.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/gd.xpi -> firefox-104.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/gl.xpi -> firefox-104.0.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/he.xpi -> firefox-104.0.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/hr.xpi -> firefox-104.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-104.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/hu.xpi -> firefox-104.0.2-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/id.xpi -> firefox-104.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/is.xpi -> firefox-104.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/it.xpi -> firefox-104.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ja.xpi -> firefox-104.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ka.xpi -> firefox-104.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/kab.xpi -> firefox-104.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/kk.xpi -> firefox-104.0.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ko.xpi -> firefox-104.0.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/lt.xpi -> firefox-104.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/lv.xpi -> firefox-104.0.2-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ms.xpi -> firefox-104.0.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-104.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/nl.xpi -> firefox-104.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-104.0.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-104.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/pl.xpi -> firefox-104.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-104.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-104.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/rm.xpi -> firefox-104.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ro.xpi -> firefox-104.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ru.xpi -> firefox-104.0.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/sk.xpi -> firefox-104.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/sl.xpi -> firefox-104.0.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/sq.xpi -> firefox-104.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/sr.xpi -> firefox-104.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-104.0.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/th.xpi -> firefox-104.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/tr.xpi -> firefox-104.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/uk.xpi -> firefox-104.0.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/uz.xpi -> firefox-104.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/vi.xpi -> firefox-104.0.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-104.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-104.0.2-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ach.xpi -> firefox-104.0.2-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/an.xpi -> firefox-104.0.2-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/az.xpi -> firefox-104.0.2-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/bn.xpi -> firefox-104.0.2-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/bs.xpi -> firefox-104.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-104.0.2-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/eo.xpi -> firefox-104.0.2-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-104.0.2-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-104.0.2-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/fa.xpi -> firefox-104.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ff.xpi -> firefox-104.0.2-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/gn.xpi -> firefox-104.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-104.0.2-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-104.0.2-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-104.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ia.xpi -> firefox-104.0.2-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/km.xpi -> firefox-104.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/kn.xpi -> firefox-104.0.2-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/lij.xpi -> firefox-104.0.2-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/mk.xpi -> firefox-104.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/mr.xpi -> firefox-104.0.2-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/my.xpi -> firefox-104.0.2-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-104.0.2-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/oc.xpi -> firefox-104.0.2-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/sco.xpi -> firefox-104.0.2-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/si.xpi -> firefox-104.0.2-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/son.xpi -> firefox-104.0.2-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/szl.xpi -> firefox-104.0.2-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ta.xpi -> firefox-104.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/te.xpi -> firefox-104.0.2-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/tl.xpi -> firefox-104.0.2-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/trs.xpi -> firefox-104.0.2-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/ur.xpi -> firefox-104.0.2-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/104.0.2/linux-x86_64/xpi/xh.xpi -> firefox-104.0.2-xh.xpi )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5938acda857365e08b8621198a1399ad
+_md5_=4513960a5d4bce2b4e0bb1bb5539ccc8
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 4c20026f4628..2a1d500aa8c6 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.5.0 b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.5.0
new file mode 100644
index 000000000000..e1e6ff390d65
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.5.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=x11-libs/gtk+:3 x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:= >=xfce-base/xfconf-4.14:=
+DESCRIPTION=Panel plugin to put the maximized window title and window buttons on the panel
+EAPI=8
+HOMEPAGE=https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin/
+INHERIT=xdg-utils
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=x11-libs/gtk+:3 x11-libs/libwnck:3 x11-libs/libX11 >=xfce-base/libxfce4ui-4.14:= >=xfce-base/libxfce4util-4.14:= >=xfce-base/xfce4-panel-4.14:= >=xfce-base/xfconf-4.14:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-windowck-plugin/0.5/xfce4-windowck-plugin-0.5.0.tar.bz2
+_eclasses_=xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c3701f0a7a15c89193dc248a86d01ce1
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 0f9b07111557..579110c22be0 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-09-09T08:40:04Z
+TIMESTAMP 2022-09-09T14:40:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMa++RfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMbUEZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCFpBAAlE0sGWknOXhnw2kz4cUvF3rHtXOvGIZsrik+7Y+x351hoGM3XTnwkAYw
-ZiZi1fXBvfPPOXMX/fw04FX2lI/1DFUqzzevgnaaruPApw2Of0LFq2tI2KcAcu3g
-Dexet9m1qCYQbGkN9IZhzsi4njyDuzH/3r9lHHuzDsdnHVG1Teojlm8tnNPo4QTe
-coWlfv8EGMLzhff7/RIbqjGBnSzjAiyBU2rbvAMJ+p5B7cSZ2KzMK6z7En6i04GR
-UKJyM8ImOUOQ9gZgjL8IDRPBKrD21oNAdfrrr/SHhQDuxjU3RJvPICVisXVCSWbw
-mtfeoMYFCmBPxCWONd6AM3uit+9dYVuDnkoxPkak9PbWj0LzPas0vBDAbpJgmA2V
-+dPo0qjhQ0VFlk9LojOeXJBtRWJ00IJba+NNQ2rA1EAWyrROBGecLGLj0e/Hqm//
-+UMx0HK8lip2XpQkLMX8Kzdl1c35JPl/8vE6gtpAJu3ODz8MnG0kiTBK3RtV8f1w
-JV12avlFk8+iGDi+KV79SSqzY4HecdnaNvPLUiAlLwf07K0E9BbWV2h5Xx5ZSBdN
-wBnVOyG+hb6zbiPvTIFo2t6guEx/HwVeLFxH75exU5fMfDOeIYaGLzJEO9e7Vwgt
-99KfD7D72qtgqcAR1SoVVRzSJ3Jh0Aiko9+wIAvXxOrK+UHU+x0=
-=aT+l
+klAUiBAAtXBNwJxtkJAjg9A2hRGKdJ4o0I1RfmM1jNeeTtmuBz9n83JMyVOwyyRk
+52dPj1a6wNBEUXhmTZgy2iWongHta3e6E+bXapJceVHxg9dJsNUMrKwJfEJYh0Uq
+sphRcm5juDLoHNcN0VhBxbHyxkABuEpU8NRA5lO/C6cWdXEkn1S5lnHsF+NNa+68
+jAD8jW5UBBXsc4HlrGpqyi/sUyzNAiYVDJgvCmDka4gGXmARBc08lKV/UOQqz+Zn
+8+Lfcb316FQWgHU9w75HW+71Y+Wz5wMu16VHIMJnWGcLvYvB92WuwNLodK/DCp9i
+gdDy12Hs3TO2UanrkCYd7vGdOrTifF0z1PU5Jg4bxkVk2fbtkOI58c3pvQHLPHAY
+M69ckdb9gXWP0ZAggwtzM4x7LUG+1Yb1c8DTr19zFAnnEirDkYxEP2Yg4bdEMq6s
+el+tyNz8049D1ZSsbSySuJmS0AFphtZpAfIk0TMGdpAMOpnPLjT0GhLw4AoNNgId
+A40lVTgMoGb0IRrmD0S3Glkz67G11WhMK9Qb3E35na3hX8cBkf7ot6l2QLLEoZN+
+aqwP/+CJjThB0MqxO5S+tFSeE9zZxR4ocYuyMZlvkm5lTr+FXu+uSLX6+uMlJdI1
++h/vWrv2QAZ5JAJNCisZFFbKd1ZVdnOqCso9yxx3M6C9lUFxE1A=
+=NJYC
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index fd130e21a421..a7f0b6fdfb77 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2022 08:40:01 +0000
+Fri, 09 Sep 2022 14:40:02 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index fb2eb662bc14..455621dd9b82 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Sep  9 08:40:01 AM UTC 2022
+Fri Sep  9 02:40:02 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 09d6207ce000..a94e21577893 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2022 08:45:01 +0000
+Fri, 09 Sep 2022 14:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 37903ff8b769..39264899a0c7 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-07aad3b2c6a3a12be810c8e510a9acbddb34dc14 1662711818 2022-09-09T08:23:38+00:00
+1cdce793e59c02894817d9bc1a383372ab43531e 1662734046 2022-09-09T14:34:06+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index fa375abdd2a0..73a5bedd93f3 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1662712801 Fri 09 Sep 2022 08:40:01 AM UTC
+1662734401 Fri 09 Sep 2022 02:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index fd130e21a421..a7f0b6fdfb77 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 09 Sep 2022 08:40:01 +0000
+Fri, 09 Sep 2022 14:40:02 +0000
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 7947c2d23570..1269731cca07 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index e0847a0da6ac..4bc39705d307 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,11 +1,7 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
-DIST mu-1.8.5.tar.xz 539368 BLAKE2B 6efc12f82aab2beee86475ee49492ce59cb70e8b4fa63f2099a6071ec3275e7f0f308a868133ab3be4646d2280f720a4f6bb5673563a4437d2135e149b1cdfac SHA512 f43afb9484937077f32a38f347352b1ec8fb74c85be74f3afdd53ff75b965f42ab88daa58433fd9292a10c69ed2f2daf3ddbaf3d8d5d5595b0b29b81629a846f
-DIST mu-1.8.6.tar.xz 539684 BLAKE2B ea220a1a6f1fafab54574aa79638232aac4108d32c1e84cb3a1bc910dabbc0dcd1092b18ab62bc5dc57eef4118e023b729d279f9cb84b1fa061d72d60bfa5a91 SHA512 09ac9732e9c18ccdf85b2e2ed64f21f8b87d1484b773ae5ce6edea37f46711ec8709ccceb76f500f8ac02ad5cb54c2bbbc86f75185682ef73bd05a9b467c254c
 DIST mu-1.8.7.tar.xz 539664 BLAKE2B 2f0081f350c0d6da4b7920c0380a02aab42eda12062011bd03a46ceb925c179089b794b501df53b4fc84daa38e6e977a3510801685aa7c91c1c0be58c9c78929 SHA512 04c2027acec80c7569f055c8324f947862721aa36b093dba07ac80b9051229a51225e5371af7cd48fae71c9d5148bd3dc2081f591b9f733bccb5650b4853df67
 DIST mu-1.8.8.tar.xz 540092 BLAKE2B 3cd3d5f41aaf145dee66fc6d5e71256a650b16d0ee99da253d7ffc87df2e36b5fef6d19dd8831002d040c5d6ed13a53e9df69d18d7c002a05a64fb22fe32f5f5 SHA512 deb48ef7d12d76575f14e5313e9c94a40a04dc916943fa45d4281aa637b6549cbcee3cc0879b9daab51e0409cdfdc619acae12bf2ff3edaeb84fb77c3bee8982
 DIST mu-1.8.9.tar.xz 541308 BLAKE2B 418458f5e04d15cce9aa0ea650e06377c5eb2a3f08e47610ce8ac63b68f5e7914b3d70ec4e07c5b89399aaad8a6e340dd6943980e6de94b02ff299358d99d07f SHA512 534bf2c0889d436601638afa7f214492b927f1a3aa4f36509ac607132dcc17f2181e7b1d2113fdf00989bf5eb71cf7ad9b19411393fe1edbb8de162b7f7636bf
-EBUILD mu-1.8.5.ebuild 2099 BLAKE2B c695a17f01602bc7d0f7d9aef41fac4ae585d7183f9ffb880b618f139b1328a91679ca69eee6e1fd076517062f72d706f48f514eec5a74b9818643bd9c7d0431 SHA512 f51afffe20c60bef08b3da69ed129103bb13c3ebb9d106d3de89b4a8fbc602637e44bd2f4d534ef26218ef018c028a388c505528277818189b9068a66b126504
-EBUILD mu-1.8.6.ebuild 2103 BLAKE2B 3def0840baba20487d6256076c9327c2762cca569af1e1c48589ee7308569f20e88aa32245b449eca9416dc4f819937f1720a0c569799d7ae29cbc7b595eb07a SHA512 f24cb94e4c8d62559a5ef824472d2684ff7b8a5239c9112c8bace36a4df6c0c38089a707bf9138928b874ef445165efd5e18bca644659fb140f1a90abb548459
 EBUILD mu-1.8.7.ebuild 2106 BLAKE2B 7da6a51b1de0124d20aede38a1826eb75a91e92518518393cc0cfa8320f3c26f4a0f5fbe2e8e229eea38f58eb11b6dd09733965043bfd0bed3fee38ad250efbe SHA512 21f779ba0ca3b2f48724fc27c60cc243a501fb0d36a189246750f4d6c9913f7062fbabd8f206019d20417f0bd2913ba0789582a216f8db257bc304b3458806c0
 EBUILD mu-1.8.8.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
 EBUILD mu-1.8.9.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
diff --git a/net-mail/mu/mu-1.8.5.ebuild b/net-mail/mu/mu-1.8.5.ebuild
deleted file mode 100644
index 702126efea4b..000000000000
--- a/net-mail/mu/mu-1.8.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common meson
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig
-"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-
-	# Don't install NEWS.org into /usr/share/doc.
-	sed -i '/NEWS.org/,+1 d' meson.build || die
-	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
-	# Don't compress the info file.
-	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
-
-	# Instead, put it in /usr/share/doc/${PF}.
-	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature readline)
-		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
-		# NOTE: Guile interface is deprecated to be removed shortly.
-		-Dguile=disabled
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Since meson no longer installs NEWS.org, install it with dodoc.
-	# Also, it must be uncompressed so that it can be viewed with
-	# mu4e-info.
-	docompress -x /usr/share/doc/${PF}/NEWS.org
-	dodoc NEWS.org
-
-	# Same as above.
-	docompress -x /usr/share/doc/${PF}/mu4e-about.org
-	dodoc mu4e/mu4e-about.org
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.8.6.ebuild b/net-mail/mu/mu-1.8.6.ebuild
deleted file mode 100644
index af673005c01c..000000000000
--- a/net-mail/mu/mu-1.8.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common meson
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig
-"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-
-	# Don't install NEWS.org into /usr/share/doc.
-	sed -i '/NEWS.org/,+1 d' meson.build || die
-	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
-	# Don't compress the info file.
-	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
-
-	# Instead, put it in /usr/share/doc/${PF}.
-	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature readline)
-		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
-		# NOTE: Guile interface is deprecated to be removed shortly.
-		-Dguile=disabled
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Since meson no longer installs NEWS.org, install it with dodoc.
-	# Also, it must be uncompressed so that it can be viewed with
-	# mu4e-info.
-	docompress -x /usr/share/doc/${PF}/NEWS.org
-	dodoc NEWS.org
-
-	# Same as above.
-	docompress -x /usr/share/doc/${PF}/mu4e-about.org
-	dodoc mu4e/mu4e-about.org
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c50e9f0157d8..9b90785743fb 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index 9537787cf95b..37a88f5379f1 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -1,10 +1,6 @@
 AUX xmrig-6.12.2-nonotls.patch 578 BLAKE2B 4d71c8d35be47fd12a019d7b8cb6e1b8787e153ab543b9b1e4079c911671ff886042d90cd439552bf364208d9a4afcc7fe088b50598bbc20e347b532dfc92a2d SHA512 fea6041879c414a4fc6006a413b217801d674f7b5d849d95c119d07e191c5d7a5e99fb959d89974b68be9df132ff480f8492645ba6821b369444b102596b06f3
 AUX xmrig.service 946 BLAKE2B 1f3b28f8229183da528ac2b4279dd64b5c6f752720c6bdfe90fa9e127108623e4a577a274527249ee7a13969be97e9b1a4348f7c3e0798839d0ed3ee67b16188 SHA512 77da620627272113e7c77a090536b04cb5a89f4010060ffb21ea1c9edc50e0743f913a70e4fb612c23aeea2b8f1a3f9ce024a434076cf9498cce0b5f801faafa
-DIST xmrig-6.16.4.tar.gz 2422895 BLAKE2B bdf4c2ee41b11a5a0d72518aadb71677536dee4ec80af191a337bddb9623e9ec8d0d3f5328732be6246eb08b28f845927ae611e2c8dc66d1b42f1c8f56a3451f SHA512 a66f5d8ef217a4ea31d65c03cc863be694947ce536ca66b0b66f523557fba1651accdc196b6ca1dbc34bd5688041248a3c30e9ee122394207f7e47d82d9e987d
-DIST xmrig-6.17.0.tar.gz 2443393 BLAKE2B 01fa7682dae6dd4aaa0f3b677bedfb3b2e9de35799f9bae0aa1a733b35152d1d6c56dfed06b9aa54fe64df4f40029d2657b9fc95e541746bd8e28bff15eef96b SHA512 a8361a5ccc8237afb59c496d88d920b7222158d9f874ff891f0cb78278e6e00881b75f4e129858c44ffc7d90227c995121f6611f1a20f84139930a883271f0d6
 DIST xmrig-6.18.0.tar.gz 2389032 BLAKE2B c7561e2d9303c80f97615471a28f57bc48c93749459e48451de52d1130b436298354a0419c3ed3c96f2bfe3592b7d28f85b91c7698174917d6eb08b685a12145 SHA512 ed20b760ae7603de752c933513c3f7abb2e254a44d79252264952f3e70c7b5320389ed4f6534a6dc8eb7cac8b1086239c46baf18c71f7ba7f0018914b2fd5917
-EBUILD xmrig-6.16.4.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4
-EBUILD xmrig-6.17.0.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4
 EBUILD xmrig-6.18.0.ebuild 1339 BLAKE2B 9b7bcd3cf6831626278475a3b08c912da8d5cb646c928493dbcddea6b6a34dbe54a650200f2676921c7daa96b288b7654699a816d55d387174d475c6562ad786 SHA512 2d0e6334dcd30bf5a357c14089842bb00df837ea4fd37b5901687f568b2f23906da5ab2add4f15ea043ef2a56c5a022381d80c7227a0ef69131aff252f7c3824
 EBUILD xmrig-9999.ebuild 1341 BLAKE2B 57e511706fc10b3ae13aa788cf98fc7bbae846e1993c16e30c6bee5b5ac4d65e43481542a11bdee219d5aa46be79e1d3281259bf61719f9095bd902660617748 SHA512 c2addf892f4692610fc4ff757f13b0528ebaad9aef07bd5d4c8923d97d13a493a169869fe611ea612c0e5607f8a4c67c4adf2f2845405de1f131d9e5800ddee6
 MISC metadata.xml 1023 BLAKE2B 207d4db4091e38a612d7bf060ca7f58c97454a03d39b0f49e0968f387a1d97d7624834ea0d010b650fc384ab51550693d90710808516082f14a5d51ecd42b9f4 SHA512 93dd1dc29085b6277a5787515449b67c45753cdd00de5a854522907cec0a59078327074c0f3a8577c1d505b0eb30e63267375b3ccc2cf0dcae697b56d163aa39
diff --git a/net-misc/xmrig/xmrig-6.16.4.ebuild b/net-misc/xmrig/xmrig-6.16.4.ebuild
deleted file mode 100644
index 1b72caa1898c..000000000000
--- a/net-misc/xmrig/xmrig-6.16.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
-	${DEPEND}
-	!arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
-)
-
-src_prepare() {
-	if ! use donate ; then
-		sed -i 's/1;/0;/g' src/donate.h || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DWITH_HWLOC=$(usex hwloc)
-		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	default
-	keepdir /etc/xmrig
-	systemd_dounit "${FILESDIR}"/xmrig.service
-	dobin "${BUILD_DIR}/xmrig"
-	dobin "${S}/scripts/enable_1gb_pages.sh"
-	dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.17.0.ebuild b/net-misc/xmrig/xmrig-6.17.0.ebuild
deleted file mode 100644
index 1b72caa1898c..000000000000
--- a/net-misc/xmrig/xmrig-6.17.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
-	opencl? ( virtual/opencl )
-	ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
-	${DEPEND}
-	!arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
-)
-
-src_prepare() {
-	if ! use donate ; then
-		sed -i 's/1;/0;/g' src/donate.h || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DWITH_HWLOC=$(usex hwloc)
-		-DWITH_TLS=$(usex ssl)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	default
-	keepdir /etc/xmrig
-	systemd_dounit "${FILESDIR}"/xmrig.service
-	dobin "${BUILD_DIR}/xmrig"
-	dobin "${S}/scripts/enable_1gb_pages.sh"
-	dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index 4c43310ddf51..b88e172a4f6a 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -1,7 +1,11 @@
+AUX zerotier-1.10.1-add-armv7a-support.patch 371 BLAKE2B ee67acce5deabc4670f3717eca72d99973874f2a30c913cfec1de763c2239a6ad1b5ed01270e1018dc9e4bdd8650e8e7127509dffb53d29c1886d4cd8f54b779 SHA512 def493479a982adeda85f6915ff3b5d53552c22f03a01690d5aeb23f46352faa3c53882adf16d7cc79f6cbbc2e0e3e84107de4c1a594d14bdce8cb968d1b7eb5
+AUX zerotier-1.10.1-respect-ldflags.patch 370 BLAKE2B acea29854cf64d3d84fc703ed6eafb1492536a3f4c6c028189d448bcb49e2046500bd3b4b239dc445bd6da86b5b0790659b84cecfc138c7586680a1acdbbdf1d SHA512 555dad4795442872c5e1c764c78b3152ce5a29bb69d3aa075c9852f0ca78b07e1f2929cd354fc02d0c3e5b45fe4d3da4ef9256e60876789022ace688a455b468
 AUX zerotier-1.4.6-add-armv7a-support.patch 419 BLAKE2B 8670511fb18c3833d17b601e692e141281d429f47281d12b420e5bf84c61a0312642be00785284739d68c33c353ff76b76b0651b03de4789cf7112c352c39648 SHA512 e2be80e39ee1a6f554b60c481f11e04c60a30bd8b198142aaeb7479365fee3d3e73ed9365f1ad7795c33781bf83693cc51a86ea5e294c63030fb111872dbad3a
 AUX zerotier-1.4.6-respect-ldflags.patch 455 BLAKE2B 2add558b3770e35d9318965eee27219366af4660935d2ee1261bc7735cbd77405ec8c8677f95ad31e02a0f81a9b9f1984b89ba2aeff3b919a84adfdebf7518bf SHA512 8b00309912e64a33086173f0c14649115bf82d5ceaf838642dc604e6ae1ec49d883c90ad5fcd93c9291fb7491cdd06b4d609ffc80c512425ee7c9988bb67149f
 AUX zerotier.init-r1 285 BLAKE2B cb30206b6b2fa00e9b77bee83d0ef61bc864146337e06c6900a6e5bcad95dab87dc88f30a1407f87ecea839b99f5aadd7807719ffaefd7be4137986284d1e43e SHA512 911a90d14bbacb2e5a139d50716850d7286f893769bf0f7fb02a0829293d5fb233ad44255b8ffc5c1d4aee4fbe1361be0f1826732b50de07bd1d418f77651faa
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
+DIST zerotier-1.10.1.tar.gz 84019609 BLAKE2B 317177c3f64818a78aed3f24e0d5fa8f164bb3778fcf123f222983b784aa8ed4a5bfd842857b3da7bca39e09e74a99b88c541921f2d1ed7633282cc9bae19bd2 SHA512 6a4c9c30b4aad389a60bd72b154f2a0c34303925a5c0efb815b4651db0db5e7b79740b5cfc4f2825bda7c158d374fff277b2f5ba57cd2cf5c740168198e7bbbd
 DIST zerotier-1.6.4.tar.gz 16021448 BLAKE2B b45219c2e54f3e789fb970fc8cd9d26ce6175c9737f02838efd11c07223ca49c10480935319292e609cb24bef46aaf7f5eebc8335e84af642d25e87ea5a8e163 SHA512 b1cd96cdc76cfd7929016382bc4a373a88d468010134cd65efbe32fc23e1cb56e0306f84ae10b3ad6d65e7a3fa6aebe79ec6c019840123f770bbc6fe2152723c
+EBUILD zerotier-1.10.1.ebuild 1342 BLAKE2B 6fc9a0c73c10e645ce1bf070bbae2ac66d7c7e875d2f0fd09a6c8f75de1243383c793acd5a5d59115a28b06fc0bda4d456e68a96864823848d0783fa7c3073d9 SHA512 5cd827beda429e5b9f26a4a6590beaf8e8b76af9bf1e6b005b81b8088e744a19ab1cc112071b1a17cfa3a86e2a3214a3f1f76213c7b3bd770b3d21ed435bb281
 EBUILD zerotier-1.6.4.ebuild 1811 BLAKE2B e322dffb348bd3150f528a363dbc371b162c638c16e72a5a5da93d627980039fc8f8f2a0eee1e780e91e23b643d72835310db73d41e6d119c9ea964756eabc57 SHA512 912d1a950617ea9db70f5d71329cad3fc5f3e669d0ffbaa02bc7dacf127f67ae62abb6e987b7a39a02a3c0093d1d8c670b5af4190a47443321449862a7d8270d
 MISC metadata.xml 420 BLAKE2B c51b54f7c06949c82cb1c1676110dc9221c8cb5638a1ac746a3cccf2bea40189b9c2d5eca2d0770ce60e3a934ba2c2c00930d54dd6855a5f27e8eeb2f7c1f259 SHA512 2318e3bbb8738b7f50f46e80a8186649ab5cfc1645fae790fdaa58bdb987dca6ca3819af0537ad27c437bbc0cf5c34ed265a54b6043a0d26431a1919c8ee8289
diff --git a/net-misc/zerotier/files/zerotier-1.10.1-add-armv7a-support.patch b/net-misc/zerotier/files/zerotier-1.10.1-add-armv7a-support.patch
new file mode 100644
index 000000000000..c0dd5e900269
--- /dev/null
+++ b/net-misc/zerotier/files/zerotier-1.10.1-add-armv7a-support.patch
@@ -0,0 +1,14 @@
+--- a/make-linux.mk
++++ b/make-linux.mk
+@@ -203,6 +203,11 @@ ifeq ($(CC_MACH),armv7)
+ 	override DEFS+=-DZT_NO_TYPE_PUNNING
+ 	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
+ endif
++ifeq ($(CC_MACH),armv7a)
++	ZT_ARCHITECTURE=3
++	override DEFS+=-DZT_NO_TYPE_PUNNING
++	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
++endif
+ ifeq ($(CC_MACH),armv7l)
+ 	ZT_ARCHITECTURE=3
+ 	override DEFS+=-DZT_NO_TYPE_PUNNING
diff --git a/net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch b/net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch
new file mode 100644
index 000000000000..41a42197c17d
--- /dev/null
+++ b/net-misc/zerotier/files/zerotier-1.10.1-respect-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/make-linux.mk
++++ b/make-linux.mk
+@@ -70,7 +70,7 @@ else
+ 	override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+ 	CXXFLAGS?=-O3 -fstack-protector
+ 	override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+-	LDFLAGS=-pie -Wl,-z,relro,-z,now
++	LDFLAGS?=-pie -Wl,-z,relro,-z,now
+ 	RUSTFLAGS=--release
+ endif
+ 
diff --git a/net-misc/zerotier/zerotier-1.10.1.ebuild b/net-misc/zerotier/zerotier-1.10.1.ebuild
new file mode 100644
index 000000000000..fff14d007687
--- /dev/null
+++ b/net-misc/zerotier/zerotier-1.10.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="A software-based managed Ethernet switch for planet Earth"
+HOMEPAGE="https://www.zerotier.com/"
+SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/ZeroTierOne-${PV}
+
+LICENSE="BSL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="cpu_flags_arm_neon"
+
+RDEPEND="
+	dev-libs/json-glib
+	net-libs/libnatpmp
+	>=net-libs/miniupnpc-2:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.1-respect-ldflags.patch
+	"${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch
+)
+
+DOCS=( README.md AUTHORS.md )
+
+src_configure() {
+	tc-export CXX CC
+
+	append-ldflags -Wl,-z,noexecstack
+
+	use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1
+}
+
+src_compile() {
+	myemakeargs=(
+		CXX="${CXX}"
+		STRIP=:
+
+		# Needs Rust and fails to build as of 1.10.1
+		ZT_SSO_SUPPORTED=0
+	)
+
+	emake "${myemakeargs[@]}" one
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" selftest
+	./zerotier-selftest || die
+}
+
+src_install() {
+	default
+
+	# Remove pre-zipped man pages
+	rm "${ED}"/usr/share/man/{man1,man8}/* || die
+
+	newinitd "${FILESDIR}/${PN}".init-r1 "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}".service
+
+	doman doc/zerotier-{cli.1,idtool.1,one.8}
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index b2b16e2635d9..1fe4a3c3747d 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest
index 89d8122afb73..2d27806d7b43 100644
--- a/net-proxy/mitmproxy/Manifest
+++ b/net-proxy/mitmproxy/Manifest
@@ -1,5 +1,3 @@
-DIST mitmproxy-8.1.0.tar.gz 27940706 BLAKE2B 6d4293f30257e88eafea21127d4f499a7734f3d450c07114f83652d73a8aaadf1523737fee96e04b1bd39d47b73263d7f62f177b5c02357b258c898ccc58a9d1 SHA512 47e0924b1fc2999cbc038295dbb43a78eef4120a31c9445aba7b1f31e90aa4d859c5e2665a429f16c5cf7a6f9f29a7d6a50bb09a1e54c2e1693714c28d5153e1
 DIST mitmproxy-8.1.1.gh.tar.gz 27943959 BLAKE2B e920ee016f3c2c1ece08924e895848d6716c60ed65ba3b0b3ac6c966cf4ac4245a31b31365d248f4b88130f787c65183943eec3611db900a4f5c2e16709c775c SHA512 a62a45f8991819202115ab8f43d1c113df88504c494c73917ec2e3c52999dbe3ac596444a4c096619d4285f2e26a91ec715d6894fc4d7768bac1a2c3c4c268bc
-EBUILD mitmproxy-8.1.0.ebuild 2204 BLAKE2B e8ae2b6dc4a77e1f642b9c9ad4b1bb5139b0a96545e45513f8243509aeafcbe24731b460171d635f6124363b3ccfce9eaf6e4bf06611829e4e5ee9b9ff84c848 SHA512 ca90b85197b481a41d8cb0958bb1f936bda17a01b041b16739be266851ed3352edae3ef47ff7198f607a2fab7dc65e44e6d6d628bf2c77a91aec870c77ffb024
 EBUILD mitmproxy-8.1.1.ebuild 2207 BLAKE2B 27e7b7245e1fb592044c19c3d5f147e1ab13928f11a104555d7a4e56c69923adbd8ce46ec2d80f65c0d23238eafdc11caca74be88bcf173b5cbefdc76d40c235 SHA512 009976db1a778443b27cd51c6ef12650a8f2028aef946145f892faf699e3a91363226eb009f624c9e59b9e069c682b84b514604eff4720824d760c0e7a696b45
 MISC metadata.xml 923 BLAKE2B 00d3790b8e1810b193babedab5b14f35c1275c5d544b4ae031cab41e886bb55130a5187a02a0adab6b00c1ad6d38ba485f9ebd68422549e4e4b62a21b7bcdc13 SHA512 50d52876c7f9d71b2cc31a697cec73c8cce041076c8057e9e3e1f0b2218b883898735f545f85f4e28ab1bd2f8091b764ebc6c92e98c291962cb6f1d52e5aa605
diff --git a/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild b/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild
deleted file mode 100644
index 2bb96ea6369f..000000000000
--- a/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
-DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
-HOMEPAGE="https://mitmproxy.org/"
-SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.2.10[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-37.0.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/h2-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}]
-	>=dev-python/ldap3-2.8[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.16[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/urwid-2.1.1[${PYTHON_USEDEP}]
-	>=dev-python/wsproto-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
-	dev-libs/openssl:0
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/click-7.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8[${PYTHON_USEDEP}]
-		>=dev-python/parver-0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.17.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# loosen dependencies
-	sed -i \
-		-e '/>/s/>.*/",/g' \
-		-e '/python_requires/d' \
-		setup.py || die
-
-	# remove failing test
-	sed -i 's/test_get_version/_&/g' test/mitmproxy/test_version.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 6ea0239bcd36..0c8185babd8f 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 5a0c893462c3..0e2a407dedbe 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -3,8 +3,10 @@ AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-1.28.tar.xz 1014588 BLAKE2B 2ca8edf3b9e038cf8a7549d76253bce42f66b4f63644433b84dad75cd51a817efdbf1437ec9c65731619d48d549cd1e89396a2609a9e31b5c73f6a16fb73e104 SHA512 adde7772787840e0a46e0068fe0bf5f22191fd32b2f16bcb10dbaf5e9c410ae1caa1479a9851bfefe264a8b29ca24ed6d58457b9351316afea62244de2d6e08a
 DIST iwd-1.29.tar.xz 1016596 BLAKE2B 9c996e8b8da8ed3e0c20c5e2c94c0e219a1f6322498aa480e0ee5d085c2ddd03b18e38d1985d9ce3b6950be2019c66321b5781ad50d812010dc8a5f65f209327 SHA512 fb9d68ab487b03b7982155d77990749f1e21362b5851baed9e599a95fb2805a9529f9e8ae31a159b384789682b0352b87e6b2183d2321f0410b1cd7cb6c14452
+DIST iwd-1.30.tar.xz 1026436 BLAKE2B 02382181d8e40d0d88c6c752c480db1036142c91b2547499456763bb9c157c7113f9c496d5dd0ae688110fab251e7f99374ea560450a12701e5d72ec7eae784c SHA512 8cf705bd6cf2c69bb6fef0274f3a59f64e7a88071bf97fe3f291ebe523d38f1381299918370d7017b4e635fd1907005c530e8e693eff94d99ac5b89aebf9f815
 EBUILD iwd-1.28.ebuild 4937 BLAKE2B eb698dc74e957a71fc23c6d1c8d2004c1b5880f96878ad1e90235a075fce2fcddc6bc24fcce37dedd332cba8ae34ae8c27a0f53d074d6b6d188ae5f7657e0c74 SHA512 59eb224a49add76d2e05b5fd8c70ebe71fbec9bfeaa44eeb390dbefdc27be71182fe73bda155b1528a10e6a5ce81323f8644afe5b88515a4f2b38edd7f1d516e
 EBUILD iwd-1.29-r1.ebuild 4963 BLAKE2B 88014cde6eed5e350cdb7ecbb0aadf8bd2cafe496fa708ad4129f0033265149143119181cf8e9f94258cd71e5e65592a7cbd70007ad31d056e0d18d0f3807916 SHA512 5de802fda11db26b6273befa747a01b44c7f2167ed8caae9ed4a41ac3c7ab6c21b0268849bb1a93ec6767fe2b3d1c5edadaaca9fc14c4d271a177a975a0bd81c
 EBUILD iwd-1.29.ebuild 4944 BLAKE2B a141a6500194959e0903dd48bb8fcd4ac3129cd1ec7b38e3b230f8df4f5885f0b05fa0830a3112a19132f5b1e9a786621c9820dfb90008c08ec400e6ecee0a52 SHA512 4a684021c31b316649219fb926b6f3072080057060e498fa2d14081ae877426a2d4c491cf7c05d0de7609ab56de9bcb70a2b3145fb9180402d56991669c97819
+EBUILD iwd-1.30.ebuild 4969 BLAKE2B 6cd50e37dabcd2ce97a2950b5b1ee92efdd82c5103fbc78a861c163e9cdec12c98ba1f980d6fbc234801c0f9466729a16500d3394384b9cd652f87b7785827d6 SHA512 fac3cda36c391e8200e797c30fd7c16fb67298cf12f3e75288150890019be2f160a4570e87e5b641f239d2aed102c13c81ab886ef6855a77c3d46d268bc27d29
 EBUILD iwd-9999.ebuild 4946 BLAKE2B 97fea4e22faacc58c2e205a328f9d490c1ba3505fe24f312aaf11a664eeb838d156d9e735b15dba9ce90e109cc6b8b11debe26bf015f4a40ef1f1f26d1401143 SHA512 4733f222626ef30742fa473b01dbd91379456c1d07360dd4ccfdca64387b3e9d381399d5e562a8bda6682b816a43bf45ddf0183875088954ba0681f472259d0b
 MISC metadata.xml 844 BLAKE2B a0745226f5314cee29c405d53b5f03c1e2706518272a69443174123601c4b79ad5902e2f22575b46bed37c5d6ebebd1ad4cdcccbb7c40405c4d04f2b92bef17d SHA512 9997101871ad37981492b0a70150d091926ec2321f13d70d5f85f2ff5d360cc87970beb9575c2f78a909e6f3a91ef022fd7115db9ec0ec77d5d94363ed30d793
diff --git a/net-wireless/iwd/iwd-1.30.ebuild b/net-wireless/iwd/iwd-1.30.ebuild
new file mode 100644
index 000000000000..cf333398377f
--- /dev/null
+++ b/net-wireless/iwd/iwd-1.30.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic linux-info systemd
+
+#Set this variable to the required external ell version
+ELL_REQ="0.53"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	MYRST2MAN="RST2MAN=:"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +crda +monitor ofono standalone systemd wired"
+
+DEPEND="
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )
+"
+
+[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/netdev
+	net-wireless/wireless-regdb
+	crda? ( net-wireless/crda )
+	standalone? (
+		systemd? ( sys-apps/systemd )
+		!systemd? ( virtual/resolvconf )
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
+		~CRYPTO_AES
+		~CRYPTO_CBC
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
+		~KEY_DH_OPERATIONS
+		~PKCS7_MESSAGE_PARSER
+		~RFKILL
+		~X509_CERTIFICATE_PARSER
+	"
+	if use crda;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3 && use amd64; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	if use kernel_linux && kernel_is -ge 4 20; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
+	fi
+
+	check_extra_config
+
+	if ! use crda; then
+		if use kernel_linux && kernel_is -lt 4 15; then
+			ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
+			ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
+		fi
+		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
+			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
+		then
+			ewarn ""
+			ewarn "REGULATORY DOMAIN PROBLEM:"
+			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+			ewarn ""
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
+		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == *9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	append-cflags "-fsigned-char"
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
+		$(use_enable client)
+		$(use_enable monitor)
+		$(use_enable ofono)
+		$(use_enable wired)
+		--enable-systemd-service
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
+		--with-systemd-networkdir="$(systemd_get_utildir)/network"
+	)
+	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake ${MYRST2MAN}
+}
+
+src_install() {
+	emake DESTDIR="${D}" ${MYRST2MAN} install
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd-r1" iwd
+
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
+	if [[ ${PV} == *9999* ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+
+	if use standalone ; then
+		local iwdconf="${ED}/etc/iwd/main.conf"
+		dodir /etc/iwd
+		echo "[General]" > "${iwdconf}"
+		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
+		echo "[Network]" >> "${iwdconf}"
+		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
+		dodir /etc/conf.d
+		echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd
+	fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a75fa1e526b5..7e363396a5f3 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index ac810ebbc755..c16dad41759a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -303,13 +303,6 @@ net-analyzer/sguil-sensor
 # transition, multiple open bugs. Removal in 30 days, bug 630752
 app-admin/logcheck
 
-# Matthew Smith <matthew@gentoo.org> (2022-08-09)
-# Please update to Erlang/OTP 24 or 25. Removal in 30 days.
-# See following link for breaking changes:
-# https://www.erlang.org/patches/otp-24.0#incompatibilities
-<dev-lang/erlang-24
-~dev-lang/elixir-1.11.4
-
 # Jimi Huotari <chiitoo@gentoo.org> (2022-08-02)
 # Masked for testing. The split of some packages may still
 # change. bug #838970.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b52e69267611..cd1189bfcde6 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1654,7 +1654,6 @@ dev-lang/ammonite-repl-bin:scala3-0 - Install Ammonite for Scala 3.0
 dev-lang/ammonite-repl-bin:scala3-1 - Install Ammonite for Scala 3.1
 dev-lang/bas:lr0 - Use the LR0 parser instead of the recursive descending parser
 dev-lang/crystal:debug - Build each module as a separate object file. Speeds build up.
-dev-lang/erlang:hipe - HIgh Performance Erlang extension
 dev-lang/erlang:kpoll - Enable kernel polling support
 dev-lang/gdl:eigen - Build matrix manipulation with dev-cpp/eigen
 dev-lang/gdl:glpk - Use GNU Linear Programming Kit sci-mathematics/glpk
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 91dfd61ea747..cb6c30b8e2ff 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 0bfb61914a1d..2efd88d19525 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,9 +7,11 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 DIST portage-3.0.30.tar.bz2 1157316 BLAKE2B 56939618f4915f77dca6bb85d4a7cf98e50133b524f68a0b192c0a928ca209a0cb944c174dda78f1b5a071c02c190857ea8a7ecd514301c45e897b302542f52e SHA512 accec770f63180b6d5d4cd08ef50f0cd01aa5701104156523f1a735d8ec3313a3b513629a33d8863285736515b6a3d56fc21498404da3a0f89b196655a98db7d
 DIST portage-3.0.34.tar.bz2 1110794 BLAKE2B 32239a8319448e63fa249296b492c88504039cf5aabe3e1ffcb2423c95fd26a048d9717c8f673d670acf0f9fa290d12dbf194df08a5a0f11311db856e41ba714 SHA512 c3566a6bed5a87b7dc6882eeafe77b2511e5be3e4919159309303477ca97e1b5c1eb134fe5fc0d8a5f5c2880f1eb5c72592b8104a726bad5ed83b4ed2eed5193
 DIST portage-3.0.35.tar.bz2 1112935 BLAKE2B 1226cc5808628a0d6c3c71aaacf87b7447205a1716beff198627693b22304b1e11b1d91e277c97794235690f17c0e3ae76f9546668d3459916caaa17c04eb9c5 SHA512 975d8e942014c2fb01971292ed0882291aef1d28ceba95250d0b593ed76fa9692adafecbf2326499dadd42d55be3d3f4fb634552b99d5e5392ef723413a2e3dd
+DIST portage-3.0.36.tar.bz2 1114026 BLAKE2B a8a535ae309c32955eae6a491cbc97f809fb67111688087aa98ac28df4bc97fcb3d9a4ce7c5dbdfbb7f21891a7524f671ff3e3ccbed425503c66bde591266957 SHA512 94b39718871e895c1170271ad072eaa72c995a7e7a06bda9ee76cde2e3949682da7a996780a83cc33c4647915f942fe9d4a7b9b6dfd9319143eb1453cee3b3de
 EBUILD portage-3.0.30-r3.ebuild 8834 BLAKE2B 8346cef2c47e8d29484674b2df37f4f38b15f9615f5578321adc6aaf98cae4649f475989e3c30cc479364903fc7bb2ca65ab1fe1fb897c828db4430dc12706b5 SHA512 0cf01ec82ca48f225309ff118ea9741e8bb9cc7f127bd753b0d6da5b12297ce71ebf7f2cb022dc0d08f957a111723fa750152bf55e406c57a74819432a036e43
 EBUILD portage-3.0.30-r5.ebuild 8973 BLAKE2B 0b3396401ef95f21383bc0c9792db80c491d9ea50ffa65985b34289171a20d738b4972fb599d5e1939fef4c60c14a3fec134161381b40ef105f99ba67f7afe7c SHA512 cfa11f597b58d814b8ed6efef30dd2b19935785d61595a2dfbb1220fa5c2417cb724af08cf390bc3896ccf2c68d2834e92cf9ec98e8e7fa3c2ee0a43c8cfad05
 EBUILD portage-3.0.34.ebuild 8778 BLAKE2B 07684b3309556f0ba97088b588992fbf3e8804d090086865872d78cc6255517dfab543431964919cadeadf180e6cfe4856778ebe1e40c6149aa1857b02fee7e8 SHA512 5d5e64586a6f6569d840fc4d7baf94a85140c1b96c67f3ed1d04c5e08fdd4843989de81d1c4a429c2b629917fd292938350371be6d5ac76fd046949089f5a454
 EBUILD portage-3.0.35.ebuild 8778 BLAKE2B 07684b3309556f0ba97088b588992fbf3e8804d090086865872d78cc6255517dfab543431964919cadeadf180e6cfe4856778ebe1e40c6149aa1857b02fee7e8 SHA512 5d5e64586a6f6569d840fc4d7baf94a85140c1b96c67f3ed1d04c5e08fdd4843989de81d1c4a429c2b629917fd292938350371be6d5ac76fd046949089f5a454
+EBUILD portage-3.0.36.ebuild 8778 BLAKE2B 07684b3309556f0ba97088b588992fbf3e8804d090086865872d78cc6255517dfab543431964919cadeadf180e6cfe4856778ebe1e40c6149aa1857b02fee7e8 SHA512 5d5e64586a6f6569d840fc4d7baf94a85140c1b96c67f3ed1d04c5e08fdd4843989de81d1c4a429c2b629917fd292938350371be6d5ac76fd046949089f5a454
 EBUILD portage-9999.ebuild 8018 BLAKE2B 697673972eb6bf97f1787e316dd5f47e24ac875a51c2f6397cb756cdd47e2d13517c497831a4aa106195ef6010ba6d55705727e3110cb4f696c7077b87d1cfde SHA512 e93838433d223a828c959ccc21411525794e611a21352d7e47c06cd17b337a8bd8b1af12324bcc5d5d2e03357d8a185b13458a627724b365f9005e163740ede8
 MISC metadata.xml 1487 BLAKE2B 5b9833e8bfc2c38e4db95f2368a65d85623aa8dd166e4e09bed4cbe3a7e59d47da69a9dff1e6615fd64f349cc05f57217ee61ebfd23e3e13622a7573ea135659 SHA512 b22f8c1f3a4dce636d0f823f1303f60d32fd570b484e93a64dfbdcbe145534b3472ae94c1ac992a478c9e2930fbc8a5311e0080b4722f9b5dc29dff59ddaa7c8
diff --git a/sys-apps/portage/portage-3.0.36.ebuild b/sys-apps/portage/portage-3.0.36.ebuild
new file mode 100644
index 000000000000..26815216586a
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.36.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix
+
+DESCRIPTION="The package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils
+	test? ( dev-vcs/git )"
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	acct-user/portage
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
+	!build? (
+		>=sys-apps/sed-4.0.5
+		>=app-shells/bash-5.0:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
+			>=sec-keys/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		>=sys-apps/file-5.41
+		>=sys-apps/coreutils-6.4
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	if use native-extensions && tc-is-cross-compiler; then
+		einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+	fi
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	local PATCHES=(
+	)
+
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions && ! tc-is-cross-compiler; then
+		printf "[build_ext]\nportage_ext_modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	dotmpfiles "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	if ! use build; then
+		python_setup
+		local sitedir=$(python_get_sitedir)
+		[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
+		env -u DISTDIR \
+			-u PORTAGE_OVERRIDE_EPREFIX \
+			-u PORTAGE_REPOSITORIES \
+			-u PORTDIR \
+			-u PORTDIR_OVERLAY \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+		env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+		env -u FEATURES -u PORTAGE_REPOSITORIES \
+			PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+			"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die
+	fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 87201e3822d2..5ac31b74f7f6 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ucx/Manifest b/sys-cluster/ucx/Manifest
index 11541862df17..2113a21f1857 100644
--- a/sys-cluster/ucx/Manifest
+++ b/sys-cluster/ucx/Manifest
@@ -1,12 +1,16 @@
 AUX ucx-1.10.0_rc5-drop-werror.patch 1822 BLAKE2B 4a0f9310f8cfd6691f0aac4d86570f60da05e5bc747445884b03618cf67fc583faa75f5789a2147dfa0ecf0c0bd651d87526bc3127a6b9eb092037a90927da22 SHA512 677f9c5a85e6971b7ed4dc9b9f71f69574797df048f6cde25a1c3e61700af71975c4ecbba73d6bcd8ccea582905701a4ea839cfa5b4b81312e09cd729317798e
 AUX ucx-1.13.0-binutils-2.39-ptr-typedef.patch 957 BLAKE2B 848012972fd7e2c8469ee47e6f4cd01459fa16bab4afd75c474a71f77824677b8c17d03ab0e0482d6d2ec389d6b9f14e43e5ee8951c6361b0d4fc751a3cf09ab SHA512 c65625d00757c1689b55213d070779f1d3b4462411c50aa989a00a73742f9011329cb08ab9e92ea3635935dc2bd6d28914ba7a495360dccf9f219b7bb5ece293
+AUX ucx-1.13.0-cstdint-include.patch 559 BLAKE2B dfd13c69862ed1d541e706ba9c92286132f48a2d398bc3fd82224e3bb9f3c706dfa90d2f243230a4b004d7cde4378df877bc0b70323cb61d1927a804ff5e5e50 SHA512 d8ec39ee1c30ecac5c559348ddf6137a330a66f9031da1896cffe59490f8c8877b82664b8ed436e8bdf4bf30cc78c187af54be3c09bd06b1662d5128cd26a010
 AUX ucx-1.13.0-drop-werror.patch 835 BLAKE2B eaf0a5a5ae7339e49a74f8382491d9b59a2cd25eff7fa6c7d3b38eb4352106a44c66824a1eac25553ea0d53fee1bfe959a58f95e13a04e3bf01e5aecf9b2cd69 SHA512 504a64f03c258afc41b54f656ba7354258d699141d90954343ed19caef5712dee147bdff148c01a553fc75eb30ecab31227fe9a37be9c85af3a478692527acdb
 AUX ucx-1.13.0-fix-bashisms.patch 1846 BLAKE2B a2fe4b6f0ca98632ab67131aecb70a52bcba23861883f5750c8cea5536ca799b487f0a76dcd99c5d3b370a303feeb06bcec467b24d0db1dde7530e1b34cc5efc SHA512 040aa3740f7317fa32bd9383461a35565521ba0282da6abd55afb76f55beecdb1991cb76dc9e31f568c9cf834c65ff0704f79375611c7b126e2ec8a4fe2c5c25
 AUX ucx-1.13.0-fix-fcntl-include-musl.patch 3007 BLAKE2B 1383a52232d93871f89e5f0ae1eeb24fbb3e07683780b0a6672a0025f4be383baf657240f5ea9f8b635c33830a0ec7bdfda0ecb1417465a8a91e2b8a9756604e SHA512 7607ae95df0649a512b28f93e17beae9246f72bf315b60423cd519281f1dbaccaa97446376cad61b1665e22d3edd2352011c6e059313cb18ac30f6c71e7ac946
+AUX ucx-1.13.0-no-rpm-sandbox.patch 751 BLAKE2B 8144335c3edb2bb99949cd02a79f48088163c19455495a60a15757295c98ae6d8ac550da2ae132336e7825c54683d45e24403ccfb30abb53743ca17ae9bb4723 SHA512 836810338352647860ec56446a8be2d4b6898c558c48c2dfb8b7f9441314a4053a6d8172e334780af652632a7ebb935e9f2031fa04f1a1ebc7f094e2a2fe64f6
 DIST ucx-1.10.0_rc5.tar.gz 2399950 BLAKE2B f6f78d2a3e0cd7f252354d59b9d667992c5f9f4d8ee4a41356decf4a1ed72382d8ce5213395bc6bacf1d8658f95808082cc0f825230857ddbbff19ed060efa5c SHA512 b772ad030e80bc5b0ab25d590117950d363f5f7ea1b7ed5ce0bba285d0a932205ee4d73705c094cef077c751b1cf8b6efdd4608c7df6b39d813771a0a31460ac
 DIST ucx-1.13.0.tar.gz 2770439 BLAKE2B 779bf7913ec1d0f5aebfd12d4eda90c83f6dae746e82bb818c4d981f6f564ecb37b6e003c3718db4ad74f25aa19fcbeb0ff98ed6349e254b7c707b4dda3c8974 SHA512 bea02adeb5c4286df360cfe788b40afde3e0404c659678497b53e753851e091de766f32aef39bd6f76e71802c88f0e0ed49c31af0c908ce2d9f3edc79ed6f933
+DIST ucx-1.13.1.tar.gz 2979566 BLAKE2B c175f876dda923062a1350b2f3939aca1c9ce3b8a0ee2a50bcc35c72b9f622cc7f4b740194dfdf2b28f56050f05cf4305d903ca0fb35496090691097f2f6d02b SHA512 8ca0876b55326deaf9f756ad8b60b2f6b96d8107d8fc4b9c58b3aad99b161b5a6c4c8a64a924ce35899012959c2d4479eac0309bec05227cf06ffc83dbfc2f6f
 DIST ucx-1.9.0.tar.gz 2467338 BLAKE2B 4d2d18c530f99a56baeb1dec88a7dba813970d3f501eb08f637dc7cefcfe5e564bc121e50c1842ea94e927a0fd657847c571241e3dd9601cdde207729d32d721 SHA512 2e8507e9cbba9ea445efdf8be5b5128dfc76cce30111805e9f7a5618bbbbb77d2bb449b6ad5e415f086b3156b63128306671d3a906583248cde720edb4241c67
 EBUILD ucx-1.10.0_rc5.ebuild 787 BLAKE2B e194162df091517e92d11ce58c2c0219eabed5b3e21fa0b4cd8db0abcdf94d1f64165a6b40991513bfb25c17437d84caf0eb823ef6dd05c58f563735b085cce5 SHA512 562b0ce8c4550ecfcb2cd289e4af9cd3c7acf7a91d5e577f7f814381254519bab1e3926aae0eca196450b4ad7fe3980904f7a74356cdf2c8e8f66367b21d7bf5
-EBUILD ucx-1.13.0.ebuild 1153 BLAKE2B e586d7410850e82f67fa4c575ae2424ffa7411ec6728cdb3ab15ac6600ba0b09d2f577a5ef855414e2e86c712da9b5a3fb5b9c86e6477122ed6c2411be41945d SHA512 c104f2f1265d714f49445ee997d5c7a5b2716fa557779ac3314b3c06085d041fce659809ef5723a63e5764a526e5738be15a6ca74212d51feb840550ce0f56fa
+EBUILD ucx-1.13.0.ebuild 1203 BLAKE2B 1f61d78b1b6c7813e915db4dea0c51e7e733bd5ab44a5650468298c5231203317f8390c782fae01b94a9026d64c184b6606d745bc69f6c85deba34b6d49455de SHA512 9b751914d2fa54fb89a9c4bff6a4c5390f7642ff8c92dd240d61c1528340e439f7f85bf9b3b3c95b7d34f1eb2007270c77a8096d41eeccc812c608bd1b459fbe
+EBUILD ucx-1.13.1.ebuild 1257 BLAKE2B 4e113648e84a27b76add36e00da408a29a21787ec57ed93c42a1747a657143b6269aeedbfe2c9e5c023cdacdb9dc53fcb86c48f8ed176d43426291f13a760b74 SHA512 858f12dce17c5a77289ad464bb6d64f86d27da9539ecb608974ae6eda0ed7d92c0ee85274c1c34f7503bc09e5e359a7a393e9f53a624e577a45893e3fa8b53c6
 EBUILD ucx-1.9.0.ebuild 608 BLAKE2B c6b01f62989d841ccc7be1dffb3ddf356d8f59bc5621bef514a300984d9f63317cb5c5b51cbf031689e292d262477082b7c4365fb899c0ddab91f6541abe8e5d SHA512 cbb8fe1196f36f2d68803c004ad6343378ff1a8eb693249c5bbe0c196fb9b72d5dddead0def92857c1afd771d440ccaed287b106d878e6424cc0f694b2a83d5e
 MISC metadata.xml 415 BLAKE2B 314b20a7f39116af997a15309552142ad7141940d12646a6e4ddca3131b53b62d62522915e353374cf0667af236ff92d8929e81291ed090eec3f49a0b8cfc6fe SHA512 c86ba7f79718e898e7c45856029d6bdb4b638a23af5a3362202d1ff8d890f79696535fee123812428f4bfe3b91408b8a5c9ebb8172dfd01ae65e63feeac9a6d0
diff --git a/sys-cluster/ucx/files/ucx-1.13.0-cstdint-include.patch b/sys-cluster/ucx/files/ucx-1.13.0-cstdint-include.patch
new file mode 100644
index 000000000000..890c630c5792
--- /dev/null
+++ b/sys-cluster/ucx/files/ucx-1.13.0-cstdint-include.patch
@@ -0,0 +1,20 @@
+https://github.com/openucx/ucx/pull/8517
+
+From 8f70e898b43d1bde1ff3fae56bf0ac5aac285997 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 9 Sep 2022 11:35:03 +0100
+Subject: [PATCH] TEST/SOCKADDR: Add missing <cstdint> include for GCC 13
+
+Closes: https://github.com/openucx/ucx/issues/8347
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/test/apps/sockaddr/sa_util.h
++++ b/test/apps/sockaddr/sa_util.h
+@@ -7,6 +7,7 @@
+ #ifndef SA_UTIL_H_
+ #define SA_UTIL_H_
+ 
++#include <cstdint>
+ #include <iostream>
+ #include <sstream>
+ #include <string>
+
diff --git a/sys-cluster/ucx/files/ucx-1.13.0-no-rpm-sandbox.patch b/sys-cluster/ucx/files/ucx-1.13.0-no-rpm-sandbox.patch
new file mode 100644
index 000000000000..c387d640dff6
--- /dev/null
+++ b/sys-cluster/ucx/files/ucx-1.13.0-no-rpm-sandbox.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790338
+--- a/src/uct/ib/Makefile.am
++++ b/src/uct/ib/Makefile.am
+@@ -13,7 +13,7 @@ libuct_ib_la_CFLAGS   = $(BASE_CFLAGS)
+ libuct_ib_la_LIBADD   = $(top_builddir)/src/ucs/libucs.la \
+                         $(top_builddir)/src/uct/libuct.la
+ libuct_ib_la_LDFLAGS  = $(IBVERBS_LDFLAGS) $(NUMA_LIBS) -version-info $(SOVERSION)
+-libmlx5_ver           = $(shell (rpm -qf $(IBVERBS_DIR)/include/infiniband/mlx5_hw.h &>/dev/null && rpm -qf /usr/include/infiniband/mlx5_hw.h) | grep -v 'not owned' | head -1)
++libmlx5_ver           = $(shell (false -qf $(IBVERBS_DIR)/include/infiniband/mlx5_hw.h &>/dev/null && false -qf /usr/include/infiniband/mlx5_hw.h) | grep -v 'not owned' | head -1)
+ 
+ noinst_HEADERS = \
+ 	base/ib_device.h \
diff --git a/sys-cluster/ucx/ucx-1.13.0.ebuild b/sys-cluster/ucx/ucx-1.13.0.ebuild
index 983466a7cf98..309fe0901b82 100644
--- a/sys-cluster/ucx/ucx-1.13.0.ebuild
+++ b/sys-cluster/ucx/ucx-1.13.0.ebuild
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.13.0-drop-werror.patch
 	"${FILESDIR}"/${PN}-1.13.0-fix-bashisms.patch
 	"${FILESDIR}"/${PN}-1.13.0-fix-fcntl-include-musl.patch
+	"${FILESDIR}"/${PN}-1.13.0-cstdint-include.patch
 	"${FILESDIR}"/${P}-binutils-2.39-ptr-typedef.patch
 )
 
diff --git a/sys-cluster/ucx/ucx-1.13.1.ebuild b/sys-cluster/ucx/ucx-1.13.1.ebuild
new file mode 100644
index 000000000000..e3b3021121c9
--- /dev/null
+++ b/sys-cluster/ucx/ucx-1.13.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Unified Communication X"
+HOMEPAGE="https://www.openucx.org"
+SRC_URI="https://github.com/openucx/ucx/releases/download/v${PV}/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 -riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="+numa +openmp"
+
+RDEPEND="
+	sys-libs/binutils-libs:=
+	numa? ( sys-process/numactl )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.13.0-drop-werror.patch
+	"${FILESDIR}"/${PN}-1.13.0-fix-bashisms.patch
+	"${FILESDIR}"/${PN}-1.13.0-fix-fcntl-include-musl.patch
+	"${FILESDIR}"/${PN}-1.13.0-cstdint-include.patch
+	"${FILESDIR}"/${PN}-1.13.0-binutils-2.39-ptr-typedef.patch
+	"${FILESDIR}"/${PN}-1.13.0-no-rpm-sandbox.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	BASE_CFLAGS="" econf \
+		--disable-compiler-opt \
+		--without-fuse3 \
+		--without-go \
+		$(use_enable numa) \
+		$(use_enable openmp)
+}
+
+src_compile() {
+	BASE_CFLAGS="" emake
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index e5aff4e38f9d..b3e8451cf017 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index b671a142ab60..568187ce9df3 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -3,12 +3,9 @@ AUX mold-1.3.0-openssl-pkgconfig.patch 887 BLAKE2B c014be11c2e18b8df12f156ac8a40
 AUX mold-1.3.1-fix-riscv-set32.patch 831 BLAKE2B 103fa9944f16993842b941b607b7e157b8fa31064fd7a115c8f1da4b617b98939b55caae98b246047e6ec0fa136d2b175001ab4dd18df5817cb282fd4e3aad9c SHA512 03b1ae4708826df19d7a879b985f7e81ad283abace64e306b982800ba633136d8f01b00221b3d9ca57fe3b21eb2796af33b0c3fbee4d94e6bb9e84043828fe01
 AUX mold-1.4.1-glob-tests.patch 5512 BLAKE2B bade33580bb63e58541dc1bafe4dc0fd0592e752e6f6003e67e210899ac3f4ee31490d40ee00c8af6ffd222744c56f74c677ba9e4aec2f3c2f4a9fc117846287 SHA512 712c878a649c13808509454fd65c10810777f1ca655365aa7fd3cf25e79247b88367ab454e6508e13f3f932ccc71ae25e4459fb6d3d107efcbe30e943e2f4bfa
 AUX mold-1.4.1-tbb-flags-stripping.patch 1141 BLAKE2B c53b46b509ccc1adb5700ee12270bf15358eca2869f0ec90e686cf1c4218e912dbf151e449220be1cc206a4eb69032619897674a4ecace6f98fce3ea889a883d SHA512 2691bde934649178e4ae45d5bc4554d6c997d10679cf0d575e4be6ecb2fca772caf9a82cdbbf61d00e0d986b3dbfc811a61800da0def1c2aefdf3c64553107d6
-DIST mold-1.3.1.tar.gz 4692379 BLAKE2B e34e9416cfc65d2097c4659ddc205a0c4492e50a1c6e4560006757e5c371d27410e38131f353cd0ee60b124e5fe42b0a1c50cdc3a7bed9f666596e608340e4fd SHA512 f576d2fcfee5cb3bade5ba24dcdd3020a16131ce7d4c3a00c3f92b94785ed86f3f040a6f5814b9c975c4c3d90a2b8c36a8101d5fbf1bc0a4be316f4a4a6dcefa
-DIST mold-1.4.0.tar.gz 4722082 BLAKE2B 65ac52724018f5df82ca40b287a5f3b2c3e4b6b313ef2573bfd0ed6d03054d92b9e1e52cbdad1930406cff232c4b952c33a16979968502c439b860bd782726a9 SHA512 7b7c4a7bac6bbc6e22372d93d94a6cb804c7017eba16b90e9bbc42b9608108c724ef55337aabdd9ce2f5244b94c8fd64311e70e18b5f8cf5f68533c2639e550d
 DIST mold-1.4.1.tar.gz 6280266 BLAKE2B 60d0a876e0bcc8f644e4b6fffe0de14299bf2bd6e382869c87761d725dca6efa874cac37aaf94ad85038c5a24521ed3582782be943236ab81c2e4b66e6002f5e SHA512 304caf4e9d9b24170a9442a84036790407bd02609a5d07c31e5f0f6285128099cbc962571804636a5da55afda59b447c12218f9e4d402fbfa55ebc354814bdda
-EBUILD mold-1.3.1-r1.ebuild 2264 BLAKE2B 5353e5967cae7cbfcf4d768d42c23701ecbc0016c6b5e177d655ca2a6c578df202b7598850af9c9cf527ea5361c6ffbedf18d39b8a1adfbfdf3ab7036cae2802 SHA512 44bb07f58b481536ad247da9576dc9ab510b2e4148dc2a4c94cf6c356409344a21319b1a59ee576f6ec41422631158cc6d540aa4fc4105dcc81b8d071952b611
-EBUILD mold-1.3.1.ebuild 2200 BLAKE2B 7e8a4f95b4edfe6642f6409cd41ef8bf9938ac5c688d0942d74c074b0cc0f1de0b1cf491f876685c59c04934d882cf8e728820b7ea9064a5d0700058ea0842fd SHA512 e962c064be2f8fe1699838fe93ead8b5864dcc64f0f4b10b052522d6099cdeb3d2096fee74b6951d0aa18e2f09ad99d595c1f0e5f4666788eebb80fcd03a6000
-EBUILD mold-1.4.0.ebuild 2200 BLAKE2B 7e8a4f95b4edfe6642f6409cd41ef8bf9938ac5c688d0942d74c074b0cc0f1de0b1cf491f876685c59c04934d882cf8e728820b7ea9064a5d0700058ea0842fd SHA512 e962c064be2f8fe1699838fe93ead8b5864dcc64f0f4b10b052522d6099cdeb3d2096fee74b6951d0aa18e2f09ad99d595c1f0e5f4666788eebb80fcd03a6000
+DIST mold-1.4.2.tar.gz 6287845 BLAKE2B ec429f70b92c4af5be83761893028f2324fe2086fea0e9b64f1d89884c6bc8dd34e5615178ef28ff19c36d01dafc834e6f6b9a8d701d62e360ef4e0be2f065bd SHA512 17f543969e53737818b0be563aee39feac672f93e0fd712827523232b64eccb4629f3994c5a90de50b5f761886669e0946a8d463663725e774eb7d352de1ced1
 EBUILD mold-1.4.1.ebuild 2737 BLAKE2B 2075dac8ebccb452747f75a95785ca20de47291585289b5d31687f75bd130e0bab0854f21f059d19cdf4a5436ee07c1827ea8d9a09d679edb6f856f7a0c6fa61 SHA512 25ebc8333c709021d3b724950b54dbf5e431371888538f54779f0df88fefbfcc2ccf92396f85227c67226fa5348d45073ad37ed1d8d4d6dd20075b67880fbb64
+EBUILD mold-1.4.2.ebuild 2247 BLAKE2B 8e6a4ed72fcd26918269414cb41284b6bd2af396e2faacf4248dfccc23521aba1fc736ebf6c257800c24434b8c0dee1803855ec6e302a514371e00e0819fcadb SHA512 be169d49593c519ea048647cbda871c317f5d72f4021483c7795b70c92a0f0c845ed2d517dd69dbef90e129ecf89dd27612c65f611d736bb7be5886025f5ed17
 EBUILD mold-9999.ebuild 2247 BLAKE2B 8e6a4ed72fcd26918269414cb41284b6bd2af396e2faacf4248dfccc23521aba1fc736ebf6c257800c24434b8c0dee1803855ec6e302a514371e00e0819fcadb SHA512 be169d49593c519ea048647cbda871c317f5d72f4021483c7795b70c92a0f0c845ed2d517dd69dbef90e129ecf89dd27612c65f611d736bb7be5886025f5ed17
 MISC metadata.xml 532 BLAKE2B 567b47e19d44fabf45a4e1153adb53618c78e89adf580c6350f525fd7596e820608571f8f0920b844702c67192dbbb0122002a0a29125ecb31617ae975d52d09 SHA512 1893b76fc3c4ed0889915700661150bb051b92c6a3e55c606e8c4432148f52d8862e5b4968a0c0474630c0f014018a211b9588f71e68c75ad745d688c6448534
diff --git a/sys-devel/mold/mold-1.3.1-r1.ebuild b/sys-devel/mold/mold-1.3.1-r1.ebuild
deleted file mode 100644
index b4a955bb2dea..000000000000
--- a/sys-devel/mold/mold-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Modern Linker"
-HOMEPAGE="https://github.com/rui314/mold"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/rui314/mold.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv"
-fi
-
-LICENSE="AGPL-3"
-SLOT="0"
-
-RDEPEND=">=dev-cpp/tbb-2021.4.0:=
-	sys-libs/zlib
-	!kernel_Darwin? (
-		>=dev-libs/mimalloc-2:=
-		dev-libs/openssl:=
-	)"
-# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
-# TODO: restore SYSTEM_XXHASH upstream?
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# Bug #841575
-	"${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
-	"${FILESDIR}"/${PN}-1.3.0-openssl-pkgconfig.patch
-	# Bug #861488
-	"${FILESDIR}"/${PN}-1.3.1-fix-riscv-set32.patch
-)
-
-pkg_pretend() {
-	# Requires a c++20 compiler, see #831473
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]]; then
-			die "${PN} needs at least gcc 10"
-		elif tc-is-clang && [[ $(clang-major-version) -lt 12 ]]; then
-			die "${PN} needs at least clang 12"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Needs unpackaged dwarfdump
-	rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die
-
-	# Heavy tests, need qemu
-	rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die
-	rm test/elf/lto-{archive,dso,gcc,llvm,version-script}.sh || die
-
-	# Sandbox sadness
-	rm test/elf/run.sh || die
-	sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \
-		test/elf/mold-wrapper{,2}.sh || die
-
-	# static-pie tests require glibc built with static-pie support
-	if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then
-		rm test/elf/{,ifunc-}static-pie.sh || die
-	fi
-}
-
-src_compile() {
-	tc-export CC CXX
-
-	emake \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		STRIP="true" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_test() {
-	emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		check
-}
-
-src_install() {
-	emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		STRIP="true" \
-		install
-}
diff --git a/sys-devel/mold/mold-1.4.0.ebuild b/sys-devel/mold/mold-1.4.0.ebuild
deleted file mode 100644
index 53cc37505b9c..000000000000
--- a/sys-devel/mold/mold-1.4.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Modern Linker"
-HOMEPAGE="https://github.com/rui314/mold"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/rui314/mold.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv"
-fi
-
-LICENSE="AGPL-3"
-SLOT="0"
-
-RDEPEND=">=dev-cpp/tbb-2021.4.0:=
-	sys-libs/zlib
-	!kernel_Darwin? (
-		>=dev-libs/mimalloc-2:=
-		dev-libs/openssl:=
-	)"
-# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
-# TODO: restore SYSTEM_XXHASH upstream?
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# Bug #841575
-	"${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
-	"${FILESDIR}"/${PN}-1.3.0-openssl-pkgconfig.patch
-)
-
-pkg_pretend() {
-	# Requires a c++20 compiler, see #831473
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]]; then
-			die "${PN} needs at least gcc 10"
-		elif tc-is-clang && [[ $(clang-major-version) -lt 12 ]]; then
-			die "${PN} needs at least clang 12"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Needs unpackaged dwarfdump
-	rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die
-
-	# Heavy tests, need qemu
-	rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die
-	rm test/elf/lto-{archive,dso,gcc,llvm,version-script}.sh || die
-
-	# Sandbox sadness
-	rm test/elf/run.sh || die
-	sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \
-		test/elf/mold-wrapper{,2}.sh || die
-
-	# static-pie tests require glibc built with static-pie support
-	if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then
-		rm test/elf/{,ifunc-}static-pie.sh || die
-	fi
-}
-
-src_compile() {
-	tc-export CC CXX
-
-	emake \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		STRIP="true" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_test() {
-	emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		check
-}
-
-src_install() {
-	emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		STRIP="true" \
-		install
-}
diff --git a/sys-devel/mold/mold-1.3.1.ebuild b/sys-devel/mold/mold-1.4.2.ebuild
index 53cc37505b9c..1a83cf4d004e 100644
--- a/sys-devel/mold/mold-1.3.1.ebuild
+++ b/sys-devel/mold/mold-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit cmake toolchain-funcs
 
 DESCRIPTION="A Modern Linker"
 HOMEPAGE="https://github.com/rui314/mold"
@@ -15,23 +15,26 @@ else
 	KEYWORDS="~amd64 ~riscv"
 fi
 
-LICENSE="AGPL-3"
+# mold (AGPL-3)
+#  - xxhash (BSD-2)
+#  - tbb (Apache-2.0)
+LICENSE="AGPL-3 Apache-2.0 BSD-2"
 SLOT="0"
+IUSE="system-tbb"
 
-RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+RDEPEND="
 	sys-libs/zlib
+	system-tbb? ( >=dev-cpp/tbb-2021.4.0:= )
 	!kernel_Darwin? (
 		>=dev-libs/mimalloc-2:=
 		dev-libs/openssl:=
-	)"
-# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
-# TODO: restore SYSTEM_XXHASH upstream?
+	)
+"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	# Bug #841575
-	"${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
-	"${FILESDIR}"/${PN}-1.3.0-openssl-pkgconfig.patch
+	# https://bugs.gentoo.org/865837
+	"${FILESDIR}"/mold-1.4.1-tbb-flags-stripping.patch
 )
 
 pkg_pretend() {
@@ -46,7 +49,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	default
+	cmake_src_prepare
 
 	# Needs unpackaged dwarfdump
 	rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die
@@ -66,32 +69,24 @@ src_prepare() {
 	fi
 }
 
-src_compile() {
-	tc-export CC CXX
-
-	emake \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		STRIP="true" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_test() {
-	emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		check
+src_configure() {
+	local mycmakeargs=(
+		-DMOLD_ENABLE_QEMU_TESTS=OFF
+		-DMOLD_LTO=OFF # Should be up to the user to decide this with CXXFLAGS.
+		-DMOLD_USE_SYSTEM_MIMALLOC=ON
+		-DMOLD_USE_SYSTEM_TBB=$(usex system-tbb)
+	)
+	cmake_src_configure
 }
 
 src_install() {
-	emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		STRIP="true" \
-		install
+	dobin "${BUILD_DIR}"/${PN}
+	dolib.so "${BUILD_DIR}"/${PN}-wrapper.so
+
+	dodoc docs/{design,execstack}.md
+	doman docs/${PN}.1
+
+	dosym ${PN} /usr/bin/ld.${PN}
+	dosym ${PN} /usr/bin/ld64.${PN}
+	dosym ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
 }
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 617ece2e4b92..8645678f7cd7 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 9b8ca58438c8..3b09eef87273 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -2,5 +2,5 @@ AUX libsmbios-2.2.28-cppunit-tests.patch 350 BLAKE2B c735096c5fe0e33eec728e28009
 AUX libsmbios-2.4.3-avoid_bashisms.patch 2909 BLAKE2B 426ca128f142307ea89cc5003c298518115805a518b348345f154094e34be932721aa6c880612fa7fe3473bc1156bf7c2dc1ce085dd9511ddeaf58e54d2464e1 SHA512 d2199481d87527ce7e90ca355cdfaf48a859982e67090e248034139b19ce2d61717e9887d246c7bd6b1e46f3f97cf6ec6bbdf04e3091c513221cb42d0f1431b3
 AUX libsmbios-2.4.3-insecure_rpaths.patch 536 BLAKE2B 7f5e307002b4898665ee2355287e1512d381168e53d1b56a8ef5ebbb503492f49b27c5fe27b53db7c5005f13559b5f0576ba14041436d0f67c172299ddc31877 SHA512 7d1f64d1a9966882a8df31abd5566f07f7fe01cede6ee1140c9b44aa47464efe53997c92ec423228114d568c4cfd77309e4a3dd7d9294fa09b054d72838143da
 DIST libsmbios-2.4.3.tar.gz 644140 BLAKE2B 684bff4f6cf755796f785e9a93d4ddbe2a1af52082cdebc27d203772a6a2a0259edb4b9d19921f90fc78b48d54700223fbc2628665b963ebcb601010ff4340ab SHA512 7f6fb36fa9653e123b416b275953fb5652025e76dac3b4ec5600168e193ea56f8ac3ea1a3b5db29d2770e73d88152d712a35bf77a9b3fc5596570fae885585ad
-EBUILD libsmbios-2.4.3.ebuild 1910 BLAKE2B 50a2098928c7c460b01c89d077ddcccfcf2cb4ea90a85a3ec16ccd59e347ba5d4cf28d8938a12de1993d29fdcfc2a0f5254d5b1b91b5ee4ab5feac0e1416f132 SHA512 94404d7b8791e24423bb9644687899162f7b4dbb501f0c1b31afbaf35d77eb9f46ad9dbae8f248b2fbc60e002882f3bb1f85671c2e5a14b3749ff64cd07aa431
+EBUILD libsmbios-2.4.3.ebuild 2017 BLAKE2B a897c618a894dda6ebb7eacedc39d311ca7062cc6cfe8287c1404c94d2886b92b51745f56f1e58e2a4110c16b1b2f30b85c1366f553fa49f1ecab1eb2ccfb60b SHA512 c767517d8579a4e6d745eef2435036a9a241fbaaf2cef6e636f2bbf6de3d40a9022bda0984c0364ed482d92b8c6861b5d67b7b20cfa06857ee17e0b063d1f2ac
 MISC metadata.xml 670 BLAKE2B 5289ced6533425323143e54359147085513eba236a8cbc5ba6e71c068143a032fb448a695ea7ac1733a6b0d9231932bc3a52dd0fa149c14d2fb1c41bd7ddb0d1 SHA512 00e4e9c65a2b499b935dd5e02b71338d70a76258ebe179c62eafc7a04b6211e1c331e6e57d6d656e0700137d1d15095bb6c4bb4dca0bca3d3e9c0ecf7dd3fa2a
diff --git a/sys-libs/libsmbios/libsmbios-2.4.3.ebuild b/sys-libs/libsmbios/libsmbios-2.4.3.ebuild
index 1a480d6268b6..15ae620a9e16 100644
--- a/sys-libs/libsmbios/libsmbios-2.4.3.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.4.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit autotools flag-o-matic python-single-r1
 
@@ -14,7 +14,8 @@ LICENSE="|| ( GPL-2+ OSL-2.1 ) BSD Boost-1.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ia64 ~riscv x86"
 IUSE="doc graphviz nls +python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="!test? ( test )"
 
@@ -26,8 +27,11 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	graphviz? ( media-gfx/graphviz )
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.9.6 )"
+	nls? ( sys-devel/gettext )"
+BDEPEND="test? (
+	${PYTHON_DEPS}
+	>=dev-util/cppunit-1.9.6
+)"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.28-cppunit-tests.patch"
@@ -36,7 +40,9 @@ PATCHES=(
 )
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
 }
 
 src_prepare() {
@@ -45,7 +51,9 @@ src_prepare() {
 	# Don't build yum-plugin - we don't need it
 	sed '/yum-plugin/d' -i Makefile.am || die
 
-	python_fix_shebang src/pyunit/test*.py
+	if use test; then
+		python_fix_shebang src/pyunit/test*.py
+	fi
 
 	eautoreconf
 }
@@ -67,7 +75,7 @@ src_configure() {
 src_install() {
 	emake install DESTDIR="${D}"
 
-	if use python ; then
+	if use python; then
 		python_scriptinto /usr/sbin
 		python_doscript "${ED}"/usr/sbin/smbios-{{battery,keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
 	fi
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 7ff06fb4a85a..8a857a8885e1 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -95,9 +95,14 @@ DIST ncurses-6.3-20220820.patch.gz 32018 BLAKE2B 14a29ee43c4d8df82a9f939ef4e028a
 DIST ncurses-6.3-20220820.patch.gz.asc 729 BLAKE2B 93179103d5465b5ddff8513a383099bbf07993a1286a164b69d213c176cc39144fc8afb407fbbb2596d975bd7017b677f75609fe8ddaa3415f46cc73c5bdcbe3 SHA512 5e589d29903a2c6c1e85dfb64d7267e3528d65e49a7c4851318139142524bed4824dd787f980b2fbe8327f0b804ecea1ca94bbb6c7615fee9d993ea6d1568773
 DIST ncurses-6.3-20220827.patch.gz 3794 BLAKE2B 2acc58c118af92413189b01d0a9e4d2d3f211921eadbbb3df775d5b64f387d860ddca58ddd2f6ae4ffc04932a5924d03f20ba945eb89a5a1f91382ed0ef0f65f SHA512 5021d4f1ddfcb9baa05926bf3e6cd00f051f301037b2166a48b178a945052a4b2424efd175759a0dde7d604316269ead8554c4eb0c2c46c11d1fd54fad6801a1
 DIST ncurses-6.3-20220827.patch.gz.asc 729 BLAKE2B 363bfe97448821c0eef29e36213389dc9908f289332001851b72e5f0381f76195663f1423150d74c23bb425a37808094e3fa06a261451f59a49861008cbf0e6f SHA512 7180f24a55e3941c7d82498004efb8ef1e9316318c6c53ea5bc1d2b499c960844ff7fd95e1131fcdf2ee4b94a0e8e54ee3f76934c3d91a87775b4a87347f479e
+DIST ncurses-6.3-20220903.patch.gz 4814 BLAKE2B 668041aef48d9ce37474edc6d70e0725323ccb1586a88bddda8e7f81a7717688041e73909089b6d15abdefaeffe0bb9565245dee4b086f07c783b0d95e8e7dbc SHA512 487dd56afd773eafa38260f8067293d41ed6bb9ff841b4c7528c12969b00151b7a3788b0b306d3997d7fb1e98c05ccb32c56f8c839bcc2d9eb4aa9e3db4bae1e
+DIST ncurses-6.3-20220903.patch.gz.asc 729 BLAKE2B 2f076ce9d390ee02edc0b58ecf3a6881897062e34a5f4c09b503c4b306ee70fb0f08e38518029eae4933508a48bda92716dd4b76159a0aa3d7bbd3835d2695ff SHA512 18cb1a77f67b6fddc9f83366487cb547fe1439e7edcd4fc27632702cd3ffc79622dd1421d32454489d08acec7403a04239b34794e81750b703385189a4534b04
 DIST ncurses-6.3.tar.gz 3583550 BLAKE2B b2c174ac48d587b4d3aa054f04e4ec8bffd8a657a4aff5f090104965c741901e600712c8f8e5e98f3b8a26bc558996a1e14a746f113854832853b855e9d406c3 SHA512 5373f228cba6b7869210384a607a2d7faecfcbfef6dbfcd7c513f4e84fbd8bcad53ac7db2e7e84b95582248c1039dcfc7c4db205a618f7da22a166db482f0105
 DIST ncurses-6.3.tar.gz.sig 438 BLAKE2B d7f9852292110fe7a048a9e38611ea06564b5142cb4cbeb8d99bba752d5df8eeffa3b57e5ca315c14024520bc008b30650e99669c995dca05a798399a0c85d39 SHA512 b9a2a25e0b1854c272bf89c610c81fc0ba061f0296eca5c0079a79cfe310e44eb16c46eb5a0dd018f1ca9114d569c9d5087a2b8e60b0344f1eb97f7c5addafc6
+DIST ncurses-6.3_p20220903-patches.tar.xz 76908 BLAKE2B a5afb3a5c016ad6b602e6af77cc4fc067692f1e1245cf006feb2b74e69be13b2ffb2b14c7b5de48780965d6b596621cc399c316657ae63afbe5ea9ff2d9715fa SHA512 11ae7458f925a68bf6d482f204e9e57ef23cf456ea9827c713787f635bd11621c3612651a90f3f3a3c7c2742f95fde4bc87d6500115ef74300b9a4d240ff74ad
 EBUILD ncurses-6.3_p20220423.ebuild 12167 BLAKE2B d7ea349cae22e242b2dabb4376f61e22902003137387a5a0af844961c3f2d64b2618fc3f9c654285491f2f80bb1de70124a8cd86345de4239331f3e69537a8be SHA512 7f5bcaed9bceb9eea739d4396ac0a1293aa3194d9d3f4085ece5db541fe86b8dbee76317e5b12ffbb7243eb09aa123b2c8efb376b1b3ebf5c795aed5a4dc9eef
 EBUILD ncurses-6.3_p20220827-r1.ebuild 12236 BLAKE2B 53261bd55ba8d2efa739b9309624bbf17e20984dab9e0b040cffc4058f3bfd394853a0a72e0223d227882b2676b2f56d8c2703256955bab7e347a0b9f3aa2a1c SHA512 5d67dc3716535da4bf5167f674f17e1bffb4359806cfd222a48a011d7f500cd58a2d11d0c86819e21dcf4d5852f125353402d16ac7ee588f53a75fb392e79cce
 EBUILD ncurses-6.3_p20220827.ebuild 12110 BLAKE2B aa1226cb5e8ea8b23f66e9e7376e795594a8da27eb668fe9252418a40333162901e51194b1270e8b0a47adf18d795305dd87885aa3604c4f7a753c697082a393 SHA512 d47f2c1be92863dbd377b47dfa91d7114b05cc9443e90aaae6ca2b59a7d2d46e75f198acd518ed3224547d1378cb0c93e20c6b569efeb7d0ef4472d7f8b0e192
+EBUILD ncurses-6.3_p20220903-r1.ebuild 13115 BLAKE2B 481f8c3cc5234c94445aa1a42abfe4311466cfcc42b5cf4a246324423e86f0ab6598747b78bada30819d45ee42a3ec02cbef6f30516cb3eb3bcac8f0b2ca7756 SHA512 6f13d98105d885248d9c877a539a6898353795c10029a0c265fbb409cc304bcc92dc353c201062f69e970430906b41951a3e6d7c7df69f57fd4027ee16581fbb
+EBUILD ncurses-6.3_p20220903.ebuild 12989 BLAKE2B 27c780a49821c260d623a98791426ce4c02a655329e2e7129d5d9666ef47056cae0355e3363a42ed1fb6e582af8c1f3bc885673098f7edac7a651f3bf7cb00be SHA512 4678c641f07b064709c0e53677a33b5918ebaa9b1114722736cf767473403a0145e49e72887bde2a0e880874606a12fc6e0364a1f2095486fa760a7fc3847a18
 MISC metadata.xml 1094 BLAKE2B a65bbb9584f77fb07fff735e6471ef48a5d63e7fa79112bf75df67f2f94e816706165fdd42a482708a7fd2ab3b3e308f9766eac0b39c3a4e31dcff5b3db25d57 SHA512 adf0f939a1e14c964bfb44ab80b1b8c1ee897a036a994848ba3e40280ab3a73ddb3beef540c905efd623e71b890c4c91e0b7c24651561d0e2bb2a4c86f039dba
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild
new file mode 100644
index 000000000000..9985db97618b
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig
+
+MY_PV="${PV:0:3}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz
+	https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz
+	verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )"
+
+GENTOO_PATCH_DEV=sam
+GENTOO_PATCH_PV=6.3_p20220903
+GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches
+
+# Populated below in a loop. Do not add patches manually here.
+UPSTREAM_PATCHES=()
+
+if [[ ${PV} == *_p* ]] ; then
+	# Sometimes, after releases, there's no megapatch available yet.
+	#
+	# From upstream README at e.g. https://invisible-island.net/archives/ncurses/6.3/:
+	#
+	#	"At times (generally to mark a relatively stable point), I create a rollup
+	#	patch, which consists of all changes from the release through the current date."
+	#
+	# Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html,
+	# the patches are considered to be acceptable to use after some testing. They
+	# are both for development but also bug fixes.
+	#
+	# This array should contain a list of all the snapshots since the last
+	# release if there's no megapatch available yet.
+	PATCH_DATES=(
+		20211026
+		20211030
+		20211106
+		20211113
+		20211115
+		20211120
+		20211127
+		20211204
+		20211211
+		20211219
+		20211225
+		20220101
+		20220115
+		20220122
+		20220129
+		20220205
+		20220212
+		20220219
+		20220226
+		20220305
+		20220312
+		20220319
+		20220326
+		20220402
+		20220409
+		20220416
+		20220423
+		20220430
+		20220501
+		20220507
+		20220514
+		20220521
+		20220529
+		20220604
+		20220612
+		20220618
+		20220625
+		20220703
+		20220709
+		20220716
+		20220724
+		20220729
+		20220806
+		20220813
+		20220820
+		20220827
+
+		# Latest patch is just _pN = $(ver_cut 4)
+		$(ver_cut 4)
+	)
+
+	if [[ -z ${PATCH_DATES[@]} ]] ; then
+		SRC_URI+=" https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz"
+		SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz.asc"
+
+		# If we have a rollup patch, use that instead of the individual ones.
+		UPSTREAM_PATCHES+=( "${WORKDIR}"/${P/_p/-}-patch.sh )
+	else
+		patch_url=
+		my_patch_index=
+
+		for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}"; my_patch_index++)); do
+			patch_url="$(printf "https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s" ${PATCH_DATES[${my_patch_index}]}.patch.gz)"
+			SRC_URI+=" ${patch_url}"
+			SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
+			UPSTREAM_PATCHES+=( "${WORKDIR}"/${MY_P}-${PATCH_DATES[${my_patch_index}]}.patch )
+		done
+
+		unset patch_url
+		unset my_patch_index
+	fi
+
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz"
+fi
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="0/6"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ada +cxx debug doc gpm minimal profile +stack-realign static-libs test tinfo trace"
+RESTRICT="!test? ( test )"
+
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+# Block the older ncurses that installed all files w/SLOT=5, bug #557472
+RDEPEND="${DEPEND}
+	!<=sys-libs/ncurses-5.9-r4:5
+	!<sys-libs/slang-2.3.2_pre23
+	!<x11-terms/rxvt-unicode-9.06-r3
+	!<x11-terms/st-0.6-r1"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${UPSTREAM_PATCHES[@]}"
+
+	# When rebasing Gentoo's patchset, please use git from a clean
+	# src_unpack with upstream patches already applied. git am
+	# the existing patchset and rebase as required. This makes it easier
+	# to manage future rebasing & adding new patches.
+	#
+	# For the same reasons, please include the original configure.in changes,
+	# NOT just the generated results!
+	"${WORKDIR}"/${GENTOO_PATCH_NAME}
+)
+
+src_unpack() {
+	# Avoid trying to verify our own patchset tarball, there's no point
+	if use verify-sig ; then
+		local file
+		for file in ${A} ; do
+			if [[ ${file} == ${MY_P}.tar.gz ]] ; then
+				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig
+			else
+				[[ ${file} == @(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue
+
+				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	# bug #115036
+	unset TERMINFO
+
+	tc-export_build_env BUILD_{CC,CPP}
+
+	# bug #214642
+	BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
+
+	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
+	# Order matters here -- we want unicode/thread versions to come last so that the
+	# binaries in /usr/bin support both wide and narrow.
+	# The naming is also important as we use these directly with filenames and when
+	# checking configure flags.
+	NCURSES_TARGETS=(
+		ncurses
+		ncursesw
+		ncursest
+		ncursestw
+	)
+
+	# When installing ncurses, we have to use a compatible version of tic.
+	# This comes up when cross-compiling, doing multilib builds, upgrading,
+	# or installing for the first time.  Build a local copy of tic whenever
+	# the host version isn't available. bug #249363, bug #557598
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		local lbuildflags="-static"
+
+		# some toolchains don't quite support static linking
+		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+		case ${CHOST} in
+			*-darwin*)  dbuildflags=     ;;
+			*-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
+		esac
+		echo "int main() {}" | \
+			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
+			|| lbuildflags="${dbuildflags}"
+
+		# We can't re-use the multilib BUILD_DIR because we run outside of it.
+		BUILD_DIR="${WORKDIR}" \
+		CC=${BUILD_CC} \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
+		do_configure cross --without-shared --with-normal --with-progs
+	fi
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	if [[ ${ABI} == x86 ]] ; then
+		# For compatibility with older binaries at slight performance cost.
+		# bug #616402
+		use stack-realign && append-flags -mstackrealign
+	fi
+
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_configure "${t}"
+	done
+}
+
+do_configure() {
+	local target=$1
+	shift
+
+	mkdir "${BUILD_DIR}/${target}" || die
+	cd "${BUILD_DIR}/${target}" || die
+
+	local conf=(
+		# We need the basic terminfo files in /etc, bug #37026.  We will
+		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+		# src_install() ...
+		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+		# Enable installation of .pc files.
+		--enable-pc-files
+		# This path is used to control where the .pc files are installed.
+		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+
+		# Now the rest of the various standard flags.
+		--with-shared
+		# (Originally disabled until bug #245417 is sorted out, but now
+		# just keeping it off for good, given nobody needed it until now
+		# (2022) and we're trying to phase out bdb.)
+		--without-hashed-db
+		$(use_with ada)
+		$(use_with cxx)
+		$(use_with cxx cxx-binding)
+		--with-cxx-shared
+		$(use_with debug)
+		$(use_with profile)
+		# The configure script uses ldd to parse the linked output which
+		# is flaky for cross-compiling/multilib/ldd versions/etc...
+		$(use_with gpm gpm libgpm.so.1)
+		# Required for building  on mingw-w64, and possibly other windows
+		# platforms, bug #639670
+		$(use_enable kernel_Winnt term-driver)
+		--disable-termcap
+		--enable-symlinks
+		--with-rcs-ids
+		--with-manpage-format=normal
+		--enable-const
+		--enable-colorfgbg
+		--enable-hard-tabs
+		--enable-echo
+		$(use_enable !ada warnings)
+		$(use_with debug assertions)
+		$(use_enable !debug leaks)
+		$(use_with debug expanded)
+		$(use_with !debug macros)
+		$(multilib_native_with progs)
+		$(use_with test tests)
+		$(use_with trace)
+		$(use_with tinfo termlib)
+		--disable-stripping
+		--disable-pkg-ldflags
+	)
+
+	if [[ ${target} == ncurses*w ]] ; then
+		conf+=( --enable-widec )
+	else
+		conf+=( --disable-widec )
+	fi
+	if [[ ${target} == ncursest* ]] ; then
+		conf+=( --with-{pthread,reentrant} )
+	else
+		conf+=( --without-{pthread,reentrant} )
+	fi
+
+	# Make sure each variant goes in a unique location.
+	if [[ ${target} == "ncurses" ]] ; then
+		# "ncurses" variant goes into "${EPREFIX}"/usr/include
+		# It is needed on Prefix because the configure script appends
+		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
+		conf+=( --enable-overwrite )
+	else
+		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+	fi
+	# See comments in src_configure.
+	if [[ ${target} != "cross" ]] ; then
+		local cross_path="${WORKDIR}/cross"
+		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
+	fi
+
+	ECONF_SOURCE="${S}" econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+	# See comments in src_configure.
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		# We could possibly merge these two branches but opting to be
+		# conservative when merging some of the Prefix changes.
+
+		if [[ ${CHOST} == *-cygwin* ]] && ! multilib_is_native_abi ; then
+			# We make 'tic$(x)' here, for Cygwin having x=".exe".
+			BUILD_DIR="${WORKDIR}" \
+				 do_compile cross -C progs all PROGS='tic$(x)'
+		else
+			BUILD_DIR="${WORKDIR}" \
+				 do_compile cross -C progs tic
+		fi
+	fi
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_compile "${t}"
+	done
+}
+
+do_compile() {
+	local target=$1
+	shift
+
+	cd "${BUILD_DIR}/${target}" || die
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.
+	emake -j1 sources
+
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files || die
+	emake "$@"
+}
+
+multilib_src_install() {
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+	done
+
+	# Move main libraries into /.
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a \
+			"${NCURSES_TARGETS[@]}" \
+			$(usex tinfo 'tinfow tinfo' '')
+	fi
+
+	# Don't delete '*.dll.a', needed for linking, bug #631468
+	if ! use static-libs; then
+		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
+	fi
+
+	# Build fails to create this ...
+	# -FIXME-
+	# Ugly hackaround for riscv having two parts libdir (bug #689240)
+	# Replace this hack with an official solution once we have one...
+	# -FIXME-
+	dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
+		/usr/$(get_libdir)/terminfo
+
+	# Remove obsolete libcurses symlink that is created by the build
+	# system. Technically, this could be also achieved
+	# via --disable-overwrite but it also moves headers implicitly,
+	# and we do not want to do this yet.
+	# bug #836696
+	rm "${ED}"/usr/$(get_libdir)/libcurses* || die
+}
+
+multilib_src_install_all() {
+	# We need the basic terminfo files in /etc for embedded/recovery, bug #37026
+	einfo "Installing basic terminfo files in /etc..."
+	local terms=(
+		# Dumb/simple values that show up when using the in-kernel VT.
+		ansi console dumb linux
+		vt{52,100,102,200,220}
+		# [u]rxvt users used to be pretty common.  Probably should drop this
+		# since upstream is dead and people are moving away from it.
+		rxvt{,-unicode}{,-256color}
+		# xterm users are common, as is terminals re-using/spoofing it.
+		xterm xterm-{,256}color
+		# screen is common (and reused by tmux).
+		screen{,-256color}
+		screen.xterm-256color
+	)
+	local x
+	for x in "${terms[@]}"; do
+		local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+		local basedir=$(basename "$(dirname "${termfile}")")
+
+		if [[ -n ${termfile} ]] ; then
+			dodir "/etc/terminfo/${basedir}"
+			mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
+			dosym "../../../../etc/terminfo/${basedir}/${x}" \
+				"/usr/share/terminfo/${basedir}/${x}"
+		fi
+	done
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
+
+	use minimal && rm -r "${ED}"/usr/share/terminfo*
+	# Because ncurses5-config --terminfo returns the directory we keep it
+	# bug #245374
+	keepdir /usr/share/terminfo
+
+	cd "${S}" || die
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	if use doc ; then
+		docinto html
+		dodoc -r doc/html/
+	fi
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libncurses.so.5
+	preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
+	preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild
new file mode 100644
index 000000000000..1b8eb4516559
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild
@@ -0,0 +1,444 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig
+
+MY_PV="${PV:0:3}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz
+	https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz
+	verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )"
+
+GENTOO_PATCH_DEV=sam
+GENTOO_PATCH_PV=6.3_p20220903
+GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches
+
+# Populated below in a loop. Do not add patches manually here.
+UPSTREAM_PATCHES=()
+
+if [[ ${PV} == *_p* ]] ; then
+	# Sometimes, after releases, there's no megapatch available yet.
+	#
+	# From upstream README at e.g. https://invisible-island.net/archives/ncurses/6.3/:
+	#
+	#	"At times (generally to mark a relatively stable point), I create a rollup
+	#	patch, which consists of all changes from the release through the current date."
+	#
+	# Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html,
+	# the patches are considered to be acceptable to use after some testing. They
+	# are both for development but also bug fixes.
+	#
+	# This array should contain a list of all the snapshots since the last
+	# release if there's no megapatch available yet.
+	PATCH_DATES=(
+		20211026
+		20211030
+		20211106
+		20211113
+		20211115
+		20211120
+		20211127
+		20211204
+		20211211
+		20211219
+		20211225
+		20220101
+		20220115
+		20220122
+		20220129
+		20220205
+		20220212
+		20220219
+		20220226
+		20220305
+		20220312
+		20220319
+		20220326
+		20220402
+		20220409
+		20220416
+		20220423
+		20220430
+		20220501
+		20220507
+		20220514
+		20220521
+		20220529
+		20220604
+		20220612
+		20220618
+		20220625
+		20220703
+		20220709
+		20220716
+		20220724
+		20220729
+		20220806
+		20220813
+		20220820
+		20220827
+
+		# Latest patch is just _pN = $(ver_cut 4)
+		$(ver_cut 4)
+	)
+
+	if [[ -z ${PATCH_DATES[@]} ]] ; then
+		SRC_URI+=" https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz"
+		SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz.asc"
+
+		# If we have a rollup patch, use that instead of the individual ones.
+		UPSTREAM_PATCHES+=( "${WORKDIR}"/${P/_p/-}-patch.sh )
+	else
+		patch_url=
+		my_patch_index=
+
+		for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}"; my_patch_index++)); do
+			patch_url="$(printf "https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s" ${PATCH_DATES[${my_patch_index}]}.patch.gz)"
+			SRC_URI+=" ${patch_url}"
+			SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
+			UPSTREAM_PATCHES+=( "${WORKDIR}"/${MY_P}-${PATCH_DATES[${my_patch_index}]}.patch )
+		done
+
+		unset patch_url
+		unset my_patch_index
+	fi
+
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz"
+fi
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ada +cxx debug doc gpm minimal profile +stack-realign static-libs test tinfo trace"
+RESTRICT="!test? ( test )"
+
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+# Block the older ncurses that installed all files w/SLOT=5, bug #557472
+RDEPEND="${DEPEND}
+	!<=sys-libs/ncurses-5.9-r4:5
+	!<sys-libs/slang-2.3.2_pre23
+	!<x11-terms/rxvt-unicode-9.06-r3
+	!<x11-terms/st-0.6-r1"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${UPSTREAM_PATCHES[@]}"
+
+	# When rebasing Gentoo's patchset, please use git from a clean
+	# src_unpack with upstream patches already applied. git am
+	# the existing patchset and rebase as required. This makes it easier
+	# to manage future rebasing & adding new patches.
+	#
+	# For the same reasons, please include the original configure.in changes,
+	# NOT just the generated results!
+	"${WORKDIR}"/${GENTOO_PATCH_NAME}
+)
+
+src_unpack() {
+	# Avoid trying to verify our own patchset tarball, there's no point
+	if use verify-sig ; then
+		local file
+		for file in ${A} ; do
+			if [[ ${file} == ${MY_P}.tar.gz ]] ; then
+				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig
+			else
+				[[ ${file} == @(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue
+
+				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	# bug #115036
+	unset TERMINFO
+
+	tc-export_build_env BUILD_{CC,CPP}
+
+	# bug #214642
+	BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
+
+	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
+	# Order matters here -- we want unicode/thread versions to come last so that the
+	# binaries in /usr/bin support both wide and narrow.
+	# The naming is also important as we use these directly with filenames and when
+	# checking configure flags.
+	NCURSES_TARGETS=(
+		ncurses
+		ncursesw
+		ncursest
+		ncursestw
+	)
+
+	# When installing ncurses, we have to use a compatible version of tic.
+	# This comes up when cross-compiling, doing multilib builds, upgrading,
+	# or installing for the first time.  Build a local copy of tic whenever
+	# the host version isn't available. bug #249363, bug #557598
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		local lbuildflags="-static"
+
+		# some toolchains don't quite support static linking
+		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+		case ${CHOST} in
+			*-darwin*)  dbuildflags=     ;;
+			*-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
+		esac
+		echo "int main() {}" | \
+			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
+			|| lbuildflags="${dbuildflags}"
+
+		# We can't re-use the multilib BUILD_DIR because we run outside of it.
+		BUILD_DIR="${WORKDIR}" \
+		CC=${BUILD_CC} \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
+		do_configure cross --without-shared --with-normal --with-progs
+	fi
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	if [[ ${ABI} == x86 ]] ; then
+		# For compatibility with older binaries at slight performance cost.
+		# bug #616402
+		use stack-realign && append-flags -mstackrealign
+	fi
+
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_configure "${t}"
+	done
+}
+
+do_configure() {
+	local target=$1
+	shift
+
+	mkdir "${BUILD_DIR}/${target}" || die
+	cd "${BUILD_DIR}/${target}" || die
+
+	local conf=(
+		# We need the basic terminfo files in /etc, bug #37026.  We will
+		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+		# src_install() ...
+		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+		# Enable installation of .pc files.
+		--enable-pc-files
+		# This path is used to control where the .pc files are installed.
+		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+
+		# Now the rest of the various standard flags.
+		--with-shared
+		# (Originally disabled until bug #245417 is sorted out, but now
+		# just keeping it off for good, given nobody needed it until now
+		# (2022) and we're trying to phase out bdb.)
+		--without-hashed-db
+		$(use_with ada)
+		$(use_with cxx)
+		$(use_with cxx cxx-binding)
+		--with-cxx-shared
+		$(use_with debug)
+		$(use_with profile)
+		# The configure script uses ldd to parse the linked output which
+		# is flaky for cross-compiling/multilib/ldd versions/etc...
+		$(use_with gpm gpm libgpm.so.1)
+		# Required for building  on mingw-w64, and possibly other windows
+		# platforms, bug #639670
+		$(use_enable kernel_Winnt term-driver)
+		--disable-termcap
+		--enable-symlinks
+		--with-rcs-ids
+		--with-manpage-format=normal
+		--enable-const
+		--enable-colorfgbg
+		--enable-hard-tabs
+		--enable-echo
+		$(use_enable !ada warnings)
+		$(use_with debug assertions)
+		$(use_enable !debug leaks)
+		$(use_with debug expanded)
+		$(use_with !debug macros)
+		$(multilib_native_with progs)
+		$(use_with test tests)
+		$(use_with trace)
+		$(use_with tinfo termlib)
+		--disable-stripping
+		--disable-pkg-ldflags
+	)
+
+	if [[ ${target} == ncurses*w ]] ; then
+		conf+=( --enable-widec )
+	else
+		conf+=( --disable-widec )
+	fi
+	if [[ ${target} == ncursest* ]] ; then
+		conf+=( --with-{pthread,reentrant} )
+	else
+		conf+=( --without-{pthread,reentrant} )
+	fi
+
+	# Make sure each variant goes in a unique location.
+	if [[ ${target} == "ncurses" ]] ; then
+		# "ncurses" variant goes into "${EPREFIX}"/usr/include
+		# It is needed on Prefix because the configure script appends
+		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
+		conf+=( --enable-overwrite )
+	else
+		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+	fi
+	# See comments in src_configure.
+	if [[ ${target} != "cross" ]] ; then
+		local cross_path="${WORKDIR}/cross"
+		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
+	fi
+
+	ECONF_SOURCE="${S}" econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+	# See comments in src_configure.
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		# We could possibly merge these two branches but opting to be
+		# conservative when merging some of the Prefix changes.
+
+		if [[ ${CHOST} == *-cygwin* ]] && ! multilib_is_native_abi ; then
+			# We make 'tic$(x)' here, for Cygwin having x=".exe".
+			BUILD_DIR="${WORKDIR}" \
+				 do_compile cross -C progs all PROGS='tic$(x)'
+		else
+			BUILD_DIR="${WORKDIR}" \
+				 do_compile cross -C progs tic
+		fi
+	fi
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_compile "${t}"
+	done
+}
+
+do_compile() {
+	local target=$1
+	shift
+
+	cd "${BUILD_DIR}/${target}" || die
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.
+	emake -j1 sources
+
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files || die
+	emake "$@"
+}
+
+multilib_src_install() {
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+	done
+
+	# Move main libraries into /.
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a \
+			"${NCURSES_TARGETS[@]}" \
+			$(usex tinfo 'tinfow tinfo' '')
+	fi
+
+	if ! tc-is-static-only ; then
+		# Provide a link for -lcurses.
+		ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
+	fi
+
+	# Don't delete '*.dll.a', needed for linking, bug #631468
+	if ! use static-libs; then
+		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
+	fi
+
+	# Build fails to create this ...
+	# -FIXME-
+	# Ugly hackaround for riscv having two parts libdir (bug #689240)
+	# Replace this hack with an official solution once we have one...
+	# -FIXME-
+	dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
+		/usr/$(get_libdir)/terminfo
+}
+
+multilib_src_install_all() {
+	# We need the basic terminfo files in /etc for embedded/recovery, bug #37026
+	einfo "Installing basic terminfo files in /etc..."
+	local terms=(
+		# Dumb/simple values that show up when using the in-kernel VT.
+		ansi console dumb linux
+		vt{52,100,102,200,220}
+		# [u]rxvt users used to be pretty common.  Probably should drop this
+		# since upstream is dead and people are moving away from it.
+		rxvt{,-unicode}{,-256color}
+		# xterm users are common, as is terminals re-using/spoofing it.
+		xterm xterm-{,256}color
+		# screen is common (and reused by tmux).
+		screen{,-256color}
+		screen.xterm-256color
+	)
+	local x
+	for x in "${terms[@]}"; do
+		local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+		local basedir=$(basename "$(dirname "${termfile}")")
+
+		if [[ -n ${termfile} ]] ; then
+			dodir "/etc/terminfo/${basedir}"
+			mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
+			dosym "../../../../etc/terminfo/${basedir}/${x}" \
+				"/usr/share/terminfo/${basedir}/${x}"
+		fi
+	done
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
+
+	use minimal && rm -r "${ED}"/usr/share/terminfo*
+	# Because ncurses5-config --terminfo returns the directory we keep it
+	# bug #245374
+	keepdir /usr/share/terminfo
+
+	cd "${S}" || die
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	if use doc ; then
+		docinto html
+		dodoc -r doc/html/
+	fi
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libncurses.so.5
+	preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
+	preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 9ce04a63b70d..36f26c32b41c 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/prowlarr/Manifest b/www-apps/prowlarr/Manifest
index f6e4643d0f4e..24fd24c0ec11 100644
--- a/www-apps/prowlarr/Manifest
+++ b/www-apps/prowlarr/Manifest
@@ -10,7 +10,11 @@ DIST Prowlarr.develop.0.4.3.1921.linux-core-x64.tar.gz 90147463 BLAKE2B 43e78e7c
 DIST Prowlarr.develop.0.4.4.1947.linux-core-arm.tar.gz 85888994 BLAKE2B 0fe9b09cbfa284f95c78829fccab06ba970ae14e1f2d9cde263f014abf40263c59e0a19a7c700571c23bc17b34f4dbbabbd003471f9d01a484028439310bf58e SHA512 18f61cadb8b642be5ee2c99bc1fd286671524d283aecbed65dd065e870b17fcfff7bea8912767e1ec85784a86fd54e026f05dada73ad209b2464bf58d05d2d6e
 DIST Prowlarr.develop.0.4.4.1947.linux-core-arm64.tar.gz 85158504 BLAKE2B 202d738d16794dc530c21a162ed39779fb844eb0c35d0465c8deded513551a0aef818b54dcf2fd45e88355fc1fe53dae43faec3e065a76563a040ab99e960607 SHA512 9b0d066e9622bdabd726b02ac8ce3547736d850e0263663397d18d61ee2c21d3142cc2c7a8e9cdd6d1c216077eec69a4eb3b9de9a2ad26fc7a146e7584b2d91f
 DIST Prowlarr.develop.0.4.4.1947.linux-core-x64.tar.gz 90160751 BLAKE2B 02e8940bd2dbc9c7bddb185ec82c1234837140782bfd3fbc91aa3136c92160869dd177f218b7a6c50f2c4cc7eb576a77efbe006ee5499e2e441b1ddd637c6c1d SHA512 af0ccaa3a789a5a9c236e7fee1b8d329ba93b9cc441a647d6df674a496f6e67d4b21dda6118d332382930752af24a5ca1010c875495abcd50fe1d4f29571cc47
+DIST Prowlarr.develop.0.4.5.1960.linux-core-arm.tar.gz 85916287 BLAKE2B c36cefadf00a4c67fdc6e799fde516cd3c87065515f628ee2a283e0a2da1b6d6214bc353ac9ae17268e5d7da04f3e7b8a7934eeed546f6394fba44672d45ed7d SHA512 fc826e2e5217696cc9cc7f8a0fedf852315d6522969d6b1ee6af208c82cb6039b4e2ab047d4a302a2ccb21f2c1c51fbad2af4c83b19b876f4b0e1d6c487e5348
+DIST Prowlarr.develop.0.4.5.1960.linux-core-arm64.tar.gz 85156068 BLAKE2B 5a0440d892c3e44ee9143ffaba833b4d3c52442f4e46c7fd87808e090856498136fbcd268bfa3135624ff083dfebe9f2e7d5ac9d92773917c6a21a576c2080cc SHA512 588641fe609fe63050b9d1926417e4faf43b678607fc6c77d3be9a1049997e73de41d37b03c87cc1bf21c96b305b97d4c5bb4c50141803b90ed81a87a5e428a5
+DIST Prowlarr.develop.0.4.5.1960.linux-core-x64.tar.gz 90180092 BLAKE2B f1006ee3ad539773871facda192e5acf7060f00c18c33864cb19da666f1b426ba7149aed74776e26072b052af8d7ac88429223f8be5dc0faff6ece0898668426 SHA512 10aac161bc6aec5ff7f32bd9ff53ebb4f56f88f5df328b9187c7b45bd25a826b3c75cb391f4c0ad4653154f38d373ee5d22e2c7f323f6bb7636cec61d7bb76cc
 EBUILD prowlarr-0.4.2.1879-r1.ebuild 1446 BLAKE2B 90b49fb8d9af086bae87fc8c5a625d8d3b21450962ccad4096d0834b121b354b04dff29254b272d49c888701419ee78be6704faab24251c400905e8c48965d7d SHA512 6b8eab78b023e506862403cd072931daeab34b5c60fd116cd491dab7196b098176413c91d8c1c9398253222d0a950eabdf09889f6c65f1b8d2d554f461ae19fc
 EBUILD prowlarr-0.4.3.1921.ebuild 1446 BLAKE2B 90b49fb8d9af086bae87fc8c5a625d8d3b21450962ccad4096d0834b121b354b04dff29254b272d49c888701419ee78be6704faab24251c400905e8c48965d7d SHA512 6b8eab78b023e506862403cd072931daeab34b5c60fd116cd491dab7196b098176413c91d8c1c9398253222d0a950eabdf09889f6c65f1b8d2d554f461ae19fc
 EBUILD prowlarr-0.4.4.1947.ebuild 1446 BLAKE2B 90b49fb8d9af086bae87fc8c5a625d8d3b21450962ccad4096d0834b121b354b04dff29254b272d49c888701419ee78be6704faab24251c400905e8c48965d7d SHA512 6b8eab78b023e506862403cd072931daeab34b5c60fd116cd491dab7196b098176413c91d8c1c9398253222d0a950eabdf09889f6c65f1b8d2d554f461ae19fc
+EBUILD prowlarr-0.4.5.1960.ebuild 1446 BLAKE2B 90b49fb8d9af086bae87fc8c5a625d8d3b21450962ccad4096d0834b121b354b04dff29254b272d49c888701419ee78be6704faab24251c400905e8c48965d7d SHA512 6b8eab78b023e506862403cd072931daeab34b5c60fd116cd491dab7196b098176413c91d8c1c9398253222d0a950eabdf09889f6c65f1b8d2d554f461ae19fc
 MISC metadata.xml 707 BLAKE2B e235e7acd37580d513d82833ec45707d5a2074c77b31aaea4bb79ccebbe378938ca6eb88d2c2afe351f16afc29192b359558130edf249a9089f5bc9008969c56 SHA512 1531f1097c7c7b375a210caa2202dd4d3ca2c611d6c28bb357e0eeb6a1fdd9efcea157c12fe07a633e64475a590edc389a34e0cca1ca8e7e438f47c4793b260a
diff --git a/www-apps/prowlarr/prowlarr-0.4.5.1960.ebuild b/www-apps/prowlarr/prowlarr-0.4.5.1960.ebuild
new file mode 100644
index 000000000000..c80e40c7bec2
--- /dev/null
+++ b/www-apps/prowlarr/prowlarr-0.4.5.1960.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+SRC_URI="
+	amd64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-x64.tar.gz )
+	arm? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-arm.tar.gz )
+	arm64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-arm64.tar.gz )
+"
+
+DESCRIPTION="An indexer manager/proxy to integrate with your various PVR apps"
+HOMEPAGE="https://wiki.servarr.com/prowlarr"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/prowlarr
+	acct-user/prowlarr
+	dev-libs/icu
+	dev-util/lttng-ust:0
+	dev-db/sqlite"
+
+QA_PREBUILT="*"
+
+S="${WORKDIR}/Prowlarr"
+
+src_prepare() {
+	default
+
+	# https://github.com/dotnet/runtime/issues/57784
+	rm libcoreclrtraceptprovider.so Prowlarr.Update/libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	keepdir /var/lib/${PN}
+	fowners -R ${PN}:${PN} /var/lib/${PN}
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodir  "/opt/${PN}"
+	cp -R "${S}/." "${D}/opt/prowlarr" || die "Install failed!"
+
+	systemd_dounit "${FILESDIR}/prowlarr.service"
+	systemd_newunit "${FILESDIR}/prowlarr.service" "${PN}@.service"
+}
diff --git a/www-apps/radarr/Manifest b/www-apps/radarr/Manifest
index af61598b95b3..8b2a63d1d184 100644
--- a/www-apps/radarr/Manifest
+++ b/www-apps/radarr/Manifest
@@ -7,10 +7,14 @@ DIST Radarr.develop.4.2.0.6438.linux-core-x64.tar.gz 98655703 BLAKE2B 5def0fd691
 DIST Radarr.develop.4.2.2.6503.linux-core-arm.tar.gz 93038005 BLAKE2B b8bce418e0db3836b6c219002faca67c14469f397fcd1f9d654107237705f8760e63a6ff1788916040aa7a2283dcc44c2ae79ef06fc821a4bf0a5a4eb9c22e7d SHA512 44dca2930c2898df53f9b3b21db2bd6d743ddbaf2aac9bc9b3984acca7e083d6b2212b55311d485522cf2ecde0d67aa79bbdcc2e446846d2086a277bc0471601
 DIST Radarr.develop.4.2.2.6503.linux-core-arm64.tar.gz 92682274 BLAKE2B cbb87f0e6b1b12568cb9fd8259425b48f32512cd929e9eef6bfe8cee713b5278b453164c10c09efffbee7f62114068dcade11360ed11a2e8e95e0ce7e7fd0106 SHA512 66b96e049b56e0b5646976a2813304b4db8e4dbf4bc58021c100431a150a6ec3b33c149efc6b514b7cbbf33c244fae838ccb73ed68dd68fffa1efc088008c9ce
 DIST Radarr.develop.4.2.2.6503.linux-core-x64.tar.gz 98713172 BLAKE2B 99bb7ecc001029fed53e8d6c71b1ffd96267cb3c74001ee9004eb6cef0fb4d8667b5d76251bb32172607d1a1ef148eddd8eafd1ab95f9ebd89ce19f3b6133db1 SHA512 156b33cedb13a980e32c8704cc0023f1af509fc61e22cdfa692f56a70f19f996e0e78ece0093628d1f72851d58b8fdb3a13aef709675a69ff8f7631725d8bc12
+DIST Radarr.develop.4.2.3.6575.linux-core-arm.tar.gz 93028272 BLAKE2B 95177eb71f4e88782c82ac147c9165a76451cd6174623b08093f297cab79b94faa504694dc67d72a1c83af811ac98181a59e42afbad50eab25f06be3bc9578f6 SHA512 ab7a24130a887991c772315f51ead5acc2a1cb591e0653db5c76fc46787286caaa4616121b80893805e93a83e1ff341a93078a67d3c0972dba299a88001fd62d
+DIST Radarr.develop.4.2.3.6575.linux-core-arm64.tar.gz 92681339 BLAKE2B 2e00a184febbc36cef02db194f3edc0e048bc977239cd6f1db270446b25e930ca17abec5b9ca8288fc1f04eac3946a32fd3c7c010994a96703c36494df7f3dc9 SHA512 d97c0b92b93fc9f45227410bb2e64941db09852e3538f73065c14f1ddcea49c96838caa1ffd7822f3ee0b9253a895c10f7a1aeb037f590a36e9c03ec87bf5730
+DIST Radarr.develop.4.2.3.6575.linux-core-x64.tar.gz 98713183 BLAKE2B 6fa50e361732ec0332759024240a3e4d11b03a0bc7335b178a4d203e813ce07cf8c10e05af7d473ee5c8e7d2110a23f1ee6cce9f2b9dda8b919dbc8cebc0cdb3 SHA512 43c74193ac9ed5beabe4311c0b4d11d7b4ea939c9ace20b9d4950caf5e85c12d3ef6b1d6f923dcad9e92e590a52f7c752139b71718489af7d0e24b6e00739f1f
 DIST Radarr.master.4.1.0.6175.linux-core-arm.tar.gz 92189393 BLAKE2B 4420ba558e7791b80d667adc08fd7d1cbbc9f2a3caac0e9ed79417a6325129e68f6bce262519ae1eafbb61046fd4aa011f36e9101a9b6d7023bf20469b983892 SHA512 13ef8a393c257a0bbd70c7b69ed9a768df69896e4d021af10262faea1508ec9ec9a129c9c9302bf6692ebadcdefb9270f8391668b09fbb16925f2c8ad6c24ab0
 DIST Radarr.master.4.1.0.6175.linux-core-arm64.tar.gz 91841527 BLAKE2B 864330f1cc8f654bbf0f6cd6db903c2679a4e4d6857f7e844d9999f0624d16790b845759558a6c013faee567aedd932cef27e04eca60c0fc0e6f7b7841970ca0 SHA512 02ba1440fe09ef5fc43263cbdbd546218ba4f7167b596a56edd510d05f9db382e8aa5901ad32c851c488492323e1351446e34a01d5b75638015879b5f3a598f9
 DIST Radarr.master.4.1.0.6175.linux-core-x64.tar.gz 97882876 BLAKE2B 9d14649d5059afe2497be25b5514bffa48e4b762b6f0683b57a250ceb5723f1ffb4041d5510fcc8287e4b56083d34ebed083ec7c6454525773578769def39778 SHA512 b3d88b2eb58a4b8125704299ddd9aaec306e9119eaffa142504e96d4d77ccefd77c226e24d6f32222811e5a0727194758940eae6890ad0927e2aa553777eaa60
 EBUILD radarr-4.1.0.6175-r1.ebuild 1399 BLAKE2B e02e94fd208ec0022cfcf1f7d5ed373fa8b2cf29eb874a5cfa9e8656243800b13f9b04de6ca65df7f506cdf5f939fb69aafae2a310e8765e1a0261888179f046 SHA512 21a2195684ddeac311939345d15ed4350bf34e6ff41669635d7638ea9b69514a06013aaa79887ba66446b0a9bb248a6462339cfdd1db3a1528d852d2caf70094
 EBUILD radarr-4.2.0.6438.ebuild 1402 BLAKE2B 1ca30d1dfef1d4b8069830e4c41dc4881fc37a7a5a4e9120734b960386f9ba47221c3b999f2c232da44efc883463c40c32bfe6122b59bc527e1fe1b71d8ca9a6 SHA512 aedc6100584bf667b0d8ce5177b39fd1d6b440321012d6765afbed8761fbb233c65f7f97bbc223106e12ac6fd120316dda1d0f84d2e2a5293130e47b5a657171
 EBUILD radarr-4.2.2.6503.ebuild 1402 BLAKE2B 1ca30d1dfef1d4b8069830e4c41dc4881fc37a7a5a4e9120734b960386f9ba47221c3b999f2c232da44efc883463c40c32bfe6122b59bc527e1fe1b71d8ca9a6 SHA512 aedc6100584bf667b0d8ce5177b39fd1d6b440321012d6765afbed8761fbb233c65f7f97bbc223106e12ac6fd120316dda1d0f84d2e2a5293130e47b5a657171
+EBUILD radarr-4.2.3.6575.ebuild 1402 BLAKE2B 1ca30d1dfef1d4b8069830e4c41dc4881fc37a7a5a4e9120734b960386f9ba47221c3b999f2c232da44efc883463c40c32bfe6122b59bc527e1fe1b71d8ca9a6 SHA512 aedc6100584bf667b0d8ce5177b39fd1d6b440321012d6765afbed8761fbb233c65f7f97bbc223106e12ac6fd120316dda1d0f84d2e2a5293130e47b5a657171
 MISC metadata.xml 688 BLAKE2B d528c66cb7915d661b673524d559fdd7309551f0b473a454e3372bc7f8d06d81e9760fe6c0273e2cfb6b8974f3d516fbc9349f986ca5a986c843db42fa01096b SHA512 006139a3c40bf1f18b8323bd80908ed0de9fa9782fa2b295339b843de5b204fb2595a325a95f2227d27c88abf37dc916d83389a8251f6c684c51b1c256f3a8b7
diff --git a/www-apps/radarr/radarr-4.2.3.6575.ebuild b/www-apps/radarr/radarr-4.2.3.6575.ebuild
new file mode 100644
index 000000000000..4de81c02d758
--- /dev/null
+++ b/www-apps/radarr/radarr-4.2.3.6575.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+SRC_URI="
+	amd64? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-core-x64.tar.gz )
+	arm? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-core-arm.tar.gz )
+	arm64? ( https://github.com/Radarr/Radarr/releases/download/v${PV}/Radarr.develop.${PV}.linux-core-arm64.tar.gz )
+"
+
+DESCRIPTION="A fork of Sonarr to work with movies a la Couchpotato"
+HOMEPAGE="https://www.radarr.video"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist strip test"
+
+RDEPEND="
+	acct-group/radarr
+	acct-user/radarr
+	media-video/mediainfo
+	dev-libs/icu
+	dev-util/lttng-ust:0
+	dev-db/sqlite"
+
+QA_PREBUILT="*"
+
+S="${WORKDIR}/Radarr"
+
+src_prepare() {
+	default
+
+	# https://github.com/dotnet/runtime/issues/57784
+	rm libcoreclrtraceptprovider.so Radarr.Update/libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	keepdir /var/lib/${PN}
+	fowners -R ${PN}:${PN} /var/lib/${PN}
+
+	insinto /etc/logrotate.d
+	insopts -m0644 -o root -g root
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodir  "/opt/${PN}"
+	cp -R "${S}/." "${D}/opt/radarr" || die "Install failed!"
+
+	systemd_dounit "${FILESDIR}/radarr.service"
+	systemd_newunit "${FILESDIR}/radarr.service" "${PN}@.service"
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index e992583056bd..0dc943397261 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index d96773ccf65e..9ed3b74ea1a2 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -304,7 +304,7 @@ DIST firefox-91.13.0esr-zh-CN.xpi 575367 BLAKE2B eb11d145bf514a5c20fd8c8f9fa2b56
 DIST firefox-91.13.0esr-zh-TW.xpi 576229 BLAKE2B 44189d585fa0725a7aa1db911acc1d243a4fbe3bc69ef863fc3387b1d20b5e70f364dca850021b6a8532a8dc9651ce6b803a543ee5f4ab88cb0e14e263b97c57 SHA512 23b25460fbcd49921431c03b50aced2465181e7fbe7cd1595afeb5d9648a7736fa8d7b07f3215ef86f5d85b13b732d967aeaf9204f766b9ff60ce01e8fb969c9
 DIST firefox-91.13.0esr.source.tar.xz 380053584 BLAKE2B 75d0daa512b3a2d41974a0169778be9ef19a100de2bd382add9831860ca93976585a41e760b6a7ec753268fb78f9f61049780fa7961834248bc8157cfdcc2827 SHA512 38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f2504621f0da78feac6e71491a6d0e7038f63dd0ae112dcad700eb02e9aa516
 DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c
-EBUILD firefox-102.2.0.ebuild 36378 BLAKE2B ad6678baa93bc17945baa3c1a4ea68e4d8a2d7024610a22f96290335331ae0c61523c1e94bd9fe7093a52f8564b458288983b4f09684c061eaf99ead5f52debc SHA512 b98c642a1f8fa9f927babc1ef52c162a859aba88dc63e475d26d5b46536f651e300258ee72f25b770b17be747ef1a5b050e1d72a82924fe9ad1b20221bd6f246
-EBUILD firefox-104.0.2.ebuild 36861 BLAKE2B daa636ff61415754cd6927143b070414e501a54e48d141ed3710e97f68e828a9b2578f1130aaccc2fd48a54688f2b4432dd82bfa27a83db240fe9d924a6f36a7 SHA512 bd6d882552ecfd12d3d1a9dbc544d7523ff86a6d6c6a4ef1b82a3058bf25768f0c78a39c547e085366d9c0a3126bd971da8b070cf92be9233c1af0c5ca7b1e16
+EBUILD firefox-102.2.0.ebuild 36528 BLAKE2B c37f58bb48e2095c68973aa83019321098ae43abb39f4203fe64510716f2e0dc29a8b4e8a2e77d47a81d068cc754c99f59b576766eaca238ad4788b1944844f9 SHA512 09c283592a8c237b16c48cda24c67627df3ea4a86ae27f4f879b3e256f084a0d98f5e5301210cb9d7505ceb55d52f91e84cf8025e42ed668f7b9080baed1fa4a
+EBUILD firefox-104.0.2.ebuild 37011 BLAKE2B 7706f822a2a12d2139ca42c043dd17c6225c2c5f3e0477e74559de8cd93909cf27fb0f67413d67ab9b80331d55509a5b184cea8829d98202a12935a18ea5acc0 SHA512 a3420d2fa49ae1873b10171235604dd135dbbe0de357ce51b3d85f19576021ba39991f060feac4ef2f4dc33c1f566aae86b2ad827d121cff5507cf5f358c6c58
 EBUILD firefox-91.13.0.ebuild 35569 BLAKE2B 19154ecc4e0a2583554ced081e5c00c844926b5ec520aced40ca69aac814848804e0931414916f34822abcef11372ceb5efc3a20e4277ad7cc62ff0a42535503 SHA512 e22cc0a89e6d1fb8269720f9cfef0f305834786cb3e69ce4e122c681d3c1ea138deb1793bcb80eba029d981c819022709a2946d2a55ca2ddeb5917eff7eaa227
 MISC metadata.xml 2275 BLAKE2B 8c145b0b5014acda00fe3839889f7805aa78b65a18eb59135576e861e0882c9966a3f91adb10a7b5afc0ee80548da9f0d7b8a0edd6ab88d9cddbcaef6f9619dd SHA512 187618848f28f201e8a554e938a37b21c5d16619e76ca7cc53c227f9f1f76b9c9c46781b3b0c31bc78bc0e52865e95e56a3741a0e623cccf104eb936b4f22beb
diff --git a/www-client/firefox/firefox-102.2.0.ebuild b/www-client/firefox/firefox-102.2.0.ebuild
index 5fc46dffe81b..8cfbc4b8a609 100644
--- a/www-client/firefox/firefox-102.2.0.ebuild
+++ b/www-client/firefox/firefox-102.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 FIREFOX_PATCHSET="firefox-102esr-patches-02j.tar.xz"
 
-LLVM_MAX_SLOT=14
+LLVM_MAX_SLOT=15
 
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -90,6 +90,14 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/rust
 	|| (
 		(
+			sys-devel/clang:15
+			sys-devel/llvm:15
+			clang? (
+				=sys-devel/lld-15*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
+			)
+		)
+		(
 			sys-devel/clang:14
 			sys-devel/llvm:14
 			clang? (
diff --git a/www-client/firefox/firefox-104.0.2.ebuild b/www-client/firefox/firefox-104.0.2.ebuild
index 24cea78da335..6c3e8c3d45c2 100644
--- a/www-client/firefox/firefox-104.0.2.ebuild
+++ b/www-client/firefox/firefox-104.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 FIREFOX_PATCHSET="firefox-104-patches-02j.tar.xz"
 
-LLVM_MAX_SLOT=14
+LLVM_MAX_SLOT=15
 
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -92,6 +92,14 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/rust
 	|| (
 		(
+			sys-devel/clang:15
+			sys-devel/llvm:15
+			clang? (
+				=sys-devel/lld-15*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
+			)
+		)
+		(
 			sys-devel/clang:14
 			sys-devel/llvm:14
 			clang? (
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index bd7d210b857d..c58bf6d1e735 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-windowck-plugin/Manifest b/xfce-extra/xfce4-windowck-plugin/Manifest
new file mode 100644
index 000000000000..b80595e32514
--- /dev/null
+++ b/xfce-extra/xfce4-windowck-plugin/Manifest
@@ -0,0 +1,3 @@
+DIST xfce4-windowck-plugin-0.5.0.tar.bz2 404966 BLAKE2B 0dd76bdc5688c834c5223f1457a9a7db2b47ddaf8fe6f02970fef44d3cfef1e14136d1b786c65132084a705b5ca12d3c34597c0371c5da9e6661ab04a05a61f8 SHA512 ea3da45460201c88c7b7cd0c18715a2dad63f9c95e96450a2d39217523b5bac8f5dc671d3d71d9c7ca309c5d9b78cf18ddabd955da510a57d3bb2aeeb91507f4
+EBUILD xfce4-windowck-plugin-0.5.0.ebuild 852 BLAKE2B e6ddf2ea0b36b6920fd05277e5dea9b8fd74787f2fa77293f24df87c73cbb24301499d8491e23821acb0a7c2bd5a458b4f5f703441b2a80f78ef89a1934ad93a SHA512 555237c9e580215ceb7d1a858bbe445f9633b949815c2eaf64e3ab4f62f7817a2b90a0e6b7c6aa66ce26951f3f0f3aed42ff67da9cc43b73e739c7dc30c397d9
+MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-extra/xfce4-windowck-plugin/metadata.xml b/xfce-extra/xfce4-windowck-plugin/metadata.xml
new file mode 100644
index 000000000000..fb3a6777ad9f
--- /dev/null
+++ b/xfce-extra/xfce4-windowck-plugin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>xfce@gentoo.org</email>
+		<name>XFCE Team</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.5.0.ebuild b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.5.0.ebuild
new file mode 100644
index 000000000000..b6fd0528f2ac
--- /dev/null
+++ b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Panel plugin to put the maximized window title and window buttons on the panel"
+HOMEPAGE="https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin/"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	x11-libs/gtk+:3
+	x11-libs/libwnck:3
+	x11-libs/libX11
+	>=xfce-base/libxfce4ui-4.14:=
+	>=xfce-base/libxfce4util-4.14:=
+	>=xfce-base/xfce4-panel-4.14:=
+	>=xfce-base/xfconf-4.14:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}