gentoo auto-resync : 10:11:2022 - 09:27:33

author: V3n3RiX <venerix@koprulu.sector> 2022-11-10 09:27:33 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-11-10 09:27:33 +0000
commit: e80777b54c5b430ca044e16878f59a2020423d48 (patch)
tree: b72b3422d129532b8f0ceb415c6e7c5109e3fe75
parent: aa61828f226f3b30e6939408847d914a145fdf35 (diff)
245 files changed, 2327 insertions, 975 deletions
diff --git a/Manifest b/Manifest
index 20c72158f3a1..abde2e6c5a8b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29599 BLAKE2B 2ec7c66395f0f564ff1cfd04d4d74d173b3ded4c693f0e0bdf04bac23c4448c0e49b6dd2b90da78a96863a3d848c7f74a14ba41fbfea31a4af6e4ce3b52cf1b8 SHA512 30933dfa84f27cb595e011869e040808e34ccc3d0a22414b01b1aec30044da09241b9d8eb3b236134db97f68542a12fb2a7dd9ebf39300acf23a0e2e0879bd2a
-TIMESTAMP 2022-11-10T02:40:23Z
+MANIFEST Manifest.files.gz 29603 BLAKE2B df377e75fd2f54bb97834cbaa20f4173fd6ab5fdce46b102dc81114e280a6365d7f8147eeb8c665c8da2a397401f58c953a5c7ad13d63a25b700ada1c347e582 SHA512 2adef6599f0f93cb1276aebe2c715b09416727c01bd68b13b0f9fa8cd89ecd295b5efddd4da13230013f562213d20ec4825c87faf53ec16e26379ffe234156ad
+TIMESTAMP 2022-11-10T08:40:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNsZJdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNsuOxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klATPg//VDaZ318DO74WnK8G+MiaNgkiyf56zKUCseAEvWQAPfm7IcjyY647TJFy
-zdyQotGqb6euwwXiW1pMFBXW77cZLlSme56msdaT0bsDw9SXdWtMePMHjVQ8R/Xg
-Q9IjRcq+XtCao+NsXnBe/3sw6uR8UVDca+Bys75kLvdZfavfNtNvonI3nXDh2AZ6
-r7kA/kWS8Xt7NWzYP48CUl0LE6031RQMDThu8c5MKIYMQnILbCMKS/AMQ5LA8tt8
-wnRbMMFR8QBEF+j2r51Wc8d7DmMePgdqXzwBZkwGYjYEe50VXeLbmR6eQjb9a1hn
-IA8mpzEWREK34L8bTWsrYKPDFEVWF1xLRozn1lkVmIVmSsaC0GJr6r1y6meGFk8I
-vAEzw6BO1aEVuxKj8jFaQqS3cQpNBp73CCpsJdktavBG6kd/Sr5nNPWFLoGFzV7J
-va3r9GJXBPpi67apOck4EISpT1ytAmlK0PRjxXCAaeQgmjV0MGX0QVFa0EH9GmtN
-+FBLwV8C+qNhlUgXwNVtWoF+/shOnqmUSJ/2//5R102uXlWg8VzjEmcvSgmQwHtH
-9FePdOUbPg8lFdPTo8zIAYp2BMKpTwHImyIPrrmsE1vqqFVWWZKW/y7oAaf6/MI6
-Pd4xB4/mrMYUrijCkfiPRNfOhiRUZhLOOkldFXG+ny58XmMllLU=
-=S9JI
+klAKtA/9HNrAa7omU26lP0c/7b41ojszkXyrodRQcU4EG69YaG5bKL7p7yypq3B+
+mLOkkRsx6vnma8SIh6YtH0bspVHcH86wF/3cwCoZL3P1cGYm4eYRsIMkJktKKSa4
+dVMBq3LscU6YfMppWw5/jUhfwq1E/Lq72m7O01+ZFMogd7hvMCIyHwIEQq085Hh+
+Bhi5jgG1n8VkgFHt6W1TI1F7VNxVr//4DU56uIz0aZotG52eVzIdqrGVhmVc95Bu
++4Q5izSNWca0wMUVMb/l2rQorZiteHCcxo8wmfzDOUt8/8NUpPzlP8OG4IM5Fkgr
+vyhXGpNVgWzCv+YnQLf7doIEA6Cmslbx+55ud61tw+rXkKZ5uJLQt+sOiZfX3DWB
+TCt4/eeDH9+gFnLgj9W+Jf+FWDSU/nq7bLcfclpsPN9l8yCKWBWojDhYYs/SvZ56
+r+CkbchfHXrY9f0xSwiYrWW+uXl+VlxMQP1ujVFxLoku7dbLudvF8cYgzCMOaDe8
+NTAHJRzPtl0DJbgqcQB9IfIv92qKTNTWCWEsGCmsMRRxHc/zX++Aj2e9E7+zA4sJ
+fuFdZ9G+cVFaXUqZbNW9yFMR54tGKTkdd/5+KD2WFLqorbGXHtcOX2C1UV7zbbY2
+at+m4KUobagsFjuTv6oeHNkeK+EIM8CCipzTMyvOY+D6FGWWExY=
+=boAy
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index c83ab61a89be..0599bfc7c592 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 21729801aa56..5fec3e07850d 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/mbrola/Manifest b/app-accessibility/mbrola/Manifest
index a1e5cad455c3..ad6bebe1f3e5 100644
--- a/app-accessibility/mbrola/Manifest
+++ b/app-accessibility/mbrola/Manifest
@@ -26,4 +26,4 @@ DIST us2-980812.zip 6387442 BLAKE2B 73502264a3900255f91edf5e3b92baff706205a72002
 DIST us3-990208.zip 6195800 BLAKE2B cf58531738ed412f75ff3c6d9788db8afd3468c10e5c07775b893516f399e3d14ef2bd5ebc5bb57ebb363d3c077924a496984f680e2ab9c45d05efc70642df19 SHA512 dbc6b0cdc3040ec3747f25a15dd17f35f0e97c40a153ae44e43a7e8030302e7e7c8710b10fe8184cc38f907de07a187ac0a7e3816be2230ce969aa014641d0ae
 EBUILD mbrola-3.0.1h-r6.ebuild 2652 BLAKE2B 7012ae6d8eee190816a5d59387fc177c5895b472a6d1dbaad9d5a2b270dd2bdffa69f28ebac3ac77323ce23653d58a0f3cf9d7ef59a689cdcdccb63c911663ea SHA512 90faedb6610c6a9b955f91f463297f7116a3696ee50bdf12728c9492c369eb42b5cc7b4a8b78fcb64c31b6449f03276069bb5fc9acdcb4fb6e57d3be2d9c0aa2
 EBUILD mbrola-3.3-r1.ebuild 704 BLAKE2B d556d33a15d1eed22456762912d809c10845ec012df530d916d0b2d1172d0dcc5dbc212adf3b79d0f39c526b273c647f72fa9327ae33d5422e7a7fec4f0d063f SHA512 62d8cc80df04b6c8c42d9351fccebe27e2f46d8d13707de5c10e1ec68cdb6ab57619fa70dbd70f5d423a2a8a6cd4b2b3c21b70483ecc802de57b4e106dc239fd
-MISC metadata.xml 376 BLAKE2B 8b18614ef8276c8e76fcc9b4796957e8f327d558ff889f5f267097ec1ec66b223917c875a160d9471ac7d732eeb0a517ac9404369e778a9de4be016227a9ab8d SHA512 b50ee97dc26e7856b3d7daec1d93406b72dc366e400a25ee5ee709af9deeda724348af617e3ec5e518fe3ab0f95300a79e7cf68f53f2433eaa72f8aa7d871b14
+MISC metadata.xml 465 BLAKE2B 7bde5caf3892d6f65498e672f7012a37265c70d1112db13288e8bd8311e32b4e46c65039c70192620a900eff33c6283e7f4d2f0cc49a918709c2c5347ac45c26 SHA512 2b11245580478c29c0d309941532b3c89804e22197f0986536a38105f7b0f1045c6c2e509243a48c5b772d84650fd9037330b347269ae0124d834828f7c2dce0
diff --git a/app-accessibility/mbrola/metadata.xml b/app-accessibility/mbrola/metadata.xml
index 904973efe33a..0ffb3e4615bb 100644
--- a/app-accessibility/mbrola/metadata.xml
+++ b/app-accessibility/mbrola/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>accessibility@gentoo.org</email>
-	<name>Gentoo Accessibility Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">numediart/MBROLA</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 0020b9ee6db3..cae6b31e7bff 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/procinfo-ng/Manifest b/app-admin/procinfo-ng/Manifest
index d89b542dd4b3..db361ae0c0be 100644
--- a/app-admin/procinfo-ng/Manifest
+++ b/app-admin/procinfo-ng/Manifest
@@ -1,5 +1,6 @@
 AUX procinfo-ng-2.0.304-autotools.patch 1521 BLAKE2B 900b0605e17dfe22512399aac73f79109c12524f53e9924d5f240e10422a1b53d3e171c89b292748bbf5515c4ea99610c39cc8d94bfe1c968a225c5a36f41955 SHA512 3b13f4eb5ebad4d9d9dc6a31f7a46b49b76aeee19042029d7c37c5fe21555c7c98c990cdf57ce9583469058fed315903efe919f7f25cc5354a6800086f56cd28
 AUX procinfo-ng-2.0.304-man.patch 130 BLAKE2B d06416e6302ca0b8952b2f01c2e6d64dbf913c5009248d187bfbf91af938d1f253ff5ff12c467041bcced2f460c3116cfd2192177d3bc7004168ee024c3aedb6 SHA512 acc1ce2abda6099b31faf4d1d6e940e8cbb8a3accfd6ca2af550d226b7f12aebc84cd68b118f7c1362895f63a800416e538ebc43e7ae98a1b348656b09373056
+AUX procinfo-ng-2.0.304-wformat-security.patch 386 BLAKE2B 46754dbf8bb6da0d9af0378abb89f7887595ca107ae68ed96f2320a89d20607ce464d231a93ced73ef2cc8d0fb1392d57b788a247138c5598d3afab3e27b7343 SHA512 32c422e389aac770fa7fc444f865da09e2b6c8bfdd3a55339afb117d5e459ea505f598b5cb0b0d1382f8afbbfec0a65717f2acb1b3fa184e67551919748f4886
 DIST procinfo-ng-2.0.304.tar.bz2 62469 BLAKE2B fc08cc69ebb4f21c52a314c19eea820bc69408d609e59f122c939c14c9159e4348c4ccc07f39f63e96ec046d8af79abd6456a56397eb952d2fff1dd31f89a3e5 SHA512 db336d2ff3bb3b31ac83a51a9d273fae8d16d36bd805f548eda06cb501699473fd8e4b4f9b722165fbf685d76c3fc09bfea9e516eabc37a888e2fae7679c08cf
-EBUILD procinfo-ng-2.0.304-r1.ebuild 611 BLAKE2B 0cfd601139aeeddc77c745210ea71ad640477f4ba503433c96bcaadefa96200a1eaecba54ee7f9350d4d0331d452c35cef24a811b5eb41a1e34014fb5522367e SHA512 7338ddfca8710b2341c40c508636d2619ac967f4d0aceac4fe04b6c76d3d7b9ddaf352723f4b724c6d8c852301150958e075f4cd3ac0d10967a95057c192c94d
+EBUILD procinfo-ng-2.0.304-r2.ebuild 741 BLAKE2B f200e30c42d4d7b3afc221c24cb71b37f1063de57052b598e94615f20b227ab6a0fd1b4ea8e70cf3e68896eb3ca0884ef5c01e2a989daa59cc5f1e4bf9e0b3ec SHA512 0a9b1fd5d462557e00c65069b5f699a4560d3f1102bd225a527d50b26d8f6548e9763f06d64453ed5b2d7551410ccdd43c5a4a457460e304676aac8e93cdb515
 MISC metadata.xml 357 BLAKE2B 02b0a928b12ab935675a1ee29a1ba7a9dd897da2f619e43dc1a84ffcf90ed8912706dc0baa8199220336c8e37d2c5cbf60c1c25eca22cb68cf881937bb1cc33c SHA512 5e806da0da0a037e8923a94a5325f3e5edd531d4da5545e9d97520a5cb3754798d716b3a383a85471057501bccf4e06b547bd7f27e5f1a68ff9a65864e766cde
diff --git a/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-wformat-security.patch b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-wformat-security.patch
new file mode 100644
index 000000000000..315983c9af30
--- /dev/null
+++ b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-wformat-security.patch
@@ -0,0 +1,11 @@
+--- a/procinfo.cpp
++++ b/procinfo.cpp
+@@ -211,7 +211,7 @@ int mainLoop(bool perSecond, bool showTotals, bool showTotalsMem, bool fullScree
+ 	try {
+ 		rows = getNetStats(perSecond, showTotals, skipIfaces, elapsed);
+ 	} catch (string exceptionMessage) {
+-		print(exceptionMessage.c_str());
++		print("%s", exceptionMessage.c_str());
+ 	}
+ 	print("\n");
+ 	prettyPrint(rows, rowWidth, true);
diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild
index c1fe7c224965..d9384bee0dd8 100644
--- a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
+++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Completely rewrite of the old system monitoring app procinfo"
 HOMEPAGE="https://sourceforge.net/projects/procinfo-ng/"
@@ -13,17 +13,26 @@ LICENSE="|| ( GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="amd64 ~hppa x86"
 
-RDEPEND="sys-libs/ncurses:0="
+RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${P}-man.patch
+	"${FILESDIR}"/${P}-wformat-security.patch
 )
 
 src_prepare() {
 	default
+
 	mv configure.{in,ac} || die
 	eautoreconf
 }
+
+src_configure() {
+	# bug #719790
+	append-cxxflags -std=c++03
+
+	default
+}
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 350ffffb3f21..321d1d9e6f06 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -2,5 +2,5 @@ AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927
 DIST sysstat-12.6.0.tar.gz 1454167 BLAKE2B 84213e1d63e6d44e889e9763c9f47c769805baf65715199b1ddb3472ce68c37b3b46229af43ecf0cd85d6c09be85273e90b96a975304cf2f6695298b3e552630 SHA512 f4d0e0dead0cce84782e985c8074871c45e77949c2bcfefd5642280e961f39e9eaa9f9fc93c013d79deba6e3703626894dd665ff64db72550d1c24f404780a5f
 DIST sysstat-12.7.1.tar.gz 1464847 BLAKE2B dd4cb510d45879665945d7c3efcb9e1011f6b77d152c7f989ef6a3e8f203c05c1ca708959030cb864c31810ec27a5e880a9cfcd805f26c4f3537d55bdd9fd763 SHA512 5c1da0f5a1bf26091f029c5ea138f836616becb1e531843aa2c150a66ddc1f07b43cffeac98445855bf70319942fe22838a682c2f7685893bead7d8de7e9e2a8
 EBUILD sysstat-12.6.0.ebuild 1709 BLAKE2B 28cfcc23664f257132f8c45e9eaa5abdeda9f70b4421b11965aa0055508e552e3f9275451e424aaed593a67a3dfeb3665b03a10baa49d28185601508f6c777ac SHA512 bacd5e5c3f6886e7a215ac9e64db6bcc19b89b1e0abfc6e3e66df7dff403725e9855a0344680e3f9c79d190eb121ca33f41ff8ea4b983c1dbb5f2d14206bc5de
-EBUILD sysstat-12.7.1.ebuild 1717 BLAKE2B 3462dd189fb0c48f9e47e2a75e70fd13400f7cdf6da3ad48aa98e3642168bdf4547cc4c7f56e0e8213d34be237eb269479899d4358827d3e712482dd9a797411 SHA512 0e5c83c6391d5fc9ca0dad48ac5cb8f3c5f8027ad897d5291a3489939bb9899576042236b7203939c6ec6a0ddac76202ffd97451435974d08da319118e69ee84
+EBUILD sysstat-12.7.1.ebuild 1713 BLAKE2B aca8ddba7c7d93d3e5a2d1550a2f297f18470d62e32ff9c0818b89dc731a12c5238172ecd2c9b7a467f2a60c23f60251cf6d7ebf906fb4543e32909107fdf899 SHA512 e4b0ba283874ecc76c128cc38cb9299f5a110ae0434f96cc439e81da29b4b087f8b4bbc258946c6c6c36752af27ef8b52a08303e632b3245189d82fe9326d663
 MISC metadata.xml 537 BLAKE2B 96a62a60f2e483414fdbe7c2d2e11c25528e5c3301b50079a32fa91deaeae37f63f7e78c73a4b749c3cbca6d438aaf0387edc655fe0575fd15ee641619529d02 SHA512 57724ab12c814c17c3c44c234409fcca149058ae678d4dd26fac4fdc11eb4234885948862880db038e82190d665a664d6449a22da49f2fe08b42106aac2058e6
diff --git a/app-admin/sysstat/sysstat-12.7.1.ebuild b/app-admin/sysstat/sysstat-12.7.1.ebuild
index 37ab5d829827..df4308ea1361 100644
--- a/app-admin/sysstat/sysstat-12.7.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="dcron debug nls lm-sensors lto selinux systemd"
 
 BDEPEND="
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index c8571ec5543c..7601bc9f309c 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index b57215f12958..8e30f7c8132b 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,21 +1,10 @@
-AUX doxygen-1.8.16-link_with_pthread.patch 691 BLAKE2B c6ced2c6aeb199d7f8ad39f39a90747d886e0841103a27d105fc40242fbb5dd289a3ff640203fe1d97bb51fdd559bb94dfddf4e2364d4bc630d861c75ff079f0 SHA512 5b23cc35faf571229b9ff7f1dd4745ade10d5ef0935d1ac9455e0036517ec3e038aacd1a565604f1621aa2c42584240939269777321993b02645334ca7dd18fa
-AUX doxygen-1.8.17-ensure_static_support_libraries.patch 817 BLAKE2B 085e2c853e10b22f1be38bd85abb3f33b3cefd4fdb565b244626785d6e54972404638c956c9f03b06022184e8308c1b1b4715f5ef83a8cf34b9a7b938e951152 SHA512 bc076b02f5f9d2886d25ac2f1800475990542e956b59afedea2dfadb262bdb317a44f91b47fbd8cd27f77476e215629aeaf1d03a9cbf24f1aafa822a382bb05c
-AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
 AUX doxygen-1.9.1-do_not_force_libcxx.patch 670 BLAKE2B e618f7acba8e4c7910b8f56001bf17bc41da5765dab57dbc148515eb2c4cfdc341d39498095f3f0dc9cad7ab74f3a508ec0ef143ca4652faace9db1031b29bb5 SHA512 ab40fb3a85f6cfcc93056d4d7b81397077552df53de1fcf26127d982a497bb0d67ead4f213b2c7101beefe2136b367137346b034b5597b39c29699c598ac91bb
-AUX doxygen-1.9.1-header-dep.patch 866 BLAKE2B 4cded0759877e2d152e67b627f633998f3b2e21b5a90e30f9aea80c401748c9d8e888ed277210ec6d4631500a804f9fa098e1c3a389c03553421f52013003d62 SHA512 9de1235d5a0462ac0909cf2fbc665b65fa3462ea24a67cacfacd309b36cfed8f296bd970b990116aa80768c516aed02023009954faa724a82d4ebc5fbc5a04ea
 AUX doxygen-1.9.1-ignore-bad-encoding.patch 1016 BLAKE2B 453e13ba115fe7108b0f319b45ad6c3f66c937a2a133eb9c76d38455f71cbbc1ee830e5e632ce36ab2a2906a67b1c676d60c02d0696a9da75862ea4197e209b1 SHA512 71cc9c54bc40f6719c64874e2bd9355cda47c87affec7f3e551fae06cb27bd9c569bffec03d2594c2f1a0190c6975123270fb446c62d8c1fac4c2834c7adaf80
-AUX doxygen-1.9.2-xml-static.patch 983 BLAKE2B 3c4e6dc68abe6c6a6e37ed1af5b41da00698ee31fe044fd98a55d29859e07412ed2e46f1706f4409d108e457c86b19daf497743594fec7bbde2a208de7ba7c5d SHA512 a7bb90fe1a3f3e9853f67ce9f754f2b26d07a0d23c33b10626b0a639623959be4b97fbb690cf5b6db3098e87cfbb54db7ce376306e0ac599defe00963bc38f49
 AUX doxygen-1.9.4-gcc12-include.patch 513 BLAKE2B c0ecef93e6735d30b6e0fe6132b28d236475a28cfba51be13de6cb43360a03fb1977299588ed353f4ef96bee4ee87b710dcb7a702c96b101a214cc763d089923 SHA512 a282605a73f00e246fde0dc62dbd4f88810bba06393df3767f841f39a3e4e3fddc291afaff2c5e8e1bc3ea9c6852903df832b323ff90ce1dff2d2654ced11ea6
 AUX doxygen-1.9.4-link_with_pthread.patch 1116 BLAKE2B 864adde5d9c0c852dba8fdaee9021f16e7e119a660d5d8657f320686c0d86c29b5695f367c2af2846e9861bca5a70889b6dd56a9734485527ae504a134e30594 SHA512 f9a1089585f83a09b89c813f51bbb7914fb27be2b3e554148387fd322c88153c2aca1af4215d90b6f2fc9eae25814085fb468f0ef2dacfa092662a4609d52929
-DIST doxygen-1.9.1.src.tar.gz 5117435 BLAKE2B 28c1a1cb8390e17e2b399cea765f837782ee268a999606eef4031a5f65943c793c97bdbd2e2a25a39358ecac5df2c7a62aa4cca72753a924e4e718c512b8a9c7 SHA512 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed
-DIST doxygen-1.9.2.src.tar.gz 5076037 BLAKE2B 7b21b228a2049f3048fba744d94066524a0fca37335a7ffd2616fd62a8a7d8d9d28d0bd506245c63771264a279a21f327e5386a9b4c490eea7f79ddd9583b566 SHA512 2729d013b0363a919bbf6babd300389b76e95dd9dbb16ac0f57fc5a0392d3e2076ea4fba958a236311513e68e4aa056a77bd22c9c92b410a17eed095e5adccc0
-DIST doxygen-1.9.3.src.tar.gz 5152094 BLAKE2B 1dabbed1058544159cf369fa1728410545d51857f053d43202fc2b1b19a7fda887fad711efa88770eac98ee7da7cf6fe3d13b03c0525db680b5f5f87f4c16fba SHA512 a4a3efac6897d9aeabc4a1eab6530883da782cdd8461c96b47a82f89328a877c91916d3a338706a8232270732efa37e9f05440cb4034976622e35f301aa1659b
 DIST doxygen-1.9.4.src.tar.gz 5196383 BLAKE2B 8fe27a8821e3309aa0314586b569a7e295425ba50f4c3e56eb1e2e726f15197c7e1b4c68803b4017345b5a67fddbadcc5a5b30039287a38c3a804bfce844c513 SHA512 613f17800ebd05b66b1954af4d51282a1779678e7ade6c43046fc940742a697ebdf3af8e94ac70a3422bc96def663e70eaea8c4349d192e2fe5e516c57cc345a
 DIST doxygen-1.9.5.src.tar.gz 5251459 BLAKE2B 46ce6c767ec60ba4b4e2d4e343f78b401b142f242e7037ce8877a5316ad5685a7c080045de793aa8fc1334cd593f9ef5f55d1b6259cb8966ce0b804c8860efbc SHA512 4ad4c1ecd4a12220442f354b90aa56f80e78fcaf288d5e36da421437d59811ed3d429ee13717692886a55b9628ae565d40ce13c51792ccc8bba15b1e018cb651
-EBUILD doxygen-1.9.1.ebuild 3069 BLAKE2B 04a668ae2be27712efc937e69f67c6d2f33041a91ffcf3d6f64255fc67c477619e56cf1caecaa02030422af8cba57b0e828afd6858fae5e4c5dde7ee44596c43 SHA512 adbefc8067347781614369199c02d7071e0fd19b047b1315300310fdffbb84781252e860382b22aec58aa881bc0a5f0f2599ee342dbdaa3d674697689cd6ae11
-EBUILD doxygen-1.9.2.ebuild 3044 BLAKE2B 418674cda835cb849d96c670af9846778f8ac40727af6ccc6a1c3880504be23dcf41007f18900cf7e4ab4ed1aef4057718aed61c83ffd43571f99fc7a844457e SHA512 af9d3a74eab861a0423ebf852b94312597624ab156e849d30cfeecd4cc20c8a5eacb6daf8da48dc21f7579b3c4c86754fcf28ba5856882616b7330386e69a729
-EBUILD doxygen-1.9.3.ebuild 2905 BLAKE2B 6c177c1de038266e02c18912f63d087c292447346b7e850d4b17f30a7eaf6f3f66703502afd8afc4eb587d2c99374e343e64c3ad587bc6faceaab29c92275352 SHA512 1d25fb469253a97006fe043ceb225704d1d9413277ac644e7c9bdecd8309f1564b2b6ffd6c5a999e3529ef4bbc5bf5da9f08dede72643112ebb984b42f94a90f
 EBUILD doxygen-1.9.4-r2.ebuild 3075 BLAKE2B ecccc1d1842628bcfc1ec0f707be52e51bbe9bc0e5a3e67f9796a54aa5ec70719dac4e352a1fde3209133652d2f7c60cbc02ad42ee94837a715b0395b5e239ca SHA512 3d03c5c7e00627eb8ab0dd4afd37bbd801612864446d413ce345876ec28bd4ad3d1f253e9f47703955df922a596364055b0fb18e890f2a7e112896ea1ed435f2
-EBUILD doxygen-1.9.5.ebuild 3276 BLAKE2B 0ca2c346461d585eb70e1f856a6c19ddfd48cc3b32883f65f423e2762453eb8c452713adbad4a91b948820ddf129818cc02dca43a81be56800d9607b2b99b858 SHA512 447b7146a351bfa468709d5eb4ec915554e2f882f83349cba6c89df903803e97c80cb6fd02fe855ad34f2c10d9ebb8693bbcdb33f3f810394db429e47d26b72c
-EBUILD doxygen-9999.ebuild 3043 BLAKE2B e4e1737c488f2a6e1def2710fb7131bea5b849f7e8f3e56541c24f127a1677f7235822e8e8ca870207efdab4b5d64d4f1228c3e09b6511eeb8133dd627b2fa10 SHA512 3dae56efad5d963fd2ad7a990cfda536e755e6b5b1bf7ffaaa4edcfe7ef78c52ffe01b0b0aec35eedb962ebdabf96b62faebaf1321af176005b01dffa078c17e
+EBUILD doxygen-1.9.5.ebuild 3275 BLAKE2B b6b9fd2af556b70b4efe1bb26a373d3f0d60b5271b823b6cbb987379b96c3f194a68985b3639b7023e50a8be6e064ee13e1f1ef9ab90e12890c79ad81e36f208 SHA512 a9b2cbfb30c4908a08d5c87adef2c7f25fcd9cc9ec51022375c36777f7d995f4aff9caca67c3566ad22c74e50ccb67c10fcf323bf6fdd6279e207384009ed61d
+EBUILD doxygen-9999.ebuild 3275 BLAKE2B b6b9fd2af556b70b4efe1bb26a373d3f0d60b5271b823b6cbb987379b96c3f194a68985b3639b7023e50a8be6e064ee13e1f1ef9ab90e12890c79ad81e36f208 SHA512 a9b2cbfb30c4908a08d5c87adef2c7f25fcd9cc9ec51022375c36777f7d995f4aff9caca67c3566ad22c74e50ccb67c10fcf323bf6fdd6279e207384009ed61d
 MISC metadata.xml 972 BLAKE2B 21df73118710e6eb9b1b495aef2b87b5c1457d55efb50bd3051d72505a12ee9855407f9222094fae21501f51d8ca97b70a211cd0953a68d172fc030b64144def SHA512 0d4855b1b4233da690add845a04c089c8a71634b25bc1dea8f995997b8e329e0e882eaaea15cc30994f9c063df48ff49a865c372162c4eb3dbc08bd6a44a3b67
diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild
deleted file mode 100644
index ba0582b0ce36..000000000000
--- a/app-doc/doxygen/doxygen-1.9.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-else
-	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch qt5 sqlite"
-# We need TeX for tests, bug #765472
-RESTRICT="!doc? ( test )"
-
-BDEPEND="sys-devel/bison
-	sys-devel/flex
-	${PYTHON_DEPS}
-"
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( >=sys-devel/clang-10:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doc? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-plaingeneric
-	)
-	doxysearch? ( dev-libs/xapian:= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
-	"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
-	"${FILESDIR}/${PN}-1.9.1-header-dep.patch"
-	"${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch"
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		-DGIT_EXECUTABLE="false"
-	)
-
-	use doc && mycmakeargs+=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-
-		# -j1 for bug #770070
-		cmake_src_compile docs -j1
-	fi
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/app-doc/doxygen/doxygen-1.9.2.ebuild b/app-doc/doxygen/doxygen-1.9.2.ebuild
deleted file mode 100644
index 0e31081c4367..000000000000
--- a/app-doc/doxygen/doxygen-1.9.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-else
-	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch qt5 sqlite"
-# We need TeX for tests, bug #765472
-RESTRICT="!doc? ( test )"
-
-BDEPEND="sys-devel/bison
-	sys-devel/flex
-	${PYTHON_DEPS}
-"
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( >=sys-devel/clang-10:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doc? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-plaingeneric
-	)
-	doxysearch? ( dev-libs/xapian:= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
-	"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
-	"${FILESDIR}/${PN}-1.9.1-header-dep.patch"
-	"${FILESDIR}/${P}-xml-static.patch"
-	"${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch"
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		-DGIT_EXECUTABLE="false"
-	)
-
-	use doc && mycmakeargs+=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-
-		# -j1 for bug #770070
-		cmake_src_compile docs -j1
-	fi
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/app-doc/doxygen/doxygen-1.9.3.ebuild b/app-doc/doxygen/doxygen-1.9.3.ebuild
deleted file mode 100644
index b4cc327223aa..000000000000
--- a/app-doc/doxygen/doxygen-1.9.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-else
-	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch qt5 sqlite"
-# We need TeX for tests, bug #765472
-RESTRICT="!doc? ( test )"
-
-BDEPEND="sys-devel/bison
-	sys-devel/flex
-	${PYTHON_DEPS}
-"
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( >=sys-devel/clang-10:= )
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)
-	doc? (
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-plaingeneric
-	)
-	doxysearch? ( dev-libs/xapian:= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
-	"${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch"
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		-DGIT_EXECUTABLE="false"
-	)
-
-	use doc && mycmakeargs+=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-
-		# -j1 for bug #770070
-		cmake_src_compile docs -j1
-	fi
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/app-doc/doxygen/doxygen-1.9.5.ebuild b/app-doc/doxygen/doxygen-1.9.5.ebuild
index 696cc076dd6b..27307799a712 100644
--- a/app-doc/doxygen/doxygen-1.9.5.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.5.ebuild
@@ -25,7 +25,7 @@ IUSE="clang debug doc dot doxysearch qt5 sqlite test"
 # We need TeX for tests, bug #765472
 # We keep the odd construct of noop USE=test because of
 # the special relationship b/t RESTRICT & USE for tests. Also, it's a hint
-# which avoids tests being silently skipped during arch testing.t
+# which avoids tests being silently skipped during arch testing.
 REQUIRED_USE="test? ( doc )"
 RESTRICT="!test? ( test )"
 
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 32ddae8a3c9e..27307799a712 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
 else
-	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
+	SRC_URI="https://doxygen.nl/files/${P}.src.tar.gz"
 	SRC_URI+=" mirror://sourceforge/doxygen/rel-${PV}/${P}.src.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
@@ -21,9 +21,13 @@ HOMEPAGE="http://www.doxygen.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="clang debug doc dot doxysearch qt5 sqlite"
+IUSE="clang debug doc dot doxysearch qt5 sqlite test"
 # We need TeX for tests, bug #765472
-RESTRICT="!doc? ( test )"
+# We keep the odd construct of noop USE=test because of
+# the special relationship b/t RESTRICT & USE for tests. Also, it's a hint
+# which avoids tests being silently skipped during arch testing.
+REQUIRED_USE="test? ( doc )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="sys-devel/bison
 	sys-devel/flex
diff --git a/app-doc/doxygen/files/doxygen-1.8.16-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.16-link_with_pthread.patch
deleted file mode 100644
index c3c49e6b5e7c..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.16-link_with_pthread.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
-index 6ae71a6..e03ea7c 100644
---- a/addon/doxywizard/CMakeLists.txt
-+++ b/addon/doxywizard/CMakeLists.txt
-@@ -104,9 +104,9 @@ doxywizard.rc
- )
- 
- if(Qt5Core_FOUND)
--  target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version)
-+  target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml doxygen_version pthread)
- else()
--  target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version)
-+  target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} doxygen_version pthread)
- endif()
- 
- install(TARGETS doxywizard DESTINATION bin)
diff --git a/app-doc/doxygen/files/doxygen-1.8.17-ensure_static_support_libraries.patch b/app-doc/doxygen/files/doxygen-1.8.17-ensure_static_support_libraries.patch
deleted file mode 100644
index 285ea16ac96e..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.17-ensure_static_support_libraries.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d7b0a0ef152312b9242cbbe7405ee49310e7909e Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tamiko@43-1.org>
-Date: Sun, 1 Mar 2020 11:50:14 -0600
-Subject: [PATCH] CMake: Mark the libmsc library static
-
-With CMake 3.16.4 at least we end up with a shared library and
-subsequent linking fails.
----
- libmscgen/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt
-index 079fcfc..fbf3f4f 100644
---- a/libmscgen/CMakeLists.txt
-+++ b/libmscgen/CMakeLists.txt
-@@ -16,7 +16,7 @@ foreach(lex_file ${LEX_FILES})
-     FLEX_TARGET(${lex_file}        ${lex_file}.l        ${GENERATED_SRC}/${lex_file}.cpp        COMPILE_FLAGS "${LEX_FLAGS}")
- endforeach()
- 
--add_library(mscgen
-+add_library(mscgen STATIC
- gd.c
- gd_security.c
- gdfontt.c
--- 
-2.24.1
-
diff --git a/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch b/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch
deleted file mode 100644
index cfa56174c5eb..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.9.1-empty-line-sigsegv.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-removeEmptyLines() segfaults on empty string
-
-https://bugs.gentoo.org/show_bug.cgi?id=454348
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676423
-
-Patch written by Thibaut Paumard <paumard@users.sourceforge.net>
---- a/src/htmlgen.cpp
-+++ b/src/htmlgen.cpp
-@@ -1022,6 +1022,11 @@
- static QCString removeEmptyLines(const QCString &s)
- {
-   BufStr out(s.length()+1);
-+  if (s.length()==0)
-+  {
-+    out.addChar('\0');
-+    return out.data();
-+  }
-   const char *p=s.data();
-   if (p)
-   {
diff --git a/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch b/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch
deleted file mode 100644
index 66e647cf53b5..000000000000
--- a/app-doc/doxygen/files/doxygen-1.9.1-header-dep.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6ea1b4104fe2524c9c1f2cdd5f7de8c1a48f3f87 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 14 Sep 2021 20:56:20 +0100
-Subject: [PATCH] Fix missing dependency on configvalues.h
-
-It's referenced by config.h, which is referenced by most things.
-
-This was failing to build for me with Ninja on the m68k Linux platform. I don't know why it works elsewhere, could just be luck.
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 18406488dd..0e0c5f78de 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -215,6 +215,7 @@ add_library(doxymain STATIC
-     ${GENERATED_SRC}/ce_parse.cpp
-     # custom generated files
-     ${GENERATED_SRC}/lang_cfg.h
-+    ${GENERATED_SRC}/configvalues.h
-     ${GENERATED_SRC}/ce_parse.h
-     ${GENERATED_SRC}/resources.cpp
-     #
diff --git a/app-doc/doxygen/files/doxygen-1.9.2-xml-static.patch b/app-doc/doxygen/files/doxygen-1.9.2-xml-static.patch
deleted file mode 100644
index a106d6eb5a93..000000000000
--- a/app-doc/doxygen/files/doxygen-1.9.2-xml-static.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/doxygen/doxygen/pull/8862
-https://github.com/doxygen/doxygen/issues/8855
-
-[sam: deleted msc hunk b/c we had it in a patch of our
-own.]
-
-From 5c3a4ad2773fc911b341b36b00528603afbe1602 Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Wed, 27 Oct 2021 16:41:28 +0200
-Subject: [PATCH] issue #8855 Unable to build 1.9.2
-
-All other libraries have been declared STATIC so better to declare the cmls and mscgen libraries also STATIC.
----
- libxml/CMakeLists.txt    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libxml/CMakeLists.txt b/libxml/CMakeLists.txt
-index 96c56534f9..596ed90887 100644
---- a/libxml/CMakeLists.txt
-+++ b/libxml/CMakeLists.txt
-@@ -11,7 +11,7 @@ set_source_files_properties(${GENERATED_SRC}/xml.l.h PROPERTIES GENERATED 1)
- 
- FLEX_TARGET(xml xml.l ${GENERATED_SRC}/xml.cpp COMPILE_FLAGS "${LEX_FLAGS}")
- 
--add_library(xml
-+add_library(xml STATIC
- ${GENERATED_SRC}/xml.cpp
- ${GENERATED_SRC}/xml.l.h
- )
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 4612e40d1a58..e74e6245f246 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index eb16bef312af..70dd5e2e38fd 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -5,6 +5,6 @@ AUX libftdi-1.5-tests-no-cxx.patch 1017 BLAKE2B ff3e05ae2cc48a023c74142f986159f6
 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
 DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0ed06cb44fb9d50ad8f80199b17057d2f48a27b8295b43b956934289c872a2ef1ddb7f93fa93c6816511ef7607d SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f
 EBUILD libftdi-0.20-r1.ebuild 1865 BLAKE2B 4f05cfeed6c13b4f5c8e28a084aed8066ade89c9540eafdc985b92b3e0d130547760695e1beab9420d1f1eda701c40c59e548e91b4898d69eac835d7b883326d SHA512 01c49655a48494976bdda22045a22ed8c3d3ae6747cfb3ef9a040e032925f3e3a4f4d4fd36de80db226d7c9fab43711e2ec4eb71c03a2ee5c8371fb45ac9fbfe
-EBUILD libftdi-1.5-r3.ebuild 2159 BLAKE2B 37f16150cdfbd9062e68159db7ba60b349aaac2a528114c3fd021ef0fed9ab2607a38818796ff984ef6dc8f30154ecbe281200f53ac835812f4ff7653255547a SHA512 01ee27b0c73e71c7cffb2e939415563265717784e596f111b7a5e7d35eb78cb5d06a0ffe4c574b1e53217f2c35d3c24746172f128fff876709439c60321f5057
-EBUILD libftdi-9999.ebuild 2071 BLAKE2B dfc52ea7939a177867d14e6ad201ecc1432696018e79342b1ea1ede35985aa9d0a0a19ec14db8bc80f5f20df8f9e503e24cc2c207a336d2658bce4e8998d7e07 SHA512 f1d12721f6a0c1757ee96782c114a7de4af502a46b039ba04ddb1c5d071d776ef92da39d4d6337cd4ae2818457baf32f2bdc3400936ef0ae18539de21258fffb
+EBUILD libftdi-1.5-r4.ebuild 1910 BLAKE2B 2c12c3d063368833363249cb01e5e78e11509f9f325e29aaa6bdac63c39215cd4aaf1abf9f3dfcb0811bb553b4d11833a5acc88c2eba2c199a61b08640aa235e SHA512 a12bbb908a8a0c02ef204bc325e2f26f4fedc6e813dab7bacd80b4aac5493aba93b06c464662033aeda1248a165c49ea4adbda4b0147ccd4969c99b071a7f995
+EBUILD libftdi-9999.ebuild 1829 BLAKE2B 4a413ebc6e38e4ba393791f1d2d0ab17f13e2c15a105aeec4f8ac1c4dc01c9b9a7770874eb69caeae4a2b38f825386bf354ebc18f05f48b9b2c771da327f1f01 SHA512 4447f8d14a48df19f3197585efa49158f56f062e327769dc242db8758a721648135c0be717472e2d03c833006803a873c985ab95361a1601d7d524c2c00a0b8c
 MISC metadata.xml 318 BLAKE2B c2c9ab83d57a082ed6608367f53f0f9420056c909d4ee50641da5b8f12b6a6ca996740fbdcadb0fa08460cb0cbef36dbedfaaf98acaea3eeeeee6afcf7724f54 SHA512 313b5c5dfcf5feb7dc8e41c1cb74939619451cb0747c1a281c9a0e763d26e0850a43e05d8fd2a836389bd75c2a4f153b80986e11be8171e9d93ca234f9df05f2
diff --git a/dev-embedded/libftdi/libftdi-1.5-r3.ebuild b/dev-embedded/libftdi/libftdi-1.5-r4.ebuild
index e9ceec3285f5..aff84e7671eb 100644
--- a/dev-embedded/libftdi/libftdi-1.5-r3.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.5-r4.ebuild
@@ -12,12 +12,13 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
 else
 	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${MY_P}"
+
 	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="Userspace access to FTDI USB interface chips"
 HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="1"
@@ -71,13 +72,6 @@ src_test() {
 src_install() {
 	cmake_src_install
 
-	# Fix up pkgconfig files
-	# bug #766818
-	if use cxx ; then
-		sed -i -e "s/libftdipp1/libftdi1/" "${ED}"/usr/$(get_libdir)/pkgconfig/libftdi1.pc || die
-		sed -i -e "s/libftdi1/libftdipp1/" "${ED}"/usr/$(get_libdir)/pkgconfig/libftdipp1.pc || die
-	fi
-
 	use python && python_optimize
 	dodoc AUTHORS ChangeLog README TODO
 
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index 36487c2e0df9..e59e64110b94 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake python-single-r1
 
 MY_P="${PN}1-${PV}"
@@ -12,12 +12,13 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
 else
 	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Userspace access to FTDI USB interface chips"
 HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="1"
@@ -66,13 +67,6 @@ src_test() {
 src_install() {
 	cmake_src_install
 
-	# Fix up pkgconfig files
-	# bug #766818
-	if use cxx ; then
-		sed -i -e "s/libftdipp1/libftdi1/" "${ED}"/usr/$(get_libdir)/pkgconfig/libftdi1.pc || die
-		sed -i -e "s/libftdi1/libftdipp1/" "${ED}"/usr/$(get_libdir)/pkgconfig/libftdipp1.pc || die
-	fi
-
 	use python && python_optimize
 	dodoc AUTHORS ChangeLog README TODO
 
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c34833751540..84a20ee78a8c 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index c395cec40f72..46d4aa378747 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,8 +1,6 @@
-DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08d57d633d95a1eaba17f52d4306603f50f332df360d0a4880c85c65bad4503503df0acad8f7b437694a2b887 SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51
 DIST mockito-4.8.0.tar.gz 1044264 BLAKE2B cbd8fa0db3b652ad882c6bb8c5f86116cf21772869814ddabe88532ff2522e399e8d7e9d68935b10844c0c496755834dee66c88dc7b2e0231757f7c79233c1fb SHA512 1f1ea9aac907d8ba42874eb6a6870cd5cb46b80a4a9f841c7eca8ff8f651e13baa92a4c3512d95d6596dd7da60e627a606c74e4b1dc56d11b06a14f44e3d53f3
 DIST mockito-4.8.1.tar.gz 1045454 BLAKE2B 82efc18afa8efae2495fdd5b0db58ddde8ea5cae9b7dfb554075924e343f5c0290a7f5d63b18c217b33a11c31a13ac40fcd28a752b0deae737c4bd75ea13c044 SHA512 dd2adc2211637daa86f5174e333744c5a1ff29dcccf9866a33933e2ba945d99781d5860c6059e6fa06a649d9a45417ab13066f8c8e896cb753b6e0869f0e2b03
 DIST mockito-core-1.9.5-sources.jar 723074 BLAKE2B e553a923542a1a2574ee0cda5979d168cc3e9644dbbc9fceed2301ae1bac150c4e35dbc4432d50e2479efea2a6cd35ec19c62c3598f61709f1f5dc8959cc0155 SHA512 271e626c3b5be9a7d7c82a2f0bf44077aabd51924b0956a88633ace7fe8c134d8cd1f89ce348ce0d15ccce55a50027e303836d2d2f430500317b6136d308d3d4
-EBUILD mockito-1.9.5-r2.ebuild 892 BLAKE2B 5efb72fdf28d793ad9cfd14ee41b58b4ef9d9bdd21b638657ea9ea77444443a68e51177a992b2f3f48e13c56ab68a3821368fd6eb287182d2f60ada628cf6ff0 SHA512 44e08dcbe481a4bcf964227cf2c741403aa799ef98065b7f8f490451d15daa286f01cc944546875cfbc92844427ad2ccb305e44ed5dfa06fa5f04e673146c8a1
 EBUILD mockito-1.9.5-r3.ebuild 713 BLAKE2B d46334ba15f68eef38b979b4c8bd84ad51fdfd61f2d33f77f3230876802c753a6fdbbb0422edae5de79f931b314c7bfbc63266de9dabbc9327ed7b1a302d517a SHA512 73886d139804085b34e67902a67af34358c7abd1083bbd2e21d6cec7b149d273307312d42351236fe6628e237685c4e1f62bcfc7333e1af32017fb97183e7f34
 EBUILD mockito-4.8.0.ebuild 1262 BLAKE2B 9098784d33a42e9a43693c75a845d02fd681df71c402f163e121ea70f9f7f30d1383a3eb70c1ec5ca5cc72bc2353659b7f47dab6148dc983513716321825da3f SHA512 3be5f8404cc604eeb1af0aba9d0c78f3d08d43f98f9ab73d3a7175fbe5f0ac7fa2f1aed08c62ae2055e2029a5ad611e031353fadd7c5afb204d794c353da9509
 EBUILD mockito-4.8.1.ebuild 1266 BLAKE2B 863f10a3958a92f41b88e8eb605082f30be2e00ec1faeb44c065afe38ed71ecbd184f2260186f0bb446ca3f24c56973e2da2ccd5e4c2804c7845115413674a0b SHA512 b4fe4f813bbf26fd31c846ad5e346b9639544b2829be1efd9be7450101f2e08aeb41f0c4fcccfb511868c717a5ddc6fd3c91df25e4b68894e81748f07bc8c064
diff --git a/dev-java/mockito/mockito-1.9.5-r2.ebuild b/dev-java/mockito/mockito-1.9.5-r2.ebuild
deleted file mode 100644
index 8d5f634f6853..000000000000
--- a/dev-java/mockito/mockito-1.9.5-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.mockito:mockito-core:1.9.5"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A mocking framework for Java"
-HOMEPAGE="https://github.com/mockito/mockito"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/hamcrest-core:0
-	dev-java/junit:4
-	dev-java/objenesis:0
-"
-RDEPEND="${CDEPEND}
-	virtual/jre:1.8"
-DEPEND="${CDEPEND}
-	virtual/jdk:1.8"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="junit-4,objenesis,hamcrest-core,ant-core"
-
-src_unpack() {
-	unpack ${A}
-	unzip "${S}"/sources/${PN}-core-${PV}-sources.jar -d src/ || die
-}
-
-src_prepare() {
-	default
-	find "${S}" -name "*.jar" -delete || die
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 276ec7bae70a..a1fa4d87bb6a 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a033e47838f2..b8311b17303b 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -25,13 +25,13 @@ DIST python-gentoo-patches-3.9.15_p2.tar.xz 23244 BLAKE2B 0917396dd08f652f8ba06c
 DIST python-gentoo-patches-3.9.15_p3.tar.xz 24344 BLAKE2B af66518f4e6aaac2347f23895d028aac6516c29d1f2c59a4a350789b217da9386d5973014715e1a7dc2f9376981afdeb21b7820b497c49a12dfe653747fb89f2 SHA512 3e5603ba9b7d7ce93df48d7df8269f01cbc86fb81844ddcf8c716ea2cb6c36c07a34dcf186620a355c70bb337b8828038cd7b30ff512fdc68b2722d733ed899e
 EBUILD python-2.7.18_p16.ebuild 8307 BLAKE2B 4be343c831fc645acc31432978f0ddb6da538abadc55238b5907a7b7c822c2e308455d1bb0d27d53c887be89fca742088932c2d4ba570293097113f6b5c0c2a6 SHA512 5fb05c1a8f045fd3eb3e24fafef2063fc51db7cfd13fcb3475a1c0e54c458db76c5667f9e164bd9ec084ba9965b7745bbf3c6bc7070db228b32c934a19722ecf
 EBUILD python-3.10.8_p2.ebuild 12901 BLAKE2B b406040e5412b528ae58e26fbc8226707f22137cc372eb386267b45d3ba047c8cd03d94027e60ef337be05ff8b1f5d89a258d1f4568925a4495f6e577f829249 SHA512 5bfd248c730be86592a747b47e23f87dc7eb1a249e3eb61cea87c4add7738755a9d4badc12f59e0fe0cba5190d94dd4a29bb6707f255f16ca748e2acfcc2a042
-EBUILD python-3.10.8_p3.ebuild 12908 BLAKE2B 3eac13cbbced06e7f27fc711d42fc81536e1435dcd8b98d75502ff5a13fa2c9b3490eeca6e07c68ee302a05416bcd0d81b3da054a2c5a0cc9ec806a9c19c08e7 SHA512 5a4bf2b87b2c93124efecd8f2df9b75dedbe210985012db5d3f2ca9902d357c9b49474ec6602d30f4658fb65425a2b77cddb1faacaac4ffc9ceedf2a5e48de07
+EBUILD python-3.10.8_p3.ebuild 12907 BLAKE2B 2e600496bc339cec075ce57768a74467343a9249b73d06a8e0600672159e6681b813b8fbab0d19a878629712513ce19f1b3105d97977b634ddb7e5bb1a58bcac SHA512 d197b58aeda92b53b6124a0ddbf1a6b2500a19ca13a1d4b43c9b1d3d1fb753ba12ffed8a8527eb9cfd0ca7da07905836f02daf286b43b1ce2bb01cb0f077d1cc
 EBUILD python-3.11.0_p1.ebuild 13801 BLAKE2B cdff9df837481ddf9a6e008dff0fe9f235fe0c8847b5b2af351b207daa201d9bf5a9faa218aab640f6044c516a03d4676525224fc9fc83ca44f77c998a6a9030 SHA512 25640cfc9428e9b18d7fcd3653df65912eff1060717f8f8ef97ee33549471fe54f2c1b7088b55577fc3169f3c16da0ea53da18fd6ae22fb173cabeae2183d1c0
 EBUILD python-3.11.0_p2.ebuild 13806 BLAKE2B 21135b23de10ad443b51a84c221741384a368a228f8f091e6a85c75e99062a35145b3c794fb85198c1c329af82782df0cd891e05d3de4cd604c06e21317b282d SHA512 3b9526601c359c441478a51061b3c0ed800e953e0c349d75e9cb79d92553f719158155fc1085f581b6ff48211105ec3e5f1955549fc9e565e6e87cd4d8aa8514
 EBUILD python-3.12.0_alpha1_p1.ebuild 13694 BLAKE2B 77802b95f3b9bf8c5a88d4a50e7529cc094c332f408be39a1cbdf243ceba3a084765247f5acc9094f939fede82b24ff7967e6544cf73b755fb3b502be4979e96 SHA512 8b2665b81a0ffa78529e66db5559d23ef682244de9849aff3985ee013d3e6fbfbb359542744ef1f90e2ba85c7b22be2f5c6e2c3751a2d9fce449564f9abc99ae
 EBUILD python-3.12.0_alpha1_p2.ebuild 13694 BLAKE2B 77802b95f3b9bf8c5a88d4a50e7529cc094c332f408be39a1cbdf243ceba3a084765247f5acc9094f939fede82b24ff7967e6544cf73b755fb3b502be4979e96 SHA512 8b2665b81a0ffa78529e66db5559d23ef682244de9849aff3985ee013d3e6fbfbb359542744ef1f90e2ba85c7b22be2f5c6e2c3751a2d9fce449564f9abc99ae
 EBUILD python-3.8.15_p2.ebuild 11439 BLAKE2B d6daa1f6acb91842a3eed6d47291ec664ce9e7fdb10644aaee576aa25ba50af80d613f47a97a0714d5ff981332efc3efca4b247bc852c08a5542ed4224fe499a SHA512 10fdfa955eed007c37640959b19ac01689cb38b9e1e2181439473ad1ca06e014393d8c7aec79835a00351d1e5b46b6b6ddba9037169920c4fbd2c637b9be0025
-EBUILD python-3.8.15_p3.ebuild 11446 BLAKE2B ea57e2f40e53c2343899edddacda8dc3b10e14a117562b67f8ddef3651517e30f2ca23e2a1c7f62c78b211609014e57bfd15a0d2d0471d0ffae3abed110d9e37 SHA512 92cb838e131457641fe19a1ff2ee5ce4b196c92403356348728faa87f4d4616575818dca86a4ef2278996cb4e298059faa2c90f3154e3df4cef9fa729f88ef35
+EBUILD python-3.8.15_p3.ebuild 11445 BLAKE2B 7c45a61547f3037a39bc044e3276c13bf810c095870b37892bf04805a102dfd170fd2adc98e9a924e1098b8c3e748cc6ef8380bd977d1a86856bbe6fc7666da4 SHA512 70ac2c75abab3c332fa65f4c238004537b769422fb9269f32167d15ad2c0a101f6a746afb7e643c78a3cd2332c91236aee2b5165f6eac649da962a580a229a75
 EBUILD python-3.9.15_p2.ebuild 12699 BLAKE2B 0c79c486faf93fbf44143cdac9a4cae7d7f5296294209be9c0e6bbab524e80aa41a88f7be3f449a92e3ccb5e1edab0b412f4aa375f615825a77fe162edbc4ac4 SHA512 bd797e9555e3b67486a33431baf5e34a55756ce6afb849d36550ff12e7aa5fb80cf6e9148e6292ffe222318368f12b2e2ab65657444e35f44aa81aa8eef6c9bd
-EBUILD python-3.9.15_p3.ebuild 12706 BLAKE2B aa83fa6246d67602007b5c727b988c6381914f3d02726370af017bd934fe957f0d00c2454417a83826c15957a29138671444a0585987d12e423cf779a042268e SHA512 ce360affae43be31da1bd2673ae1e15e102f60829c915a543496129f0576574bdfd31dd596421ab63293bb09669e73d600ca39601449a8d5fb1952e529658088
+EBUILD python-3.9.15_p3.ebuild 12705 BLAKE2B 8e229d65af8de498147d983bd0b078be7e81d57990a54365559dd1f21e1785932f9572029475c6811d2527d065e1008b4bd91411b6b7bfc12eb45a7b5455a349 SHA512 f6ce237d1e7b504a8cd48bc770c52253120cf0153dd533fc73af799f05c11ee5541199acf39080aa7b4e257ad2eee055ef3b81f6706ba2a86692619cb84f1988
 MISC metadata.xml 1125 BLAKE2B 5302c84538eb30fe86c91d15faa2f6de0eaa4ee38c26a0f6845b4a95bda94ad0006a509bedf9f71288332a593d245191c0f358f0515d96c8aec8693eca22fd2a SHA512 2280aa3f309e1338d7e41c8cfa50cde4d0441bee7d98a86ce7bf4969560b34dfab8ef6171cbbe0d6a19f56c676e9c9dd63c65340ac7145317d2eab0fe618ae0d
diff --git a/dev-lang/python/python-3.10.8_p3.ebuild b/dev-lang/python/python-3.10.8_p3.ebuild
index dedc83e8a23d..1a6849d68da3 100644
--- a/dev-lang/python/python-3.10.8_p3.ebuild
+++ b/dev-lang/python/python-3.10.8_p3.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened libedit lto
 	+ncurses pgo +readline +sqlite +ssl test tk +xml
diff --git a/dev-lang/python/python-3.8.15_p3.ebuild b/dev-lang/python/python-3.8.15_p3.ebuild
index d6eac9f2a689..928658f24517 100644
--- a/dev-lang/python/python-3.8.15_p3.ebuild
+++ b/dev-lang/python/python-3.8.15_p3.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
 	+readline +sqlite +ssl test tk wininst +xml
diff --git a/dev-lang/python/python-3.9.15_p3.ebuild b/dev-lang/python/python-3.9.15_p3.ebuild
index 10dc65809a85..516f6837b10a 100644
--- a/dev-lang/python/python-3.9.15_p3.ebuild
+++ b/dev-lang/python/python-3.9.15_p3.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
 	+readline +sqlite +ssl test tk +xml
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 375b70498e89..6455dee06352 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -19,7 +19,7 @@ DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253
 DIST spidermonkey-68.6.0-patches-04.tar.xz 5956 BLAKE2B b1250391a5173e676272d5926b710c06b0e9de1ff03b130a57fdac30f2deefbee3fa92250b37e28087572fe5cce73eb112ef4e1fb0c0401d6ecdb22ab9868998 SHA512 94575b11b4f006c6ee0c8d64b315734a173cecb68e9128ca61ba1a28177e3c149b8cf1f3b3c47a7a263fad8da6196fc0101df87392f016686a827e0cd24fdc74
 DIST spidermonkey-78-patches-04.tar.xz 3408 BLAKE2B f2fdd4882e1e4de1908c458dc8dfedd5665ef7118f19704dabf2b2a80e2fae48813e9bc3d0c3410287e32c21e3f9d09233d8e5d15917f53aa2f60e6190cd9cdb SHA512 87ac83c0ccc05f482913b1fbf043db1878536f935f934362a47283809c0cbfdeff040206a9c18c687384b606ba8a7bd9a7c1fc3c0bcfdd620987990a33ca1fe2
 DIST spidermonkey-91-patches-04j.tar.xz 4624 BLAKE2B d9cf47b39a165e8434d4f2f20ae3a9734c1bb81c32ddb75360e5edfa6817d6343be89aff0f8ec381485772cad80b00a069789decbc462129161afc3d4acfcb53 SHA512 bd574fee600cb4c6a262893b7d992d85c4059d512b829cd2f226aff86d8a6a83c2bdab466704e22f64bf6d29f90901037a34f9e90a42251952ba1cdbc0cab968
-EBUILD spidermonkey-102.4.0.ebuild 11052 BLAKE2B aa8dfc27d8dcc99f3532ba47126428895331809fa49a78e30cf47845fb18d751e5035244cbac7fee4b34a3c6e28ea1c20d78ac7d9f18d28564098939a62f1bc0 SHA512 27563fd0e4f3e1ea14098e85943e0c36c5e128d70739aea9c06d551f3a441e21ef3ddcc7ae7e76912b472240dc08cb6135921b8d411327d5fc1b0b72b71cdc0b
+EBUILD spidermonkey-102.4.0.ebuild 11064 BLAKE2B 4477456fc5958dbdbf5935762a0fcd1c295f888b0770a6fa0cf6b2bbdd693acb30d6c5652157b1a20541a37e7a6db8487fe5e6b818d0b5784decf1d11672fa7b SHA512 8b66e29fb142a2a9c534217492bb9f607c1127a69b10389b44d1391363eefd0772b65c2c869d3dbb553b8b63a5527010d8a195e6ffe06bc5efd79994e240abf6
 EBUILD spidermonkey-60.5.2_p0-r6.ebuild 4080 BLAKE2B 7269a944ab109fa27ee80016d44c4c71d91c0f230fbea9704ba468bff06d62c2740af3cce4ce7c39179dca6be7c74b3eb62b877e7f7db2c7a6e7314e0361401c SHA512 971cbfaad2aabaf43b6f528bc67f5bb207bf53bc4d9bd19d8d21948ad6e055a8f3aa0f059028db13c95740fef3ebc9257a1ab2813131180dfb5c7b2306b66e2b
 EBUILD spidermonkey-68.12.0-r1.ebuild 7834 BLAKE2B 35252f841078dc8b0f06c2c2dab0d0a17abbfa23f025c3b2534232a82951298722a7ee5c3c7bcd56055879c5a886961a8ac34bb325fca7a466dc7d59f7b391ec SHA512 4ecbf27cddb67cdef15aa2c93cb4acfb4851973a07b7b9040186555027f5bc4d7126351b5bb1646640d0493afa78e63151d39b0bf37a6899c87ff20a7ea22198
 EBUILD spidermonkey-78.15.0.ebuild 13130 BLAKE2B d0c2f2749c442b6d67ad990e07e2496ef1c57af7e71f0fd0d7fc362d11278e062847d730429b64edfc94e289c11236efdc3b66006fd6c7208bedf3043f6676ca SHA512 626aa7d0d21e5718def7d2e948c2606ae07a0536267ec6c81af2f95bc390e0eb2c436d4749fe65ccb8d1efac311525ac69261f27754bfb2a039e9fb73935aa7d
diff --git a/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild b/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild
index edf248964440..4f58b769e17b 100644
--- a/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-102.4.0.ebuild
@@ -235,7 +235,6 @@ src_configure() {
 			have_switched_compiler=yes
 		fi
 		AR=llvm-ar
-		AS="clang -c"
 		CC=${CHOST}-clang
 		CXX=${CHOST}-clang++
 		NM=llvm-nm
@@ -260,6 +259,7 @@ src_configure() {
 	# Ensure we use correct toolchain
 	export HOST_CC="$(tc-getBUILD_CC)"
 	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
 	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
 
 	cd "${MOZJS_BUILDDIR}" || die
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 24945b6ba51d..e70a70e438e0 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/stdcompat/Manifest b/dev-ml/stdcompat/Manifest
new file mode 100644
index 000000000000..0294108f795a
--- /dev/null
+++ b/dev-ml/stdcompat/Manifest
@@ -0,0 +1,3 @@
+DIST stdcompat-19.tar.gz 530511 BLAKE2B 4af97c355b98f63366d647a4a375bde43ffbf959a2c02132ab57457db4213b8f98a972bf99667dd53603b28235b4f853470c2117270ce42c6aa579a21dd148fb SHA512 25582731170f2f80eed281c48af4904d1d00ef88a38d1b17853395c19a326d7b11e42c17b69f639402c467ff6f9b83a2e9d4dbab7255ac25d466b85a55674bd0
+EBUILD stdcompat-19.ebuild 619 BLAKE2B 70f8fbb535ecd3c682197f7ef3ac382a1b0efa6a837efb0938bbc8edf60972d52d3e7261c4271c409a20e5bff0a26abcef050bac6cee82f5fa7cdb400992b924 SHA512 6b2a837ef459d2c2f9678057cf39cf26c20e75932a84be552c9dd624b8e018ff006b6335abd0bc7ac41e0e24e8aa60049366300fdab64e0d84b50b1541e9ca43
+MISC metadata.xml 577 BLAKE2B b6857bd7760fbdc5988d1a545e2f128c9d13ea18d43a341af0757a227958594ed314b9472c9994fae54f7aba2f57ebee06b6f9cc4bb5a1428218dcdda2745507 SHA512 859f88d95b52a4e159fb4241ccaca2ba7777eda999623e281fd36e6b1ab2273407931f9ca89971f86b7563889bb704d7e353605f808aab868cb09a0468687419
diff --git a/dev-ml/stdcompat/metadata.xml b/dev-ml/stdcompat/metadata.xml
new file mode 100644
index 000000000000..ef295f228ea6
--- /dev/null
+++ b/dev-ml/stdcompat/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<longdescription lang="en">
+		Compatibility module for OCaml standard library allowing programs
+		to use some recent additions to the OCaml standard library while
+		preserving the ability to be compiled on former versions of OCaml.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">thierry-martinez/stdcompat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/stdcompat/stdcompat-19.ebuild b/dev-ml/stdcompat/stdcompat-19.ebuild
new file mode 100644
index 000000000000..e6001579ae46
--- /dev/null
+++ b/dev-ml/stdcompat/stdcompat-19.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Compatibility module for OCaml standard library"
+HOMEPAGE="https://github.com/thierry-martinez/stdcompat"
+SRC_URI="https://github.com/thierry-martinez/stdcompat/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0/${PV}"
+
+DEPEND="dev-lang/ocaml:=[ocamlopt]
+	dev-ml/result:=[ocamlopt]
+	dev-ml/uchar:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-ml/dune
+	dev-ml/findlib[ocamlopt]"
+
+src_configure () {
+	econf --libdir="${EPREFIX}"/usr/$(get_libdir)/ocaml
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 378c47bee24c..76548919b617 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 47079dbf6718..15c71c492458 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -2,5 +2,5 @@ DIST pypy3.9-gentoo-patches-7.3.9_p8.tar.xz 15660 BLAKE2B 0d2d2c6e4795b7a30eb1e0
 DIST pypy3.9-gentoo-patches-7.3.9_p9.tar.xz 16508 BLAKE2B 30e61ebccb4949c5da6f1837df0e4474eda99c2b2262994b41ce9a5de58b543562010a28d20abb4d1c53c866d668c717802afd617efbcca142610a67cf1a48da SHA512 20d72fe0b7592f6f326faf8f989dacc4c6204203b270f033ff528bc845e68ea2092fa0a16176e91e882d028f549e6622c609e1566d3bc018b34178de76c48992
 DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a
 EBUILD pypy3-7.3.9_p8.ebuild 5762 BLAKE2B 3aee68d655c6d2ab2f69dd8873e5793d341c2f8cb48a8251358c0be5787cc5d9cfc2f22a80e32c10323c58b3e44b4428a6b110e94336bd6a873b6dc7ebb022de SHA512 bf2cf7581bd27d0f2e3fcc6008e26c2fcbac4f6c8de18a628dfc06cfd5e16c1fb3d16c0da1272f073186742ec8e3329d0c4dd1ec4dc27eb85c61f182fa542375
-EBUILD pypy3-7.3.9_p9.ebuild 5732 BLAKE2B eab20ecc301643f2c31d387f03f0dbfcab1ded5db71dd06fecb75d247f9e0120b67be6db37ab73b2ff2c3bb370152b2cbbff35cfbc70a70f3f3a690609e3eb31 SHA512 d6186f78967ba60d73647b568af6b9d3e329c26151275de5e4686c60c19fddf4d6125d7c7d8f36739a99d34b346e6e341fc1226936cc747722d8f5a867fcfe8a
+EBUILD pypy3-7.3.9_p9.ebuild 5730 BLAKE2B d9d2ae7ede9d548494c0d4f14d150e28a9ad921d82fa1d0ea39289a6e8090f66c7d72de5539cd3f5f8ad30a3b7a918e42c664e1426618fc611bc5193172082f8 SHA512 ae32e79948584725dfcf36df6098d9f17402f187f26dc1c6dbeaac50134907880776cc8ad48efb2222a8eeb22f7c8516b2d2e10c6c27cb05386c09416285a8be
 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6
diff --git a/dev-python/pypy3/pypy3-7.3.9_p9.ebuild b/dev-python/pypy3/pypy3-7.3.9_p9.ebuild
index 6370feafe7b8..b8fada825778 100644
--- a/dev-python/pypy3/pypy3-7.3.9_p9.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.9_p9.ebuild
@@ -25,7 +25,7 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="0/pypy39-pp73-336"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ensurepip gdbm +jit ncurses sqlite test tk"
 # many tests are failing upstream
 # see https://buildbot.pypy.org/summary?branch=py3.9
diff --git a/dev-python/tlsh/Manifest b/dev-python/tlsh/Manifest
index 7e344d9652e5..566ae536a962 100644
--- a/dev-python/tlsh/Manifest
+++ b/dev-python/tlsh/Manifest
@@ -1,4 +1,4 @@
 AUX tlsh-4.8.2-setup-sources.patch 1029 BLAKE2B 6b1a252693940df0856361aa38553a6a684566c4ab80ac4e01b7151a611b5d27bd9065c5560e958931108399b9b860405ab4119615f8f6ab6f8d05e8ce2f4c89 SHA512 04fce865f3a7e73a9a6814596255f86eb1d24086372479ed993b7faa362973808d2d45f4d81506c1bf87bfc534caa410a0c8758250ccb3fa4337c0952610be5e
 DIST tlsh-4.8.2.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
-EBUILD tlsh-4.8.2.ebuild 796 BLAKE2B c9fe0fb7d46d7aa35ff24e3e0bb267d1ea5ed7cbe6d604bd901d0a9e7929769a2ad813234fde29e4fa49a6dfeca1ed3d18e2afdc454d1e708922f3417e0c2bb0 SHA512 b401ab462988b65a30d8f96d4073889b749eaa3223f486b0f208ca063682959c5102feaa40654b66be8de8d0a25fcf614eb42535dbe25ffde23bd51c3a168822
+EBUILD tlsh-4.8.2.ebuild 796 BLAKE2B 21d34d99e476fcd896a3063ca86d200008c0ed14b484933c47160892969ba9ef11ed0dd7c812b3e6c49dd5bb039cd7eca7cb0fa3dd0c1ae2bec4fa2aba229b16 SHA512 094533b78aef4dae022b5789ca953abad11f541a198a81630d32c68b41132e56d2237ae19ecf9271d8e4f53b16dbccbf868b2dc07c2487857cc5da205e5931f4
 MISC metadata.xml 520 BLAKE2B 97d64e94859345f4537e1a95dac94190cf54cf608cc851a8cdf24f5f4b71c0821c778d24f99fb076ed08247a085270d4c36aaa66583916c0a420733b7b8543be SHA512 95dc94ca2c08d71246453ccee139901e675ec84b2c4af224b90057270f4bf5494ffb761e2d3b4dff25cfcac47185d4f7d2f4b3080182f8c9526b746e99519211
diff --git a/dev-python/tlsh/tlsh-4.8.2.ebuild b/dev-python/tlsh/tlsh-4.8.2.ebuild
index 0c04d759bb83..ff90343fe42c 100644
--- a/dev-python/tlsh/tlsh-4.8.2.ebuild
+++ b/dev-python/tlsh/tlsh-4.8.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Fuzzy matching library - C++ extension for Python"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c5718226f05d..3c9b26f5cd3c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
index 04ee5548b05d..306071c044e0 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -1,3 +1,6 @@
 DIST bcpp-20210108.tgz 150080 BLAKE2B 5614b1e9957d63532ed6ba6d4588ae8b899201c363984bc99726bf48ae49ee9d16a71c407e3988fdeb715fef5e67343bc56c94eb1c8e977a14a6c2b08ee6668a SHA512 46a8fff766bbca4833c898d550ce4f0ac5e6ea64a2e05e63e4680186345a080aa30e54a4a5a3d22d47df8e8c8cbc4e738578fd59ec647d305c32a228d3b01e73
+DIST bcpp-20221002.tgz 151426 BLAKE2B 6978b30ca684ec5e9eb781955679d333e7efdb389af2b29a341b466387bf4147bc72c54d80eaa6d57770cd720c2074881594418ccbe7aa81241ebeac938499e3 SHA512 a1d2c57e5acabf90f19d3721c79f76867c2b93af51b717af80089ab9dc5117ac28263ceb6aff6544a1040b6fc5115a229759631309c4f6ea9808c6b6eb7d1c92
+DIST bcpp-20221002.tgz.asc 729 BLAKE2B 64a211fb84ac6ca2926cb54b06945a908bb19ef15fb8784f4201b29dbc1ebe1be85e8bb0d05d14ebde126508cb33bb9e2d2411fa54b1290246263829d1f4f7f0 SHA512 867b2c04c957daff028a0eaa14ce2c7fd8718dbe9a9af5bf46b293ce51a0a49f823b18978f10f77b7363ff62691683e2945d0d71280185386f19dc7f1cc883d5
 EBUILD bcpp-20210108.ebuild 903 BLAKE2B 3748ffc0caa34f1a2a64e29bd7f586406ff45ac63ad6b9fa4a5bc6eb90040d71df74eba132ada63340b1e450d90d961de1e02c6e1921d5395d2ff8771eb7a916 SHA512 59c925ed7e6bd7015bdef7febdc9682e424793df4e568f70b5fc641d2fc65f286deb9b5d421af9159496871a64507c97a896274ac03e430a97f95369ae771f07
+EBUILD bcpp-20221002.ebuild 1160 BLAKE2B f2a1011fd6e3602833bbad59cc2de8084a257ecde8391ac6465b33cb7f560d3af558f62a425fed8e4f329dc42213ca96dd7642c81a5ef8178db1d5eff84202c1 SHA512 1ae3b0e4c0d908cc4baf4b808c759fbd6f4cfe68deffcf2f78b2b22955070f1c8ee219ba94050989dfe717666a935184fcff6c1d00c0afe4f006104de4a03bcd
 MISC metadata.xml 327 BLAKE2B 98cfc008c1157e6c7bf26938ee9cb85afed7b4ca15f625a6bfb4f10a4a7ec9b7ad101c38c6b5bde51ac8ff8f6ebc15ca0cdd2903db65f1d691c13f534f5783e1 SHA512 ebaa5a7e3f02bc91337c50366007ffb65ef5a8a5604c43872d3a45f50a372adca5ac279b84309e3045fd34b81d0a9a138d2f73141955e15f0e827a42fab70673
diff --git a/dev-util/bcpp/bcpp-20221002.ebuild b/dev-util/bcpp/bcpp-20221002.ebuild
new file mode 100644
index 000000000000..08c0120f1997
--- /dev/null
+++ b/dev-util/bcpp/bcpp-20221002.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="Indents C/C++ source code"
+HOMEPAGE="https://invisible-island.net/bcpp/"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
+
+src_compile() {
+	emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"'
+}
+
+src_install() {
+	default
+	dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \
+		txtdocs/manual.txt
+
+	insinto /etc/bcpp
+	doins bcpp.cfg indent.cfg
+}
+
+pkg_postinst() {
+	elog "Check the documentation for more information on how to"
+	elog "Run bcpp.  Please note that in order to get help for"
+	elog "bcpp, please run bcpp -h and not the command by itself."
+	elog ""
+	elog "Configuration files are at ${EPREFIX}/etc/bcpp."
+	elog "To use them, use the -c option followed by the filename."
+}
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index f26d565906ce..aaeab823ce17 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,5 +1,7 @@
 DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
 DIST bear-3.0.19.tar.gz 125086 BLAKE2B 0c6a27359e8c88ab0dbaa3f5442a87efeaba4f6a9b8d0912ad026231421e2555a524b194a19972f549600951bc1f6620398c48338f7eac8850ba6c3969f2e6ac SHA512 688766a76cc3bee1dc82478d29d6e8754618f92633c842586fce95f2f1096764902ffd64a6f2f59101e58eba5472bf39ddb178c3dfcd48491fa4eb63d111585c
+DIST bear-3.0.20.tar.gz 125393 BLAKE2B 826a774beeb0596038f69b345a3659fe58f897bdb1a63f5faeac1d4242ae3cf4bf346ab82d2f87934d0786e5c0d4e835837b838a62f5a92c28ffe5e6a3d6a900 SHA512 4cf0e648b73fd4c0ac109c4a853e203efccb34ac7373d6c2f3ee3d5089853b791008990df768871dfd1268324bcce97c44657b4c3a2d1383134cba3eaec40bdd
 EBUILD bear-2.4.4-r1.ebuild 1829 BLAKE2B 0f87691b8ee68c1176236f4cf1608892941195893b4a1ebdf5872333b05196f81f1b98469bd90534f7de062bb613dbc649ccc2e99ccc739501d4d57b57d48a61 SHA512 be4c5dee00262ac6681cc2486965732ba5f196e70e7cbf21424e96d3154f3171d1db68b7493f802ba359699999664f92bc64488f3922cbf9ac34d785dc61dd8e
 EBUILD bear-3.0.19.ebuild 2151 BLAKE2B f71d8ca7f99cf5e07b27a1a390075dd8a13acd4d99b05b8d66743de94630f99eeec424e75836377b103945a4425ef6fd7a5acedfd47bc9f58d3142c5ce513637 SHA512 4702e73afe41c9756a1fba67f2680aeea1cf8ce920b4679288af9924c5dd7a7218cbd6ece08303f521d8156487624a1f157f66670602fe652415761ad4f1408c
+EBUILD bear-3.0.20.ebuild 2130 BLAKE2B 978885e8d079c5b1ba4445826316fb161dd8b14ccacb1e93a87e34f7c90d82514cfbef39e89a59bb27db72b613d15ffb3158c76bcd4d377cbb0c985d56cd84b5 SHA512 c22df13d713c0ddb8538bc3acaf82cc83e0a27c20f96eeae6f88b2e570b15e658f6300a462100ad5d83f3b2110f7d440a845bec2a49cd0b4efeb9b76d380b34e
 MISC metadata.xml 915 BLAKE2B 74d981eed24b95353d225061c11b11e3f7aedddd6fb3b79a96bc98f2d348d64ea4598337f5b946d94ac64278eaa9bce5a3ade0f9564d9e3f3b4031574569f20c SHA512 010b17d6da15e7b5a4079864c7c2f3f11c8531faddee1ab226c1d6c3f646079c52ef4495e4685bae6eeec8702801ddbd41c4bd2e1aaa82400c1265e2ecad1957
diff --git a/dev-util/bear/bear-3.0.20.ebuild b/dev-util/bear/bear-3.0.20.ebuild
new file mode 100644
index 000000000000..d4c5a6e6cc28
--- /dev/null
+++ b/dev-util/bear/bear-3.0.20.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Build EAR generates a compilation database for clang tooling"
+HOMEPAGE="https://github.com/rizsotto/Bear"
+SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-cpp/nlohmann_json-3.7.3:=
+	>=dev-db/sqlite-3.14:=
+	dev-libs/libfmt:=
+	dev-libs/protobuf:=
+	>=dev-libs/spdlog-1.5
+	>=net-libs/grpc-1.26:=
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-cpp/gtest-1.10
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		sys-devel/libtool
+		$(python_gen_any_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${P^}"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# Turn off testing before installation
+	sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_UNIT_TESTS="$(usex test)"
+		-DENABLE_FUNC_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if has sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=sandbox\' detected"
+		ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
+		ewarn "Skipping tests"
+	elif
+		has usersandbox ${FEATURES}; then
+		ewarn "\'FEATURES=usersandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has network-sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=network-sandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
+		ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
+		ewarn "and will fail without generic cc symlink"
+		ewarn "Skipping tests"
+	else
+		einfo "test may use optional tools if found: qmake gfortran valgrind"
+		# unit tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose
+		# functional tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose
+	fi
+}
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 8494abf07301..2293068b3151 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,4 +1,7 @@
 DIST byacc-20220128.tgz 896513 BLAKE2B a5dd491702274ed84fdddc8b2d2d240d8ddcc9350db82eee067978297ceda012ab99d7c8f53102f8190ce6e6bb3feb8d9beb62969ddf222b4ba967041b746c00 SHA512 e8ae4c56f5be4cc0ef1d281c43f02c6296fdc40f630269f2a61af511f270ae059ad185b9718190b8133018f7b74b7ca6f84ced5d63a359960b52ea2a3ef562ea
 DIST byacc-20220128.tgz.asc 729 BLAKE2B 7e43d182d06419fdfc925f078535163cf1bba49c7ec05788e2268adc34fbca8ce368516cbd46605bfe2c700950e3c9a202ed120f8a9ff507599a1a2acf6998dd SHA512 84140b9aa4aaada776c580be7adb265bf281decd1d24661b1368e0ffdaf52257751931e61ad0bcc59977e966c32125f751f889d5bfa806b7e0bdeaf96dd629e3
+DIST byacc-20221106.tgz 896951 BLAKE2B 36be6de11f06ed38068d35ac7ace6ca9585ac001d1ad2bc1aee3f9da47aa40a0a01820e3c0183dc9ce49d90d474608d19e45653b937d0dd960e9368b19813480 SHA512 866933b4eb2296565ce70b4ade565e4679f3b652715f0066072bbcc42b95389fa47a2f96cd03de577807dcc49bf453b1d4f7e22b96c80fef1aa66898d3de5d5c
+DIST byacc-20221106.tgz.asc 729 BLAKE2B 89142646f85d6ec86c2e227f773e1091771c8218ade06190f1218d5b2cf37a4699e90d8fba0e67f42e4c0ce299960ce3eb505f715a51264d321bf55467b47be4 SHA512 ffdf93c720dcc73356fd7035cdbca36081383b3f75b34286432cfcd292076386ba4ddbc8d7bd23ae10331f281553f7d8b0a5d19f1b03cc6178ee9d0715bf81a3
 EBUILD byacc-20220128-r1.ebuild 857 BLAKE2B 23568cb5640c370af78fa38d50661e7ca86f10e98271414f958aec50923a50d4b094e26c6d9417172d74923e86618f3d5d17ad2289b5851ca5d7b8b81f54631c SHA512 5cf4477919d18b5e1146ebe85f2b7333b4956cbc7dbd03a485e44be80734d868975633d11310d251f56cf0cd7ddc7513e397986616830d77944874e430e91fd0
+EBUILD byacc-20221106.ebuild 864 BLAKE2B 16e225c0c59b8a601cb7443c38ac59044b5f8efd40e012f7e3096c48fcde66d39da467d137eee9138dc5aaf5a2eb6df8b86d9fe1588cbe7335e38b80215414e1 SHA512 a381052ecf6b2468664dc41f4c02cc53985c5cc304bcaaf84031add0c6ec4246307232a9dbd2eb4a2944348d3d37a96882f44536221182324236fc2db1dd5f3c
 MISC metadata.xml 424 BLAKE2B f7c1172e12c784d254658b3743db6fec9d6ef008891fe84114c71c1d0edf24a37f00ad61a1705716bbaf6c912b763756995185f2cffd95c831b8ca57abec6d68 SHA512 8bbdcf35f0499db09f1d55d038d93f8c3aa516e0baa74ec078c7a3032d4885110530be47cdd309de1a44b8c92e6dca3f4353d3ff1d3da04b052d492c91549067
diff --git a/dev-util/byacc/byacc-20221106.ebuild b/dev-util/byacc/byacc-20221106.ebuild
new file mode 100644
index 000000000000..0f65a03aaf8a
--- /dev/null
+++ b/dev-util/byacc/byacc-20221106.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="The best variant of the Yacc parser generator"
+HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
+SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index 9d68a21f890d..33a7ede5eb94 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -1,4 +1,4 @@
 AUX 50coccinelle-gentoo.el 154 BLAKE2B debbfe7a00bf6195db370b33430d18fb7121123da26f97c01703704918f977f886090abfa0b6f226f8d713bca566ff6e39fabefb07e098a2bfd7cbd64eaebe6a SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d
 DIST coccinelle-1.1.1.tar.bz2 2118055 BLAKE2B 7efb0c86432c88daa1bce2710acdf2f62b6210c69245b4896ea8c5e39a0b28c538d94deae6ed1544e0ced66b2baa6edf8670f5e02dad40c2d1f5562326ce23e3 SHA512 fcb83203c91dae18122cf95f7db931d2e1576559b74a7a1c664c795437904acdffa005a8b9e732c1d99c8f0ab1c5f529d143eafe79c6397d28c4879848afca45
-EBUILD coccinelle-1.1.1-r2.ebuild 2882 BLAKE2B 40ab6babfa3fcbfd05c40bfc8f045ea8bef1a9844530e646a5244bdeb9d3a41e6451f59a6ecf9578d609f17e25ff9e96c2da9be4ac283d79b1af838a719bb6fd SHA512 23c8f07b66635aa98ab386f83b68758fa69ee265fda3252b7fe68cb353fe979e6786cf4c61bb498a0235eee309c03161ca13eda5b2679383f825705979a4832e
+EBUILD coccinelle-1.1.1-r3.ebuild 2902 BLAKE2B 303eaf9e70f5a19d1e92e3aa541811fc11257d9bfe00f66e98cbbfcc4902a2b658be547332d0d356f227286e7818915451a58b8e185d4a687a2a2dcd070e1d0e SHA512 e495955e8735ad2d9eddb85127d86542ed103980dd4ebea5a86fc91de33bb23c0ec58b4d4a9eb7eab91ad466b7fc536216ad02b1d0a12aafd4d609d69aa9b82b
 MISC metadata.xml 318 BLAKE2B 0d950c53a548409db938f27ae7e6941875f2d3260237c72fb3771659ed35e876e456e48823f2340122e68da18bf80bc4f16b58182937117977567579d49d48ad SHA512 c32dd8ca3473e147b69f305fe58412f10ba00dd939eba5fb871d366c6440cffbd623ce4922cd5879b2fefed19a3cf3ffb29bd588021e707623a32f85640905c4
diff --git a/dev-util/coccinelle/coccinelle-1.1.1-r2.ebuild b/dev-util/coccinelle/coccinelle-1.1.1-r3.ebuild
index da7c3d3ec5db..dcca7af3cc71 100644
--- a/dev-util/coccinelle/coccinelle-1.1.1-r2.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.1.1-r3.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-ml/camlp4:=[ocamlopt?]
 	dev-ml/parmap:=[ocamlopt?]
 	dev-ml/findlib:=[ocamlopt?]
+	dev-ml/stdcompat:=
 	emacs? ( >=app-editors/emacs-23.1:* )
 	pcre? (
 		dev-libs/libpcre
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index e7290f10b71a..7070955cd278 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,7 @@
 DIST diffoscope-223.tar.gz 3145330 BLAKE2B 47ebe733c6330c2c8a7a78dfaad4c364ac3570d5a691b889f3154dcc5f7bec7b97744f04433cf56544ca208233271bbbca8bb767ed43844786fca4e77505d95b SHA512 5f83177133fd4689a77fb08038222998f9597cd63b0f328d3ae55c2ef6f5136f55ab1f5841b70ce1f64a62d216e2332bb4cecb82a3edcc90a6a5841e95955d4c
 DIST diffoscope-224.tar.gz 3145263 BLAKE2B 918de272781a7829ad4a16f5db3f8d98e05fd1c7e342e18028bf448bf94ede09d5c475a3c1cadf255fa35f46bc8912374cb6cedf2cea878dcaf59380188b084f SHA512 2efbf2ea45e3a43a86eb6a3432852e0eb5a299d3745d8acb3f8857638cb4775d4322d844f2020ed718e4d28419c8a5ca8ab26f66b9bedeea15da57f33a008909
+DIST diffoscope-226.tar.gz 3164328 BLAKE2B 96fbafcd00c695fd3391122b8468abb0bb27936c45d97d01b2e0bb44bb1f18dc46b7ed2c7cf365993d6303c96a6cc8aeaa780808f23c6dfee5066e0cb377456b SHA512 59e8fd73fcf6e94a603c7e5fa8793f4746e770b0ff84d13379e155d3b4eb91defed79b688109785b62ae5cca1faf9b536454b3107ea93aa361eb511916601615
 EBUILD diffoscope-223.ebuild 3444 BLAKE2B ace11e44d106488caa6e2e2014236e1d5889667c48348ef29b6b34b719f5b95392cc0f2aaf73ecf0a01085263e4dea21c3ba4280802abca4fe95ac2c2c018c17 SHA512 e9cb6a0ec3fe55146081dd3336409c49112b55dda2e7edb97c9c0b6269ca29f9706dbf9b1cc5061d4d0869f980824ea8ebe447e191d015510af58a50014f659b
 EBUILD diffoscope-224.ebuild 3446 BLAKE2B 24aa2e6955914e21505310a6c935ad141627be46c1a22505fe371e4c3e6623866a6984090967eaddbab9905391b299ea2fe1cc7714b2b7d2a9d068e105a45275 SHA512 562d8964cd5d939e7280ef1d69d7b034b76cf27072391b262536fb3502c9d915562cee2464dda4c5a3e67b210aa3cc8897aaa0616e50b6a04b9c433c93718b32
+EBUILD diffoscope-226.ebuild 3546 BLAKE2B 18cd87610740fc78a59edb01e5fc3ba390ce3f73b6a023cdd3fe3f0b14a4e24f41122beee19a644cca308110e998b64a1a1688996392045879c7826209f12a7b SHA512 5b975cef495c7dcbcc5d5fd9cae76439c0dc6381df9f425c41d704140e61883736fcbb808aea09b8c9e325be9e89843fbe190d42cfa7f91551e213e61aa12489
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-226.ebuild b/dev-util/diffoscope/diffoscope-226.ebuild
new file mode 100644
index 000000000000..24af754a0edd
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-226.ebuild
@@ -0,0 +1,120 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/tlsh[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence of filemagic's magic.py breaks imports
+# of dev-python/python-magic: bug #716482
+RDEPEND+=" !dev-python/filemagic"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="
+	test? (
+		app-text/docx2txt
+		app-text/html2text
+		media-libs/libcaca
+		virtual/imagemagick-tools[jpeg]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Test seems to use different tarball
+	tests/test_presenters.py::test_text_proper_indentation
+
+	# Needs triage
+	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+	tests/comparators/test_gif.py::test_has_visuals
+
+	# img2txt based failures, bug #797688
+	tests/comparators/test_ico_image.py::test_diff
+	tests/comparators/test_ico_image.py::test_diff_meta
+	tests/comparators/test_ico_image.py::test_diff_meta2
+	tests/comparators/test_ico_image.py::test_has_visuals
+	tests/comparators/test_jpeg_image.py::test_diff
+	tests/comparators/test_jpeg_image.py::test_compare_non_existing
+	tests/comparators/test_jpeg_image.py::test_diff_meta
+	tests/comparators/test_jpeg_image.py::test_has_visuals
+
+	# docx2txt based falures, bug #797688
+	tests/comparators/test_docx.py::test_diff
+
+	# Formatting
+	tests/test_source.py::test_code_is_black_clean
+
+	# Fails on ZFS
+	tests/test_main.py::test_non_unicode_filename
+
+	# Fails on (unreleased) LLVM 16 with minor difference
+	tests/comparators/test_macho.py::test_llvm_diff
+)
+
+distutils_enable_tests pytest
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index e28932d98c18..ef331a15c0cd 100644
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,5 +1,6 @@
-DIST diffstat-1.63.tgz 270855 BLAKE2B 01a54c49200396a102c42d982e952d38d23c78452ae467e799d29ae1199aa179927ff719955d700081c4b4f4296c0b73229fa35823e3e18f80b2edc51e3316e2 SHA512 e1319f95088e615d442b0b02af922605d0c76e15ba2f0e8cf8c4db56949ac63f4a6e3e42099254480b9aab388cbd6550f515ed4d4995c6723d24f392d1872b16
 DIST diffstat-1.64.tgz 278873 BLAKE2B 41500977adacf492498a7ea38d5f5a7bb5a31d5e39a202c72ee344ad1996f36c493ff18af74cf4dda18d47617832351fd55e386f008493c39f4b64e6d3f01910 SHA512 d647477beb49b0999c5de41d084da827528571c4848f40c69c2d64d060fc89848d15d03d59b1a31d79f02180f81d92cdf6e19d0172482bc569cf2a87476f12cf
-EBUILD diffstat-1.63.ebuild 450 BLAKE2B a6ec1ed16911eca0a032c80a7125f390dc60cedec668a02c521bbc0d7f67e88cd2529c741492b4479f6106d6023f6be8f3ca45cf74fc5eaf7a4ecb2a3b9d77ae SHA512 6f04a0d1760b91762740d3f03b0901e445a9c427ead2d6ed2a78be326c82c958f1e1beb1cc3e29242c9e927c69edf4bf45f29c8d48a9e4dc851468933c7f4426
+DIST diffstat-1.65.tgz 295596 BLAKE2B 85a0967854473d7893fac7e49c7e22d9039bd46a45cd00cfbf85c0d20d48bb05876d3e68d97ca6ae785d0cf9cf90540dbd248d39503ebccb195cb9b69dbe4111 SHA512 8b516201d3070ccc37522f3e57aa8b1abf4ddb52956e5a7c7a7027ac0ada1630bb54c95c57e6acdbe6e110867073d1cec2b1726edb2d60d326caded1501b1e89
+DIST diffstat-1.65.tgz.asc 729 BLAKE2B 31dc2cf15df97d83dbc466f30c7eebf451450395fba76d9561dcee5a7dbb7f3972928c60634fdd78b947f7d3cff6dc1eb3d3ae77270e960fc8ce5ee1a60d8b3c SHA512 f25b88b5f70e30ada85650a081fa3f67409d06d2a0ead446c038d08dcd9ccb7c0ee711d12ebc202669456bbeb9807cfc891018048f5a08c20b46d56433fac6ec
 EBUILD diffstat-1.64.ebuild 449 BLAKE2B 14fcfaa6a09b61516c0dbfc215595b13885a5072fa8423548f507bea573ef1d2c675485780c586a0cb1560fdd4ea431f1a06457fd9b19cf19728dad8a3fff672 SHA512 1ff0e572792bcacfb2a02f538d8e8e6a978fd7347a9763092bb526ca80106876fda488461ff8fb6b0cb7dc4963e341727df5e733decd2454c9c6451958642cda
-MISC metadata.xml 372 BLAKE2B 9899694280a5260ab30206373057dd7821e5745a7bad366c388b03da0d77884e1e21b3be7f7abd8bd68a4880fd79f57d2cb206e579ac0e75f84b5fe82ea5478a SHA512 260d0e4229e8c1bc3465a85a1fccea6fc1bdbc1231c2a1cc89ea23d266fcaea2895503313d3c1501e82586d54e381bed2ede7af0121b0d581f05e9a29ab9510f
+EBUILD diffstat-1.65.ebuild 702 BLAKE2B c40076a96294ab5ccfe2d5e0cdccfc8239ba66ebd05dd53e0604449a093017f9edd752bf725e105068327d5c54394f41b60d764b25c040a58b73a20a9d641b4c SHA512 3d3ebea0887341a29ff99fc233dd7175d8e9fd8f70872da1b0c18343f561beb652ae9cf3ff4f7a7129e4c2d2e6f37f8aa7748d67b25d029689025e86c554e699
+MISC metadata.xml 445 BLAKE2B a07a359b64943c219636468163918f32cfe9a053879f32b4275ab2659788e3c59251b2d1c478c234fa807924947fbdd24db7c693fb2803d9f8335eb5ec9c1ccd SHA512 b8a077397848122d36f000d993280f1f2f8b0783021d1423f5b8dee1a43c159fb790819b0a475ae9b148ae25108292e11a396af3cef086679fb2eaeec5a587af
diff --git a/dev-util/diffstat/diffstat-1.63.ebuild b/dev-util/diffstat/diffstat-1.63.ebuild
deleted file mode 100644
index dbb0ae8eb11f..000000000000
--- a/dev-util/diffstat/diffstat-1.63.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Display a histogram of diff changes"
-HOMEPAGE="https://invisible-island.net/diffstat/"
-SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-util/diffstat/diffstat-1.65.ebuild b/dev-util/diffstat/diffstat-1.65.ebuild
new file mode 100644
index 000000000000..06e5391b4e8d
--- /dev/null
+++ b/dev-util/diffstat/diffstat-1.65.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="Display a histogram of diff changes"
+HOMEPAGE="https://invisible-island.net/diffstat/"
+SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
diff --git a/dev-util/diffstat/metadata.xml b/dev-util/diffstat/metadata.xml
index 1050bc28611f..8a804831c723 100644
--- a/dev-util/diffstat/metadata.xml
+++ b/dev-util/diffstat/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <changelog>https://invisible-island.net/diffstat/CHANGES</changelog>
+    <remote-id type="github">ThomasDickey/diffstat-snapshots</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index e5e51176fe98..ad2de33bdc14 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -9,6 +9,6 @@ EBUILD nvidia-cuda-toolkit-11.5.1-r1.ebuild 7595 BLAKE2B efbc0f8747cfb8468203114
 EBUILD nvidia-cuda-toolkit-11.6.0.ebuild 7885 BLAKE2B 738dddb098d327bc4bcfdb464ef6599f5dd499f9afebe9540137f07ed19f445214039d7a7a584914644db56d1adc3e2d0da1358b344f462e266db10b87fbf3b0 SHA512 be71bac77074319782dff9f9a52ec093228f3079950c7aca3c05dc33e32ca3dfce4fb45a6bfdfb025f62ebf6ed872af95fa7a8b4d11c42726682e09f8d013f5e
 EBUILD nvidia-cuda-toolkit-11.6.1.ebuild 7885 BLAKE2B cde8e87114871685e4891be06633065dc181c1ede3c7690a6d8cfe5537f518147862b426d01187c9265c452628b3db340aa1d7bcc3a63507c3d576aa79005ea7 SHA512 aff120e1c3140cb353aa37366d58c9a08185ab4ca603f4161ff33253d1e5fd065ec1a8e9d73490ca8fa2eff87464c1a15a35944b012c93c5d8560f46de1d1b57
 EBUILD nvidia-cuda-toolkit-11.6.2.ebuild 7885 BLAKE2B cde8e87114871685e4891be06633065dc181c1ede3c7690a6d8cfe5537f518147862b426d01187c9265c452628b3db340aa1d7bcc3a63507c3d576aa79005ea7 SHA512 aff120e1c3140cb353aa37366d58c9a08185ab4ca603f4161ff33253d1e5fd065ec1a8e9d73490ca8fa2eff87464c1a15a35944b012c93c5d8560f46de1d1b57
-EBUILD nvidia-cuda-toolkit-11.7.0-r2.ebuild 7901 BLAKE2B e17c9639dde2e4f3d237a993589a35b2b73ccb881c67a494552dcafc8531286b2f18c6c191453779cd79b2a9c9a93eff611dc359d70156cc9fd32d8f8b21c97c SHA512 146327a76cb8d01808f4537db3bc77ec24cfb5b91c442e33451c7b8fdaad9939a5a2023b30a52eee9052bcc0750dffde1e30b200b2cd66712c403c4e0c58c519
-EBUILD nvidia-cuda-toolkit-11.8.0-r1.ebuild 7926 BLAKE2B d42c1047d0b8d32ad6423f44f541a34e9dc9e6b9e5219b278aa3185908244d38d0b393c16b92b287f79383c21d55e4d0974aca302f2da7b8ca7dbb4bd0c9b247 SHA512 27cfdc191f459320547f4cd42185b17870539a8afb35d26acc38d9981fcd96862d5183e6e65f2f5b1e77f891031583ad995e5c8a27ad1cc6393a1ef1de545aff
+EBUILD nvidia-cuda-toolkit-11.7.0-r2.ebuild 7903 BLAKE2B 2ee716a575c9b702686e139b32f0b95bc423826751138cd6f6d623d40e022a16aaa4a942e6c5fbc5ade38f9146a6abd1d8ae15cdc8da17e48522292c75c30cd4 SHA512 3d13107d58d80ce59ef48b904f6a8d9b10751a38d06764444e57b32979795978e6c80ebec48422948cd66aea5fe187f1f51404d53ca7e714ed0b0b88f1dd5c72
+EBUILD nvidia-cuda-toolkit-11.8.0-r1.ebuild 7928 BLAKE2B 5773d7cd97251f3e5cca49a8424475a8dfcf084b615d16ca3ae27c7f8a0cf5acde456cc93bb25751b4be767a229f39922c8f644f078ea5de57ba0f3105487a48 SHA512 7ec3eb88afd2cb179edf0c08166cde6462c894a4d0bfbe5b197033440bcf033bb92dd661e6ba819777cfa8222600ca29bc46c12e7b65b6f78794ee8af280ea3a
 MISC metadata.xml 671 BLAKE2B 20d0b15061270bdb0604e9e76e8913c9d304c51a05102f92b2ef64cddb1b369705a742aefca28f4d36976bb633d0a2cf090bf3d307ea579121578d29c41264e1 SHA512 09fe8a1c60ca7924e433c5aca460d6a757c9962371b3f2a3c42c2ff1b0dd819f1704dd5943bd31a3e74337ad0f14aa4d7836912a435396c15e4f0daaed33800e
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r2.ebuild
index ddd576b50961..b4b3850015f4 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r2.ebuild
@@ -232,7 +232,7 @@ src_install() {
 }
 
 pkg_postinst_check() {
-	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
 	local b="0.0"
 	local v
 	for v in ${a}; do
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r1.ebuild
index 6892b8af6f78..14112f7a0201 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r1.ebuild
@@ -232,7 +232,7 @@ src_install() {
 }
 
 pkg_postinst_check() {
-	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local a="$("${EROOT}"/opt/cuda/bin/cuda-config -s)"
 	local b="0.0"
 	local v
 	for v in ${a}; do
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 4112dbdcaa63..a2c2b6cfd191 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/exult/Manifest b/games-engines/exult/Manifest
index b8d672d79ebc..4397d8348946 100644
--- a/games-engines/exult/Manifest
+++ b/games-engines/exult/Manifest
@@ -1,3 +1,5 @@
 DIST exult-1.6.tar.gz 7906968 BLAKE2B f58b009bf82c5120a7ce588cbc5d2b282b92d7e8d08fb3e6119436de178ebd8af1d9a10e4ba660038aac9b87f0ced3fbbdbc5f39a3b3e17fee36b295d7df2603 SHA512 e786ccc11d3fc1b0747c0c620b51152d09f5157ca1e458a5aecc5e66c91e3222b6ba61311149bd6be83e20d339ea1d6d47640f89cc1750a9720549278a33e1b2
-EBUILD exult-1.6.ebuild 1359 BLAKE2B a21c17bc3a4a107ae767ad54d1f71606534b7b5fb6515a11d1c41d6bb97a5309993c5d4c859d5eb06bf9506cc67eb9ba90bc36a9364689e5fa7aa6646851e333 SHA512 79ebd1725c4d2ace4a4fc72ce8faf126807596532b067822d8dbe582945151e9187950987f49d1812341af5d8e6673df0bacb1a41bb256b7ab4504351971f649
-MISC metadata.xml 562 BLAKE2B 16f13adb61d22189cc7b2779e9491aa6f55ac2716cf7606be69f4106b204e5ddefccae08128ea41b3cc1d039184abf7188f72ca0d36b032bbd37c79ff62ba251 SHA512 86a556391b3ec336c8ac6090e29598d48f65dc33ece7d410738f5839d834db7b44be79779afdbb0af5b29b3d35a01fc32cafd25fea61d6759cd26fb13c9cce9c
+DIST exult-1.8.tar.gz 19104130 BLAKE2B 56e127d95d3a948b7c52ca3439f8a84691728817c855b46580a8baf21ad0b8f663d5f9fb2fb855d73baa1d3cc29181d001adae1a978c75a7dfa598879b559ab4 SHA512 5422f70c00a1d5ff0606cb7613b891abda430872c50b1058999085c7df08360fd55d5bdf95cbff09616cf3b11e51dce4b11c7322c3db9a8756946e5854ef0fde
+EBUILD exult-1.6.ebuild 1366 BLAKE2B 47055bfa466a79f4fb71615686f72fa07e16cd12c3015b23da4412bf4e4a0267eb88a2063175889d7caa97fd9e681b71374e5e146c6ef587e8423417472359d7 SHA512 5fcc9b7c16e88f73028ec9c42c84b69dc7194dac8eaa251df10ca355dc27b4d6eee0d4205e92034720005afecb27e5f9732ff2137080bed781f701861db849e4
+EBUILD exult-1.8.ebuild 1365 BLAKE2B 578bc348a5e047e3c158e37c654cfa2593129086a2cba5a97dbb48ec342e0b80aee6d25732a4f36acf1e66b8a74b303ae97f09a8e8fc56fe432ebd1cf4aac4a9 SHA512 740c87e7e4d80874878b8383019574b618f6d2759495466491487e00ab412d27a8d3585146bd52e2542e04c0f55c9c4fee74ffa91fbbad4f9c528424b056beac
+MISC metadata.xml 598 BLAKE2B c04bad50b2844fff071f5bf7fe1d7238491418b07423e8104c75fb1e66430f03b9e0b93b0c2f70522996e8829a60d592ad05103294299d2ca136acc2213918f2 SHA512 376e956b57c8a6407e372b84a2bfe74502fa4fd2b28f2e611c257122a739e80b03d72a9e50f4147b1fdbae52d82a8062780747f05297e9867d2789508d8e1324
diff --git a/games-engines/exult/exult-1.6.ebuild b/games-engines/exult/exult-1.6.ebuild
index 890ac649e4c7..bb5e1c9d1715 100644
--- a/games-engines/exult/exult-1.6.ebuild
+++ b/games-engines/exult/exult-1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/exult-all-versions/${PV}/${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="alsa fluidsynth opengl +sdl2 timidity tools"
 
 DEPEND="
diff --git a/games-engines/exult/exult-1.8.ebuild b/games-engines/exult/exult-1.8.ebuild
new file mode 100644
index 000000000000..bf03c5b70837
--- /dev/null
+++ b/games-engines/exult/exult-1.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Ultima 7 game engine that runs on modern operating systems"
+HOMEPAGE="https://exult.sourceforge.net/"
+SRC_URI="mirror://sourceforge/exult/exult-all-versions/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="alsa fluidsynth timidity tools"
+
+RDEPEND="
+	games-misc/exult-sound
+	media-libs/libpng:=
+	media-libs/libsdl2[X,joystick,sound,video]
+	media-libs/libvorbis
+	sys-libs/zlib:=
+	alsa? ( media-libs/alsa-lib )
+	fluidsynth? ( media-sound/fluidsynth:= )
+	timidity? ( media-sound/timidity++ )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--docdir="${EPREFIX}"/usr/share/${PF}/html
+		--with-desktopdir="${EPREFIX}"/usr/share/applications
+		--with-icondir="${EPREFIX}"/usr/share/pixmaps
+		$(use_enable alsa)
+		$(use_enable fluidsynth)
+		$(use_enable timidity timidity-midi)
+		$(use_enable tools)
+		$(use_enable tools compiler)
+		$(use_enable tools mods)
+		--enable-zip-support
+	)
+
+	econf "${econfargs[@]}"
+}
+
+pkg_postinst() {
+	elog "You *must* have the original Ultima7 The Black Gate and/or"
+	elog "The Serpent Isle installed."
+	elog "See documentation in ${EROOT}/usr/share/doc/${PF} for information."
+}
diff --git a/games-engines/exult/metadata.xml b/games-engines/exult/metadata.xml
index dfaf409414b7..6351a584ce67 100644
--- a/games-engines/exult/metadata.xml
+++ b/games-engines/exult/metadata.xml
@@ -12,6 +12,6 @@
 	<use>
 		<flag name="fluidsynth">Compile with support for FluidSynth</flag>
 		<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
-		<flag name="tools">Enable tools</flag>
+		<flag name="tools">Enable tools, usercode compiler and mods support</flag>
 	</use>
 </pkgmetadata>
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 241a70bdf2ce..f8f7aa7fd9da 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/exult-sound/Manifest b/games-misc/exult-sound/Manifest
index 956b0fd80e98..71906fe4c9b2 100644
--- a/games-misc/exult-sound/Manifest
+++ b/games-misc/exult-sound/Manifest
@@ -1,3 +1,3 @@
 DIST exult_audio.zip 48439905 BLAKE2B ad8a230d9ba92cef94b22b669644a10ae6fcfe92c4dbfc5c3f89535534b4bddfe7d9b69dbf05220033df92b6d172e83340e6571920f42b5e63e66a5417ffa8f4 SHA512 70374a079935b063f41a37aeb90315d55abb584e5542f7fa12c707318db6365e989a5848bba9045a2c2cca1ccd902cc1d31fec8c95511a986de7a75d322d0919
-EBUILD exult-sound-0-r2.ebuild 601 BLAKE2B 6706a506afef2008234f200628af4dc4359b8625f99ab4795f888d36bf19204d462cd180f1178269d7416a01c47420461e52e37ccc36e17dd27cd2d5b24e86e0 SHA512 d2a0a0985a86863dcafc321ab4ba1ef63e336a31691b33251308ed324d7ef56b5e7d10c7b24bd8071a624242ce441927f0817f42626cb9752abc3ed05425481b
+EBUILD exult-sound-0-r2.ebuild 608 BLAKE2B 82c3b10701f923f6328214900625f0ac7a68a6adac272d5a2b964c516efc5f4e561a51676a8f27722dddb4346ca47961a1b77a3b1b048c395a1b8c9107609bb0 SHA512 387cadee7ead72743cdb1cd6d7ae6fe4e50011582b9162133bcf926d6ad493d978aa92697dc857328eb47b9b21eb0a1e2a60fb5117e8ca64fa340a595e5efcba
 MISC metadata.xml 329 BLAKE2B f879cd6ee783aedd84f5f16852fd4f2ba368eaa26c64e7893a476f2067fe28d8c7281ae1da3c5a81b01b9f23fa49412b857f59fc6dee4c72ccda3a8fd8656b46 SHA512 84ef445bd11dbf3fda1b1c23195b14d0afca4205439a9481ee762adf56a7d7ac8d125c6bac2c3e6b2b1418a1b1709ce741773592482c15b13cde059315f0d2c7
diff --git a/games-misc/exult-sound/exult-sound-0-r2.ebuild b/games-misc/exult-sound/exult-sound-0-r2.ebuild
index 6583d1301935..21a835bed962 100644
--- a/games-misc/exult-sound/exult-sound-0-r2.ebuild
+++ b/games-misc/exult-sound/exult-sound-0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.sourceforge.net/exult/exult-data/exult_audio.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 996df42834f8..64e5a359a289 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 9f481ecfa17c..5fe30dc78671 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -136,6 +136,6 @@ DIST thunderbird-102.4.2-vi.xpi 724848 BLAKE2B d63dda61aece0d1e229ee0bca54f4cc7c
 DIST thunderbird-102.4.2-zh-CN.xpi 722698 BLAKE2B d8a466c7c3cfa4d7a710be4429a5b1d9342b298fcd4848baf6601df1f122085c0ed6c921bd25c352cbd0441e07e8b2bf2a220cc73a0e3cae3b7760ddd65150e7 SHA512 a5ae3a7aa426bfaf44d13230f14589f56d92bc0b75b4fd24b8c746e7f758492ff21f2bdfd426a578434c35dbc7367bd5eada1961a809a3b303453dd99796777b
 DIST thunderbird-102.4.2-zh-TW.xpi 725969 BLAKE2B 15b0798c234180778c17cb1363218d5d190f7c63b7d3ddc06a13f77d9fd40a1ce664a17890c849bae502ddd0cf82f7eaaea8f003042310de80f2fadff1617d49 SHA512 6ddc7bd5aa084658253d228388af2cab035d611131ea2e4e84a6fea5f48c5402e463851d15faa979da1fc7b96535a1ee0aff6de4ebfa91f0f6dc4915da695adf
 DIST thunderbird-102.4.2.source.tar.xz 500913544 BLAKE2B d20177ac0191ee85d972fd11705a5a1a86fcd8265e3bb9c24c1413a0175a76094d9b775ea97217e2b5f7413ab3e3766ac5d167c8ed2622c786a0d5aa1d13211f SHA512 d74045e3ded718b9dffbf9f076f61f05be63d1914cca672c5145f86e94677df35c0c86958e31aee4f6388052c766b9588b942ab8578bc214addd49edfaa04a4f
-EBUILD thunderbird-102.4.0.ebuild 33390 BLAKE2B 5b3be8a5fd0ac9305e8d5c17f2cfbf3a2fe5eab6cb129a923060b980bc5a94bbd7cd4154cf85cb0443910d7487adc06768c2f86e4307ea5ababd8212bb9998bd SHA512 529b6e7b8d9b342d2f505e5ddf8effa3e970cff884f08820c915be330efec5312d30292500689877195b822ac1a9b4780b43a7d72fe484d3dfdaad97b0699c21
-EBUILD thunderbird-102.4.2.ebuild 33392 BLAKE2B b33709fdd6c42ba14d96d28c227020255755ad2954da78e3cd29444f3867f74fa8b7147eb420733264dab96d7348131bd52cb342b4058d5b6477985a04231f55 SHA512 28c8e11dc2a16887cb609a5c01aa795dc469780f460f0cb8e38114e27429cbd00d76352417306c906a3a6e9abec8d94d52bc5fa6d4e0417c2fbbc814ffa1b8e8
+EBUILD thunderbird-102.4.0.ebuild 33402 BLAKE2B 8ebbb46776ba1e5e65654775a798b20f3a164987a4359c48f26277e01c8f4be4457d802bd6b28c4f0119f91c7785ca15f05cda604a4dac0fc2874f2d0dc46daf SHA512 9c7a7bad143f6b5f893a10fd3ad08b87dc8fe185b819a417fcce29b9f35e068f747bb629cd8f695c6bbe5b6104f37901afdc58edf5bd3cf7c1aac0d89b5125b0
+EBUILD thunderbird-102.4.2.ebuild 33404 BLAKE2B 298b3ed02874ff34fce7398217620da9caf71938333829c33c28586209cad21ffb87f9d7cd5548c1d3541e811d5de3018a3acd18be3897f7f930ff3785097bca SHA512 f5ff830bad5ca7dee95de145af883053582b955940c80d25c4382e44bf1747fd76bcb08e3d4c4ae5be8a517c95bf7fa66bb5a0225b16070d67b1b8bb681b9e67
 MISC metadata.xml 2139 BLAKE2B c348f9dc2bf813c386bc2e62782bf762ef4fdaf3f913cec41bbd115a7bac54b01852dec04e6f7574b24ea5cd6d9500f289109127cdac5887128b07116d6a6cf8 SHA512 09b0670e852cc954b5df5e846935d274ae180e4627d112104d5fedf2a777fda7d52d73cdfde9e50475d9a560ed44946d4c0682d52d793bbfb5f2e1b1e0aac608
diff --git a/mail-client/thunderbird/thunderbird-102.4.0.ebuild b/mail-client/thunderbird/thunderbird-102.4.0.ebuild
index eb9b1b7dc0fe..67f10b0179dc 100644
--- a/mail-client/thunderbird/thunderbird-102.4.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-102.4.0.ebuild
@@ -574,7 +574,6 @@ src_configure() {
 			have_switched_compiler=yes
 		fi
 		AR=llvm-ar
-		AS="clang -c"
 		CC=${CHOST}-clang
 		CXX=${CHOST}-clang++
 		NM=llvm-nm
@@ -599,6 +598,7 @@ src_configure() {
 	# Ensure we use correct toolchain
 	export HOST_CC="$(tc-getBUILD_CC)"
 	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
 	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
 
 	# Pass the correct toolchain paths through cbindgen
diff --git a/mail-client/thunderbird/thunderbird-102.4.2.ebuild b/mail-client/thunderbird/thunderbird-102.4.2.ebuild
index 831f69b6d8f2..1dfca9adeb82 100644
--- a/mail-client/thunderbird/thunderbird-102.4.2.ebuild
+++ b/mail-client/thunderbird/thunderbird-102.4.2.ebuild
@@ -574,7 +574,6 @@ src_configure() {
 			have_switched_compiler=yes
 		fi
 		AR=llvm-ar
-		AS="clang -c"
 		CC=${CHOST}-clang
 		CXX=${CHOST}-clang++
 		NM=llvm-nm
@@ -599,6 +598,7 @@ src_configure() {
 	# Ensure we use correct toolchain
 	export HOST_CC="$(tc-getBUILD_CC)"
 	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
 	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
 
 	# Pass the correct toolchain paths through cbindgen
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1cc229110785..5c7c0c8b1630 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 8ffc48dd4efd..5cac759e79f3 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,6 +1,8 @@
+AUX freetype-2.12.1-strict-prototypes-clang16.patch 1151 BLAKE2B 93a06eef003acdf4ca164b849dec970a3a3d1fad01d250edf4f2b3162ac4e5a3aea6aee558fdbf48ffcde5fb68d2423894f1b41645e2fb9ec505d8ffc6486a9c SHA512 0b300ea2f60536bb66b4c742f9f0bc4a46cdb79a5a71040d77f66a8dad3d897b0fda80fb43ded60b71bacf6d603852b983cf001bb7b61a8f2c70df34be79bd21
 DIST freetype-2.12.1.tar.xz 2471916 BLAKE2B c4737dc0c6e44e0a911545d604fdb2e8e8b3f5185d3f5dfe4e4561ee2d75b3e5a31afcbb2089306fec4b31ba10324a6ec6499c3735b2b7591c71e96fee4ed278 SHA512 6482de1748dc2cc01e033d21a3b492dadb1f039d13d9179685fdcf985e24d7f587cbca4c27ed8a7fdb7d9ad59612642ac5f4db062443154753295363f45c052f
 DIST freetype-doc-2.12.1.tar.xz 2038632 BLAKE2B 81225caf1a2c586a8a282a22eaaf23412270d19002bc5b07e94d946d41d089f798724982e354d1701488de37c35bf68f36de88796565f0ebaa3f9fb35c51f532 SHA512 276b91b93e375096bc0f9fa76408a6ea9fa89d4d06e9c9179f88d27d41df3f3bc0ce6939ea7a3fd7c93cb694e78fd6bfb154e969188279e2bca82dcc3afd108d
 DIST ft2demos-2.12.1.tar.xz 263656 BLAKE2B fd48dc68bd832e7532e9fae869a19699ab3337e599118bb9f1b76c3bcdcecec3cd3f55f7387508d29baf85b8de4a549aaa0e8af34d988743b1737458e255bdcf SHA512 cd9356152a64d807c75b797d005ca1dd0bde69cc2fadedec101d125cb54b2aaff1f7afa2f20839caba7db66325df7c11ed4883b7e906110356b28d9900caaae7
 EBUILD freetype-2.12.1-r1.ebuild 7496 BLAKE2B fcc0d3e6f1653833dd198ef64b8963209bc3bd4d1f797a55279b4e767fb38b029b159a4ce6074d783ce508e9d5a1697c9c2bf73390fdadba7bea5473884c0592 SHA512 c24692f86ca40baeba2b8edaff0a606ccbe1c9e28fb6d3e24b171a79c090da5bd7811594d1b6420769ec059307e721335d090752588413b7958ba6cc83cdc2f1
-EBUILD freetype-9999.ebuild 7164 BLAKE2B 89a5d64416841616e8b5508580bab7ad8d8903183abd8438daa55dadb536ffd3a82b460d5179de2d16adefade8a31a9f4e5a4ec7547e783a0df8c8b57fb7e43e SHA512 17dd4ff427348b166932e1b7614591eb382f50befdcc8c967f621db08005631356176198df7dde3a63e035dbb67023a7d40f38f849cb5a13ba70002251971b07
+EBUILD freetype-2.12.1-r2.ebuild 7556 BLAKE2B 0b0a9714c5d78f95856d6eceec212f441e30936f8d2e1155e61428cecd404455dd8457e30ec1a4b6436dfd7154d220e2273391b57c4ae46fe4aed1e62221e943 SHA512 2331e55ac709f698e417743c5fdc7019cc5562e02d0f66f64baadd3b3380345f978417ef095bfedacd67373fdee67d5a2b37bb08fff9a8176929af1a95da933c
+EBUILD freetype-9999.ebuild 7504 BLAKE2B 19574db1f788fd487789fde4f15d6fdc43d71e02aaf83bd9b174a2112bed101b6374073b3267ae8dee732428fb733755fa8417c846b2f7ec5e2f5d51e788bbe3 SHA512 8a96642149771c2fd4b0e6fb0e1d0d9e3205a889e93aa1b072e1c19142f671c91a59a9c2485fb808d8c669c3dad7420140cbe2412303554f12f0c8e1182c9f94
 MISC metadata.xml 1306 BLAKE2B db0f9487a62f002883a1850bbf90f5df4007215ce432440023a9c637ec79333576db4ebe4d3275f088a9225848eb508ef1b409c4c67ade051663d822ad5cb9ec SHA512 464c6f6810572f9f9194adba7b85ed8dfbe1c1b3dccafd5370fb555547b7a708768e2f302baa437cd5ab06a9da34a00d5aec7a48bc2903b24b8dab9f42aaa493
diff --git a/media-libs/freetype/files/freetype-2.12.1-strict-prototypes-clang16.patch b/media-libs/freetype/files/freetype-2.12.1-strict-prototypes-clang16.patch
new file mode 100644
index 000000000000..0526c27df405
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.12.1-strict-prototypes-clang16.patch
@@ -0,0 +1,36 @@
+https://gitlab.freedesktop.org/freetype/freetype/-/commit/e82371bf6ec2efdf79f9ed2d00e633ba0bbf7830
+
+From e82371bf6ec2efdf79f9ed2d00e633ba0bbf7830 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 6 Nov 2022 05:18:59 +0000
+Subject: [PATCH] Fix `-Wstrict-prototypes`.
+
+* builds/unix/configure.raw: Fix `-Wstrict-prototypes`.
+Clang 16 warns on these and they will be dropped in C23.
+
+* builds/unix/freetype2.m4: Ditto.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/builds/unix/configure.raw
++++ b/builds/unix/configure.raw
+@@ -50,7 +50,7 @@ if test ${cross_compiling} = yes; then
+ 
+   AC_MSG_CHECKING([for suffix of native executables])
+   rm -f a.* b.* a_out.exe conftest.*
+-  echo > conftest.c "int main() { return 0;}"
++  echo > conftest.c "int main(void) { return 0;}"
+   ${CC_BUILD} conftest.c || AC_MSG_ERROR([native C compiler is not working])
+   rm -f conftest.c
+   if test -x a.out -o -x b.out -o -x conftest; then
+--- a/builds/unix/freetype2.m4
++++ b/builds/unix/freetype2.m4
+@@ -121,7 +121,7 @@ AC_DEFUN([AC_CHECK_FT2],
+ #include <stdlib.h>
+ 
+ int
+-main()
++main(void)
+ {
+   FT_Library library;
+   FT_Error  error;
+GitLab
diff --git a/media-libs/freetype/freetype-2.12.1-r2.ebuild b/media-libs/freetype/freetype-2.12.1-r2.ebuild
new file mode 100644
index 000000000000..a42c32a28638
--- /dev/null
+++ b/media-libs/freetype/freetype-2.12.1-r2.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+
+DESCRIPTION="High-quality and portable font engine"
+HOMEPAGE="https://www.freetype.org/"
+IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
+		mirror://nongnu/freetype/${P/_/}.tar.xz
+		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
+			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
+		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
+			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
+	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+=" doc"
+else
+	inherit git-r3
+fi
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
+	utils? (
+		svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] )
+		X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-strict-prototypes-clang16.patch
+)
+
+_egit_repo_handler() {
+	if [[ "${PV}" == 9999 ]] ; then
+		local phase="${1}"
+		case ${phase} in
+			fetch|unpack)
+				:;
+			;;
+			*)
+				die "Please use this function with either \"fetch\" or \"unpack\""
+			;;
+		esac
+
+		local EGIT_REPO_URI
+		EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"
+		git-r3_src_${phase}
+		if use utils ; then
+			EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"
+			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
+			git-r3_src_${phase}
+		fi
+	else
+		default
+	fi
+}
+
+pkg_pretend() {
+	if use svg && ! use utils ; then
+		einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled."
+	fi
+}
+
+src_fetch() {
+	_egit_repo_handler ${EBUILD_PHASE}
+}
+
+src_unpack() {
+	_egit_repo_handler ${EBUILD_PHASE}
+
+	if [[ "${PV}" == 9999 ]] ; then
+		# Need to copy stuff from dlg subproject (#758902)
+		local dlg_inc_dir="${S}/subprojects/dlg/include/dlg"
+		local dlg_src_dir="${S}/subprojects/dlg/src/dlg"
+		local dlg_dest_dir="${S}/include"
+		mkdir -p "${dlg_dest_dir}/dlg" || die
+		cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
+		cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die
+	fi
+}
+
+src_prepare() {
+	if [[ "${PV}" == 9999 ]] ; then
+		# Do NOT automagically mess with submodules!!!
+		sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die
+		# inspired by shipped autogen.sh script
+		eval $(sed -n \
+			-e 's/^#define  *\(FREETYPE_MAJOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			-e 's/^#define  *\(FREETYPE_MINOR\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			-e 's/^#define  *\(FREETYPE_PATCH\)  *\([0-9][0-9]*\).*/\1=\2/p' \
+			include/freetype/freetype.h || die)
+		FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}"
+		[[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}"
+		pushd builds/unix &>/dev/null || die
+		sed -e "s;@VERSION@;${FREETYPE};" \
+			< configure.raw > configure.ac || die
+		# eautoheader produces broken ftconfig.in
+		AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
+		unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	pushd builds/unix &>/dev/null || die
+	# eautoheader produces broken ftconfig.in
+	AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
+	popd &>/dev/null || die
+
+	# This is the same as the 01 patch from infinality
+	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
+
+	enable_option() {
+		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	# Will be the new default for >=freetype-2.7.0
+	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+
+	if use infinality && use cleartype-hinting ; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
+	elif use infinality ; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+	elif use cleartype-hinting ; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	fi
+
+	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
+	# via environment (new since v2.8)
+	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+	# See https://freetype.org/patents.html (expired!)
+	enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+	if ! use adobe-cff ; then
+		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+	fi
+
+	if use debug ; then
+		enable_option FT_DEBUG_LEVEL_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	if use utils ; then
+		cd "${WORKDIR}/ft2demos-${PV}" || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X ; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+		cd "${S}" || die
+	fi
+
+	# bug #869803
+	rm docs/reference/sitemap.xml.gz || die
+
+	# we need non-/bin/sh to run configure
+	if [[ -n ${CONFIG_SHELL} ]] ; then
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
+			"${S}"/builds/unix/configure || die
+	fi
+
+	elibtoolize --patch-only
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	local myeconfargs=(
+		--disable-freetype-config
+		--enable-shared
+		--with-zlib
+		$(use_with brotli)
+		$(use_with bzip2)
+		$(use_with harfbuzz)
+		$(use_with png)
+		$(use_enable static-libs static)
+		$(usex utils $(use_with svg librsvg) --without-librsvg)
+
+		# avoid using libpng-config
+		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+	)
+
+	case ${CHOST} in
+		mingw*|*-mingw*) ;;
+		# Workaround windows mis-detection: bug #654712
+		# Have to do it for both ${CHOST}-windres and windres
+		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
+	esac
+
+	export CC_BUILD="$(tc-getBUILD_CC)"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use utils ; then
+		einfo "Building utils"
+		# fix for Prefix, bug #339334
+		emake \
+			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use utils ; then
+		einfo "Installing utils"
+		emake DESTDIR="${D}" FT2DEMOS=1 \
+			TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
+	fi
+}
+
+multilib_src_install_all() {
+	if use fontforge ; then
+		# Probably fontforge needs less but this way makes things simplier...
+		einfo "Installing internal headers required for fontforge"
+		local header
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header ; do
+			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+		done
+	fi
+
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+	if [[ "${PV}" != 9999 ]] && use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 011cc4310aba..4b80a7e3b439 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+inherit autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="High-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils"
+IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
@@ -16,10 +16,10 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~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+=" doc"
 else
-	inherit autotools git-r3
+	inherit git-r3
 fi
 
 LICENSE="|| ( FTL GPL-2+ )"
@@ -32,17 +32,18 @@ RDEPEND="
 	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
 	utils? (
-		X? (
-			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
-		)
-	)"
+		svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] )
+		X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
+	)
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+)
+
 _egit_repo_handler() {
 	if [[ "${PV}" == 9999 ]] ; then
 		local phase="${1}"
@@ -68,6 +69,12 @@ _egit_repo_handler() {
 	fi
 }
 
+pkg_pretend() {
+	if use svg && ! use utils ; then
+		einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled."
+	fi
+}
+
 src_fetch() {
 	_egit_repo_handler ${EBUILD_PHASE}
 }
@@ -109,6 +116,11 @@ src_prepare() {
 
 	default
 
+	pushd builds/unix &>/dev/null || die
+	# eautoheader produces broken ftconfig.in
+	AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
+	popd &>/dev/null || die
+
 	# This is the same as the 01 patch from infinality
 	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
 
@@ -185,6 +197,7 @@ multilib_src_configure() {
 		$(use_with harfbuzz)
 		$(use_with png)
 		$(use_enable static-libs static)
+		$(usex utils $(use_with svg librsvg) --without-librsvg)
 
 		# avoid using libpng-config
 		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 36a77e5ee713..397be560af39 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,3 +1,4 @@
+AUX harfbuzz-5.3.1-meson-freetype-icu.patch 5077 BLAKE2B e8eee50d555f7d12b374885e56d946b6283b2a041c4aa0d42bbb0463eca6a039aaef329ca9900f939dbc8a8797784d4e1719be3717e07c1d101827c11ce7f70d SHA512 5a6e3eb18153b87610c0cd14cefb4decf23183b4bebe439edacd3f61d3cfebb0863727dab395aef8bbd38264bf2e741181d0949c78b89cfdb353eb6fa08586cc
 DIST harfbuzz-4.4.1.tar.gz 29231251 BLAKE2B 3947084ea2eedd76d64acfc5286ecd14d772ce0507163bc2c54a86579556a8799959ff4d47ea2919ee8472f8fe50d0266d325e3d0a7024f2ae8dcdf48d14f37e SHA512 bbc415d7b74408b1e8d34bfbc19a3cab002471fdd56d71b469c3129f0eae5532d5c7aaae7bb5cc3942fea6008d2ed9e96a7b20b10f4f5e46db63cecfa5c0248e
 DIST harfbuzz-5.1.0.tar.gz 29358116 BLAKE2B 006e66e9c76b505214b948c7c8756af38171b85cc865923e4665a4dd3eb14d89d20456ad4490b11208d57d056b087da78e1742141e41f8a22e644f20d3ea4851 SHA512 bdd7c2ca0b6f2a3a3fffbf0324d3c8bfd64a1753314048f6f67f901d4098e90054eeda9155d134f03c5d3ddefb15e087f872d2d87b2ace07bac6625fb43c7f3e
 DIST harfbuzz-5.3.0.tar.xz 17921224 BLAKE2B a220c1d4912487012f30942280651bcb63b5109e49be778a210bf26f4a0bcc7dc5ab7247775286b75cbe5b8fad7c439ae420d2085c6719088f028679242f9269 SHA512 0eae94769ac0157bf1df9b001223b30d40104ac448b1062f34ac793edb27ed1e459ac99954498c4b3cfb65c8cda29f2214a300f11523826b378ab67deec1a5f3
@@ -5,6 +6,7 @@ DIST harfbuzz-5.3.1.tar.xz 17874260 BLAKE2B e4d3926daca4f5c95441a9b99e10acd4b95b
 EBUILD harfbuzz-4.4.1.ebuild 2568 BLAKE2B 7e139034f21f106e2d3df102161487d788b49e6f52d2d109a922c0d38a9821fe090f71f5d844e04f495e16c69328b5b75c37dfd2faa05d1e120b19f4ccca66dd SHA512 0548def0efedc11cf90c9b57090e835a2f83a9e7f5b679166c04c16fc011dcf7919d5399c0ccbff1c7c8371c2480771d7a92da60573c3aa530e451cf5c2726c3
 EBUILD harfbuzz-5.1.0.ebuild 2574 BLAKE2B 2793ad1bf84ab388d2d5efddb74cd1431e2d4db4789273314e1824fd8c9fff9ea3f1489253b15703295fb46fd8509712cdd3cafe1a9e3aa07d2d9d9170bdd022 SHA512 80cd15636bc586ff84796bd0fb2d4b4b607e94335ad7eb83f6901164f4236c1cbb5db0533532b500638f25eb615da725ffd82aab5dc2cfdef50432597c1cf62d
 EBUILD harfbuzz-5.3.0.ebuild 2588 BLAKE2B f1a74063855a9437e2b3ff5322d03ef90bb6432721cb223373a8a088362db51f9819ea09179f2a7e1ee2b23ed783b8daebca8f689044d89f86ef1f114ad3fbae SHA512 398bc8ba0dd4f9b04157e7b842bbd6f2c7ea51699a47249192e5c31f78167eaa47bd1cc9c9cbb56ef7ead2626a754f2ef75124aea14d59cd5f4f701c8589b879
+EBUILD harfbuzz-5.3.1-r1.ebuild 2646 BLAKE2B 0132fbdda5e3d2e6f245fc2219d3153c3bb496139d73ad393002e9074a3a1f379bae8bccb4977007b59e160db903c6af52566539f4e0bf663d530a142fac2da6 SHA512 6975a84b548a031b5b143f0bb66effabb8dc09e4199b820e7e1c4adf0ef3be03298362bc1fd0a25924747a721b281fb92750ac24ee0d8e79b2f246e0bdc88b2f
 EBUILD harfbuzz-5.3.1.ebuild 2582 BLAKE2B 578a1f1d8d3e252587ec45d6b7bc07a78bb0284647226d3160ebb1a38f0e276579bc333038c7cd3bffb3bc9eae1aa5b1c6308ce1a51678bf2966bb7e3aa1a29c SHA512 d799301c05dfdaa20a10cc8c179240feec5bface78d3aec751cfe27e4066ddfb5b0d1ff1575928fde7f53599312d7ab35b4d04d3c90a23643a237bebfe9ea6d7
 EBUILD harfbuzz-9999.ebuild 2588 BLAKE2B f1a74063855a9437e2b3ff5322d03ef90bb6432721cb223373a8a088362db51f9819ea09179f2a7e1ee2b23ed783b8daebca8f689044d89f86ef1f114ad3fbae SHA512 398bc8ba0dd4f9b04157e7b842bbd6f2c7ea51699a47249192e5c31f78167eaa47bd1cc9c9cbb56ef7ead2626a754f2ef75124aea14d59cd5f4f701c8589b879
 MISC metadata.xml 763 BLAKE2B cb8679b8a67d692c73f1dc48facf6a98a442d34b51a90b2236070919b737d22e38a15babe5847cf4d30d4630c66d803f9d6e684c5e8b8b87a199d5d471a9e35c SHA512 0d87926c3e7a475bc84859d630cc8ed1b62e5766856e15b9aa74c87b5fd22345a9c05951508ccecadbea3513afdfd2244b1dbfbec8b41022d413a1401701e55e
diff --git a/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch b/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch
new file mode 100644
index 000000000000..3e0a7beece9c
--- /dev/null
+++ b/media-libs/harfbuzz/files/harfbuzz-5.3.1-meson-freetype-icu.patch
@@ -0,0 +1,120 @@
+https://bugs.gentoo.org/880479
+https://bugs.gentoo.org/880405
+https://github.com/harfbuzz/harfbuzz/pull/3870
+
+From 2c14943fb06ffd6de4e270454501ff5d305ede6e Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Tue, 8 Nov 2022 16:24:08 -0500
+Subject: [PATCH] meson: fix regression in detecting freetype2/icu-uc when
+ explicitly disabled
+
+In #3811 / commit 53a194aa3f5f7de0b40e879e41fcbe0de6e9fefe a broken and
+half-implemented approach to kind of sort of handling the detection of
+both pkg-config and cmake names for dependencies, was implemented. It
+just checked for both versions with required: false, but when the build
+was configured with *disabled* options, it was still found because it
+was treated as auto.
+
+Really, the problem here is trying to outsmart Meson, which handles a
+lot of edge cases correctly. But it's possible, albeit very wordy, to
+manually implement Meson's internal logic via if/else fallbacks. Do so
+here.
+--- a/meson.build
++++ b/meson.build
+@@ -83,20 +83,35 @@ check_funcs = [
+ 
+ m_dep = cpp.find_library('m', required: false)
+ 
+-
+-# Try pkgconfig name
+-freetype_dep = dependency('freetype2', required: false)
+-if not freetype_dep.found()
+-  # Try cmake name
+-  freetype_dep = dependency('freetype', required: false)
+-endif
+-if not freetype_dep.found()
+-  # Subproject fallback, `allow_fallback: true` means the fallback will be
+-  # tried even if the freetype option is set to `auto`.
+-  freetype_dep = dependency('freetype2',
++if meson.version().version_compare('>=0.60.0')
++  # pkg-config: freetype2, cmake: Freetype
++  freetype_dep = dependency('freetype2', 'Freetype',
+                             required: get_option('freetype'),
+                             default_options: ['harfbuzz=disabled'],
+                             allow_fallback: true)
++else
++  # painful hack to handle multiple dependencies but also respect options
++  freetype_opt = get_option('freetype')
++  # we want to handle enabled manually after fallbacks, but also handle disabled normally
++  if freetype_opt.enabled()
++    freetype_opt = false
++  endif
++  # try pkg-config name
++  freetype_dep = dependency('freetype2', method: 'pkg-config', required: freetype_opt)
++  # when disabled, leave it not-found
++  if not freetype_dep.found() and not get_option('freetype').disabled()
++    # Try cmake name
++    freetype_dep = dependency('Freetype', method: 'cmake', required: false)
++    # Subproject fallback, `allow_fallback: true` means the fallback will be
++    # tried even if the freetype option is set to `auto`.
++    if not freetype_dep.found()
++      freetype_dep = dependency('freetype2',
++                                method: 'pkg-config',
++                                required: get_option('freetype'),
++                                default_options: ['harfbuzz=disabled'],
++                                allow_fallback: true)
++    endif
++  endif
+ endif
+ 
+ glib_dep = dependency('glib-2.0', required: get_option('glib'))
+@@ -104,18 +119,36 @@ gobject_dep = dependency('gobject-2.0', required: get_option('gobject'))
+ graphite2_dep = dependency('graphite2', required: get_option('graphite2'))
+ graphite_dep = dependency('graphite2', required: get_option('graphite'))
+ 
+-# Try pkgconfig name
+-icu_dep = dependency('icu-uc', required: false)
+-if not icu_dep.found()
+-  # Try cmake name
+-  icu_dep = dependency('ICU',
+-                       required: false,
+-                       components: 'uc',
+-                       method: 'cmake')
+-endif
+-if not icu_dep.found()
+-  # Subproject fallback if icu option is enabled
+-  icu_dep = dependency('icu-uc', required: get_option('icu'))
++if meson.version().version_compare('>=0.60.0')
++  # pkg-config: icu-uc, cmake: ICU but with components
++  icu_dep = dependency('icu-uc', 'ICU',
++                            components: 'uc',
++                            required: get_option('icu'),
++                            default_options: ['harfbuzz=disabled'],
++                            allow_fallback: true)
++else
++  # painful hack to handle multiple dependencies but also respect options
++  icu_opt = get_option('icu')
++  # we want to handle enabled manually after fallbacks, but also handle disabled normally
++  if icu_opt.enabled()
++    icu_opt = false
++  endif
++  # try pkg-config name
++  icu_dep = dependency('icu-uc', method: 'pkg-config', required: icu_opt)
++  # when disabled, leave it not-found
++  if not icu_dep.found() and not get_option('icu').disabled()
++    # Try cmake name
++    icu_dep = dependency('ICU', method: 'cmake', components: 'uc', required: false)
++    # Try again with subproject fallback. `allow_fallback: true` means the
++    # fallback will be tried even if the icu option is set to `auto`, but
++    # we cannot pass this option until Meson 0.59.0, because no wrap file
++    # is checked into git.
++    if not icu_dep.found()
++      icu_dep = dependency('icu-uc',
++                           method: 'pkg-config',
++                           required: get_option('icu'))
++    endif
++  endif
+ endif
+ 
+ if icu_dep.found() and icu_dep.type_name() == 'pkgconfig'
+
diff --git a/media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild b/media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild
new file mode 100644
index 000000000000..fe93f48bc581
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-5.3.1-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
+	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"
+fi
+
+LICENSE="Old-MIT ISC icu"
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+SLOT="0/4.0.0"
+
+IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-freetype-icu.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	# bug #726120
+	sed -i \
+		-e '/tests\/macos\.tests/d' \
+		test/shape/data/in-house/Makefile.sources \
+		|| die
+
+	# bug #618772
+	append-cxxflags -std=c++14
+
+	# bug #790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
+	# bug #762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for introspection, bug #535852
+	local emesonargs=(
+		-Dcoretext="disabled"
+		-Dchafa="disabled"
+
+		$(meson_feature glib)
+		$(meson_feature graphite graphite2)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+
+		$(meson_native_use_feature cairo)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_use_feature introspection)
+
+		$(meson_use experimental experimental_api)
+	)
+
+	meson_src_configure
+}
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index 1aae0ac7bc02..cb55e205dde2 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_image-1.2.12_p20210314.tar.gz 10890897 BLAKE2B ddc3e0a49e4ce8fc3c46c5dabe277f9bd2db81f43880aadc8fbd3b6fa09254669fdac90ee4c3c7b92d5c7ec97747944c3953ea2dca065e646416391730cb22dd SHA512 f087472593cbaa9e65c5d643d7801e2ff5e49bee66502d8c094ea18bcd5f66e6da153d39bff7bc81ed20556c909fc4cce279275ff55ee00aebf07d39c27fd543
-EBUILD sdl-image-1.2.12_p20210314.ebuild 1691 BLAKE2B 2902fd64c3c900456501d516f5bf1964867aa038b26bbf475d04ac23a81506ff16449d5fe1004215c7aa29dc3ee01c7b3a784307eb3204201a7a5a44d8d6ac59 SHA512 cc199e3bfb7f7ebfa84c25fdf247dc2cd89d6b740c97a91eceb9f191ba78a46758306db3805efadfe37ad2b64952d123fbed815143bc8c42d58a58732108d1f3
-MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
+EBUILD sdl-image-1.2.12_p20210314.ebuild 1853 BLAKE2B 5bc24961cf0fc3761bc2b46063efab70291846113d8df52b7e0b06ac75439bb69be7d615a823b7e6f931ea294e9a596c91830a9e33e0a66b081aa983d33797d1 SHA512 9732a99c744d03622e1b4ceb908514d97ac3cf4e8f19a31bd9900ded8a7713e301ff028bf423914e3787e4dd4778e188c9faf43b2b45a5c74758c2ffb42a09fe
+MISC metadata.xml 365 BLAKE2B e7adf1771a0e52171d5ace8c77b8fb4b65019796c885f279e813b22f5a1abbefcee1fa9189a479788db4e5d1d2b96cf61f79e6881c816a19f0270fb69521e8d6 SHA512 80cc2d8d6af06bd4a43448c91747a2f04c477a59e19c9b46007b444c949e60664c26b8dc51755b67d7dfbd13a218b4126301f10fa3074d65740a8bfc7a0fe477
diff --git a/media-libs/sdl-image/metadata.xml b/media-libs/sdl-image/metadata.xml
index 7c730d47817a..b9962e96bc14 100644
--- a/media-libs/sdl-image/metadata.xml
+++ b/media-libs/sdl-image/metadata.xml
@@ -5,4 +5,8 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<upstream>
+		<!-- SDL-1.2 branch -->
+		<remote-id type="github">libsdl-org/SDL_image</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild b/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
index 3fe9ea4a9024..16f9cc515aad 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12_p20210314.ebuild
@@ -1,7 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# or take new snapshots every so often as no SDL 1 / 1.2.x releases
+# will be made anymore.
+
 inherit toolchain-funcs multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index c7eb7eb7b902..960c3c1f6be7 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,9 +1,11 @@
 AUX sdl-mixer-1.2.12-Fix-compiling-against-libmodplug-0.8.8.5.patch 553 BLAKE2B 9967bfa5cabffe68691fbb1002d01dafb14626596bc3fe0e15dcfd159dca4e542eb3998b08376b24870150beae7927fa3be7822cb9b68ad443544345a042cd6c SHA512 c411f372a817696838ef590db21579da96ca4f7f3170fdd6497ab204c3058138023d89ef379c810b8675091ae9e8c15bc3681085ca56a026cc1d3d22fdbef687
 AUX sdl-mixer-1.2.12-clang.patch 276 BLAKE2B 242e261861bab476d7f83148fc265daee990965cad8c3247dcf7e9e28e6b3aa9b2f491ac51c3517e3db4ab043ac8f8a118ca18c170f826f200df757de303e8db SHA512 2f318a73991783c75b32d05c9f81a42a7fd145a9d78e1cef00d1f2184f7c498e4c0a5a578bd2866315a940af76d4296de660ee94488530815694b7524d1d452e
+AUX sdl-mixer-1.2.12-incompatible-func-clang16.patch 2381 BLAKE2B 30fbae0d2453b67a8e263f970658b9ec309bbb476900b5187a571cf74224bc162e8174b20350615d55facfba13e0071b890334b002d4651157a6ca0b284fb21b SHA512 2d71a48566997eaa693b375f9a1e5136cf0cf14aea6545203c7d13685efca0851a26a2da407c7ad351e80554b7a435f9e0182c497a7d4d2c3a4e3e5a21e5099f
 AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff4397cd3fd284f2f39102879f5cf4956603075ba79cf0753822a8cbdcf4d1196ac9839f59211e0128bf97c0a1f36f00e70cc7682 SHA512 64ad577331eceea0eb060d0c2b333b664d4edb62cb3336f97b53e5c88f6b4ecdc4004136fef0461cdf999b282064b5809e79308591239bfafbdc3df8360bf123
 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704
 AUX sdl-mixer-1.2.12-parallel-build-slibtool.patch 4288 BLAKE2B 3beaeddf4e3ff97dc2778dfc79f800b3749a0b0fa511872f353587a3e01ded1cdc9c57c3a89cb3e1a6a34d6848b19aaacba5a2a81c3129906f521c2afc71e2c0 SHA512 b6e42b2ee43b57a3a4f3e8b47b96aa5d94b37f0326cbecca7128eb8b34f0ac00dded506a4d5164156ca23cf1aeaca6aa92f40ec43991fa73a97274a2262fe679
 AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491
 DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96
-EBUILD sdl-mixer-1.2.12-r5.ebuild 3438 BLAKE2B bbc1c4b67af067f344be5fb91c72b610065916a5f0a66362049a16cdd813532b0a93d525d25e695b1c8f2fd5b14bdd3b9f4a3ddea7d8e0ffd0520b6bc27f9fde SHA512 c7e8022f9960b8ae369805e62c55b2bec8c6c078f37427c94d44f014303cae0e463ca0218bc919ffb9554e7101f809665b659c91f1d2ba54f86883c9ec21ba53
-MISC metadata.xml 664 BLAKE2B 95d73b3e7ecc6b155cfad0d5043b63e245ccae5666b80d7ca6acccc71df7c1e76def7ede91a0bfd87b4084a14d3a7b2407a6f5ab537e619ed3cc32c5658248db SHA512 c8d112e07ceaa7c3ca71f023147024ead1fbda761fbb290fa5c1e7a76d17de48a69a8a4859e19df7ac5e36f08bc42805df768bcfe81f3c06afca0d00173cd46a
+EBUILD sdl-mixer-1.2.12-r5.ebuild 3601 BLAKE2B f51bbe3d0cc2c60b47ddf3626a07b45bbfcc5334adf4f1fef0d6fd681b9fac44d47e3e879397329355539288c6d983cc31a600f9e9c4403143688c221e1df881 SHA512 dd3969be4a66304acbf4366dfd387a00ae4558ad7d595f62c7e7790d6206be5fede4ae807abec8a5baaa9484c98b158e5431f4c663306bf6f120cd4b25aefcce
+EBUILD sdl-mixer-1.2.12-r6.ebuild 3660 BLAKE2B 8b140bae4093ad4cfb2d8f69890ec72735e20037033a17fbacb889e749e61d609bb3b252cfa58edb77dbf6d0f3413e6389d70ce5a1b50096606c7cba67274c30 SHA512 570cfd9dce65dfe49f1303d89a0eeb1e6ffb6c0582fd144b1900f274068bae76a9c7e52c04e2c5e80913f862df7deebde79f46696e966641389782c722b7bc3f
+MISC metadata.xml 787 BLAKE2B 4a9a04b0b88ec853de52f1cc7f6ad63e6bd4e5a421906daa2e0935c32d756538ef9aee8631e5be96665dd37ec6c4e47d256e30b01f7cc6ca56f29baaaa5ef27d SHA512 46520c6a56e9d6ff2137e71bf728349ed167f7ec10417345528e6da051e482b3a27158e46ae973d1bd0f348cac9e3f65e8a02eef984b8e00fbb2aced256ad2bd
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch
new file mode 100644
index 000000000000..0f104d5d6ffe
--- /dev/null
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-incompatible-func-clang16.patch
@@ -0,0 +1,64 @@
+https://github.com/libsdl-org/SDL_mixer/commit/03bd4ca6aa38c1a382c892cef86296cd621ecc1d
+https://github.com/libsdl-org/SDL_mixer/commit/9e6d7b67a00656a68ea0c2eace75c587871549b9
+https://github.com/libsdl-org/SDL_mixer/commit/d28cbc34d63dd20b256103c3fe506ecf3d34d379
+
+From 03bd4ca6aa38c1a382c892cef86296cd621ecc1d Mon Sep 17 00:00:00 2001
+From: Ozkan Sezer <sezeroz@gmail.com>
+Date: Sun, 7 Oct 2018 10:15:50 +0300
+Subject: [PATCH] backported a warning fix. (from 2.0 branch commit
+ 6fa075aa693e).
+
+---
+ dynamic_ogg.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dynamic_ogg.h b/dynamic_ogg.h
+index 822458d4..8eb91656 100644
+--- a/dynamic_ogg.h
++++ b/dynamic_ogg.h
+@@ -31,7 +31,7 @@ typedef struct {
+ 	void *handle;
+ 	int (*ov_clear)(OggVorbis_File *vf);
+ 	vorbis_info *(*ov_info)(OggVorbis_File *vf,int link);
+-	int (*ov_open_callbacks)(void *datasource, OggVorbis_File *vf, char *initial, long ibytes, ov_callbacks callbacks);
++	int (*ov_open_callbacks)(void *datasource, OggVorbis_File *vf, const char *initial, long ibytes, ov_callbacks callbacks);
+ 	ogg_int64_t (*ov_pcm_total)(OggVorbis_File *vf,int i);
+ #ifdef OGG_USE_TREMOR
+ 	long (*ov_read)(OggVorbis_File *vf,char *buffer,int length, int *bitstream);
+
+From 9e6d7b67a00656a68ea0c2eace75c587871549b9 Mon Sep 17 00:00:00 2001
+From: Ozkan Sezer <sezeroz@gmail.com>
+Date: Sun, 7 Oct 2018 12:41:20 +0300
+Subject: [PATCH] fixed a warning after commit cb08fb0976e6
+
+--- a/dynamic_ogg.c
++++ b/dynamic_ogg.c
+@@ -52,7 +52,7 @@ int Mix_InitOgg()
+ 			return -1;
+ 		}
+ 		vorbis.ov_open_callbacks =
+-			(int (*)(void *, OggVorbis_File *, char *, long, ov_callbacks))
++			(int (*)(void *, OggVorbis_File *, const char *, long, ov_callbacks))
+ 			SDL_LoadFunction(vorbis.handle, "ov_open_callbacks");
+ 		if ( vorbis.ov_open_callbacks == NULL ) {
+ 			SDL_UnloadObject(vorbis.handle);
+
+From d28cbc34d63dd20b256103c3fe506ecf3d34d379 Mon Sep 17 00:00:00 2001
+From: Ozkan Sezer <sezeroz@gmail.com>
+Date: Mon, 25 Nov 2019 03:28:02 +0300
+Subject: [PATCH] dynamic_ogg.c: fixed ov_time_seek() signature for
+ libvorbisidec.
+
+reported by Vitaly Novichkov.
+--- a/dynamic_ogg.c
++++ b/dynamic_ogg.c
+@@ -78,7 +78,7 @@ int Mix_InitOgg()
+ 		}
+ 		vorbis.ov_time_seek =
+ #ifdef OGG_USE_TREMOR
+-			(long (*)(OggVorbis_File *,ogg_int64_t))
++			(int (*)(OggVorbis_File *,ogg_int64_t))
+ #else
+ 			(int (*)(OggVorbis_File *,double))
+ #endif
+
diff --git a/media-libs/sdl-mixer/metadata.xml b/media-libs/sdl-mixer/metadata.xml
index e21b7d3404e3..164919840177 100644
--- a/media-libs/sdl-mixer/metadata.xml
+++ b/media-libs/sdl-mixer/metadata.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
-</maintainer>
-<use>
- <flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
- <flag name="midi">basic support for MIDI files</flag>
- <flag name="mod">basic support for MOD files</flag>
- <flag name="playtools">Install playwave and playmus tools (useful for testing)</flag>
- <flag name="smpeg">Use <pkg>media-libs/smpeg</pkg> for MP3 support</flag>
- <flag name="wav">support WAVE files</flag>
-</use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
+		<flag name="midi">basic support for MIDI files</flag>
+		<flag name="mod">basic support for MOD files</flag>
+		<flag name="playtools">Install playwave and playmus tools (useful for testing)</flag>
+		<flag name="smpeg">Use <pkg>media-libs/smpeg</pkg> for MP3 support</flag>
+		<flag name="wav">support WAVE files</flag>
+	</use>
+	<upstream>
+		<!-- SDL-1.2 branch -->
+		<remote-id type="github">libsdl-org/SDL_mixer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild
index 1e21b42d4cad..45fe1cea8182 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r5.ebuild
@@ -3,6 +3,10 @@
 
 EAPI=7
 
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
+# will be made anymore.
+
 MY_P=${P/sdl-/SDL_}
 inherit autotools multilib-minimal
 
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r6.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r6.ebuild
new file mode 100644
index 000000000000..04a69cf22ab4
--- /dev/null
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r6.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
+# will be made anymore.
+
+MY_P=${P/sdl-/SDL_}
+inherit autotools multilib-minimal
+
+DESCRIPTION="Simple Direct Media Layer Mixer Library"
+HOMEPAGE="https://www.libsdl.org/projects/SDL_mixer/"
+SRC_URI="https://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
+
+REQUIRED_USE="
+	midi? ( || ( timidity fluidsynth ) )
+	timidity? ( midi )
+	fluidsynth? ( midi )
+	mp3? ( || ( smpeg mad ) )
+	smpeg? ( mp3 )
+	mad? ( mp3 )
+	mod? ( || ( mikmod modplug ) )
+	mikmod? ( mod )
+	modplug? ( mod )
+"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+	flac? ( >=media-libs/flac-1.2.1-r5:=[${MULTILIB_USEDEP}] )
+	midi? (
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
+		timidity? ( media-sound/timidity++ )
+	)
+	mod? (
+		mikmod? ( >=media-libs/libmikmod-3.3.6-r1[${MULTILIB_USEDEP}] )
+		modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	)
+	mp3? (
+		mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
+		smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
+	)
+	vorbis? (
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-wav.patch
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-Fix-compiling-against-libmodplug-0.8.8.5.patch
+	"${FILESDIR}"/${P}-mikmod-r58{7,8}.patch # bug 445980
+	"${FILESDIR}"/${P}-parallel-build-slibtool.patch
+	"${FILESDIR}"/${P}-incompatible-func-clang16.patch
+)
+
+src_prepare() {
+	default
+	sed -e '/link.*play/s/-o/$(LDFLAGS) -o/' -i Makefile.in || die
+
+	# Hack to get eautoconf working
+	# eautoreconf dies with gettext mismatch errors for now
+	cat acinclude/* >aclocal.m4 || die
+	eautoconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-music-flac-shared
+		--disable-music-fluidsynth-shared
+		--disable-music-mod-shared
+		--disable-music-mp3-shared
+		--disable-music-ogg-shared
+		$(use_enable wav music-wave)
+		$(use_enable vorbis music-ogg)
+		$(use_enable mikmod music-mod)
+		$(use_enable modplug music-mod-modplug)
+		$(use_enable flac music-flac)
+		$(use_enable static-libs static)
+		$(use_enable smpeg music-mp3)
+		$(use_enable mad music-mp3-mad-gpl)
+		$(use_enable timidity music-timidity-midi)
+		$(use_enable fluidsynth music-fluidsynth-midi)
+		LIBMIKMOD_CONFIG="${EPREFIX}"/usr/bin/${CHOST}-libmikmod-config
+	)
+	ECONF_SOURCE=${S} \
+		econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use playtools; then
+		emake DESTDIR="${D}" install-bin
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc CHANGES README
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# bug 412035
+	# https://bugs.gentoo.org/show_bug.cgi?id=412035
+	if use midi ; then
+		if use fluidsynth; then
+			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
+			ewarn "environment variable to the location of a SoundFont file"
+			ewarn "unless the game or application happens to do this for you."
+
+			if use timidity; then
+				ewarn "Failing to do so will result in Timidity being used instead."
+			else
+				ewarn "Failing to do so will result in silence."
+			fi
+		fi
+	fi
+}
diff --git a/media-libs/sdl-net/Manifest b/media-libs/sdl-net/Manifest
index 99ce53e7a2b0..f7f704b3672e 100644
--- a/media-libs/sdl-net/Manifest
+++ b/media-libs/sdl-net/Manifest
@@ -1,3 +1,3 @@
 DIST SDL_net-1.2.8.tar.gz 360958 BLAKE2B 656fb9c86949bc962656edc7b950e64eee9b9b1ce1b257e6c4974c2d9be99714128c5556d3a3b7ea92cc6d294846af7a51a1925d17418afc8409e44a7b71099a SHA512 2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b
-EBUILD sdl-net-1.2.8-r2.ebuild 735 BLAKE2B d60dc361d443cb770b582b98684252a4b1eee4baaa3d014e07eeab8a2267950f49f4fe1bd40ae27417508380f8ec8a423700ad65ea35d018224b13dc112753b1 SHA512 6d16a932eca8f89532dd9722562b2d2f05e67db42b2cbd967910f061ba5ea6a68b70de8ef663dc64c38608bef590e711ecae7b75e5d2287c98194dd61dd75e48
+EBUILD sdl-net-1.2.8-r2.ebuild 898 BLAKE2B fee3f7d5d3ffbadb653f5a3af448c7497a0a4d4ef30ec0dfa00800bbf305b0e5deb31b8a8fb3019451078b1560a07c580b83408605c997ff78ca95726b656dfa SHA512 1073b06c9a4c1b1b39b61e2128350b60d99ab96751ebda9a641720582bfc746c0066d7cbbf6e718615fa8bf41770afe2b10a94d019aa4a9ff477b78340b95cf8
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
index 7cfc2935b429..e03f1e258a2e 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r2.ebuild
@@ -1,8 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
+# will be made anymore.
+
 inherit multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index 079dcf8e6b6e..738e678e9baf 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -2,5 +2,5 @@ AUX sdl-sound-1.0.3-automake-1.13.patch 231 BLAKE2B cc17a9d7a9f8ea42f84b6a65505d
 AUX sdl-sound-1.0.3-physfs-3.0.1.patch 1574 BLAKE2B 9829f6429041322c0eaa41d547dbebfe03bf730e80d76b5b15afc66c123a87e0ab1fd9819372e37ed505c1a9e214c27583cb56e12920b3fe0c88a211177c79bc SHA512 ac228520e1c8e682b58919335ea117289087962b4b98fae23e743830709d8dca60a3d22c7171ee13bdbf84f528cfddcad70231edbba64a7cec88c7dd77295eca
 AUX sdl-sound-1.0.3-underlinking.patch 413 BLAKE2B 594339dae9a0230ddc1b821ca90d1650800610b0a7904fc00e33f1e3ff183ece1c8715b1d27b0c80cecbf5bda9e7b15255fba00fdc293f5e0841452efde447ef SHA512 1f67d72313abc44080a47b70c210bd6c03b2a204e85e2f5d1eb95f40367470bab4f14956f0404c5025fb4af7d72731dd1df3196ee316a2c5d9bb775e27d58a8c
 DIST SDL_sound-1.0.3.tar.gz 1127100 BLAKE2B 6fff5ea22ae82f9692a51910d5415288d5a1ebc1c463b2c741f9ee9fabeabb385de12f781d4f40aaf0628598824758376c51b442f434d77d96d0376379908ff6 SHA512 3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824
-EBUILD sdl-sound-1.0.3-r3.ebuild 1973 BLAKE2B 2d974028041ac4bfdece43556dfac3cb7438b054c14f4fe63dcaa2ae21d9f874b735423dbe4b47d83d34ff2f8f54e87403958e05aad636dfaba96009f252f050 SHA512 1da80c71270781faa3a33c8ea8fd66c916f706de850f31284595e1a84ceb204602326b56a40e94ea5fbaec7ef8c4ae3bbb26919c076ba354bf84fe0ca14a0b99
-MISC metadata.xml 444 BLAKE2B 5a67655b6e48cd4bbbb1f985a879d5060a7b1ae25a336d837d25001b2a15bcca1ef257ac1425467cf1b89f9a3eb5ad555639709e470e91aec7712a1920bdd4ea SHA512 2d6709b7fc8eefdfa5cd403eecff74a3f54ab08bf7043f5b966bdb09194eabc4d6aae4b4225c77210f6e452a9297fcf4b03a0cc6998d0967bc437e505c9133e3
+EBUILD sdl-sound-1.0.3-r3.ebuild 2134 BLAKE2B f1f5429dfb243da26936fa89ee47e50cd171defc1b470b75af1ad3666071ceba5ee1bf580d75c425370984d87a6e36507332bb8d6b6712ff72d8c8dbb506fa04 SHA512 05794ef14e799d102fc2354c4f3e02106b66c5ee8dee1c5a6a30f28a95a6294e7bc0b61b0e859d9c286b9f885a043dd361767fbbc8e532459d930c347b064d70
+MISC metadata.xml 530 BLAKE2B 1927045e4dd57e0b2ac63cc6ef1165009aafe2a981c2d8bc0ff9ea3e3b9473fdca4945b8b7227a285a425bfd97fa4a65809e7ebe6477ac95bfa0952ea5a6190d SHA512 cc8d087914c0ab7689a7cc9ce230de1d531c4e424bed3b73c21a215a8b681314c9e0fad95039cbf4ec2e4e93911ac876821505ac7f0872c251240121d8e77b77
diff --git a/media-libs/sdl-sound/metadata.xml b/media-libs/sdl-sound/metadata.xml
index adf47d033fce..f155573d634e 100644
--- a/media-libs/sdl-sound/metadata.xml
+++ b/media-libs/sdl-sound/metadata.xml
@@ -10,5 +10,7 @@
 	</use>
 	<upstream>
 		<bugs-to>mailto:sdlsound@icculus.org</bugs-to>
+		<!-- stable-1.0 branch -->
+		<remote-id type="github">icculus/SDL_sound</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild
index eb34c69194cf..7380edd37f8e 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3-r3.ebuild
@@ -3,6 +3,10 @@
 
 EAPI=8
 
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# even take snapshots from it in future, as no SDL 1 / 1.x releases
+# will be made anymore.
+
 inherit autotools multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
diff --git a/media-libs/sdl-ttf/Manifest b/media-libs/sdl-ttf/Manifest
index 78a7f3a5ef3e..f4f22ee8ad07 100644
--- a/media-libs/sdl-ttf/Manifest
+++ b/media-libs/sdl-ttf/Manifest
@@ -1,5 +1,5 @@
 AUX sdl-ttf-2.0.11-freetype_pkgconfig.patch 1229 BLAKE2B 79ee75681d33ba925a29066b818cd32409c1eff159cd827606c6ea893a739eb698586d8cc292b1d3c21b3963112a26f5685aba532b47d1e83bc21fcce6995253 SHA512 abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937
 AUX sdl-ttf-2.0.11-underlink.patch 244 BLAKE2B 2eb1782f89a72c94a1d90e4560895aafc9beda72a1537d41186de0e2816b6d37486b1211ac274d72c1b369f82d2b977c173443145a4a49b9592379e667881d32 SHA512 22495819ad0972183d850496acdcae1358bd37d25191e62c293f8d5fc50c617507631a202d46bd1ec380c70d89c61d050763919d48912b9a527908e8ad1ef1ac
 DIST SDL_ttf-2.0.11.tar.gz 4053686 BLAKE2B 3a78eeec91d7f6983b851cdd52925890c168cdf85dd34c7722183cc5a8848dab530c0c2d76493e0a380aa7e4f81967eeefd7cb34dc74faafc40497ffcb0e577b SHA512 64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b
-EBUILD sdl-ttf-2.0.11-r1.ebuild 1235 BLAKE2B 6f93b3d4de10ab94a9db942992dda52abb4e70d2ea8bb5fa60cf9f81927c8650146ff986f61bb78b3775d4a3fbcaf671558d1019f1eff8b71e061cdc62f01c20 SHA512 64e5cff1522b743417d1f2122e16d469b39bcc6ac83ebd3eb2072fde8fec4e48fa056b4a1bf440a472f4ae60b87ee888384ed85ba14629c7c8ee3f0c373e4d59
-MISC metadata.xml 488 BLAKE2B f68c35cf8344372cd48c32170cb5aa7fcd8110773f6319a5cee824c1b8a7f95ab7a8e7d8c84df38fc25ddb4fac6b2ac59b59b1a4365b0876bad258b79e6c1d84 SHA512 c641f45fae365c6880180d51187ec8f247e81a2addf6eda5752fc428526b737fd2ac58244adc3792b69c9e0cf21f8c75f29f6f762f64607ccf0e10d8367bafb2
+EBUILD sdl-ttf-2.0.11-r1.ebuild 1399 BLAKE2B eb11423354a01c4a258f91f6b57666ab08c7fc1235640366fb365fd21fc9a75cd39812cdfe721eee5b8ee817264f97abddf16e5403bbb4c7c165f9d4f930c3f6 SHA512 9d5a9a3f19bd5d2f7f70b59613cff3fb2c6501cd91c3930a1b2801d33735a13479b13d1e83f268a27a89981a601f8916aed0f8ceeb9ed462ad467cc1298cbd92
+MISC metadata.xml 604 BLAKE2B 28ad2d239df5d6096bbc586e3842b9b41739a76a740995955e08e7a324cca40566fed84a4050447cb9cb8edfbe14562f62bdfe7aa6b5b1c407104a0912dfc013 SHA512 07e5dc681f113e2657bb37307e4a28b1630e142d42685403f04af8505f9eb52dc6bae513710ca0b94170174d75455d0315dd75c784d99ae0cd1ac79fde3cf793
diff --git a/media-libs/sdl-ttf/metadata.xml b/media-libs/sdl-ttf/metadata.xml
index a569823703ad..f82bde12e798 100644
--- a/media-libs/sdl-ttf/metadata.xml
+++ b/media-libs/sdl-ttf/metadata.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-This is a sample library which allows you to use TrueType fonts in your SDL applications. It 
-comes with an example program "showfont" which displays an example string for a given 
-TrueType font file.
-</longdescription>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription>
+	This is a sample library which allows you to use TrueType fonts in your SDL applications. It
+	comes with an example program "showfont" which displays an example string for a given
+	TrueType font file.
+	</longdescription>
+	<upstream>
+		<!-- SDL-1.2 branch -->
+		<remote-id type="github">libsdl-org/SDL_ttf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index a2068af4c79a..040210674b8a 100644
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -2,6 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
+# We may want to grab backports from the SDL-1.2 branch upstream or
+# even take snapshots from it in future, as no SDL 1 / 1.2.x releases
+# will be made anymore.
+
 inherit autotools multilib-minimal
 
 MY_P="${P/sdl-/SDL_}"
diff --git a/media-libs/sdl2-net/Manifest b/media-libs/sdl2-net/Manifest
index 55adefcc4a41..dd4c09e077e9 100644
--- a/media-libs/sdl2-net/Manifest
+++ b/media-libs/sdl2-net/Manifest
@@ -1,3 +1,3 @@
 DIST SDL2_net-2.0.1.tar.gz 347436 BLAKE2B 9c7bb46cf97581f75543b9e2695e4ce87b78c66dada3ac1a3ddf7b8e6eeaf2540532aece3e7a6dc7f6dfcfd3ecf5148d5bfb9a84bc2775e57f68b3adf32e5828 SHA512 d27faee3cddc3592dae38947e6c1df0cbaa95f82fde9c87db6d11f6312d868cea74f6830ad07ceeb3d0d75e9424cebf39e54fddf9a1147e8d9e664609de92b7a
 EBUILD sdl2-net-2.0.1.ebuild 824 BLAKE2B e7ec9b5ba6548415108eeaa22043969112bc3d61cd330637669272f4987dedf3b0900a1a1ec40f6696f03aef5c46afa7a6b9f74b605939fe927d5c0d9a7c5d71 SHA512 04911606d152393946e55e49ffbf5ca65ff46a472a90a4eaebc2f539726d31cd362ba69b251c3b97f53b4828b267266973d9f47aee5ffa11b2290cda98ebbcb6
-MISC metadata.xml 337 BLAKE2B 48ae83a7d75050dc1fc90dcd86e5f56d347f356af4c7d7e6bf0e7bd58a3cb56cc9a1d20391a195066f2198651e41c0af832b427490aad18c15d21250cd598f88 SHA512 9cf8aeb4bb0d72403d3c13e45bac9dbb54f791d1e783f384c5b87c014fa8b25696c29679479aa40d9ea96a2c6c71263bf1f3e3094f2930bc28fb11c32e36254a
+MISC metadata.xml 363 BLAKE2B eee15854dacbfd1d5c7d7d8adf277d52e5d839681cc29e9969710d0f642c7f04bce10954676a88d34e3f1f472bf30b12a37da3216e09eefae73919032c8c90ba SHA512 40f6f80d29e1a1cff805b9cd74779b03f249f27ce81872c52e27b86753edd0a0e01baa8f2a5928fd9c0c38c8c6cabeb14b91fc98e7bd3b8a720e7bf6fd6fee36
diff --git a/media-libs/sdl2-net/metadata.xml b/media-libs/sdl2-net/metadata.xml
index 56790c9e6201..53042ad2a247 100644
--- a/media-libs/sdl2-net/metadata.xml
+++ b/media-libs/sdl2-net/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<!-- SDL-1.2 branch -->
 		<remote-id type="github">libsdl-org/SDL_net</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7488c7c21b45..17746b73290d 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index 5b9c8e4d3280..cbce72810a6a 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,4 +1,4 @@
 AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
 EBUILD jack-audio-connection-kit-0.125.0-r1.ebuild 2187 BLAKE2B b52f3cb0504bf86f1c65178ed4a63d6b629cd1262303c235b6837562c42148254225591e9ac1cacc1b02f834533e851a316357d8abc1b4f8572c961d22557347 SHA512 5bf3c7139da37aa55a9dd2219998b2105d1677235cf8bb6b3a5cb5d4abf8c1718718b87f9458ecfb87f745a698426b33023e79bfde368df35f460e8beed16266
-MISC metadata.xml 372 BLAKE2B 66c633666e2c8a5b8d8ef71fba7385592793402402a1ae68e056942bb8f42a83db9d040f37bd3bf4ed5b49fa98c5a4cb827e634a0f9eff31f50b9db18e814baa SHA512 b9816869688b653d145e3eb2aee1dcc911ebd292b81855a079104fa0a93306b61cd4658323a1985c8a2c735f6f44b62e8d4a54b1761725d8c66db2bf2ac48025
+MISC metadata.xml 452 BLAKE2B 89a78fca1c96ccd12d3370c2d9ed557f6411c187861eb57302121707b8b5bf611b7e548464c39b42ac6c2eff0b489fd14f0298e28ca3e4979b143db538134edd SHA512 5a771bf96efa6e652a75618d82ada77de9ca5fb494402b165b71fe129985aa47502792695cf6bbd867956fd52630588d47c555b32cb0d47e79b40f7a02556d4b
diff --git a/media-sound/jack-audio-connection-kit/metadata.xml b/media-sound/jack-audio-connection-kit/metadata.xml
index aa2076180f8a..4fc61802269e 100644
--- a/media-sound/jack-audio-connection-kit/metadata.xml
+++ b/media-sound/jack-audio-connection-kit/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">jackaudio/jack1</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 7a33e9d95261..33b6065aecbf 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/vcsi/Manifest b/media-video/vcsi/Manifest
index 058611ced290..b63d2c920ffc 100644
--- a/media-video/vcsi/Manifest
+++ b/media-video/vcsi/Manifest
@@ -1,5 +1,3 @@
 DIST vcsi-7.0.13-r1.tar.gz 25491 BLAKE2B 64babd9637e7bc01e5b40f33db24309fe7ac7d1eb6c831d9755a313fea1147eccd45951c0d17d874f9f9a417a4fae69b43199f92d30a1f78ea91c724cf9ef92d SHA512 91edd1e82b3a2d8b1cffd0392dd1e807f289a5e4a6885e9d44f39c1393b9bca412b7766b1148233daee611ba9a2ea43af623f50c2c83a24b2250f79f5270d345
-DIST vcsi-7.0.13.tar.gz 24343 BLAKE2B d3bacb95f470f118d7d0e8cc1f810a069f85bb07eaa15c25e4bee35f8b8fa4c6eb908b1fa791fc48e8510e627e2bd7d1b915a1525cc214130829c03498d9bf8c SHA512 bd5b20635a3184e1bfae5b1ba804124c6af884af5b3a12fcc9130451f084c0496b87b6f1193cd8d6a2b39676a2b91e2266e17c80c2013444cee5bd1dfefc3b1c
-EBUILD vcsi-7.0.13-r1.ebuild 777 BLAKE2B a049fa1e25bc2a83b1d6f97ef2f0d2810f7c08dc06205bc608a9353268ff7ea6f7aa084425edd218cc23ee6984c63ffba96f4dcb84878b3e7ab103196f0e60cc SHA512 53c21fb7c0a197a6177cfa6cf5af262b911484ea20882f2cdac3e645071f058c9032ca857ce28383fe0af648a358ab228b5fa345c244959aab996fc5b2a0cac4
-EBUILD vcsi-7.0.13.ebuild 770 BLAKE2B 955b87e4ccc27d2087a52ee0fdf7b88540732ef5fa81df2998112b8ee1419ee5a35869573b12f3631e0f6a8b2e4a110ee97d5f65bae6c9c08f6f01fb78b9fa80 SHA512 2a97f65f11a560adafd20ab18221b22f3be802a4de1ec66a73cd8cef5c7d81088b233d25bdb48fe8eb3305a1799c457867f0cf73976b629591ba65fee858b9be
+EBUILD vcsi-7.0.13-r1.ebuild 775 BLAKE2B 0d3cdb6e61fa8caf6489d8dd2f02bfe73cc1616fc030c65a29196256bfef5df7d9dd11a9f89c328f9ce761fb7a6dffdc353583f45b3608104bdf20d3628428f4 SHA512 4b63d983c1a5a6dc298ccfcaa397f8d9cd7437d48bcafe7dfc0987d6c0e8d803edeca0296c7ca896e1d8b58e9f40bee3f606ce38084e7e93339acc4c32a08315
 MISC metadata.xml 280 BLAKE2B 30756c19f90277ebe700cf4641848ae376453c6031a019f348f04ee8d4c30146947ec383fa4bf12b669df790417eec9285df363210138e39f611d345d127ed27 SHA512 cf301b82fada2d4ca02e1dd9ba7b5234c42b7c63f87b96d81cb06ebc7853934533b75d0fc77eff0dc39f3c0a9e2d468b6bc03ac98fcb3834da67a11b254a0b77
diff --git a/media-video/vcsi/vcsi-7.0.13-r1.ebuild b/media-video/vcsi/vcsi-7.0.13-r1.ebuild
index c46a705de422..45698a8fc6bf 100644
--- a/media-video/vcsi/vcsi-7.0.13-r1.ebuild
+++ b/media-video/vcsi/vcsi-7.0.13-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/amietn/vcsi/archive/${MY_COMMIT}.tar.gz -> ${P}-r1.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/media-video/vcsi/vcsi-7.0.13.ebuild b/media-video/vcsi/vcsi-7.0.13.ebuild
deleted file mode 100644
index fedc09b71e5e..000000000000
--- a/media-video/vcsi/vcsi-7.0.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_COMMIT="7c974f7396a5c6e459f7c6033674ad7144e820a8"
-
-DESCRIPTION="Create thumbnail sheets from video files"
-HOMEPAGE="https://github.com/amietn/vcsi"
-SRC_URI="https://github.com/amietn/vcsi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/parsedatetime[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg,truetype,${PYTHON_USEDEP}]
-	dev-python/texttable[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-video/ffmpeg"
-
-distutils_enable_tests nose
-
-S="${WORKDIR}"/vcsi-${MY_COMMIT}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 813503948590..80518d69b9a8 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8d5cb91b4a8e..1a4962688436 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 10 Nov 2022 02:40:18 +0000
+Thu, 10 Nov 2022 08:40:08 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 761741dd7a29..032b26a8b59e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 536084 BLAKE2B c89e49fb5e75661a7da4bc1a8267e8936701fe518e99a96ea46c267fe11ac6fcc34a3029874ea964f0a67189423224c5aba6dc5cc7a56cf0d5889ea2d47d781f SHA512 75913d485440890ef20577369af3828f92411599dd916f9c5792517c2a36a196afc4bb5153abea2e3a2bc4b763ff2159dd5b7d79a6de88fdec6368ba79776c6f
-TIMESTAMP 2022-11-10T02:40:22Z
+TIMESTAMP 2022-11-10T08:40:11Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNsZJZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNsuOtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBrLw//St3Rvemj8UHt17xXPVFIfHy/dLO6pvGYNC4AjAb8XGVGsH8p7ZL4QLej
-FfU5galikMYTEt/TykaIswhPHDNgFULVBGI1PS6ncT+U/IP+34wXfGf4aD++ZzBV
-SbB+ToaCBJX7MU/cYggaukJ8Am2U928EOr9SBkkHDmZDWLzBaDQY0ik6Jv4ocCiR
-3FQTSvacIG74x1ak7YIzEgGKnflPSYMeUfTg69bcgVVWgc4qtWitahbEd1iIO0A8
-8MKUenYUjwg69+gMD+RQvZwb19VN17kRjQRM/MOehdCkdsFKY4YnZChDM0hGVhs3
-I1RPOXGzkaItbrZEXJR1HpIdLF/1ffzzyyQkOhzL/p1G1x5tFx5reZimiPHCObRP
-maiqhtOJzPXa6WET86pZh0ia9OcmCtrx+/g2GKHRXqe+vy6Zq5lqONMtDkWK/QmA
-ZpznX0YgU5jWGQe7KG004tZlKxvhaIJUtliGOvr181o7+XUtAiheyLeeH/4iH1nx
-M5BvYM2hrJCNPWIIrthosFkHN82Vmrgyigwr5RLMJwQzn6ylvT0i0lH6EMs8+DZK
-qchXWOvKQtn5Rw9M7QDhJA/nuKHdsPbyZb7r1LoMid68ixSpahk5fl2juNkkMN9K
-BRobg6Z/zCUQjYKIjEdiy/2kpGDkHVkj6biQUpXhT2H99AYx5yY=
-=R0S1
+klBlDQ/+JwE/K0DNKPLnPOpEqYq5v4CO1H4XKEQyJ+/Oyaunjg4Xcw59JseW0dmw
+LKJp5Mh1EehIZHI4+UvVJmKl4vtSHhx6w2gQR1Ksgi/Bxbx5rLXMsnJPZEl/63zk
+/KccqNTuOHh9DNTKK0O5H3fIwgaxtOEu0Mb2tYUCsTuvKbdqTZ5QZz6U3kseAoBY
+Sx1s7OejwXj4N8G+PQ1MXgXVRQmqA0fv5vf0dnTPb5qOElpwFBV0PLNGSSC+hnsE
+chdcykkEHyjTz6Axj8Eh6LT+aVcfzThwUyAHwHgc+REuJgbGU73Marl0v3YBQUD4
+idKE7NKGWO1ApH7JapPj/wV8V7m4OyykMO44Wl0fqAe/HA5qzykPzWjFYe5vmERH
+n1uJVKbTBkMPzNS9oZzZz42JZUp3WEOCDvgX+xIg2Bs9RNdoAeao4ffL2kHy2geT
+F0Kih8Rm5oquIxj3MNjBRqf/JjxbsiL88tqpCJxYtX5NQWgupkgEhs5b6K7fA0MG
+94csLUfwU1WcuKXOuVQcfiEAo6PLNnasCLj1jirhx6utEw/0c8t/SNUbS32AgmTq
+OWtEsR8M4nuMciubBV+DrYFe5eIEtjqdQ6TV8rqsr8QA4nAx2r351OGI1Ke9m2zo
+4wgdIweNEhGDHC14yHKOm7sWyNbZInDUHoHT0o0oGbyAUyUwtNs=
+=Mn4A
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 442aaea52c42..1a4962688436 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 10 Nov 2022 02:40:19 +0000
+Thu, 10 Nov 2022 08:40:08 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index c7524b223d1d..e805c6c2b762 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 49a5c9f0f9f5..ac79e43c30c7 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1 b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
deleted file mode 100644
index f1a1203763d6..000000000000
--- a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=prepare
-DEPEND=sys-libs/ncurses:0=
-DESCRIPTION=Completely rewrite of the old system monitoring app procinfo
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/procinfo-ng/
-INHERIT=autotools
-KEYWORDS=amd64 ~hppa x86
-LICENSE=|| ( GPL-2 LGPL-2.1 )
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/procinfo-ng/procinfo-ng-2.0.304.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1711863973ae79091a4449343f6b42a0
diff --git a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r2 b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r2
new file mode 100644
index 000000000000..f15f22dc9b80
--- /dev/null
+++ b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=sys-libs/ncurses:=
+DESCRIPTION=Completely rewrite of the old system monitoring app procinfo
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/procinfo-ng/
+INHERIT=autotools flag-o-matic
+KEYWORDS=amd64 ~hppa x86
+LICENSE=|| ( GPL-2 LGPL-2.1 )
+RDEPEND=sys-libs/ncurses:=
+SLOT=0
+SRC_URI=mirror://sourceforge/procinfo-ng/procinfo-ng-2.0.304.tar.bz2
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=e998b7a3a1885913a51894dfd4e3a54b
diff --git a/metadata/md5-cache/app-admin/sysstat-12.7.1 b/metadata/md5-cache/app-admin/sysstat-12.7.1
index 00d9d457fe32..17a16fe147cd 100644
--- a/metadata/md5-cache/app-admin/sysstat-12.7.1
+++ b/metadata/md5-cache/app-admin/sysstat-12.7.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://sebastien.godard.pagesperso-orange.fr/
 INHERIT=systemd toolchain-funcs
 IUSE=dcron debug nls lm-sensors lto selinux systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) !dcron? ( !sys-process/dcron ) selinux? ( sec-policy/selinux-sysstat )
 REQUIRED_USE=dcron? ( !systemd )
 SLOT=0
 SRC_URI=https://github.com/sysstat/sysstat/archive/v12.7.1.tar.gz -> sysstat-12.7.1.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ea64ef1e69e50a9bd0dd6eef17230166
+_md5_=ebf03262bb4df5399ea77c111b0516c5
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 4089dde8b4cf..683598ebcf96 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/doxygen-1.9.1 b/metadata/md5-cache/app-doc/doxygen-1.9.1
deleted file mode 100644
index 159347737351..000000000000
--- a/metadata/md5-cache/app-doc/doxygen-1.9.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-10:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doc? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) !!sys-devel/llvm:0
-DESCRIPTION=Documentation system for most programming languages
-EAPI=7
-HOMEPAGE=http://www.doxygen.org
-INHERIT=cmake flag-o-matic llvm python-any-r1
-IUSE=clang debug doc dot doxysearch qt5 sqlite
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-10:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doc? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
-RESTRICT=!doc? ( test )
-SLOT=0
-SRC_URI=http://doxygen.nl/files/doxygen-1.9.1.src.tar.gz mirror://sourceforge/doxygen/rel-1.9.1/doxygen-1.9.1.src.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7457bde654cee17e09a0e9bae41c2601
diff --git a/metadata/md5-cache/app-doc/doxygen-1.9.2 b/metadata/md5-cache/app-doc/doxygen-1.9.2
deleted file mode 100644
index 1bc38b68a2b8..000000000000
--- a/metadata/md5-cache/app-doc/doxygen-1.9.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-10:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doc? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) !!sys-devel/llvm:0
-DESCRIPTION=Documentation system for most programming languages
-EAPI=7
-HOMEPAGE=http://www.doxygen.org
-INHERIT=cmake flag-o-matic llvm python-any-r1
-IUSE=clang debug doc dot doxysearch qt5 sqlite
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-10:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doc? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
-RESTRICT=!doc? ( test )
-SLOT=0
-SRC_URI=http://doxygen.nl/files/doxygen-1.9.2.src.tar.gz mirror://sourceforge/doxygen/rel-1.9.2/doxygen-1.9.2.src.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d56723cfa80aee4399c395706844e434
diff --git a/metadata/md5-cache/app-doc/doxygen-1.9.3 b/metadata/md5-cache/app-doc/doxygen-1.9.3
deleted file mode 100644
index bf85407cbff2..000000000000
--- a/metadata/md5-cache/app-doc/doxygen-1.9.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-10:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doc? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 ) !!sys-devel/llvm:0
-DESCRIPTION=Documentation system for most programming languages
-EAPI=7
-HOMEPAGE=http://www.doxygen.org
-INHERIT=cmake flag-o-matic llvm python-any-r1
-IUSE=clang debug doc dot doxysearch qt5 sqlite
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-10:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doc? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
-RESTRICT=!doc? ( test )
-SLOT=0
-SRC_URI=http://doxygen.nl/files/doxygen-1.9.3.src.tar.gz mirror://sourceforge/doxygen/rel-1.9.3/doxygen-1.9.3.src.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=da744dc1a22ccd3f2b7905dda5a283a2
diff --git a/metadata/md5-cache/app-doc/doxygen-1.9.5 b/metadata/md5-cache/app-doc/doxygen-1.9.5
index 6b825e8305f5..9978c2557e72 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.9.5
+++ b/metadata/md5-cache/app-doc/doxygen-1.9.5
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://doxygen.nl/files/doxygen-1.9.5.src.tar.gz mirror://sourceforge/doxygen/rel-1.9.5/doxygen-1.9.5.src.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b39b07a5404f0f6a053f551aa47e1754
+_md5_=b9e00c7ab7f8bdf2c7aef2136f1329e8
diff --git a/metadata/md5-cache/app-doc/doxygen-9999 b/metadata/md5-cache/app-doc/doxygen-9999
index 29789488ea12..e04c5228518c 100644
--- a/metadata/md5-cache/app-doc/doxygen-9999
+++ b/metadata/md5-cache/app-doc/doxygen-9999
@@ -5,11 +5,12 @@ DESCRIPTION=Documentation system for most programming languages
 EAPI=7
 HOMEPAGE=http://www.doxygen.org
 INHERIT=cmake flag-o-matic llvm python-any-r1 git-r3
-IUSE=clang debug doc dot doxysearch qt5 sqlite
+IUSE=clang debug doc dot doxysearch qt5 sqlite test
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-10:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doc? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) doxysearch? ( dev-libs/xapian:= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
-RESTRICT=!doc? ( test )
+REQUIRED_USE=test? ( doc )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d918772d7048602a16eaa448d4bcf3ee
+_md5_=b9e00c7ab7f8bdf2c7aef2136f1329e8
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index c86513733bb4..4750f577f987 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/libftdi-1.5-r3 b/metadata/md5-cache/dev-embedded/libftdi-1.5-r4
index 704a8e0187e2..09dcb2bf8b5e 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-1.5-r3
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.5-r4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.5.tar.bz2
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0376f3faeccc61d63b0ee8fd8fd63731
+_md5_=3aafa669894e623863209d6a71fd74af
diff --git a/metadata/md5-cache/dev-embedded/libftdi-9999 b/metadata/md5-cache/dev-embedded/libftdi-9999
index 92a0775993d0..2b639dc87eb5 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-9999
+++ b/metadata/md5-cache/dev-embedded/libftdi-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=1
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e27b837876f95e5d37ee0966d0e20b23
+_md5_=d2a54c99feb65ffae337ec4b0dd2c735
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 2fd4da401009..8497a63450f5 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/mockito-1.9.5-r2 b/metadata/md5-cache/dev-java/mockito-1.9.5-r2
deleted file mode 100644
index 81d4638a6c62..000000000000
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/ant-core:0 dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/objenesis:0 virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A mocking framework for Java
-EAPI=7
-HOMEPAGE=https://github.com/mockito/mockito
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-java/ant-core:0 dev-java/hamcrest-core:0 dev-java/junit:4 dev-java/objenesis:0 virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://mockito.googlecode.com/files/mockito-1.9.5.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=4976555477c891d9c12d81fd9f8b842c
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 32dba71be583..c7f15c2f7288 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/python-3.10.8_p3 b/metadata/md5-cache/dev-lang/python-3.10.8_p3
index ad41b7928092..d6308e302e9b 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.8_p3
+++ b/metadata/md5-cache/dev-lang/python-3.10.8_p3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.8_p3.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e1e2e9b28dd0ba8491f82b6453ad4c9e
+_md5_=4b66ec8dfe15404b69bbae234f4b41fb
diff --git a/metadata/md5-cache/dev-lang/python-3.8.15_p3 b/metadata/md5-cache/dev-lang/python-3.8.15_p3
index d567d3ddf072..3f055ea37b98 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.15_p3
+++ b/metadata/md5-cache/dev-lang/python-3.8.15_p3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.15_p3.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=91866a833193af6dda2657ba00a4daea
+_md5_=18cd237f2c36bd73925a32e432b76837
diff --git a/metadata/md5-cache/dev-lang/python-3.9.15_p3 b/metadata/md5-cache/dev-lang/python-3.9.15_p3
index a95a8baf1910..ba060f6174ec 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.15_p3
+++ b/metadata/md5-cache/dev-lang/python-3.9.15_p3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.15_p3.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4d388b225b2fd1098da860f5bc8fb2e5
+_md5_=bf3bc22505bc66de9ab874a805c3ec60
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-102.4.0 b/metadata/md5-cache/dev-lang/spidermonkey-102.4.0
index 954b2db39e37..dd43a7d5285e 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-102.4.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-102.4.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=102
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/source/firefox-102.4.0esr.source.tar.xz -> firefox-102.4.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/spidermonkey-102-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-102-patches-04j.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e7905b1213e40b1f8b4c2588547f865e
+_md5_=297425c321f6619d30488e90aa5336d9
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 6de68fc2b17b..226cec546b1f 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/stdcompat-19 b/metadata/md5-cache/dev-ml/stdcompat-19
new file mode 100644
index 000000000000..e3d15a434cd7
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/stdcompat-19
@@ -0,0 +1,12 @@
+BDEPEND=dev-ml/dune dev-ml/findlib[ocamlopt]
+DEFINED_PHASES=configure
+DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/result:=[ocamlopt] dev-ml/uchar:=[ocamlopt]
+DESCRIPTION=Compatibility module for OCaml standard library
+EAPI=8
+HOMEPAGE=https://github.com/thierry-martinez/stdcompat
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/result:=[ocamlopt] dev-ml/uchar:=[ocamlopt]
+SLOT=0/19
+SRC_URI=https://github.com/thierry-martinez/stdcompat/releases/download/v19/stdcompat-19.tar.gz
+_md5_=6964ed69343ca023c2930f45cca47c4e
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 3219c2252e43..5288756c516a 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.9_p9 b/metadata/md5-cache/dev-python/pypy3-7.3.9_p9
index 642bb54b2ec0..286bd17f52d7 100644
--- a/metadata/md5-cache/dev-python/pypy3-7.3.9_p9
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.9_p9
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.pypy.org/ https://foss.heptapod.net/pypy/pypy/
 INHERIT=pax-utils python-any-r1 toolchain-funcs
 IUSE=+ensurepip gdbm +jit ncurses sqlite test tk
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=|| ( >=dev-python/pypy3-exe-7.3.9_p3:3.9-7.3.9[bzip2(+),ncurses?] >=dev-python/pypy3-exe-bin-7.3.9_p3:3.9-7.3.9 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= )
 RESTRICT=test
 SLOT=0/pypy39-pp73-336
 SRC_URI=https://buildbot.pypy.org/pypy/pypy3.9-v7.3.9-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.9-gentoo-patches-7.3.9_p9.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a79a7caf3b5a9942ae777bb3e4b8b64e
+_md5_=c2108a9011b1732bc3af728fc86051f4
diff --git a/metadata/md5-cache/dev-python/tlsh-4.8.2 b/metadata/md5-cache/dev-python/tlsh-4.8.2
index 87db164fd6ec..3d546029dc09 100644
--- a/metadata/md5-cache/dev-python/tlsh-4.8.2
+++ b/metadata/md5-cache/dev-python/tlsh-4.8.2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/tlsh
 DESCRIPTION=Fuzzy matching library - C++ extension for Python
 EAPI=8
 HOMEPAGE=https://pypi.org/project/python-tlsh/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=|| ( Apache-2.0 BSD )
-RDEPEND=dev-libs/tlsh python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-libs/tlsh python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/trendmicro/tlsh/archive/4.8.2.tar.gz -> tlsh-4.8.2.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=12ea9cbc3134ee0cd23f800ea9cb4b3a
+_md5_=eb1780f81f6bc647b4829bb4c08fae7d
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 45cda5a89141..7d6d80ebb905 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/bcpp-20221002 b/metadata/md5-cache/dev-util/bcpp-20221002
new file mode 100644
index 000000000000..7c337baa6270
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bcpp-20221002
@@ -0,0 +1,13 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Indents C/C++ source code
+EAPI=8
+HOMEPAGE=https://invisible-island.net/bcpp/
+INHERIT=verify-sig
+IUSE=verify-sig
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://invisible-island.net/archives/bcpp/bcpp-20221002.tgz verify-sig? ( https://invisible-island.net/archives/bcpp/bcpp-20221002.tgz.asc )
+_eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=7884a12787205792a274f75d0c527881
diff --git a/metadata/md5-cache/dev-util/bear-3.0.20 b/metadata/md5-cache/dev-util/bear-3.0.20
new file mode 100644
index 000000000000..fc8894643a97
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bear-3.0.20
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( sys-devel/libtool || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-cpp/nlohmann_json-3.7.3:= >=dev-db/sqlite-3.14:= dev-libs/libfmt:= dev-libs/protobuf:= >=dev-libs/spdlog-1.5 >=net-libs/grpc-1.26:= test? ( >=dev-cpp/gtest-1.10 )
+DESCRIPTION=Build EAR generates a compilation database for clang tooling
+EAPI=8
+HOMEPAGE=https://github.com/rizsotto/Bear
+INHERIT=cmake python-any-r1
+IUSE=test
+KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-cpp/nlohmann_json-3.7.3:= >=dev-db/sqlite-3.14:= dev-libs/libfmt:= dev-libs/protobuf:= >=dev-libs/spdlog-1.5 >=net-libs/grpc-1.26:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rizsotto/Bear/archive/3.0.20.tar.gz -> bear-3.0.20.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=fd2d541cd81bdd7bf5fb040906a4add9
diff --git a/metadata/md5-cache/dev-util/byacc-20221106 b/metadata/md5-cache/dev-util/byacc-20221106
new file mode 100644
index 000000000000..b504bb64d689
--- /dev/null
+++ b/metadata/md5-cache/dev-util/byacc-20221106
@@ -0,0 +1,13 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure unpack
+DESCRIPTION=The best variant of the Yacc parser generator
+EAPI=8
+HOMEPAGE=https://invisible-island.net/byacc/byacc.html
+INHERIT=verify-sig
+IUSE=verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://invisible-island.net/archives/byacc/byacc-20221106.tgz verify-sig? ( https://invisible-island.net/archives/byacc/byacc-20221106.tgz.asc )
+_eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=69f60ce363f708bb92fc0d53988d6644
diff --git a/metadata/md5-cache/dev-util/coccinelle-1.1.1-r2 b/metadata/md5-cache/dev-util/coccinelle-1.1.1-r3
index 6e79ec595f16..7fc0da0fd433 100644
--- a/metadata/md5-cache/dev-util/coccinelle-1.1.1-r2
+++ b/metadata/md5-cache/dev-util/coccinelle-1.1.1-r3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( dev-texlive/texlive-latexextra dev-texlive/texlive-fontsextra virtual/latex-base dev-tex/hevea ) 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 postinst postrm prepare setup test
-DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] dev-ml/findlib:=[ocamlopt?] emacs? ( >=app-editors/emacs-23.1:* ) pcre? ( dev-libs/libpcre dev-ml/pcre-ocaml:=[ocamlopt?] ) 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 ) )
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] dev-ml/findlib:=[ocamlopt?] dev-ml/stdcompat:= emacs? ( >=app-editors/emacs-23.1:* ) pcre? ( dev-libs/libpcre dev-ml/pcre-ocaml:=[ocamlopt?] ) 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 ) )
 DESCRIPTION=Program matching and transformation engine
 EAPI=8
 HOMEPAGE=https://coccinelle.gitlabpages.inria.fr/website/ https://gitlab.inria.fr/coccinelle/coccinelle
@@ -8,10 +8,10 @@ INHERIT=autotools bash-completion-r1 elisp-common python-single-r1
 IUSE=doc emacs +ocamlopt pcre python test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] dev-ml/findlib:=[ocamlopt?] emacs? ( >=app-editors/emacs-23.1:* ) pcre? ( dev-libs/libpcre dev-ml/pcre-ocaml:=[ocamlopt?] ) 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 ) )
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] dev-ml/findlib:=[ocamlopt?] dev-ml/stdcompat:= emacs? ( >=app-editors/emacs-23.1:* ) pcre? ( dev-libs/libpcre dev-ml/pcre-ocaml:=[ocamlopt?] ) 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_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=strip !test? ( test ) test
 SLOT=0
 SRC_URI=https://gitlab.inria.fr/coccinelle/coccinelle/-/archive/1.1.1/coccinelle-1.1.1.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3ace3bb7ef5b062d4af00decaa0ea1b1
+_md5_=03d10a49c8c3a0809cf4cb1883627c44
diff --git a/metadata/md5-cache/dev-util/diffoscope-226 b/metadata/md5-cache/dev-util/diffoscope-226
new file mode 100644
index 000000000000..1575d59a7aec
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-226
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-text/docx2txt app-text/html2text media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=8
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+INHERIT=distutils-r1
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-226.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=f44574845c916d0de9031f4d31c69299
diff --git a/metadata/md5-cache/dev-util/diffstat-1.63 b/metadata/md5-cache/dev-util/diffstat-1.63
deleted file mode 100644
index 3c0e1dd9a550..000000000000
--- a/metadata/md5-cache/dev-util/diffstat-1.63
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Display a histogram of diff changes
-EAPI=7
-HOMEPAGE=https://invisible-island.net/diffstat/
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=HPND
-SLOT=0
-SRC_URI=https://invisible-mirror.net/archives/diffstat/diffstat-1.63.tgz
-_md5_=494ea0b9fd073d9adbcc43fa49081cd1
diff --git a/metadata/md5-cache/dev-util/diffstat-1.65 b/metadata/md5-cache/dev-util/diffstat-1.65
new file mode 100644
index 000000000000..568365acb63b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffstat-1.65
@@ -0,0 +1,13 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=unpack
+DESCRIPTION=Display a histogram of diff changes
+EAPI=8
+HOMEPAGE=https://invisible-island.net/diffstat/
+INHERIT=verify-sig
+IUSE=verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=HPND
+SLOT=0
+SRC_URI=https://invisible-mirror.net/archives/diffstat/diffstat-1.65.tgz verify-sig? ( https://invisible-island.net/archives/diffstat/diffstat-1.65.tgz.asc )
+_eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=eb96923f8ad5d36d5f916e178d41c52f
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.7.0-r2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.7.0-r2
index f7ef9d3453bf..c17d1ff00c76 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.7.0-r2
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.7.0-r2
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror
 SLOT=0/11.7.0
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda_11.7.0_515.43.04_linux.run
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=db03a761707dcb6d1240e93d6557396e
+_md5_=81826fa0bd8c7d53fff751d585c2604c
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.8.0-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.8.0-r1
index ef1adee66155..a848cc1f4cba 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.8.0-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.8.0-r1
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror
 SLOT=0/11.8.0
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux.run
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=863d757bdfbecf320ce08bff1cf775d1
+_md5_=f56229e971c962976bba26ddf592e74f
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 5ab02a4f2dd0..cf8a40e99138 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/exult-1.6 b/metadata/md5-cache/games-engines/exult-1.6
index 13b7626e9b6b..a05e332bdf4a 100644
--- a/metadata/md5-cache/games-engines/exult-1.6
+++ b/metadata/md5-cache/games-engines/exult-1.6
@@ -4,9 +4,9 @@ DESCRIPTION=an Ultima 7 game engine that runs on modern operating systems
 EAPI=7
 HOMEPAGE=http://exult.sourceforge.net/
 IUSE=alsa fluidsynth opengl +sdl2 timidity tools
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=games-misc/exult-sound >=media-libs/libpng-1.6:0= media-libs/libvorbis sys-libs/zlib alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) opengl? ( virtual/opengl ) sdl2? ( media-libs/libsdl2[sound,video,X] ) !sdl2? ( media-libs/libsdl[sound,video,X] ) timidity? ( >=media-sound/timidity++-2 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/exult/exult-all-versions/1.6/exult-1.6.tar.gz
-_md5_=d9a112d35180fb55ff5e12d99c136a7c
+_md5_=846d95223a5beeca8bc26c8390ae8585
diff --git a/metadata/md5-cache/games-engines/exult-1.8 b/metadata/md5-cache/games-engines/exult-1.8
new file mode 100644
index 000000000000..40159728688d
--- /dev/null
+++ b/metadata/md5-cache/games-engines/exult-1.8
@@ -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=configure postinst prepare
+DEPEND=games-misc/exult-sound media-libs/libpng:= media-libs/libsdl2[X,joystick,sound,video] media-libs/libvorbis sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth:= ) timidity? ( media-sound/timidity++ ) x11-base/xorg-proto
+DESCRIPTION=Ultima 7 game engine that runs on modern operating systems
+EAPI=8
+HOMEPAGE=https://exult.sourceforge.net/
+INHERIT=autotools
+IUSE=alsa fluidsynth timidity tools
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=games-misc/exult-sound media-libs/libpng:= media-libs/libsdl2[X,joystick,sound,video] media-libs/libvorbis sys-libs/zlib:= alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth:= ) timidity? ( media-sound/timidity++ )
+SLOT=0
+SRC_URI=mirror://sourceforge/exult/exult-all-versions/1.8/exult-1.8.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a9b5ac70597bb2123fe38bd6466ec288
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index c8204baf3e09..55959a685060 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/exult-sound-0-r2 b/metadata/md5-cache/games-misc/exult-sound-0-r2
index 7aede60ad2e1..96d826615bb6 100644
--- a/metadata/md5-cache/games-misc/exult-sound-0-r2
+++ b/metadata/md5-cache/games-misc/exult-sound-0-r2
@@ -3,8 +3,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Sound data for games-engines/exult
 EAPI=7
 HOMEPAGE=http://exult.sourceforge.net/
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/exult/exult-data/exult_audio.zip
-_md5_=226490e2269901bc95b320dff9de0f1e
+_md5_=a7586f86d75a4f5d3130f1d0628ef5de
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index cd1aa27ab8d1..562aa92607e1 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.4.0 b/metadata/md5-cache/mail-client/thunderbird-102.4.0
index 7b34fdfc1e80..98b99f9a4e4c 100644
--- a/metadata/md5-cache/mail-client/thunderbird-102.4.0
+++ b/metadata/md5-cache/mail-client/thunderbird-102.4.0
@@ -14,4 +14,4 @@ REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/source/thunderbird-102.4.0.source.tar.xz -> thunderbird-102.4.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-04j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/af.xpi -> thunderbird-102.4.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ar.xpi -> thunderbird-102.4.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ast.xpi -> thunderbird-102.4.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/be.xpi -> thunderbird-102.4.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/bg.xpi -> thunderbird-102.4.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/br.xpi -> thunderbird-102.4.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ca.xpi -> thunderbird-102.4.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/cak.xpi -> thunderbird-102.4.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/cs.xpi -> thunderbird-102.4.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/cy.xpi -> thunderbird-102.4.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/da.xpi -> thunderbird-102.4.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/de.xpi -> thunderbird-102.4.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.4.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/el.xpi -> thunderbird-102.4.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.4.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.4.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.4.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.4.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.4.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/et.xpi -> thunderbird-102.4.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/eu.xpi -> thunderbird-102.4.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/fi.xpi -> thunderbird-102.4.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/fr.xpi -> thunderbird-102.4.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.4.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.4.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/gd.xpi -> thunderbird-102.4.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/gl.xpi -> thunderbird-102.4.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/he.xpi -> thunderbird-102.4.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/hr.xpi -> thunderbird-102.4.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.4.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/hu.xpi -> thunderbird-102.4.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/id.xpi -> thunderbird-102.4.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/is.xpi -> thunderbird-102.4.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/it.xpi -> thunderbird-102.4.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ja.xpi -> thunderbird-102.4.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ka.xpi -> thunderbird-102.4.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/kab.xpi -> thunderbird-102.4.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/kk.xpi -> thunderbird-102.4.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ko.xpi -> thunderbird-102.4.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/lt.xpi -> thunderbird-102.4.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/lv.xpi -> thunderbird-102.4.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ms.xpi -> thunderbird-102.4.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.4.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/nl.xpi -> thunderbird-102.4.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.4.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.4.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/pl.xpi -> thunderbird-102.4.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.4.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.4.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/rm.xpi -> thunderbird-102.4.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ro.xpi -> thunderbird-102.4.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/ru.xpi -> thunderbird-102.4.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/sk.xpi -> thunderbird-102.4.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/sl.xpi -> thunderbird-102.4.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/sq.xpi -> thunderbird-102.4.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/sr.xpi -> thunderbird-102.4.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.4.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/th.xpi -> thunderbird-102.4.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/tr.xpi -> thunderbird-102.4.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/uk.xpi -> thunderbird-102.4.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/uz.xpi -> thunderbird-102.4.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/vi.xpi -> thunderbird-102.4.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.4.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.4.0-zh-TW.xpi )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6a3473cd1bfd9eee8376eeb742ac0b70
+_md5_=d768650479d9d33dd4c3d16d8a91e427
diff --git a/metadata/md5-cache/mail-client/thunderbird-102.4.2 b/metadata/md5-cache/mail-client/thunderbird-102.4.2
index c1868ca5d1b5..904d78597982 100644
--- a/metadata/md5-cache/mail-client/thunderbird-102.4.2
+++ b/metadata/md5-cache/mail-client/thunderbird-102.4.2
@@ -14,4 +14,4 @@ REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/source/thunderbird-102.4.2.source.tar.xz -> thunderbird-102.4.2.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-05j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-05j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-05j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/af.xpi -> thunderbird-102.4.2-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/ar.xpi -> thunderbird-102.4.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/ast.xpi -> thunderbird-102.4.2-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/be.xpi -> thunderbird-102.4.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/bg.xpi -> thunderbird-102.4.2-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/br.xpi -> thunderbird-102.4.2-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/ca.xpi -> thunderbird-102.4.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/cak.xpi -> thunderbird-102.4.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/cs.xpi -> thunderbird-102.4.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/cy.xpi -> thunderbird-102.4.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/da.xpi -> thunderbird-102.4.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/de.xpi -> thunderbird-102.4.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/dsb.xpi -> thunderbird-102.4.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/el.xpi -> thunderbird-102.4.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/en-CA.xpi -> thunderbird-102.4.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/en-GB.xpi -> thunderbird-102.4.2-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/es-AR.xpi -> thunderbird-102.4.2-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/es-ES.xpi -> thunderbird-102.4.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/es-MX.xpi -> thunderbird-102.4.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/et.xpi -> thunderbird-102.4.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/eu.xpi -> thunderbird-102.4.2-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/fi.xpi -> thunderbird-102.4.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/fr.xpi -> thunderbird-102.4.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-102.4.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-102.4.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/gd.xpi -> thunderbird-102.4.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/gl.xpi -> thunderbird-102.4.2-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/he.xpi -> thunderbird-102.4.2-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/hr.xpi -> thunderbird-102.4.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/hsb.xpi -> thunderbird-102.4.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/hu.xpi -> thunderbird-102.4.2-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/id.xpi -> thunderbird-102.4.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/is.xpi -> thunderbird-102.4.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/it.xpi -> thunderbird-102.4.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/ja.xpi -> thunderbird-102.4.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/ka.xpi -> thunderbird-102.4.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/kab.xpi -> thunderbird-102.4.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/kk.xpi -> thunderbird-102.4.2-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/ko.xpi -> thunderbird-102.4.2-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/lt.xpi -> thunderbird-102.4.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/lv.xpi -> thunderbird-102.4.2-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/ms.xpi -> thunderbird-102.4.2-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-102.4.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/nl.xpi -> thunderbird-102.4.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-102.4.2-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-102.4.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/pl.xpi -> thunderbird-102.4.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-102.4.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-102.4.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/rm.xpi -> thunderbird-102.4.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/ro.xpi -> thunderbird-102.4.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/ru.xpi -> thunderbird-102.4.2-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/sk.xpi -> thunderbird-102.4.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/sl.xpi -> thunderbird-102.4.2-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/sq.xpi -> thunderbird-102.4.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/sr.xpi -> thunderbird-102.4.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-102.4.2-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/th.xpi -> thunderbird-102.4.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/tr.xpi -> thunderbird-102.4.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/uk.xpi -> thunderbird-102.4.2-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/uz.xpi -> thunderbird-102.4.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/vi.xpi -> thunderbird-102.4.2-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-102.4.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/102.4.2/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-102.4.2-zh-TW.xpi )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f0dcb9978db79b9a9389d45841b5b231
+_md5_=a0d7c740180d89f2321f069f3082d9f1
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index aee0e78013de..a37b7cc59634 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/freetype-2.12.1-r2 b/metadata/md5-cache/media-libs/freetype-2.12.1-r2
new file mode 100644
index 000000000000..d9053ac72b19
--- /dev/null
+++ b/metadata/md5-cache/media-libs/freetype-2.12.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare pretend test unpack
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( svg? ( >=gnome-base/librsvg-2.46.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+DESCRIPTION=High-quality and portable font engine
+EAPI=8
+HOMEPAGE=https://www.freetype.org/
+INHERIT=autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+IUSE=X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils doc 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=|| ( FTL GPL-2+ )
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( svg? ( >=gnome-base/librsvg-2.46.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+SLOT=2
+SRC_URI=mirror://sourceforge/freetype/freetype-2.12.1.tar.xz mirror://nongnu/freetype/freetype-2.12.1.tar.xz utils? ( mirror://sourceforge/freetype/ft2demos-2.12.1.tar.xz mirror://nongnu/freetype/ft2demos-2.12.1.tar.xz ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.12.1.tar.xz mirror://nongnu/freetype/freetype-doc-2.12.1.tar.xz )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=6d44bad6c9d2de81a8ab7296c488ada7
diff --git a/metadata/md5-cache/media-libs/freetype-9999 b/metadata/md5-cache/media-libs/freetype-9999
index 4b5178cd4458..ad268b429757 100644
--- a/metadata/md5-cache/media-libs/freetype-9999
+++ b/metadata/md5-cache/media-libs/freetype-9999
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare pretend test unpack
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( svg? ( >=gnome-base/librsvg-2.46.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 DESCRIPTION=High-quality and portable font engine
 EAPI=8
 HOMEPAGE=https://www.freetype.org/
-INHERIT=flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs autotools git-r3
-IUSE=X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs 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
+INHERIT=autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs git-r3
+IUSE=X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg 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
 LICENSE=|| ( FTL GPL-2+ )
 PROPERTIES=live
-RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( app-arch/brotli[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( svg? ( >=gnome-base/librsvg-2.46.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2041ce696a093b3a7461b0847289d258
+_md5_=0703016f155b98262e3e3ce41129b04c
diff --git a/metadata/md5-cache/media-libs/harfbuzz-5.3.1-r1 b/metadata/md5-cache/media-libs/harfbuzz-5.3.1-r1
new file mode 100644
index 000000000000..2701e42ef76f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-5.3.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[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-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34
+DESCRIPTION=An OpenType text shaping engine
+EAPI=8
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+INHERIT=flag-o-matic meson-multilib python-any-r1 xdg-utils
+IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +truetype 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
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[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-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+RESTRICT=!test? ( test )
+SLOT=0/4.0.0
+SRC_URI=https://github.com/harfbuzz/harfbuzz/releases/download/5.3.1/harfbuzz-5.3.1.tar.xz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=fd584d36fa68d24c902ba6a57a7f179b
diff --git a/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20210314 b/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20210314
index 356de8701872..3306c2e5e661 100644
--- a/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20210314
+++ b/metadata/md5-cache/media-libs/sdl-image-1.2.12_p20210314
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32
 SLOT=0
 SRC_URI=https://github.com/libsdl-org/SDL_image/archive/5d792dde2f764daf15dc48521774a3354330db69.tar.gz -> SDL_image-1.2.12_p20210314.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f88824f2863cd198fff01bca2985dddc
+_md5_=5429fa1af51917aa1ac87f04bc5972bb
diff --git a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r5 b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r5
index cb888cd2109f..8ca411d7dc64 100644
--- a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r5
+++ b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r5
@@ -13,4 +13,4 @@ REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth?
 SLOT=0
 SRC_URI=https://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=afebce7425227779ff0311b3f1d7f91b
+_md5_=afd76c3303b1680f53f0e8340fb818e2
diff --git a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r6 b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r6
new file mode 100644
index 000000000000..aabbadfbef8b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r6
@@ -0,0 +1,16 @@
+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 install postinst prepare test
+DEPEND=>=media-libs/libsdl-1.2.15-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(-)?] flac? ( >=media-libs/flac-1.2.1-r5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) midi? ( fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) timidity? ( media-sound/timidity++ ) ) mod? ( mikmod? ( >=media-libs/libmikmod-3.3.6-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) mp3? ( mad? ( >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) smpeg? ( >=media-libs/smpeg-0.4.4-r10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) vorbis? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Simple Direct Media Layer Mixer Library
+EAPI=7
+HOMEPAGE=https://www.libsdl.org/projects/SDL_mixer/
+INHERIT=autotools multilib-minimal
+IUSE=flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=ZLIB
+RDEPEND=>=media-libs/libsdl-1.2.15-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(-)?] flac? ( >=media-libs/flac-1.2.1-r5:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) midi? ( fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) timidity? ( media-sound/timidity++ ) ) mod? ( mikmod? ( >=media-libs/libmikmod-3.3.6-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) mp3? ( mad? ( >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) smpeg? ( >=media-libs/smpeg-0.4.4-r10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) vorbis? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod )
+SLOT=0
+SRC_URI=https://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=81e5cd4443e9b56b5668c2cb82d8b071
diff --git a/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2 b/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2
index b3bf2d46934a..eeb9f37fa17f 100644
--- a/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2
+++ b/metadata/md5-cache/media-libs/sdl-net-1.2.8-r2
@@ -11,4 +11,4 @@ RDEPEND=media-libs/libsdl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips
 SLOT=0
 SRC_URI=https://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3f343303239de2c60b79b2d161c63f32
+_md5_=edf37329e0f2a4cd246ce53ceb8b4581
diff --git a/metadata/md5-cache/media-libs/sdl-sound-1.0.3-r3 b/metadata/md5-cache/media-libs/sdl-sound-1.0.3-r3
index 0a03087ddafe..9d25ae33fe99 100644
--- a/metadata/md5-cache/media-libs/sdl-sound-1.0.3-r3
+++ b/metadata/md5-cache/media-libs/sdl-sound-1.0.3-r3
@@ -12,4 +12,4 @@ RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 SLOT=0
 SRC_URI=https://icculus.org//downloads/SDL_sound-1.0.3.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5fc8bdd42668ab8345d2ddf48d3b4d3c
+_md5_=5e93a4557db6f094f38b37fc0221dd50
diff --git a/metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1 b/metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1
index 3bfa6e962c12..7a6b10e3ee2f 100644
--- a/metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1
+++ b/metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1
@@ -11,4 +11,4 @@ RDEPEND=X? ( >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1453594de25d26047cf46dccf8330cf4
+_md5_=50ba19d1c2d18a7b26dbeef1a345f67f
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index b0714f4d9976..6f64ae61d0ed 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/vcsi-7.0.13 b/metadata/md5-cache/media-video/vcsi-7.0.13
deleted file mode 100644
index 5ebb84ce9c18..000000000000
--- a/metadata/md5-cache/media-video/vcsi-7.0.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parsedatetime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,truetype,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-video/ffmpeg >=dev-python/nose-1.3.7_p20211111_p1-r1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Create thumbnail sheets from video files
-EAPI=8
-HOMEPAGE=https://github.com/amietn/vcsi
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parsedatetime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,truetype,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-video/ffmpeg python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/amietn/vcsi/archive/7c974f7396a5c6e459f7c6033674ad7144e820a8.tar.gz -> vcsi-7.0.13.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8aed34a9c3f8f2771ef98fbf321a2656
diff --git a/metadata/md5-cache/media-video/vcsi-7.0.13-r1 b/metadata/md5-cache/media-video/vcsi-7.0.13-r1
index ca154ba3be88..0ff91f325976 100644
--- a/metadata/md5-cache/media-video/vcsi-7.0.13-r1
+++ b/metadata/md5-cache/media-video/vcsi-7.0.13-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/amietn/vcsi
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parsedatetime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[jpeg,truetype,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/texttable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-fonts/dejavu media-video/ffmpeg python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/amietn/vcsi/archive/fa7aa8ca781d0fe3188eea76f79c5702bf9b7330.tar.gz -> vcsi-7.0.13-r1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8fe34d705bc5c4e7e7262c2e625fdd25
+_md5_=f521cabd044c18dd7ef1ddbc82c5d8fd
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 59aac2f539e2..bdf21bad8fe1 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-1.0.2 b/metadata/md5-cache/net-analyzer/fail2ban-1.0.2
new file mode 100644
index 000000000000..3c375ee471ac
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/fail2ban-1.0.2
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.3.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-65.3.0[python_targets_python3_11(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DESCRIPTION=Scans log files and bans IPs that show malicious signs
+EAPI=8
+HOMEPAGE=https://www.fail2ban.org/
+INHERIT=bash-completion-r1 distutils-r1 systemd tmpfiles
+IUSE=selinux systemd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python3_8? ( || ( dev-python/python-systemd[python_targets_python3_8(-)] sys-apps/systemd[python(-),python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( || ( dev-python/python-systemd[python_targets_python3_9(-)] sys-apps/systemd[python(-),python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( || ( dev-python/python-systemd[python_targets_python3_10(-)] sys-apps/systemd[python(-),python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( || ( dev-python/python-systemd[python_targets_python3_11(-)] sys-apps/systemd[python(-),python_targets_python3_11(-)] ) ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) virtual/tmpfiles
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/fail2ban/fail2ban/archive/1.0.2.tar.gz -> fail2ban-1.0.2.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a1545c60fef65a383da659303da19318
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 68c06b669939..abab59d2b42d 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/chrony-4.3-r1 b/metadata/md5-cache/net-misc/chrony-4.3-r1
new file mode 100644
index 000000000000..0eb830aaaad2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/chrony-4.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bison html? ( dev-ruby/asciidoctor ) nts? ( virtual/pkgconfig ) sechash? ( nettle? ( virtual/pkgconfig ) nss? ( virtual/pkgconfig ) ) verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare unpack
+DEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) seccomp? ( sys-libs/libseccomp )
+DESCRIPTION=NTP client and server programs
+EAPI=8
+HOMEPAGE=https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git
+INHERIT=edo systemd tmpfiles toolchain-funcs verify-sig
+IUSE=+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
+REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? ( !nettle ) libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) )
+SLOT=0
+SRC_URI=https://download.tuxfamily.org/chrony/chrony-4.3.tar.gz verify-sig? ( https://download.tuxfamily.org/chrony/chrony-4.3-tar-gz-asc.txt -> chrony-4.3.tar.gz.asc )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=a6f4e52512c9d071bcad4ceb16e103c6
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index c5c98daf038c..53f811c531b0 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.6.10 b/metadata/md5-cache/net-vpn/tor-0.4.7.10-r1
index 9daa711dff88..ccbc5757fc73 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.6.10
+++ b/metadata/md5-cache/net-vpn/tor-0.4.7.10-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.torproject.org/
 INHERIT=python-any-r1 readme.gentoo-r1 systemd verify-sig
 IUSE=caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd verify-sig
-KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos
 LICENSE=BSD GPL-2
 RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.4.6.10.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.6.10.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.6.10.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.6.10.tar.gz.sha256sum.asc )
+SRC_URI=https://www.torproject.org/dist/tor-0.4.7.10.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.7.10.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.7.10.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.7.10.tar.gz.sha256sum.asc )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=922ce96f43215a7e454a9da72b42b8ca
+_md5_=2fc809accfd191d4dbada7bacba760b1
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 4e4589d5c7cd..f5db9f0f8cc3 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1 b/metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1
index 41d4b58f1120..24fb7d0cc1bd 100644
--- a/metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1
+++ b/metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/brandon-rhodes/pyephem/archive/v3.7.7.1.tar.gz -> pyephem-3.7.7.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=1ac3f86c6b3cd3c18e53c0a7ff08e83c
+_md5_=b95d4f11b7922d5f89caa6225ec34f60
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index cf9393797994..cfd2499798da 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1 b/metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1
index b56aa1e4ef3c..fc0eade7c617 100644
--- a/metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1
+++ b/metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenChemistry/molequeue/archive/0.9.0.tar.gz -> molequeue-0.9.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e2f5be501f8ecc33d529ef6371edbe5d
+_md5_=c514f6a40aa78786545cbc221f21ade3
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index d52ea41bde15..820a67cd0609 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/pkgcore-0.12.17 b/metadata/md5-cache/sys-apps/pkgcore-0.12.17
new file mode 100644
index 000000000000..c12bbec024ba
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.12.17
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/flit_core-3.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-vcs/git ) test? ( >=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snakeoil-0.10.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=a framework for package management
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/pkgcore
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD MIT
+RDEPEND=>=app-shells/bash-5.0 dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snakeoil-0.10.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.12.17.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=43c5aba1bb7144e081ad6185683d48a0
diff --git a/metadata/md5-cache/sys-apps/shadow-4.13 b/metadata/md5-cache/sys-apps/shadow-4.13
index 2371230b8663..8fb11c50c901 100644
--- a/metadata/md5-cache/sys-apps/shadow-4.13
+++ b/metadata/md5-cache/sys-apps/shadow-4.13
@@ -6,10 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/shadow-maint/shadow
 INHERIT=libtool pam verify-sig
 IUSE=acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD GPL-2
 RDEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= ) !<sys-apps/man-pages-5.11-r1 !=sys-apps/man-pages-5.12-r0 !=sys-apps/man-pages-5.12-r1 nls? ( !<app-i18n/man-pages-it-5.06-r1 !<app-i18n/man-pages-ja-20180315-r1 !<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1 ) pam? ( >=sys-auth/pambase-20150213 ) su? ( !sys-apps/util-linux[su(-)] )
 REQUIRED_USE=?? ( cracklib pam )
 SLOT=0/4
 SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.13/shadow-4.13.tar.xz verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/4.13/shadow-4.13.tar.xz.asc )
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=c2a1d159b408f322c91a3fea819ad4b7
+_md5_=32271ead38e0e9518e017d6d6ee25354
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index ee47e9897a40..fda232b42638 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/elogind-246.10-r1 b/metadata/md5-cache/sys-auth/elogind-246.10-r1
index a4dd2dbba2cb..ead060cac7e7 100644
--- a/metadata/md5-cache/sys-auth/elogind-246.10-r1
+++ b/metadata/md5-cache/sys-auth/elogind-246.10-r1
@@ -13,4 +13,4 @@ RDEPEND=audit? ( sys-process/audit ) sys-apps/util-linux sys-libs/libcap virtual
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v246.10.tar.gz -> elogind-246.10.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=792c0971d9da6de63567f6f5b770f305
+_md5_=e619648b6d93c101b563a7c2150dcfd2
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 89d66711a229..816b13e2d726 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/btop-1.2.12 b/metadata/md5-cache/sys-process/btop-1.2.12
index 2b94db600860..abe05a2d96f3 100644
--- a/metadata/md5-cache/sys-process/btop-1.2.12
+++ b/metadata/md5-cache/sys-process/btop-1.2.12
@@ -4,9 +4,9 @@ DESCRIPTION=A monitor of resources
 EAPI=8
 HOMEPAGE=https://github.com/aristocratos/btop
 INHERIT=toolchain-funcs xdg-utils
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ppc64 ~riscv x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/aristocratos/btop/archive/refs/tags/v1.2.12.tar.gz -> btop-1.2.12.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e99e1abb101856f63fcaa77d32ab9243
+_md5_=efd45fc52af0c4d7e4399a9ae94dcf56
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 73a76b78b404..1485563d3812 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.4.0 b/metadata/md5-cache/www-client/firefox-102.4.0
index 45efdcd97a27..752cc7a7a295 100644
--- a/metadata/md5-cache/www-client/firefox-102.4.0
+++ b/metadata/md5-cache/www-client/firefox-102.4.0
@@ -14,4 +14,4 @@ REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus
 SLOT=esr
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/source/firefox-102.4.0esr.source.tar.xz -> firefox-102.4.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-05j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-05j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-05j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/af.xpi -> firefox-102.4.0esr-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ar.xpi -> firefox-102.4.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ast.xpi -> firefox-102.4.0esr-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/be.xpi -> firefox-102.4.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/bg.xpi -> firefox-102.4.0esr-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/br.xpi -> firefox-102.4.0esr-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ca.xpi -> firefox-102.4.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/cak.xpi -> firefox-102.4.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/cs.xpi -> firefox-102.4.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/cy.xpi -> firefox-102.4.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/da.xpi -> firefox-102.4.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/de.xpi -> firefox-102.4.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-102.4.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/el.xpi -> firefox-102.4.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-102.4.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-102.4.0esr-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-102.4.0esr-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-102.4.0esr-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/et.xpi -> firefox-102.4.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/eu.xpi -> firefox-102.4.0esr-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/fi.xpi -> firefox-102.4.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/fr.xpi -> firefox-102.4.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-102.4.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-102.4.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/gd.xpi -> firefox-102.4.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/gl.xpi -> firefox-102.4.0esr-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/he.xpi -> firefox-102.4.0esr-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/hr.xpi -> firefox-102.4.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-102.4.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/hu.xpi -> firefox-102.4.0esr-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/id.xpi -> firefox-102.4.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/is.xpi -> firefox-102.4.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/it.xpi -> firefox-102.4.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ja.xpi -> firefox-102.4.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ka.xpi -> firefox-102.4.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/kab.xpi -> firefox-102.4.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/kk.xpi -> firefox-102.4.0esr-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ko.xpi -> firefox-102.4.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/lt.xpi -> firefox-102.4.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/lv.xpi -> firefox-102.4.0esr-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ms.xpi -> firefox-102.4.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-102.4.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/nl.xpi -> firefox-102.4.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-102.4.0esr-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-102.4.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/pl.xpi -> firefox-102.4.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-102.4.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-102.4.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/rm.xpi -> firefox-102.4.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ro.xpi -> firefox-102.4.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ru.xpi -> firefox-102.4.0esr-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/sk.xpi -> firefox-102.4.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/sl.xpi -> firefox-102.4.0esr-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/sq.xpi -> firefox-102.4.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/sr.xpi -> firefox-102.4.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-102.4.0esr-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/th.xpi -> firefox-102.4.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/tr.xpi -> firefox-102.4.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/uk.xpi -> firefox-102.4.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/uz.xpi -> firefox-102.4.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/vi.xpi -> firefox-102.4.0esr-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-102.4.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-102.4.0esr-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ach.xpi -> firefox-102.4.0esr-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/an.xpi -> firefox-102.4.0esr-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/az.xpi -> firefox-102.4.0esr-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/bn.xpi -> firefox-102.4.0esr-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/bs.xpi -> firefox-102.4.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-102.4.0esr-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/eo.xpi -> firefox-102.4.0esr-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-102.4.0esr-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-102.4.0esr-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/fa.xpi -> firefox-102.4.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ff.xpi -> firefox-102.4.0esr-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/gn.xpi -> firefox-102.4.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-102.4.0esr-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-102.4.0esr-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-102.4.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ia.xpi -> firefox-102.4.0esr-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/km.xpi -> firefox-102.4.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/kn.xpi -> firefox-102.4.0esr-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/lij.xpi -> firefox-102.4.0esr-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/mk.xpi -> firefox-102.4.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/mr.xpi -> firefox-102.4.0esr-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/my.xpi -> firefox-102.4.0esr-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-102.4.0esr-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/oc.xpi -> firefox-102.4.0esr-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/sco.xpi -> firefox-102.4.0esr-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/si.xpi -> firefox-102.4.0esr-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/son.xpi -> firefox-102.4.0esr-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/szl.xpi -> firefox-102.4.0esr-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ta.xpi -> firefox-102.4.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/te.xpi -> firefox-102.4.0esr-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/tl.xpi -> firefox-102.4.0esr-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/trs.xpi -> firefox-102.4.0esr-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/ur.xpi -> firefox-102.4.0esr-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/102.4.0esr/linux-x86_64/xpi/xh.xpi -> firefox-102.4.0esr-xh.xpi )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1fe6cb0941d6e4f2f1afbf2821a3bad4
+_md5_=c31a96168049ba3aa5bd0a9d85a35de6
diff --git a/metadata/md5-cache/www-client/firefox-106.0.5 b/metadata/md5-cache/www-client/firefox-106.0.5
index 9bd6455b8977..4fa8444d7c10 100644
--- a/metadata/md5-cache/www-client/firefox-106.0.5
+++ b/metadata/md5-cache/www-client/firefox-106.0.5
@@ -14,4 +14,4 @@ REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus ) || ( X wayland )
 SLOT=rapid
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/106.0.5/source/firefox-106.0.5.source.tar.xz -> firefox-106.0.5.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-106-patches-03j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-106-patches-03j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-106-patches-03j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/af.xpi -> firefox-106.0.5-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ar.xpi -> firefox-106.0.5-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ast.xpi -> firefox-106.0.5-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/be.xpi -> firefox-106.0.5-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/bg.xpi -> firefox-106.0.5-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/br.xpi -> firefox-106.0.5-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ca.xpi -> firefox-106.0.5-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/cak.xpi -> firefox-106.0.5-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/cs.xpi -> firefox-106.0.5-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/cy.xpi -> firefox-106.0.5-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/da.xpi -> firefox-106.0.5-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/de.xpi -> firefox-106.0.5-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/dsb.xpi -> firefox-106.0.5-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/el.xpi -> firefox-106.0.5-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/en-CA.xpi -> firefox-106.0.5-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/en-GB.xpi -> firefox-106.0.5-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/es-AR.xpi -> firefox-106.0.5-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/es-ES.xpi -> firefox-106.0.5-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/et.xpi -> firefox-106.0.5-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/eu.xpi -> firefox-106.0.5-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/fi.xpi -> firefox-106.0.5-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/fr.xpi -> firefox-106.0.5-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/fy-NL.xpi -> firefox-106.0.5-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ga-IE.xpi -> firefox-106.0.5-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/gd.xpi -> firefox-106.0.5-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/gl.xpi -> firefox-106.0.5-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/he.xpi -> firefox-106.0.5-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/hr.xpi -> firefox-106.0.5-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/hsb.xpi -> firefox-106.0.5-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/hu.xpi -> firefox-106.0.5-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/id.xpi -> firefox-106.0.5-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/is.xpi -> firefox-106.0.5-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/it.xpi -> firefox-106.0.5-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ja.xpi -> firefox-106.0.5-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ka.xpi -> firefox-106.0.5-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/kab.xpi -> firefox-106.0.5-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/kk.xpi -> firefox-106.0.5-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ko.xpi -> firefox-106.0.5-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/lt.xpi -> firefox-106.0.5-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/lv.xpi -> firefox-106.0.5-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ms.xpi -> firefox-106.0.5-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/nb-NO.xpi -> firefox-106.0.5-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/nl.xpi -> firefox-106.0.5-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/nn-NO.xpi -> firefox-106.0.5-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/pa-IN.xpi -> firefox-106.0.5-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/pl.xpi -> firefox-106.0.5-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/pt-BR.xpi -> firefox-106.0.5-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/pt-PT.xpi -> firefox-106.0.5-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/rm.xpi -> firefox-106.0.5-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ro.xpi -> firefox-106.0.5-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ru.xpi -> firefox-106.0.5-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/sk.xpi -> firefox-106.0.5-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/sl.xpi -> firefox-106.0.5-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/sq.xpi -> firefox-106.0.5-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/sr.xpi -> firefox-106.0.5-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/sv-SE.xpi -> firefox-106.0.5-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/th.xpi -> firefox-106.0.5-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/tr.xpi -> firefox-106.0.5-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/uk.xpi -> firefox-106.0.5-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/uz.xpi -> firefox-106.0.5-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/vi.xpi -> firefox-106.0.5-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/zh-CN.xpi -> firefox-106.0.5-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/zh-TW.xpi -> firefox-106.0.5-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ach.xpi -> firefox-106.0.5-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/an.xpi -> firefox-106.0.5-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/az.xpi -> firefox-106.0.5-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/bn.xpi -> firefox-106.0.5-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/bs.xpi -> firefox-106.0.5-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ca-valencia.xpi -> firefox-106.0.5-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/eo.xpi -> firefox-106.0.5-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/es-CL.xpi -> firefox-106.0.5-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/es-MX.xpi -> firefox-106.0.5-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/fa.xpi -> firefox-106.0.5-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ff.xpi -> firefox-106.0.5-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/gn.xpi -> firefox-106.0.5-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/gu-IN.xpi -> firefox-106.0.5-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/hi-IN.xpi -> firefox-106.0.5-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/hy-AM.xpi -> firefox-106.0.5-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ia.xpi -> firefox-106.0.5-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/km.xpi -> firefox-106.0.5-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/kn.xpi -> firefox-106.0.5-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/lij.xpi -> firefox-106.0.5-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/mk.xpi -> firefox-106.0.5-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/mr.xpi -> firefox-106.0.5-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/my.xpi -> firefox-106.0.5-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ne-NP.xpi -> firefox-106.0.5-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/oc.xpi -> firefox-106.0.5-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/sco.xpi -> firefox-106.0.5-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/si.xpi -> firefox-106.0.5-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/son.xpi -> firefox-106.0.5-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/szl.xpi -> firefox-106.0.5-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ta.xpi -> firefox-106.0.5-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/te.xpi -> firefox-106.0.5-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/tl.xpi -> firefox-106.0.5-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/trs.xpi -> firefox-106.0.5-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/ur.xpi -> firefox-106.0.5-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xpi/xh.xpi -> firefox-106.0.5-xh.xpi )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0d0c693ae7ca7a1c9695e5b1f3c608d9
+_md5_=77ed9981f7f2cf604fdc3c65acd3a110
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 37a5eba300ef..c24fcc2cfce2 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/browserpass-3.0.10 b/metadata/md5-cache/www-plugins/browserpass-3.0.10
index c423d48835f1..2c9d00000c73 100644
--- a/metadata/md5-cache/www-plugins/browserpass-3.0.10
+++ b/metadata/md5-cache/www-plugins/browserpass-3.0.10
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/browserpass/browserpass-native/archive/3.0.10.tar.gz -> browserpass-3.0.10.tar.gz https://dev.gentoo.org/~mattst88/distfiles/browserpass-3.0.10-deps.tar.xz
 _eclasses_=go-module	15312495dc4fd84f8c37bbe228ea2abd
-_md5_=5292c6f90a5f6c0f1f8a49d5d0ee6a5e
+_md5_=d668fb0e0e216fc265a78c722c21b3ce
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 1945d0f6500e..2321237dc2f2 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/luit-20221028 b/metadata/md5-cache/x11-apps/luit-20221028
new file mode 100644
index 000000000000..37612a6ed02c
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/luit-20221028
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/groff verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure unpack
+DEPEND=sys-libs/zlib virtual/libiconv
+DESCRIPTION=Locale and ISO 2022 support for Unicode terminals
+EAPI=8
+HOMEPAGE=https://invisible-island.net/luit/
+INHERIT=verify-sig
+IUSE=verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=sys-libs/zlib virtual/libiconv
+SLOT=0
+SRC_URI=https://invisible-mirror.net/archives/luit/luit-20221028.tgz verify-sig? ( https://invisible-island.net/archives/luit/luit-20221028.tgz.asc )
+_eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=a5d4ddc77908128d965dc1f6702346c3
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 1388cfa07a8b..5c9a639e5cb0 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-11-10T02:40:22Z
+TIMESTAMP 2022-11-10T08:40:11Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNsZJZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNsuOtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC6QRAAh1+NFo9wxvv5ZH9HGsRuoWH8PT+aq9GCO7QEhZ0cWa135xvzJudmQehr
-vKw2baRE7nz2oeAG4t1lcZBnS1ONNwq9nWgJxTwq52Xifi/Ml1K21wYiDj0ZFW8g
-U1GMK4fg+YQZQLio8XGq6bvre2Qs5aYREeZjOg0gazPBAAVOGcvSPJRqQhvlCMWw
-Qut9+idq6y/UdfHImUTcF4nzr+hrExEIS/U8sMC8fwlchIgnFHXCM8YbEd5ymc7z
-uIHWbVTQCN8nnR+BVmB/chCAFDZmQFnrTOT967WlEA5Gv/yMBPHfi4rHFgX/myFH
-vToziicGr2BOmsyW4BMJNc5DSn8o7V4lOUVWslE1GGdbi11hNC2ta/eoX1zZ9a3X
-+VANYfu+c4ymMqKhGFHcBXxXdDEspPS1lPrxNSmYXCh6VjzsbtsdC0p5XdYyZzWl
-w8xSSMoGVPFj5sqMlyN/4I1NpceyezZmNrtn1zH1UlXP3CsJHuxbLS8MCRFw7TDS
-UW1LISP9Be2ZpMcvw8WQ6VNKrGBN+/m4OxpRmBALmzVn5nHs6/VwyOOJYV/CRbcF
-YoumiDQdbq/x/M0nWZKH+WiUh0AgtgzIlMc2YdvRRzZrcIsHIx6AkR6Ho/2f7XxA
-MCpe7VkLIX8s2oJzPPpHyptHAfvYcYNR73vxChGgzFrnGzVRVJc=
-=MwzI
+klDNNw/+IBv1JxOv6QD/LmReQ7PZYNuT4gkK3Y2iB1f0cKT12iqvSkeUUH0cNP/5
+gFnNVipbUHTztADMu5Tlxwcnk/FgoIOiZg5nHwJaOY2mJ8XGFqAKrxtde8an7IPd
+fOXeKohCXFRCe1x1Jw2XUmeIdLUkG1gQJPbBEpb/jC+RPacKAEAe3iSZg8u1G30k
+zOZtVokE2DSoEaB39QR+BinWU0KK4as4ECmY+EPSSVNNSQl4GzjMhNvyKkYeR1gW
+cPdT/ts6bfGgvXXIK9dXxtkkpQO8sf5p7DDhF06PkD4FKXCE62bRApMWoioudH8C
+DAG1WRqFjRqLIg1pd6RC99RGMgR/Hq0vwAA3Y/j+6v8WAoHVq3ayH88BYhyzxJX1
+m2Sw8oUCGOQO/navKj5vTWQI7V9T7/oJq5zfAjsReW1+GNp6a+gAeZKIGc8Ma5qE
+gDF29Bcjk5S2XyIvKjE6DzpUzq0feJW1ptTpSpdIEkDKkhKNtXA2dblx219SsAsR
+LrkrnnrSC/vG4Pvb3IwMOaNE5T6khq6Y7cB5+wgrPkvDMhMSsaqJXtFxgkbRoqty
+gZL2gLAOh5DIussGA0zHSxotpmoHTb0Db3S2l+42LFsIdGSIoLep84vcVjPLw9hs
+rqjskhgsqQX1xXApjBFpHwC/QxJdt6gb0yEZsp1AJ5EdsRfqLBU=
+=QjpF
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 442aaea52c42..1a4962688436 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 10 Nov 2022 02:40:19 +0000
+Thu, 10 Nov 2022 08:40:08 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 5eccab3d4993..565c5cc4b297 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Nov 10 02:40:18 AM UTC 2022
+Thu Nov 10 08:40:08 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1e828c7e2b45..9b856edc26d6 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 10 Nov 2022 02:45:01 +0000
+Thu, 10 Nov 2022 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e902e9b40678..939f7732e678 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3c723aae90b1eea541ea1904c8c0f4b622fae579 1668046084 2022-11-10T02:08:04+00:00
+5bdf7768de4b59c0d93eb49e7d0f65a948820949 1668067958 2022-11-10T08:12:38+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 61450cbab04e..b658f8fd46e8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1668048001 Thu 10 Nov 2022 02:40:01 AM UTC
+1668069601 Thu 10 Nov 2022 08:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8d5cb91b4a8e..1a4962688436 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 10 Nov 2022 02:40:18 +0000
+Thu, 10 Nov 2022 08:40:08 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 41117645424f..1d5e7706c7f7 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 89df75a58997..a76614381c57 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -6,7 +6,9 @@ AUX fail2ban-0.11.2-fix-tests-for-2021.patch 1821 BLAKE2B 52fae8ace32d6205d290d7
 AUX fail2ban-0.11.2-upstream-openrc.patch 8205 BLAKE2B ee85888dbd5ed9b7aa5b8edaba7a0eff430df4677b33c37223d04b46d8b39ff29ded81be8fdd77d0e92e14654e2fb9726064772232af393a053bd3234843218b SHA512 bc4d3ba2c8c1008efe128abe07f6c5125479bf4fb5b96c38b9e5e6401da30faf1a58242b1e01e71638ff922c7e020e16b789f013a0227a8aa6f5bba232dacfd4
 DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
 DIST fail2ban-1.0.1.tar.gz 582122 BLAKE2B 1fe1e5b3d6a1790304c29066b7a8edcb5a6ea11bea6fd8a2bf5f42a4725db1d5bfdd9ed1215a51bfc0eeccafa8a0e93c45940e897ceba7335965126f9b913ab0 SHA512 a4d0ee5405225b1ec950f3209bc304c1168c644d06309a187d77119f6bea12c382db046130a86411aad4210b458a16ee092269dc7953400950969a34550c6da5
+DIST fail2ban-1.0.2.tar.gz 583295 BLAKE2B 84eb5e3487c4db734f4f0a36af142d520e1cc53c2960893ee2f05ff4e78133860be59ed9580fa0d972509a03c17e5d9458b8e3f6b470a4c3154f10911f94691e SHA512 688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb
 EBUILD fail2ban-0.11.2-r4.ebuild 3867 BLAKE2B 5119d5d09bb26701bb6f740759437aa4c1f52f4cff3eec90729291c5ff742ca7cd349b32d9fddddbf441b07f48c489da7e18dba5daf47f668c45c9e96aae4851 SHA512 a3dd3e4d7b8ede3606282366eeede6a5fc2b817cb7a9004476e84ac2d5dc6eb813e25abc74fa803d1f7a0349356121aa2c790b21c984a18d0a5e08edf0ac3e01
 EBUILD fail2ban-1.0.1.ebuild 3668 BLAKE2B 3dd73b46392b5b5acae89aa0da2a3c1dcfad025462a9ec459e64cf5cebccdced2464e1be7a14d360b53a018c8f829ee0f167c3756702b3b224d394fb455a3c56 SHA512 32d928b9c698b7c13e7d2f2d44934e7ff0b1722aba1fa8f7bb9ffa500e1eb6acd36d71d9c8073adea90c8fe8c7797c3272bb99930142634c5bbd5f6dac6b794a
+EBUILD fail2ban-1.0.2.ebuild 3668 BLAKE2B 3dd73b46392b5b5acae89aa0da2a3c1dcfad025462a9ec459e64cf5cebccdced2464e1be7a14d360b53a018c8f829ee0f167c3756702b3b224d394fb455a3c56 SHA512 32d928b9c698b7c13e7d2f2d44934e7ff0b1722aba1fa8f7bb9ffa500e1eb6acd36d71d9c8073adea90c8fe8c7797c3272bb99930142634c5bbd5f6dac6b794a
 EBUILD fail2ban-9999.ebuild 3668 BLAKE2B 3dd73b46392b5b5acae89aa0da2a3c1dcfad025462a9ec459e64cf5cebccdced2464e1be7a14d360b53a018c8f829ee0f167c3756702b3b224d394fb455a3c56 SHA512 32d928b9c698b7c13e7d2f2d44934e7ff0b1722aba1fa8f7bb9ffa500e1eb6acd36d71d9c8073adea90c8fe8c7797c3272bb99930142634c5bbd5f6dac6b794a
 MISC metadata.xml 357 BLAKE2B a5dee8c760b80bbfad6bca9a7adae797eda34b9db80716db8842c6813b4ed25ed4707290756dc869a7db4163de1ff6114c1995fcc2c485df1bcc6cad9c9a8f14 SHA512 9877a507bd3617c33351036317c5dc7855a1024d8f04f76a57edb93bd80e62b2b7c4f35784f447e94497305eab33246ae5913ba36ea001aa9068d1f91aeee9f0
diff --git a/net-analyzer/fail2ban/fail2ban-1.0.2.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2.ebuild
new file mode 100644
index 000000000000..cf108a52442c
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-1.0.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit bash-completion-r1 distutils-r1 systemd tmpfiles
+
+DESCRIPTION="Scans log files and bans IPs that show malicious signs"
+HOMEPAGE="https://www.fail2ban.org/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fail2ban/fail2ban"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux systemd"
+
+RDEPEND="
+	virtual/logger
+	virtual/mta
+	selinux? ( sec-policy/selinux-fail2ban )
+	systemd? (
+		$(python_gen_cond_dep '
+			|| (
+				dev-python/python-systemd[${PYTHON_USEDEP}]
+				sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+			)' 'python*' )
+	)
+"
+
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Replace /var/run with /run, but not in the top source directory
+	find . -mindepth 2 -type f -exec \
+		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
+}
+
+python_compile() {
+	./fail2ban-2to3 || die
+	distutils-r1_python_compile
+}
+
+python_test() {
+	bin/fail2ban-testcases \
+		--no-network \
+		--no-gamin \
+		--verbosity=4 || die "Tests failed with ${EPYTHON}"
+
+	# Workaround for bug #790251
+	rm -r fail2ban.egg-info || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
+
+	newconfd files/fail2ban-openrc.conf ${PN}
+
+	# These two are placed in the ${BUILD_DIR} after being "built"
+	# in install_scripts().
+	newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}"
+	systemd_dounit "${BUILD_DIR}/${PN}.service"
+
+	dotmpfiles files/${PN}-tmpfiles.conf
+
+	doman man/*.{1,5}
+
+	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
+	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+	insinto /etc/logrotate.d
+	newins files/${PN}-logrotate ${PN}
+
+	keepdir /var/lib/${PN}
+
+	newbashcomp files/bash-completion ${PN}-client
+	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}-tmpfiles.conf
+
+	if [[ ${previous_less_than_0_7} = 0 ]] ; then
+		elog
+		elog "Configuration files are now in /etc/fail2ban/"
+		elog "You probably have to manually update your configuration"
+		elog "files before restarting Fail2Ban!"
+		elog
+		elog "Fail2Ban is not installed under /usr/lib anymore. The"
+		elog "new location is under /usr/share."
+		elog
+		elog "You are upgrading from version 0.6.x, please see:"
+		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+	fi
+
+	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin ; then
+		elog "For most jail.conf configurations, it is recommended you install either"
+		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
+		elog "to control how log file modifications are detected"
+	fi
+
+	if ! has_version dev-lang/python[sqlite] ; then
+		elog "If you want to use ${PN}'s persistent database, then reinstall"
+		elog "dev-lang/python with USE=sqlite. If you do not use the"
+		elog "persistent database feature, then you should set"
+		elog "dbfile = :memory: in fail2ban.conf accordingly."
+	fi
+
+	if has_version sys-apps/systemd[-python] ; then
+		elog "If you want to track logins through sys-apps/systemd's"
+		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
+	fi
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e8ddfcad34ff..105cbcb4fd6c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 5fe12a04e78c..db3ef6ac03ff 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -3,6 +3,7 @@ AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1
 AUX chrony-4.2-seccomp-rseq.patch 1111 BLAKE2B 625d93528c11d4fc37a6ec4f7d32c80940ea33976e9b351c519cccfa1de81b3ddef74cad5a85f28c7196ff169cf14f3ff91704c7278444a6abca0e679d9ca0f4 SHA512 bcb9d17345043049c9990a3939d97100a4be6d17ff23851b3a61b929dd9ea4421ad9f5e7e3adb79675dab8a854a9a2a7f9ddbefc8dea294c7d5639c19e6169b1
 AUX chrony-4.2-systemd-gentoo.patch 538 BLAKE2B 70d3bb2a190aa2401ff566dd88d1cace1d3573261819d082863fe310bb16507fcc1497fd31ec24033cb9dbe8356aef416d91b36df6067fd37f4273e59bc4e330 SHA512 62e54e1c16380812b3cf11a84091e134401341a4a64dda806af1a52dfa4158912adc4c2524388956f67a44e095e893ed714a2eee15650080c38ce44d2bc279ec
 AUX chrony-4.2-test-mawk.patch 1219 BLAKE2B 7cc8d36de7879a500006e6a31d6dde77343616358e6d135efc80181f97fed5e81ada2b5d0ee4ac2d125cf828ac94a0894ffe40ec09ffb5328bf9b8cb71addd24 SHA512 69a9e1bd7c632ecf98992840d2b8aa5bd6e9ac3e7a67485ad9b59286414509001e71c47638059ebfcb952d17e7b6e754d74950dd0ebbdb265c8127e06bb94f34
+AUX chrony-4.3-strict-prototypes-clang16.patch 1771 BLAKE2B 8da00e991a6ca8c62caa9d31f5d12b311eac0fc400048e8423c5ef689a04fe305668a0fa375726f0ae15c905ef82f0024e0254fe524f31b9a0bad620b8a1bcdf SHA512 24b3f18db7f92d581940eddfb6e25a0955e17402dbd48a0413be828c2bc4d56441e91eaeaf44595956f258509acb373f4c277926f1c8ec54139bc15dee82dd92
 AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea7106356083cf1a20bdb8fd4b85bd8cce8cf20ce6839e8788fedc1f94e912ec512193988f83283ceef86d6cfc7 SHA512 ab0bbd07c17e391d068c5a37d5f8d9c8fc2c42add2700869217a95784666bd3f23bebd70942cf11b42c124e0947f68c101153998e89bc61ccb71b30a0187cf0c
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 DIST chrony-4.2.tar.gz 578411 BLAKE2B 6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45 SHA512 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d
@@ -10,6 +11,7 @@ DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f
 DIST chrony-4.3.tar.gz 593560 BLAKE2B 51ba6d19312fd52cd6d6d8ab9437c886a3779877170674db6dc37d657e849101e2669fd6c8723d24e43c895cd1924c3d8d2ff442baeef9abe8a6c313929edf5f SHA512 1394bac3ed684352fe89b7fef7da50e61f9f522abee807627ae1fc4c2dde891017bc8e5b13759fced028f3a1e875d5e4e5a4f85de65c63b5f83d0ca03bb4c5df
 DIST chrony-4.3.tar.gz.asc 833 BLAKE2B 12399205da4ee5c442207bfdf936ac88552a49b21b0db8c15b09118b579e2076f7cfec6ad916b08b41edc4f9f8e03b13d7758ed08e116bee54d0f0f9cd68a505 SHA512 300b06f253ac3727edb86a1b7c337f9529ee752bbb471b266217b6a8ac5183e827264177a3210d436425d746673bf11fbdc41da145673213e28165197c6c76b7
 EBUILD chrony-4.2-r1.ebuild 6719 BLAKE2B 9dbf927768234a5e9f4a38463815395ae78b982c784cf25be1d6e78c0b268a6b9ed327d9de71505a4c1c4f158be50c15e6ecdff691369fb25f6ff664d73dce55 SHA512 12c3470d09c3b98f81649b8d16c58b53f9a2721540ae4fb376f4aea9a1f144540e0e415f94d08aceee9d69afddf1571855798c7ee175a278096f63fc32dcb0ab
+EBUILD chrony-4.3-r1.ebuild 6762 BLAKE2B cc0d5d8cd199f7400fcf0818e30bc5d48bce048e8abdbb538574c957a4b4ee8ea79c670f1bca4a0313cac51953d7640f7e43783db85a865866b522d64b2be8c4 SHA512 683a123f0d4eac1cb9df71a278f4b44ddcdd29137f9365dccdf98d3de45b56e997e378ef3b2d130087ceb5a485695573556469d4bc2914edcca4f01303b69c8c
 EBUILD chrony-4.3.ebuild 6624 BLAKE2B 56cb3e48e17081147d037779ec867a5162b4cb88341ecc57cea6f49813320743ff5bb87d472b5e69982c9c433226d948945e9a28b6361e01b6cb067a606f3e7f SHA512 a0c094c7f290040ea0e5befd28418552af8c55dd40b072a776f629354c8b20df50baa35a50bf4fda6797298e2a4a3de95be729b5f96e473dcafbe16c5c3f1802
 EBUILD chrony-9999.ebuild 6624 BLAKE2B 56cb3e48e17081147d037779ec867a5162b4cb88341ecc57cea6f49813320743ff5bb87d472b5e69982c9c433226d948945e9a28b6361e01b6cb067a606f3e7f SHA512 a0c094c7f290040ea0e5befd28418552af8c55dd40b072a776f629354c8b20df50baa35a50bf4fda6797298e2a4a3de95be729b5f96e473dcafbe16c5c3f1802
 MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0
diff --git a/net-misc/chrony/chrony-4.3-r1.ebuild b/net-misc/chrony/chrony-4.3-r1.ebuild
new file mode 100644
index 000000000000..021c2b2f5fb2
--- /dev/null
+++ b/net-misc/chrony/chrony-4.3-r1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc
+	inherit verify-sig
+
+	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
+
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	fi
+fi
+
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux"
+# nettle > nss > libtomcrypt in configure
+REQUIRED_USE="
+	sechash? ( || ( nettle nss libtomcrypt ) )
+	nettle? ( !nss )
+	nss? ( !nettle )
+	libtomcrypt? ( !nettle !nss )
+	!sechash? ( !nss )
+	!sechash? ( !nts? ( !nettle ) )
+"
+
+DEPEND="
+	caps? (
+		acct-group/ntp
+		acct-user/ntp
+		sys-libs/libcap
+	)
+	libedit? ( dev-libs/libedit )
+	!libedit? ( sys-libs/readline:= )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss:= )
+	nts? ( net-libs/gnutls:= )
+	pps? ( net-misc/pps-tools )
+	seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+# bison dep only for 4.3-r1 for ${P}-strict-prototypes-clang16.patch
+BDEPEND="
+	sys-devel/bison
+	html? ( dev-ruby/asciidoctor )
+	nts? ( virtual/pkgconfig )
+	sechash? (
+		nettle? ( virtual/pkgconfig )
+		nss? ( virtual/pkgconfig )
+	)
+"
+
+if [[ ${PV} == 9999 ]] ; then
+	# Needed for doc generation in 9999
+	REQUIRED_USE+=" html"
+	BDEPEND+=" virtual/w3m"
+else
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
+	"${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
+	"${FILESDIR}"/${P}-strict-prototypes-clang16.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
+		doc/* examples/* || die
+
+	cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
+}
+
+src_configure() {
+	if ! use caps ; then
+		sed -i \
+			-e 's/ -u ntp//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	if ! use seccomp ; then
+		sed -i \
+			-e 's/ -F 2//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	tc-export CC PKG_CONFIG
+
+	# Update from time to time with output from "date +%s"
+	# on a system that is time-synced.
+	export SOURCE_DATE_EPOCH=1607976314
+
+	# Not an autotools generated script
+	local myconf=(
+		$(use_enable seccomp scfilter)
+
+		$(usex caps '' '--disable-linuxcaps')
+		$(usex cmdmon '' '--disable-cmdmon')
+		$(usex debug '--enable-debug' '')
+		$(usex ipv6 '' '--disable-ipv6')
+		$(usex libedit '' '--without-editline')
+		$(usex libtomcrypt '' '--without-tomcrypt')
+		$(usex nettle '' '--without-nettle')
+		$(usex nss '' '--without-nss')
+		$(usex ntp '' '--disable-ntp')
+		$(usex nts '' '--disable-nts')
+		$(usex nts '' '--without-gnutls')
+		$(usex phc '' '--disable-phc')
+		$(usex pps '' '--disable-pps')
+		$(usex refclock '' '--disable-refclock')
+		$(usex rtc '' '--disable-rtc')
+		$(usex samba '--enable-ntp-signd' '')
+		$(usex sechash '' '--disable-sechash')
+
+		--chronysockdir="${EPREFIX}/run/chrony"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--mandir="${EPREFIX}/usr/share/man"
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc/chrony"
+		--with-hwclockfile="${EPREFIX}/etc/adjtime"
+		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
+
+		${EXTRA_ECONF}
+	)
+
+	# Print the ./configure call
+	edo ./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+	if [[ ${PV} == 9999 ]] ; then
+		# Uses w3m
+		emake -C doc man txt
+	fi
+
+	emake all docs $(usex html '' 'ADOC=true')
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
+	newconfd "${T}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	docinto examples
+	dodoc examples/*.example*
+
+	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
+
+	if use html ; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	keepdir /var/{lib,log}/chrony
+
+	if use caps ; then
+		# Prepare a directory for the chrony.drift file (a la ntpsec)
+		# Ensures the environment is sane on new installs
+		# bug #711058
+		fowners -R ntp:ntp /var/{lib,log}/chrony
+		fperms -R 770 /var/lib/chrony
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+	systemd_dounit examples/chronyd.service
+	systemd_dounit examples/chrony-wait.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
+
+pkg_preinst() {
+	HAD_CAPS=0
+	HAD_SECCOMP=0
+	HAD_PRE_NEW_SECCOMP_LEVEL=0
+
+	# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
+	# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
+	if has_version 'net-misc/chrony[caps]' ; then
+		HAD_CAPS=1
+	fi
+
+	if has_version 'net-misc/chrony[seccomp]' ; then
+		HAD_SECCOMP=1
+	fi
+
+	if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
+		# This version introduced a new filter level: -F 2
+		# It's a limited set of seccomp filters designed to be 'bare minimum'
+		HAD_PRE_NEW_SECCOMP_LEVEL=1
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process chronyd.conf
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
+			# bug #719876
+			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
+			ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
+			ewarn "This is necessary for chrony to drop privileges"
+		elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
+			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
+		fi
+	fi
+
+	# See bug #783915 for general discussion on enabling seccomp filtering
+	# by default.
+	local show_seccomp_enable_msg=0
+
+	# Was seccomp disabled before and now enabled?
+	if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
+		show_seccomp_enable_msg=1
+	fi
+
+	# Are we coming from an old version without the new 'minimal' filter?
+	# (-F 2)
+	if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
+		show_seccomp_enable_msg=1
+	fi
+
+	if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
+		elog "To enable seccomp in a stricter mode, please modify:"
+		elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC"
+		elog "- systemctl edit chronyd for systemd"
+		elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
+		elog "By default, we now use -F 2 which is a baseline/minimal filter."
+	fi
+}
diff --git a/net-misc/chrony/files/chrony-4.3-strict-prototypes-clang16.patch b/net-misc/chrony/files/chrony-4.3-strict-prototypes-clang16.patch
new file mode 100644
index 000000000000..fb89a1eb3fef
--- /dev/null
+++ b/net-misc/chrony/files/chrony-4.3-strict-prototypes-clang16.patch
@@ -0,0 +1,71 @@
+https://git.tuxfamily.org/chrony/chrony.git/commit/?id=7b97668319f9449b4adb1a978bb1fe9b0fb22e4d
+https://bugs.gentoo.org/880519
+
+From 7b97668319f9449b4adb1a978bb1fe9b0fb22e4d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
+Date: Wed, 9 Nov 2022 09:17:14 +0100
+Subject: getdate: fix various warnings which will be errors with clang-16
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+These were found by Gentoo's QA while rebuilding the world with
+clang-16: https://bugs.gentoo.org/880519
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+
+--- a/getdate.y
++++ b/getdate.y
+@@ -448,9 +448,9 @@ o_merid	: /* NULL */
+    the same signature as the function definition does. */
+ #include "getdate.h"
+ 
+-extern struct tm	*gmtime ();
+-extern struct tm	*localtime ();
+-extern time_t		mktime ();
++extern struct tm	*gmtime (const time_t *timep);
++extern struct tm	*localtime (const time_t *timep);
++extern time_t		mktime (struct tm *tm);
+ 
+ /* Month and day table. */
+ static TABLE const MonthDayTable[] = {
+@@ -641,16 +641,13 @@ static TABLE const MilitaryTable[] = {
+ 
+ /* ARGSUSED */
+ static int
+-yyerror (s)
+-     char *s ATTRIBUTE_UNUSED;
++yyerror (char *s ATTRIBUTE_UNUSED)
+ {
+   return 0;
+ }
+ 
+ static int
+-ToHour (Hours, Meridian)
+-     int Hours;
+-     MERIDIAN Meridian;
++ToHour (int Hours, MERIDIAN Meridian)
+ {
+   switch (Meridian)
+     {
+@@ -677,8 +674,7 @@ ToHour (Hours, Meridian)
+ }
+ 
+ static int
+-ToYear (Year)
+-     int Year;
++ToYear (int Year)
+ {
+   if (Year < 0)
+     Year = -Year;
+@@ -694,8 +690,7 @@ ToYear (Year)
+ }
+ 
+ static int
+-LookupWord (buff)
+-     char *buff;
++LookupWord (char *buff)
+ {
+   register char *p;
+   register char *q;
+cgit v0.10.2
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 08ec70a80393..4ed3859b0b24 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index b468690c3984..b1618b47c67c 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -1,19 +1,17 @@
 AUX README.gentoo 316 BLAKE2B 9c962395e49a2eff8411e7fb3996d99e504b0023712151acdd6bee43755be89d52c970cbf7e5aae62c0adfb33ff7ad072578b88a40857bffb359a3d2c8571947 SHA512 6ca305c710562c0f9a3f0cba07760adf300ea166c8baa47e8872719190d779fb63d4dd6c9193fb60ddb51015138790aaa93935668423e0f861f05496d22ce660
 AUX tor-0.2.7.4-torrc.sample.patch 1341 BLAKE2B c6b398d6fd417e9029196046529109ed52c7c5dd6bd38505261116e15d1516a6e200583b480fe50b6e971d2ab4336673f9e75effa9dc8d3858c6248fbe31a69b SHA512 4a6b855734717416b6615fbd76bb75a54731767a74d3ade8c58fe52f4a42ee51c93ff8d591943343f319018e18d65b768bbe8fe936200ad829ab1e262c5e9b0f
+AUX tor-0.4.7.10-strict-prototypes-clang16.patch 3287 BLAKE2B 763ab2742939dcc8aba5619d9c7d0d3bc7274075baf80a97a991fe6119527d4e5317c9c051006b16276500d034b5372a9cde96cd20d19d20b15f3ae28fc22068 SHA512 57aa9c0a94dfc366ed06589d4374f529484f305556f8154aabca9e900ffdf6acd10aa822f4a3ff640a86621ebcd45d7f8269dcbffad5952238ee9b35df538784
 AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c196d49df4492471cb8b21dde43d668b31171ee2dfae81562a70367c72801ae60046908b022e SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660
 AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c50b0521b99cb80e9b793a78de3de0e0e89d56553c32f3a6566015dd2c4fd77c812577f6f637d7a SHA512 fa3a6f52dc733d27f954299cfb32fc813ef731e1d124096450f7b53f0e4fce9f41cf48b66651d1f5383c18bdca8a87d6bbe03c65dc8a5f9a58660bb8db0040a1
 AUX tor.service 1050 BLAKE2B 7f6553b9f4b928f0c924d73ee6f9df8a99ee75ec1801f6b865a7d8e40ff30290bf836907b561586d0f429b7ddf05286ab51974d207906a0fe52cb2fbcc8e160f SHA512 786481b20d7cab9696656c5136ff74c9c2aaa73ca3d63b163a294b9b3c4b628da387cb5ec3ada81277ca81cff16ead5162f3b4d64cb0d773c22f2e4607c3194b
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
-DIST tor-0.4.6.10.tar.gz 7811644 BLAKE2B 4bdf8ab8ac992866ffc18711de0ad9e19b496398dfdace4d3902273822666dcfda3acd825ee22251cd8d671ff563702c6f24fe8670719a2c75d144cfe9219f68 SHA512 7d3ca14f260f8d18c020f629fee93a9e941962f99d7b6106d81b1f302152e4be14f5f719c06a34257c2bedf1612c53da21c26750b2608034bd6c6cf0c82192a9
-DIST tor-0.4.6.10.tar.gz.sha256sum 85 BLAKE2B 1c51a80a0bdc34c31725ba6d632ae16ddec1c4aadd4c5ce8ff5ccd4dc9b051f76ddebbe1f1dc2c6f86194bf6badc95222ae14be100bbc24b75bc53f525cb8378 SHA512 97b49664f9f998b00fdd80f956bd5ab9588cd75d09041a0b946fdabd9f10c471eb49aa4bbb4d19bde45a554c1f2ef60d76ff58aa1dc74d4e7d930df77ac68262
-DIST tor-0.4.6.10.tar.gz.sha256sum.asc 488 BLAKE2B 4f17ba1b555eeaa0aadad9348420979c1c83d3ce3cc4fa7e1cc6f453e75ae0bb43db19b883efcc329de5b52b91cda0f740ed949674f64e8cbfc0eb343ca2819b SHA512 3d814c0b3533cf2b2ff421dc92f254596f2af7206bbefdc15a71a906c667dd3606b2c37ada3d36df6011fd0b4d5fe78860f8845fae9e19bd9e3ba5745f45130b
 DIST tor-0.4.7.10.tar.gz 7933376 BLAKE2B 46a9d932e7451bcc683e18d296d7a26bb4b544767cf4622910ebf90d82715718451ec3e0d6cd215eff5fe2cc3ae8441b8e6065c5877d7fc92c2f26ab5c7fa0cb SHA512 e82877807d9e73fe12ab424830641e52b9b45034ca06f07e37648f50a3c1c10cd1b07081d8646b8e92c58658bdff5f6e9670e5104e9d05a531b1d85d0851a606
 DIST tor-0.4.7.10.tar.gz.sha256sum 86 BLAKE2B 4b372b3508ffee497ecc9adab4a4d3d2b548100bb7dd54e1036c71004503d96148899096bbae807f2d626a5e26d0a947f7546df0a708a78b59b4d39bed3e849c SHA512 518b6e617702386df7a84155d528f1a904a45221c946402da3fc3d40170dcdac117bff38c92a2e58ef4dd8d422433950f3904d27da66a99d808204432732cc9b
 DIST tor-0.4.7.10.tar.gz.sha256sum.asc 1321 BLAKE2B fc7fd43115992e5d434cc1bf2808eeb971ead532935be7493b4eef7804a65cad3cf4f9fd18158a0c8f3e19bb9e55c5fe7487ded9adb6782cbc1583e1159aaf7c SHA512 789923b465e72a1a77b1b1951cd0f66c266c10119a480ce8b622f1f4aa07381b7403c27aca3badf51381da0b41498c9b0d42b2c5cedd6c54a617df9dc138689e
 DIST tor-0.4.7.8.tar.gz 7910081 BLAKE2B 40f6eab453d95a09e4531ce7cdb59715a21b84e1d0b1045d107add6a443fb7563a5747734b23e0e1dfda6490a5a7659f912e38c11cdb5fa635535dcff6169eeb SHA512 2daeb4ef9144772b4e0793ccd00990b7eda58c533f9616670940931d6d12770e9a7d48b33b5626d330f62bb71fbc6e1f559881f062d16bc15fbb162e29fa91f4
 DIST tor-0.4.7.8.tar.gz.sha256sum 85 BLAKE2B 0fa1e094af83c74f46f87d0569a623bd3061b416f272d19326faf08ab6e9e926b14c2d46c99fba80d68f22188aa74c73e68477015e1c37382e4acb115d10a5a2 SHA512 8d8ef020e8028a0d481cbf6e50809212ebfb493b11c3937f1f732be48ca139a991e68b799342a17374f6faf77f0a7113d15c5220a5bf94d110d11582a078a013
 DIST tor-0.4.7.8.tar.gz.sha256sum.asc 1321 BLAKE2B b70d64db73c45f50bac4ef07f12d755eaf02b676d929bd6f3a9b5b593326e1cce4a3bc8466f2ccce003ab044084fa812ce6ea4cbf32f5a4c0321199dcd291bee SHA512 5c58745abb4db4a9d53c4c4df209cab96689494704d661439efa705f143267aac648ed23240aedc802e9689223f79d2d1c7eba865d2d5b3296590f8b93e03c37
-EBUILD tor-0.4.6.10.ebuild 3085 BLAKE2B 1b09e39479439bbd276f0a3f810f2509a7cdec2f5e1b31176586e213d2cb7398c97452e12b4960c3c75e37c3eed64691824d08f9ac0a6d66a701b5d3f7e3cea8 SHA512 8dbd47200f35f15479cf611f2f68346c534f30403b3d56d289717672097b150b627cfd91e64ae46a881e94f5c39714f830cc788931a13ca485f0872cc870ebde
+EBUILD tor-0.4.7.10-r1.ebuild 3240 BLAKE2B f602689f1bf6d1b75c25aea18ace207fbae845ada59abfd07144bedd1557396d50f567b3493a896bdc06ce84350afce9483cbf1f6c52edeb7c765069402ce601 SHA512 fe80d75a3f1196473e5477a031a65ffe82c37d4c7308342d9074627e4221f6abbed12504cc74a76860e67baaec41b5737e5302b4ddf6edb03666aafcf8de4b05
 EBUILD tor-0.4.7.10.ebuild 3188 BLAKE2B 38219b96311d1b087f15543634fec44839223a1f5e74ea3baeddbcf3907819bb6fa5b8dc07364802d51e453d50d3c352de461a8014cfab2c9f40b5526e5d6853 SHA512 f3e2012daae2cf4afe29bd01d5bd5c3d64dfbc221f3c519070d04758e65e11be8fa28a4c88833f72d0af6a852c5927a3523e187fc1c421ec14622bdf701e11bf
 EBUILD tor-0.4.7.8.ebuild 3182 BLAKE2B 33b1531bbaf9ed8f176b1801fa9a7c7a17d7feeac0bd2007b9cab0f3bf36f838e242c13ae566776c8844da7b9557626cebdddba7aaf54284a08005a85a4c2fdf SHA512 35133f9dfc685723739a53f2714032b0a428a338473945769386c57e96388b11dad64f6c68bd6e152d47efb77fed308b55cbc1345dcd41b77860d03ef762d5f2
 MISC metadata.xml 550 BLAKE2B 483cfc846fb5d2996ca0b1b947df203a3470c8ea4a9ed655ce7c40b6ee3bde22d9fc41945c1fda79bfd2f5d91c6c7886e8b3fa1b6f385c802722ddba927980be SHA512 85ff349fc58d1e122c8ae0476a6143585190928c1abf0d4b228ad7f2e991e813d19a8b75a89421acfb96fc8c1d73e34be0c1a0ff70c9c68594518047a0de3df9
diff --git a/net-vpn/tor/files/tor-0.4.7.10-strict-prototypes-clang16.patch b/net-vpn/tor/files/tor-0.4.7.10-strict-prototypes-clang16.patch
new file mode 100644
index 000000000000..9317b6b215b7
--- /dev/null
+++ b/net-vpn/tor/files/tor-0.4.7.10-strict-prototypes-clang16.patch
@@ -0,0 +1,75 @@
+https://gitlab.torproject.org/tpo/core/tor/-/commit/ee38514cc4372bfb7d01ee96a1110d600a30e061
+
+From ee38514cc4372bfb7d01ee96a1110d600a30e061 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 8 Nov 2022 06:42:59 +0000
+Subject: [PATCH] build: fix -Wstrict-prototypes (Clang 16)
+
+Clang 16 warns on -Wstrict-prototypes in preparation for C23 which can
+among other things, lead to some configure tests silently failing/returning the wrong result.
+
+Fixes this error:
+```
+-ignoreme: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
++ignoreme: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
+ main ()
+```
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], gentoo-dev@ [2],
+or the (new) c-std-porting mailing list [3].
+
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
+[3] hosted at lists.linux.dev.
+
+Bug: https://bugs.gentoo.org/879747
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -1982,7 +1982,7 @@ AC_CACHE_CHECK([whether memset(0) sets pointers to NULL], tor_cv_null_is_zero,
+ #ifdef HAVE_STDDEF_H
+ #include <stddef.h>
+ #endif
+-int main () { char *p1,*p2; p1=NULL; memset(&p2,0,sizeof(p2));
++int main (void) { char *p1,*p2; p1=NULL; memset(&p2,0,sizeof(p2));
+ return memcmp(&p1,&p2,sizeof(char*))?1:0; }]])],
+        [tor_cv_null_is_zero=yes],
+        [tor_cv_null_is_zero=no],
+@@ -2006,7 +2006,7 @@ AC_CACHE_CHECK([whether memset(0) sets doubles to 0.0], tor_cv_dbl0_is_zero,
+ #ifdef HAVE_STDDEF_H
+ #include <stddef.h>
+ #endif
+-int main () { double d1,d2; d1=0; memset(&d2,0,sizeof(d2));
++int main (void) { double d1,d2; d1=0; memset(&d2,0,sizeof(d2));
+ return memcmp(&d1,&d2,sizeof(d1))?1:0; }]])],
+        [tor_cv_dbl0_is_zero=yes],
+        [tor_cv_dbl0_is_zero=no],
+@@ -2031,7 +2031,7 @@ AC_CACHE_CHECK([whether we can malloc(0) safely.], tor_cv_malloc_zero_works,
+ #ifdef HAVE_STDDEF_H
+ #include <stddef.h>
+ #endif
+-int main () { return malloc(0)?0:1; }]])],
++int main (void) { return malloc(0)?0:1; }]])],
+        [tor_cv_malloc_zero_works=yes],
+        [tor_cv_malloc_zero_works=no],
+        [tor_cv_malloc_zero_works=cross])])
+@@ -2049,7 +2049,7 @@ fi
+ # whether we seem to be in a 2s-complement world.
+ AC_CACHE_CHECK([whether we are using 2s-complement arithmetic], tor_cv_twos_complement,
+ [AC_RUN_IFELSE([AC_LANG_SOURCE(
+-[[int main () { int problem = ((-99) != (~99)+1);
++[[int main (void) { int problem = ((-99) != (~99)+1);
+ return problem ? 1 : 0; }]])],
+        [tor_cv_twos_complement=yes],
+        [tor_cv_twos_complement=no],
+@@ -2069,7 +2069,7 @@ fi
+ # What does shifting a negative value do?
+ AC_CACHE_CHECK([whether right-shift on negative values does sign-extension], tor_cv_sign_extend,
+ [AC_RUN_IFELSE([AC_LANG_SOURCE(
+-[[int main () { int okay = (-60 >> 8) == -1; return okay ? 0 : 1; }]])],
++[[int main (void) { int okay = (-60 >> 8) == -1; return okay ? 0 : 1; }]])],
+        [tor_cv_sign_extend=yes],
+        [tor_cv_sign_extend=no],
+        [tor_cv_sign_extend=cross])])
+GitLab
diff --git a/net-vpn/tor/tor-0.4.6.10.ebuild b/net-vpn/tor/tor-0.4.7.10-r1.ebuild
index e5d94f3b2d67..42aab32d686a 100644
--- a/net-vpn/tor/tor-0.4.6.10.ebuild
+++ b/net-vpn/tor/tor-0.4.7.10-r1.ebuild
@@ -21,9 +21,11 @@ S="${WORKDIR}/${MY_PF}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
 fi
 IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
+RESTRICT="!test? ( test )"
+
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
 
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20220216 )"
@@ -51,13 +53,16 @@ DEPEND+="
 		${PYTHON_DEPS}
 	)"
 
+DOCS=()
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+	"${FILESDIR}"/${P}-strict-prototypes-clang16.patch
 )
 
-DOCS=()
-
-RESTRICT="!test? ( test )"
+# EAPI 8 tries to append it but it doesn't exist here
+# bug #831311 etc
+QA_CONFIGURE_OPTIONS="--disable-static"
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
@@ -76,7 +81,7 @@ src_unpack() {
 }
 
 src_configure() {
-	use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
+	use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING )
 	export ac_cv_lib_cap_cap_init=$(usex caps)
 	econf \
 		--localstatedir="${EPREFIX}/var" \
@@ -88,7 +93,6 @@ src_configure() {
 		--enable-missing-doc-warnings \
 		--disable-module-dirauth \
 		--enable-pic \
-		--disable-rust \
 		--disable-restart-debugging \
 		--disable-zstd-advanced-apis  \
 		$(use_enable man asciidoc) \
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 39318eba1b80..2fb04629249a 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 87edfe06a199..e0b60143d108 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -8,4 +8,4 @@ DIST kismet-2022-08-R1.tar.xz 10700692 BLAKE2B 9f6b3a651eca34b90e34b8a8357be493a
 EBUILD kismet-2021.08.1-r1.ebuild 5957 BLAKE2B e0aa26ddd1cee3bef68e3f4943e35f5f04762590f68aa5bb2798fa342d5be4ad1df13e75d74950bbd1911e76916605d059c99d081f60314dd85c80745845b208 SHA512 63bfbb54b03f9ce71a146cd9a171803e474e6b0e13bf73e3f7be4f905985ec9426aa7bc2cd1d4a1c110be00f9fa3253daae42922660041e0daf079ebf915be0b
 EBUILD kismet-2022.08.1-r1.ebuild 6138 BLAKE2B 52502f33ed01fae65667375d5426f61fb3a0c382326e958138638b5ccf4f959880d5c6a6d92f51f8a4e450ca0f3c6bd64d0d6b27d7d489c5aa8d6fde0758e277 SHA512 22802e341f881ed3679f2ce7c358ccec88a0ee9d02a14ab0514189fc97bc5b9c24b34a562ea336998a668ff4c4747bb5afe345a3f0dcd567e6f2adb6f9f4f243
 EBUILD kismet-9999.ebuild 6179 BLAKE2B 11171238d360ea28246f538398ef04783dd5b9d152f1cf9f8979f7cc12a54e6939806fc317365df0bc58e6a510b16d326f3672c9c214004cf6b8a4904c2d1a04 SHA512 398145f1d6818459d3911fb7b45fdbbc387136d52472cbb47df641d3f2e7719ca03d49cd9e46fd244f7f506aeba39adf22515808340f78164362cf3d0b4d1ee4
-MISC metadata.xml 787 BLAKE2B c7000a14fe4a29247dbb68f535ad8e5b9daffc6cda71176db88f5d55811601a1b3113ad5029fc2cb46f777a16e7c5859de0798fb1a83a03beead91ebf66160a1 SHA512 449e7457a35f11b3c09c917134df48af7896ac9d34892f80102cbd2b2510f78d95331582cbde0be7d24ffe004c58a95fdebc6590ce90522a9f15212d5e70c58b
+MISC metadata.xml 873 BLAKE2B f4dea6914ce2380db76b7f66d3028dbc22a5785e41814b71f3876716148e71e82f9a62035d27abeba1567222b16da560e7e74a6ca2379433bf68b5a842fa618d SHA512 a82c3f86ab863646e6d7c8a91b033c851413487652621e576c7baf9b956ff39b8b4c4d8616478eb62752766aa8b10039d1c881cf29c99ea44eb98174c3cf4f67
diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml
index 06fff9ef465d..2728866d3aa6 100644
--- a/net-wireless/kismet/metadata.xml
+++ b/net-wireless/kismet/metadata.xml
@@ -16,4 +16,7 @@
 		<flag name="rtlsdr">Enable rtlsdr based kismet capture sources</flag>
 		<flag name="ubertooth">Enable capture source for ubertooth to sniff bluetooth low energy</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">kismetwireless/kismet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 09c243ea9269..f7e0f4af57b2 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask
index 6588d1e9f48a..4b731ea7a64f 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gentoo.org> (2022-11-10)
+# Doesn't work on ppc64, #871921
+sci-mathematics/gmp-ecm custom-tune
+
 # Michał Górny <mgorny@gentoo.org> (2021-12-31)
 # Don't apply stable masks to python-exec since we're forcing every
 # impl there anyway. Please keep this in sync with use.stable.mask.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0712ddc0d4d0..4866882c1224 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3076,7 +3076,7 @@ games-engines/devilutionx:sodium - Enable network packet encryption using dev-li
 games-engines/devilutionx:zerotier - Enable ZeroTier for online public games
 games-engines/exult:fluidsynth - Compile with support for FluidSynth
 games-engines/exult:sdl2 - Use libsdl2 instead of libsdl
-games-engines/exult:tools - Enable tools
+games-engines/exult:tools - Enable tools, usercode compiler and mods support
 games-engines/frobtads:tads2compiler - Build TADS2 compiler
 games-engines/frobtads:tads3compiler - Build TADS3 compiler
 games-engines/love:gme - Use media-libs/game-music-emu to support additional music formats
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 367815180770..1ff673381cc6 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/pyephem/Manifest b/sci-astronomy/pyephem/Manifest
index f2e01ee33621..1901cea13148 100644
--- a/sci-astronomy/pyephem/Manifest
+++ b/sci-astronomy/pyephem/Manifest
@@ -2,7 +2,7 @@ AUX pyephem-4.1.3-clang-15.patch 1126 BLAKE2B 2a976402626fa74e1c9304230b996980f6
 DIST pyephem-3.7.7.1.tar.gz 1622306 BLAKE2B aefdd7b7e4471140f1c2b5c065f663dfb1095d8d8325e23d4b5b9c683ff7a91020151429a992ad78be897ab738d9bc207afa337b7806fb244d6d6c8a1c680b7f SHA512 ae0d9562f33ee25065b33ea3d4b24a74e32259bebb07edf37deacaa77e6d24b3a7a49e4602393b45a3c7cfc7d8088f038e68e96ec3576a796b5486fc2946ac5a
 DIST pyephem-4.1.1.gh.tar.gz 2659977 BLAKE2B e373857d3fb66e742f9db992165dbd1d50afbb6b91588f2cfcd299409d491ef1174c54a182dd59b5a8e298a07312899c8f8b5a8aaa63e6b31deb5f8b1cd3131e SHA512 2539f36b7110cacd6cf95e9ba0be26ca837a66ba81f092d4be01405029adf22478184861f46ecf09d6cd35927140874e0f0d228b06537d05f3e2eddbcb35da85
 DIST pyephem-4.1.3.gh.tar.gz 2660800 BLAKE2B 272a96dfe5debe083274f911737246ea90dc15b12b141e41c018d0b4eff13e548fe1d99cfb75ea7d06d7784cd9cbce7f43149a08de051cd9e12a4b5d6a306607 SHA512 1d113e1adbe5c8175364a29ae405d80005e54a4f60d475534d6721dc51b4f58d314ad161ddaf791614fcd4b0550e4b2142f4e52ec4771ca0d1be6b10f3f8cc4d
-EBUILD pyephem-3.7.7.1.ebuild 1067 BLAKE2B 45c390e9a9e361bc8c817b83c07b240c1706a182e47f3455f75cf0e6559207c6d177cd170f902c08c287df40308df7fe73ca666b5c802a192549673b46f164c2 SHA512 d4555ab691276a8e5557f34ad36f0fdc541b4029e89a1be166730dc7987fe1cf3644fea30d182d19067b2d19bff56032457d16981921307bd4583d4f2443f324
+EBUILD pyephem-3.7.7.1.ebuild 1069 BLAKE2B ff9eaa894256801e2c560a8dd696f47d6b500a9df9908eb767aef51fb7af3e813a1576faa65982c165175a46ffba389f02e72b77fb85ea1f782454d8097483a1 SHA512 f2b7852ab583f47362e5c1f975b755c684c6cb180a74366f0e0a29590da9192a7f41558214ffaa6f1b14c1d8e6533f283666c481e255548beb3077d1480a8f61
 EBUILD pyephem-4.1.1.ebuild 1215 BLAKE2B 969f13d53df7534d38ccc6d4f665c8fcfc42ef438886618f93bce50f9dfefc3631d32c2c8c2eea121a7efe02d60627438f287a7781cff7431ac8989dc11168da SHA512 d67c63022b7839cfdd3f5ecd45b483837ac4fefcce2def5c53341c3744ab2451b744ed587c195eb14374c335eb1c03e3303a71d473b92f8f741c7bdc0d4861c7
 EBUILD pyephem-4.1.3.ebuild 1265 BLAKE2B e0e2038cafddc129766d10af59d4f64ebc02a9de3d41ffe547bc96f94a24779f992509783f9a2fdeb465951181786d62277227708a7d2887e16b2b57cacb200d SHA512 446676a2b1d0d2aeee64e69efbfa2e4f4937b50be48e3f5a1c92d212652f53d589e3cdc6e5de9e59f782cffd2addded75d2728d5152e22e08b8bbb1fceeb9bbf
 MISC metadata.xml 1010 BLAKE2B 3d603ea6d647cc50bcc0a0f31704a6e201e6deff6694f7604b3dd39184eeb6ca7fe72b38772aca9c89f0d7185b5ed14f9ff67ba624aba68baaa358ad893bbc59 SHA512 c09f86ba1462ad279f3336165a7b8be4cae8499de3a16282e658bf76eb60ddbe0cb86b9d8f5a74edec2dd4c148c66d687c6becd5f84df9483b0f9bf1beb9eec5
diff --git a/sci-astronomy/pyephem/pyephem-3.7.7.1.ebuild b/sci-astronomy/pyephem/pyephem-3.7.7.1.ebuild
index cac5abc5aca7..2a874902d059 100644
--- a/sci-astronomy/pyephem/pyephem-3.7.7.1.ebuild
+++ b/sci-astronomy/pyephem/pyephem-3.7.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ src_compile() {
 }
 
 python_test() {
-	PYTHONPATH="$(ls -d ${BUILD_DIR}/lib*)" unit2 discover -s ephem
+	PYTHONPATH="$(ls -d "${BUILD_DIR}"/lib*)" unit2 discover -s ephem
 }
 
 src_install() {
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 249c42940fea..ea2bed027561 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/molequeue/Manifest b/sci-chemistry/molequeue/Manifest
index b5b5335d9eef..f95b9f180d11 100644
--- a/sci-chemistry/molequeue/Manifest
+++ b/sci-chemistry/molequeue/Manifest
@@ -1,3 +1,3 @@
 DIST molequeue-0.9.0.tar.gz 604015 BLAKE2B 37e7f404a0fefb40defb198295659372121fbe770269c2f9fb92e856aceb8222bec5e83939ecea061b76f925c0cbde1be0a854db41f992a92a2b2b9e0651f2e1 SHA512 87ddd8ca59227cab60c0ce2643e5bd435d9ac7e23b929659b95f190478734a5b71d4935f37d03eeadbc39939cbffb3604e0a283d50b0a23a1a000b57c1fce335
-EBUILD molequeue-0.9.0-r1.ebuild 2067 BLAKE2B 552c6b56e7b0907fa78b9e2d88f62f6768a5b08efe58afb6d039b1451e11324c21701ce4231086d685fdd1887f12a12d68e79a3cd444ec623c921b045a48c85a SHA512 7fe1f39d56b1d5131f01130d9b60e537b29c280835b69cca3f4d7f42b1a51d764de49301c22b41eeed72558e6419665af35447718aeb8fa3f14cc49951a9aa60
+EBUILD molequeue-0.9.0-r1.ebuild 2069 BLAKE2B 8621829a95dfab3e083f1c993bd6c3b6bce0c8c13edd6b7c82fc7f3133e1f56ae217fdda5655753fe756fcb515deead3003e4f45b2d0b2e9ef1a047d7ee8aa05 SHA512 6b91ac68c6b4cae0ee8d17092e99fa6e98405649eb3fc4630a070ce6ce747f4b14d50d60f06b096d4be3838bb6c794778c9faabc2d20897d830ed91f8836a7be
 MISC metadata.xml 1258 BLAKE2B db62408b81fa39c138916de98df72a14b7d66bfaa7ac50e6afe5e138ce4d3627cbb7f0544e075ecdaff70b04ee6023d5f2381bd0f130d5075b060c5ed8bfabb5 SHA512 b4b028602d96c58d8744d016176361d41a1ac4c3dbb0e14edb3526d683cfdd8607ba3c627529edcdd5fe97ba484cb8e1fcaf797e4c4d0253f0bb2321a2140512
diff --git a/sci-chemistry/molequeue/molequeue-0.9.0-r1.ebuild b/sci-chemistry/molequeue/molequeue-0.9.0-r1.ebuild
index 8901b0f81ce5..097499b09f3c 100644
--- a/sci-chemistry/molequeue/molequeue-0.9.0-r1.ebuild
+++ b/sci-chemistry/molequeue/molequeue-0.9.0-r1.ebuild
@@ -53,7 +53,7 @@ src_configure() {
 			-DINSTALL_LIBRARY_DIR=$(get_libdir)
 			)
 		use zeromq && \
-			mycmakeargs+=( -DZeroMQ_ROOT_DIR=\"${EPREFIX}/usr\" )
+			mycmakeargs+=( "-DZeroMQ_ROOT_DIR=\"${EPREFIX}/usr\"" )
 
 		cmake_src_configure
 	}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 441226d459a8..e45c16ea625e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 840a13aa78e2..404cc51c025c 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,4 +1,6 @@
 DIST pkgcore-0.12.16.tar.gz 623795 BLAKE2B b591aeaa5d780f0b273d446d1bdbdf33a44d085aa4975d3c5f394820a6f479c15da7850a699c92a56cb280ee028d922551c7226801dea6f4c34620bde3859c31 SHA512 acd7c478b342349e66dfda5ed1284663037b221e39b557215d1441e8a908c845fe26e274bcfd97b1879f5792fc017437cd0fbde1cdffc5ebc595a34fa56d2589
+DIST pkgcore-0.12.17.tar.gz 615375 BLAKE2B 9aabdeead2997e53ee3c966c908a231ff5e3b85422844538f47ff7bed03611459224ad7e931a9e94f0e376f221bd5c54f0f77f7883543cbd5b03c4dba6ba591b SHA512 9bad9b6e6177873b9187cff66b6b51c644a59a2d9f01b8ca110bc49006d6f0221c2c3b145d7cf5cec6f3c7526b6751100d56df13350b674a68ab5bbf19f10131
 EBUILD pkgcore-0.12.16-r1.ebuild 1449 BLAKE2B a4620deadd0c3e5c59a72b0eea28d15dab8d73449051d59f347a4d37b4a83c69ff8c84cae743b7d8f3344dbac5055c08e6a85282d3680900b9e873131ba9f842 SHA512 cd9676de9f17249a2c0aeb1b266b357c6a700f829a6fe8ba0b9cab5423312ef8874e2f407c29156f894a2c9b64e3a7e98d733f6abff082ec2a199870e629c1e2
+EBUILD pkgcore-0.12.17.ebuild 1462 BLAKE2B 8d0ae8be85072236fb8a624179f78d0f21ce26c1bf2d661a7538e652e646ee5416a5fad966b0ec29fafea357333d7a71f97d7cedf55501391e3bd3cbc4531fcf SHA512 8ea694a7561725786af3e520a653e8c7d2d28a2ef55412bb60d184edef04315cfbf0589d9dc45b086af150a99f30fffc066f9a6de4e95b73771c79015e8d4b45
 EBUILD pkgcore-9999.ebuild 1449 BLAKE2B 24ba7a7835e8d2268c3dd1c05d73700e55de940ecabe1cface8878a1ef9b78c824da197787b065ccbef1d28f91a82418f9ee0d78efe2c09831c749bcbf66454a SHA512 777b0ef3b758ea7da829e0288e16164643d37268f973628c1415a71cf9e9fdf7f569606a16bb130544671277fc33726267e072bee62655021917fa7c05a175fa
 MISC metadata.xml 392 BLAKE2B 98797b18321d3133dceaf79389bd35b26344a342c55c477b178359d731c46fa209adbdcf1d14eb009d57c8c20db8b898651dd45d5bcfc6bb3009ceffa1436650 SHA512 097710cc6c1df7455328a1d3feb223e324162ff20ef03964de4682eec7acf4e2d08fa64d3ac4946783f4c2587455d90ee5aa628f637f3a48386d9c9e6b7362e1
diff --git a/sys-apps/pkgcore/pkgcore-0.12.17.ebuild b/sys-apps/pkgcore/pkgcore-0.12.17.ebuild
new file mode 100644
index 000000000000..727dcbf220de
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.12.17.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcore.git
+		https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="
+	>=app-shells/bash-5.0
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	>=dev-python/flit_core-3.8[${PYTHON_USEDEP}]
+	test? (
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fail because of forcing Gentoo's prefix
+	tests/ebuild/test_eapi.py::TestEAPI::test_register
+	tests/ebuild/test_eapi.py::TestEAPI::test_is_supported
+)
+
+src_prepare() {
+	# force Gentoo's prefix
+	sed -e "/INSTALL_PREFIX =/s@= .*\$@= '${EPREFIX}/usr'@" -i py_build.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman build/sphinx/man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 308388c263c5..02f1b4868635 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -9,5 +9,5 @@ DIST shadow-4.12.3.tar.xz.asc 488 BLAKE2B b23525c3303f78df9d046c0225ed3ee1715cb0
 DIST shadow-4.13.tar.xz 1762908 BLAKE2B 315ab8a7e598aeefb50c11293e20cfa0982c3c3ae21c35ae243d09a4facf97a13c1d672990876e74ef94f5284402acf14997663743e2aaefa6cfc4369b7d24dc SHA512 2949a728c3312bef13d23138d6b79caf402781b1cb179e33b5be546c1790971ec20778d0e9cd3dbe09691d928ffcbe88e60da42fab58c69a90d5ebe5e3e2ab8e
 DIST shadow-4.13.tar.xz.asc 488 BLAKE2B de1f8285c5713a772343a2a7c638d1d13429dd4fa867d4f91d4922aa0d083b4a3110d38e8a8ab82137fdf4fecb12ba3677f3fb235401fc6438ae663fbd9bfbd2 SHA512 f8549c4e699c65721d53946d61b6127712572f7ad9ee13018ef3a25307002992aa727471c948d1bb22dcddf112715bed387d28f436123f30e153ae6bc0cd3648
 EBUILD shadow-4.12.3.ebuild 6482 BLAKE2B bc7bc19a961369429b2850e04957c3c4b66aa6b57482897f051b4f93e9ca68c0dc1979e75b3323e498ed6da8bed01f0e56605a4fed0edb58f90e3ad8de9c42e7 SHA512 842e434b064fc30675805c360c1ff73830c9d01016d5f9a8f74ba70d0892f48de8e792e963d25b82db2d75380a51fcfd0789fc655f85e720f9c86d5bfc081192
-EBUILD shadow-4.13.ebuild 6459 BLAKE2B 56d173da0c087743be065c66ce61006a001379421efaf18c4c9aa68fc967fc407852c28d48376169f8e2cd4c1d4f6efe96b7a3da0e6deedf88e49a7627bd19b9 SHA512 592d5e4c26ba43f2152720c61d5c7522b5b76ec44791e01aa3c4af2f3ae26a2505ad3a6619e6c0bbd079d6d4227b4ac3572696a1a7fdf23869d3f2606960bd44
+EBUILD shadow-4.13.ebuild 6601 BLAKE2B 1db9e6a25abefdf8f36228ffeeaf4f100e3bf2a0f053f6e2c218a41fcfeb3209f9e33698d572fae4841587b0fea792a9e3f93da2aa8c5472e0217715e53c2b6c SHA512 8f85e3d56e4af2154e233c1ee82e9b5eb8cb559b23f5c0ae19a98a19fce2b0d96294ad8a020140434fde7a8f77ae8c68a14390c17ab73a5d960ed0d2c8e7ec01
 MISC metadata.xml 606 BLAKE2B 2b14042f4702a908f8250c3fb6499ea33d8a8c44072707aa44881a36e3cc710256a821f8cd82c5214b32e9f5632745db4fdf00dd722f6fb7401e2f6b0bfbb4fd SHA512 694e039ae781982e8cbe6670b4e9c93b43455715ce4b9830a5fa61e6bf3eb91abcc284bf29c64fab055ba9754edaeab5d2da8140dbb2794fc1f534e2ccbb2b16
diff --git a/sys-apps/shadow/shadow-4.13.ebuild b/sys-apps/shadow/shadow-4.13.ebuild
index 373918e9f2e2..49415126ddb3 100644
--- a/sys-apps/shadow/shadow-4.13.ebuild
+++ b/sys-apps/shadow/shadow-4.13.ebuild
@@ -3,6 +3,10 @@
 
 EAPI=8
 
+# Upstream sometimes pushes releases as pre-releases before marking them
+# official. Don't keyword the pre-releases!
+# Check https://github.com/shadow-maint/shadow/releases.
+
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sergehallyn.asc
 inherit libtool pam verify-sig
 
@@ -14,8 +18,7 @@ SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/downloa
 LICENSE="BSD GPL-2"
 # Subslot is for libsubid's SONAME.
 SLOT="0/4"
-# Marked as pre-release for now
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index fe6a856fcda9..b8d13253daf8 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 7c69916f3cb0..280f75401680 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -6,6 +6,6 @@ AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
 AUX elogind.init-r1 503 BLAKE2B 7e54688c91f78b46411edff04dd8544dea778864d34ec00a4f0f2c166b4062ebc6b01f201f1b7d1f22f6781c51ac22f924136c83c0b0cdb29d6aadf640a6c0e8 SHA512 97d78afe1c0833f3f632272904bd8338869639facb79cd2fae6a4bf58fc5b2dd960484e1f9945152ff13d075216cf4b48b6b234eb7738fbbf445eee2c20e88f2
 DIST elogind-246.10.tar.gz 1559256 BLAKE2B 17a8146ee08c8ccf167f25d89b1d4525050ed0b0baaad0d36924ad3c40ffc820ef1528b33557cf285ad06c9ac9c440137428c5a235a2acf563e56f2f8f07e208 SHA512 9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b
-EBUILD elogind-246.10-r1.ebuild 4193 BLAKE2B c3c674fea3b7e95441e2f63147e39e377330fb9f056191c88a51bb2f9e5f8684346f9b5d7c8d8b85cdbfb973da244ea46d6dcb7fd380e39d5e0e6d102fa7c502 SHA512 3a4c0bef8cc0499dd91a90702e0fc500be615cf96c4045988b5c21b7f45e7a0acfcf7208699cc88084052db84d2c9bd10271b0864ae91ac2e0a10a7485799ec8
+EBUILD elogind-246.10-r1.ebuild 4195 BLAKE2B 58f3f967c18d83290c4e10d74eddb8578d2bccf98884853f3e4a4654248d33c4374621435d79e1e4c29263b17c071391721308310334b4ad373d967c8127833f SHA512 1097833faf17b97c3266a6b17f133b8d84d81c2175a7d989c9433014a53322cf75016093a661acac1178c4c3b95d14ce839477b65203d269f5db3ec5a7245244
 EBUILD elogind-246.10-r2.ebuild 4144 BLAKE2B 014c286c48d17589780d8b1b2257b5f5eaaca874b73350128ad438bdcdfcf205fb0b5e2ad3c5bf8bb274a3115a97256928d61dad5ffead253de4725396ba4545 SHA512 0e25086eff13432909aa3e93359239f9ccf7dfaebd0ec339c99a49842dfa91d22d45f7d11404be409d885a3ef8d282f4f441e41da2d3a0af7bbdc53da736a56f
 MISC metadata.xml 643 BLAKE2B 8304073654ac908cfb0e65493afc49a3f4925ba1c4adb8d571b57ddf3d7cf22a8e79dfbc6e3e3eb4fd8fe7f23f2edf2e1f0df908342add9c39e488bc1676ba39 SHA512 8c745c007f86f8c6a867a8c6e747111c4cc3e8f0faf4ad50b2dc4bf92b756b5d3f7b15af9a51e1c7353a45afeced6ad56b420f2af76706fe7d8e542db50ac952
diff --git a/sys-auth/elogind/elogind-246.10-r1.ebuild b/sys-auth/elogind/elogind-246.10-r1.ebuild
index c6a1f102edac..545f56aa84e4 100644
--- a/sys-auth/elogind/elogind-246.10-r1.ebuild
+++ b/sys-auth/elogind/elogind-246.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -66,7 +66,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local rccgroupmode="$(grep rc_cgroup_mode ${EPREFIX}/etc/rc.conf | cut -d '"' -f 2)"
+	local rccgroupmode="$(grep rc_cgroup_mode "${EPREFIX}"/etc/rc.conf | cut -d '"' -f 2)"
 	local cgroupmode="legacy"
 
 	if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 5b9c6a26408a..3d407c7247a1 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/btop/Manifest b/sys-process/btop/Manifest
index e692b02d5d6f..9d2a4862f69a 100644
--- a/sys-process/btop/Manifest
+++ b/sys-process/btop/Manifest
@@ -2,7 +2,7 @@ AUX 876319-verbose-makefile.patch 3136 BLAKE2B 48a45db41fded1eb3b447e06f742dd3d4
 DIST btop-1.2.12.tar.gz 980406 BLAKE2B ddaa023b85a00edfb27b55e574950934cce578ad7bbf0ea03b2780a511078638c14cd2316ebce8701be76c13ed3af8f0ded703071b363fddc14bcbea040279dd SHA512 36bf329a7b9922ff5cae990f5528625280b6b3fcb83d0af2e502876a2a8f4864c3a6ecbc6cb5aaa885f637859eef66470ff0cc86036f76b499b23a7c4086ea60
 DIST btop-1.2.13.tar.gz 982660 BLAKE2B 053c1ef87203b894c2cbe6007c3b5962dca232733d28f97d82a2f70e771d4cc92fe4c49d3582c80cb79974d65329d3e95e758b9e8a7fa51a2ff0cdbf6cbd9a75 SHA512 324e572d43e57e5e65e646aa743f7730e6d535fdc52e848aeb55d60c8d73945850c5b89fe0b541e98495ddf2bae71427a6ec8fe8a495b41cef885c535d01019b
 DIST btop-1.2.9.tar.gz 978265 BLAKE2B ff80079a393342a2cf3aefad6ead8be8b786fbc2b9445e8e2a8b37386f65f4060c801a6f59d216cd611783f4135a60d64b95ff2b5e1a3d62bb2d40030bde8974 SHA512 424573c8f82d0daf748cba7c82e72232773f145af9792ac78a5f5f18d98a8695f11452de106c72cf685ecb8cc89729471a494f9ea6b4300bdb2fa6acdbf4ac60
-EBUILD btop-1.2.12.ebuild 1243 BLAKE2B babad810ce33177f59ae2f6e716fea7d46448b8ad175cd35014b531a3775b025c602c86d0dc648df193a38b7d40aaf8b603f8b230eda987f429fe98a205b09fa SHA512 9ae97bf7556f3cd4d004444df5d3ffb5992c285a2243f1cc1390a0845faf9252e8d44359cb155a1d93518d19eac12afdad71b91c9fe4255830100edc240bb49b
+EBUILD btop-1.2.12.ebuild 1239 BLAKE2B 4661502ca39f90ef261eaa201eb829386bd34c7013286146974fff7d8036a6eed11c64e8396b983a63dd0b25dfa25101b8a13a5d23e3de86ae31610ea2022ebf SHA512 e43be0619d863bae39f713673a9b79ab97fcf4f9a91e041ed9a448a26df4b40e582aecd99cb902562c87476e60609e744a3b3f6715e29115f3893f6ea31e66e2
 EBUILD btop-1.2.13.ebuild 1185 BLAKE2B 6ab896005ffb6ae650e7bd4c9f3dba9bf181a88a5841161a41f15e65e1ea2919d1bda3aa3d846925f7d3c4544111c32b653e3fcff374ba4040d0b99871758193 SHA512 a02b19a7172ad0e0613d8c1f8fa7ddb5240079caaa5a7edf51baeac3efa794d6cd4fbadfd67a635011c9da912a1a12c599b0da3997a009ea70cc1dd68b975174
 EBUILD btop-1.2.9.ebuild 1239 BLAKE2B 4661502ca39f90ef261eaa201eb829386bd34c7013286146974fff7d8036a6eed11c64e8396b983a63dd0b25dfa25101b8a13a5d23e3de86ae31610ea2022ebf SHA512 e43be0619d863bae39f713673a9b79ab97fcf4f9a91e041ed9a448a26df4b40e582aecd99cb902562c87476e60609e744a3b3f6715e29115f3893f6ea31e66e2
 MISC metadata.xml 548 BLAKE2B 74762cdc63011b363a4c06de8190541f862d70f0006461c7a1cf2d734caf20601ba0769dc067e261957fe42a64bdaf26297bf3d080c3c08203eabd73165f2f8c SHA512 bb16944df9321001ca5c9e9fff49ea39069386117f0cfde67e8f19e3f44c13d360effb578d2c44c67f792d1ff574830f13cb9ef183f594e39ad3669083f2cf41
diff --git a/sys-process/btop/btop-1.2.12.ebuild b/sys-process/btop/btop-1.2.12.ebuild
index 5dbb46974fd7..39aa6592146f 100644
--- a/sys-process/btop/btop-1.2.12.ebuild
+++ b/sys-process/btop/btop-1.2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/aristocratos/btop/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 
 BDEPEND="
 	>=sys-devel/gcc-8
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 8f9aa9852891..bde83d4576db 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 39916a51395c..0748c496f6b2 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -205,6 +205,6 @@ DIST firefox-106.0.5-xh.xpi 426998 BLAKE2B 233fffe6c5cae7492d9ed68434a2d8728d163
 DIST firefox-106.0.5-zh-CN.xpi 595327 BLAKE2B 8ec7d74b482bb78aeddc5549bc4dcfb61c8a6c0aacba208ec107dde36a5798b79abc6258fd1b9180922ddcf59beee8c144ed8bd53d14fefa3f909d3657e64c6f SHA512 54261aaee801365967968f97f3658bc34a91a8c068c563fc31de54f5fbe5e4d20bc8be4995ea5a74719b9efd2d0b38719c5ff19b2826f042db5ded80f1847e27
 DIST firefox-106.0.5-zh-TW.xpi 596097 BLAKE2B 12f423ad06d9424cf0e08d960bcb43291e205bde5555a52e0f9351c3590c7b6f66c84e9b49fdd7b722df101c7c7fa65f80a6e8df3369a24869395ee8d3c41c2e SHA512 73ebf18f10a31877e9423c9bd1a04c0bcca9a091a3d8cdcadcb6a11cf9f5b29c94b7c19b57560734ee71f79ca296b0e589f85054527498cb7c5027ebb246353f
 DIST firefox-106.0.5.source.tar.xz 500379208 BLAKE2B 76cbb04bd0555cdf69d9c29fdcd57745eceaca581224d0a4c3de14735baca72632f800485749184eb7ccb183adf0a706010bda651b7c3a293cedb3f90ec9e207 SHA512 879b054340d632c5d972888ceb67da0d02f28f6755e9683c8e4e7fb71b55bde0e588b98e24bae448ffea8ddd3e30c44dc0563554ecd69506862796a64ca040d7
-EBUILD firefox-102.4.0.ebuild 36284 BLAKE2B ad4b43603c5852fe434889cca555bbd7d68ea308a35027c1bb638f3162f0623e88fb62eb901d029c7918fc2363b9d394453f0373a7ef30819ef95c492960788b SHA512 ab073abeb4fdabae2139b53b2b14eb49a5b0fa6808d9724b547200faa86553b598667f2a2f407aa9292472bfe0dc8863ee45d3333589f19f6ffbcb8a1619a75f
-EBUILD firefox-106.0.5.ebuild 38056 BLAKE2B 11c04946baefaca78119b321b315a7b8c216485cf371f7ee40d52735c8f81fffb99cc58fd48c0bd5e43aac353e732ce196c6899d2cc6e66cd0b079d418f1f009 SHA512 7125f9e10f565d5f8704ee1a4b0b155166835ce7f34af55e0f0fd54f78952f56a50f95dddb5471b6784a2d8c3429bfc040fbd965f4c49fa77914ca022cf42a04
+EBUILD firefox-102.4.0.ebuild 36296 BLAKE2B 88c04e1bae9e61ba54656820a2995abc0df2a3af32db11ebb56be70884e35c379ed3289a70060a490ca5beea29634f8548eb4ba7635e9fc5b7d4338ad67d5f26 SHA512 2bdd22e1ce0f451e517878783acc8227c926f31ea20a4dd79877a4d5c683ea7b97782781ff785632c02a4c1209bedccf65e52337d30e54d3fddad8f0374abc6a
+EBUILD firefox-106.0.5.ebuild 38130 BLAKE2B ae8396647f85a7a3abe6df686602c1d47ad0778f20df714ff9a7f7a5889c3ac80527002c538011612e9fcafcbb109bc5ee95b2117f691b4f1e47115165e439b7 SHA512 d8b1d453f862fa1707e986f8b098cd54f3c6a4dbbfb11bbd4b89632ea835d282913d42f9fda22bc6ea0a761114f14ecc31a7b1878125c19a63884b440338e6f7
 MISC metadata.xml 2219 BLAKE2B 064f486eecd2a66ef4c9cccef46803f877039bf16bc40b699a48e28e04e816d0ad434ce65ae2e056e1a4126a67a7dd7eff16040276159c1f5aa8966b1c0d7b6c SHA512 522b09ffc2857553e240b1e7c82c11ccc281dd87c720c6292ec9314b91319e0a55ca2838f17e878f5c1e58e4f22caa1b0c3b90506b65b350beff06f3f397d897
diff --git a/www-client/firefox/firefox-102.4.0.ebuild b/www-client/firefox/firefox-102.4.0.ebuild
index 49346cd4dda6..c5330f9f9bbf 100644
--- a/www-client/firefox/firefox-102.4.0.ebuild
+++ b/www-client/firefox/firefox-102.4.0.ebuild
@@ -625,7 +625,6 @@ src_configure() {
 			have_switched_compiler=yes
 		fi
 		AR=llvm-ar
-		AS="clang -c"
 		CC=${CHOST}-clang
 		CXX=${CHOST}-clang++
 		NM=llvm-nm
@@ -650,6 +649,7 @@ src_configure() {
 	# Ensure we use correct toolchain
 	export HOST_CC="$(tc-getBUILD_CC)"
 	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
 	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
 
 	# Pass the correct toolchain paths through cbindgen
diff --git a/www-client/firefox/firefox-106.0.5.ebuild b/www-client/firefox/firefox-106.0.5.ebuild
index 84b885c8cd46..8ff3bcb85429 100644
--- a/www-client/firefox/firefox-106.0.5.ebuild
+++ b/www-client/firefox/firefox-106.0.5.ebuild
@@ -670,7 +670,6 @@ src_configure() {
 			have_switched_compiler=yes
 		fi
 		AR=llvm-ar
-		AS="clang -c"
 		CC=${CHOST}-clang
 		CXX=${CHOST}-clang++
 		NM=llvm-nm
@@ -692,9 +691,11 @@ src_configure() {
 		strip-unsupported-flags
 	fi
 
-	# Ensure we use correct toolchain
+	# Ensure we use correct toolchain,
+	# AS is used in a non-standard way by upstream, #bmo1654031
 	export HOST_CC="$(tc-getBUILD_CC)"
 	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
 	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
 
 	# Pass the correct toolchain paths through cbindgen
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 5091c5e64327..d92057d83345 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/browserpass/Manifest b/www-plugins/browserpass/Manifest
index be58521bc514..a8410bb3a586 100644
--- a/www-plugins/browserpass/Manifest
+++ b/www-plugins/browserpass/Manifest
@@ -1,4 +1,4 @@
 DIST browserpass-3.0.10-deps.tar.xz 2508704 BLAKE2B 893aa8116bf6d021a9a8ca2b2fd7bcdc4686e8d3060a42255f702881b65c4cf20971e4c69b2f92520b9ad73439ffb92b73bc1013947a317840e4bdf090ea6439 SHA512 44e48d60e9656ef7b4ad74aebb9d2aa38ad42c77873143f857a1908daa81089544ef1b9cbc367e2566c910243e869a17203a8ecddd06650ff63c830defdf8244
 DIST browserpass-3.0.10.tar.gz 19242 BLAKE2B 822fb82b30b3f0faab5aad40af534f94b12636b476c9f704d8e1bd874e4dde2b2f4645553a43fcc79741aa06e30eac48bd26af8d6f868db0901330ecfaee6d35 SHA512 c8be34d3b0bd53f0d14f620826a223df44847ec7a2d6ee9fd9af776e640157bac2064a5eb21116942701d97e385f1d0bbf2c705a043e03ca62448db872c97c38
-EBUILD browserpass-3.0.10.ebuild 1308 BLAKE2B 9f7bb5cced18e9b8f185df079735fc53a8e5f8ce533392dbf22e2254a996465808852d2bea65cc9b50bfd7abb84b5e8164c305a2e4d274dfde12d58029374482 SHA512 fe70e93a9230fb53d0225fe78da19ed9e22ef1822e9d575c19569366bb02389c41890096c8389fc747af69d7ada6565ab8152b8ca543a0cb4917660741b1e3d1
+EBUILD browserpass-3.0.10.ebuild 1306 BLAKE2B 81bcc9b5579a9995b7640dc7553ce019cefab5a3958980c7d00bc83a104cc9ecbe4c07d356dd6fd3cc7dd0d4c170598fa9efedf9d5e37d19ed6b2425896f8fbc SHA512 92a9638155d86a4f54272312c6a62acec48837c219eb73d85fbcc7e17965937b537417ade34b4c9d8d190669d02bec3c21c3d83f40a19b37b3495924ae07f1bb
 MISC metadata.xml 247 BLAKE2B d28116ba04afa6e119da94b4ba50a1a127b38e4d856b28c87ec13f20feef202c8f2fbdf484745736f6faa03df9f50952d42906daa9bc6288658c2876792cec3d SHA512 b1a1e61e0ab021e177fc2bc916ec72e5de35fe795b466b9b9ed4ed51ebace140b33015bb0b5e03e4711af27c2bc12d161565f79c56a6675ab186abd3927ab46e
diff --git a/www-plugins/browserpass/browserpass-3.0.10.ebuild b/www-plugins/browserpass/browserpass-3.0.10.ebuild
index 086dfb387890..ccca3aa0379f 100644
--- a/www-plugins/browserpass/browserpass-3.0.10.ebuild
+++ b/www-plugins/browserpass/browserpass-3.0.10.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"/${MY_PN}-${PV}
 src_compile() {
 	ego build || die
 
-	sed -e 's|%%replace%%|'${EPREFIX}'/usr/libexec/browserpass-native|' \
+	sed -e "s|%%replace%%|${EPREFIX}/usr/libexec/browserpass-native|" \
 		-i browser-files/firefox-host.json browser-files/chromium-host.json || die
 }
 
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 0642499f09b6..ba98bbcf8b9d 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/luit/Manifest b/x11-apps/luit/Manifest
index b234e51ca169..6b67de6e0cc7 100644
--- a/x11-apps/luit/Manifest
+++ b/x11-apps/luit/Manifest
@@ -1,3 +1,6 @@
 DIST luit-20220111.tgz 206011 BLAKE2B 030f4c734b1b63c7f51f4e601445522a318b9b0cb3d291d9a392c8aac12315088115e513d368977c3a4536c580f033b78ab575ae4d6d4e8439c53fad6f5cd5e0 SHA512 c3e0e2e7e9da5ca1176f61b1aa050e6a525af1e4c924d9685ae0684657e549093677240cc3f74517dcb12821f7c447e5b4f5306f37d1ddefc9fc7bf1971eee28
+DIST luit-20221028.tgz 209510 BLAKE2B cf2785ac5c9c1081e2845d3b72b968a621add556575ceac807079970cfa701928711708aa3f8714910aad1a2648e9fafaaed5ae1afa2f32e6c18ddb29c12c0d5 SHA512 c6930ce6adb4ad74160bbee22f245ca1e68395e38d0a1d871fc4d8b2c87f42c2c18a91c1afe5d8647a6e0c6a61caf8e227e46985d0f344c3bafa763bf6f2b0e4
+DIST luit-20221028.tgz.asc 729 BLAKE2B 0bc964a275cc46616ca4730c2dde55cda1fc95e254a9c5f4e5e7bed17ad34ce7d540de6aecd9a3dee6ac13eb0e5b68de40d16e4236c7896a957f7b82fcbeaf19 SHA512 6f627cb8fa36f4f46321e3170dbc8d3a4a59f82bec885131c5751df81e37ad1a37f8dc7362458ef04e6d35960a5482dfead61b32ee2420014a22d4267d40c5a2
 EBUILD luit-20220111.ebuild 643 BLAKE2B bd0c94e5dfc82af625a02323c820b184df988ed12a5de6ec4eea0e0eed55525e67c3b7d82d32139432c15a1fa89891206d3e92651a6ceeefa58ebb866adf3eac SHA512 8d4bf29e8b9765637ca88976d8dae5792b0c2ecf4801b110d07d056cb156a7a73041dde16b7e22adc752f3fefbda75b2537010526bc5ba07185ebdf61ed00a4e
+EBUILD luit-20221028.ebuild 892 BLAKE2B e5c39111eccb9c780450bee3a6b584fa31226e398beef7e3a4e7a60a6d412ef7383ac166adcd4140fec43ec2d59dcdfee8d8134737c365822420a7c795cb9ae2 SHA512 3868253637f54d535e1622c35e8c691d867b3f2f29f5925a9dd68a8cfd0182ceabe44828341a723927a98860ea20d13c9485a48dc677327630c972101080412b
 MISC metadata.xml 333 BLAKE2B 5f4b1f673dd8208a3b23c5f522e08e0762c30f5a073cbda959e74b8949d747e83a97cb2908a295f9d3ed4d25f296a9a8c65f4d15f3ed3b5c46afd1e49c3f9c4f SHA512 1819ed06cf5efe5ac10cd04ba571788df4002de323bbb4785888eaacb7034a1d15996ffeecf6284591ff6851325abff391ec816ea09c05ea2bdacc8069712c2e
diff --git a/x11-apps/luit/luit-20221028.ebuild b/x11-apps/luit/luit-20221028.ebuild
new file mode 100644
index 000000000000..c9fb3ab74067
--- /dev/null
+++ b/x11-apps/luit/luit-20221028.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
+DESCRIPTION="Locale and ISO 2022 support for Unicode terminals"
+HOMEPAGE="https://invisible-island.net/luit/"
+SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	sys-libs/zlib
+	virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/groff
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
+
+src_configure() {
+	econf --disable-fontenc --enable-iconv
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-11-10 09:27:33 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-11-10 09:27:33 +0000
commit	e80777b54c5b430ca044e16878f59a2020423d48 (patch)
tree	b72b3422d129532b8f0ceb415c6e7c5109e3fe75
parent	aa61828f226f3b30e6939408847d914a145fdf35 (diff)