gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /dev-libs
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
522 files changed, 6247 insertions, 5714 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 59d0e85c5a3a..700d4eece106 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/bitshuffle/Manifest b/dev-libs/bitshuffle/Manifest
index 1226ae59e242..2e1a9ca94589 100644
--- a/dev-libs/bitshuffle/Manifest
+++ b/dev-libs/bitshuffle/Manifest
@@ -1,4 +1,4 @@
 AUX bitshuffle-0.3.5-Makefile 1770 BLAKE2B 38debe6516431e20f133b95873ce94f5df9dfe9424fa501d8bf9e20c864957e8c1c3b69bfffe1587c9ec1a58beb4408bfe568e3b055ece87954084cdde753a73 SHA512 1eba096b1cffe0fee28236df877636421066e00d44b021e1f9d42e8a1012f314f2fd4dbcc4e4339bc669242e8c5ed661d36619c1cc2bbd6344d60abd98cbe693
 DIST bitshuffle-0.3.5.tar.gz 112312 BLAKE2B e9e70608217743a93d2bf5319af0f48feff391bb2893b161a1a4c391ab630c90fc59483041d7594eb8366a9469feb309f3b8054c8ecc630d070a9170735f61f5 SHA512 4ae371ab2e1adedb5c3a2c047e0583d320c87f0687d9dc1c921ed9e38d8b90a447fb305f399cd591adf48a473471fd5827f4da2777dd7f0fb6d5fd145fdeb36f
-EBUILD bitshuffle-0.3.5.ebuild 733 BLAKE2B bb241995cfbbe34a2e4ea9369816a114c88a7b1309bb42801591881adf6cb5b45b94bd78039ed25743cfbf84fa97a4c6b27b52ec83b00e654071170d6308e0ee SHA512 1407482cd625127a8cde3621e199559e3810bc395d7c3560a95f3d589b61a3a9c154f80412c0dcae0cc73bd327446b4d0fb7390914d343042634a7e91370a5a5
+EBUILD bitshuffle-0.3.5.ebuild 729 BLAKE2B 5b1730a5c444b40e71c9aef857f1fbe96fe51b2241453c19be24c092da9b413e8a579435f0265f3f19044296b0863ea71fa864555f48c8f2a2169a90a8b98ca1 SHA512 af3b9cdf51cacea4955ae32c85498699dde6112119aea19ae8a8fd439cba4371c6ef7bffacc8654595df1361e2c031a35dd0153b04167c2988927c53a6fd6646
 MISC metadata.xml 323 BLAKE2B 395bf88139bea1ee92d2142ff9644b73d9f188c33377e2998a8899dbaf13eee43272ca9e06ad4ae7814c4e31db47255725f99a9a08231d4a6d3e93cd408030a2 SHA512 1e6d7f797d98eb00d3887e204e5be66af1cadd51051c5fe34ed32bf890b487f77874ff6484fad03fe5f72ee718f16e44218b65bd7eb84121605aaa73fe222d00
diff --git a/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild b/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild
index 3a4dd5a7574d..964fad44dbd0 100644
--- a/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild
+++ b/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kiyo-masui/bitshuffle/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND="
 	app-arch/lz4
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index c967134c8622..f3e2648e801a 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -5,9 +5,10 @@ AUX boost-1.73-boost-mpi-python-PEP-328.patch 396 BLAKE2B 5f08ce2eab46f2d108166a
 AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19e20325cc33c9c8fb206bdcf87efbafa6d28c6ebcd8b70f88f12e32b68b492ac6b985ccef703c61439661a194983b9ad9 SHA512 c8e6758840b58358b676226ef9f498b9e72cbeedee83cd6c8ea0608a6bc1466bedeba5b7a92d1a608c3a2788cb3c0444203e70995e3b3123198bf68081b477b9
 AUX boost-1.77.0-fix-process-include.patch 550 BLAKE2B 86c137e9bf8aae3c0906eb901dc7f256f2ae4cfa0f43f22bd28cc6c9f42ce64f619196ec6777e32de3c6781feb1fd9de23c28aa69895ab4f00e5705cf50c3440 SHA512 c8fee600346a73a13e590208dc06ecafbc1971bf3c08e0f78c4e9dacd8d4a2e872c1fb5b29fd7bf8948bd09b12dbfe66f15471a4964c79a60c4d096ee41774fb
 AUX boost-1.77.0-python-3.10.patch 1934 BLAKE2B f40633c08512f45f63f58cf029aea25968f36780b530f1dd8bbcbb7053b86b9f431bd89f5cba1ed74e0efe8b5aa37f3c9c12c7a3f5f75d289ad824d0a4f03dee SHA512 09fe68069578630bfcdb2aa74036ac4c376d181952ded41aac2cae47a1c0bc9e3c5ecb397f19fd3d813c41ac1b87e57c51d2c82aef85ddde99fdea6b6b7ce287
+AUX boost-1.78.0-interprocess-musl-include.patch 676 BLAKE2B 4278a20b6494a8653c42968d44f5c0c06e0abe6615a70a33421f900f8fa924bb8d478b4897a2fbd2a3177392b77ac3c67bbf51db13af32ff9aa7ad0e9dde27fa SHA512 70e230da8a7e6ea363655d27343621c7a81b692c63a9af48c542d847a167985b18dd238063349ea4c5a484ff61236ba4dbb6a4cad678b8509ef5b99adb8e91cd
 DIST boost-1.77.0-patches-1.tar.xz 9612 BLAKE2B b56e45cee94329c97e8ee4e6f040832829e63fb0ae47f02fb1aa54720311f56e68b4d4d53557952bb280d60316ecf64ffc1a1e9c9411b70a733690270b85c2d2 SHA512 1358fa6d3afa45fe414f0c11bb583cc8b95737405c6fc3831f7485e22edac990e98849c06c851a4d0fe26bbeec7b8b40103090dc80417ae717ba33caa2088d86
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
 DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf
 EBUILD boost-1.77.0-r4.ebuild 10891 BLAKE2B fce56456f1ae6b23af5836ee5a1e7ee6a3a8bad63fece1f4b18d8188f289a7df758de128059a734a09512262c52d994526a5992eddaf341e7c2b831a361a1c80 SHA512 825bcafe7fc201600d46fbf10355577bee3cce3e7a9ba2e542af1c4e75c99167197d6521adedf7f73320b72f5e7a3b93c55b299cca47c10e48ff0d49a2a05423
-EBUILD boost-1.78.0-r2.ebuild 10632 BLAKE2B 56294fdf2026d10ab0d75067c4a2af42b75aa40157cb5721010fecc7aa4b72986911f8c45d0253b4e68e3de90b2d87b797cefeff206c44cf384ff0bd40c97022 SHA512 3a6ba72384db6d25d873a1361113e5d25bed48c697d63ebe385c569071c4489d79941460c3f8657d9b6092628f785b9f3a4da1442e450f4d73b490ae4702e505
+EBUILD boost-1.78.0-r2.ebuild 10677 BLAKE2B 4691c074dea43225dabd192e2978fe082468b8decb355b87f7c9007f61bc6e981568a53b1849b518e70d5b583bb5d6960856a88a87f01ed85c5ae0c0a6385f34 SHA512 cf01098cfe185ba42f70817fa328179c40b0698e75a4c72b5bccec0ef35ca205d44109d874fdc94df793aca2b677a16f4900d5b0deb0736cb5f4c068ee92226d
 MISC metadata.xml 1296 BLAKE2B 68366717e95027dc72733a63960c674a710cd3f05ca6adc4d0ce96d1da03725800c39d11b788e063401c1661b67b27972a729861c6d7abecf42a343df889d990 SHA512 52ef93567f2ea6ff7be566eff974407d508d3c1b05d691f8753b6dafb39afaf03ca1d5b0d4d23e6f411099aa8b8a177a0b6b05c668c1cfb387c87d5df5342cad
diff --git a/dev-libs/boost/boost-1.78.0-r2.ebuild b/dev-libs/boost/boost-1.78.0-r2.ebuild
index 185d0046dbf0..5d274a9df837 100644
--- a/dev-libs/boost/boost-1.78.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.78.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}_${MY_PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # the tests will never fail because these are not intended as sanity
@@ -53,6 +53,8 @@ PATCHES=(
 	# Boost.MPI's __init__.py doesn't work on Py3
 	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
 	"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch
+
+	"${FILESDIR}"/${P}-interprocess-musl-include.patch
 )
 
 python_bindings_needed() {
diff --git a/dev-libs/boost/files/boost-1.78.0-interprocess-musl-include.patch b/dev-libs/boost/files/boost-1.78.0-interprocess-musl-include.patch
new file mode 100644
index 000000000000..85d25861f11b
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.78.0-interprocess-musl-include.patch
@@ -0,0 +1,25 @@
+https://github.com/boostorg/interprocess/commit/d002a0d929ecb031843d806c2bda69e013442e13
+https://bugs.gentoo.org/829147
+
+From: Leonardo Neumann <leonardo@neumann.dev.br>
+Date: Mon, 13 Dec 2021 01:07:20 -0300
+Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems
+
+Boost 1.78.0 fails to build on musl-based systems because musl does
+not include sys/stat.h by default.
+
+Fixes #161 ("Boost compiler error")
+--- a/boost/interprocess/permissions.hpp
++++ b/boost/interprocess/permissions.hpp
+@@ -29,6 +29,10 @@
+ 
+ #include <boost/interprocess/detail/win32_api.hpp>
+ 
++#else
++
++#include <sys/stat.h>
++
+ #endif
+ 
+ #endif   //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
+
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index de4c048c9006..2ac20376ae33 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -3,5 +3,5 @@ DIST Botan-2.18.2.tar.xz.asc 488 BLAKE2B 03744e95f52031295162b63dc34d7e0fd9a6b01
 DIST Botan-2.19.1.tar.xz 6088380 BLAKE2B 7a2d50bb66ea4a1875857bea769bcc30f397170a10a70377c3963d92e33321a079271c1e235a7892e33ec5b1bc19e4df8336b2586548ccd849f52ebfa47d9c8f SHA512 e604be0e7e82da89e3e1949d3035a87dc63314bd9854d5fe5129ccb3ed5bc78edb0406c7f8ad1a152b59a63b6d98ba207a0851a08428c3452cce794614b5eef5
 DIST Botan-2.19.1.tar.xz.asc 488 BLAKE2B 36f27e294fed60ea4d9ee9d919a58fc431a1bf9bdec8c12d30f2cba537a70b0e22f6a7c882cf7a80dc10aeee256f9f4a32129b55d2ab5df192d16759638feaa4 SHA512 2cd57bf97630d8f79cc0a87da79d3b338bd3b33b02ded16f6b60d5fd6cb3ea62105f577deb3b8d061f56a09ff902ff553ea3a0c603d5c3bd53a905024a2f457b
 EBUILD botan-2.18.2-r1.ebuild 4074 BLAKE2B ad2d28abbf64514ed31b13920fa302274b7e142e635f3ad4c5200695bc63f945908016c2f532fbfd008cd71f3824e0c40deed9f235fed9760733ccde90f2601f SHA512 c92b0f2f1f249174368918e6614dae17108be3a8da0dccacbe27bb2eaf45d097187e2afb1ed581f471c4dc7f19198fa27b3f41cb4ec6e7d6062b90840fa4216c
-EBUILD botan-2.19.1.ebuild 4149 BLAKE2B f5be0ee5ca561e8a496a5e1f6328eb06fa9f92b5bbce0067eec6e7a77f7696f652f3afd496bb680d4b06b9f05cad53e0d7ff88f8d4206e352507dd595761b20a SHA512 253ba93a34330775985d8e7199bb3ba88e1b8f95069ff50e52bb8689ff1aa27064d10acb80c2793a51d4c34efa72600961286369de703c7237be7d3a33438a79
+EBUILD botan-2.19.1.ebuild 4145 BLAKE2B c9f3428f8b5c3b163f5de138b5b72b2300b7d05f1e1ce321b2086676e872a9cda5470e117a57c0ff0c8ccd964fcc1bf3caa851856c656076713cc0736745aeb5 SHA512 aa89b9cab9813fd21f7c504725ff32fbad660441e373ca73f7329ac67fceacada5b228393146be151d409af8415e03155bfd74e7fca32e11c7f5e161147a2886
 MISC metadata.xml 519 BLAKE2B 78e28054a5c35b101d1f1b20ce1095a8a4f0ee8cf312e8d4f3aa711310d34d48878040ffa2a5a7a6600b071cfb5898b69508796aacd3f1d7658c2f30cbda1200 SHA512 9b039acb51f28ad8f21ed310e34d0d36fa7c5dd763fe8661a7ae21dc8dcc08c55d1eb9f1d0e519773697fe18600ffb3424811244e6f7ae243f6e675988006142
diff --git a/dev-libs/botan/botan-2.19.1.ebuild b/dev-libs/botan/botan-2.19.1.ebuild
index 6138e73f21d7..15696ea8fbc9 100644
--- a/dev-libs/botan/botan-2.19.1.ebuild
+++ b/dev-libs/botan/botan-2.19.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
 IUSE="doc boost bzip2 lzma python ssl static-libs sqlite zlib"
 
 CPU_USE=(
diff --git a/dev-libs/boxfort/Manifest b/dev-libs/boxfort/Manifest
index beabb22b0c56..18dcee8a21d5 100644
--- a/dev-libs/boxfort/Manifest
+++ b/dev-libs/boxfort/Manifest
@@ -1,5 +1,5 @@
-DIST boxfort-0.0.1_pre20200902.tar.gz 41643 BLAKE2B 6ac53b632f604ffd6b790a026703a2d64da65fc03cc71ebc3e4da3463e7c5a44ec99e85e3cdac8e5756afaf7d98785955815e194929bbc8dd6b6fd90bfb3fd52 SHA512 96090372f3e546f53f82c515c3f9e557fdd67eb7bc735683b30d8a66c2536cf21261b0467e449ccbd13e914b7cf4ea3da1a37c4108b215d6d0d08cdb68944b1e
 DIST boxfort-0.1.1.tar.gz 41993 BLAKE2B b9153a6330cecb781e2b5cd20554df3d0aad277dfc01174fd5d375211896b2912f26a76b0ba6ef7143c7101d844072e1a857caf5a8191893f22c0528c0a203d4 SHA512 48f7a0a52d03f36307271c8f387613dd53aebb19d0379e1758d557b043854c89068776ca4c22e64eb518429dd629c9a082476ecd2a548ac95e6aebef512a50ca
-EBUILD boxfort-0.0.1_pre20200902-r1.ebuild 963 BLAKE2B f79546fe561570a0da7cba09c72d5e0e7b3f23c020c30f2d7a602bed60df267e96564cdf1044c56a317d14f0134f458523694e835635c7b6eca2174a27f75f37 SHA512 b5dd8932584ce89160de6884640e8a828819c28f90d9375bce754f7c802271d4d1075e6e8796f3d4628cf9243b63252b1e865862b8620d65e8a80deae84696ee
+DIST boxfort-0.1.4.tar.gz 43011 BLAKE2B a925d21d4f29e0720ae66c6d5ac1a1d0b9c3f779a5ad0689aa6a058815852cfe04a7400daff1467b87df8c07a04201a32b4edc4b94358b53a320ddf223af05ac SHA512 0c6fe2ee474013c47d4688e5d1b4813c6265daa89f55e39202dd76676f5d0687c473216dde5236faf5cd246d24c21e232ed82bb5b676a231faadc4231e7aea1b
 EBUILD boxfort-0.1.1.ebuild 881 BLAKE2B 727b0079823942d325e43e2aac20b1fe30be87c68117a09dbfb0b9591c0ab091d0495e072d7d35cdfddb590fcf14becae9074d6e9901a6319d3f115931647927 SHA512 a3a92f817262f2800b7a2d1fcdfa7fd2a778bb5d1295dc907442c564071f8e6920796fcc80fe9e0bd492f8d93c4bb55c4e844c7c723f0bb59ef38233b873be72
+EBUILD boxfort-0.1.4.ebuild 867 BLAKE2B f54f0df2658a4ae5499d0380d35f2e7cae440a654a7e5635df2b97ff50e9e09b2f54108ba2116ae4e3670bbed726aa5326b09fbbe2854bf8327d7c841ac0530a SHA512 760b7b588214311dca99c84db8745dde2cd52847afc014d173f862fec32f2daf9f04f31f275e8ab868c8e5d9dc9fd82336fde78e59b8cd30625025c7264611ed
 MISC metadata.xml 493 BLAKE2B 26ae62742b6461f52ff68fa741cbef36de3e27d9580fae5265d02e089b1403d1cccad76b09d53b707454a9bbdaf60bace25fb1f0c115ee42d17362d6fe6543db SHA512 5f89cc0f108d3971d7b1cac8c9dadc0d16df0b6b643f484fcb214c04f772a5e071ef34699c6b0ba31c2783a3cae9e2cf166799224c3ed70cc2b7cedcf43d49c3
diff --git a/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild b/dev-libs/boxfort/boxfort-0.1.4.ebuild
index 693c2ee3a362..c1d27a92948b 100644
--- a/dev-libs/boxfort/boxfort-0.0.1_pre20200902-r1.ebuild
+++ b/dev-libs/boxfort/boxfort-0.1.4.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
 PYTHON_COMPAT=( python3_{7..10} )
 
 inherit meson python-any-r1
 
-BOXFORT_COMMIT="ac0507b3f45fe58100b528baeb8ca04270b4a8ff"
-
 DESCRIPTION="Convenient & cross-platform sandboxing C library"
 HOMEPAGE="https://github.com/Snaipe/BoxFort"
-SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Snaipe/BoxFort/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/BoxFort-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 -riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 -riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,8 +23,6 @@ DEPEND="test? (
 	)"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/BoxFort-${BOXFORT_COMMIT}"
-
 python_check_deps() {
 	use test && has_version "dev-util/cram[${PYTHON_USEDEP}]"
 }
@@ -36,8 +33,8 @@ pkg_setup() {
 
 src_configure() {
 	local emesonargs=(
-		-Dsamples=$(usex test true false)
-		-Dtests=$(usex test true false)
+		$(meson_use test samples)
+		$(meson_use test tests)
 	)
 
 	meson_src_configure
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 718606530996..61b5b795ec71 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,3 +1,3 @@
 DIST c-blosc-1.21.1.tar.gz 1456777 BLAKE2B a6a48d79fc8cb3df277e878a69361a5d12552be4b8ae50a4a95d2fe48d5b073c849724913a20c2834de7cf3cac7f288ddfec977ed1e4a1875fc3d21975907b44 SHA512 e06712ffaeaa6892415a6b01219221426c20af4191db6ca923301313daa8f5b0a83a7a3cd273f7013766349ace4e4869590e9c44bd892e57027ca45de53779e7
-EBUILD c-blosc-1.21.1.ebuild 1150 BLAKE2B 94fb2d9327806ef105328bb5b7714b1c9864c693623c1f0f8fb4be58e771d81147cbffa093ca5cf7b8f8f1cb46f417df846f26e465ed35ee452ff9dd25d6fee0 SHA512 0522f88ceba2c2acb65a33fc4aebb0a866e979abd8feeb0742679c5030cc9d7aa97fb16888b2b22e893872fc345d1fb63e106b5e06ada2edb2b893e9935568e4
+EBUILD c-blosc-1.21.1.ebuild 1157 BLAKE2B 7c58afa8f3c9b0f3ac557aabf6840f4a0718fc009682bc2d550936a7a002380b4f07a2651fba191e59afd38216045a1fc0c2d8e8431469eb16c3f15ef1364cbe SHA512 60b4d0cf1efe2516864905b8120dca6b197c1df382d4aa9a6fbacf9a0d06de02756d3cbd012f58061bef08d95db58a47577df04bcd76b03bdcbe6a9ffd27b3d9
 MISC metadata.xml 839 BLAKE2B 108d89a888ba31f03eb42a0717c7c9458d599cdb67cf98940c88ff943ce2079c736b6a52ac4206d4ceda17f56ea67e52dae1c77b304d39fbb9ec249a8ac38576 SHA512 f4ed6f93992492a98499ad1dff54b3fcd14e35710e0307041e606ddfff54769c5ed6ccd3ef90a5ce7943425bcee93ea9b46211f643da30d94db88adb6be7d5f8
diff --git a/dev-libs/c-blosc/c-blosc-1.21.1.ebuild b/dev-libs/c-blosc/c-blosc-1.21.1.ebuild
index ff5e50e77c0d..c0b7e51199f0 100644
--- a/dev-libs/c-blosc/c-blosc-1.21.1.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+lz4 +snappy test zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest
index cc721d23a576..af6e8508ad1e 100644
--- a/dev-libs/capnproto/Manifest
+++ b/dev-libs/capnproto/Manifest
@@ -1,7 +1,3 @@
-DIST capnproto-0.7.0.tar.gz 1983172 BLAKE2B d88b5f8e3278f8e3aceccdc459001b99328b0440812352dcb6b54bd11e18aa7fee6d337252841c86e9c3eb1afcdbd99884c965156d6cec37e3c0996c9ec1241f SHA512 a3ea278ded6a866759c0517d16b99bd38ffea1c163ce63a3604b752d8bdaafbc38a600de94afe12db35e7f7f06e29cc94c911dc2e0ecec6fe1185452df2a2bd3
-DIST capnproto-0.8.0.tar.gz 2121249 BLAKE2B 6d4ef9adb026a8ea8bc558bed1f8ce910e9c3b050ad0ac7ebd4be323cc1709a6b08956d4d2f39daee5c6485438f64695a028ea198aaae8a6c366316f10b1a64f SHA512 a3b87d47f4c160c3c72304539c3d2a6836488a50d1014c9f0eb95c112dc1e0f85b3158d26c248eff464205388ea61733c45ba10dc5441e5dd04064ba2c7970e6
 DIST capnproto-0.9.1.tar.gz 2238849 BLAKE2B f8de56c7f79b0ddad35f3e8fec7740510ca2328e4ddc633a71420901d3fc44df44d807c3965213dfc2535bbe03832c5164242d33cd0bff901d6f288fb62bab21 SHA512 bdc5960f26214139744d768ca4558b085e2d359c375a8849ca532a4c458a2daf0ee1a1f4d00745de5abf353aa1e4084a2d85e5523006f23f591f21fac2d847fd
-EBUILD capnproto-0.7.0.ebuild 893 BLAKE2B a4abba275bb800fe7ac662d9a815522f166e304c55eb2f5c55e49931820238330da71f2c7ec4f7f6b9819d4f71612888db8bb1f97de67672ce704d87ec42868e SHA512 62be82cde8adcfb628f2269419c3ee1a35756bc99d4539db198a61211b6cd521b7669b450afa2e771fc9db913c7155360181636d1441353483dd20a428bc79c2
-EBUILD capnproto-0.8.0.ebuild 968 BLAKE2B 46e5939815b8fcfc67e5774fde831a520a5220226fea6a48766610e1d2ed90beb3ee7ff4a908b700442e3537e1cb43cca29d307ee3b0bbcb649bc80cb8e6aab4 SHA512 9a8b4d3b06ecec8e804ef753a1d498d95d1e8133420972adc4aefd3d89e22cb301c91399ae0b9830ba8b65b89840a19e823730aa80184edd20d021938abb8b64
-EBUILD capnproto-0.9.1.ebuild 776 BLAKE2B a5b51f1ebb7a10ebdee61ab5920effa7b43dc0d54377f6e64bc08696e21ded31198f64b737e0253e8364a4c21c2163b9cd712c755a0b1ff142fd07f356fcec42 SHA512 437fc03b44afb49d1b141c9b80c0eb2d0711757105f88b20b24edc4f8cdb003f2f2ab9f770eb3b86886e2110554031ad97e0b0f8902d19c6291a89c32af544eb
+EBUILD capnproto-0.9.1.ebuild 982 BLAKE2B 14fecab4dff6be5e7b42222cecd47664a85c45058d810c578c3d093b7c7b6cc61d9ce72ca1aae7995ea7b729f202daa17a46303c4062e06eee81b41029e8c631 SHA512 1db279715ff228a167b8e8f5d87a5f77e0d5d2c1855a72f0c522792ed2e34dec52c11a97e9cdbe58741e87c30faa5954cc0f80b5d2887113aac6260edee22a18
 MISC metadata.xml 347 BLAKE2B 36c92aa137b803a5b0804f7684ecd55e13733f506000bed2fa306267b87922255486124dffe336822554c8644e2b2b34cfa13a5456a0f69f0e5b0e4136a1ce95 SHA512 af4c39c709263a8d5a3849a057475cebd9c7bac0228d599c28d0d9298c1c0d06a744f5999198217ee9248ed0318f95d376fb1802afe766082d18606f4776be57
diff --git a/dev-libs/capnproto/capnproto-0.7.0.ebuild b/dev-libs/capnproto/capnproto-0.7.0.ebuild
deleted file mode 100644
index 9279dffeaef8..000000000000
--- a/dev-libs/capnproto/capnproto-0.7.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="RPC/Serialization system with capabilities support"
-HOMEPAGE="https://capnproto.org"
-SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/070"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="+ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND} test? ( dev-cpp/gtest )"
-
-S=${WORKDIR}/${P}/c++
-
-src_prepare() {
-	sed -e 's/ldconfig/true/' -i Makefile.am || die
-	sed -e 's#gtest/lib/libgtest.la gtest/lib/libgtest_main.la#-lgtest -lgtest_main#' -i Makefile.am || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-libs/capnproto/capnproto-0.8.0.ebuild b/dev-libs/capnproto/capnproto-0.8.0.ebuild
deleted file mode 100644
index 396f01c7ef9a..000000000000
--- a/dev-libs/capnproto/capnproto-0.8.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="RPC/Serialization system with capabilities support"
-HOMEPAGE="https://capnproto.org"
-SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/080"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ssl static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	zlib? ( sys-libs/zlib:0= )
-"
-DEPEND="${RDEPEND} test? ( dev-cpp/gtest )"
-
-S=${WORKDIR}/${P}/c++
-
-src_prepare() {
-	sed -e 's/ldconfig/true/' -i Makefile.am || die
-	sed -e 's#gtest/lib/libgtest.la gtest/lib/libgtest_main.la#-lgtest -lgtest_main#' -i Makefile.am || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with ssl openssl) \
-		$(use_with zlib)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-libs/capnproto/capnproto-0.9.1.ebuild b/dev-libs/capnproto/capnproto-0.9.1.ebuild
index ecd0a5027d58..9f31c01fca12 100644
--- a/dev-libs/capnproto/capnproto-0.9.1.ebuild
+++ b/dev-libs/capnproto/capnproto-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="RPC/Serialization system with capabilities support"
 HOMEPAGE="https://capnproto.org"
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/c++
 
 LICENSE="MIT"
 SLOT="0/091"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 IUSE="+ssl test zlib"
 
 RESTRICT="!test? ( test )"
@@ -26,6 +26,12 @@ DEPEND="${RDEPEND}
 "
 
 src_configure() {
+	if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
+		# append-libs won't work here, cmake doesn't respect it
+		# ... and ldflags gets missed once
+		append-flags -latomic
+	fi
+
 	local mycmakeargs=(
 		-DWITH_OPENSSL=$(usex ssl)
 		-DBUILD_TESTING=$(usex test)
diff --git a/dev-libs/cereal/Manifest b/dev-libs/cereal/Manifest
index f5bd82596c2f..b9ea89fb52c4 100644
--- a/dev-libs/cereal/Manifest
+++ b/dev-libs/cereal/Manifest
@@ -1,5 +1,7 @@
 DIST cereal-1.3.0-fix-doctest.patch 148684 BLAKE2B 6ab6263db5b787b3ae41b9c177df19554f17837d5bb496de887f1d2d2df28c280e038fe64f0986ce3a32cedb709249a9986f6869b6e21b7c3a4b27058739496f SHA512 6389bead42f2f8008e6296f3d5ff5fc7a94920972c774003080fd3ae24ea0fd8fa1c4ab940ab800ab6b3249db003e452fd98a9ed77e5ffbdb301311fc2972a6f
 DIST cereal-1.3.0.tar.gz 374585 BLAKE2B 67bcdf8715585d8913c6ae4ff1a20d77df0eb95816b37a77620a3f08000b6e911afbd295236a6cd0394d3242ae0a3b2619f6e168503724517c9c66bc20f1d07c SHA512 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72
-EBUILD cereal-1.3.0-r1.ebuild 815 BLAKE2B 8ca410517b7d8f92e4d0fc8c534fbc1bf6d20790c3842b1323d11df7afa657c3c89e891efd51bf20a2af3b7278fc97493285f87490e9b8598e745cee4e351d77 SHA512 e44bb348fbded83fe7a5277570a0bc4ccc7558d11fdca65df216140fb51b548e0a814e77dfecd8b5e00dcb1df237bc06449d2b08059207fcecad5efebfd6ff04
-EBUILD cereal-1.3.0-r2.ebuild 1008 BLAKE2B 3e757e93f3c3ba8fb2836948909e7481dcc57ec5d90e88d221828a10f8b7b1120348dc62a7464c08210345c4f2d4422ff5c89219d37b6c1185d7bbdc562e69f1 SHA512 0659138d942509a716eab408f64511ae28805529ae43fdde6e452fccf3ed3d5648a4f42a6c2b395fb7e14700f3b69b0ff52dd3b04095ae19d98c227db1b1a83a
+DIST cereal-1.3.2.tar.gz 385903 BLAKE2B a52e035f31766846dbea86ecb0071d73450bc481967221268717d46112eab1c6618d9cda627610aa1bf35308940d9408c37bd4ebb73c9ee9358334542d8ed810 SHA512 98d306d6292789129675f1c5c5aedcb90cfcc1029c4482893a8f9b23f3c9755e5ed4762d7a528f215345cae6392e87cd8d89467115b6f031b41c8673d6b4b109
+EBUILD cereal-1.3.0-r2.ebuild 1006 BLAKE2B 8199a733804ab6badcbbe8b84051869ecfb109a7c165f6a04d5a9b1fb788e5e8dfe36ed176cb3bea75c6fb957c5a14453b4bafecc75cb15aed7bfd6b2f7dbcd0 SHA512 d131e01315e9bd21ba9dda25e06e7775a766c50bd20ce0faf8e60dbd5065a86bc7dbc4fdb00b73c632ae15ccb27f2479ea7b4d1125af345591664ee7c8266f44
+EBUILD cereal-1.3.2-r1.ebuild 948 BLAKE2B b28353cd45de21e923ccbe596d59a4e404f8fe35cd75593019ac60929689541b894d01bea6c037f0737a5512a78799d8e15d8f064f570a50648c1643a1e88669 SHA512 8d4384b405077ce98ed9e5652870f9137dcf6677f91a3c2b055f38274867b59cd438b01c5e1006f5873eb0165034076181d56a64da386a73db61ac12f3a39aff
+EBUILD cereal-1.3.2.ebuild 817 BLAKE2B 8f868b05638d3b8aa749a3e0bf894d2c71110a4407a77e423a7fbaad95cba9157524cf01cf8a2bb6dca31b9950524419c674498fe9013d6892c8d28b4cab3d4a SHA512 3d01cb31a2241bf0356b7aec8a8e0eb06f98fb2532492f0f164a93c6dddf4c273a62a8b2dd85611fbe6e027b803d1c77618c6b9762dabc73747f239510ce72e8
 MISC metadata.xml 395 BLAKE2B 6a5de4941e400c48ca8148af6748f2054614eb28337e6f8ea6f282c4fa961c8f60a57fe2e98f87cefd32cd72de32c4cbe2d13f8f7bfc91d6ba1cbdc42adcf200 SHA512 344f769d49106b234ccaa39934eb2531f2161a018c302efd27bad57f072e7ee41501f8b3c189694a9059a6ef24053ea80219307a910f64838e9c0ff51588c850
diff --git a/dev-libs/cereal/cereal-1.3.0-r2.ebuild b/dev-libs/cereal/cereal-1.3.0-r2.ebuild
index ce67e5fd8916..585358628ca0 100644
--- a/dev-libs/cereal/cereal-1.3.0-r2.ebuild
+++ b/dev-libs/cereal/cereal-1.3.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/cereal/cereal-1.3.2-r1.ebuild b/dev-libs/cereal/cereal-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..3a40d8fa882d
--- /dev/null
+++ b/dev-libs/cereal/cereal-1.3.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Header-only C++11 serialization library"
+HOMEPAGE="https://uscilab.github.io/cereal/"
+SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="dev-libs/rapidjson"
+
+src_prepare() {
+	if ! use doc ; then
+		sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
+	fi
+
+	# remove bundled rapidjson
+	rm -r include/cereal/external/rapidjson || die 'could not remove bundled rapidjson'
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# TODO: drop bundled doctest, rapidxml (bug #792444)
+
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+
+		# Avoid Boost dependency
+		-DSKIP_PERFORMANCE_COMPARISON=ON
+
+		-DWITH_WERROR=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/cereal/cereal-1.3.0-r1.ebuild b/dev-libs/cereal/cereal-1.3.2.ebuild
index c14fc8b906f6..807b51bc4c74 100644
--- a/dev-libs/cereal/cereal-1.3.0-r1.ebuild
+++ b/dev-libs/cereal/cereal-1.3.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -11,16 +11,13 @@ SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="doc test"
-
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( dev-libs/boost )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
-	sed -i -e '/set(CMAKE_CXX_FLAGS "-Wall -g -Wextra -Wshadow -pedantic -Wold-style-cast ${CMAKE_CXX_FLAGS}")/d' CMakeLists.txt || die
-
 	if ! use doc ; then
 		sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
 	fi
@@ -29,9 +26,16 @@ src_prepare() {
 }
 
 src_configure() {
+	# TODO: drop bundled doctest, rapidjson, rapidxml (bug #792444)
+
 	local mycmakeargs=(
-		-DJUST_INSTALL_CEREAL=$(usex !test)
+		-DBUILD_TESTS=$(usex test)
+
+		# Avoid Boost dependency
+		-DSKIP_PERFORMANCE_COMPARISON=ON
+
 		-DWITH_WERROR=OFF
 	)
+
 	cmake_src_configure
 }
diff --git a/dev-libs/cl/Manifest b/dev-libs/cl/Manifest
index 1c06567aab73..0b7ef351ebda 100644
--- a/dev-libs/cl/Manifest
+++ b/dev-libs/cl/Manifest
@@ -1,3 +1,3 @@
 DIST cl-1.2.4.tar.gz 142258 BLAKE2B 28d72842c092ceb81722769136e2282fdf7062f630eae0fb2097f4b2ae0690e41bb96d3fd947186d90b88a68982f5af03bf0cf0f6375304f6a1d05395f018701 SHA512 f7a7f24abf6c374b42f9aa809984c818ac2514d013ff224b3392b2b5df1ba75f2b393ad0bcd822c4118dd0034ed4e815f83041f0b2350ba71def1b33b42e8801
-EBUILD cl-1.2.4-r1.ebuild 631 BLAKE2B 5be5e4478e8ce77e1fb85b9913f0ec371d2e8ad3bb7ec4cf947d3ec2e86bd2dca89ca2e2dd5301b79db836d5b895e819093e23cc5130eddfbb681a67215229eb SHA512 86adc65258f96f133870496742d557b7d5e937572f5f65cba2efe36f7079d2d0438a9c5785b41c8c76554220eca94299134b2afc1ac55cf67a0bd84116dbe3b2
+EBUILD cl-1.2.4-r1.ebuild 613 BLAKE2B 8d1c780c4ab8a412365c9fd7c289affb63cbaa9217b8cfee01d62626d8b2ae41cfab37e313e43cb1ec46e56ae1b9ec0b4fdbd5fff1af0c066a78552978a603a0 SHA512 677644fb6c3bceffce02c680592fc8d9bcaf80ce9ff0f1cf8c5e38ff36cf27fc4d139ceb836bb25e6efb7d3c3779987a9e9c5827be3459817029eb03dafe8fe5
 MISC metadata.xml 243 BLAKE2B 98d944f206eaca5c6181b4ab23118637693b1c29cbbcddb66ccbf2277bffabd56329d978f401d2c911bc4c2bb9af9861c955a9532fa74017c00a1dee0980ce85 SHA512 8526dd024c32c289fe5a96ad71279f71f13da9b14aefb45cae54e7a56d2bb84d7fb92693d9818047d583c7d47c8543bfe6bda28792da0832e487f1cfc9aa535c
diff --git a/dev-libs/cl/cl-1.2.4-r1.ebuild b/dev-libs/cl/cl-1.2.4-r1.ebuild
index c2faafa84d9b..8d9a8d858935 100644
--- a/dev-libs/cl/cl-1.2.4-r1.ebuild
+++ b/dev-libs/cl/cl-1.2.4-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-inherit multilib
-
 DESCRIPTION="OpenCL bindings for Erlang"
 HOMEPAGE="https://github.com/tonyrog/cl"
 SRC_URI="https://github.com/tonyrog/cl/archive/${P}.tar.gz"
diff --git a/dev-libs/clipper/Manifest b/dev-libs/clipper/Manifest
index 18776b21516b..ffec1d26f91e 100644
--- a/dev-libs/clipper/Manifest
+++ b/dev-libs/clipper/Manifest
@@ -1,3 +1,3 @@
 DIST clipper-6.4.2.zip 2535706 BLAKE2B 755dcfd759888bda7114af784d9e684f36ce8f6e43dcadf07f5797e3723d392aab2ea9b80cb212b7eb3177bfb306ca20a797546cb2c382132887e62fa0dffd93 SHA512 ffc88818c44a38aa278d5010db6cfd505796f39664919f1e48c7fa9267563f62135868993e88f7246dcd688241d1172878e4a008a390648acb99738452e3e5dd
-EBUILD clipper-6.4.2.ebuild 628 BLAKE2B 81cfa0859a48748f8787120ed00633d9367f1b28c128b6f1f9bb68ad84ad92886933f044b6fa3e2a792ac08efb471ac87a63e459ce79ce3032cca0d2e9e3e519 SHA512 97339d7f81f0a44ae3c3d83072a0cffcd3f7b0d238aff1e58b89a4f881c28a4bc31297d770b38171d5b8b80b04156c54bdd0a9e6cda23ca395f659089676e516
+EBUILD clipper-6.4.2.ebuild 627 BLAKE2B d95c75391938cc8f35a856644ad1c2a727ba2382ff923eb0922d279e19ad68e0a0474006a541e2eda36a3bbfb31040cac816b1745946c829176f3f10e0c0286c SHA512 7e12cb147047e244d1c73d05c6a1f4f8d33b3f187e3fb0e01d0d181d1476b3b290ea31c1b5c35abe148a5babf795e02c91b8d212cd955f2053e0a3fc2f22cbdf
 MISC metadata.xml 798 BLAKE2B 187a99147c934f8269795dcb7778ef5b53edbb3092bc667e671a333d132ac974c71eefe4cc8ca9039b066ca7bc2e9daaeaefd5e1bb55921f0dc44bed5b71a9f5 SHA512 bfc3be25dd88849f33da103b0a726eefa90a3435b447340759aa7d9e4cf486541371371981b41b844e28ea0f60cb7565ee21dc3e6de4ce334f42e61ea91df079
diff --git a/dev-libs/clipper/clipper-6.4.2.ebuild b/dev-libs/clipper/clipper-6.4.2.ebuild
index da55f29d7429..37050fb9bc05 100644
--- a/dev-libs/clipper/clipper-6.4.2.ebuild
+++ b/dev-libs/clipper/clipper-6.4.2.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
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/polyclipping/${MY_P}.zip -> ${P}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 IUSE=""
 
diff --git a/dev-libs/collada-dom/Manifest b/dev-libs/collada-dom/Manifest
index e5f8f58fb33c..2757b2cce1cc 100644
--- a/dev-libs/collada-dom/Manifest
+++ b/dev-libs/collada-dom/Manifest
@@ -1,5 +1,5 @@
 AUX take_snapshot.sh 330 BLAKE2B 7203b021e0d78d1985015e5c57d7e1eb3ff5b537c4ff448b5ab2b6d28a1baae28cce45a6c0e051bf190217ccd29539c6c40db9690b0845f9c797e7e2929f8fb1 SHA512 c8bbf4c5eac8d3d67f4017d8b5097925806864d54914ba3472f0c589bcb72b4d8d4330845170f8aa6051296285abbf8e404dd19103a3e4552fe41bc615ca0487
 DIST collada-dom-2.5.0.tar.gz 4509266 BLAKE2B bf09937680897850dd5c288fd4245b403f11d88a0dfecb8f22d83b82759078f2dce201ed871fb644b165deefce05893354badf75911ab56bb2730e318c472407 SHA512 f189d09e2396faa266734981bb7b5e91ec34b6faa9ad340206e769dae316496bf4271c129980668dc2756874dbb8c1157162197d0d3a74075e35200821875156
-EBUILD collada-dom-2.5.0.ebuild 776 BLAKE2B 9f24c8fb610b836b6a131d2e31cfd7b7094018f33a4e79eb52877400d906fcd89e456ee4c27e45510ee651ce026940a1dea656ef83ebc08c4b32baf1897d901c SHA512 c57942a605a09b30be83ac8a21f2bb67a9727ee615efba64e39dddd0a3f6a3dfe304a83a659c5ad6d4618b3a7df8d51fa22063ad52c8e64b696706c857915b11
+EBUILD collada-dom-2.5.0.ebuild 773 BLAKE2B acff90d6aae65905a997204d0cedeafc5b15107dd3b311e3954bb78a2151aff239e324ace4d88ac9a78557635df81aa25ca5b8d17d3261b5c454f62927a438b6 SHA512 da704b83aa5aec681b2b3861b68e2da577128a32615346652a1f27337b19d402c3c3ccedabf7c2046a38b8498ff5c168093da3f92e36fb1d30ee8ad299a875d6
 EBUILD collada-dom-9999.ebuild 773 BLAKE2B 8c3ec525d5982699f998634ba3e03dc7272695e45b93792ba7f496f0b3a082e5737255af41096ed2a54c86dd8fe01ec6ec096eeb355c2090f7544285459580c4 SHA512 9d8bdc470880f4afb2a7ebec9838f1307aabdeb3aadd7efaf77950265548cbe08b875c438e3e73d8e35bbcf27dbb4ae3f17edae762bea83cd2959ec1f35187b1
 MISC metadata.xml 403 BLAKE2B 7401cd008bf9c7a690597217a09f31f2223f1af9c71c72d0f1324a71e6abf8b23edfd7eea16fe63e2f78fb8b7ce3f4f13ef6531582085b03dea19f51c472898c SHA512 c415e46dac6f00d5e853afe0c1cda14c4e6dac7c58b1e034f90a97c05e2258f474254cb508a055667b53f87ca9e7f9b2e10476cee9fc185fea804743155770eb
diff --git a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
index f007edd29daf..98f7f38a13bc 100644
--- a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
+++ b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86"
 	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest
index 735f537db2c4..79be428cf84b 100644
--- a/dev-libs/concurrencykit/Manifest
+++ b/dev-libs/concurrencykit/Manifest
@@ -1,3 +1,3 @@
 DIST concurrencykit-0.7.1.tar.gz 252802 BLAKE2B 907db3b244544a9c46db7432f2c3d07c20652882067157974ce54c71c27f21fdc87d41e068efc71f88392a94895e0de1a8f3ae90605b4267606cfa7d29c7dc35 SHA512 48768e7adf05b818f2951b246c90185071d6c3f874218349183d96b7887830f9505f9fa58576e9933862486e8543097df0ee667518009a3946d1edc19fc253f7
-EBUILD concurrencykit-0.7.1.ebuild 697 BLAKE2B 7fdca10f1783de1478600d79b21845c563fbccba1965e41524380a582d635b9088596ac5aae293c85fc7e9cf2a9f18016a1ef5cb7a6b19eaf262b5483f63e943 SHA512 46683f039a119d8c680b6766ca9449a90f30bae15821a0d8690242e923cff083dae9ab35c9997292e96478b5f548fca97f149c5969847c1fcf3fe19211fcd57e
+EBUILD concurrencykit-0.7.1-r1.ebuild 697 BLAKE2B bd174487c1f391aa2b4befc4bc81adda7960305ea1c4325d694d89c25c69fccb40086c333067f0978b4b83c83b5bfcee23f48111797d49b3b003769b8e76b658 SHA512 8a3362a829e59c64c6007581d2ae25083e38219d91c2581f909546966e42ff27feb6cd27ddba488a25b5ab93c1807691c20de8944c42424bcc3a3bc1fc86bdc5
 MISC metadata.xml 333 BLAKE2B 2fd93fa762629a64c971530a13139a483bda381f9fca9a7f8869f13e4a92ab04290ab7bcf3ada28d59a51489d90d3c68c034da3c09dda238c85e753355bc732b SHA512 0c1de28692b06be50656859e8453b4e8e5ca120b1215627a2f07d655f936f352ab0e893042a635fd1204e9d4387af618f7f925574208cea138f130f60e2431e9
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.1-r1.ebuild
index 110318f4711d..b6d82d69054a 100644
--- a/dev-libs/concurrencykit/concurrencykit-0.7.1.ebuild
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
diff --git a/dev-libs/console_bridge/Manifest b/dev-libs/console_bridge/Manifest
index 0c3e900324af..ea0a469fce69 100644
--- a/dev-libs/console_bridge/Manifest
+++ b/dev-libs/console_bridge/Manifest
@@ -1,9 +1,9 @@
 AUX tests.patch 864 BLAKE2B 7561e7fce3da8045b343180303f08a2748eb5aedd99dd297e269434371c63e711be731e4c4c2ccdcb9acee1fb6209f3d0f9323e5eaf6e034ab56bb1b77f43196 SHA512 e8c2fc93efc4af9638e0f8da67686ccddcb9402add5dc65999fe9033b08a95ed62e69b08209633d37885c9bf23d91d446270903d1b973814ea93bb574f64a081
-DIST console_bridge-1.0.1-ament-0.9.5-cppcheck.py 11626 BLAKE2B d4125b72bfd467f14302ef42c68ac0d7d5dcf53b0d8a678b9ec4a7e01cb71d27ef178d125ba659141dcb912a6a6b08a059e4b5babf03981d6da7190c4f626807 SHA512 19e5a854a228d4e98bdad1037089c2b74d88e31ee633bc1c7d580b011b4306f700aff3eb38fb1dcc0624a00a35942f38f71758eb3f0fc07b2b2f2a97e03def4c
-DIST console_bridge-1.0.1-ament-0.9.5-cpplint.py 239005 BLAKE2B 9dc409974ada177f4698106fba4ec4f1dae9e49719daba999c19670057b11fa74463d459b3575dc80b589e36d96dfac182ac66a6ef31ef3fd0639aeab256990a SHA512 c01c549e67744f0646a8c29c7d35fff0ba80dfd374f77619c66b6f8e4365b9e4dfaa9419bd87aa00066d99a6af8d89f28438e3f116312303a521a8277fc427ab
-DIST console_bridge-1.0.1.tar.gz 259480 BLAKE2B 78df3aeaba2e7589166709e7c43a77ac021d22d0db8d379f320455a9d532b247083ff86c3e03d7f9842943c3c98f78cfb33d7920a2987433f822a05ccaf23866 SHA512 913b7ee1d5401c6324eaaab1f8a54d5ff6df4eedb119a1cd00712f223750d69313047344aec5887920497c7b456cf6cb88e5f756bfbbb5ed8223ec758cdfd021
+DIST console_bridge-1.0.2-ament-0.9.5-cppcheck.py 11626 BLAKE2B d4125b72bfd467f14302ef42c68ac0d7d5dcf53b0d8a678b9ec4a7e01cb71d27ef178d125ba659141dcb912a6a6b08a059e4b5babf03981d6da7190c4f626807 SHA512 19e5a854a228d4e98bdad1037089c2b74d88e31ee633bc1c7d580b011b4306f700aff3eb38fb1dcc0624a00a35942f38f71758eb3f0fc07b2b2f2a97e03def4c
+DIST console_bridge-1.0.2-ament-0.9.5-cpplint.py 239005 BLAKE2B 9dc409974ada177f4698106fba4ec4f1dae9e49719daba999c19670057b11fa74463d459b3575dc80b589e36d96dfac182ac66a6ef31ef3fd0639aeab256990a SHA512 c01c549e67744f0646a8c29c7d35fff0ba80dfd374f77619c66b6f8e4365b9e4dfaa9419bd87aa00066d99a6af8d89f28438e3f116312303a521a8277fc427ab
+DIST console_bridge-1.0.2.tar.gz 259600 BLAKE2B e697219b1779534fd935b6bd940317d4aed2fd7b5c2673a08cf9bb015034f2ea9db85d2af0015805f8508d68c88ece39be8585f681afacb140fb8128c3fd18fe SHA512 ed427da8e59f9629f8d70e0a14415f88177c06fbaf7334bee56135dde91d19a1b54f5c9c668e0fd68314ab8dfd61446a174b9f528304decc5d4626a7c98882cb
 DIST console_bridge-9999-ament-0.9.5-cppcheck.py 11626 BLAKE2B d4125b72bfd467f14302ef42c68ac0d7d5dcf53b0d8a678b9ec4a7e01cb71d27ef178d125ba659141dcb912a6a6b08a059e4b5babf03981d6da7190c4f626807 SHA512 19e5a854a228d4e98bdad1037089c2b74d88e31ee633bc1c7d580b011b4306f700aff3eb38fb1dcc0624a00a35942f38f71758eb3f0fc07b2b2f2a97e03def4c
 DIST console_bridge-9999-ament-0.9.5-cpplint.py 239005 BLAKE2B 9dc409974ada177f4698106fba4ec4f1dae9e49719daba999c19670057b11fa74463d459b3575dc80b589e36d96dfac182ac66a6ef31ef3fd0639aeab256990a SHA512 c01c549e67744f0646a8c29c7d35fff0ba80dfd374f77619c66b6f8e4365b9e4dfaa9419bd87aa00066d99a6af8d89f28438e3f116312303a521a8277fc427ab
-EBUILD console_bridge-1.0.1-r1.ebuild 1693 BLAKE2B 4c9b82d631a8ddfd27fffe87a0820bc62400f267d0e19cb6cc4e3ad721a335c561c18d834028e505141b8329903c0ca9dffd631df76a49fc6c00fa37d1323499 SHA512 ccfba4e4d63b72869ab9a7bf6d8e57dc091954de96e1423aa3c29de8911800d00fd5043dc82c6e360f0ba265840e2414b1b9b23adf4c07788347462d9803e4a3
+EBUILD console_bridge-1.0.2.ebuild 1693 BLAKE2B c6d814b7dabb7d0c11f864bea6b7b643d11d4ab5ddd73692fb14cf3031edfc6b786ce7565800be7ada44ab2072ab82bc312742a3f2d98767918bf9bc966fd0c9 SHA512 a4fec347ebd39f91e6f7c7cdb5097ef88df3cf10ea307a2ee164b20cee2a72b622c697bba69bdfa6e7187913561642fa0b4c753466cbb19cc4e46029f1869090
 EBUILD console_bridge-9999.ebuild 1693 BLAKE2B 4c9b82d631a8ddfd27fffe87a0820bc62400f267d0e19cb6cc4e3ad721a335c561c18d834028e505141b8329903c0ca9dffd631df76a49fc6c00fa37d1323499 SHA512 ccfba4e4d63b72869ab9a7bf6d8e57dc091954de96e1423aa3c29de8911800d00fd5043dc82c6e360f0ba265840e2414b1b9b23adf4c07788347462d9803e4a3
 MISC metadata.xml 343 BLAKE2B 9525cd96a6e181a7ad761d2c18c59448c6d1a14a999e5f4bc0464834ca16a6a7aea7f4f2c0b284941c8e1b775e2248da7fef3e8e4604375229808d56c1bd7b6d SHA512 38fd7cc68c1bb280bb9f8355f8d421fbbc7f4d741569e266316185e2ac3c77e2226a77e43fd56e6a1886cef79f68ec735c2975c68f1fcf74d2faabf1c458b6f2
diff --git a/dev-libs/console_bridge/console_bridge-1.0.1-r1.ebuild b/dev-libs/console_bridge/console_bridge-1.0.2.ebuild
index 21209fda7c82..d28df7e2d161 100644
--- a/dev-libs/console_bridge/console_bridge-1.0.1-r1.ebuild
+++ b/dev-libs/console_bridge/console_bridge-1.0.2.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
diff --git a/dev-libs/crc32c/Manifest b/dev-libs/crc32c/Manifest
index 659373891285..ca6381751c4f 100644
--- a/dev-libs/crc32c/Manifest
+++ b/dev-libs/crc32c/Manifest
@@ -5,5 +5,5 @@ DIST crc32c-1.1.1.tar.gz 29829 BLAKE2B 5ffb0809e80d1fad81a77d96683d44142a7d84fc1
 DIST crc32c-1.1.2.tar.gz 29819 BLAKE2B f48720e632b6a4aaab9591651ed92b268bc8fc5faacb01888094af86ecc9dec901be6edc419c534aebf94ade5a2ce2347c0ff2962ba57c62627d6d7c420fc23b SHA512 6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196
 EBUILD crc32c-1.0.6-r1.ebuild 703 BLAKE2B 3443d226948d7357e5db97f791a96abf123a4e99573dfed1d3d15a3ed4547f43d8f9e2ed6aa72edbd373770c822582123ac162a197d70016365d489f0b6e5781 SHA512 87923213b411d5ca4c92cadd3d18aa61965e1d50f18c84d9ffbd7a2f789d9353629b768824debd9a1cbb1fb5aedf90e0e216482e907bac63ff684e7a4f61f9a3
 EBUILD crc32c-1.1.1.ebuild 866 BLAKE2B b72361efd51aea538bc2e82fa4d23a10eb954a261334989937a9f3635ce46abb797c1f19a3f4c783b10a2c8ed67040dfb199d7c25dd26b98bf6b84c9bee1d737 SHA512 bb2ad906d9124847f5df27d6980cb59b720b5f7e27dde5933f09b802883d01f3f3a999b968637e147a1075579cb895e5080f6e5e0c7be2dfb6053d92d5cf4817
-EBUILD crc32c-1.1.2-r1.ebuild 857 BLAKE2B 5a235e32ac2650d82811d8d9eee2f9e1e03295a8abc8a4cea3746ddd45f4125489dfa656cafa6443acc4dc187e2a09593ea4cee8e173724eddec09e8caddf873 SHA512 985fdfc66ab9caee0154dddc8f98f08a85ec7c1df812ca8dd6e31e65967bdf7e3d5b70477571caaa3ff146cc59107b0f269477655cf335ce25b07cecd987b466
+EBUILD crc32c-1.1.2-r1.ebuild 856 BLAKE2B 727ca6f288f2cf114b4ae825e20ca4886a15265c8adabf3e3b7bc5d741c4c9d93540358e49700c4761a2db7a088078425e7461b4fccdf3747c7332185028efbf SHA512 6dffb253127acb0614bb45952c92ab9023d49b53c0939b10d4670b217f3c51d75a469a16b7b7ebee99d4b8a0148934d870e909ee7c62e3a655dcb91c91ee2468
 MISC metadata.xml 251 BLAKE2B b1949292bb332d69832bf47a05a2f53519bb6c233a09b8e595dac3ca8aff30e213aeefef78bbd8b0b52124b43669042e0d63c476b5dcacb309468bd4f233da83 SHA512 97acf3ebe0b0e94afecdbd634bb9800f9930660cb8f6be45fc54a6e24534a64399549ce1dc0862ab7d9bb3034bccdc6c96931046769846f847b769c9899f6037
diff --git a/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild b/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
index 0bc6721f5fb9..dde949144a27 100644
--- a/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
+++ b/dev-libs/crc32c/crc32c-1.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 7d9a4b7392b8..5e5e734e9e81 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -1,10 +1,8 @@
-AUX criterion-2.4_pre20200110-gcc11.patch 370 BLAKE2B 63b68e20cb7d2b84df561bc308e61a6dc3b0398c52f2f575cfb5750b80aa6d83209d770c4feb52c53245e85d6f8b9268a89cfb1892cc26ef9bb79824e5a9b9a4 SHA512 25008b50b4b9b957083fc14537b76f8015264f030a3902ec70629c58ee491f4eaa92009004316f7a2b70b110e498c942d9cbb6ad138fbc599669940b74a5a652
-DIST criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz 863335 BLAKE2B 5e86709f4b7d500f3a2d4e61dbffd17f50d5ab593bfe48c8b8d5d6019436e203cd0b7a818933733377fa2dd98b9a94a46f3980b0bc52a8b3ca54c9d60406bace SHA512 34a6acc6fc0c74dcab572c9f6a56c4490935df442b1ea95169143a50193e752fc361c66d007f875c319285eb81b533139f25c5b421903e7cc1ec89c546b94a21
+DIST criterion-2.4.0.tar.gz 870099 BLAKE2B 06d81344f6e9110cbb4313c847e0fb1d596ddfad7ab57d4a0c9df2140c5506450f702082d6fc893d819b74252b20193720ca44a903b43c43e940122529da88ad SHA512 4a7cd9cd26f64bfeb95683a0479a59b29676ffc5110041757417ab152dced7a360a94fd721b31e45e1b91d0ca08fec0327d7a7d56a2cf9d2f3e9e25e2b95f446
 DIST criterion-a91a69f65006c057812fdd850b100ff28790ea73.tar.gz 864681 BLAKE2B 7fe19c8d316f965d8b6214252ac262d3a67ed43857902e17af0505a5c7afe7cc22f84052ef7c8d1ac8283286c833952615a0aae13f6e5efa05c03b8717fd1048 SHA512 4e9cd278154873bc781f320fd14b6adc82caeae16e4daa2aaa5be93290f43a93478db068f82f1afbd3788a51cb791c69c2abeaa25a6b9f282b303495fbc09821
 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb
 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
-DIST nanopb-70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz 301605 BLAKE2B 24ddb83b3bd220be57c82761159f2b138ec646bec53d02632e96f6cf9dd6fa39e24039a908ac9687c183612703e6973095f94aba55fab5dd5559f243c5d412b2 SHA512 ab535c57a000c5df267352fcab8dcf0560a3a0d9b92634699508c8504840510e4f9f4a21005d57baf0af2e31718eda2ebe41763c7f82ac37ef9b6342c27e2e2a
 DIST nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz 1124211 BLAKE2B b8dfe6916decef6b6e32315989050a8ed3e72191fe8365c36652906631a9a2cbbdddd34f8927223d866749dde58d85a8e264ef6d5daac614327db0977d05d693 SHA512 3914fe37399cf99512fbd45e496ac95490b74a2c259f96138123a3399fa2b7258e5d99ebd5293b8ad87069e1bb4ea71d13c54366382904c9607d8545afd90b62
-EBUILD criterion-2.4_pre20210114.ebuild 1928 BLAKE2B 494af9c52b899784e4beb95f2d65571d099ce8fb63d47cea3adbfd2875dfe6a26145eeeaf6ceacb867429b9d9f0e979d88536396ac80fc02eba71539bbbd164a SHA512 b771c5e2e378e8f1e8c352da31c6d11f4b86aaf8667cd28f0076aac8b3e8a1d043da244fd6653d8d459a33a003832569f2fcd896ae65e09101b44f9e6cf6a981
+EBUILD criterion-2.4.0.ebuild 1767 BLAKE2B d38d7b8efaabfa7d539af8352422316d8606126c3afee62c7aab29f6f0b5051b7508c3bfe54996b5aea50b9d9828e896cb5bcc5537481b54081efa375ebb970b SHA512 e79c1afb902e1e2ac1993cfb198c528c0c2289cd169cf11c2e691c31d60a13ea09d3dba976290b3a95b7515cc3b98e11653409e0393ecdd9536620ff9d9476d2
 EBUILD criterion-2.4_pre20211218.ebuild 1866 BLAKE2B c14ccfcb7d68b88ef3d79bdc559c62e3e7d3c2e74810e79893c87166715b5037fc499c116c01370d664b3bbb89203052cc59950ee644b72b7ddffb6b5bb2f5f6 SHA512 c94762c0dabc9a99636ed75b02139dc28545f16b20d4150fa43e4568b44500007d587cc94e1e5bd19c50e587c60bf1b8fa9cc09626b581e7a59d6fc4b316497d
 MISC metadata.xml 495 BLAKE2B e26a19888a85984288468d569c85fc5076c0e78fa79c759ef0fb4f62e2c84453200f819459a9b85ac3dd7d4a08017b4c61bfdd01b73288ed4663332030f9a8aa SHA512 9602e9b6e0405dce29b8e90c72d95ce64fe0c4f54df0ed01416cc9562533195c2fcbde1fd139547387b3aabda8b4896a05bf4a277bb3a2921bf02cf66f81b744
diff --git a/dev-libs/criterion/criterion-2.4_pre20210114.ebuild b/dev-libs/criterion/criterion-2.4.0.ebuild
index 220b6acc2d46..f43eea0b2b1c 100644
--- a/dev-libs/criterion/criterion-2.4_pre20210114.ebuild
+++ b/dev-libs/criterion/criterion-2.4.0.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson python-any-r1
 
-CRITERION_COMMIT="4cf886a2d96ada425e8c88d3c4d935e510c7c712"
 DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32"
 KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502"
-NANOPB_COMMIT="70f0de9877b1ce12abc0229d5df84db6349fcbfc"
+NANOPB_COMMIT="c9124132a604047d0ef97a09c0e99cd9bed2c818"
 
 DESCRIPTION="Cross platform unit testing framework for C and C++"
 HOMEPAGE="https://github.com/Snaipe/Criterion"
-SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz -> criterion-${CRITERION_COMMIT}.tar.gz
+SRC_URI="https://github.com/Snaipe/Criterion/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz
 	https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz
 	https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz"
 
 LICENSE="BSD-2 MIT ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -35,11 +34,7 @@ DEPEND="${RDEPEND}
 	)"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/Criterion-${CRITERION_COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4_pre20200110-gcc11.patch
-)
+S="${WORKDIR}/Criterion-${PV}"
 
 python_check_deps() {
 	has_version "dev-util/cram[${PYTHON_USEDEP}]"
diff --git a/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch b/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch
deleted file mode 100644
index c99e03af6f19..000000000000
--- a/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/criterion/internal/assert/ieee.h b/include/criterion/internal/assert/ieee.h
-index 3b6de3b..2063d87 100644
---- a/include/criterion/internal/assert/ieee.h
-+++ b/include/criterion/internal/assert/ieee.h
-@@ -29,6 +29,7 @@
- #ifdef __cplusplus
- 
- # include <cmath>
-+# include <limits>
- 
- namespace criterion { namespace internal { namespace operators {
- 
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index a8a932fbfaf3..18a03c52c63e 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,13 +1,5 @@
-AUX crypto++-8.2.0-build.patch 6814 BLAKE2B 490329199a411c6d291e35216680fae3b540b7c7d8c88c4f671db41c3b9b22ab8d537b9ddeb6cee899daa58b2173e5486ee763ba6f163ecfa3a20018a5117a94 SHA512 d9f23cf713e76d986d50fce895ba9ef2980b3ad81460b81217f9fa5af2a8840ab9e9e72c1d8d9635eaeceaa45f1add9e8dad36fd4159923b659f4fce09ef502e
 AUX crypto++-8.2.0-musl-ldconfig.patch 1012 BLAKE2B 3c076365b7a6458c8348aa84c66df3d84c73829f49e36f3dffa9ba75be064235d9128721798967a7baff1e1f283f7789587d31f299275501039ba9e78ec4ccd0 SHA512 61f342e134cf696a1d064b9c27cbece4cccbbaa6a6ac55bd0bdff9e13669ce2e19b9f31ba0307410822bcf2c016397dbe81f79815a23f3f1cff2a3aa45d8622c
-DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
-DIST cryptopp840.zip 9124180 BLAKE2B de57ece8644aef68e40527e2dfe1892f924f1939617ce11d8d27253f15f2dd11cba6e594dd32f75ce799392c12ef22472fcb2f3e44b9c66bb2ae093d4c7e781e SHA512 4c32b6a9ce8a6925286185f65f7413fa1a430471f09624219656b1d088674c56f95fcc3b64f611632f12cb56dfecdcd41c9d1468942b8c391425a548245dde09
-DIST cryptopp850.zip 9125575 BLAKE2B 857a65d63d17a3447d3cbd8370f9d750c480a9734c79739550b1ec7a6da3e7183af5748c2dfa5127be3810d73960af2f3b09b4b2bf4e624a43bfc4357ecde12b SHA512 090472545c74bbf0579b56b09e8b5dcd777b38f29f7199a2e68f45d4a8c687acc82f105ba8b2a38f9aa65e5997a3d846aaf2341ab74d58b4bbfd1f5f03823b93
-DIST cryptopp850.zip.sig 659 BLAKE2B e56d059069aa233b11dd1dd2c555ba8b9b0d12474d4f5ec9057e626ad22449959b9474ccf9ce553a2507f50215b669cf4b90cab6b51697559a6ffb95d41da9ec SHA512 7b59fbeb14fea942c846573c7bf8e76d6cee86aca4b605ce06323bc6f5549232285864cd735c2a882ca4df3d93747436a5268fee63dbf8eb43c503143b660e63
 DIST cryptopp860.zip 9274149 BLAKE2B c93998e2deb93abf12b801877404f0f82547bfbbbc5aae727e68daffc2407877dda76d7bcd06239d40a48baf21b6f2e29f74e9a97ecbc1b5d4b5bcc50ada71da SHA512 e7773f5e4a7dc7e8e735b1702524bee56ba38e5211544c9c9778bc51ed8dc7b376c17f2e406410043b636312336f26f76dc963f298872f8c13933e88c232fc03
 DIST cryptopp860.zip.sig 659 BLAKE2B 591a535092c61964c0fbb1ba31e44e70fc5f15757b9b56476ff64de0c28d47a13fe99d7f5819cfeb52e514ade1454622451b267bcc751868defcb080ddf79e8c SHA512 6231816b1ccec75cbcdd09daa8895830c5f4c595a4a0aa24dacc3e377832d8db5efa1aeadf815e53db32fc5263b09dd1b249668f34da4bfad5d5cba6f031ce21
-EBUILD crypto++-8.2.0-r2.ebuild 1775 BLAKE2B b53a3c343a882953244e8232e9ab7dcafb9ff0dfd60f80449d9057e9ac60811e628668704adc474f88385ae9fe363534990c162ca8af82f1d78c43dd333d38d5 SHA512 491829f87023ec95132521a1605a17b3eb9e8e58b92bb4ebcbae5feed98a058731398858d8c5e0e8af6f63d7df01ff13cc3154b0340f6e4ed7a226ee22fd1861
-EBUILD crypto++-8.4.0.ebuild 1190 BLAKE2B aaeb8f3171c59e2e8061b01fc8e515da289017720b162614ea77d0d7c49dd4c0d558cbf8042272f736a2786e2eb32d05b49669c5df6a1990dcadcae60004613d SHA512 1ec1a83bff3e783106705dfa46dad55bf80026dc0665e58e325f4b43fd314036f33e94a60b392b6fd9b48aae5e2c4534619ba22d4a072ccdfb4e497dd9df1cde
-EBUILD crypto++-8.5.0.ebuild 1446 BLAKE2B 0f3b1636a874deba4ddfbe68a77155154eaade357ec1347fce2b3500612f134115bb38b6b52389b33e3aa16213f7f77537f631d03ed967b857fb0b889d86c61d SHA512 3e570722fb2dd098957d883e85f250abbf075e7498be37042ebc96446424e09b8b9e9040b9eda72dca054f87d2128a318eb569021d6cf49c6b1f2e5c377170cf
 EBUILD crypto++-8.6.0.ebuild 1484 BLAKE2B 3ad6b804dac04fa8b2e4f5cc302f62c432a8ffccf9db10784fb7cea48820dd5cf3b094e189cf339158107a6fc2680fe658d9bb847638584aed98011e682c0811 SHA512 37eed0f2ad965b8c6f82ec1163095e83212742dea7b0f8d037fcc968206b2878cfc21708c2a515cd06dff2ce90f1b825784e2381b2bf11c723fe30b63219767d
 MISC metadata.xml 506 BLAKE2B 5d6a8770ad53c178e43d30c04be9924718eaf373e8d9945f637db7af71fccf9b21bf46141910ec1cb1ea12e3817dfef4c7881d935fb6f441898ee949ac13ee5f SHA512 8d195dfc2d4f627f59d3a37d4988a0bc59e420a64f8615b819760e32449640eff2f357160b2b9797817d38b0e44c8d6bc04bc4f84a2bd20cfdb7fb5d12df7f2d
diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
deleted file mode 100644
index a52ee90857ea..000000000000
--- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="C++ class library of cryptographic schemes"
-HOMEPAGE="https://cryptopp.com"
-SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
-
-LICENSE="Boost-1.0"
-SLOT="0/8" # subslot is so version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x64-macos"
-IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_pclmul cpu_flags_x86_sha cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 static-libs"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch"
-)
-
-config_add() {
-	sed -i -e "/Important Settings/a#define $1 1" config.h || die
-}
-
-pkg_setup() {
-	export CXX="$(tc-getCXX)"
-	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export PREFIX="${EPREFIX}/usr"
-}
-
-src_prepare() {
-	default
-
-	use asm || config_add CRYPTOPP_DISABLE_ASM
-	use cpu_flags_x86_aes || config_add CRYPTOPP_DISABLE_AESNI
-	use cpu_flags_x86_avx || config_add CRYPTOPP_DISABLE_AVX
-	use cpu_flags_x86_avx2 || config_add CRYPTOPP_DISABLE_AVX2
-	use cpu_flags_x86_pclmul || config_add CRYPTOPP_DISABLE_CLMUL
-	use cpu_flags_x86_sha || config_add CRYPTOPP_DISABLE_SHANI
-	use cpu_flags_x86_sse2 || config_add CRYPTOPP_DISABLE_SSE2
-	use cpu_flags_x86_sse4_2 || config_add CRYPTOPP_DISABLE_SSE4
-	use cpu_flags_x86_ssse3 || config_add CRYPTOPP_DISABLE_SSSE3
-
-	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
-	[[ ${CHOST} == *-darwin* ]] && config_add CRYPTOPP_DISABLE_ASM
-}
-
-src_compile() {
-	emake -f GNUmakefile all shared libcryptopp.pc
-}
-
-src_install() {
-	default
-
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/dev-libs/crypto++/crypto++-8.4.0.ebuild b/dev-libs/crypto++/crypto++-8.4.0.ebuild
deleted file mode 100644
index 276755fe4309..000000000000
--- a/dev-libs/crypto++/crypto++-8.4.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="C++ class library of cryptographic schemes"
-HOMEPAGE="https://cryptopp.com"
-SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
-S="${WORKDIR}"
-
-LICENSE="Boost-1.0"
-SLOT="0/8.4" # subslot is so version (was broken in 8.3.0, check on bumps!)
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x64-macos"
-IUSE="+asm static-libs"
-
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch"
-)
-
-config_uncomment() {
-	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
-}
-
-src_prepare() {
-	default
-
-	use asm || config_uncomment CRYPTOPP_DISABLE_ASM
-
-	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
-	[[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
-}
-
-src_configure() {
-	export CXX="$(tc-getCXX)"
-	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export PREFIX="${EPREFIX}/usr"
-	tc-export AR RANLIB
-	default
-}
-
-src_compile() {
-	emake -f GNUmakefile all shared libcryptopp.pc
-}
-
-src_install() {
-	default
-
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/dev-libs/crypto++/crypto++-8.5.0.ebuild b/dev-libs/crypto++/crypto++-8.5.0.ebuild
deleted file mode 100644
index af996cfaed97..000000000000
--- a/dev-libs/crypto++/crypto++-8.5.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/crypto++.asc
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="C++ class library of cryptographic schemes"
-HOMEPAGE="https://cryptopp.com"
-SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
-SRC_URI+=" verify-sig? ( https://cryptopp.com/cryptopp${PV//.}.zip.sig )"
-S="${WORKDIR}"
-
-LICENSE="Boost-1.0"
-# Bumped to 8.5 in 8.5.0 out of caution
-# subslot is so version (was broken in 8.3.0, check on bumps!)
-SLOT="0/8.5"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="+asm static-libs"
-
-BDEPEND="
-	app-arch/unzip
-	verify-sig? ( sec-keys/openpgp-keys-crypto++ )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch"
-)
-
-config_uncomment() {
-	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
-}
-
-src_prepare() {
-	default
-
-	use asm || config_uncomment CRYPTOPP_DISABLE_ASM
-
-	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
-	[[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
-}
-
-src_configure() {
-	export CXX="$(tc-getCXX)"
-	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export PREFIX="${EPREFIX}/usr"
-	tc-export AR RANLIB
-	default
-}
-
-src_compile() {
-	emake -f GNUmakefile all shared libcryptopp.pc
-}
-
-src_install() {
-	default
-
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/dev-libs/crypto++/files/crypto++-8.2.0-build.patch b/dev-libs/crypto++/files/crypto++-8.2.0-build.patch
deleted file mode 100644
index 7c7e8a9c1b66..000000000000
--- a/dev-libs/crypto++/files/crypto++-8.2.0-build.patch
+++ /dev/null
@@ -1,271 +0,0 @@
---- a/config.h	2019-07-02 19:25:10.448720035 +0300
-+++ a/config.h	2019-07-02 19:25:25.785455586 +0300
-@@ -514,7 +514,7 @@ NAMESPACE_END
- #endif
- 
- // 32-bit SunCC does not enable SSE2 by default.
--#if !defined(CRYPTOPP_DISABLE_ASM) && (defined(_MSC_VER) || CRYPTOPP_GCC_VERSION >= 30300 || defined(__SSE2__) || (__SUNPRO_CC >= 0x5100))
-+#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SSE2) && (defined(_MSC_VER) || CRYPTOPP_GCC_VERSION >= 30300 || defined(__SSE2__) || (__SUNPRO_CC >= 0x5100))
- 	#define CRYPTOPP_SSE2_INTRIN_AVAILABLE 1
- #endif
- 
-From fbbf0a08e8cf4faca661b0f75f806ea652abea70 Mon Sep 17 00:00:00 2001
-From: Jeffrey Walton <noloader@gmail.com>
-Date: Tue, 2 Jul 2019 16:55:00 -0400
-Subject: [PATCH] Add missing XOP header for blake2b_simd.cpp (GH #859) The
- Gentoo folks caught a bug at https://bugs.gentoo.org/689162. The 689162 bug
- uses -march=bdver1 -msse4.1 on a AMD Bulldozer machine.
-
-Investigating the issue we are missing the XOP header blake2b_simd.cpp. However, adding the XOP header is not enough for this particular config. Four source files fail to compile with the expected headers. We are waiting on the GCC folks to get back to us with a fix.
----
- blake2b_simd.cpp  | 5 +++++
- keccak_simd.cpp   | 5 +++++
- simon128_simd.cpp | 1 +
- speck128_simd.cpp | 1 +
- 4 files changed, 12 insertions(+)
-
-diff --git a/blake2b_simd.cpp b/blake2b_simd.cpp
-index ff138321..b246824c 100644
---- a/blake2b_simd.cpp
-+++ b/blake2b_simd.cpp
-@@ -32,6 +32,11 @@
- # undef CRYPTOPP_ALTIVEC_AVAILABLE
- #endif
- 
-+#if defined(__XOP__)
-+# include <immintrin.h>
-+# include <ammintrin.h>
-+#endif
-+
- #if (CRYPTOPP_SSE41_AVAILABLE)
- # include <emmintrin.h>
- # include <tmmintrin.h>
-diff --git a/keccak_simd.cpp b/keccak_simd.cpp
-index 45674ac2..ae2f2095 100644
---- a/keccak_simd.cpp
-+++ b/keccak_simd.cpp
-@@ -26,6 +26,11 @@
- # include <tmmintrin.h>
- #endif
- 
-+#if defined(__XOP__)
-+# include <immintrin.h>
-+# include <ammintrin.h>
-+#endif
-+
- // Squash MS LNK4221 and libtool warnings
- extern const char KECCAK_SIMD_FNAME[] = __FILE__;
- 
-diff --git a/simon128_simd.cpp b/simon128_simd.cpp
-index 5331c351..4b551f8f 100644
---- a/simon128_simd.cpp
-+++ b/simon128_simd.cpp
-@@ -23,6 +23,7 @@
- #endif
- 
- #if defined(__XOP__)
-+# include <immintrin.h>
- # include <ammintrin.h>
- #endif
- 
-diff --git a/speck128_simd.cpp b/speck128_simd.cpp
-index 2c356346..fb3eb1e6 100644
---- a/speck128_simd.cpp
-+++ b/speck128_simd.cpp
-@@ -23,6 +23,7 @@
- #endif
- 
- #if defined(__XOP__)
-+# include <immintrin.h>
- # include <ammintrin.h>
- #endif
- 
--- 
-2.21.0
-
-From eeb7dadc76572b7061922ca6ac5f247bdfd985ad Mon Sep 17 00:00:00 2001
-From: Jeffrey Walton <noloader@gmail.com>
-Date: Tue, 2 Jul 2019 19:10:11 -0400
-Subject: [PATCH] Fix missing _mm_roti_epi32 and _mm_roti_epi64 under GCC (GH
- #859)
-
----
- blake2b_simd.cpp  | 4 +++-
- blake2s_simd.cpp  | 7 +++++++
- chacha_simd.cpp   | 3 +++
- cham_simd.cpp     | 3 +++
- keccak_simd.cpp   | 4 +++-
- lea_simd.cpp      | 3 +++
- simeck_simd.cpp   | 3 +++
- simon128_simd.cpp | 4 +++-
- simon64_simd.cpp  | 3 +++
- speck128_simd.cpp | 4 +++-
- speck64_simd.cpp  | 3 +++
- 11 files changed, 37 insertions(+), 4 deletions(-)
-
-diff --git a/blake2b_simd.cpp b/blake2b_simd.cpp
-index b246824c..6803d0ae 100644
---- a/blake2b_simd.cpp
-+++ b/blake2b_simd.cpp
-@@ -33,8 +33,10 @@
- #endif
- 
- #if defined(__XOP__)
--# include <immintrin.h>
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+#  include <x86intrin.h>
-+# endif
- #endif
- 
- #if (CRYPTOPP_SSE41_AVAILABLE)
-diff --git a/blake2s_simd.cpp b/blake2s_simd.cpp
-index f02b9771..4b6d1bd6 100644
---- a/blake2s_simd.cpp
-+++ b/blake2s_simd.cpp
-@@ -42,6 +42,13 @@
- # undef CRYPTOPP_ALTIVEC_AVAILABLE
- #endif
- 
-+#if defined(__XOP__)
-+# include <ammintrin.h>
-+# if defined(__GNUC__)
-+#  include <x86intrin.h>
-+# endif
-+#endif
-+
- #if (CRYPTOPP_SSE41_AVAILABLE)
- # include <emmintrin.h>
- # include <tmmintrin.h>
-diff --git a/chacha_simd.cpp b/chacha_simd.cpp
-index a983ab69..5a63ecee 100644
---- a/chacha_simd.cpp
-+++ b/chacha_simd.cpp
-@@ -46,6 +46,9 @@
- 
- #if defined(__XOP__)
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+#  include <x86intrin.h>
-+# endif
- #endif
- 
- // C1189: error: This header is specific to ARM targets
-diff --git a/cham_simd.cpp b/cham_simd.cpp
-index 7fcaece1..e102a877 100644
---- a/cham_simd.cpp
-+++ b/cham_simd.cpp
-@@ -24,6 +24,9 @@
- 
- #if defined(__XOP__)
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+#  include <x86intrin.h>
-+# endif
- #endif
- 
- #if defined(__AVX512F__)
-diff --git a/keccak_simd.cpp b/keccak_simd.cpp
-index ae2f2095..194291a0 100644
---- a/keccak_simd.cpp
-+++ b/keccak_simd.cpp
-@@ -27,8 +27,10 @@
- #endif
- 
- #if defined(__XOP__)
--# include <immintrin.h>
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+#  include <x86intrin.h>
-+# endif
- #endif
- 
- // Squash MS LNK4221 and libtool warnings
-diff --git a/lea_simd.cpp b/lea_simd.cpp
-index b4180e34..ee2a5697 100644
---- a/lea_simd.cpp
-+++ b/lea_simd.cpp
-@@ -24,6 +24,9 @@
- 
- #if defined(__XOP__)
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+#  include <x86intrin.h>
-+# endif
- #endif
- 
- #if defined(__AVX512F__)
-diff --git a/simeck_simd.cpp b/simeck_simd.cpp
-index 2a9efc99..f92a53d7 100644
---- a/simeck_simd.cpp
-+++ b/simeck_simd.cpp
-@@ -24,6 +24,9 @@
- 
- #if defined(__XOP__)
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+#  include <x86intrin.h>
-+# endif
- #endif
- 
- // Squash MS LNK4221 and libtool warnings
-diff --git a/simon128_simd.cpp b/simon128_simd.cpp
-index 4b551f8f..cb16fa8d 100644
---- a/simon128_simd.cpp
-+++ b/simon128_simd.cpp
-@@ -23,8 +23,10 @@
- #endif
- 
- #if defined(__XOP__)
--# include <immintrin.h>
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+#  include <x86intrin.h>
-+# endif
- #endif
- 
- #if defined(__AVX512F__)
-diff --git a/simon64_simd.cpp b/simon64_simd.cpp
-index eb5a1757..fcbe1342 100644
---- a/simon64_simd.cpp
-+++ b/simon64_simd.cpp
-@@ -25,6 +25,9 @@
- 
- #if defined(__XOP__)
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+#  include <x86intrin.h>
-+# endif
- #endif
- 
- // C1189: error: This header is specific to ARM targets
-diff --git a/speck128_simd.cpp b/speck128_simd.cpp
-index fb3eb1e6..0c0f389e 100644
---- a/speck128_simd.cpp
-+++ b/speck128_simd.cpp
-@@ -23,8 +23,10 @@
- #endif
- 
- #if defined(__XOP__)
--# include <immintrin.h>
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+#  include <x86intrin.h>
-+# endif
- #endif
- 
- #if defined(__AVX512F__)
-diff --git a/speck64_simd.cpp b/speck64_simd.cpp
-index 0a720fb3..0b43c175 100644
---- a/speck64_simd.cpp
-+++ b/speck64_simd.cpp
-@@ -25,6 +25,9 @@
- 
- #if defined(__XOP__)
- # include <ammintrin.h>
-+# if defined(__GNUC__)
-+#  include <x86intrin.h>
-+# endif
- #endif
- 
- // C1189: error: This header is specific to ARM targets
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index de644abdb3d1..cd8d11290614 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -1,6 +1,8 @@
 DIST cudnn-10.2-linux-x64-v8.3.0.98.tgz 742140405 BLAKE2B 648849c041e2e7d87a8d804a35d9e0fa1d9a454977aaec4545386ee0c8b57c502b98583a357a70b7096905f82c2a8dadc252f8b363a7975d572167f4f7f2f121 SHA512 e0c6967663bdaf0e7539b550f1aa84aaf35efe6192fc524d78f6a1bc980a79b05eeb0693e9548f4d3433864f88137ce2ff1489d7dd0e8cf883000d6c7b9a62bb
 DIST cudnn-11.5-linux-x64-v8.3.0.98.tgz 1477554466 BLAKE2B cd8b7bdca8ef08af971d56b43b80f0fe721f76cb744bfef43a9369f81a2533b00651f2c89e9084026991a1cc1c6db13b55914d966b723edbfc104c3e7626a087 SHA512 46af7d47b40a2c0ee8d5b893514755f803b5a0c7426b8d88b258e71ae6312cb553cba7dd68f63e2060849c70713330d52f93f56121f663213c16030d39b2fc1d
 DIST cudnn-linux-x86_64-8.3.1.22_cuda11.5-archive.tar.xz 856769204 BLAKE2B 375021592470b1f17d7a69701f1ac3289ceb8ddbbdacf577fa51abfdad263102d3c6cedb24ac829c49e033300532e77b6064835a8ae1e05377e375f4320c9a15 SHA512 815ef678b7510e014181f3bf782e627771e8d00d218b34f2af11436b8a49331400269f98448854353c12721468365b71a8483eb7631777f0d628982e81942a8b
+DIST cudnn-linux-x86_64-8.3.2.44_cuda11.5-archive.tar.xz 857894928 BLAKE2B 7f0f4fe4d8ccd2e7385d5c4535f4543b3d8e80f65caa5a4d5fdaa1b386a76fe16d8d9e32745a098954eda8d0b803af6146c1ffc5b46c838ea0ccecd5923984cf SHA512 4f2159e48685613b436adb3995aa80cf6d5b395c146059ccc15ef2f5f7e47c94bfeebd14b09d8832f7df76d2379829aa32edb7b69852e17a8e7036084265ed39
 EBUILD cudnn-8.3.0.98.ebuild 832 BLAKE2B 70584e11eebea6788dfb5f1d9586810e85cbcd93f128546fe926ca39ad23a29c2eae24fdd78d7cb178de195982ced709d768358173b343a3fca6f870bb25c73e SHA512 16af64f86ac442b3ab5adf62fbc1e4da5ccb8d20b656125edb8b1de0bee29b197c48215af1d00ba00c50141f9e355a2d4194523d5778cdfe2b45a93399139fe4
 EBUILD cudnn-8.3.1.22.ebuild 700 BLAKE2B 7c3095b585ad73f24ea12fcb5dc580a648c634c8662c5fb3558bfbf66e08b3c3e6cc75d4cda856b44d2f7187ecff078c1b1a2ebfe1b74c78038184f3cc94feef SHA512 95b4da813d90fd828afefac712d4da9c5eea12445ce2fec8c0c7bc05a5f493428360b34da558610878d4c83b4dc5d8bd5d79c6bc17a367d52a5ee20e67db4835
+EBUILD cudnn-8.3.2.44.ebuild 700 BLAKE2B 7c3095b585ad73f24ea12fcb5dc580a648c634c8662c5fb3558bfbf66e08b3c3e6cc75d4cda856b44d2f7187ecff078c1b1a2ebfe1b74c78038184f3cc94feef SHA512 95b4da813d90fd828afefac712d4da9c5eea12445ce2fec8c0c7bc05a5f493428360b34da558610878d4c83b4dc5d8bd5d79c6bc17a367d52a5ee20e67db4835
 MISC metadata.xml 371 BLAKE2B 07b65e38f232d9b70e9769516ee4e535b2ad6a1d0deb1d6103c503aa0bccf34d1171e1d66a5c7415dd2be3cbbf33619486b18dfd69cefe8c3e5a3bac4387bf1e SHA512 c811a6d843e7c24a2c6c0763db24ede4562e33d797ae8d531b9dee890cfa3acc0f46f58fa595d92bc862a58a930023456e1fbdc31c63d5411bbd688f7ad0bf54
diff --git a/dev-libs/cudnn/cudnn-8.3.2.44.ebuild b/dev-libs/cudnn/cudnn-8.3.2.44.ebuild
new file mode 100644
index 000000000000..167d9bc667cc
--- /dev/null
+++ b/dev-libs/cudnn/cudnn-8.3.2.44.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
+HOMEPAGE="https://developer.nvidia.com/cudnn"
+SRC_URI="cuda11-5? ( cudnn-linux-x86_64-${PV}_cuda11.5-archive.tar.xz )"
+S="${WORKDIR}/cudnn-linux-x86_64-${PV}_cuda11.5-archive"
+
+LICENSE="NVIDIA-cuDNN"
+SLOT="0/8"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="+cuda11-5"
+REQUIRED_USE="^^ ( cuda11-5 )"
+RESTRICT="fetch"
+
+RDEPEND="
+	cuda11-5? ( =dev-util/nvidia-cuda-toolkit-11.5* )"
+
+QA_PREBUILT="*"
+
+src_install() {
+	insinto /opt/cuda/targets/x86_64-linux
+	doins -r include
+
+	insinto /opt/cuda/targets/x86_64-linux/lib
+	doins -r lib/.
+}
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 9a42cbb6cb1b..3a53a3aba347 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,7 +1,5 @@
 AUX cyberjack-3.99.5_p14-gcc10.patch 344 BLAKE2B c535dd6c5d034b0ad81dd6ce6364d2c8807e1adfb2391d5b801cf285260c6f55c2bdf9f56e3bf4c0fc06cc8f87128855f34f6e3519a6ebc67a7b6eba10aa8008 SHA512 7ee096fbca22ffccff1ae941c7e16578ee10ab3b7704902dee4643bdf1a3d1592ae5cd19625414245fd4c1ee6f10d8a869e273e47d71c47a3300356a0709995d
 AUX libifd-cyberjack6.udev-r1 1435 BLAKE2B 3606ea979cf8bc068eb7ab447af70f5f9c409369554868ba36a43eaa7202813587b2193b0ef16b42a68bb665f4eaee5ac976774ec0f77dbaa93b447a6e6021bd SHA512 bfefad4cd2b509a41d3e8f638364a3f604e80dd5302456ca9d27d592175e30a2c348353d35fda242f2f80651efcd111c7294ecde7a8d80f1c7e1a655240483d2
-DIST pcsc-cyberjack_3.99.5final.SP14.tar.bz2 1682821 BLAKE2B 389b0da28beec42e3e2f1766b76dd77efec24bf7aea906ff14ad206c182162125431ac6c81e9242813c088b4936958b8056f5e7c71424c95de6e8e1ac2357aed SHA512 c83e142d6c071f7f20f9f15b9b76ed819873760bda4b49ec042506b2d7ef9ad8674c953abe67f08a1c4b178ce44767ba6479ea1148d8eeb38797e4775b2a9e82
 DIST pcsc-cyberjack_3.99.5final.SP15.tar.bz2 1681827 BLAKE2B e6b8325e4822f24e31b7986d5a7bc0ee2c99bd29568c19ac1fe8d308f561b0bcecfcc3e0ac2633b13986b2422bb014d28c7953e622021476ac3188de4dd0ed15 SHA512 d1a5454aea96866581f48a240b96013bd0c313965a8ef7a384ac41a929f3e805ad13590c383dab7638134c730e6f26e6cd1492d533f4910aad7c515016452258
-EBUILD cyberjack-3.99.5_p14-r2.ebuild 1910 BLAKE2B ce129e192cd8396a8a4d20c39b2f58bb8f3b38cfe16c10692490c3a8222f5b71cca1a200a7dda81f98ed0e601de6bb99e6864e9c97e19e98ca9a8954a00c2c0c SHA512 30fe40220ff67cd04e1b3b4701e83a1f3d8ffd8d20976c91e711be7777deb13cb2108021b81a7691eef24ac068047846e234c71d477fa410b67f1d40fb7b7470
-EBUILD cyberjack-3.99.5_p15.ebuild 1907 BLAKE2B cf186511e2152db3b2b21bc346b50dcfe6211fdab1f6fee99ff8528b6dae43d129c6be1d0ee6d02e35bdc67ffca310134db00e40530a9d7456e2238c6327c6a2 SHA512 8e9f89f995c6070da3020dc6a84fa8d392ca853643093a0a47bb4a808a021a1143fbc04e3fe2f367f00771b57f3d9c471ef4ae85e8325b7ef1b7ee8178361c26
+EBUILD cyberjack-3.99.5_p15.ebuild 1905 BLAKE2B 0fd1d9a12e7068c8de4d2fbd2f9a3457bae595f6351c0d1f56eccf3e135d38c9663034588ab8c34f7e55f9cb20e624d9f7a5826e38ae931fdb52c9e14bdadf8d SHA512 ca09c5320edd03cd6282f80f11f832b4f4bdc3acd132308caf69f80da804323a7232d3d07cf3a289f6ac9adf32749fe572ae8b32811bef4e6091807ad21c1512
 MISC metadata.xml 551 BLAKE2B b6c0ee4b76f7f7e58c0cf3a09d581143fe24dc863beda59337e51605463e58c93801848f115ab710937f3e17fec8c62fcdd98da27fa7b108466ca75491b28ac2 SHA512 d43d9224b8508447ca3410792bed8e88b791c1029d2412e4be251ea41be564fce12ecf0ae1172c47c6be10371278ad35f22eafc17490a5a96f4e6c081adbcd05
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
deleted file mode 100644
index 6324d86c3a9e..000000000000
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="pcsc-${PN}"
-MY_PV="${PV/_p/final.SP}"
-MY_P="${MY_PN}_${MY_PV}"
-
-inherit autotools toolchain-funcs udev
-
-DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
-HOMEPAGE="https://www.reiner-sct.de/"
-SRC_URI="https://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.gz -> ${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P/_/-}"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="static-libs threads tools +udev xml"
-
-RDEPEND="
-	sys-apps/pcsc-lite
-	virtual/libusb:1=
-	udev? ( virtual/udev )
-	xml? ( dev-libs/libxml2:2= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/${P}-gcc10.patch"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-debug
-		--disable-error-on-warning
-		--disable-hal
-		--disable-mac-universal
-		--disable-mac-arches-i386
-		--disable-mac-arches-x86_64
-		--disable-visibility
-		--enable-nonserial
-		--enable-pcsc
-		--enable-release
-		--enable-warnings
-		--sysconfdir="/etc/cyberjack"
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(use_enable udev)
-		$(use_enable xml xml2)
-		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use tools; then
-		# cjBingo can't be compiled, as it's defines stuff, which got dropped
-		cd "${S}"/tools/cjflash && emake
-		cd "${S}"/tools/cjgeldkarte && emake
-	fi
-}
-
-src_install() {
-	default
-
-	use tools && dobin tools/cjflash/cjflash tools/cjgeldkarte/cjgeldkarte
-	use udev && udev_newrules "${FILESDIR}"/libifd-cyberjack6.udev-r1 99-cyberjack.rules
-
-	dodoc debian/changelog doc/{LIESMICH,README}.{pdf,txt,xml}
-
-	docinto html
-	dodoc doc/{LIESMICH,README}.html
-
-	docinto source
-	dodoc doc/*.c*
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p15.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p15.ebuild
index 44af14f1ad60..a5075094fe49 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p15.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p15.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.reiner-sct.de/"
 SRC_URI="https://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P/_/-}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE="static-libs threads tools +udev xml"
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index a5d39cf650ea..f5d8e3e6389f 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,13 +1,4 @@
-AUX cyrus-sasl-2.1.25-auxprop.patch 552 BLAKE2B 2d932e05863da6b108eec405e792003d6d8df4bde07bd044537729232a9b23e7261cbb33b82df7c5685ee96aae3e0aed62317f89e970fbedffea65bf9d89ccdc SHA512 73ae914e684ae698eb56a1579ba9a477a946625a3b079e2b400d88583074f1701d8a6926ed17dea36b923050f21c04fbf746d54284568bd21c14be3d10283b6f
-AUX cyrus-sasl-2.1.26-missing-size_t.patch 280 BLAKE2B d686930b0b04f994ef9f5315ee86e69b61b8e800e192ab45f0b891d3f13a12c2bbd11f99a15533169d0690e9558dcc0327f6632a1a3baaa68679784079884088 SHA512 d6ed3a981da06f60d63b0364d8d841922bb007bf478b67558e88e9b297a4ed7c8eee9501e232d9ca17601f63f6c1cf04962a59c4f0c24fc641868d56006b3616
-AUX cyrus-sasl-2.1.27-CVE-2019-19906.patch 706 BLAKE2B 5165697869a0ce71ecba927165e164df12b1329183e4215a888b64e0e7ca00fa22662bd97ddc2bc6e057c7655c0792f9ce6c20dfc5c351fbcb9a4af4168ce001 SHA512 3b9448f32216ce794b615b3c7c2e6acd6c01892ff35db78a55d44adc4cee3f540a443d5da5f07124bea134e2cfd88a45bb02b169a6015313d540caf363ab8378
-AUX cyrus-sasl-2.1.27-as_needed.patch 1141 BLAKE2B 7d289e96ef1f4593dd48db270dd698a7cf6f21aae3c58043b0f8af30c2d935b24d2a4902f39c9fcfc3261833d1b09032511919f15fc94f62527e46ea25cb2fcc SHA512 9eefa6d45e3dd9157a5672909acdd88f0ae35e76d64c3723890a474bbb05b22499cfadb0c077924d27f34da3710b2b700094dd7d5704050138c08dabcefdde94
-AUX cyrus-sasl-2.1.27-autotools_fixes.patch 749 BLAKE2B b7f832a5e937053deaf1696f8dbf777ebf789df8165fe90f6d1be7efc47e4114a8a467c74f4acf06245e7ffab22f62436159cd610ebe5c5b0cef61f1cb01fb71 SHA512 0d99ca049e76c11500769079d94f3bdb634bddb4c8d45a83b383e9bb9777edda66b17566800acbd450e1f4842d070ec3fbc236e7f0ef8759c36e6dd5ea8e3c64
-AUX cyrus-sasl-2.1.27-avoid_pic_overwrite.patch 866 BLAKE2B 1e117d9d07ad3937066c7b4ef8415df55bf9c5ce821902331792056e6df63e366fd3adebfdf09f0292aae889d0db632521f37ec5ebf74005b71a474ccc6fe250 SHA512 4ca601839b023ef790e48dae567ffbbd57c632384c980946639ec7437ad23874961451718569455e6e25afaeff1728ecbc71a8686f6b43246f83465f95a2c904
-AUX cyrus-sasl-2.1.27-doc_build_fix.patch 417 BLAKE2B 2a76fcce47d248ccf0dfd08b6d18c94c5426601964fff64c0579b3c2ef2be28673e80a00f298e4830797adc3404c7c79ebce8b5869af443248bd1a25fdf7f2eb SHA512 6d723e7ec2c431b45c011b887187b6a670dbe646aa4c39d38171047ab23db529c30c433f8d4dd624181917c5ce4e5271f86e35e2644ede1c40dfb09cb67dccde
-AUX cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch 734 BLAKE2B fa45f0bc2598602b9bff76fa4462010507227f4e914ae265c2715cbfb13f71848564e886bd59ce9ff0f6ff4920b215cf28a4511d8928cd93283469fa9e657011 SHA512 fca4f2b7e427c7613f71daa4a31772c33c8c0fe9d7f85b57b85da71bc5a88a18fc52f7caea463188b4addd31cd041d5349af689d5face2cc45fb50c700a8afd7
-AUX cyrus-sasl-2.1.27-memmem.patch 1559 BLAKE2B 97d624b575b7479ba84b0d0fed98743eddb0419b38957c55ba66475e1509bb7fa9a2db517b1a2bcdc73f1dbdbf3031f7641890ddc4858a08af38ece082c0fa82 SHA512 6e3c6bb4212fe0cb29f4432d94d6cfc4dc9437a30dd5c4fb4d5a30afb4a9a5273674386d6c81da1829553968b371d98c4fa2efb686a62f84944a456fd420415c
-AUX cyrus-sasl-2.1.27-slibtool.patch 599 BLAKE2B 1dc8cb7edd82216cbf36c5d4dd5279f9530e169565bc8bba90d3e54485c9a549cc8639ebd8909c796e907bffce2816810782a33893afeedc5cf02c33559356e7 SHA512 4783c54f9d6db3eccb1324b3bbde9e99c9fd9ad8a31974b7c236f022e9f916745818da5308c1bb08f4238e1e5df9ab464aacb764e3ddd41cf08481f83b5c4036
+AUX cyrus-sasl-2.1.28-fix-configure-time-check.patch 2206 BLAKE2B cc06bc18b3f0a3a4d5ebf5e9551467f62c210f5562de6870d63a76f206b83d4fca1faee2ff2bc9314704ff7c6c2b0d1aa0dd64987951cce1ba31ee5858b34875 SHA512 fd25192e32af5acc15205458aacb2e26939d65e3affdfe93523125f2222a09eab67ff12d4628638d50e42f30578ad0d5095f61f59dfd4bef2a96491cc7c3a257
 AUX cyrus-sasl.conf 34 BLAKE2B f41e1d0d58f484958648cc6f6e2903cf7555f825a1f073b247b4080f575f8508b9a73c9d02c155178d2031019a48ff6300adf60bbb0286a6f7dc710c72f433c3 SHA512 67b9bb97191d091ffc2b8f450ad88a558df304a29651a9a49407c50df0a316666a96e7d1a2ca3ac8ee5e60a58a5d5b618ce963661f4f45049dc6b3ef2cf8099e
 AUX java.README.gentoo 934 BLAKE2B f3447c8422f07cfc17b5e240d5c2fe894f94118132360dda4a5eb04fa51acab10b13d01fcb68beaf6308926256e7c95c457a43f3f697e0c755c7c08143e6c3f6 SHA512 afcecb94e8e8c427b9491fc21312f4bed2a7d4ecedbbec8fec895cf8ca1e747073979f4415e12d8499eadbc29e8d74c6029f7cdfd7a2cb732454faaa19d52dd4
 AUX pwcheck.rc6 409 BLAKE2B c3e27eeeca23d60aad6078d0e66887b40742a516caf585bfe21619275bae59bd2a9da0c31299c03f1c1aff2e340b93b434816e16d196554d59e78b7fdba5f78d SHA512 797317f0361d6d849ca35c5189ba0cb562e58d62022ce7c29229aab71e8ce4c1e3e6409cd3b092b666724a00b0b3b6071e527cc49050fc34590ef3b1a7648f8a
@@ -18,6 +9,7 @@ AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.27-r6-patches.tar.bz2 5169 BLAKE2B 43a2f0db4a8589ec1cde7807b31a93459eacb04d27ba36751a69dd5f4e669d1b28342194b0e1a5382e281a52a35e88168877b54065cfba01b9bd33e87fbd23f1 SHA512 41c4ca7c8f7b79e03faf5d826a6ff0ed398137239b93fb0046ccbf385f6ddeab2b9fb2f51d7a263dc74626e5fdbefb28615a1ee22aabe57ed57f10a52d382797
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
-EBUILD cyrus-sasl-2.1.27-r4.ebuild 8288 BLAKE2B d9030f78ed7e1fe0f86aea42a0202694cd1768612b0aea18cf8f589aeebc45bc77fcb03cd987c039e7ab0b39d5c15c5de47c77043159ffe00b11510fd1b9e71f SHA512 9c662f6dff16579c8ff3ec840e5df4fc9772adc8e08700a1c7d86b5f00e83f4711010a70cc82c2b46ff6a9d5b442c1f5dbca395afa4f7a78aed39624b571ed80
-EBUILD cyrus-sasl-2.1.27-r6.ebuild 7968 BLAKE2B bd4aaefc34577f98340ecbd99e96158a1c88f521dd361566ca7dae819f8c8694547581b3cea5b0903137ba09ef01aa2c0af58c0b7700cae29e21d52557e2fdef SHA512 9d55e3c04dd3244160527e33264e04aafe12631c6ba5ea047e3ef79a014caee36e81ede6ab9487d5ed5e6f16416d0de423482494ff5f3e8980e75108d971cb6b
+DIST cyrus-sasl-2.1.28.tar.gz 4034803 BLAKE2B 6cca8c26cebb9c2ee5d539c43797d30b6309a476ec4233225789978e1d7315c4ea5d2abbc7f5464be0f3c0de5fd9212706b43fbc92f40b76cd0b1013cc00f823 SHA512 db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78
+EBUILD cyrus-sasl-2.1.27-r6.ebuild 7969 BLAKE2B 1b01b3022944d482d250795af83404b3678267ce150d9ac4f67bacc26c623e95b721a81e29d5d0018087987356dba430d3a32857bd5191b92a0247675df27b17 SHA512 d8f8cd1234860cd75cf5b5dbee19683a37887fd3e292ffa28d6c11bc2416120ad72a4726c91016a87dfc2406aa2bad318b6a1812c2db64d1c6ee041e252c8409
+EBUILD cyrus-sasl-2.1.28-r1.ebuild 7155 BLAKE2B 2236c85cc6fdcf024a1585d16cd17efc465ce8f2e0b6973a5fcbed748c67067a3af16b42c526ea69cac6dd4158c7096a6bc96e29e1b7840ca740f53f0e6ac9b6 SHA512 2c4aa24d278f2777e6e0f1d88679847eeb716022f6b727e880a6121af07ca6574a238cd147fdc25a91325d2ae16e708b78bfe1a4413615358e3e9e60ed5194d2
 MISC metadata.xml 721 BLAKE2B 23da714758f539942c45bd8f04fa0f435f0e1a4770c258ca4a1e73f89a627335d6804f636dc38d8b356968bb859ca7a65ca428e24e8eb0e64ed7f666d2c7f3b6 SHA512 388ec91796dfa0eed11200822ff521e5094a072c56469adf20f2a1a18c6e4501e73f8182a1372f7d301b28aecf755d81e330f7cfeb6b742c894c7b7750bbf7dd
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild
index 99c0c56d8889..8f8d05f0c9d3 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.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
@@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VE
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 
 CDEPEND="
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r1.ebuild
index 670450a576e0..034e9ed863fe 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r1.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit edos2unix flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd toolchain-funcs tmpfiles
+inherit autotools edos2unix flag-o-matic multilib multilib-minimal pam db-use systemd toolchain-funcs tmpfiles
 
 SASLAUTHD_CONF_VER="2.1.26"
-
+MY_PATCH_VER="${PN}-2.1.27-r6-patches"
 DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
 HOMEPAGE="https://www.cyrusimap.org/sasl/"
 #SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VER}.tar.bz2"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
+REQUIRED_USE="ldapdb? ( openldap )"
 
-CDEPEND="
-	net-mail/mailbase
+DEPEND="net-mail/mailbase
 	virtual/libcrypt:=
 	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
 	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
@@ -29,63 +30,38 @@ CDEPEND="
 	pam? ( >=sys-libs/pam-0-r1[${MULTILIB_USEDEP}] )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-	ssl? (
-		>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jdk-1.6:= )"
-
-REQUIRED_USE="ldapdb? ( openldap )"
-
-RDEPEND="
-	${CDEPEND}
+	ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-sasl )"
 
-DEPEND="${CDEPEND}"
-
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/sasl/md5global.h
 )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch"
-	"${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch"
-	"${FILESDIR}/${PN}-2.1.27-as_needed.patch"
-	"${FILESDIR}/${PN}-2.1.25-auxprop.patch"
-	"${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch"
-	"${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
-	"${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
-	"${FILESDIR}/${PN}-2.1.27-memmem.patch"
-	"${FILESDIR}/${PN}-2.1.27-CVE-2019-19906.patch"
-	"${FILESDIR}/${PN}-2.1.27-slibtool.patch"
+	"${WORKDIR}"/${MY_PATCH_VER}/cyrus-sasl-2.1.25-auxprop.patch
+	"${WORKDIR}"/${MY_PATCH_VER}/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
+	"${WORKDIR}"/${MY_PATCH_VER}/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
+	"${FILESDIR}"/cyrus-sasl-2.1.28-fix-configure-time-check.patch
 )
 
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
 src_prepare() {
 	default
 
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.ac || die
-
 	# Use plugindir for sasldir
+	# https://github.com/cyrusimap/cyrus-sasl/issues/339 (I think)
 	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
 		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
 
-	# #486740 #468556
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		configure.ac || die
+	# bug #486740 and bug #468556 (dropped AM_CONFIG_HEADER sed in 2.1.28)
+	sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' configure.ac || die
 
 	eautoreconf
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
 }
 
 src_configure() {
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
 	append-flags -fno-strict-aliasing
 
 	if [[ ${CHOST} == *-solaris* ]] ; then
@@ -102,9 +78,6 @@ src_configure() {
 }
 
 multilib_src_configure() {
-	# Java support
-	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
 	local myeconfargs=(
 		--enable-login
 		--enable-ntlm
@@ -117,7 +90,7 @@ multilib_src_configure() {
 		--with-saslauthd="${EPREFIX}"/run/saslauthd
 		--with-pwcheck="${EPREFIX}"/run/saslauthd
 		--with-configdir="${EPREFIX}"/etc/sasl2
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
+		--with-plugindir="${EPREFIX}/usr/$(get_libdir)/sasl2"
 		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
 		--with-sphinx-build=no
 		$(use_with ssl openssl)
@@ -126,10 +99,9 @@ multilib_src_configure() {
 		$(use_enable ldapdb)
 		$(multilib_native_use_enable sample)
 		$(use_enable kerberos gssapi)
-		$(multilib_native_use_enable java)
 		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
-		$(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
+		$(multilib_native_use_with postgres pgsql "${EPREFIX}/usr/$(get_libdir)/postgresql")
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr/$(get_libdir)")
 		$(use_enable srp)
 		$(use_enable static-libs static)
 
@@ -167,16 +139,6 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
-multilib_src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	if multilib_is_native_abi && use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
 multilib_src_install() {
 	default
 
@@ -188,18 +150,6 @@ multilib_src_install() {
 			doexe sample/client sample/server
 		fi
 
-		# Default location for java classes breaks OpenOffice (bug #60769).
-		if use java; then
-			java-pkg_dojar ${PN}.jar
-			java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
-			# hackish, don't wanna dig through makefile
-			rm -rf "${ED}/usr/$(get_libdir)/java" || die
-			docinto "java"
-			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-			insinto "/usr/share/doc/${PF}/java/Test"
-			doins "${S}"/java/Test/*.java
-		fi
-
 		dosbin saslauthd/testsaslauthd
 	fi
 }
@@ -209,28 +159,28 @@ multilib_src_install_all() {
 
 	keepdir /etc/sasl2
 
-	# Reset docinto to default value (#674296)
+	# Reset docinto to default value (bug #674296)
 	docinto
 	dodoc AUTHORS ChangeLog doc/legacy/TODO
 	newdoc pwcheck/README README.pwcheck
 
 	newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
-	edos2unix "${ED}/usr/share/doc/${PF}/release-notes"
+	edos2unix "${ED}"/usr/share/doc/${PF}/release-notes
 
 	docinto html
 	dodoc doc/html/*.html
 
 	if use pam; then
-		newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+		newpamd "${FILESDIR}"/saslauthd.pam-include saslauthd
 	fi
 
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-	systemd_dounit "${FILESDIR}/pwcheck.service"
+	newinitd "${FILESDIR}"/pwcheck.rc6 pwcheck
+	systemd_dounit "${FILESDIR}"/pwcheck.service
 
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	dotmpfiles "${FILESDIR}/${PN}.conf"
+	newinitd "${FILESDIR}"/saslauthd2.rc7 saslauthd
+	newconfd "${FILESDIR}"/saslauthd-${SASLAUTHD_CONF_VER}.conf saslauthd
+	systemd_dounit "${FILESDIR}"/saslauthd.service
+	dotmpfiles "${FILESDIR}"/${PN}.conf
 
 	# The get_modname bit is important: do not remove the .la files on
 	# platforms where the lib isn't called .so for cyrus searches the .la to
@@ -246,10 +196,13 @@ pkg_postinst() {
 	# Generate an empty sasldb2 with correct permissions.
 	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
 		einfo "Generating an empty sasldb2 with correct permissions ..."
+
 		echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
 			|| die "Failed to generate sasldb2"
+
 		"${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
 			|| die "Failed to delete temp user"
+
 		chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
 			|| die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
 		chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-auxprop.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-auxprop.patch
deleted file mode 100644
index a9dd1476d2e6..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-auxprop.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugzilla.cyrusimap.org/show_bug.cgi?id=3590
-https://bugs.gentoo.org/show_bug.cgi?id=392761
-
---- cyrus-sasl-2.1.25/lib/auxprop.c~	2011-10-20 17:33:46.423015318 +0200
-+++ cyrus-sasl-2.1.25/lib/auxprop.c	2011-10-20 17:48:49.336348654 +0200
-@@ -971,6 +971,10 @@
-     }
- 
-     if(!found) {
-+	/* compatibility with <= 2.1.23, ignore the lack of auxrop plugin */
-+	if (!plist)
-+	    result = SASL_OK;
-+	else
- 	_sasl_log(sparams->utils->conn, SASL_LOG_DEBUG,
- 		  "could not find auxprop plugin, was searching for '%s'",
- 		  plist ? plist : "[all]");
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-missing-size_t.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-missing-size_t.patch
deleted file mode 100644
index 0177b52567f2..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-missing-size_t.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Gentoo bug #458790
---- a/include/sasl.h
-+++ b/include/sasl.h
-@@ -121,6 +121,9 @@
- #ifndef SASL_H
- #define SASL_H 1
- 
-+/* stddef.h to get size_t defined */
-+#include <stddef.h>
-+
- /* Keep in sync with win32/common.mak */
- #define SASL_VERSION_MAJOR 2
- #define SASL_VERSION_MINOR 1
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-CVE-2019-19906.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-CVE-2019-19906.patch
deleted file mode 100644
index 82b9e1fb6dbe..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-CVE-2019-19906.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: CVE-2019-19906: Off-by-one in _sasl_add_string function
-Origin: vendor
-Bug: https://github.com/cyrusimap/cyrus-sasl/issues/587
-Bug-Debian: https://bugs.debian.org/947043
-Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-19906
-Author: Stephan Zeisberg <stephan@srlabs.de>
-Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
-Last-Update: 2019-12-19
-
---- a/lib/common.c
-+++ b/lib/common.c
-@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t
- 
-   if (add==NULL) add = "(null)";
- 
--  addlen=strlen(add); /* only compute once */
-+  addlen=strlen(add)+1; /* only compute once */
-   if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK)
-     return SASL_NOMEM;
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch
deleted file mode 100644
index 7cd9e151fbb7..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Matthias Klose <doko@ubuntu.com>
-Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
-it.
---- cyrus-sasl-2.1.27/saslauthd/Makefile.am
-+++ cyrus-sasl-2.1.27/saslauthd/Makefile.am
-@@ -25,7 +25,7 @@
- saslauthd_DEPENDENCIES = saslauthd-main.o $(LTLIBOBJS_FULL)
- saslauthd_LDADD	= @SASL_KRB_LIB@ \
- 		  @GSSAPIBASE_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
--		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS)
-+		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS)
- 
- testsaslauthd_SOURCES = testsaslauthd.c utils.c
- testsaslauthd_LDADD = @LIB_SOCKET@
---- cyrus-sasl-2.1.27/sasldb/Makefile.am
-+++ cyrus-sasl-2.1.27/sasldb/Makefile.am
-@@ -54,6 +54,6 @@
- 
- libsasldb_la_SOURCES = allockey.c sasldb.h
- EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
--libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
--libsasldb_la_LIBADD = $(SASL_DB_BACKEND)
-+libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
-+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
- libsasldb_la_LDFLAGS = -no-undefined
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch
deleted file mode 100644
index 2ce971efc5b5..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- cyrus-sasl-2.1.27/configure.ac
-+++ cyrus-sasl-2.1.27/configure.ac
-@@ -44,6 +44,8 @@
- 
- AC_PREREQ(2.63)
- 
-+AC_CONFIG_MACRO_DIR([config])
-+
- dnl
- dnl REMINDER: When changing the version number here, please also update
- dnl the values in win32/include/config.h and include/sasl.h as well.
---- cyrus-sasl-2.1.27/Makefile.am
-+++ cyrus-sasl-2.1.27/Makefile.am
-@@ -44,6 +44,8 @@
- #
- ################################################################
- 
-+ACLOCAL_AMFLAGS = -I config
-+
- if SASLAUTHD
- SAD = saslauthd
- else
---- cyrus-sasl-2.1.27/saslauthd/Makefile.am
-+++ cyrus-sasl-2.1.27/saslauthd/Makefile.am
-@@ -1,4 +1,6 @@
- AUTOMAKE_OPTIONS = 1.7
-+ACLOCAL_AMFLAGS = -I ../config
-+
- sbin_PROGRAMS	= saslauthd testsaslauthd
- EXTRA_PROGRAMS  = saslcache
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
deleted file mode 100644
index c331039e2f16..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Fabian Fagerholm <fabbe@debian.org>
-Description: This patch makes sure the non-PIC version of libsasldb.a, which
-is created out of non-PIC objects, is not going to overwrite the PIC version,
-which is created out of PIC objects. The PIC version is placed in .libs, and
-the non-PIC version in the current directory.  This ensures that both non-PIC
-and PIC versions are available in the correct locations.
---- cyrus-sasl-2.1.27/lib/Makefile.am
-+++ cyrus-sasl-2.1.27/lib/Makefile.am
-@@ -98,7 +98,7 @@
- 
- libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
- 	@echo adding static plugins and dependencies
--	$(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
-+	$(AR) cru $@ $(SASL_STATIC_OBJS)
- 	@for i in ./libsasl2.la ../common/libplugin_common.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
- 	if test ! -f $$i; then continue; fi; . $$i; \
- 	for j in $$dependency_libs foo; do \
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch
deleted file mode 100644
index bdd02f779660..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py
-+++ cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py
-@@ -23,7 +23,7 @@
- from sphinx import addnodes
- from sphinx.locale import admonitionlabels, _
- from sphinx.util.osutil import ustrftime
--from sphinx.util.compat import docutils_version
-+#from sphinx.util.compat import docutils_version
- 
- class CyrusManualPageWriter(ManualPageWriter):
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
deleted file mode 100644
index c585cb158e15..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Gentoo bug #389349
---- cyrus-sasl-2.1.27/m4/sasl2.m4
-+++ cyrus-sasl-2.1.27/m4/sasl2.m4
-@@ -220,7 +220,11 @@
-                  [AC_WARN([Cybersafe define not found])])
- 
-   elif test "$ac_cv_header_gssapi_h" = "yes"; then
--    AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
-+    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
-+                 [#include <gssapi.h>
-+                  #ifdef GSS_C_NT_HOSTBASED_SERVICE
-+                    hostbased_service_gss_nt_yes
-+                  #endif],
-                     [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-                                [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])])
-   elif test "$ac_cv_header_gssapi_gssapi_h"; then
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-memmem.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-memmem.patch
deleted file mode 100644
index 158529dcb5f5..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-memmem.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-auth_rimap: provide naive memmem implementation if missing
-
-read_response uses memmem, which is not available on e.g. Solaris 10
-
-Bug: https://github.com/cyrusimap/cyrus-sasl/pull/551
-Signed-off-by: Fabian Groffen <grobian@gentoo.org>
-
---- a/saslauthd/auth_rimap.c
-+++ b/saslauthd/auth_rimap.c
-@@ -367,6 +367,32 @@
- /* END FUNCTION: process_login_reply */
- 
- 
-+#ifndef HAVE_MEMMEM
-+static void *memmem(
-+		const void *big, size_t big_len,
-+		const void *little, size_t little_len)
-+{
-+	const char *bp = (const char *)big;
-+	const char *lp = (const char *)little;
-+	size_t l;
-+
-+	if (big_len < little_len || little_len == 0 || big_len == 0)
-+		return NULL;
-+
-+	while (big_len > 0) {
-+		for (l = 0; l < little_len; l++) {
-+			if (bp[l] != lp[l])
-+				break;
-+		}
-+		if (l == little_len)
-+			return (void *)bp;
-+		bp++;
-+	}
-+
-+	return NULL;
-+}
-+#endif
-+
- static int read_response(int s, char *rbuf, int buflen, const char *tag)
- {
-     int rc = 0;
---- a/configure.ac
-+++ b/configure.ac
-@@ -1292,7 +1292,7 @@
- 
- #AC_FUNC_MEMCMP
- #AC_FUNC_VPRINTF
--AC_CHECK_FUNCS(gethostname getdomainname getpwnam getspnam gettimeofday inet_aton memcpy mkdir select socket strchr strdup strerror strspn strstr strtol jrand48 getpassphrase asprintf strlcat strlcpy)
-+AC_CHECK_FUNCS(gethostname getdomainname getpwnam getspnam gettimeofday inet_aton memcpy memmem mkdir select socket strchr strdup strerror strspn strstr strtol jrand48 getpassphrase asprintf strlcat strlcpy)
- 
- if test $ac_cv_func_getspnam = yes; then
- 	AC_MSG_CHECKING(if getpwnam_r/getspnam_r take 5 arguments)
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-slibtool.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-slibtool.patch
deleted file mode 100644
index 81198cb87f0d..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-slibtool.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/cyrusimap/cyrus-sasl/pull/623
-https://bugs.gentoo.org/775875
-
-From 5b8075eeba8d0334573689450b07610c176a2618 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Wed, 9 Sep 2020 07:29:38 -0700
-Subject: [PATCH] common: Define the missing crypto_compat_version version.
-
---- a/common/Makefile.am
-+++ b/common/Makefile.am
-@@ -46,6 +46,7 @@
- # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
- # CURRENT:REVISION:AGE
- plugin_common_version = 3:0:0
-+crypto_compat_version = 0:0:0
- 
- AM_CPPFLAGS=-fPIC -I$(top_srcdir)/include -I$(top_builddir)/include
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.28-fix-configure-time-check.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.28-fix-configure-time-check.patch
new file mode 100644
index 000000000000..873dac53fe03
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.28-fix-configure-time-check.patch
@@ -0,0 +1,50 @@
+https://github.com/cyrusimap/cyrus-sasl/pull/709
+
+From 399625c3413c313e93432d0f5907350722b861c7 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 23 Feb 2022 00:45:15 +0000
+Subject: [PATCH] Fix <time.h> check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We're conditionally including based on HAVE_TIME_H in a bunch of places,
+but we're not actually checking for time.h, so that's never going to be defined.
+
+While at it, add in a missing include in the cram plugin.
+
+This fixes a bunch of implicit declaration warnings:
+```
+ * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration]
+ * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration]
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -1290,7 +1290,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h])
+ 
+ AC_HEADER_DIRENT
+ AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h)
++AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h time.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h)
+ 
+ IPv6_CHECK_SS_FAMILY()
+ IPv6_CHECK_SA_LEN()
+--- a/plugins/cram.c
++++ b/plugins/cram.c
+@@ -53,6 +53,10 @@
+ #endif
+ #include <fcntl.h>
+ 
++#ifdef HAVE_TIME_H
++#include <time.h>
++#endif
++
+ #include <sasl.h>
+ #include <saslplug.h>
+ #include <saslutil.h>
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 19edce369daa..7fd8cf9540d8 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,9 +1,3 @@
-DIST double-conversion-3.1.5.tar.gz 7023792 BLAKE2B ed70a554bd52e23aadecbeaa6607dfcdb670450b95e2ff699c784512e6cb0c022f51f6ab775ebc5b3c293f991e5200ff5528d689c74dae92e8e68bedf672c5ac SHA512 0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a
-DIST double-conversion-3.1.6.tar.gz 7030812 BLAKE2B 8572c4c127bca57c85075a1d308c81e22d133ddbc9c691538dc9a5564f82cf0b6e9009f0d223db0fcfd9c2c662059b8866cb26e8510187f47fe8b56101bfcc82 SHA512 2282e9838f916a0e59011e1b7530c32fb392e9bf07f370df419f1a8c59c88d66f7e16fa6ecdc3785af86591639d1201144feb0c60a5de54482da936f6c0c5534
-DIST double-conversion-3.1.7.tar.gz 7031619 BLAKE2B 2bea771abfad58af14cb4476208f2ca4562719213b942208d2c21ed1a3423688e3c0f5671dfbea9b939a1f005dc7870617f6c91fc543945a60bcab239a7b9319 SHA512 70baa0f8d5bbab433f6a3f3b6e172730f10cde5524639c7da8cb205bf95e6743a4b129b69ef09d8f121524e3d5a45d501a393e4f69f6848494e7ce87db765f37
 DIST double-conversion-3.2.0.tar.gz 7031760 BLAKE2B 971c06121e64c4d78a1f9bce9b206a079ea72fb82072f5db10f9b50516ecc178ade9d5ae2d6d024fdb78607d8a1c0d9d48380acabc529eb498e37ff38297aa00 SHA512 0670ee70ed2662c6795ec6cf144e0915d805940ea0f49633d17500c496fb241788a0de6f0a9f8eaed5cb74a376f64fe590fa0d883d0676dc2bd2dab288b85e00
-EBUILD double-conversion-3.1.5.ebuild 475 BLAKE2B b1e21ecc8dd0452bdc7d3bc77445906e938b194ead9944290ac3ad98087f80864a47591d291dd0f45c8619b60bbf4cc2d6018b869c01a5da1cdc844e8586c1b4 SHA512 09d500e702a461236917e4a0861c6af0bec5f8651d3a20a2fa971a96dce07aab64ebd8c5b05271d96df6d7671fea44cd02893c29b2c225fcc747cf0337c85512
-EBUILD double-conversion-3.1.6.ebuild 482 BLAKE2B a38b28b95ddc705baa7894c0f430fb571c12bd906b9e71f3e01dd31a7d73fe42d1c4e15e8663d70061f83ac5af3540fda21639730b16cb7f8caa9c7eb39a12de SHA512 a00a9d93bed2ddee4c5408221c3297bfe57a4bb69c59c7a8261089a81bfbde748a7e417dafa60714976e30d1e33007fbc745618f02deb5b818c600d091cae4f6
-EBUILD double-conversion-3.1.7.ebuild 482 BLAKE2B c70e8314b8a1c6e2d0571d16d254c9826dd4d831a0275dd2de9c674e210539647667339f10bd192a9669d2a6e78b92e4526a6299b8c5d5df12004e3d7ea47a0b SHA512 8b6d3e13bbb7dcef48673f51ced017a012a510c6d9fa03a409fea5b717f5ffb3cd4fdcc487089b1c79e37019dd6e345bcb37283efb3c034875824cffca2f491d
-EBUILD double-conversion-3.2.0.ebuild 489 BLAKE2B 581b296c0a6b3987089ee6d4a65732072431b21baa0fc2d535f94ea853d6154223c5e53d68e56e63d8f3f9e56f8da02bf1fad6648246eff2b65d0eba755904e1 SHA512 341f3c229c9abe0c40861fb984e7d30f5dadfb8cc4c5fc75129c51eb4638292cefd1eb2c060552c4dc3e1da61072fbe134bc4eaa64776957be7d59b0fcabfdcf
+EBUILD double-conversion-3.2.0.ebuild 482 BLAKE2B 094a622ad2ea3f64b777e5500299491e9b14803112f2caa2c6bdae114bd3af186c4edcaefc3ef71e8d7e1be01c1c72d8792244314f2c051de06216502db86a92 SHA512 b46e06b37832b11b5545dbce92c44224f51de2aa73bf992051294512a0954f444d32144f61d57f9c54c503cb8fa6cb2a70a3fc5da38211902040cb049d51b6fc
 MISC metadata.xml 682 BLAKE2B d16297d56e3609d9c14023e754fbdfd4a41d1ac91eb9e66e9b5122bfe7758d59d1b1ce92845d866e989baf8716bc425a6229098868ecdd2d8ce10c0af7808860 SHA512 f2c25b81770d33fe86231cb4c80cbfd5495d9ef493f6710c96732c4ad72523b362bd1c22316e326c500afc0f5c4ca22e77f07601a552b52ab71f24ceb4ca7e71
diff --git a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
deleted file mode 100644
index 8ef06639af4d..000000000000
--- a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
-HOMEPAGE="https://github.com/google/double-conversion"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-libs/double-conversion/double-conversion-3.1.6.ebuild b/dev-libs/double-conversion/double-conversion-3.1.6.ebuild
deleted file mode 100644
index 199d6bdc3447..000000000000
--- a/dev-libs/double-conversion/double-conversion-3.1.6.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
-HOMEPAGE="https://github.com/google/double-conversion"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/dev-libs/double-conversion/double-conversion-3.1.7.ebuild b/dev-libs/double-conversion/double-conversion-3.1.7.ebuild
deleted file mode 100644
index 30c576af21e6..000000000000
--- a/dev-libs/double-conversion/double-conversion-3.1.7.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
-HOMEPAGE="https://github.com/google/double-conversion"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/dev-libs/double-conversion/double-conversion-3.2.0.ebuild b/dev-libs/double-conversion/double-conversion-3.2.0.ebuild
index 2f049917716f..d1f0723de50e 100644
--- a/dev-libs/double-conversion/double-conversion-3.2.0.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.2.0.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index 1b0b7f9a3825..be2fb6428b26 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -1,3 +1,5 @@
 DIST dqlite-1.9.0.tar.gz 160222 BLAKE2B 7a6179e87ff8e37d19ab28a11bcd02531297095f83fffc936aa8b719be737cbba359b62daeea8de6d4bc599a4bf579a3471ab632fae27186d5f2358324b518df SHA512 eeb759cdca6ef44d3c8d7d032b277dab57c24acfab29ead218aecf826c71631fad22244cadcea7337002049857a8b5cb3b5dcd39d611e41a463128e1e09472e3
+DIST dqlite-1.9.1.tar.gz 165507 BLAKE2B 275ad91e99335c311c55a51a2228d5674fe79ba2e0b4d1fbb00b62134cd2130c1131fefcde71985cb2a4c90b706ba7f9048818f0711e762f1437f0c263ed1927 SHA512 996767bfdcc4dd5f360b71b16c99b16c6dd3c630cc87746de2df6fc6e74dcdd4ecb8223097f5d85b9c78a4856440c83d3b067f6681f26487a88bb4f511cfe41c
 EBUILD dqlite-1.9.0.ebuild 832 BLAKE2B 89907060fb4691d7303b578dbe83333a18212222479282accfa70e320c91f05630be252ad328a8e8f93d23a2bfb949465f0b0110089da04f953e08646200ddc9 SHA512 73d0734783f7b28957e800c763a0f2ddcbb9bffa95b821efcae55d4d917752f70ea77180443b8f2f56b2b14e9da68f81b03c8ed41598c289188ff04ee0eaeecb
+EBUILD dqlite-1.9.1.ebuild 833 BLAKE2B 6fb476a089394d3fdc670cd07543c521fed6063c7ff85fbdff177182e14b1d282bcff488cba2dbdb94931bcdb3fa92b1a92c65dafa647d563cf710d9db7cec58 SHA512 94efd0efbad2e347391df3abe531c5089ef9eb0584149e2aa30c4fa5035b58c207bc8f8169a8dc78047b446c47f3d861569cdcd142edf8ce6936fdf151b2a722
 MISC metadata.xml 865 BLAKE2B 3489de10f0de21d57146940eed0f4b69e637b0226b4be0127f33232dc6d8648ca4c169451948c31296ac5c41d163c8e65e983992f5baeb24db7d1b5dedfa4d22 SHA512 fc5c1fec36820bb855569c5e8bf7bfc3b522f00892489b20062e95121e6bd4e45f6b87a2d7c6d7a2e6b6c92e3dfd39b66705c58920207cf601e029d330b580ce
diff --git a/dev-libs/dqlite/dqlite-1.9.1.ebuild b/dev-libs/dqlite/dqlite-1.9.1.ebuild
new file mode 100644
index 000000000000..67f811b7c29d
--- /dev/null
+++ b/dev-libs/dqlite/dqlite-1.9.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Embeddable, replicated and fault tolerant SQL engine"
+HOMEPAGE="https://dqlite.io/ https://github.com/canonical/dqlite"
+SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/libuv:=
+	dev-libs/raft"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/raft-0.11.1[lz4,test] )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-debug
+		--disable-sanitize
+		--disable-static
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 9ca1153cabf1..6a5cf2940651 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,6 +1,6 @@
 AUX efl-1.25.1-libavif-fix.patch 2477 BLAKE2B 36ad24c7ba88a34e4da0d69cfda74b3a7a890dc639d966403511373a182cf908229a15e6c3302c3635a8ac134399a71823d2dc65320f4304078c674da7978911 SHA512 7293fbccc394f09887398940996d44f59170fc556662f095bdcead752be84b7583411af8303e462703272b00523a8e14407d14c4f0e1589ba395b592b7c29f01
 DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
-DIST efl-1.26.1.tar.xz 168538588 BLAKE2B 2274b8939635d472560a7131651586e6ab5dfc71094f15fad0a30711ae2fdf40098ce6cd70a9b664c9f16c6b6880f51de96372dcc6d251bcad8c069429c3bfcb SHA512 50fd972315d10997a077e403e3484a6637a66217a66865216a3e47d214cfe7647876fade087da8d9ee5104ca99ce11db27ba6279564b1076f3353f3f9c702cb1
+DIST efl-1.26.2.tar.xz 168537016 BLAKE2B b7ca59dbcd483edf31e68aae4df512a195a8239935febf8497ce039eb18696ca84e4f6d0206818c84f6e1f625abf3e730fc812304459e5615feca2c3fa07092c SHA512 d8478b6f197600c5abb7e2fcc030f8938e6726dde5e1947df4b042e6e9c77b0f31770b6b86a76ee2be52bf5354e02716bd7e5daf0771d149004d9447e432dc32
 EBUILD efl-1.25.1-r13.ebuild 8244 BLAKE2B 33ed2bf2ffc2954ff3d485c0da4580b41c8df9847b4dd95ec886f491324239de06f97b6d123b2c38d33be28031d073721b90667be88ce3bc8de8ac32b2790867 SHA512 de0a9aea7d4e66c4b4fc11f2b0951b2f3296e9b84cb4bf0df5d6c5a723b21e325b8fc5d6258b76e4504b7759208bf8e52907b51113d86b3304f8d0938a90edaf
-EBUILD efl-1.26.1-r1.ebuild 8229 BLAKE2B 463e8595c5e09e32383f017a85eccfa1e76daef69c982b91dcb044e6be006568a1e555a2bb9293d15cb1973e0e67d045eae5feebb22ea2664e5e8dcccc9cff4a SHA512 f08bcf284fc99ea70a0e0606da15ec7eb0c6077ebadb5e209ccc43d6c1322bd74ea240d19e3b13e876f2f3c74a1481419eea70a754c10bba6458e60737a76092
+EBUILD efl-1.26.2.ebuild 8227 BLAKE2B 5aa82c221486d054cb831e2f9b4fae5a5b27906612d63d9ddbd7f05976cf6e1a91698999756d5ea46566b0f0c571f3d3d9c6be8ebab97c27bf659fea5e977518 SHA512 a70429f35861d4f7fcc3cd384a270c0572c95273e86d2a160c9873cccf02181b0d6c00c246b29d55f15f09540dea20fdd51297d60d1e06354dc89128aefdf4c6
 MISC metadata.xml 1943 BLAKE2B 192127f421b9e9216ac8b9b2b161dd99bff9ae0286e1051bd541e4102046ebd23d835d2a0745d5ec82e9ce2b56e37569b2b3e0532f7d2daa485c17eda17bebd8 SHA512 c7a8d0dcfddfa4e1b2f0fce817e9daf3f07c014eeeeb3a7cf4d43df89b35aab24872e5fad1dcf3bf00213dbbb309436a49e005d8ce94095b1810067e5b68b250
diff --git a/dev-libs/efl/efl-1.26.1-r1.ebuild b/dev-libs/efl/efl-1.26.2.ebuild
index 8528716bda38..76cabd758589 100644
--- a/dev-libs/efl/efl-1.26.1-r1.ebuild
+++ b/dev-libs/efl/efl-1.26.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon
 	+fontconfig fribidi gif gnutls glib +gstreamer harfbuzz heif hyphen ibus ico
 	jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index e0367f73c278..aa901ce7ffea 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,8 +1,10 @@
 DIST ell-0.46.tar.xz 531420 BLAKE2B aea36c7faf75bdc282805e4c003877cfe3fc8ff31fcb1ec85a666481b5d574091876b5021259797411d102d7ae6057a79a600e89fa34da038d44863a840db78a SHA512 20a25dbcb7c93a7c29a87cd07ab6124d0915d382f588e2a808e3f7e330d00a6769f40d91264d505408eeae3c6d07ce3917e04d843b4d04c73cc7c9f01395ecc4
 DIST ell-0.47.tar.xz 531432 BLAKE2B 74c4a9d40f42eca3b105fa2433b3c8472df24bb185dacfba8f4978edeac79b94a1c7ef3c009eed3a3303125e7f3f26e08e046ebb1d913870d4f298806dc34119 SHA512 103708ea625d8eb63e5a662fc7fdd0f59cd3610c4d6de7ac2cceef89e30f8896d14a7b756047a3b046035544bcf80992aec786f06678047895cf0e3c791b8daa
 DIST ell-0.48.tar.xz 528916 BLAKE2B 3ab2a90afdedd0ebc8ac0efd69f52189a93f408db7b35e3a1a85e72ebe5884ed0c833ff1835b390925a406147d207b99328388f09124c34b935fc84f33e93339 SHA512 481b94c0aac91f26c9e618db2590f132265c07460e86c443ecac033a78566ce0e86a7c8f0ab7b2a954073ebbe66ed0303281776b82f751fa2b4d3aaf40e55dc2
+DIST ell-0.49.tar.xz 530072 BLAKE2B 76823742261b319a60fa34a086e4f328459c12fa2e53c2fc0397968a7c5914eac019598f927853697c3aa3c8afc389758bf4ca31f3b6315b09d6bdccf0244a88 SHA512 9bac4312ebe85bd6903bd9665551e9f1de4cfc6914659cea28355363502f8968ac842b3579ac8efcb0721cb5a1f3f16dca80f02235f3675a24f13eb250ed3aea
 EBUILD ell-0.46.ebuild 1169 BLAKE2B ed818bc1b592a9d5768ee4875205a63bedc7c32cad81e5be707e5b345aa78de37e1c337a33fdbae36a934bb2c01e288f5ab27a8af6a3fcfd795912414dd4437c SHA512 b4aab5df0c8036b434c05e46f00277f5b9a111567b3fd1b7ecff52cbb0c6e3678fa8cd9afcba57c43bc316b7416a28582484791d66b1ffb9357e366e3821241b
 EBUILD ell-0.47.ebuild 1175 BLAKE2B c91500654e555bb6023ac37c0715d240e93d57d5f1e48f1c3a3b6083360a8a2eadcb37a8750730905b9a73abfd0d9e42e55928d884801711ca65ca947629e6a3 SHA512 a402b13afb81a1cb481464581c2210961a5ecb239ac68a638c0f3e117c1e1490cc4ae17c939d25995b1e647104a9713ed628fee4eeb9c396ddbb9dd9e86f6b8b
-EBUILD ell-0.48.ebuild 1175 BLAKE2B c91500654e555bb6023ac37c0715d240e93d57d5f1e48f1c3a3b6083360a8a2eadcb37a8750730905b9a73abfd0d9e42e55928d884801711ca65ca947629e6a3 SHA512 a402b13afb81a1cb481464581c2210961a5ecb239ac68a638c0f3e117c1e1490cc4ae17c939d25995b1e647104a9713ed628fee4eeb9c396ddbb9dd9e86f6b8b
+EBUILD ell-0.48.ebuild 1171 BLAKE2B 3d986cd56fdaf581540c67ee2a5bcb4f9e8d0e8b7a10a4081c49df85186d1da2522828c37660443b44df33b2cf0a7adac77be75142dfe72a24f05c0c366b2c6e SHA512 06fee9c875fc56fa94a3d280d6453f42be888e0f493a6971c8c366ac1007618bfa0b10926cb9e6b07b0bf241c0aa30c5b622c4ce674a71845ec6f3cbcc4e9ad1
+EBUILD ell-0.49.ebuild 1175 BLAKE2B c91500654e555bb6023ac37c0715d240e93d57d5f1e48f1c3a3b6083360a8a2eadcb37a8750730905b9a73abfd0d9e42e55928d884801711ca65ca947629e6a3 SHA512 a402b13afb81a1cb481464581c2210961a5ecb239ac68a638c0f3e117c1e1490cc4ae17c939d25995b1e647104a9713ed628fee4eeb9c396ddbb9dd9e86f6b8b
 EBUILD ell-9999.ebuild 1175 BLAKE2B c91500654e555bb6023ac37c0715d240e93d57d5f1e48f1c3a3b6083360a8a2eadcb37a8750730905b9a73abfd0d9e42e55928d884801711ca65ca947629e6a3 SHA512 a402b13afb81a1cb481464581c2210961a5ecb239ac68a638c0f3e117c1e1490cc4ae17c939d25995b1e647104a9713ed628fee4eeb9c396ddbb9dd9e86f6b8b
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.48.ebuild b/dev-libs/ell/ell-0.48.ebuild
index 56c48e4f83d1..e1c237f5179c 100644
--- a/dev-libs/ell/ell-0.48.ebuild
+++ b/dev-libs/ell/ell-0.48.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.49.ebuild b/dev-libs/ell/ell-0.49.ebuild
new file mode 100644
index 000000000000..56c48e4f83d1
--- /dev/null
+++ b/dev-libs/ell/ell-0.49.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="pie test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="test? ( sys-apps/dbus )"
+
+CONFIG_CHECK="
+	~TIMERFD
+	~EVENTFD
+	~CRYPTO_USER_API
+	~CRYPTO_USER_API_HASH
+	~CRYPTO_MD5
+	~CRYPTO_SHA1
+	~KEY_DH_OPERATIONS
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 6eab1ae12078..78cb8a5dff83 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,5 +1,5 @@
-DIST expat-2.4.3.tar.xz 451012 BLAKE2B 4c0200837ea0054a88d2a2606486482f234e4b4f6b5f16134bf2a4b7b61457b12d534c6be3f16d28f6926f896d00177ef53a947a0a6c3ad11ff024a8e76edf84 SHA512 62a7fe751f6846deec4b04fd2c2ca8ed9e139fa27cda0e3fe7f8f05107caaed70597aed17b45c49d30a60c8a0c6beae1317dd5f24240640310951aabb16dbcb7
-DIST expat-2.4.4.tar.xz 449448 BLAKE2B 20b2cfb27746c24e56580478c933b3ca9e9ff19aed13561bc07e8ad879daff575882b8940fdca00f8c99b146067438a4a680238728098b10e4d08303ffa00119 SHA512 c88a82f4732e27340eb9480c082bcc909b0284e16b368ee9feeb4e2dd058e8f7c42fd48feacd5272cc76cb78bd183df33eb5d0b135fdd1d3c493cb156572ab76
-EBUILD expat-2.4.3.ebuild 2277 BLAKE2B 5e2039ed2e5604aafde9f4ae1b61a931c3c8e7bade01349eb804e62efc12650ae0ead3531672df8064c7dcb9a257cf00314ed7c6a591b10731a465cc9279697d SHA512 e69a6ec9a906245e8d884cb5019b68644f0e86a48fb5d30d012c588442db761b3bdb115f5ab4c7e50e36251a0edf22389ead0f36823db59a6a9d873dbc10ca82
-EBUILD expat-2.4.4.ebuild 2278 BLAKE2B 6d9fb099b1c670541e10df0feeb1b9f10004763c4f13a2849a4deafea35a96b691acd85ab71e9da185cca797925572334aecc683f27f3ab751b9dfb9d9304617 SHA512 d52bb96a4d09c86f15d80bdbb554516a922939b6295c2efe6b0f88cbc72f02b51850aea1b202ed30693fa59f82e697ff7d727f70e085dc7f4963983f8da19a39
+DIST expat-2.4.6.tar.xz 452468 BLAKE2B 8b30acc2628e3ce67ee57a4c9bee232f89f49ee70901588f7f5a34844e459cbc447fd225a734078100e52c96a73aa1f016e4f2d51d9a079128d661d97b2213c0 SHA512 830b00dbdfb92ef5cab69d783762a78443cd7d834bccda072d103c6178327cf480bde579089b1c3be884e67ddb862178fa734bd7e1f992f6f0ca29d83e21d737
+DIST expat-2.4.7.tar.xz 454136 BLAKE2B 441616f44ce585f75a67a3ebc2264e5723df55975dbfa9a9279039d3773d9e5a4b37c70a8e26787bbc8742fbc66a077e6845b540df6fede936d98065587fe3ac SHA512 e1a16cd48fcd6c4974dc7058d2e0284e0f91565835ec93f16d3f2c79647124470e5edb9f88f1ab9df5f403883a527750a4d63b941bd26fd43c05cd6f42bdcc48
+EBUILD expat-2.4.6.ebuild 2277 BLAKE2B 5e2039ed2e5604aafde9f4ae1b61a931c3c8e7bade01349eb804e62efc12650ae0ead3531672df8064c7dcb9a257cf00314ed7c6a591b10731a465cc9279697d SHA512 e69a6ec9a906245e8d884cb5019b68644f0e86a48fb5d30d012c588442db761b3bdb115f5ab4c7e50e36251a0edf22389ead0f36823db59a6a9d873dbc10ca82
+EBUILD expat-2.4.7.ebuild 2277 BLAKE2B 5e2039ed2e5604aafde9f4ae1b61a931c3c8e7bade01349eb804e62efc12650ae0ead3531672df8064c7dcb9a257cf00314ed7c6a591b10731a465cc9279697d SHA512 e69a6ec9a906245e8d884cb5019b68644f0e86a48fb5d30d012c588442db761b3bdb115f5ab4c7e50e36251a0edf22389ead0f36823db59a6a9d873dbc10ca82
 MISC metadata.xml 514 BLAKE2B e38c182f42192e0f3b567423b148733b59ed885cca58d36829dfd57bad88565baca743024aa5fc701f368fcfc8886a92ae20a94f549e190a3d31e2ca5c0e28af SHA512 6248f12ed1f3e2bc10d7f11117ad18dc86ccb5ecc1fc48aac32032a062d1273e956cd22e712a1b14cc670642047f9dcaf63606dbad08895e1e3b94b0573bd74c
diff --git a/dev-libs/expat/expat-2.4.3.ebuild b/dev-libs/expat/expat-2.4.6.ebuild
index 8db61e9898d3..8db61e9898d3 100644
--- a/dev-libs/expat/expat-2.4.3.ebuild
+++ b/dev-libs/expat/expat-2.4.6.ebuild
diff --git a/dev-libs/expat/expat-2.4.4.ebuild b/dev-libs/expat/expat-2.4.7.ebuild
index 15afc9578393..8db61e9898d3 100644
--- a/dev-libs/expat/expat-2.4.4.ebuild
+++ b/dev-libs/expat/expat-2.4.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/faxpp/Manifest b/dev-libs/faxpp/Manifest
index 20de927a0ad7..fd74a7ee11c8 100644
--- a/dev-libs/faxpp/Manifest
+++ b/dev-libs/faxpp/Manifest
@@ -1,3 +1,3 @@
 DIST faxpp-0.4.tar.gz 512740 BLAKE2B 922c0fe6092517c6d4fa6d1cc7169bce7d97b873c49e3d6a776174e43cfc72bcd5f38b1baf8cee4239aecfd7820a3e6b0594a1fa94e4a45392ac2cf0d6889dbd SHA512 25b871a6419b70d9ee85817cda267dfff7ed8aa99a031493a6ccaf1faed80e113ceb7407df1629958d7841c73ba3bee760af9f595dd71648d853561e8c8f33d8
-EBUILD faxpp-0.4-r1.ebuild 600 BLAKE2B 4c3f2abac2a9bf64e3bf993f0712bceb7e7357591f0e0a2ce654f35232771ff839ee304b440af3ddc44cc695e8d115defd98f1a23cfcdde36ae2ea5392213c78 SHA512 f6f3c275853e27e16d1b09c0458675cbae18434d10c68f37613a4c1e1f6de3c5c1098e8f9dd04381c623973bd27ff56a02c3d998b65e1fd4c03dd2e6bda5c5b7
+EBUILD faxpp-0.4-r2.ebuild 615 BLAKE2B e34c6ab3fd560e64037ce7b1cadba3f7eb184d42cd58c3c9dbbc38defed30154e7cfc2e21e4eb1747a7bd77b6a998d4433b3b0aee0ec29a28a836931ed8205f9 SHA512 993ca6d49d4962c6b39c9bdd78b9e24dc848a6d0a339493c91b66375f2014eefa4146c8f38efc109f206e94d9903caf94f6cf9fb8ae24427a9e6f4934f627cfa
 MISC metadata.xml 243 BLAKE2B 4ba2e1dddc54f56a0d196703eb36fbdc5eefca06ec8e2ab62a115dc55062547bde4b63048a0a42117842dd60fca7b110c3496a45fe7d10426da27eae9096347a SHA512 f935ad6d90337691da6ca34bc41e7bda2a4c777bb6f3d3c3d50adf564e1253100bf72e442c1fc2bac83a70068ba9da7797562a0b653f621f784eb880f27915aa
diff --git a/dev-libs/faxpp/faxpp-0.4-r1.ebuild b/dev-libs/faxpp/faxpp-0.4-r2.ebuild
index 60af37fc3cee..50aaf74f8139 100644
--- a/dev-libs/faxpp/faxpp-0.4-r1.ebuild
+++ b/dev-libs/faxpp/faxpp-0.4-r2.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 DESCRIPTION="Small, fast and conformant XML pull parser written in C"
 HOMEPAGE="http://faxpp.sourceforge.net/"
@@ -24,8 +24,8 @@ src_install() {
 		dodoc -r docs/api/
 	fi
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 
 	find "${ED}" -name '*.la' -delete || die
diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index 66b14466a951..43762bb8e76f 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -1,5 +1,5 @@
 DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
 DIST libffcall-2.4.tar.gz 1253767 BLAKE2B 669bf556f082b533eb7d71ebc6fadeac464b1a6054ac8078c9315678929bcfb8ad4b7376b345bcfbb5d2caf9d45179012d4bb5a08ad675f475f58570ae96b7ae SHA512 c9451662764a888e3be21499c29673bfb0e1df4915814da3506db5d395a2b00ea2f0c08d1c9dffebf030179f9347794876ec6ec9e6710b4fc70fd760960335e6
-EBUILD ffcall-2.1.ebuild 1466 BLAKE2B 3a18b74e440bdb0d4a4a0d910cb77b6643a3d2f958a9656af5116642b904e650c56f10d93b1fb19f0c2b10bc7bcc1d29517fa0ed20ea42b30ed58f7561f57fa7 SHA512 00df8ef9fc1219e9d0e177d8f48add57d54d30b79fcf1021c12a0d421c47b6570db2a1ff057f11f235661e85579e93ee8aeaad421ba379fb93325bb60a9d9573
-EBUILD ffcall-2.4.ebuild 1483 BLAKE2B f5802d5fb500792c966ece4d9c5fb3b06d9525701108834e681f2a3c149b1ed2cdd868d46ffc8177c03867d4a6f1d3f2f8b29b726f094c178b57e1d2b53ef96d SHA512 d9930c7ec80dbb59143648a04b20444883cc74d7470db0f2305f34cf679856d3d357f1d3d420b16020631ef668c2c01f3b09739b8d2dabbd4d095948c07420c4
+EBUILD ffcall-2.1.ebuild 1465 BLAKE2B 94c45c5e0c32ef02e7eeb1922466dabb4c5ad239e992403796e84a803fb2901384da0b029af539b8d71d960e207530de48bc49a72ecdd7143721d0982af76e13 SHA512 4b4fd2c30aaa9e7039e3797df97ad9947f960ba22d65fc5ae1a8d6c57c1cf6ad04ea6726249d3e2fcb34940ebf30b2c15f270f19b79dea9dd2e8b0fabdce062c
+EBUILD ffcall-2.4.ebuild 1478 BLAKE2B d698e14473c405a1df3303637aa06483a8d26956e5e3d1dff7c0eb372d5cf57b3c91f52ea1aa8e7e7edf2bc5c6ccdb3f5d0d282f97509f21d16ec2e7d7ab689a SHA512 b09176dc77882cfd995c70b1d94a02a98cbc1e53d8589f293fb33f56025d4c358182c6754d04ae159f4bba852ed0a271d2596aed61b8e35ee613fc3ac2f295ab
 MISC metadata.xml 859 BLAKE2B a3c2244f2545985f3000c06357c8494bda02e082d089a1b44793a944bdd2592eac8b6e567be29943d07a0eb2930dfda1eb20695f213ec469a1457fd3f8d4360f SHA512 49e8a58e4839ee6d15de7165fede7f8b5f1f200731f8d3a0c4ceee97b8ff1c6e03550ca6be6531d928d43000ec7ded5922f85ef8e3a97d1853be94c9c3d3afe0
diff --git a/dev-libs/ffcall/ffcall-2.1.ebuild b/dev-libs/ffcall/ffcall-2.1.ebuild
index de9d512e1b78..d7fb5928fbfe 100644
--- a/dev-libs/ffcall/ffcall-2.1.ebuild
+++ b/dev-libs/ffcall/ffcall-2.1.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=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz"
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 S="${WORKDIR}"/${MY_PV}
 
diff --git a/dev-libs/ffcall/ffcall-2.4.ebuild b/dev-libs/ffcall/ffcall-2.4.ebuild
index 84fa806a52d6..203f4c3040f7 100644
--- a/dev-libs/ffcall/ffcall-2.4.ebuild
+++ b/dev-libs/ffcall/ffcall-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PV}
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 src_prepare() {
 	# The build system is a strange mix of autogenerated
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 1e653d55b949..d03e4d5bf67b 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,3 @@
-DIST folks-0.15.3.tar.xz 491432 BLAKE2B f11123a2c41c4a36c002b26f3c3616d62e4a74bbddbde84643143404497c8e3c31d8cafc8bff0ba4714606259aaa6f7adf352ba4bb98a20c75a181ee68bfda3a SHA512 dd54aef470990974bfc9b22fb83c868ca9674608ccfddeea1bb7507dfc77d7d12a43d43462957b0bb99bf249c13868ba7326f7fd7e38de8802a3ba54e33d8d58
 DIST folks-0.15.4.tar.xz 493004 BLAKE2B 0e067a39b4e89e8fa41b20f37c774e56fcb1e0c8de23798ced647177b0d9329509ae3c03ff85a00464887deb4ce275c96b2fcf50aa2dd44af02e20b6ee45fe65 SHA512 4dbd0bb82d56a8cb179ab8148ce531817ccd55bd40f8b562eb0d77555b264e5190669b356ff009c81a963fdcacaabc02fe871bf0c3c668a648f2c820da76f25c
-EBUILD folks-0.15.3.ebuild 2349 BLAKE2B 213e515feb14d84974725e90dcb996858bcde38b6a09bada63749f37e7101f872628f6e0a9674a71342aca6ff2471774be3df5573d23dfaa4da0bdd6600e1dcd SHA512 b85cb48350c0a8bd11d016ef2c87d6da1fec68653770ddf05a6c7a7019543c7d0f86948fde7224c0c1bcf9d106361709ca5e2b43c593df341f52f4b74bd808fc
-EBUILD folks-0.15.4.ebuild 2351 BLAKE2B 383302043f5b46855941fb0d9147bea76af943f6c8011ff9bf825753857e40950f9966b1bacf4b0c3ffe79a2146d2c0431d98cda07a4c6a8da9e43e7b0258b5c SHA512 32b67a3c72f320390f5991aaf24109b25f2263866e3b24fd02b92f0b38de034dd1eb2f1a7a419b26fa93ccbd18e2102adc8ded0f91e173f5834a4e1a1d7bdbc1
+EBUILD folks-0.15.4.ebuild 2348 BLAKE2B 2a6b299326aa74168affff44885f41d61895e91b6c9785a89973abd6c17cd458248cf7e5a956be272bc8181cc68dca44984fd6a2534b402b52356ee85825c7ab SHA512 e0b5a04ee0215820366a79dac1acac2003c17241f0880dbbbc25c6731d065168783812bbd9feea2a1268c462910d367eccdf6671760a6aa7af7298eb78077f73
 MISC metadata.xml 396 BLAKE2B f4e55d5af852a227b66080749510b9915ac9c3f7081c88051f06be73465235ccc326db015238366e62c40d6e8027eac233644ad8421eb0b59f881e2ec215a1e2 SHA512 4a6a15a7ecee35f43c7f82d24e82c32ca3811058f5135e473e15bcae21fc3023d61a6c9f638c9d97336baef3fa8126ab31a49eb036545f521dab2bf93c2a0f0a
diff --git a/dev-libs/folks/folks-0.15.3.ebuild b/dev-libs/folks/folks-0.15.3.ebuild
deleted file mode 100644
index ab69961fd1bc..000000000000
--- a/dev-libs/folks/folks-0.15.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.48"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
-
-IUSE="bluetooth eds +telepathy test utils"
-REQUIRED_USE="bluetooth? ( eds )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.58:2
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	telepathy? (
-		>=net-libs/telepathy-glib-0.19.9
-		dev-libs/dbus-glib
-	)
-	eds? ( >=gnome-extra/evolution-data-server-3.38:= )
-	dev-libs/libxml2:2
-	utils? ( sys-libs/readline:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${DEPEND}
-	bluetooth? ( >=net-wireless/bluez-5[obex] )
-	telepathy? ( net-im/telepathy-mission-control )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	eds? ( gnome-extra/evolution-data-server[vala] )
-	test? (
-		sys-apps/dbus
-		bluetooth? (
-			$(python_gen_any_dep '
-				dev-python/python-dbusmock[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-
-python_check_deps() {
-	if use test && use bluetooth; then
-		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth bluez_backend)
-		$(meson_use eds eds_backend)
-		$(meson_use eds ofono_backend)
-		$(meson_use telepathy telepathy_backend)
-		-Dzeitgeist=false # last rited package
-		-Dimport_tool=true
-		$(meson_use utils inspect_tool)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" -t 5
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/folks/folks-0.15.4.ebuild b/dev-libs/folks/folks-0.15.4.ebuild
index 7d90012d5b65..5ab4cc617b40 100644
--- a/dev-libs/folks/folks-0.15.4.ebuild
+++ b/dev-libs/folks/folks-0.15.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/f
 
 LICENSE="LGPL-2.1+"
 SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
 
 IUSE="bluetooth eds +telepathy test utils"
 REQUIRED_USE="bluetooth? ( eds )"
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index af9955bc7467..d30bb6e04215 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,3 @@
-DIST fribidi-1.0.10.tar.xz 1147588 BLAKE2B e40e16b4b6167d0c7cc26b72ed21a7b4b2ba78dcce56eaf5dee94835cd2d4770401ac17bc2b5f13227e41e8f19513a0616f49edab07ea8fb2969eab30e24f653 SHA512 cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360
 DIST fribidi-1.0.11.tar.xz 1077004 BLAKE2B 9de3e170e2b6cf90623c711e16f6595f6ca91e14707cbfd36dda7df92689ea79ec36c4b658199e9046eedd07c9ebfde18617525c83cf4b0e9e2ccb4d9f82ed84 SHA512 6afde86784de06759f18235ccb44f23261a975f7cce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c
-EBUILD fribidi-1.0.10.ebuild 1036 BLAKE2B f2e1ee2d0d667379e2eb4b73636059f8f965c88e398af200ed67338ef7694c08ba84ac1668a8d97c957b5fedbe7a889b0fe331d37990ab7ee7b693b49fa558f3 SHA512 e286612b3598892cd735c801084113d9c0efa301141e55c02da4463cbf8893bb7c2bac63b99bf4d24f8861b87a2bcd012d31695cc6cb70657b1562b660bd2c60
-EBUILD fribidi-1.0.11.ebuild 800 BLAKE2B 5039b43dfbfdff710623d0162d48d55fdeb9be7d87ab0658930808b92b64df86c0dee19465d22d011a8b5f66b9b8ce08b121be9cae8ad9813bdf5525b0f5343e SHA512 e7eaba0f24e030083a03325d5b2fb2de56b54fc7871c4625c7f29ec3d585e869ac782e2978f49cd5d7fdca5e3e5a60660506d55d7bcea6e526f31537831904bf
+EBUILD fribidi-1.0.11.ebuild 792 BLAKE2B 67389241050d716c43ecd68978ac9047176f67554beb51342ad0e6c49fb279d8d1c55a323e92308705503b176dc7f66dd2362badadefe57400691d5ab9bf6c1d SHA512 2c405435b8603031f8111811e2ae72cb439ca74b04efd1e4535f3c51d24c83117ffb45de784066059dbf62793cfdbd022fa0e65257f94bd812729ce7df21442b
 MISC metadata.xml 342 BLAKE2B 71ad2adf0909be22d8d55ed37c2ea05e7e2fdbdb14e2eee4bff83447d400b89996403a2c4875d30330e56fd857d3672574006c36ba8b23b91ae0de3e801609f9 SHA512 a4b5a69dea823758640fd15374ddb4e5840bec92cbdaff8f8b62554b472a9b7006f77f0771d8410fc076e67da005a4e153fde7443059ccf9d7d85244c8cf2912
diff --git a/dev-libs/fribidi/fribidi-1.0.10.ebuild b/dev-libs/fribidi/fribidi-1.0.10.ebuild
deleted file mode 100644
index c05c3f823854..000000000000
--- a/dev-libs/fribidi/fribidi-1.0.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
-HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-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"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS NEWS ChangeLog THANKS ) # README points at README.md which wasn't disted with EAPI-7
-
-src_prepare() {
-	default
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--disable-static
-		--disable-debug
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/fribidi/fribidi-1.0.11.ebuild b/dev-libs/fribidi/fribidi-1.0.11.ebuild
index 2022757529b3..0dac42de89b3 100644
--- a/dev-libs/fribidi/fribidi-1.0.11.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index c058f9d5552a..bfaa6a4e99a9 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -1,6 +1,6 @@
 AUX geoipupdate-r6.sh 1085 BLAKE2B f093f49881fa86bb81ac8b7c2705568a186e51c669a3da85114e0985ea7b2cc3de7ab5b6f8ef2e73ccd46af89149eade9b9b116506c6d9891e70dd8613a3c7a2 SHA512 97cdeadaf42510b88e00b3187e51089f62838c87d11500f572ed19232aedde1cb51a4183a84d7421773d8248072c2ef7197a28b0fe9a06cc10624b0f5d00a21e
 AUX geoipupdate-r7.sh 1058 BLAKE2B 1b8e12245ffdb9140a437aca19b8a34d2c700980330c50316a50774bcc2d71df0fd86789f73ee3e61bdd4993a333ef9478e201cabee7508cb49cd52d098928c9 SHA512 7d53aa88d3048431bf9caff37ab61cde737d0bb59e776bd6544e1ef2c51aaf8d36db6ad2a3a674e7226c4d2e26a92940f68c1ae932076e6d0e2ad94e80775f3e
 DIST geoip-1.6.12.tar.gz 160826 BLAKE2B a6cb17141e4e9d00c15d19d7adfecb5492b14591911dc85de403afc9f94801fe1ec92b6106478448074d3679d6c9fa6a44f210b9cc751aba0c0425a5fae699c1 SHA512 d1ed2dae091548f555cde4d26e4b51ae1e8fbb12ef1695fd95963229d9a1bf241e6f09e5d77b151d51edd0cef78ddef490c6a3f3a70ff122bdd9c0ac5500fc7d
-EBUILD geoip-1.6.12-r1.ebuild 1276 BLAKE2B c78ac5627607f5de2f1ba2b76f50136a82a3754a99f92ec0bb70eb6d64a1d8d26663052d743bd81e9897fb611b4c38308cf212108b9db6cbf92cf9c0206985f9 SHA512 5b3855c91596e09e9f467c759c6571ce32dc8e2cda7b8bda34fce15253394988476fce269e6790a9c38794560631546325147333c6bc799432e56567d3d04567
+EBUILD geoip-1.6.12-r1.ebuild 1269 BLAKE2B 7e84666bf7217f30e0d7bcce20b7592f74e66a1af77fe053e260ee97a596773aea58cda327cadc3291c84261df962199628313a59786d43092e61bb0fef83d60 SHA512 0caa56a199ec161f7d6d443f85f6de848ebd88d46a0930068627c977a195342a7de7b35ccfc3122b1dc887bfbf756a68cc0c6d9618686f84eb7c2ad9af254b72
 EBUILD geoip-1.6.12.ebuild 1269 BLAKE2B 3f1138520480a81f491554d11553bf3b8c743058218dc7fdd8b3e4eefa2572eef11fa2714822940bf6d9ba358b0efb292b5cba81e7c81f1a983856978231a2bc SHA512 bebd29e5cfa06ebe7ea4d66febb106c5e1759710ab931ee51c4f7fb244de695f14a60f3de1352bc9596845746471119d87c0f6e7d54e9d025e711fe8867a2709
 MISC metadata.xml 375 BLAKE2B ab965301b6b1e134e5f760ee64f84fd9c854d63b278d35f311d8afd7c80034d146cabf57fbbb2a18831a08d114cb0baf10b80b16484affb94ed6f8572e23e27e SHA512 dfaeae0d24da6ae8c0bd1f88ffb5b219e60e14c764816a61c3654c2bd6b60d8cae6648e65ac46ca4cc8ac8e25dfb30f2f8a902f372aa582dd74b37b66e3efdad
diff --git a/dev-libs/geoip/geoip-1.6.12-r1.ebuild b/dev-libs/geoip/geoip-1.6.12-r1.ebuild
index fd7343e19b73..903dd0242bbc 100644
--- a/dev-libs/geoip/geoip-1.6.12-r1.ebuild
+++ b/dev-libs/geoip/geoip-1.6.12-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
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-api-c-${PV}"
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index e58cd587c701..87f670cfbff0 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,7 +1,7 @@
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
-DIST gjs-1.68.4.tar.xz 559768 BLAKE2B 0e5f2cbb5b93c7ddc05916c95f23d9438c8e76bc2eb35c11eca5414d9f4327e0c99ec9c85795880bd478de5e3655da0f7e9223ba4c3f7c8d5685bdb4a00920d5 SHA512 c610abfa701c0a61ffa6916ec5ebcd07b1dcb04607d74ab0b6d30583da27d60f9993e037fab73e66e1580d644d3a57f0a479f55a09e3bf56fea7f17367c787b3
-DIST gjs-1.70.0.tar.xz 595292 BLAKE2B fc06f4b397350daf19a532a3ec3c2851e106bc76dda41d4a9c32b2718a6f5add1bf0c1066ba9cc5aaeeb192cb4f0a0e3dba1c16826fb3157c0a1e0a8bfe88606 SHA512 e32ee511c34fa9af210061a106d42de67d40c20f398dfacc541db0323bb4a499f2552aa28028eba16ec42afd4dec5a0cea4292155a66b966c3731ded45b23cb4
+DIST gjs-1.64.5.tar.xz 422548 BLAKE2B dcc0b7327cbc6a1108be031c8807e61ebd3c8392916750078aaa0d82cb3bf9f7ff0e1876c250e5ddf6e9d7bb6a17d9d1fe34c1c77ff534b7ec1dd54fa05a2d1b SHA512 41a3c79888792674b2bccbf254507ed02497eb571c8ca7f47aab406d2ee29b73c98b1c7d59c33ed33bad90c6989df944d78b86d2f7e9824d598b62e29769b6dc
+DIST gjs-1.70.1.tar.xz 598444 BLAKE2B 7d5f1b82e9edd20b9b3d3b03511d3cb8e19715d5dcaaa5375867c1c8754895db33089c41e17f28b732183ce510fff868399cd2174062684e0b3072cd599bc12b SHA512 194d8efeb37ecf7f3ea65c0bf0bbe2120524a11448423888d0785868297ebdea12b0ea4b28cb49d2596c7a3d73f13eb216072db8dca5e209193ba3dbbad78b6b
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
-EBUILD gjs-1.68.4.ebuild 1120 BLAKE2B 19bcb66930e48d86adcc80fb753b5cd97b26c137e0a35ff98ddae38dba162a7dd82522e5f25ea2e4f62ccf46829ad89e654cae583bc0d2628bcebce63426461a SHA512 211799f2a201f419f6122fad8f98bfa3cfc904b566dffb6ab2c1a6195c5651834b0f60738d4f7c654f49782ace3c9f5d6c103153ad523e306fdc07383654e93e
-EBUILD gjs-1.70.0.ebuild 1189 BLAKE2B a0435573897efa84ca663435dc70ceb2a9d58167e1d6d468cfd095dbf254bcc653efddc590c8f4db954483ce0fec3e0f865212cbf31edf25d5e474e5a84f7fdf SHA512 99bbf1c080ae962eaa2eb4e94db0b9d86b3b12570a8f65b88dff0ffa51ab66e1c925731ea0af353fd5a33df1c0bf5adda4f38772f2a1efa5546092ecc00f4145
+EBUILD gjs-1.64.5.ebuild 1182 BLAKE2B b9b3ac973aa78bfcf7093fdcd01820094e055b5a52368788521cb9eebecf0ea36fe0deb74bd9bac314303cea3c9f24e1cb1438c20abf035a9e86160560557ae9 SHA512 6a4b489a7bb48db88d22a5c2f847d6c6c469af609fa877f95fc1e62ac6c1db0bf5c2b3782d5c31b13538536dae44da27c106e7b54f6e52652c11b20dd1c80305
+EBUILD gjs-1.70.1.ebuild 1189 BLAKE2B f5d195a50c4fb8f270368d87cac25c50ed74fb13ff2f6d9213de4c1ac940a86c9a9a693b539f2a4320e11bd50613c899879fcabbef0a41182b62b8e4a4e194bc SHA512 c3d2524695c7f58d78f3e58f0e7f260b497e6783446bd216a0c1f0abfab91e423f7959d492507abd5b820d7296d5f7d4e235f58c7f7ebe4686a82fef776717be
 MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb
diff --git a/dev-libs/gjs/gjs-1.68.4.ebuild b/dev-libs/gjs/gjs-1.64.5.ebuild
index 433139d0b4bd..c8a26722b31f 100644
--- a/dev-libs/gjs/gjs-1.68.4.ebuild
+++ b/dev-libs/gjs/gjs-1.64.5.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
@@ -10,26 +10,28 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
-IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
+IUSE="+cairo examples gtk readline +sysprof test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/glib-2.66.0
+	>=dev-libs/glib-2.58.0
 	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.66.1:=
-	dev-lang/spidermonkey:78
-	cairo? ( x11-libs/cairo[X,svg] )
+	>=dev-libs/gobject-introspection-1.61.2:=
+	dev-lang/spidermonkey:68
+	cairo? ( x11-libs/cairo[X] )
 	readline? ( sys-libs/readline:0= )
 "
 DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 )
+	virtual/pkgconfig
 	test? ( sys-apps/dbus
 		>=x11-libs/gtk+-3.20:3[introspection] )
 "
-BDEPEND="
-	virtual/pkgconfig
-"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-11-support.patch
+)
 
 src_configure() {
 	# FIXME: add systemtap/dtrace support, like in glib:2
diff --git a/dev-libs/gjs/gjs-1.70.0.ebuild b/dev-libs/gjs/gjs-1.70.1.ebuild
index 1322c5b817b2..4e9dda763169 100644
--- a/dev-libs/gjs/gjs-1.70.0.ebuild
+++ b/dev-libs/gjs/gjs-1.70.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-libs/libffi:=
 	>=dev-libs/gobject-introspection-1.66.1:=
 	>=dev-lang/spidermonkey-78.2.0:78
-	cairo? ( x11-libs/cairo[X,svg] )
+	cairo? ( x11-libs/cairo[X,glib,svg] )
 	readline? ( sys-libs/readline:0= )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 2b9b460c242f..cb65e2950157 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,6 +1,4 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
-DIST glib-2.70.2.tar.xz 4822356 BLAKE2B 63b1f4e05f26cd51c3345bb042e2175ebcdb22afa3fef85bccae530581a378070e6c7ea48eb957bcc73142ea228ddb70bdac2679ca2f81155a668560397aaa37 SHA512 872e3f06f87f21a32446b41aac7454fd6bf4d665c753121f6e9772cddebc592b79d88713fc6b8d510636af9f9c4528a9d508d8c4225c6dfeb928390120fb4809
-DIST glib-2.70.3.tar.xz 4824700 BLAKE2B ba84333b3ad27c0092ebd8bfe31a522d30ef8b18e7483123da6e353bb572f8a58307e23758e93ac95eb781b4d5ff86f20d84eedc1ac6e72af85822f2891bcea0 SHA512 d0e58ea71575e30707b6eda0a5231bc9bd202bcd7a0293fed9e378252a9e430e219b82cd8a12eaab41bb0a0605bb9f3a1cdb8db6766cd42bac8ca9bd9885b80a
-EBUILD glib-2.70.2.ebuild 10107 BLAKE2B 119f2c3b999daec1c9f06be38ddf4ffe5e454ab8a150e73de2750af51c8c6bd08e3bf058f163dde7441b64a6ba19b5ca3b170fd3d0d44e373f3b9ec05ae3a420 SHA512 445932aa03eed856953f0882f310a2adbce4d2261963fddf34d3f11958953ce481971a4aa6cfede3b888ab0fe80c8deae72b4c094102e662e2eb45448a1c713c
-EBUILD glib-2.70.3.ebuild 10115 BLAKE2B e769c96dbdeb0f90660a9b3e408434ebdfb22202497911692eec8179135a0b84192f8b6dd3b9206e46aaaee4e01c963ac92783c612db276dd36678dd9bb7b255 SHA512 6d1de5ee8572e91f83a7a7a31c2b7bfceff7a3f60f0685c14d32c4e8025253b3995ccacce5bff764a95cf720554a72164fd7875f50a353de7dd769243480b163
+DIST glib-2.70.4.tar.xz 4824296 BLAKE2B 10e472672bfa20cadad01a9c22d01f2363c3033a234f4abe939c30a86e22621ffe9f8bec8031f43b18cc8c07a1ddfa05631979641d8dab88ae7b42345b2a3cde SHA512 e0fa19ef7c2ee48d94fb15074e4e58ecd23b288cfa7bb92ca72d3e337dade80c675595f05b26c10d351a0167f6b273656aef3686d44708121a8861b16b7635c0
+EBUILD glib-2.70.4.ebuild 10120 BLAKE2B 9bac993665ff720a570c18e4eb71ad256f2906f903fa4887deddc80f75ac311854fcc555afe1c053e96df649eae3dc7b6a461ba2afbc3dd0aaba5915f6553bc6 SHA512 cd2348fbfa1087494d57f711483db6a91939438b396eebee128363a3eb46c145713b52aa3a4154b260377f0c520011e90334727b60e87eab554850fa2e0315aa
 MISC metadata.xml 1221 BLAKE2B 517c6f9ee14ccac7192d7c1189773ec6e034bc638a8acd28081a604f8516ee639f43c82ca3233d513dbfd06db714358e396f2c4cd906715bb0950f130974ab9e SHA512 0c4203b3c9d8b91eebe4ee54f34d1aae26e5efa4c791760559b18b58d90b508936ead62ee8df81e6777ad8e0cb0e9c68d504d0f24ecd5903d4e3df89c6cc0bdf
diff --git a/dev-libs/glib/glib-2.70.3.ebuild b/dev-libs/glib/glib-2.70.3.ebuild
deleted file mode 100644
index 3db8a09e3f72..000000000000
--- a/dev-libs/glib/glib-2.70.3.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	elf? ( virtual/libelf:0= )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.33
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	xdg_src_prepare
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=enabled # only used if host_system == 'linux'
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		$(meson_feature sysprof)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use fam)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=disabled
-		$(meson_native_use_feature elf libelf)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "2.63.6"; then
-			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
-			ewarn "to restart your session for \"Open With\" dialogs to work."
-		fi
-	done
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/glib/glib-2.70.2.ebuild b/dev-libs/glib/glib-2.70.4.ebuild
index 2019f4a6893a..d275a6a9bfdf 100644
--- a/dev-libs/glib/glib-2.70.2.ebuild
+++ b/dev-libs/glib/glib-2.70.4.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
 
@@ -135,7 +136,7 @@ src_prepare() {
 	chmod a+x "${T}/glib-test-ld-wrapper" || die
 	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
 
-	xdg_src_prepare
+	default
 	gnome2_environment_reset
 	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
 }
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 46c471325399..d3720e19bef0 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,5 +1,7 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.7.tar.xz 2227048 BLAKE2B 7fba57640038f34bd45ecba1067b6db131705310b62a74da1fa3d575993bbc6cc1dce4e3d219dd42033775e0a90f2b2acc86b1094f96f03a7532eae1b69e63ae SHA512 2c8fecd6eb74c9e956c419ce111bef6280916ea3756a534b6b800a273f0fff260717cda7fefd4bd4c6ddb27973112ec6e73fa971fa74bb9aa04cfe587d45f10b
-EBUILD gmime-2.6.23-r1.ebuild 1447 BLAKE2B d3699c169a24e802c7a1426adc361d3c0932d687acade866ba3bf16b712b6adea6075bb7f8c03b49b5ea0c1115c091c5ed6031bd730ac3cb45b706fa9b02b59b SHA512 b826bf0dbb432bf00d56d010c3a4dfe8751e88ef2546924cb6122c6e143b2c84ec2f24923c0252c3e19618807fea5d4b5cba6b9d738a476ad626de2fdd7143b5
-EBUILD gmime-3.2.7.ebuild 1572 BLAKE2B fd179c5b414fcd188ddfa35364b31823548a1c38609380ec3bab107fc57c74e109461ce741e31f5085d05d35b725f30993ca8c0075cbf6e1de2dad2e683afaf6 SHA512 3b6f52a4c00894ec23af166a717ac1ced9e410069ce8ad99917f9c3ac52c5c9dd2ce9ac814d3f4e868144ff534086246539ec314407ec4eb80f4ccce64a9cdf9
+DIST gmime-3.2.9.tar.xz 2230284 BLAKE2B b6dd81adf939fed8fee70880e2c3f907d9eb8fb33efb90c78d6e6c93754e310f44a1affa8c59ac980805be42bbd5f61353633ac071dfa8fd89b65f2f23cbda24 SHA512 00b92ff5e2001644bfac50d1736203dd478c3a44c8f325a216105c5b354540807df9a6025bd0313d1e60793d8388ed4f5ff72685e116e3f36e6ca8c6b326a19b
+EBUILD gmime-2.6.23-r1.ebuild 1446 BLAKE2B 2f33b0c77267916299e67120a5bcc2009917ae3adcea844d6e066d0901e1241455e1f26cc72fdbd5db400b8b08344d267450664a380fd1b2be1d57fd4c4824a5 SHA512 33a21fae9e9cadb9a7de26a593ce4b684bf605812ff280d3b1a933953cfefe0a07d93061427ecb5d943962ff8f3de783d2211208a41b5b2d4b429076ee5bf8e8
+EBUILD gmime-3.2.7.ebuild 1578 BLAKE2B 0296a81dba65f0e16229ecde33060b905279c716684925eaf94d87b0d736658c9fb7a22039177dbeb3ef75ae40da6d718efae5fedbf621d7e4123458714f08fc SHA512 ae274233dfb71264e83d1a9c432ccc6cdaaea26fb375ab69be1998e24b232a76772658857cebeaa190ee87789744d493e7fdef6ed16693415b1c7cea8a912a91
+EBUILD gmime-3.2.9.ebuild 1643 BLAKE2B a7673007086416b8c927306a22a667f0e88e0e6ced815c87896c2ce654cd77f8d778d8bc32e973f223f9d965cdf0e857e4ecc0459df1c62bf939a88a97357ee7 SHA512 cfbc8018fd2a07d014bfa475d687ffb9bce7332a5bc66d4bc6133a93bb639a6ad1d0d3d80dc937bb9bd963b80ba5c1576c3b41bba8df008ab36f9c58a621d5b6
 MISC metadata.xml 408 BLAKE2B e340c8e376fb1fe428478c937d8e018f5b8c475cde16e947467434a7f86227d07ec0d1f9d61226e7f88c763a1d292f39cf4886569d218b4107bbe0b8465b35f6 SHA512 b75375be09c0f37a41d0a1f1ef0abde6880fce81e8318c480df27b954e39aa5fbb69826ff9243f029af2eb959d50641330f31f4bbdfaa6531e031326099cfcc0
diff --git a/dev-libs/gmime/gmime-2.6.23-r1.ebuild b/dev-libs/gmime/gmime-2.6.23-r1.ebuild
index 6c2ade626ef3..2a6e0ed982f4 100644
--- a/dev-libs/gmime/gmime-2.6.23-r1.ebuild
+++ b/dev-libs/gmime/gmime-2.6.23-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=6
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	>=dev-libs/glib-2.32.0:2
 	sys-libs/zlib
-	smime? ( >=app-crypt/gpgme-1.1.6:1= )
+	smime? ( >=app-crypt/gpgme-1.1.6:= )
 	vala? (
 		$(vala_depend)
 		>=dev-libs/gobject-introspection-1.30.0:= )
diff --git a/dev-libs/gmime/gmime-3.2.7.ebuild b/dev-libs/gmime/gmime-3.2.7.ebuild
index 6806355fa243..b875e0ba71af 100644
--- a/dev-libs/gmime/gmime-3.2.7.ebuild
+++ b/dev-libs/gmime/gmime-3.2.7.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=6
@@ -11,14 +11,14 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gmime http://spruce.sourceforge.net/gmi
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn static-libs test +vala"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.32.0:2
 	sys-libs/zlib
-	crypt? ( >=app-crypt/gpgme-1.8.0:1= )
+	crypt? ( >=app-crypt/gpgme-1.8.0:= )
 	idn? ( net-dns/libidn2:= )
 	vala? (
 		$(vala_depend)
diff --git a/dev-libs/gmime/gmime-3.2.9.ebuild b/dev-libs/gmime/gmime-3.2.9.ebuild
new file mode 100644
index 000000000000..ccc807d2d80a
--- /dev/null
+++ b/dev-libs/gmime/gmime-3.2.9.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic gnome2 vala
+
+DESCRIPTION="A C/C++ MIME creation and parser library with support for S/MIME, PGP, and Unix mbox spools"
+HOMEPAGE="https://github.com/jstedfast/gmime http://spruce.sourceforge.net/gmime/"
+SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+SLOT="3.0"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="crypt doc idn test +vala"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.58.0:2
+	sys-libs/zlib
+	crypt? ( >=app-crypt/gpgme-1.8.0:= )
+	idn? ( net-dns/libidn2:= )
+	vala? (
+		$(vala_depend)
+		>=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.8
+	virtual/libiconv
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	test? ( app-crypt/gnupg )
+"
+# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
+
+src_prepare() {
+	gnome2_src_prepare
+	use vala && vala_setup
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# bug #???, why not use --with-libiconv
+		append-libs iconv
+	fi
+
+	gnome2_src_configure \
+		--enable-largefile \
+		$(use_enable crypt crypto) \
+		$(use_enable vala) \
+		$(use_with idn libidn) \
+		$(usex doc "" DB2HTML=)
+}
+
+src_compile() {
+	gnome2_src_compile
+	if use doc; then
+		emake -C docs/tutorial html
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use doc ; then
+		docinto tutorial
+		dodoc -r docs/tutorial/html/
+	fi
+}
diff --git a/dev-libs/gnulib/Manifest b/dev-libs/gnulib/Manifest
index 36b1ebe4afad..e9ed43501e0a 100644
--- a/dev-libs/gnulib/Manifest
+++ b/dev-libs/gnulib/Manifest
@@ -1,4 +1,6 @@
+DIST gnulib-9f48fb992a3d7e96610c4ce8be969cff2d61a01b.tar.gz 7637646 BLAKE2B 80a2e5fba2c5d75903dec43eb663d4f354c55317efe2f0c0e5b53bcff3ff17d17ade605a1219550a025335cfa75eba8e6b38af01ecfdf989de7741a36cc37d4e SHA512 db786cd38eb5deb77a6c189ebd8425618a6281c7129355011295517020cb57982f0d568dc0f77bbf2bb709e6e05c729e0ec50351fd7951909723173fe89ccd26
 DIST gnulib-b451121ab45497e78cb6f612c8673a9705193391.tar.gz 6666079 BLAKE2B e7d3b9478697067b57ab198e044f3c854128d5fe390d30947829ce4f34c695a748668c33ae19690e9927fff6df3e194a3160cb4adb7cf47235c603241c66889a SHA512 f6e165cfc0a3999c778d9f43ffc90ff9b569a77ff1e54ff5c50b12b0eddf262c24da8cd2719548574e0397535bb0eb835eef603cc74769f7876ef9db101bebec
 EBUILD gnulib-2019.03.17.09.24.57.ebuild 920 BLAKE2B 1b3067f397b59fe1ad908f8b2206ce0f96e28a7bf8c76314c5e8f3f98b647ea6395c760adeec6cad47d1e58f1560d05f83b940d24ac227b45436a980034ae3da SHA512 29aefc32fe5c14277eac2bb80c6c48c01055089e50fae0a87951b944a3dbb5fe58beaf277c353eb2dba952ff01405f700892dc084ce39d0515cea9d513159fa1
+EBUILD gnulib-2022.02.12.16.27.05.ebuild 920 BLAKE2B ed0e6932dd1065be5f8fbbe33b19455648f16718b7c93bdfde70de0887eefbf07ad85fe656258be8d4fc3cfa9bbf6842718604b5c7e57978ebcfa8618bc4a01a SHA512 05701287a1795b14a67b43b8fbb1fe675068dc169745a5c971f7c6828014b854f863d3918038f11c5484e83b49fffde822f04f3573e0fdcb3f3f362d4a2ab9f5
 EBUILD gnulib-9999-r1.ebuild 788 BLAKE2B 58e59d347b87cc6a6e1f4e04b6723d1e6dccc7adb7d8c5fac2d4df749bb059da9cd38df28139046281cb5e3c0eee5a62949c47fab8b6976cb37f99fa300fcc33 SHA512 f6042419262d62e10dfb62c2770e821157672040bd86ac3e92da9b5fd008a6ceda1486f331ead8716195cb8c9c3966531ecfe1d47bb6cc09e313a7f4492b269a
 MISC metadata.xml 244 BLAKE2B f599747a5c4b523305b9895669bb3171446bd4edf7339753b21ca14524c010a83bdb41e83851df393240077c31891fefa1a9bd876bda37cf2ef77731a76eca80 SHA512 7db5efa0f85d76e9ff76fd6a0e83908ccb9d5486b2994277166976ff531b9eb88806ca80cd3cb070bac89f383872733c8470d04f86a67854d1b023eb24b4e2b5
diff --git a/dev-libs/gnulib/gnulib-2022.02.12.16.27.05.ebuild b/dev-libs/gnulib/gnulib-2022.02.12.16.27.05.ebuild
new file mode 100644
index 000000000000..302bd8f7f895
--- /dev/null
+++ b/dev-libs/gnulib/gnulib-2022.02.12.16.27.05.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GIT_TAG="9f48fb992a3d7e96610c4ce8be969cff2d61a01b"
+
+DESCRIPTION="Library of common routines intended to be shared"
+HOMEPAGE="https://www.gnu.org/software/gnulib"
+SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+S="${WORKDIR}/${PN}-${GIT_TAG}"
+
+src_compile() {
+	if use doc; then
+		emake -C doc info html
+	fi
+}
+
+src_install() {
+	dodoc README ChangeLog
+
+	insinto /usr/share/${PN}
+	doins -r build-aux
+	doins -r doc
+	doins -r lib
+	doins -r m4
+	doins -r modules
+	doins -r tests
+	doins -r top
+
+	# install the real script
+	exeinto /usr/share/${PN}
+	doexe gnulib-tool
+
+	# create and install the wrapper
+	dosym ../share/${PN}/gnulib-tool /usr/bin/gnulib-tool
+}
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index 620b3e6252a6..e0fd51b917f8 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -4,5 +4,5 @@ AUX hiredis-1.0.0-disable-network-tests.patch 1760 BLAKE2B 9e2837834e0e7b0411ad4
 DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f
 DIST hiredis-1.0.2.tar.gz 98139 BLAKE2B 86d872cfec3d4e925d5d68e4f4faf1301aa6d706bd0406a8080471e14afc2c25db13b9a0937d29baccd457611af8e46922b5379183c7470c9ae1860aac3af096 SHA512 86497a1c21869bbe535378885eee6dbd594ef96325966511a3513f81e501af0f5ac7fed864f3230372f3ac7a23c05bad477fa5aa90b9747c9fb1408028174f9b
 EBUILD hiredis-0.14.1.ebuild 1897 BLAKE2B f247584df6ce3646f5fe5a9e014910d0a1392679b596ab54bc0879914ec63e45a9d0e0e8d27c29ffc41143bd7f033cacf24ca3103fb56cec816fd0e2455bbe87 SHA512 4a2f9e9f98f842a30051744892647fa3b2c9e91b0a8c117215609ad4ffd66a599c2b6603b3b4fab5815b21488176d103d9fa29026b9f1cf437ffb30c1db67167
-EBUILD hiredis-1.0.2-r1.ebuild 2093 BLAKE2B c48e12c509bf650a9bf993057b85861de87adab3f0cfde343c7d9184c49432bbb1bb1405361c604c314428ee38bae9f1d2eb019bfeb8a57bef5b5633b34650a9 SHA512 893b2c9538be684d711ca0f21c60a949169e4c5a8a37e2b4c513eae485782d341c222d2a88c60595721050261a8aa15ddddb9038d27bf7e3ee6dc2d3a4b69823
+EBUILD hiredis-1.0.2-r2.ebuild 2092 BLAKE2B 7b904144a78910a91c450be1a7ba4cb7296bf48607751c757853c019f3b3ba580d73199b932cdbcfb6358e26139072051cb627e85468e2e2e019fcab68f7c404 SHA512 96f07365a812aec08a3f2d1ec9539a3b44611f41353ab9446fb81d203fec38715cb4c3ccf1bf4eaf5be8c8e03a7ccf2a266817357aee688ccdc200fc4cadf25a
 MISC metadata.xml 404 BLAKE2B 3872a9946b2a134a1c55c2b0aa6a77d83df6b3e48a6bfd017e716ec0eb8400bc95476088d8b79de5e23d6638397b5a0d41bff556c076e607a6f1d0dcd668c7e5 SHA512 ea90d8e7a04ab8929bbefce3c78adb610c7e22d2c9ed44483e16dd4530f04baf160d372999a5de9ea52850336b4d9ca13fd70fb719c2db18f938360262761a29
diff --git a/dev-libs/hiredis/hiredis-1.0.2-r1.ebuild b/dev-libs/hiredis/hiredis-1.0.2-r2.ebuild
index 5ff9381ea657..6290e448af16 100644
--- a/dev-libs/hiredis/hiredis-1.0.2-r1.ebuild
+++ b/dev-libs/hiredis/hiredis-1.0.2-r2.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
@@ -18,7 +18,7 @@ IUSE="examples ssl static-libs test"
 RESTRICT="!test? ( test )"
 
 DEPEND="ssl? ( dev-libs/openssl:= )"
-RDEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 BDEPEND="test? ( dev-db/redis )"
 
 PATCHES=(
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index b925a623a77f..6c393a43115f 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,3 +1,3 @@
 DIST hyperscan-5.4.0.tar.gz 1844963 BLAKE2B 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27 SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62
-EBUILD hyperscan-5.4.0.ebuild 1366 BLAKE2B 36e702803f0c63a7b2c97e0e3d85535ae2e40a0e5d90dd9495d948421a8e27ffc1ca235c528d8b6e40917b8a6ec16b9ce267cd4f3cc879b307affc5605c4d887 SHA512 c8b668bb583e5363b68db800feaf7f1707ebdaa1e36a92b2aaa8d1961917f4015dca6dbd4e82ca0ea1f34da00ce4fdc96a17d79def042c203752a9204c3109c7
-MISC metadata.xml 593 BLAKE2B 41cbe15aa60debd9e61e773300742992bd619fb5a7eee4bb5664c18a88c0aba6091da3acf39911640af0453f69832df16ff3534b5a4d2f018a1a5ab59b8b0732 SHA512 16734322e077cfa8ab6a496f7a3b8feb9da48d49c956cc61040fae356a49ca723a707f27611de450267a3027a364c8cef8251d2722505179a56a90d8002f13c2
+EBUILD hyperscan-5.4.0.ebuild 1367 BLAKE2B e41e77a0bfbd85c8b8c0a6b3be852ee557d2f650a942e43b01d38ffd98762551bc8d648d183ddb8c858f44f6ec0a633038cc336c07e60aeb92e42ae882818446 SHA512 60a3ff1533ce8fb5041781c885e185d4a32cc681f6e60e2103b833a0bce6f45ac1277bcf5fea35c11b169694e24cbf31b9ec9e67d4e600c64aaaf2c465f143a8
+MISC metadata.xml 471 BLAKE2B 0e366381dbc182a34196e84ef09ecc3f58d3287a57437443b46dc685f4c807b6f409bae7055a6123dc08287becf7ab4ec3c1b9817c337f464ce350e9b67232c4 SHA512 ea14de0dcff4f679d7bad0c4a5d3b56e592492ec9ee7ef3d180f1d8d951129d886d8def3779d9e8b8df2a6779d2a5e6063570a0a8ab3e87f97788a4f1306e5ed
diff --git a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
index 9e3f43300d71..1f26f29e501e 100644
--- a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake flag-o-matic python-any-r1
 
diff --git a/dev-libs/hyperscan/metadata.xml b/dev-libs/hyperscan/metadata.xml
index 7d408e90b66e..9af6495c981e 100644
--- a/dev-libs/hyperscan/metadata.xml
+++ b/dev-libs/hyperscan/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>c@roessner.co</email>
-		<name>Christian Roessner</name>
-	</maintainer>
-	<maintainer type="person" proxied="yes">
 		<email>arkamar@atlas.cz</email>
 		<name>Petr Vaněk</name>
 	</maintainer>
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 0d29b92c631e..d1c7eac46ae9 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,6 +1,4 @@
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
-DIST icu4c-69_1-src.tgz 24814903 BLAKE2B ef95a04e238f0de96e969d580ef64000ab04a4a0003e8f31fd02baab35387d5ab2c4d792ae0d14f3de8e48aa28570237ccd67fb32e03b13d1572e4a995b1de76 SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
 DIST icu4c-70_1-src.tgz 25449582 BLAKE2B e229376ee45322db99aa963465048ab5e694ce9f0ba335f071817198238de21fcd77dfe3e86ea1394790e2a3b6d96772d1b98cb7dccd6462a9dd05c0ab7bdef0 SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9
-EBUILD icu-layoutex-69.1.ebuild 2510 BLAKE2B 0bbcafbf071fed411b9b66246e1bb961eed4788a8405bf3dc366b2e90bf299ed7b04723b6aed87f332c0c835250c8d7965820c06544c9fabaceed601eb3b91cd SHA512 d7956417175a54b4f7b8b0c78d76a62b94222fc7290c5b52dd0d78e95b512cf21237988cca42ca8b46ea7995af0d6136a4fe7ed1fa11517bb56bbfdc5f476479
-EBUILD icu-layoutex-70.1.ebuild 2510 BLAKE2B 1ee196eddd7df5a88dd5b26adab558f0bc9a4ed75f106c1e91188b3c43f54d94316da3d4f1c05389344f9ca99db9555232b99a6be155c858ec800e611fc95182 SHA512 dffd70c4c63e704e9be06210a7908236d9d79d135136cfedf93f5013ce43d7c61bd66fbbc92130022605ad46886891fe5e67e257d0f62a8588d5ceb5bf8ac6fe
+EBUILD icu-layoutex-70.1.ebuild 2505 BLAKE2B 3197805d41f024b6cf3aadba1db8b305f6d45af609305f8af4f9fc24154ccc651299b571e37e83f5dbfc4f86cf315443b972139ed87b54856a9af128d7b8830f SHA512 57c95d2a5e2a4b1c5876d5b4becfde3a27ce519a4a6e81db38ea10e8e4423cb4a2b335b153ddd031253713f455b5e09faf6c656ec5ecddc2dcf89a055b961487
 MISC metadata.xml 380 BLAKE2B 8ce5a87c902267e85bba46c378db4430060c8a6d66e7ad869373bd533bcf88ae8870f1814350e76713d54545518b3650ffb7b288e29e504b82fcaf1ef1880fb8 SHA512 6cd44c60cbe48e130cb58d330deeeee325131080e0bc366ea7a1a969e269bd366340a815984fb7dcb3e47b70b81cfe837f601e1c20d358ea6931142d27f4c040
diff --git a/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild
deleted file mode 100644
index 0e04c50bbdea..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild
index 0fad8d95c72a..b4c96881ba12 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-70.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN/-layoutex}/source"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 DEPEND="
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 13d81090cf87..e809d14bcde7 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -3,8 +3,6 @@ AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e4
 AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d12941db39980abea1fff2328c112196b62cc89d521e8cc2a1f7c11b58816401a838bb8fcbe50036e80d3d9e4343 SHA512 5d605cc1cbbd16221603a9509d07713d64201f4fc1a372d29c18f8d49a4618fcd7e0a0bb0a459024a288e5c2c339a9aa0849abe88691ee2cdb24b92c9b61e290
 AUX icu-69.1-fix-ub-units.patch 866 BLAKE2B 29b849c08bd0ddb19ee03c37f34873819307a0daa53c00724ea27842829acc895a9a9fffd7a0ef03d5629d17f15399be3df7a2f0270dbbf65512dbfc0f41f66e SHA512 d3d72909643ffb2d3f4407d6e9259b661f7ee033bcc8b35a7a771d8c2c6295a7bf1139ad8b6aee14f3a2291d15c3dfbbc847aeeb1fe60c64c4f2dc202e34d88b
 AUX icu-70.1-fix-ucptrietest.patch 1086 BLAKE2B a61919181c015c5f4673ba7ca6513f50e3f6ac3b5a3fc4541ace854cd44b8d77fc4752c91c90c0275647a65b83f56061619726c714296dee7db6906a5f4b7e8d SHA512 57c08fc2fab69050b338f3830581087d69311ae1a622b1b48e7986822219fc728c981b1434c30fa15bd21c528a64672ebf5dcfbedbfb0f8ab401c3d1278dd4a1
-DIST icu4c-69_1-src.tgz 24814903 BLAKE2B ef95a04e238f0de96e969d580ef64000ab04a4a0003e8f31fd02baab35387d5ab2c4d792ae0d14f3de8e48aa28570237ccd67fb32e03b13d1572e4a995b1de76 SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
 DIST icu4c-70_1-src.tgz 25449582 BLAKE2B e229376ee45322db99aa963465048ab5e694ce9f0ba335f071817198238de21fcd77dfe3e86ea1394790e2a3b6d96772d1b98cb7dccd6462a9dd05c0ab7bdef0 SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9
-EBUILD icu-69.1-r1.ebuild 3636 BLAKE2B 86f03e2aec9ae9b1e490b1a306ed444433c541e93f0e6901733de3e2085b6925657e0ef94433c3f9df493f22ae8767383d4eae2fffa7ae351792c57b2b272cc7 SHA512 fc3d55b1aa6e18e4294c0606665fa92b90e31ecfb9129be5aad301bfa97bf63fe628e3a1ca145cbc0376a70b4264330d31d62efd1df21ba5943e714cec2d7651
-EBUILD icu-70.1-r1.ebuild 3702 BLAKE2B 88a064a23b0688bb5dcbcb2077e4cddf18aaa7b1d52fb04a6cfd01f1a9635540ccd07bdf3a9c86c03f1221d86ddb7310d2f8a5b67c8bf139cf59545b3342463e SHA512 a251ec63476acce63356667b8939db19c971c4c7ce1f2709bb9a8d62d3bccf764f9f246b37229c2463b0c114607d08f9093de9830ec915b81cb5a1660440d27b
+EBUILD icu-70.1-r1.ebuild 3694 BLAKE2B 3e47d60528a8330807d3238de5c4e55c5179d77b676ead14bbe421289424758199967665ce2236a98636ee252e6245c8184e5535e1aed922043860c3b785c2f2 SHA512 9abfec28beb93afa6a7faf3eb55ab7e4c2492c1e433e12b8d7bf8b65fbb89478fc18f5dd732245d932009f070aec70321800bbe0649570e6dbbc1fd970352cc6
 MISC metadata.xml 256 BLAKE2B 28554175365761f81817e75e2c125714b94680527103d72118d0daf2eb0d2359082c36f2c8b0e92574e93c9c00038c944486a31d7843108dcc285d809bd52fe6 SHA512 1a0e13dd42f80f5c8669910c7360c6c1542e9a2f143da3a812f874966ba4729248152efb36e03bdfd47f09086797e6e1410e1ac735925d304811c847aa2b6398
diff --git a/dev-libs/icu/icu-69.1-r1.ebuild b/dev-libs/icu/icu-69.1-r1.ebuild
deleted file mode 100644
index 6f632a02fd23..000000000000
--- a/dev-libs/icu/icu-69.1-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://site.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-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"
-IUSE="debug doc examples static-libs"
-
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-64.2-darwin.patch"
-	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
-	# Should be in the next rleease, but check
-	# https://bugs.gentoo.org/788112
-	"${FILESDIR}/${PN}-69.1-fix-ub-units.patch"
-)
-
-src_prepare() {
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# work around cross-endian testing failures with LTO #757681
-	if tc-is-cross-compiler && is-flagq '-flto*' ; then
-		myeconfargs+=( --disable-strict )
-	fi
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/icu/icu-70.1-r1.ebuild b/dev-libs/icu/icu-70.1-r1.ebuild
index c2095a985a40..50dada47fc08 100644
--- a/dev-libs/icu/icu-70.1-r1.ebuild
+++ b/dev-libs/icu/icu-70.1-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}/source"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-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 ~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="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index 41c7e499ad87..286c8c5fb4b2 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,7 +1,5 @@
-AUX imath-3.1.1-0001-changes-needed-for-proper-slotting.patch 7206 BLAKE2B b812c30370a0022824fe8d251e26ce63abc0ba3f970059336cd8402f899ecae456982e4a3cda0e152323005d5eba3adaeee47bbacf78084ae3dbafa5bd0a89f2 SHA512 5df522b31043cbfcaa21c5fca4e4d6866f3ed93530fd0beba81d2c6c684003cf3214e3e011816996e76e177cdb60d1aec584c454664362e6079f1efaf9e857d7
-AUX imath-3.1.4-Gentoo-specific-changes-needed-for-slotting.patch 6000 BLAKE2B 0001b8bbc7ae4ec7a3bc76ca86119ee1be3324feaacd35f84741f96b4f512e3a83c2e9f0f609d6cf49687bbf76a9fe4f87a73a9ca8f6fc9b4963fdcebba2d318 SHA512 01fdf04b94c3c0e89b69abd828185be1aeb4b916eab5fbf480f04d3179414bfecc1d5cff01f05870370c0d7b688ae551ee32c99fde539e2c1c57135a41676174
-DIST imath-3.1.3.tar.gz 570840 BLAKE2B b037c9bdee87f58c7a2be9dbda52c89c26eba25fe07342710578f9eef4b90a49b9d5dc5451702c960ae94427d7f748b79b81b7fc9ad350d2252e9e4bf6a1d6cc SHA512 a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75
+AUX imath-3.1.4-half.h-include-intrinsics-for-f16c-capable.patch 719 BLAKE2B 3919766914fb929fcadfca3d77a3d025522c6210e99654a68b7d0a580d59fcbd3a09403260a4da7dd80bae7d1e74c12ecfe6fec9190f0447b5e16a462d69f159 SHA512 01fc0ed3cf07ef58caa0321922b2e4882be9e7b1e5bf554ab6f6ef236197e95a48ade658f34abd04748604b62c8e5559257503cffe9fd5079d237ed7de46aa8c
 DIST imath-3.1.4.tar.gz 572214 BLAKE2B 6d67f542256e44f9ba6f30ae7d22a37dbf3cd1e49992fb8b0e2264d51d47e9c2297940b3a484e1f59bd8b251e8ef42d81ae88282d0769c111b3cd84cd0a9354e SHA512 f9f7d8ec333e6383191543ee927dc40e870a6330225b01070bb93ad3d149c5e31bd5989d4dc52f3321490c1c5a7cab55582c6e42e34ab4ca5723170e7578e286
-EBUILD imath-3.1.3.ebuild 2025 BLAKE2B 0b0eb714cc883281fe83cc56f7522dda57204e9db504485e5977bd7440e28ff839fe8d3e9f2a078d2bb09d1798e3dd8434766fe2ea39dff233a0262671b00358 SHA512 6a10836c93fde13fc183eaa3dc3419cc05ee76bdf405e88cd0d5da53de4160a800b0b232cd8f3eed07fe405dae77656841bb1d2c9777cc369f9086f9d87c17d8
-EBUILD imath-3.1.4.ebuild 1964 BLAKE2B bdc9475f6d32d95b3b11fde3eee0ff2aed71b81eaff22eac5dc1e757dd1bfa4bc722704b7a140da68979092b1e9734c030fdd79c96fb6512dc8c1971205568de SHA512 9e309e80b8b504b379fb9f3ae24a8975c024795e84098d9dccd37e646099f6179e94a9565eb53a6e987eb78097d9e318fda2ece338367a039c66550fdb5ce92f
+EBUILD imath-3.1.4-r3.ebuild 1793 BLAKE2B 64fd0eeeaae148a21d7f58e2df9c7adbc84068534c08a0a23a232075abd298eca9b1b378f0c69077044361685cdfe4b931e2f80a1ef90e94c5b5e14fea2a8b59 SHA512 6e4c9e4ac06c85db01969131c49f76aa93e59ca8358f61c422407e4dab3a5fd4f4bbf7efa2fb22f0f931d4fb8d47cdbd2fe4d509535dac63feea4fbc9007831c
+EBUILD imath-3.1.4-r4.ebuild 1877 BLAKE2B 2c4fd6c647157f06445b0f2c9547bcd7ad90ad019d0112163f9e263aaf012a5f3a6dd06b7568cad764bf9c15b8bfdebe1fa26b292744752057b695be02027a50 SHA512 efff61f4b210287e5b9ce128183d45a54fa145e90815258d8a2d40b7302c0dc5d6215ca5d674d16b6d4f906d4ae80329df881693db791551081dcf5c3fb8bf32
 MISC metadata.xml 820 BLAKE2B f035962970166d4c636e8b98b9301e31fbc27aecb7059289a7581958619b85c7f60551d56175637d373363a41c7349c8c78ec31348590826313bdca94aec6727 SHA512 9dbff2f917f1705a611680c46f73a0ad372f27f6b5c236f691f16b6c41a51cb3d8712c4bceddb5469742f4952385e2a2b07377c4c216736810562ae89c5c52f4
diff --git a/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch b/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch
deleted file mode 100644
index baa6a84bfb83..000000000000
--- a/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 19073a8ed52dbc02b64be4cb55a6203dbf36707e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 24 Jul 2021 22:28:34 +0200
-Subject: [PATCH] changes needed for proper slotting
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- config/CMakeLists.txt                  | 6 +++---
- config/Imath.pc.in                     | 4 ++--
- config/LibraryDefine.cmake             | 8 ++++----
- src/python/PyImath.pc.in               | 4 ++--
- src/python/PyImathNumpy/CMakeLists.txt | 2 +-
- src/python/config/CMakeLists.txt       | 4 ++--
- src/python/config/ModuleDefine.cmake   | 6 +++---
- 7 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
-index d51c25b..63cc98d 100644
---- a/config/CMakeLists.txt
-+++ b/config/CMakeLists.txt
-@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers)
- 
- configure_package_config_file(ImathConfig.cmake.in
-   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
--  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
- 
- write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-@@ -70,11 +70,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
- 
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
- 
- install(EXPORT ${PROJECT_NAME}
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
-   FILE ${PROJECT_NAME}Targets.cmake
-   NAMESPACE ${PROJECT_NAME}::
-   EXPORT_LINK_INTERFACE_LIBRARIES
-diff --git a/config/Imath.pc.in b/config/Imath.pc.in
-index df11cfd..6eb4f40 100644
---- a/config/Imath.pc.in
-+++ b/config/Imath.pc.in
-@@ -5,7 +5,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
- includedir=@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: Imath
-@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@
- Requires:
- Conflicts:
- Libs: -L${libdir} -lImath${libsuffix}
--Cflags: -I${includedir} -I${includedir}/Imath
-+Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
-diff --git a/config/LibraryDefine.cmake b/config/LibraryDefine.cmake
-index 4868954..60b6532 100644
---- a/config/LibraryDefine.cmake
-+++ b/config/LibraryDefine.cmake
-@@ -87,8 +87,8 @@ function(IMATH_DEFINE_LIBRARY libname)
-   install(TARGETS ${libname}
-     EXPORT ${PROJECT_NAME}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-     PUBLIC_HEADER
-       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}
-@@ -101,8 +101,8 @@ function(IMATH_DEFINE_LIBRARY libname)
-       install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-       install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_BINDIR}/${baselibname} -> ${verlibname}\")")
-     else()
--      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
--      install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${baselibname} -> ${verlibname}\")")
-+      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-+      install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}/${baselibname} -> ${verlibname}\")")
-     endif()
-     set(verlibname)
-     set(baselibname)
-diff --git a/src/python/PyImath.pc.in b/src/python/PyImath.pc.in
-index 8e8de6f..1902660 100644
---- a/src/python/PyImath.pc.in
-+++ b/src/python/PyImath.pc.in
-@@ -5,7 +5,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
- includedir=@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- 
-@@ -13,4 +13,4 @@ Name: PyImath
- Description: Python bindings for the Imath libraries
- Version: @IMATH_VERSION@
- Libs: -L${libdir} -lImath${libsuffix} -lPyImath@PYIMATH_LIB_PYTHONVER_ROOT@@Python_VERSION_MAJOR@_@Python_VERSION_MINOR@${libsuffix}
--Cflags: -I${includedir} -I${includedir}/Imath
-+Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
-diff --git a/src/python/PyImathNumpy/CMakeLists.txt b/src/python/PyImathNumpy/CMakeLists.txt
-index 7b4f6b2..8f7fd70 100644
---- a/src/python/PyImathNumpy/CMakeLists.txt
-+++ b/src/python/PyImathNumpy/CMakeLists.txt
-@@ -48,5 +48,5 @@ if(TARGET Python3::Python AND
-     LIBRARY_OUTPUT_NAME "imathnumpy"
-     DEBUG_POSTFIX ""
-   )
--  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
-+  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
- endif()
-diff --git a/src/python/config/CMakeLists.txt b/src/python/config/CMakeLists.txt
-index 4f796df..15d7026 100644
---- a/src/python/config/CMakeLists.txt
-+++ b/src/python/config/CMakeLists.txt
-@@ -41,10 +41,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-   COMPATIBILITY SameMajorVersion
- )
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
- install(EXPORT ${PROJECT_NAME}
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
-   FILE ${PROJECT_NAME}Config.cmake
-   NAMESPACE ${PROJECT_NAME}::
-   EXPORT_LINK_INTERFACE_LIBRARIES
-diff --git a/src/python/config/ModuleDefine.cmake b/src/python/config/ModuleDefine.cmake
-index 7e30614..40d9032 100644
---- a/src/python/config/ModuleDefine.cmake
-+++ b/src/python/config/ModuleDefine.cmake
-@@ -54,8 +54,8 @@ function(PYIMATH_ADD_LIBRARY_PRIV libname)
-   install(TARGETS ${libname}
-     EXPORT ${PROJECT_NAME}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-   )
- endfunction()
- 
-@@ -154,7 +154,7 @@ function(PYIMATH_DEFINE_MODULE modname)
-         LIBRARY_OUTPUT_NAME "${modname}"
-         DEBUG_POSTFIX ""
-       )
--      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
-+      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
-     endif()
-   endif()
- endfunction()
--- 
-2.32.0
-
diff --git a/dev-libs/imath/files/imath-3.1.4-Gentoo-specific-changes-needed-for-slotting.patch b/dev-libs/imath/files/imath-3.1.4-Gentoo-specific-changes-needed-for-slotting.patch
deleted file mode 100644
index 9d384d1d0a7b..000000000000
--- a/dev-libs/imath/files/imath-3.1.4-Gentoo-specific-changes-needed-for-slotting.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From ca68d34843ce4ef4b03d2b50d20f83329e3d0933 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 25 Jan 2022 06:25:51 +0100
-Subject: [PATCH] [Gentoo specific] changes needed for slotting
-
-Patches some cases to set the path according to the install
-locations, which are different than upstream default to
-respect slotted installations.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/config/CMakeLists.txt
-+++ b/config/CMakeLists.txt
-@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers)
- 
- configure_package_config_file(ImathConfig.cmake.in
-   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
--  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
- 
- write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-@@ -70,11 +70,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
- 
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
- 
- install(EXPORT ${PROJECT_NAME}
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
-   FILE ${PROJECT_NAME}Targets.cmake
-   NAMESPACE ${PROJECT_NAME}::
-   EXPORT_LINK_INTERFACE_LIBRARIES
---- a/config/Imath.pc.in
-+++ b/config/Imath.pc.in
-@@ -5,7 +5,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
- includedir=@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: Imath
-@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@
- Requires:
- Conflicts:
- Libs: -L${libdir} -lImath${libsuffix}
--Cflags: -I${includedir} -I${includedir}/Imath
-+Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
---- a/config/LibraryDefine.cmake
-+++ b/config/LibraryDefine.cmake
-@@ -87,8 +87,8 @@ function(IMATH_DEFINE_LIBRARY libname)
-   install(TARGETS ${libname}
-     EXPORT ${PROJECT_NAME}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-     PUBLIC_HEADER
-       DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}
-@@ -101,8 +101,8 @@ function(IMATH_DEFINE_LIBRARY libname)
-       install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-       install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_BINDIR}/${baselibname} -> ${verlibname}\")")
-     else()
--      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
--      install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${baselibname} -> ${verlibname}\")")
-+      install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
-+      install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}/${baselibname} -> ${verlibname}\")")
-     endif()
-     set(verlibname)
-     set(baselibname)
---- a/src/python/PyImath.pc.in
-+++ b/src/python/PyImath.pc.in
-@@ -13,4 +13,4 @@ Name: PyImath
- Description: Python bindings for the Imath libraries
- Version: @IMATH_VERSION@
- Libs: -L${libdir} -lImath${libsuffix} -lPyImath@PYIMATH_LIB_PYTHONVER_ROOT@@Python_VERSION_MAJOR@_@Python_VERSION_MINOR@${libsuffix}
--Cflags: -I${includedir} -I${includedir}/Imath
-+Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
---- a/src/python/PyImathNumpy/CMakeLists.txt
-+++ b/src/python/PyImathNumpy/CMakeLists.txt
-@@ -48,5 +48,5 @@ if(TARGET Python3::Python AND
-     LIBRARY_OUTPUT_NAME "imathnumpy"
-     DEBUG_POSTFIX ""
-   )
--  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
-+  install(TARGETS imathnumpy_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
- endif()
---- a/src/python/config/CMakeLists.txt
-+++ b/src/python/config/CMakeLists.txt
-@@ -15,7 +15,7 @@ if(IMATH_INSTALL_PKG_CONFIG)
-   function(pyimath_pkg_config_help pcinfile)
-     set(prefix ${CMAKE_INSTALL_PREFIX})
-     set(exec_prefix "\${prefix}")
--    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
-+    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}")
-     set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-     set(LIB_SUFFIX_DASH ${IMATH_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
---- a/src/python/config/ModuleDefine.cmake
-+++ b/src/python/config/ModuleDefine.cmake
-@@ -54,8 +54,8 @@ function(PYIMATH_ADD_LIBRARY_PRIV libname)
-   install(TARGETS ${libname}
-     EXPORT ${PROJECT_NAME}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-   )
- endfunction()
- 
-@@ -154,7 +154,7 @@ function(PYIMATH_DEFINE_MODULE modname)
-         LIBRARY_OUTPUT_NAME "${modname}"
-         DEBUG_POSTFIX ""
-       )
--      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL})
-+      install(TARGETS ${modname}_python3 DESTINATION ${PyImath_Python3_SITEARCH_REL}/${IMATH_OUTPUT_SUBDIR})
-     endif()
-   endif()
- endfunction()
--- 
-2.34.1
-
diff --git a/dev-libs/imath/files/imath-3.1.4-half.h-include-intrinsics-for-f16c-capable.patch b/dev-libs/imath/files/imath-3.1.4-half.h-include-intrinsics-for-f16c-capable.patch
new file mode 100644
index 000000000000..5211bd450e38
--- /dev/null
+++ b/dev-libs/imath/files/imath-3.1.4-half.h-include-intrinsics-for-f16c-capable.patch
@@ -0,0 +1,26 @@
+From 41e7d468246440f30bc75e7a6a316a9a07e77b23 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 6 Mar 2022 10:07:09 +0100
+Subject: [PATCH] half.h: include intrinsics for f16c capable x86 targets
+
+Reported-by: bzoloid <bzoloid@gmail.com>
+Suggested-by: bzoloid <bzoloid@gmail.com>
+
+Bug: https://bugs.gentoo.org/834628
+Bug: https://github.com/AcademySoftwareFoundation/Imath/issues/239
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/src/Imath/half.h
++++ b/src/Imath/half.h
+@@ -181,6 +181,8 @@
+ #        include <intrin.h>
+ #elif defined(__x86_64__)
+ #        include <x86intrin.h>
++#elif defined(__F16C__)
++#		include <immintrin.h>
+ #endif
+ 
+ #include <stdint.h>
+-- 
+2.35.1
+
diff --git a/dev-libs/imath/imath-3.1.3.ebuild b/dev-libs/imath/imath-3.1.4-r3.ebuild
index 94fa189368ba..32a4e1bd3c33 100644
--- a/dev-libs/imath/imath-3.1.3.ebuild
+++ b/dev-libs/imath/imath-3.1.4-r3.ebuild
@@ -13,20 +13,22 @@ DESCRIPTION="Imath basic math package"
 HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 # re-keywording needed for (according to ilmbase keywords): ~x64-macos ~x86-solaris
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="3/29"
-IUSE="doc large-stack python static-libs test"
+IUSE="doc large-stack python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 # blocker due to file collision #803347
 RDEPEND="
 	!dev-libs/imath:0
+	!media-libs/ilmbase
 	sys-libs/zlib
 	python? (
+		!dev-python/pyilmbase
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-libs/boost:=[python,${PYTHON_USEDEP}]
@@ -41,7 +43,6 @@ BDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch )
 DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
 
 pkg_setup() {
@@ -49,22 +50,17 @@ pkg_setup() {
 }
 
 src_configure() {
-	local majorver=$(ver_cut 1)
-
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 		-DDOCS=$(usex doc)
 		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
 		-DIMATH_HALF_USE_LOOKUP_TABLE=ON
 		-DIMATH_INSTALL_PKG_CONFIG=ON
-		-DIMATH_OUTPUT_SUBDIR="${MY_PN}-${majorver}"
 		-DIMATH_USE_CLANG_TIDY=OFF
 		-DIMATH_USE_NOEXCEPT=ON
 	)
 	if use python; then
 		mycmakeargs+=(
-			# temp. disable for finding libboost_python310, #803032
-#			-DBoost_NO_BOOST_CMAKE=OFF
+			-DBoost_NO_BOOST_CMAKE=OFF
 			-DPYTHON=ON
 			-DPython3_EXECUTABLE="${PYTHON}"
 			-DPython3_INCLUDE_DIR=$(python_get_includedir)
diff --git a/dev-libs/imath/imath-3.1.4.ebuild b/dev-libs/imath/imath-3.1.4-r4.ebuild
index 54eb940af84e..26fe42463028 100644
--- a/dev-libs/imath/imath-3.1.4.ebuild
+++ b/dev-libs/imath/imath-3.1.4-r4.ebuild
@@ -18,15 +18,17 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="3/29"
-IUSE="doc large-stack python static-libs test"
+IUSE="doc large-stack python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 # blocker due to file collision #803347
 RDEPEND="
 	!dev-libs/imath:0
+	!media-libs/ilmbase
 	sys-libs/zlib
 	python? (
+		!dev-python/pyilmbase
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
 			dev-libs/boost:=[python,${PYTHON_USEDEP}]
@@ -41,7 +43,8 @@ BDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-Gentoo-specific-changes-needed-for-slotting.patch )
+PATCHES=( "${FILESDIR}"/${P}-half.h-include-intrinsics-for-f16c-capable.patch )
+
 DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
 
 pkg_setup() {
@@ -49,15 +52,11 @@ pkg_setup() {
 }
 
 src_configure() {
-	local majorver=$(ver_cut 1)
-
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 		-DDOCS=$(usex doc)
 		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
 		-DIMATH_HALF_USE_LOOKUP_TABLE=ON
 		-DIMATH_INSTALL_PKG_CONFIG=ON
-		-DIMATH_OUTPUT_SUBDIR="${MY_PN}-${majorver}"
 		-DIMATH_USE_CLANG_TIDY=OFF
 		-DIMATH_USE_NOEXCEPT=ON
 	)
diff --git a/dev-libs/kopeninghours/Manifest b/dev-libs/kopeninghours/Manifest
index 0b3166a3f08f..5d9113d2d41e 100644
--- a/dev-libs/kopeninghours/Manifest
+++ b/dev-libs/kopeninghours/Manifest
@@ -1,6 +1,6 @@
 AUX kopeninghours-21.03.90-boostpython.patch 3513 BLAKE2B 165e1bc5770aee4d7990f06da47354104fafdf1993feee4d57f7580450b3d8e367f326555256026ed4859854e3ed4d30634ac07ea48099946693db19d0ca0002 SHA512 5cb98a4ca4dab9a33f63f4b77d391d21e2e017256a1ee011f30e509160288eb9cfb21938617b542e57f210848ebdc31f45d52fe4b6d7667c0c7f72ed889edf68
 DIST kopeninghours-21.08.3.tar.xz 65904 BLAKE2B 88169a5881a49fbb6728d706585d2e2d4c88d2eb66360917c1d0cef0cb7239de378d69afc1970f038e9c52756fe6097d5e423577a29e77c071e0b5ad54b7c6c2 SHA512 9fe8181b4c4e9427a6eba133a51b119e86378933ebf5bdbfe5a78c711837ccdbaa8baa04cb10e234febe7596c7e7e515dda8e09f8568bd785b0a3e061f6d8bcf
-DIST kopeninghours-21.12.1.tar.xz 68732 BLAKE2B a6de2313bf75d1067fb69830e185f975723b9ee314f2bd8e502f28f8a39f4878202b9f9c7a11164dbe9b05b5696f8876fe156b8218ce20808a52991a135ac360 SHA512 8970816f0f679a4d7a0f756e6dea08605d142c5590b9178d6e8468c377b8bb71f39786d3cf7db71b7a2ff0bfe4d3e042722bde41ae09395beb9b45225cc9cb8f
+DIST kopeninghours-21.12.3.tar.xz 68916 BLAKE2B d80275c195231ca52e0042149d685224c9ffadd6d341ddce1af6f46df451442e924f282119c91ab004dcabb64b112de559bbbcddc2a91daee5cf9a76b84fb4bb SHA512 42bdbe8172ff5ff89469786f3d544db4a07bc0d1de9a54b8525dc8789d0f4328159ee815c07595463f190073433de567fb2d3496d261daa46aac70354b3da6ae
 EBUILD kopeninghours-21.08.3.ebuild 1266 BLAKE2B 2300f8e1734e45840ad781e679fc860071c9f80774c09f0bed04d9a1adc56336252c5bcc18c8940b6532a9599d92cc4acc9bff4b5eaaa1bed0688c29e425002e SHA512 c80bc7a598e6df2ca2053fa9d3fda6fd5e222e1a91e704b1d0156fac6411b11980a0c443ee1c753471229f23e8ae3f9b4e73be1b11d64219c32cbf04d5cc2568
-EBUILD kopeninghours-21.12.1.ebuild 1284 BLAKE2B c412ac19980818679f764e00007985011fcb6824fbce05af1efcd7b0c4fd4d0a0f003e4195a9beb893fb489d60557e842ba20ef54d0ccd58fce1261ecc65566a SHA512 b30cfaea9be3a99b45a453934f599a79b344c04659e46a9825afd953bd7cbaeeb702ba80609c5f6271f15bb7190596e792c5dc72e6cf7dff38376f0dbd4064c8
+EBUILD kopeninghours-21.12.3.ebuild 1284 BLAKE2B c412ac19980818679f764e00007985011fcb6824fbce05af1efcd7b0c4fd4d0a0f003e4195a9beb893fb489d60557e842ba20ef54d0ccd58fce1261ecc65566a SHA512 b30cfaea9be3a99b45a453934f599a79b344c04659e46a9825afd953bd7cbaeeb702ba80609c5f6271f15bb7190596e792c5dc72e6cf7dff38376f0dbd4064c8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kopeninghours/kopeninghours-21.12.1.ebuild b/dev-libs/kopeninghours/kopeninghours-21.12.3.ebuild
index 5d70c6f06c47..5d70c6f06c47 100644
--- a/dev-libs/kopeninghours/kopeninghours-21.12.1.ebuild
+++ b/dev-libs/kopeninghours/kopeninghours-21.12.3.ebuild
diff --git a/dev-libs/kosmindoormap/Manifest b/dev-libs/kosmindoormap/Manifest
index 30f9d68af0e2..442c0ffe01e5 100644
--- a/dev-libs/kosmindoormap/Manifest
+++ b/dev-libs/kosmindoormap/Manifest
@@ -1,5 +1,5 @@
 DIST kosmindoormap-21.08.3.tar.xz 342772 BLAKE2B e30c0645105627b304162187ac9c84e8ebef0bbf5db17b28c1239428ec982eed526a7f29f7e543d1c1fb660d90d641358c1d0e8b1c6d6c40c5b11e471b25be52 SHA512 3a2337b433c25c16f2e69ab1a42e9324e8e176eaf85094a08d95a542af479e65637544a8486d481a3fe811e5c90aee1bcf803d92f3225db7c53c75840247e642
-DIST kosmindoormap-21.12.1.tar.xz 351084 BLAKE2B be7445e3163d506a17502dc69d71f43df1a260c5f0afd1f5ce82d2cc40a5f7b9c7cd82db1a53b03bf53354292ae2dfa17038ca106ce5ca8bf3cd208f92d78484 SHA512 bea94bc11af528b1f82dcbf12a2c04ecb3c123634e3ccf02209e3e73dea60ae44d53e17a10c0f3a485fc94c1982bdf4bcbdea0760d4d16e748a8c2d75b12c8ca
+DIST kosmindoormap-21.12.3.tar.xz 351272 BLAKE2B 8fde9196e18062770c63eb2b636bf3bfea65d8575f4d67106c28fcf3349c6d9bfa3bd1d48a8978b3ec2e2d027f89be3338b88cdfd4b59b7609cc9bba2aeab689 SHA512 f2f5bc04dbb9943114d9807787d98ad4a4963be556c5f2ec332c59bc60533abbf6d39b982f79264ff3d764cb4b8e60501d711039e0fc475500abbd800fc13b86
 EBUILD kosmindoormap-21.08.3.ebuild 1063 BLAKE2B 80687934139fd66331b87a30a5ce87d01ec04276d12bacbe3c1bd45f33184f894307c501078e4d42c3578045d4af406a94694174a8a719041938a2b1858eb5b4 SHA512 ecb37c911e5bcfc27702b40cf57422bf3833e9061fec751d4170f6fb44ad12ea615de7000e19fb5a9733621d82b5bdfd179aec49af9595b73a4adb59892c4273
-EBUILD kosmindoormap-21.12.1.ebuild 1063 BLAKE2B e55139cff5e9ccd4fe97e199ab708d21f966c55fccaab0a952c653e397daf942aec84d23ea4ba8d048a5b8fcc2e34fbb1b997de001a62e6defa92f7c568ee85b SHA512 d00b328b3f2af8d09b1943b05c045fc6d134177e573475a2ee0a2f30913e515dbc23556bf10a71739fe99b9777bed052676655b072ce786ba0e11acdaba762e0
+EBUILD kosmindoormap-21.12.3.ebuild 1063 BLAKE2B e55139cff5e9ccd4fe97e199ab708d21f966c55fccaab0a952c653e397daf942aec84d23ea4ba8d048a5b8fcc2e34fbb1b997de001a62e6defa92f7c568ee85b SHA512 d00b328b3f2af8d09b1943b05c045fc6d134177e573475a2ee0a2f30913e515dbc23556bf10a71739fe99b9777bed052676655b072ce786ba0e11acdaba762e0
 MISC metadata.xml 436 BLAKE2B 7b97cad83675445e816a4f92d2e9c2c4167457df244fd166b6388be7c9336b4852c3873fff4e9d18bf1cccaaeaec849a1b340fa92a15e54180652e53cb023859 SHA512 312c58bb9ef49585287db38ff0f4e6cb6486477f4c84246610c443fb07ced2129017462ef91fab147dde7d69b0923605dc5b68fe71f6cd80f0ed1115b4a9ca6b
diff --git a/dev-libs/kosmindoormap/kosmindoormap-21.12.1.ebuild b/dev-libs/kosmindoormap/kosmindoormap-21.12.3.ebuild
index f125124502bd..f125124502bd 100644
--- a/dev-libs/kosmindoormap/kosmindoormap-21.12.1.ebuild
+++ b/dev-libs/kosmindoormap/kosmindoormap-21.12.3.ebuild
diff --git a/dev-libs/kpeoplevcard/Manifest b/dev-libs/kpeoplevcard/Manifest
index ce60850fc9a8..9d48ff02d5de 100644
--- a/dev-libs/kpeoplevcard/Manifest
+++ b/dev-libs/kpeoplevcard/Manifest
@@ -1,3 +1,4 @@
+AUX kpeoplevcard-0.1-emit-initial-fetch-complete-signal.patch 906 BLAKE2B 7e0538c5ffdafb82ffa7991d59b3b818975896b61ecfda1113ad120423d0a8dce793e7b15400d434d814f2bbd853eef4feb8891477c9593eaee916d18ed00374 SHA512 3a5c92bf46a7ad61b0ba0c3508cea0d69d0b847f65279e763a37a73ea36ac58d3e885dbf5f3704f62449517dbadb9b52a5b9769fe700de90503528e2a8c56669
 DIST kpeoplevcard-0.1.tar.xz 13424 BLAKE2B 567b5f081283da8af26e03c3e46c50bf67524146171a6f8afa938ac9609d11bfe32ad8de39a29ec0431af135f33825149fb8e98a28141941fd418539a8f03c30 SHA512 9f11ee768d1ddce1f03f41b604180078c0315eb8b9f0118dd99eba65333400b0a0ed12ab1e08ebce3c6c0a2c93563e5c3e832a0cd458d6ea296bd64eeb9413e7
-EBUILD kpeoplevcard-0.1.ebuild 635 BLAKE2B 1f989f739e8f5f7d8a2fff9423176113ef2f90b66d441e417fe4bfa5b6af22642d01b240f9aa28e85fa1937a711c5827ec004316a1e74b126cb90f4fc4e451f5 SHA512 57653385b0a45fb2d5ea66973b2cb664045830a31b020666a812f7ed066f86ffafdfe35c0978d00b9294dc019a401c2fcb14d3c9ced20d4c069b55df6604ba97
+EBUILD kpeoplevcard-0.1-r1.ebuild 784 BLAKE2B 5dba52451cc6832f46d8152f4f2d952db1944e5d336c874c49db3d4774bd2df0262ae1ed67fa807d68356b05e78685585f7643b10c5454ac338ce7f1d8cd70bc SHA512 cf1f3c52033110267a3b1b173962641dbf6a1502ba9f6b7a38e8ed366f0104d16b9952a0d199197aaa85596ca6129feaf31427d07840aadeae0fa81f15e4d863
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kpeoplevcard/files/kpeoplevcard-0.1-emit-initial-fetch-complete-signal.patch b/dev-libs/kpeoplevcard/files/kpeoplevcard-0.1-emit-initial-fetch-complete-signal.patch
new file mode 100644
index 000000000000..3f16d9f5b674
--- /dev/null
+++ b/dev-libs/kpeoplevcard/files/kpeoplevcard-0.1-emit-initial-fetch-complete-signal.patch
@@ -0,0 +1,29 @@
+From 778d03445f41c536f2ca9116ee6acb5f4f01b868 Mon Sep 17 00:00:00 2001
+From: Dimitar Petrovski <dimeptr@gmail.com>
+Date: Mon, 6 Jul 2020 18:36:31 +0200
+Subject: [PATCH] Emit the Initial Fetch Complete signal
+
+BUG: 423845
+The plugin does not emit the initialFetchComplete signal which seems
+needed by AllContactsMonitor and PersonsModel does not get initialized
+since it waitd for the signal from all plugins
+---
+ src/kpeoplevcard.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/kpeoplevcard.cpp b/src/kpeoplevcard.cpp
+index bfaf71e..20531f6 100644
+--- a/src/kpeoplevcard.cpp
++++ b/src/kpeoplevcard.cpp
+@@ -153,6 +153,8 @@ KPeopleVCard::KPeopleVCard()
+ 
+     processDirectory(QFileInfo(*vcardsLocation));
+ 
++    emitInitialFetchComplete(true);
++
+     connect(m_fs, &KDirWatch::dirty, this, [this](const QString& path) {
+         const QFileInfo fi(path);
+         if (fi.isFile())
+-- 
+GitLab
+
diff --git a/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild b/dev-libs/kpeoplevcard/kpeoplevcard-0.1-r1.ebuild
index 1d705d08d4ab..2fc43960289e 100644
--- a/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
+++ b/dev-libs/kpeoplevcard/kpeoplevcard-0.1-r1.ebuild
@@ -1,10 +1,11 @@
-# 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
 
-KFMIN=5.64.0
-QTMIN=5.12.3
+KDE_ORG_CATEGORY="pim"
+KFMIN=5.82.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Library to expose vcards to KPeople"
@@ -23,6 +24,11 @@ DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcontacts-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kpeople-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-emit-initial-fetch-complete-signal.patch" # KDE-bug 423845
+)
diff --git a/dev-libs/kpublictransport/Manifest b/dev-libs/kpublictransport/Manifest
index ddde5d05d1b8..3e2c8eefa154 100644
--- a/dev-libs/kpublictransport/Manifest
+++ b/dev-libs/kpublictransport/Manifest
@@ -1,5 +1,5 @@
 DIST kpublictransport-21.08.3.tar.xz 411364 BLAKE2B 46d4681e98037d84d5813c62f13d76831922f9b2a3c04a51885292d702fa569f276dbd00056ee79cfecfebc4597d1ddde3c497b2d72e585ec5c14006253944e5 SHA512 bcd422855de8f224f7a30f09cd95345bd8637d3fb7a32ba0a7efe5c4bd350aed02cd6d8f186b4bfb467d50ce4ae927f360ccb5d188dadfbfa4e498ca4665df72
-DIST kpublictransport-21.12.1.tar.xz 480640 BLAKE2B 208cbf7fd778efb710108ba02f70ddf4bd3fc699d36e8e615cd5a4504c08a86ed9ae621ab70d5e92c55bc121a36dae4ea39947f0901d2c39fcd58e33a7a01fe7 SHA512 fb6c03fcd97d9578eca176e50d47599d7a5b899b7d874f7ded6f63ffbd75cec305b63efd0db4870b0d8af77c513bbccf8f8d01233a486959740fa490884e4ede
+DIST kpublictransport-21.12.3.tar.xz 480780 BLAKE2B 949c394497fcd76af7e4cc3d83e1db74cbef221f9f468a4ac247e82000503468e204eaa45ee61b4f5d05d84c1f4878484db342ff760d101a6a0a7b0960937baf SHA512 495fc7e92bab00fa0953fa81d2cb73e37055f8ccee899c8d9f8783e85f83e7f6a4c04a1e48ed607d565926bdc9fcadc539a2738b7c898a07aa6934f5e15038eb
 EBUILD kpublictransport-21.08.3-r1.ebuild 808 BLAKE2B 86c3d245c2b985ce99762f6948e0991e65888deb9d73e99dcf8aa18df876b7cf4fd338e8acea384dd0c06d4c47ba4db6ebbbd9d2317460241932ff0fda1ec37d SHA512 6b4125b74768951f3d005a186f96124f375be4fcfb57f07c7c79dac91d3e763959edd55578e68197fb26bed4e59b8c77722e30b0e00b18a3af6d4e5acb498df4
-EBUILD kpublictransport-21.12.1.ebuild 826 BLAKE2B a3cf204cfbcea9111a4dc415baea208e3e964e376f109eaa2c8a561cd452272c76a12f3926230d29b18ea68ef17532dd22fdf225e6912d318e0c8bd1a4104f57 SHA512 3be3156f902a546f2f79d9909d8ae6262f6dce8b8c43130e44de794c503793ae7a5c0dc54e13718d8c317e0c110571e857f354f7624362ea49798d90486f5e88
+EBUILD kpublictransport-21.12.3.ebuild 826 BLAKE2B a3cf204cfbcea9111a4dc415baea208e3e964e376f109eaa2c8a561cd452272c76a12f3926230d29b18ea68ef17532dd22fdf225e6912d318e0c8bd1a4104f57 SHA512 3be3156f902a546f2f79d9909d8ae6262f6dce8b8c43130e44de794c503793ae7a5c0dc54e13718d8c317e0c110571e857f354f7624362ea49798d90486f5e88
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kpublictransport/kpublictransport-21.12.1.ebuild b/dev-libs/kpublictransport/kpublictransport-21.12.3.ebuild
index 1b4c7df1e026..1b4c7df1e026 100644
--- a/dev-libs/kpublictransport/kpublictransport-21.12.1.ebuild
+++ b/dev-libs/kpublictransport/kpublictransport-21.12.3.ebuild
diff --git a/dev-libs/kuserfeedback/Manifest b/dev-libs/kuserfeedback/Manifest
index 14054521055d..bfb56022fbd9 100644
--- a/dev-libs/kuserfeedback/Manifest
+++ b/dev-libs/kuserfeedback/Manifest
@@ -1,3 +1,7 @@
+AUX kuserfeedback-1.0.0-fix-opengl-crash.patch 1513 BLAKE2B d53f4c02ab9c1bb298708694d2f4dc0f655ba93bb9ac83e1a24b264c810dd0caa0ea955e8a1f03418f133a0702ad324233ac5f7e46030980169936ee0903e3c7 SHA512 f3d91845ed05d592696b0a79bbc5d70c03b2c211fe9a4c1937da849c4f9f2fabbf339aced2038c97be9a66f4506bf021dabce558a51bf26916967f2087254923
+AUX kuserfeedback-1.2.0-enable_docs.patch 1776 BLAKE2B 6eab84c4ea3d678911ea6ab73dac0b4b7ff563dc9fa3fb11f563f2a9de6db7853fa16306c843f0380e14e734c28cb1654c06b9ec776dda89c784c6687f64d659 SHA512 209e8687c409a0c91d48b5fd0677088e7933270e9250b0fc389f2e78e733a13df52618a8e61d28d17ddaaf2f1a1a7f1207af0c30e0132b33337fc13c2395b8f5
 DIST kuserfeedback-1.0.0.tar.xz 187784 BLAKE2B 24acb6c1f143a0811a84c7d4f5ffe923df2fe94b0d13e361870d308b65ee8be747cef1a2ab719c6023b4f5885fb9970620a2a5da0d073e70b1e4912c6f64c5d1 SHA512 d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7
-EBUILD kuserfeedback-1.0.0.ebuild 1278 BLAKE2B 194802ce04a1a0d5d98249c779beb6320ab3d80f1cfaa0c3cf52fa7a89067ecfd0846a6a54eb5da38a11beaede97011d0c0c52c8903c292c2cc06e988e0e6a0c SHA512 84b34c90ce042990074c2918b11972ced89367e1ca60871b9b00258469b02eaee87c7a4e8a774e63e0fed2b91ddb2d985b68e1246bbe1e7ac5f0cfa02e055a1e
+DIST kuserfeedback-1.2.0.tar.xz 206364 BLAKE2B 4ae1683f8a3470ee3db7b3039c27ebd7bc210afd5cd8cdd992a107e541971f4778d7add3fb330befbfd7d62e04d9d2aba8fc22eab5a368f4b92e98f7baa1ec41 SHA512 0152233c741a287b623256cac6d109d405441f17dec68c5782d900ddb9ca5a93614d46ea112e1be9e64913cc3f46d107bec64cad4579b766919439b0ed88a470
+EBUILD kuserfeedback-1.0.0-r1.ebuild 1332 BLAKE2B 53cb13e2a7d21a6d64241b16d0311d78770f171abd09d8ba4b315c79f3f8ad2abf91f31501c5ffd613a71dfdeebec3602f014854257707b7975c3814d29ca05c SHA512 a078b5a6a4a3050cdbee78224549759d38d0dd35fa36628ee114b75966b521991c67d99b319a5c9717d23c79f5b1a203fdfac8600bc620f8426522b92fc9d63f
+EBUILD kuserfeedback-1.2.0.ebuild 1422 BLAKE2B cf3a08771d740484b475eaff0b51095b4ae079e22e6c9af709741b979395beba100c357e00a61d5375100d808fed92936b71759c1b5a3b720b6ce35102158ee6 SHA512 6474a37d6b3b8288d6131c6fd8a19ad944a4887c1c8aa61f6bb0b808399c2967beb0677c5091830ad7c1026577fdbb4dddaf7c0ae0092b0782f085643eb96b11
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch b/dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch
new file mode 100644
index 000000000000..57321355b23a
--- /dev/null
+++ b/dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch
@@ -0,0 +1,39 @@
+From 17db7d75643b4f3dccd5b36a6ab175f03ba74297 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Wed, 2 Feb 2022 20:36:40 +0100
+Subject: [PATCH] opengl source: Do not crash if we could not make our context
+ current
+
+BUG: 449505
+---
+ src/provider/core/openglinfosource.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/provider/core/openglinfosource.cpp b/src/provider/core/openglinfosource.cpp
+index 5117d85..08402c7 100644
+--- a/src/provider/core/openglinfosource.cpp
++++ b/src/provider/core/openglinfosource.cpp
+@@ -13,6 +13,7 @@
+ #include <QOpenGLFunctions>
+ #include <QSurfaceFormat>
+ #include <QWindow>
++#include "logging_p.h"
+ #endif
+ 
+ using namespace KUserFeedback;
+@@ -37,7 +38,11 @@ QVariant OpenGLInfoSource::data()
+         QWindow window;
+         window.setSurfaceType(QSurface::OpenGLSurface);
+         window.create();
+-        context.makeCurrent(&window);
++        if (!context.makeCurrent(&window)) {
++            qCWarning(Log) << "Could not make OpenGL context current";
++            m.insert(QStringLiteral("type"), QStringLiteral("none"));
++            return m;
++        }
+         QOpenGLFunctions functions(&context);
+         m.insert(QStringLiteral("vendor"), OpenGLInfoSourcePrivate::normalizeVendor(reinterpret_cast<const char*>(functions.glGetString(GL_VENDOR))));
+         m.insert(QStringLiteral("renderer"), OpenGLInfoSourcePrivate::normalizeRenderer(reinterpret_cast<const char*>(functions.glGetString(GL_RENDERER))));
+-- 
+GitLab
+
diff --git a/dev-libs/kuserfeedback/files/kuserfeedback-1.2.0-enable_docs.patch b/dev-libs/kuserfeedback/files/kuserfeedback-1.2.0-enable_docs.patch
new file mode 100644
index 000000000000..77915f1b4040
--- /dev/null
+++ b/dev-libs/kuserfeedback/files/kuserfeedback-1.2.0-enable_docs.patch
@@ -0,0 +1,48 @@
+From f523d1da91dbf944cb753e8aed8ad40367e8826c Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 11 Feb 2022 12:29:50 +0100
+Subject: [PATCH] Hide finding docs dependencies behind ENABLE_DOCS
+
+It was also oddly placed within CMakeLists.txt so moved it below
+major Qt dependency calls (and the actual "# Dependencies" block).
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9ea764a..48623bc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,12 +39,6 @@ include(ECMGeneratePriFile)
+ include(FeatureSummary)
+ include(GenerateExportHeader)
+ 
+-if(QT_MAJOR_VERSION STREQUAL "5")
+-    find_package(Qt5 CONFIG OPTIONAL_COMPONENTS DocTools)
+-else()
+-    find_package(Qt6 CONFIG OPTIONAL_COMPONENTS ToolsTools)
+-endif()
+-
+ ecm_setup_version(PROJECT
+     VARIABLE_PREFIX KUSERFEEDBACK
+     VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kuserfeedback_version.h"
+@@ -61,6 +55,14 @@ if (NOT CMAKE_CROSSCOMPILING)
+     find_package(Qt${QT_MAJOR_VERSION} NO_MODULE QUIET OPTIONAL_COMPONENTS Help)
+ endif()
+ 
++if (ENABLE_DOCS)
++    if(QT_MAJOR_VERSION STREQUAL "5")
++        find_package(Qt5 CONFIG OPTIONAL_COMPONENTS DocTools)
++    else()
++        find_package(Qt6 CONFIG OPTIONAL_COMPONENTS ToolsTools)
++    endif()
++endif()
++
+ set_package_properties(Qt${QT_MAJOR_VERSION} PROPERTIES URL "http://qt-project.org/")
+ set_package_properties(Qt${QT_MAJOR_VERSION}Widgets PROPERTIES TYPE RECOMMENDED PURPOSE "Required for feedback configuration and notification widgets.")
+ set_package_properties(Qt${QT_MAJOR_VERSION}Charts PROPERTIES TYPE RECOMMENDED PURPOSE "Required for UserFeedbackConsole.")
+-- 
+2.35.1
+
diff --git a/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.0.0-r1.ebuild
index 85edbc6aa810..d3d0eb2f85e9 100644
--- a/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
+++ b/dev-libs/kuserfeedback/kuserfeedback-1.0.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.82.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,19 +15,10 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
-
 LICENSE="MIT"
 SLOT="5"
 IUSE="doc"
 
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	doc? (
-		>=dev-qt/qdoc-${QTMIN}:5
-		>=dev-qt/qthelp-${QTMIN}:5
-	)
-"
 DEPEND="
 	>=dev-qt/qtcharts-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
@@ -44,6 +35,16 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		>=dev-qt/qdoc-${QTMIN}:5
+		>=dev-qt/qthelp-${QTMIN}:5
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-opengl-crash.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild
new file mode 100644
index 000000000000..ff6e5c22bb87
--- /dev/null
+++ b/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+LICENSE="MIT"
+SLOT="5"
+IUSE="doc"
+
+DEPEND="
+	>=dev-qt/qtcharts-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		>=dev-qt/qdoc-${QTMIN}:5
+		>=dev-qt/qthelp-${QTMIN}:5
+	)
+"
+
+# https://invent.kde.org/libraries/kuserfeedback/-/merge_requests/21
+PATCHES=( "${FILESDIR}/${P}-enable_docs.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_MAJOR_VERSION=5
+		# disable server application
+		-DENABLE_PHP=NO
+		-DENABLE_PHP_UNIT=NO
+		-DENABLE_SURVEY_TARGET_EXPRESSIONS=YES
+		-DENABLE_DOCS=$(usex doc)
+	)
+
+	ecm_src_configure
+}
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index 946b62e30f4d..a2210985f13c 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1,5 +1,5 @@
-DIST level-zero-1.7.4.tar.gz 395803 BLAKE2B 09b977cbd7bd438daeb1cf4b97c4a6e586239b01a873604282a925458e8c2abb896dbce7e3199cc27ef4e85fa6dbae8b77186bedc9f942427c81aa2bdf81c97c SHA512 270c273fa7f3a90d3a3af8d7882c8dfca684eeeab9b6c01b9145aa802186d8a1a5eaaf1afd720fb12be3a6338a4d95698bb5dd175abb96b4c2916c94e4f4771c
+DIST level-zero-1.7.15.tar.gz 396788 BLAKE2B 794b1ee0955ffaa8671918cba8b31f388bfd8464bd59c3e041cc976d36831ee8e11ec64b1428613bd1621a6118b7794c908071756060f1bd8f2239e77f3c6817 SHA512 84600ff4fd18abffc8765c071454e7fef7a49d7ff711c97e326bae4a8e4295f2e611fac99bcaaf7ad555916d7078b36dd91b45cf57a00bd9e995fc028a40fd2e
 DIST level-zero-1.7.9.tar.gz 396946 BLAKE2B c0b09e5318d5ba430b760d28d0f0943f8de910eaa0acc6477947ef4d6e0dc8af6ba3e1f8b2728e6fd9e763f038d1a22acd8c1d23eaac2e6fafa1f1f6913a91cd SHA512 65721d00de32d4b483eeca2b9f803a05724619afc46f664d6d5fb344fcff6a053a9a23daf24ab0fa05f598c7fde3e91c6b350fb9e8bf6ea38c596dbfe42fadc1
-EBUILD level-zero-1.7.4.ebuild 627 BLAKE2B aca47fb72cf707848e75b93925d2026623612743ef8516f7d813143423a3b1a0bc7487edd309a583135e30a2c5dcfbd0f5fd388f94489e1963caf86cc899f6a5 SHA512 a3ebecbe6443a186d1b32edae090b0f97ff442f2aae1f22df0f23846b6dc583c7b893a9e4499cb8da756c83af65c15c712f200d129b59856dcaf8ed62e6035ca
-EBUILD level-zero-1.7.9.ebuild 628 BLAKE2B 19db5e3da871d1eafc51d0cb941f4264bf2ae829720ccf185c6167d44aed4aa2f107c96c4009b48ca37c4516aeb77548886d6de8e06d140ebb1b309c73c6d640 SHA512 e61cb69efacfbd907551fcb62c3ebe4f0aeb5c1fbae007607d5af2bac778db2d40cbc3bbf9cb1d8d73cfd547fbf7fc6f2f82ece63f2bcf59a7a72591416cd899
+EBUILD level-zero-1.7.15.ebuild 628 BLAKE2B 19db5e3da871d1eafc51d0cb941f4264bf2ae829720ccf185c6167d44aed4aa2f107c96c4009b48ca37c4516aeb77548886d6de8e06d140ebb1b309c73c6d640 SHA512 e61cb69efacfbd907551fcb62c3ebe4f0aeb5c1fbae007607d5af2bac778db2d40cbc3bbf9cb1d8d73cfd547fbf7fc6f2f82ece63f2bcf59a7a72591416cd899
+EBUILD level-zero-1.7.9.ebuild 627 BLAKE2B aca47fb72cf707848e75b93925d2026623612743ef8516f7d813143423a3b1a0bc7487edd309a583135e30a2c5dcfbd0f5fd388f94489e1963caf86cc899f6a5 SHA512 a3ebecbe6443a186d1b32edae090b0f97ff442f2aae1f22df0f23846b6dc583c7b893a9e4499cb8da756c83af65c15c712f200d129b59856dcaf8ed62e6035ca
 MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e
diff --git a/dev-libs/level-zero/level-zero-1.7.4.ebuild b/dev-libs/level-zero/level-zero-1.7.15.ebuild
index af873cd942fa..84d0079b1c54 100644
--- a/dev-libs/level-zero/level-zero-1.7.4.ebuild
+++ b/dev-libs/level-zero/level-zero-1.7.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/dev-libs/level-zero/level-zero-1.7.9.ebuild b/dev-libs/level-zero/level-zero-1.7.9.ebuild
index 84d0079b1c54..af873cd942fa 100644
--- a/dev-libs/level-zero/level-zero-1.7.9.ebuild
+++ b/dev-libs/level-zero/level-zero-1.7.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index d3f797580b52..1d45739c45f0 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -5,6 +5,5 @@ AUX leveldb-1.23-system-testdeps.patch 920 BLAKE2B 2e2a01c801ba852e312b13beb3dc7
 DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
 DIST leveldb-1.23.tar.gz 242925 BLAKE2B ef9ac853cdc2f376b9b4299c1017db8c262cb318ad771f40fe81c9fb71ea06ee56ac533b3e8af4e6fdd28577a2f87cfd103ecb49098187d099ccd6019b8ca1d2 SHA512 ac15eac29387b9f702a901b6567d47a9f8c17cf5c7d8700a77ec771da25158c83b04959c33f3d4de7a3f033ef08f545d14ba823a8d527e21889c4b78065b0f84
 EBUILD leveldb-1.20.ebuild 1696 BLAKE2B cf3635413925eb7fda325336206a17ba3449559e4c70b8f66db79dc0704d4acd5c1f5f08f5e5a9b7b73ebdf9366ab0cb09e94b3957497147e8518e266235414c SHA512 2267e43e96a97110a190882aeb053aee5ef40e6735059989320ba272db5e86a66e384883f10afba274d05c41054f050d22851b89c6be769c6e881e5a9762a681
-EBUILD leveldb-1.23-r1.ebuild 940 BLAKE2B c8845aaaedf9dae20e102864641a6562f402c5e13673b17bc9246b721aeddd2e3a8abf2188a8da5327f66176e9749c900c5a541c564d44a5c0bbe1b1bdfe0004 SHA512 9b34fa37095e60d03c2f04e14bbb774e671bc6eefabcdd15f472c03ca4a72d725a6fd0da442df8ad9d2112043bb3422ac1cc000649a10ee08cd434c47d1011f6
-EBUILD leveldb-1.23-r2.ebuild 1026 BLAKE2B 5b3232e693b5e6314250b9387be8767b19e8e9afee3dc0050d7bdb88a5066102addb0af2261d27222c4f2f2348139c82b73ae610e85440fbab46534396bd305a SHA512 9d8321e5199085c127d11451b136434b1c53a76fc9191ae446e526009aa019edfc8380b045274804beff6bc687d617c93f676e1b07a730a10d928bbd02b6494c
-MISC metadata.xml 511 BLAKE2B 2108f2600f79e95a7afe0d3f2b96afe529ec8b2aec0eba1e4231e902c118b9332f11dd952db93c95f2d6133362d2315435e17da153cf17fb7382da18a8651377 SHA512 44a3726f1dfb71c1abd07b2c3b0c9e0243ac74fa23f87c8564c503d192944879196433e3cae9849ad1fec79f20e72156fed412cbb18d0fbb573d987830f640d4
+EBUILD leveldb-1.23-r3.ebuild 1134 BLAKE2B efba3d4436da5c60522ae83a8a2c9e2358678ee2e54b8a75c16e2fe7c0f1228ba76f1b885fbd65dac9bee02d45474484f4a3249b63993a15fb11f1d22ecd051a SHA512 837a1c5c69162c0e816fc9ae0434bd7385980117725f124fecb5d5eb0f3ec1de9c5978db03b9904101c88688252263168667e97c50c6aaa1a35bd0cda75e06e1
+MISC metadata.xml 392 BLAKE2B 5912a3fb0a2763269de18e8be23215dfb0002d5e4fc4a7cf9870f36a2583bc64497e77320e83ce6437349fde84c5d38a5574e248920d1b26dfb6003e79f809b9 SHA512 7da9c4c217de039a538f7c9e87e102cbcbb843da7a1ffbc773e4f8498bcd39cfc3ee83e7d34298ec77d8ea806bd754f48300ce285ea9d409c823b72f626b67d6
diff --git a/dev-libs/leveldb/leveldb-1.23-r1.ebuild b/dev-libs/leveldb/leveldb-1.23-r1.ebuild
deleted file mode 100644
index 498da29525eb..000000000000
--- a/dev-libs/leveldb/leveldb-1.23-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+crc32c +snappy +tcmalloc test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="crc32c? ( dev-libs/crc32c )
-	snappy? ( app-arch/snappy )
-	tcmalloc? ( dev-util/google-perftools )"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.23-system-testdeps.patch
-	"${FILESDIR}"/${PN}-1.23-remove-benchmark-dep.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DLEVELDB_BUILD_BENCHMARKS=OFF
-		-DLEVELDB_BUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/leveldb/leveldb-1.23-r2.ebuild b/dev-libs/leveldb/leveldb-1.23-r3.ebuild
index 398757537db1..13684bcf2b50 100644
--- a/dev-libs/leveldb/leveldb-1.23-r2.ebuild
+++ b/dev-libs/leveldb/leveldb-1.23-r3.ebuild
@@ -11,14 +11,15 @@ SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+crc32c +snappy +tcmalloc test"
-
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="+snappy +tcmalloc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="crc32c? ( dev-libs/crc32c )
-	snappy? ( app-arch/snappy )
-	tcmalloc? ( dev-util/google-perftools )"
+DEPEND="
+	dev-libs/crc32c
+	snappy? ( app-arch/snappy:= )
+	tcmalloc? ( dev-util/google-perftools:= )
+"
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( dev-cpp/gtest )"
 
@@ -34,9 +35,15 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
+		-DHAVE_CRC32C=ON
 		-DLEVELDB_BUILD_BENCHMARKS=OFF
+		-DHAVE_SNAPPY=$(usex snappy)
+		-DHAVE_TCMALLOC=$(usex tcmalloc)
 		-DLEVELDB_BUILD_TESTS=$(usex test)
 	)
 	cmake_src_configure
 }
+
+src_test() {
+	TEST_TMPDIR="${T}" TEMP="${T}" cmake_src_test
+}
diff --git a/dev-libs/leveldb/metadata.xml b/dev-libs/leveldb/metadata.xml
index e937f6bb5998..0c3bde759c88 100644
--- a/dev-libs/leveldb/metadata.xml
+++ b/dev-libs/leveldb/metadata.xml
@@ -9,7 +9,4 @@
 		<remote-id type="github">google/leveldb</remote-id>
 		<bugs-to>https://github.com/google/leveldb/issues</bugs-to>
 	</upstream>
-	<use>
-		<flag name="crc32c">Link against <pkg>dev-libs/crc32c</pkg> for accelerated CRC32C calculation</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-libs/libansilove/Manifest b/dev-libs/libansilove/Manifest
index f2554f618e20..26fc42ae2c6c 100644
--- a/dev-libs/libansilove/Manifest
+++ b/dev-libs/libansilove/Manifest
@@ -1,4 +1,6 @@
 DIST libansilove-1.2.8.tar.gz 59695 BLAKE2B 4be4fb1f7277cc53bdc31399b429fc142cd3b87933da4c87604fe290b8697dd4c3d03a4c77bbac62648b0b8b0da509b5f7b17d2867e2e9e56eaf00674219fff3 SHA512 99df7fa0e5f2eb26a95b5073587e957378163fcab9ca828f7d6eca79dcb92463b1788285813c4fed6bfc9ee753c425fd34968e5e08999bc63fe6c4ba5939198f
-EBUILD libansilove-1.2.8.ebuild 588 BLAKE2B c6d98e2b87fbb9840e46c0f859a736819ee0eaaf14b2f56880f250ea265a9e5624e4b955562656a817e0e81049798528b3760e593d0113bf8c313c5e1be6debe SHA512 88ef22d3592634ead3204b8b34a55a65766a9433952d23e2443dd6104888b45797d6c0a27227ce5e6741d223ead421a8dc0dcf0c772b5f081855b8a7b37da9ca
-EBUILD libansilove-9999.ebuild 576 BLAKE2B 87c3087832270affcf72e50b3bd4c6667d65355663e66da57aece50fffa61b31bef9f9c651126aab73e000d5e23ada053cbab99229fb5815f4b5df0bc5c7bdf9 SHA512 8b3e4cff2640d0c8519635ccfc9e15165ae401a7d052ade92cb02146380846ad0da04bb67a9484945c167cd58ef5d6518f69b10b3fe98ab3ea887989843b685f
+DIST libansilove-1.2.9.tar.gz 58703 BLAKE2B b7feb458c01ab6bb96be1893d7f8ffc92dff63e23aa81fad29519ff574d55c0bbf84f66da0bf54a9ff428079f7d101e50b92d6f600934400f67d06497123abf7 SHA512 80fe2463634005c4ba5ba74587b1248fa5ef4789600a3b9603678bf63c8bb7d9c60348388d103589b6b11516fe033ec080a7a625ed84233976c44334c6ac1959
+EBUILD libansilove-1.2.8.ebuild 593 BLAKE2B d14a33d42a2e95fde3b062538c57d4447ee6e3be324e9eeefb7ce06d85b9b7523fa2e63b9e145e03b5ec63120157f8a8fe9d3d1ed30a09ae3604ae8b9167146b SHA512 f53ad0b89e43607347269f83aa83d422878531b40692caa66a02a3a8f50d87886438661e31609114df42e4c37f2bb2b4a7cd670ef8669df531590e01cab6b002
+EBUILD libansilove-1.2.9.ebuild 593 BLAKE2B d14a33d42a2e95fde3b062538c57d4447ee6e3be324e9eeefb7ce06d85b9b7523fa2e63b9e145e03b5ec63120157f8a8fe9d3d1ed30a09ae3604ae8b9167146b SHA512 f53ad0b89e43607347269f83aa83d422878531b40692caa66a02a3a8f50d87886438661e31609114df42e4c37f2bb2b4a7cd670ef8669df531590e01cab6b002
+EBUILD libansilove-9999.ebuild 593 BLAKE2B d14a33d42a2e95fde3b062538c57d4447ee6e3be324e9eeefb7ce06d85b9b7523fa2e63b9e145e03b5ec63120157f8a8fe9d3d1ed30a09ae3604ae8b9167146b SHA512 f53ad0b89e43607347269f83aa83d422878531b40692caa66a02a3a8f50d87886438661e31609114df42e4c37f2bb2b4a7cd670ef8669df531590e01cab6b002
 MISC metadata.xml 511 BLAKE2B 326fb74ded1bca2aff1bfd21a0de0f063ac7015710226f0b04e272a5665b086115a0bfc70884a92417473b149a4d3e41173602be9ce9c9a0d5ac3428b7a99db2 SHA512 062e9312119ea28e711fa63b6f8554f415cf37b74949497bad0c94e27c2e44d9edb338fc14e87ecade56cf8e1e1fd2c1f38fb6acb62d973ea75d37e9f37b107f
diff --git a/dev-libs/libansilove/libansilove-1.2.8.ebuild b/dev-libs/libansilove/libansilove-1.2.8.ebuild
index d3dabfe51f2b..dd28dd03edd7 100644
--- a/dev-libs/libansilove/libansilove-1.2.8.ebuild
+++ b/dev-libs/libansilove/libansilove-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"
 else
 	SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/libansilove/libansilove-1.2.9.ebuild b/dev-libs/libansilove/libansilove-1.2.9.ebuild
new file mode 100644
index 000000000000..dd28dd03edd7
--- /dev/null
+++ b/dev-libs/libansilove/libansilove-1.2.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="library to convert ANSi and artscene related file formats into PNG images"
+HOMEPAGE="https://github.com/ansilove/libansilove"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"
+else
+	SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="media-libs/gd:2=[png]"
+DEPEND="${RDEPEND}"
diff --git a/dev-libs/libansilove/libansilove-9999.ebuild b/dev-libs/libansilove/libansilove-9999.ebuild
index 7d64d5664add..dd28dd03edd7 100644
--- a/dev-libs/libansilove/libansilove-9999.ebuild
+++ b/dev-libs/libansilove/libansilove-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"
 else
 	SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 16700fbcfefa..fa306b74b052 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,4 +1,10 @@
 AUX libarcus-4.8.0-deprecated-protobuf-calls.patch 1395 BLAKE2B 6488f7da07b78df1f18826a62f47cc2a7835ad66f7c5f999a4926caff9bffa8125b39f44cbb4e5849b3283c95898120c2cdc0947c9008869af91db08f0036e55 SHA512 f98cdd0d15d03752cd04466211cdaf2fb0ebb4f9a5aa887c4f9a1df5c32ced18559952f89c4549ea93376d95ec0b1bc51289ce87256804d2fc453686d48b55e5
+DIST libarcus-4.12.1.tar.gz 32079 BLAKE2B 0efc45f3ddb4d08f960b2a629b0ad58cad9cbf16e90d75ca4f63706acb3ce8625dbe7c51c9265074f3104b66f23385c41e865fbc603a0b43c848c55a95b1f971 SHA512 0b2f2a0b4c3492725b83f2c8b0bb38a2cba10c27317cedd722b27447f0e36c571f1ae7a796de29cfb30e9827f35449327cc20c21780212fdeb35d05c90c3e2e6
+DIST libarcus-4.13.0.tar.gz 32079 BLAKE2B 56ddd99c347936770c5b2a99d337784605a27fda2c8a16e1537b25f5ff4d2ccead20e4992aed6cfba439be73a42dc2785da9681e80bc1a7c0ef0aa3a2c33f630 SHA512 a48ab1cb286c13b817363e113707499f2619724c8d2f7672309f9aad78123a89f60e60e92932d8761af87ec5f868f8c319717457532d45e3f2d8e5c3cc010db5
+DIST libarcus-4.13.1.tar.gz 32077 BLAKE2B 8a75de1ccd0879db817cd67600f83e765e00eed175d73685331ea7f1cde07dabd5c49c9b0f3f039a2a0e6ad7f491fa34de62054494fd9c588e3bb530370b65b7 SHA512 ffb14595f23c47f71082b994eae01471f45e2e9e1ae9a8ad01df577b9445594c30173388beab016a92be9723638ca6e46b5cecddddc6adc97e9d212fc0fa23fa
 DIST libarcus-4.9.1.tar.gz 31967 BLAKE2B 2ee827c3f1f592ac1efa7557a2cbfa9cf9fd2d43a7be7fd803f94f7b51c9a03be1078d3df319e1bbe2bc37b6ec3a1c6f16996c4e3b6251dd06f6031dd32ad2a9 SHA512 5124b80647cb0715ad94c5eaaeac797a867319de9a8064b689783fdb28598903a69e3a61393db90f5e0b3d10ee30aed844170cab63dc4b7c70509d5129a17cdd
+EBUILD libarcus-4.12.1.ebuild 1358 BLAKE2B 3cd3af7a1b25a29159f79f6cb5e5e10af181504206ed8cc8f100b4e8748e1853020c72b2c22bd0af288b3007475ef46e2f5713fb671257ff8ed28048cdc3c06f SHA512 9e63dccc5817e5e65f3a7e23a4db9b1d5490b4f8002f7c1bf70c2afa2f7c6a27e0012411a7d547d5bfaeb06ce7ebd72bf906d9d43119b97f7a7c88ecff5bfcbf
+EBUILD libarcus-4.13.0.ebuild 1359 BLAKE2B ae3a4eeb376b9097cd770f6d882484ae19f8d6805c6b6100acd47c57d8d9a6e2be08ac2441b7b814b3d9d9fe475a4359315bc765e6a8e485e06956199a075354 SHA512 72af8d29e2f2c886fc98cbc839807c692f9f6d340db89fb9ef3a53eb61425b596383bfd3f3a3c6b0886ca35d5f656ef36a10cc35cea77397fabc92e7706b22a1
+EBUILD libarcus-4.13.1.ebuild 1359 BLAKE2B ae3a4eeb376b9097cd770f6d882484ae19f8d6805c6b6100acd47c57d8d9a6e2be08ac2441b7b814b3d9d9fe475a4359315bc765e6a8e485e06956199a075354 SHA512 72af8d29e2f2c886fc98cbc839807c692f9f6d340db89fb9ef3a53eb61425b596383bfd3f3a3c6b0886ca35d5f656ef36a10cc35cea77397fabc92e7706b22a1
 EBUILD libarcus-4.9.1.ebuild 1359 BLAKE2B 103675b40d9849aaa5c9b1a077a3ca0efd2f2c539f6e7caf53115411996f8a36c4a58ef5b512076cc9c95b9c57e2ab60aca458f4f804b67c9e9de93e5ff48856 SHA512 19789acb5e8e7bd6b7db4354432372a4feffb588f48845e2ddfcef64d642570bf3396b6292ca454fb6bbb90754a29b26190fd76e0cc231fc56365c91c9101756
 MISC metadata.xml 1286 BLAKE2B 149e6008ee050d64c46009c12f18dd2e18234e4f19c1093fd0c557cc3d9369b547b07f7397975ab74b58d96ce39210f6a213b2f750ac2f844da579ff9f4ba8e3 SHA512 d6efb7fab1d6072cf8ad1ce5d2a33956eb9a8ac78992a434201d89de444b29382223e91f3c25475128a07fc81cfd4382bd396f9f16044f33b5ec4cdac8612b0c
diff --git a/dev-libs/libarcus/libarcus-4.12.1.ebuild b/dev-libs/libarcus/libarcus-4.12.1.ebuild
new file mode 100644
index 000000000000..0490a9cfc427
--- /dev/null
+++ b/dev-libs/libarcus/libarcus-4.12.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+MY_PN="libArcus"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libArcus"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="examples +python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/protobuf:=
+	$(python_gen_cond_dep '
+		<dev-python/sip-5[${PYTHON_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )
+	')"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.0-deprecated-protobuf-calls.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Find SIP for current python version, not the latest installed
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+		CMakeLists.txt cmake/FindSIP.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples ON OFF)
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libarcus/libarcus-4.13.0.ebuild b/dev-libs/libarcus/libarcus-4.13.0.ebuild
new file mode 100644
index 000000000000..119faccb2d4b
--- /dev/null
+++ b/dev-libs/libarcus/libarcus-4.13.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+MY_PN="libArcus"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libArcus"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples +python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/protobuf:=
+	$(python_gen_cond_dep '
+		<dev-python/sip-5[${PYTHON_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )
+	')"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.0-deprecated-protobuf-calls.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Find SIP for current python version, not the latest installed
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+		CMakeLists.txt cmake/FindSIP.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples ON OFF)
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libarcus/libarcus-4.13.1.ebuild b/dev-libs/libarcus/libarcus-4.13.1.ebuild
new file mode 100644
index 000000000000..119faccb2d4b
--- /dev/null
+++ b/dev-libs/libarcus/libarcus-4.13.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+MY_PN="libArcus"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libArcus"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples +python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/protobuf:=
+	$(python_gen_cond_dep '
+		<dev-python/sip-5[${PYTHON_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )
+	')"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.0-deprecated-protobuf-calls.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Find SIP for current python version, not the latest installed
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+		CMakeLists.txt cmake/FindSIP.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples ON OFF)
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 39b8b9c2858f..1f5665157b0f 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,5 +1,5 @@
 AUX libbpf-9999-paths.patch 883 BLAKE2B 663e03ae01afd7be73c281e8b83cf5534717c28f5960b4b7ca5530096840568dedf4e5f58f2139ab56c5f57382a80540294cb492f6ad619f174184172b3441af SHA512 de78131baa08874000cc52b0b21db4055246a653503301bd82c2e8f5818c955d63727d957d7834f1aed63abad42607480911fa0c2ea8d07d833ebd1f8b338039
-DIST libbpf-0.6.1.tar.gz 858232 BLAKE2B 239e7bf47c24d09eb8e177e61d00bd834a0155c8773918246514858fe27688911f79dc4a22d02ab256c7c137010875f8d39d4fec9cecfd7a2b77e6b4df7610ea SHA512 5a8ca70c571fb306dd280f0526db48b78b13b57b4012f7bd3933d6e07d5e41e9370b2db6ed9bbc283c6dcbb21036810bf3093f462906b66557ce0d850c89083a
-EBUILD libbpf-0.6.1.ebuild 1077 BLAKE2B 82ce5fe750c70a860b686d6f7cefd7ba51c7070f5c6d49c234407e5afa7e2479f0bcd7cda059d4d4dd222ced2b8b0b13c039ff4b3f3731b21d543d00c551b0b4 SHA512 e42a838c5b6d6ba55dce73ed46cb772f66402979674382e5617905a0b4443ee43c391deb4a0f52854da4b2eebc0ea25758d338cf5ef320a375d56936ca2ef2a8
+DIST libbpf-0.7.0.tar.gz 900120 BLAKE2B a67d83f52fde8a6d7771b0d31fbfabbc7d81013aacd733b1a71724a30eef47a085884f28687cb9e5a103a08a3bd9dde6eeb93f13fa4f1a04a386fe6887f126eb SHA512 8f1b13d60fc61176567f780a6c34314e5bdf1d2d3a8187c31b83eef74250729612a4333a9f739cd75887a8b7bd94446d6a1e0c8424565366051be9d24aa286b4
+EBUILD libbpf-0.7.0.ebuild 1077 BLAKE2B 82ce5fe750c70a860b686d6f7cefd7ba51c7070f5c6d49c234407e5afa7e2479f0bcd7cda059d4d4dd222ced2b8b0b13c039ff4b3f3731b21d543d00c551b0b4 SHA512 e42a838c5b6d6ba55dce73ed46cb772f66402979674382e5617905a0b4443ee43c391deb4a0f52854da4b2eebc0ea25758d338cf5ef320a375d56936ca2ef2a8
 EBUILD libbpf-9999.ebuild 1076 BLAKE2B d44039d1bfd55ddc95d912ed484d247b1724e426f90cc37cd6dda84a5272f061c83811504d25c2f05c4394e57c3285bf256a3287b2bf320ed1fa0d677de16612 SHA512 15e0913d7eb9f8497c86cb2845662f2986a16ce1f5829ce34054c09e3be3a8165e1e7e91cf453e79d968bf8d9d1f69be539b1136e5fd9b4eb6adbbd0e5d794cb
 MISC metadata.xml 420 BLAKE2B c61b50bd86dd9d110c35d57a9352ca3862790460f0a6f8e4be9e4ac2eb603fe6c1d6bbe8d77e9fdf32d08e7aaf19349516f25a0fdcb29e2671d71d2c230fc1f5 SHA512 131f77e33aa5b3cbc037a297fe0ed9affbcb956b4c7ddc64889eba5f8315f5090ae4fd7a6054f8961461072ca77d13f8bc6674f3ed27372b7b96c4322c487676
diff --git a/dev-libs/libbpf/libbpf-0.6.1.ebuild b/dev-libs/libbpf/libbpf-0.7.0.ebuild
index f4feea29582b..f4feea29582b 100644
--- a/dev-libs/libbpf/libbpf-0.6.1.ebuild
+++ b/dev-libs/libbpf/libbpf-0.7.0.ebuild
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 017da3afc799..301001182d83 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,3 +1,3 @@
 DIST libburn-1.5.4.tar.gz 991212 BLAKE2B 3fd4aa70eed2c9d0d33ef8bb967cd6208f1561aeebe8bc2b222fa4639fa3c215d49ee5ed3efc32813221fc4a9016ec9a3cabdcd8ae052d161794c0af11c7e6ee SHA512 dd7b14093e62e2c02011955c24e01d70ed78969b14faf7e5a63c0da97a80c438b628922532eb135af7dea8ee7c7b83554b3354160306dad852ce5bf6eb1d5ac9
-EBUILD libburn-1.5.4.ebuild 855 BLAKE2B 24b8753ef3505698d8655f2a25e724516542dfdf2af397351a05d2a2ca6e2f9bffd527e81bacafd2dbcba1ea18eaad99067fc16531f14b592fd9cb3c1bbcfb01 SHA512 c39efd1ce862f773b4290c5030855a34248b9a389ccdd82588b102ac6e41734fe3ae4ae0d78212e5dd0eb0186f5a28aebb30526db5189e6b3bd5c910ed7f67e4
+EBUILD libburn-1.5.4.ebuild 854 BLAKE2B 0f367b43bdec0b0570d4d9c7eb6bd6bb6ce33d08e3d8c05b979fa08879e771a14e601f4b5296fa35a13608194a4bf12aefe09c637fca41eab961172fa21a8c8d SHA512 03d8d1f7296d975f1f6276202ee38a8507843fd64153e1632024847552ddcb293cbb2447c0e42f85c151f54ae24f6deccf2fb117025c5386f2019793b57188ca
 MISC metadata.xml 244 BLAKE2B 81e7bffb2ab3a3015b9a90bb48d0f62a65b55840b50a77f41b24961c3d9f682405c866b25a88c900785d60f669e60791607921808b988ab3ae525e31933e6067 SHA512 d4a328a1ed124445554a4a6f16cd5d9021314f6f4634c9e2866a68ca318220889554603e405c7aba69e9135cb5848de9bbf361f923fd3c0a5a6c803345351b93
diff --git a/dev-libs/libburn/libburn-1.5.4.ebuild b/dev-libs/libburn/libburn-1.5.4.ebuild
index 0b38168bb122..23da5bdecb27 100644
--- a/dev-libs/libburn/libburn-1.5.4.ebuild
+++ b/dev-libs/libburn/libburn-1.5.4.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
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index c0f4e0ae65e5..492d16244dd7 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,3 +1,7 @@
+DIST libcharon-4.12.1.tar.gz 151783 BLAKE2B 54cac090a924ee086e15fddc0cd2acc8dfbc3dfd2dc91b27ffb1d81a64dcf30a46bf62e2c443d8de46a6f2a02e6d06dc1ea454d19f57f7dd93d5f81a44477dba SHA512 dcc0b89703e36e8f3d508bbda91b6fcc8313ac09c4d5e09cc6f0770ccdde18e421daa7e6b52958c5705dbb6987961635e3e31a61810ba54bf8b842af7afba94d
+DIST libcharon-4.13.0.tar.gz 151775 BLAKE2B f8a8b59b361ffc9b54e0047e0cc3824e2a92cf341aa9664712d020e07e5f2facda6f2d1827998c4af0958a3b05070738a20d93d7723a2f3708e601b70474653c SHA512 cd6e4cd696bcbebe5aa6a53f5222fbb8f982ff21d165adcd8854769b19df2d15ea6287100ba09ddd85ac80d3f86dbfae9ac050ee50f082223bf0acb542413d8c
 DIST libcharon-4.9.1.tar.gz 151243 BLAKE2B 8557efe4667a83297a4bcfc8307e2322a379e52d50ad1648d873a923e182b3be1651a13c7402ac041fd134036a75a42e825adf2cc27271af218db44af7e48473 SHA512 41d611f8d3bf0f762a38a00c159104df04b73cd5c4f7e9ebcfe3ac9cdd0c8e31e505c4fd4ef8f8a6f1c02bf882bb3e14ea4e92c8b15169a91cbd1815e36310fa
+EBUILD libcharon-4.12.1.ebuild 1746 BLAKE2B 8398f3a32823f17eb7d7c20da8d6a80c233ca9064d005b585fad25ad42e28cd443165801bfac246424fa2714eb0bf32fc2e7f5811ed55686e3a9c7454979626f SHA512 c3f9a56031cdd4e2f252c68fe7c3fa7f1821775250aea272ca9414f10a344557df872333eea1614cf241abf7379eed7311c25bdc5e7d427dc362101aa2abcc5c
+EBUILD libcharon-4.13.0.ebuild 1747 BLAKE2B 6062f4fed8d330e9e6a28c4e91dcac51bd79fa4e6094e6084e3062002abd83b905b03e9da906c3f6717e82409588dd13237f7e272d3a22594e913198e442b581 SHA512 8b3dac6ae40877e6a24ded839db182e11b3f3c1b163a6cf69f48681b1cd955d39ab6d825a2c4ce97a3db20df29767963c4d8f5e8791873fb1a6281aca2bb585a
 EBUILD libcharon-4.9.1-r1.ebuild 1747 BLAKE2B 8a8989c27be14e430a912d220e83e12e7584010a82838ff7453c9f58b7a6e3bb045885a6f222ef49a17fbd77dbbfe7d8343bbeba387008a6f50299d2dc6b4021 SHA512 422fe986046dbb84f3cef7e1e7872a484a8a71dcd49e0dd5d096aa89a60f8c2bba1a2d2ecc5648c88668b3cdfc4a94e0448b9f24c539840244d10a409cac419d
 MISC metadata.xml 1140 BLAKE2B 356713d6a644186b8fda5d9fd9587a74a605aaa638217c62dd9f0657859322c66015d25a5b5335dbe02fcf2492ca7dec0d5e7decd5a2d4602b8b8ec8338f7821 SHA512 8aa76c3b4dc2246e0cc6c508149ff9913ef3310a3477d7596b9101f183d0e858cc3c11ebfd138cf1eb65e79c2800ad63cfaca63201aa1a63e36e5ef63bd664aa
diff --git a/dev-libs/libcharon/libcharon-4.12.1.ebuild b/dev-libs/libcharon/libcharon-4.12.1.ebuild
new file mode 100644
index 000000000000..9d4e30e9bfc3
--- /dev/null
+++ b/dev-libs/libcharon/libcharon-4.12.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+MY_PN="libCharon"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libCharon"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+IUSE="+client +dbus test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="
+	${PYTHON_DEPS}
+	dbus? (
+		acct-group/ultimaker
+		acct-user/ultimaker
+		sys-apps/dbus
+	)"
+
+DEPEND="${PYTHON_DEPS}
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# use current python version, not the latest installed
+	# fix python install location
+	sed -i \
+		-e "s:find_package(Python3 3.4 REQUIRED:find_package(Python3 ${EPYTHON##python} EXACT REQUIRED:g" \
+		-e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}\.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" \
+		CMakeLists.txt || die
+
+	sed -i -e "s:/usr/lib/python3/dist-packages/Charon/Service/main.py:$(python_get_sitedir)/Charon/Service/main.py:g" service/charon.service || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_CLIENT=$(usex client ON OFF)
+		-DINSTALL_SERVICE=$(usex dbus ON OFF)
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
+
+pkg_postinst() {
+	if use dbus ; then
+		elog "To start the Charon File Metadata service at boot, add it to the default runlevel with:"
+		elog "    systemctl enable charon"
+	fi
+}
diff --git a/dev-libs/libcharon/libcharon-4.13.0.ebuild b/dev-libs/libcharon/libcharon-4.13.0.ebuild
new file mode 100644
index 000000000000..5a215127935d
--- /dev/null
+++ b/dev-libs/libcharon/libcharon-4.13.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+MY_PN="libCharon"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libCharon"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="+client +dbus test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="
+	${PYTHON_DEPS}
+	dbus? (
+		acct-group/ultimaker
+		acct-user/ultimaker
+		sys-apps/dbus
+	)"
+
+DEPEND="${PYTHON_DEPS}
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# use current python version, not the latest installed
+	# fix python install location
+	sed -i \
+		-e "s:find_package(Python3 3.4 REQUIRED:find_package(Python3 ${EPYTHON##python} EXACT REQUIRED:g" \
+		-e "s:lib\${LIB_SUFFIX}/python\${Python3_VERSION_MAJOR}\.\${Python3_VERSION_MINOR}/site-packages:$(python_get_sitedir):g" \
+		CMakeLists.txt || die
+
+	sed -i -e "s:/usr/lib/python3/dist-packages/Charon/Service/main.py:$(python_get_sitedir)/Charon/Service/main.py:g" service/charon.service || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_CLIENT=$(usex client ON OFF)
+		-DINSTALL_SERVICE=$(usex dbus ON OFF)
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
+
+pkg_postinst() {
+	if use dbus ; then
+		elog "To start the Charon File Metadata service at boot, add it to the default runlevel with:"
+		elog "    systemctl enable charon"
+	fi
+}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 0d5869ccbec2..401771b9f1e9 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,7 +1,9 @@
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
-DIST llvmorg-13.0.1-rc3.tar.gz 147302323 BLAKE2B 9ac2f97568062d7dd618295a68d6e14898fcd69e2bb66290b999ceb8c12132371f4e9b59d8ba2b252e5e5cb249045676b24fc50c117b2afae20abab98f426582 SHA512 88a04ad02af2d41ec21c7a62bad21ee0e627b7276a16795875afd062ed29ac7fb4aadec5b5e48785a6502c9fd797a4b67d648a21f193c9f7602112870b10a3d1
+DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
+DIST llvmorg-14.0.0-rc4.tar.gz 158082013 BLAKE2B 0e717898d8f1ed160e525a68aba56a84b7d31856ea72fdb8fa02e863c5a2074245a38d4a4aa7d178beab1ea64aa92d0ba9dcad4373ebb03868070bf718112107 SHA512 a942848aa5042b97bab6d0d5bcee11ea2f85f1244d7eaadb8f7000bf104b2160e6034c04e3755501dd178bc99c26669cf4aca40edb4bba598fdde6bcf3f40ddc
 EBUILD libclc-13.0.0.ebuild 1431 BLAKE2B 023945ee57d09ff8763d18d0076733f929d7d0834757e9c7bcc02398512899a3c004a5c79d25f3c33418114824d03e78d904022f889cd7420eafb95a1d3543a0 SHA512 536fea5a39a795ea8984cafd271617291c6da14ebb39214a448a835e62e80fcd1ce004e69b770a22c78e1660209f76efd4fd2e6dc90b0b431b710dadb7f9824b
-EBUILD libclc-13.0.1.9999.ebuild 1422 BLAKE2B f3af05e150ecfe6545b45f5aa8e1e37a99193eb00f3fdd3d2ac35824898ae1f7279233e1db91456dfa665f6f14689f3eb39db95ccad2aa3d36f9ff60320677fb SHA512 a37bde17738852f5e824108f99bf65535bec2fb2e568e5d9d00b5ee14ed2b07c3a26db19bbea03c8950b6f3d1f60a05fced021d7b3aa93964395b0e6b235e568
-EBUILD libclc-13.0.1_rc3.ebuild 1422 BLAKE2B 4581595de54d598a5aee5fd78b594a8aaea3c08913cf48597dd1aec88fdd299bc104ed44919ca96ea7b9ace2f290c370ce2edfcb57ab46fadc9e380b7bbce634 SHA512 1f0749b33eede2d913c2700511e46042f70c8825292ac47a2cf0b1c9ed0de470758b5d0222f11cde20b83d7599abc0150918d405c409837999529be2baf3535b
+EBUILD libclc-13.0.1.ebuild 1432 BLAKE2B 59269e3486b7baf86062f3734ba52750acbce0a8d93b6a925e5654f24611c2d9055306518b60a271857d9735591c102f86501b21f034135ab6afb98183a2bc45 SHA512 948fc251abdd2ade60a4b0fb57cb9c9a365c3c0082535e00c24c54c489aeb15e33735099c76054b8c71873eb0953910b12cfc883203538b8514dc34a3437e865
 EBUILD libclc-14.0.0.9999.ebuild 1443 BLAKE2B a1074740140a14cd68ee7491b4d1dc3d296accaa269a82cb4f98f8a3c49935a43a61e43bcd9c8da4435040117fdc170dd153771d5581f765f9375be98fb72ded SHA512 540a4bbfed08807ae4fda13516126d85c4fa5e0756d2143a2bd2b4c61d9c0cc538ff34a77d7147bd54ed315af9739b273d0b5f63921496bb8f99dba5b014d6a0
+EBUILD libclc-14.0.0_rc4.ebuild 1443 BLAKE2B 96d9dc2863ff6e20917576d1775b8e30d6a36dd25b35582e75d9f05d7771507d76f35ef31c75ffb95f38c30ffdb740189e84901809ffa6f8853acf700959bac4 SHA512 a0424e1b83d6af76f4e3d4d51b1c25bfe62841cbdc849fcc7841db1b9cc91c85a24efefed00d34d2c2e6bb66b93090917f8734ba00615fd8aafeb7902d4a04e4
+EBUILD libclc-15.0.0.9999.ebuild 1464 BLAKE2B eb3defea1ec4f77f431b772f9fc0f8695344e4d80a0a42a9620e983bf12fe6c965380fd26bfc6b17bef66ae26893cd2d63df948dee58981492c1e4731e3fb838 SHA512 6c06c48e42969f10cff381407be3d8d1e02752529ea8dc9944fb11d97f680a687951f83900225585d8df0a37d1341c33c18f3f3a082119e8b8b9045b411040cf
 MISC metadata.xml 395 BLAKE2B fe71cab225f1879c7bfcb591a2bf96aaf7c2d454a3b83a8f4730e36c609d7064a9f0a3c9cd105eb11248a80e552a6ddddaaf69db0ec7c955356698a63042f9d9 SHA512 160750cbd7da115c3b9d070a73afac330c6841cb4a0d3102c65f4e9396c008d82431e14f66fae1c7ec83199a97d3749b662cb01d9d769ee20bd6d08666f5565c
diff --git a/dev-libs/libclc/libclc-13.0.1_rc3.ebuild b/dev-libs/libclc/libclc-13.0.1.ebuild
index 1da191d1914e..8c385a0c2f8c 100644
--- a/dev-libs/libclc/libclc-13.0.1_rc3.ebuild
+++ b/dev-libs/libclc/libclc-13.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://libclc.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="amd64 ~x86"
 IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 IUSE="${IUSE_VIDEO_CARDS}"
 REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
diff --git a/dev-libs/libclc/libclc-13.0.1.9999.ebuild b/dev-libs/libclc/libclc-14.0.0_rc4.ebuild
index de9b38e9f826..36da442fa39d 100644
--- a/dev-libs/libclc/libclc-13.0.1.9999.ebuild
+++ b/dev-libs/libclc/libclc-14.0.0_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,9 +16,10 @@ IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 IUSE="${IUSE_VIDEO_CARDS}"
 REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
 
-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=14
 BDEPEND="
 	|| (
+		sys-devel/clang:14
 		sys-devel/clang:13
 		sys-devel/clang:12
 		sys-devel/clang:11
diff --git a/dev-libs/libclc/libclc-15.0.0.9999.ebuild b/dev-libs/libclc/libclc-15.0.0.9999.ebuild
new file mode 100644
index 000000000000..139479da9e37
--- /dev/null
+++ b/dev-libs/libclc/libclc-15.0.0.9999.ebuild
@@ -0,0 +1,69 @@
+# 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 llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS=""
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+IUSE="${IUSE_VIDEO_CARDS}"
+REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
+
+LLVM_MAX_SLOT=15
+BDEPEND="
+	|| (
+		sys-devel/clang:15
+		sys-devel/clang:14
+		sys-devel/clang:13
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	# we do not need llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	# TODO: spirv
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+		-DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index ef572221cdbc..f78bc62c81a3 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,5 +1,3 @@
-DIST libdazzle-3.40.0.tar.xz 447648 BLAKE2B fb7916fd7812c03ec63bc804974574bbf6d029596e8364f5f13cde22be330a9356ee250c0d5bfc8742545d410c94b1ad7a1fa0bd5e2f473f67d6c45fe55e8e93 SHA512 23bf0a176fb847ee46a22a96594e9ed60921f104875fd102375445f364b552167778a56dd4929a18b2a7bee1144fd5e07d5cadac3355ac4877cd56838cb5deb2
 DIST libdazzle-3.42.0.tar.xz 450636 BLAKE2B 0a77a9ceeca2af8a001b75dbffa04cd385be89d9fac898e6b90111d240b409a54357d9668ca33e494dbb0ed932f16605f363aa69b92c548981be0db971b67dfe SHA512 db6ac54deba034627726747b8c15472aa2f640617473825698e23ca6527d5b69e9103dd82141e82b7dd7fa8bd57eadf054cdd300d46e1b65ced0fffcbc55a301
-EBUILD libdazzle-3.40.0.ebuild 1702 BLAKE2B c3e106800152ec6f2d7ef0156f85016fbbfb27dd815cd6ad6fdf7b21a62e31dae5bf58d233e5f2a7e032c9075e00931327a1460e5e72457ab027c6db18a71dd4 SHA512 1ab1bda49dc015ca1a9ff84e467c43373ec74127ff82f78bf34164680038373ad9ddafc99391a19d4b972bdb03726e1459e5780cb1a4f56e27e8e489f8f7144e
-EBUILD libdazzle-3.42.0.ebuild 1704 BLAKE2B 96d1bf947fe0f31e074ddcc0d66620045b4e08c9c3ed59176d2c5e1af47771ff7e3d5138849bb91b1698cc35f486b3483fe8bafd522a86868fe183dbf4cf9053 SHA512 e9d851e73fe77bea2c72617ef39e7d066f746ff7af5f131c2c879751f356ec4b1b738a5af6f3786021eaeef119f775a0e7c20e88a2ffe85f6d2e8d00b0bfb1d2
+EBUILD libdazzle-3.42.0.ebuild 1701 BLAKE2B 52083fcba3194aad21f21aa6eee9819c4c721be3417be40538db6febcda99ae4451d43bef4da00d3945b06c271dd4a7c9ea13f4b0d55abf0ffd1cd0dedbe5742 SHA512 dcbe89393adb92734e7b22612ad9bb88bf5de8fd4ffcd49c943009e10c6c6dfea6a0e358d904f96303f01522e98308c8a9248867bf293024320c324a4465da73
 MISC metadata.xml 562 BLAKE2B d07bb8d5805ff6659c6984057084cc5daa294cd33d87ba9f152aeab79b425626673c83e2cd5046914381a8c0432cfd34994fd61aadc1c9263367ba9c9506903f SHA512 be5ed6332538f24044008dcb91b93771ff7afb73e5e7d2351474b6a9d3dca57a790cb27831ca869057ece03989c49d7e49213240cb1c1f0c5c93346a4a157710
diff --git a/dev-libs/libdazzle/libdazzle-3.40.0.ebuild b/dev-libs/libdazzle/libdazzle-3.40.0.ebuild
deleted file mode 100644
index 86eded995e3f..000000000000
--- a/dev-libs/libdazzle/libdazzle-3.40.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson xdg vala virtualx
-
-DESCRIPTION="Experimental new features for GTK+ and GLib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-IUSE="gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-# We keep newer glib/gtk+ deps to avoid GtkEventControllerMotion backports gettings used
-RDEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=x11-libs/gtk+-3.24.0:3[introspection?]
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}"
-# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums
-BDEPEND="
-	>=dev-util/meson-0.49.0
-	vala? ( $(vala_depend) )
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_tracing=false # extra trace debugging that would make things slower
-		-Denable_profiling=false # -pg passing
-		# On linux it'll always use a vdso based implementation that is even faster
-		# than rdtscp insn, thus never build with rdtscp until we don't support non-linux
-		# as the rdtscp using function will never get called anyways.
-		-Denable_rdtscp=false
-		-Denable_tools=true # /usr/bin/dazzle-list-counters
-		$(meson_use introspection with_introspection)
-		$(meson_use vala with_vapi)
-		$(meson_use gtk-doc enable_gtk_doc)
-		$(meson_use test enable_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/libdazzle/libdazzle-3.42.0.ebuild b/dev-libs/libdazzle/libdazzle-3.42.0.ebuild
index 0bed8faf85a5..c14f4e044587 100644
--- a/dev-libs/libdazzle/libdazzle-3.42.0.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.42.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libdispatch/Manifest b/dev-libs/libdispatch/Manifest
index 9cb2560adb43..a0ab9c8bec66 100644
--- a/dev-libs/libdispatch/Manifest
+++ b/dev-libs/libdispatch/Manifest
@@ -1,4 +1,7 @@
+AUX libdispatch-5.3.3-musl.patch 1213 BLAKE2B 76db17275b46160840867ae2956b58f38bafa55539a0396ad910df30747a766f170cf57d7229f12d11dba7bddc37978da501335904a482c0dbc041939db169d6 SHA512 4e8f20a20454c84fcf6ba45e2560053283a4c38955151718bcc96d03f326e2d9c7b5782848acca412166675d3b5daee6369f47ba672023bb047a0c08237b1008
 AUX remove-Werror.patch 1217 BLAKE2B f7ef18089abcd11fb8ed36980e681a804649b8ad8891b97113966c099bb05178604983359b79eb853ad6256a6c116fa8fdca116b29e2d6108c2a38fff01472a1 SHA512 0c17b1b36a02b401182a91e1f751f71b343f1d61ce7340230fdb13e89354316d0f2863fc3ea2f1a33bee6033c79e30e35024519c515a03a4d88467456ef340cc
 DIST libdispatch-5.3.3.tar.gz 591794 BLAKE2B 982b99227a1292d999639e7b16c1382a38dd6799a0ea1b83dd66333d5b6388be809127565fafc7f171dab9d8aa388cf67316d7eb6fa2ae2e1b8ccf660b32f0ab SHA512 b76071e8fac19ef5aed8cb3998b903a17a4f2b9e6b992d22d394212f4d48c4a547fb7a8cf16e4ce2ef17d6b58e253c2d52c6b176c3a874132410215b73332909
-EBUILD libdispatch-5.3.3-r1.ebuild 1013 BLAKE2B 6e71f0a4c7304d9bf72a3e05db52b3105d1cd97ed01583bf5327af0825b6da4709439357e303e27abd117d3b502040a18c34fc221de1961c90ad43560e6ec6a2 SHA512 64441726d02a68aa4c0cd23dda4cbc82ac1c6b5c7abb627bad4a363cc43832721abc033611c763216df25bf18c5f00500cff009b0454ed8fa3023dd5f348bad3
+DIST libdispatch-5.5.tar.gz 592054 BLAKE2B 500ae44069063f202b48cfab2df1fb7fc012f1a1048d2460054e34f18629feefd38952d08f9de310d71774120a0516b4f9210147869e2ce34c266bf44e6fa0d7 SHA512 58ad7122d2fac7b117f4e81eec2b5c1dfdf5256865337110d660790744e83c3fea5e82fbe521b6e56fd0e2f09684e5e1475cf2cac67989a8f78dd0a284fb0d21
+EBUILD libdispatch-5.3.3-r1.ebuild 1065 BLAKE2B 34f48796234e44a1c856c7cbba8caded4998e8200ce2799820cb2cde28c72c882d459fad02723c2d77819db8be1e551a6065358811a20091d4a7ce011ea9e100 SHA512 338c0902dcf7fe48bfb8bdb26b695bc78325c737b7425ec31765e74f6ccf8d1d28e4b2a072d09436f3e85876067d0bdd665e6ee2b5cce9ab953e6b656cc8747f
+EBUILD libdispatch-5.5.ebuild 1096 BLAKE2B 9ecf38085edb6ab2a5a5117618892a1106a976cfc8735fe01ce8cba99168ce1aaf6656ec535b9429e988420f9194ed78d7f069ad7043a10d62d1d99de95f267b SHA512 eb842fd1d6908dbead8b360566d05a0b6a7818b7e28055faae20aae8dcfba3a4f835b080304b3f6d00007f7d2e0ce2b810ce528540732a9ccffc0c6f99afbaf7
 MISC metadata.xml 350 BLAKE2B 179ce6945eeec3c78414fb6dd66822f26ac6b629528da5868b44d3715355ec80acb1cc5dd8357b659f31877c83bfc10ae8b236367904bbbdd36d2ec7c1458739 SHA512 64646993f5469b2573385aa94fa578ae0e7645f4c5a30b631cf1d0de9ac5ef88270ba85e95f684b884631ec21d7ef31c4d68b563923901651da2ec631b0ccff5
diff --git a/dev-libs/libdispatch/files/libdispatch-5.3.3-musl.patch b/dev-libs/libdispatch/files/libdispatch-5.3.3-musl.patch
new file mode 100644
index 000000000000..a162b34efc53
--- /dev/null
+++ b/dev-libs/libdispatch/files/libdispatch-5.3.3-musl.patch
@@ -0,0 +1,56 @@
+Fix building with musl libc
+
+https://github.com/apple/swift-corelibs-libdispatch/pull/594/
+https://bugs.gentoo.org/829158
+https://bugs.gentoo.org/833306
+
+--- a/dispatch/source.h
++++ b/dispatch/source.h
+@@ -32,7 +32,7 @@
+ #endif
+ 
+ #if !defined(_WIN32)
+-#include <sys/signal.h>
++#include <signal.h>
+ #endif
+ 
+ DISPATCH_ASSUME_NONNULL_BEGIN
+--- a/os/generic_unix_base.h
++++ b/os/generic_unix_base.h
+@@ -25,6 +25,14 @@
+ 
+ #if __has_include(<sys/cdefs.h>)
+ #include <sys/cdefs.h>
++#else
++#if defined(__cplusplus)
++#define	__BEGIN_DECLS extern "C" {
++#define	__END_DECLS }
++#else
++#define	__BEGIN_DECLS
++#define	__END_DECLS
++#endif
+ #endif
+ 
+ #ifndef API_AVAILABLE
+--- a/src/shims/getprogname.h
++++ b/src/shims/getprogname.h
+@@ -37,7 +37,7 @@
+ static inline char *
+ getprogname(void)
+ {
+-# if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
++# if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME || defined(__linux__)
+ 	return program_invocation_short_name;
+ # elif defined(__ANDROID__)
+ 	return __progname;
+--- a/tests/dispatch_test.c
++++ b/tests/dispatch_test.c
+@@ -34,7 +34,7 @@
+ #define HAS_SYS_EVENT_H 1
+ #include <sys/event.h>
+ #else
+-#include <sys/poll.h>
++#include <poll.h>
+ #endif
+ #elif defined(_WIN32)
+ #include <Windows.h>
diff --git a/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
index 5ec153ddcd8c..ac43a88ac6fc 100644
--- a/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
+++ b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ppc64 ~riscv x86"
 
 DEPEND="!gnustep-base/libobjc2"
 RDEPEND="${DEPEND}"
@@ -26,7 +26,10 @@ BDEPEND="
 
 S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-PATCHES=( "${FILESDIR}/remove-Werror.patch" )
+PATCHES=(
+	"${FILESDIR}/remove-Werror.patch"
+	"${FILESDIR}/libdispatch-5.3.3-musl.patch"
+)
 
 src_configure () {
 	if ! tc-is-clang ; then
diff --git a/dev-libs/libdispatch/libdispatch-5.5.ebuild b/dev-libs/libdispatch/libdispatch-5.5.ebuild
new file mode 100644
index 000000000000..af88a1aec21c
--- /dev/null
+++ b/dev-libs/libdispatch/libdispatch-5.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic cmake toolchain-funcs
+
+MY_PN="swift-corelibs-${PN}"
+MY_PV="swift-${PV}-RELEASE"
+
+DESCRIPTION="A library for concurrent code execution on multicore hardware"
+HOMEPAGE="https://github.com/apple/swift-corelibs-libdispatch"
+SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	!gnustep-base/libobjc2
+	!sys-libs/blocksruntime
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/clang
+	sys-devel/llvm
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/remove-Werror.patch"
+	"${FILESDIR}/libdispatch-5.3.3-musl.patch"
+)
+
+src_configure () {
+	if ! tc-is-clang ; then
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 0559f11b3e15..bcfa709c9ce9 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,4 @@
-DIST libevdev-1.11.0.tar.xz 445316 BLAKE2B f3c1aa688d83f4a27abec23f18817bbdb7a5911cc30fab694271f620c23273cf20109598edb0049239e78a173baa20471ad1f25266eff34a50ed8898d7b86080 SHA512 b3c6b4a1532c5142f3684b920dcdd497a5368aec516e8c389e2c8f9d1eaba16c907b2a7f2c82a3c3ff89bb4d0ae5503c736098c095f9f1bc98f0668e99bf639d
 DIST libevdev-1.12.0.tar.xz 443716 BLAKE2B 1df548cc9bc2472c88308eb2794df7d5636d498631b8873a1957f5cc959097235e64f46f61285a3cbe1abbfe1d968946ae181dfcd8150fecfddf212ed7f4e07e SHA512 6c1c1362d5112cdf3816d1f735c27e625f5463ebf10a83d675cd9364c3fb291ebcb91c051da442f1a36ed28ba7dd99af74546707f61274f7d5715c544a0ed04c
-EBUILD libevdev-1.11.0.ebuild 1111 BLAKE2B f10e33cfa17f0171956e65da7125225ff1d39d6356f48451465523fab1bb0112f6842aad3986c7720ddfc240e6cdf9162a7394038893ffd23d0b44badea90013 SHA512 9903be70f11c5ea07ac6c4005ad698f3a93068f8d30118cdade48833423ae73ddee35660e2a7d54a4cd2309a5e865d30ad50347af8ea445529eb2b0b4473d831
-EBUILD libevdev-1.12.0.ebuild 1118 BLAKE2B 49f2238cca846d4cc9b3c99783924be11be9631c42f3c41d62970f75d7a42bad8fed5f18ccad37409cecab950af4433586fa383da2cb75cfc154025dc8817f17 SHA512 c42f0802afe1a4f84a32dbaa444d9e612cb3d003fe14ec52a8cce30eb465bf56cc21635edff78679f6058aa733bdc78589edec222e7301a39348381722264675
+EBUILD libevdev-1.12.0.ebuild 1117 BLAKE2B e583ff529df3a04102e77f9bce314cdb48734981ee081c11f901a143a50ac66d6119aaffa54268600aa9b4596966bb222f6a7892f43e9eebe78df9bc2ca916be SHA512 ca8c62a433bf0ecf21aa13f600c0fbd57a22d40fcde568a23b5328d0dfd0ca37760112c97f0e0ac465c884ae4911d6b27e35b6dedf883e4fdb34ea2060855db2
 EBUILD libevdev-9999.ebuild 1119 BLAKE2B 7454c31abb9ea204726b25bdf082078716cca0e911e3012121c06cb37663ebf911e48765a5e718db2b65ace23cebcc305e34129576e4bb1ff863829520f21b6d SHA512 805de4364e75326dada41594b727af707f8b1682b990cc4871a475a545b43a4539e29b57b26bde18e72620d38f2dbae0139094e8d00b4c872b0bd174a83fe8b9
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/libevdev/libevdev-1.11.0.ebuild b/dev-libs/libevdev/libevdev-1.11.0.ebuild
deleted file mode 100644
index 39c22f360654..000000000000
--- a/dev-libs/libevdev/libevdev-1.11.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson-multilib python-any-r1
-
-DESCRIPTION="Handler library for evdev events"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-
-DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		local HTML_DOCS=( doc/html/. )
-		einstalldocs
-	fi
-}
diff --git a/dev-libs/libevdev/libevdev-1.12.0.ebuild b/dev-libs/libevdev/libevdev-1.12.0.ebuild
index 2c4a086e78b0..d44903015d0c 100644
--- a/dev-libs/libevdev/libevdev-1.12.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.12.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index e417541e008a..9a817e913234 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,7 +1,7 @@
 DIST libevent-2.1.11.tar.gz 1082234 BLAKE2B c6721589834bff027a8149ee0076e1877fba000d1712a405e20030192d9c81b892d0930bc1a4774650bef4cb08c60ac81b5928dc17346492ae7e4ded2125579a SHA512 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3
 DIST libevent-2.1.12.tar.gz 1100847 BLAKE2B bc1ace15f639ecef2e6b3f95976b8830c1d86f1d06606dd949e2978611fdf9859ed4eb9292d13e6e90e3835063edb94aae64a15c518d5dabe680f37d5a7f5290 SHA512 88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f
 EBUILD libevent-2.1.11.ebuild 1585 BLAKE2B c161f33d7495496181920013ef14d7dd81667259b1bf90f08f24939a9315aad47de251c8dc3c7dacf385f01180ee74aa0603b0b43f3c6a92edb0b848998320e7 SHA512 a40c419b90d930d5f9ced97c1e86af0a643e2fdfebd12f4b0bc22e68eb5333a27c1d7200297d0b0053f428afba8dc36f0386507d6fc48cad29cf106c546c5ca2
-EBUILD libevent-2.1.12.ebuild 1781 BLAKE2B c8f9deeec10cb3df87967151501b5dd4b6aa559555644a79bc48a4cedf67438e87a2cf9f97f0740d8c0d9f56c4e0c5c651d49d14da8e9ab636e9f4bf7fa7e8bc SHA512 6244116c2a9cf2bcf3efb24ee09c9ff8227ede7b854f9ecf9bc5c99fa45b499025ec96fcc4ba555826232508bdee7b24e1c53c3cbb25ede635cc094a6942ab03
+EBUILD libevent-2.1.12.ebuild 1779 BLAKE2B 51eec0127d6550578a561e39ab0118aacba6cba23f8619dbbedcc5b5f0d816fcc1eacfc694319230897894780aa237bda56397463afba8a8f1494f1cd5cf5b5b SHA512 bd9fbc93e99ada604dc69deb8272ed55aba885e0f02ea08d5b6beb26ac2dc91610daaefbf18b98ef87c2fe916f5125a5f9d43ad83e670bdd30d688351da9a7dd
 EBUILD libevent-2.1.9999.ebuild 1373 BLAKE2B e63481164e06fcf66173232ebc124aa7ec71c017f576fa2bda552da6ed38c1c292a8953406829d8075224c65a408256da2cdd8e6225831ce56aa4077f4a4e8a2 SHA512 9cb3489ddf24f00a09768d29c78fa88481c5ee738239a38837225a0af168a10102981a4c1b84e1736105811feb71881bd5ab7b3ef84fa4f00cdbb339fa644cfc
 EBUILD libevent-9999.ebuild 1375 BLAKE2B 81351bd0afe5fdc579f19105a7ab7aeb0b76d45291e4ae5cf9d7cb3ef47e1926846ebc33236c12bba08746ee2f3ec54ccf8822f1e671e1e5678c3c9865aa9b6b SHA512 9651907284b14c63de0daeb3d93706fd1ca1711b886ef4327c59f5040ea870b02f9e144be223b3b47746fd8f8a01ca88dbcdb3ce2fe019043033f2fc495306d1
 MISC metadata.xml 935 BLAKE2B 45e1677dd467a0b9f0de89bf9966cec3368da090bc330c7b31aa8528d19440e3523ef3afb67d27102cbf4b40ad8343dc03d040f5961629e2a43d55fe46d7e5a6 SHA512 a7a5ac5c59e2a767bbb511c4eefb53535d894a936d5cd0e9206c176a4f50dfc90387a46a35ece2b48740974f9352793ab56026573678ab74e3e1e5250799bdcf
diff --git a/dev-libs/libevent/libevent-2.1.12.ebuild b/dev-libs/libevent/libevent-2.1.12.ebuild
index b25c5ebe459e..a2d9bbd5ef11 100644
--- a/dev-libs/libevent/libevent-2.1.12.ebuild
+++ b/dev-libs/libevent/libevent-2.1.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools multilib-minimal
+inherit libtool multilib-minimal
 
 DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
 HOMEPAGE="
diff --git a/dev-libs/libffi-compat/Manifest b/dev-libs/libffi-compat/Manifest
index ff8f349ee0bb..0baf5f53e0c6 100644
--- a/dev-libs/libffi-compat/Manifest
+++ b/dev-libs/libffi-compat/Manifest
@@ -16,5 +16,5 @@ AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
 EBUILD libffi-compat-3.2.1-r3.ebuild 1534 BLAKE2B e148290c7b6c8b0c783dd758863c471c73bad73bcdbe58cd3ff0e0637094877697de7d2e8929f647db9525234d5723fd861b68ad2f9dd1998fdb1b75c6ff64e6 SHA512 31cb87e70e761b05a9b8e464dbb524ab8d86ac29923decb073d150c10556a0fe37120741d79bcb352815c93cf4fd998f55dc1d94ee8e47319662ae4d534d1fb5
-EBUILD libffi-compat-3.3-r2.ebuild 2239 BLAKE2B a17f064e4a9212296b0d7fbd03b97d432b66f9de60be6bf089c623167538a4b8dbbf8be5fae44deb10c74971e7fa9801af078b529359bf41db0b1ee3e3ab1690 SHA512 5852098d0b04e55736a22ff85fdb7a38e7d7e401b125f50390c909f9c4d4bb7e753fe95169dde3088b0931f8f7359db5613fb00451dc1a5a9c5dbd178d51571b
+EBUILD libffi-compat-3.3-r2.ebuild 2232 BLAKE2B 5748abb00034cbc59966f5dab9832548f3bf933923d6f6cf4b13e55fe4ededdcb2dccd884faed6bd7866ae82265307baf436b8be19086e28e809967811487e53 SHA512 1d727d6c8da072be94b0e71d98dda124814c5fedcf914923f6c84ba41cfadb7635b28b0327ee7e4a50a38ee25f237adbaf88a335ce5bbc65dec979946940ea4f
 MISC metadata.xml 1957 BLAKE2B 567c2909e3799d2f3266bc6817f4e3a1024bb4985593cf7e81439d8a8b9499fa996e4a44f12e6e755c3d5538879dc890abb0bcda6279c73eb996f52f05851c71 SHA512 1ea70c162253294aad59ab9cb75e3ffce0aebe566163d702b0f7f49d6d4ee9a06c6e4f36fc9e1b3fbcad0aca4dcd0ff2dac4b3cfb587a68936f97f24ab2e2b55
diff --git a/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild b/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
index 7dd6a32f89c1..2db083d7054e 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.3-r2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit libtool multilib-minimal
+
+inherit multilib-minimal
 
 DESCRIPTION="a portable, high level programming interface to various calling conventions"
 HOMEPAGE="https://sourceware.org/libffi/"
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 2c3023e14cdb..3d204b11b036 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -6,11 +6,13 @@ DIST libfilezilla-0.31.1.tar.bz2 585070 BLAKE2B b7cd275ee39d5ac62801889adae79515
 DIST libfilezilla-0.34.0.tar.bz2 593998 BLAKE2B 3f3563389f4dfe3667c8c1e46d5f4ab76e02f93188bada3c15e974405c49e0d1346813e64457ec5b60bdeca98629e5a05941f76cb375bb229eee759cc6ab5246 SHA512 960908aa570704e983e51e2eaa13a7fb688587bd1f3c37ade6a3f1b3f5379d0b9e5d3c727bcf58f033a1cc0fce2fc34e2fdffdb379ad5be85de917c0a590de22
 DIST libfilezilla-0.34.2.tar.bz2 595072 BLAKE2B b7c5db16ff74ee218eb38e69f029f6c2cad7984f7f27795ec67f9250eb544b259941cd34fc30bc8222aa0fef51e275d4ca0587754386807ecd916ab7c56b6688 SHA512 a749635f7526e307b93002c4044debdcae948bebb73c272ffc98d1997cf160001a7edc6c776656ea927254614c5a3067ebab1ffc92d7b9f97cf5d4542dec8df9
 DIST libfilezilla-0.35.0.tar.bz2 597061 BLAKE2B 3b7e54a5c999ca7a52d90bdc71a237940c7909ff2ca63c28e0ed76e743a15209cfddd66d0de54c157b42524a460079f05cc3af93a54d4b76c2d44e623bab23fe SHA512 685ed22ab8e4c197f26488751bac2b28e72e5dddce0fce4795afabe59a9c1c7775ac92958ad9c15b0717a8e9f4cf4bf44eee61179d8a2194cbc11a7e2564a5c4
+DIST libfilezilla-0.36.0.tar.bz2 598327 BLAKE2B d578b7c83cbd440acbb3efe2994c7140bfb0a11271e68a8bae52ac53f10e1ccf428c50d07e8cfc79f63beb0a3bffe8fbffd962413725817ac9df14e0b3b3a1cd SHA512 c6b0240c560afb87426f7ccf01e34eb92975b043697be89f26a12dcfaf4a109d308eed200429f986b14f80111573ea5a869194375c844fa7b666d173e9629a0a
 EBUILD libfilezilla-0.27.1.ebuild 1241 BLAKE2B bb00084913fae7dae260d3ecff107d4bdfd27fd8b8a5338c05fcbe9cc521a022b2daeedb6e341b97ce529646f0a415190bcccc06564ac017150c28436e959330 SHA512 edb4e98d5d68d6848984eb58c09605ae170f19f7be44bfa183f880364b40363c14dc2a937634696e941b3981f23a1274df731f4864f054f1409b693fa087cc16
 EBUILD libfilezilla-0.28.0.ebuild 1195 BLAKE2B c437655e4fff0fbc8a2b04316f48d0294c3679a532c337af8fe4fb6a521bf79febd33ef366ef1c46746202f01a8b43cef68d65b84da9f1dbe72461d229b50d56 SHA512 00c1b6556ed183280ed87e7c73529440043582ae0e818b06de66e614199c293117794e23443c2870c787ba22f5b7c0b20cc8a95681dc818df7d0fc203a84a48e
 EBUILD libfilezilla-0.30.0.ebuild 1195 BLAKE2B 6542369e8d9785df7603b283e63bc14cb0cbdcc208b4eadc367a89fc286435c62e5763fe6be8de6aec9f17cb9b6a4b52c14f342d95e642a949cb26a89ccfb052 SHA512 e60c681739a20877635e88cad841942eed0192812be10ebfc30022fe9781b3924a635418bcf89099fa02892f196c8366e6596fcd1f2c8fd123b432447d2bbb96
 EBUILD libfilezilla-0.31.1.ebuild 1195 BLAKE2B c24e1fa7f4264cc320a4fd2f03dd16de950f48e5faf750939b2b26e9558e6432b6f0b7baf0e6c5c92907664ed7dd624ebf7dd67dc46e7f4d9fc75f34699a869e SHA512 7b2a20fdb5be7e1d34707c91a241ca820803fd5dc56190fc39ddaa67e200627eea62dbbec114fdf47c456093e03003d1fe3b9e325a1f9f079d25af19c895d5aa
 EBUILD libfilezilla-0.34.0.ebuild 1215 BLAKE2B f28398b8f2649d074e87cbaffa0cb8713c4a0ae97ee0e009f360302ece2c93b544546308c8178a200de8665e8f316f7e554c28850c5289fc6e54689df999728c SHA512 03f1a0a9c7c6a94e83640d751fe909ef9161de482b09d6749ce6d4dfb0050e1fd5c4320e31748d4c9fa447759f2d3e9e35cf4f88c79502df443f43a4404e059a
 EBUILD libfilezilla-0.34.2.ebuild 1215 BLAKE2B baa509341d723ebeef377336bc5e57a55542e389928d0c706c6a32d39765c86d47ad0c610f96d69d8c885ea4e7525b3fd66e4940076ed2c615e5952363fcc03e SHA512 5368eaf24194e528ccf327c25f216b4de6831974d1b72949fa7dc27f2b905c6170c85e4a08a0f5b0994aed0185b2a771c9c769f61c93892035a89ec1bdfbb292
-EBUILD libfilezilla-0.35.0.ebuild 1215 BLAKE2B 5a31cc4246e7842c2040882ffd44af50da5c58f4f7a53bac3d079227b8171d0237bf1e661e0dfedad15891234673cb9dde5ffb7a2fde3329093105283fb3a131 SHA512 8f53c0030ac0823cf16137594808c20b09ba868ae6685cd701cf2ba0861a12c92315469a276decdeedd8820842e3be1317b95da08d01295fff7311e68ff16a7f
+EBUILD libfilezilla-0.35.0.ebuild 1222 BLAKE2B bf0a613ef3ab50f39bd6ab90bb0809ad91806abf7708fd6a660affce5761e9c60512f885ea5aafe6af39f871f92d10c8a493f9b65ed919b2f3b3a0166d40e64c SHA512 4d2c996fb8d87c4f4828b1e5a3ad0a96919d142cd8ea23fdd9ec56bface99f9d551bb34819f1caa3d3f53d6a86e1f0a3c18b91049e29af08d16b49be2b06e375
+EBUILD libfilezilla-0.36.0.ebuild 1222 BLAKE2B 23380de6addcfbea936664a00c729998070f74baa62323e9bd7527d8ce7c3e4a0a5074e0f75c25dfc0cd8f4f16ed33e0e99b6486e7684888c60079ccbec1e184 SHA512 df49e81fed431b8d56e96f6fdc13e08a691cfef2a71e3a965e75664877f4831985502b21fcc1a12fcdff2833f55c3a04441809c66b7d591a581dfab5169550fd
 MISC metadata.xml 1136 BLAKE2B 9db086df9b33ec49950324ad327f9746b79667dfd61028ec173ac71fe16000549cf6bcf2270f7e8c3f85e1ff2de88620867db9f52cd6530716154cd1ede8902f SHA512 2ccacf35e9b6f503ac4e46c6705cd032ba4895c02c8ab9f3da6898ac20f4dff999bb8a649f71d4a222fca4b9237b0a7d819d6929468390df92806fccb82be781
diff --git a/dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild
index 4652d201fefd..785d5e9fa7d6 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/23" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libfilezilla/libfilezilla-0.36.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.36.0.ebuild
new file mode 100644
index 000000000000..106c52d6facd
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.36.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/24" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+	virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_configure() {
+	if use ppc || use arm || use hppa; then
+		# bug 727652
+		append-libs -latomic
+	fi
+
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 6f1afe901b3c..27c195b21fe5 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,4 +1,5 @@
 AUX libfmt-8.0.0-no-udl-define.patch 1802 BLAKE2B 538a9dfe1dec002894db22536de91b8c3180eebd7029f5c97ca31da04b93c83dea38e70c44c880ef45e45fdded7010f571999eb3b65958d5af2cd23b5442bbe9 SHA512 967d2969a2afcfb2ad9be07382e2dba332162c7a43905f855a98dd2ae5cc6b9c387dbfeebd3f8cc538d51b4ac885b78584486831f9e80c1728be75a24f0fd628
+AUX libfmt-8.1.1-fix-static-assert.patch 2670 BLAKE2B 781ccf10647dede937f38f2743dd3ab381c307774d136aeb974997ba6f004bb0e30ba02fa5e69952f76fb142133c9e5c9867194352d54ec6d9f4bacf9a13fa09 SHA512 c03186a3d4d1857f5063e94a5bdbc764535c042d98dc20d577c88ad3d93a60d75e7bf6a95c547df8fc7b037c021b464b9e47b6fcb6aba4ee9716e1727f181cd9
 DIST libfmt-7.1.2.tar.gz 769401 BLAKE2B 66a14197a818cbc63e2219eb9f8aeb47cc575a712e3a8e20ad6e2316219bd4661446533f305a1a18b83723d5f530c59dcff17251488c3e811aa090b399bc16ca SHA512 e245a3860df4414ad7ea114d2d5686d0c8ae06fbc45f4af0a232ad4bbf0797e5845d731e307af67aad920d3587e5e424135bffeab09132690edb387c47f4fe15
 DIST libfmt-7.1.3.tar.gz 770029 BLAKE2B 745440a6f5876d47d4651d007d5968f77d8f5ac01ab5ec17ec5851130a5581e2aa7d359ae297ce7318023b0bf386f9c027e3e38c65f297ae874e607253a3493a SHA512 cfb2431de822202f17a6f34a302b1922b9cd696d8d4c27ad50ea08add781d2af9944db987603c2eb294ee7d73054a60cc11d3a0693f7f6db61949f3041cb9517
 DIST libfmt-8.0.0.tar.gz 804902 BLAKE2B 9330acbfb6ab47a484b4dbd3138d11cdd79f4233dfe8fefed41d67118eb19b2c00db5896ee883e2f5ff297170c2eb8dfa001cc6d7c6eff42b6285acd0ea91b5c SHA512 61768bf8b64c430f11536800985509ce436bbbe05cbe1dfb6045cfaf2f859af98eae1019ef602af8fec6946ae25e4d8adb589f0f738666b20beb3afe65ee760c
@@ -8,6 +9,7 @@ EBUILD libfmt-7.1.2.ebuild 778 BLAKE2B 8bcbc4e41e301994ef5d4b3af78c156503be56359
 EBUILD libfmt-7.1.3.ebuild 778 BLAKE2B 8bcbc4e41e301994ef5d4b3af78c156503be5635937c17f9e48d27f5800cc022071352131d63e2cdb24c9ce05929006fea637911c537c1b39874753cf00fdac1 SHA512 3e3a6478992cabf9be4c94a6fa55c027414978f6a422d3557777d39b4dd0bf3f4dbabd7abb768bbc2991a64e51b753060e86bf1297f2f8decc62dbe55ed74ff1
 EBUILD libfmt-8.0.0-r1.ebuild 837 BLAKE2B 40ccd08531ed4834cd9b5489a623775a7770e2ef6ede4431d4ee45376f03895e5f1c6e40d9f4204b9368851f9e8d6620dc1c61e5e290d73bd5a3e17e6720f4c7 SHA512 35a204cd36f3b08d328b20c5da367826ce2d27647a19563fc540561226d75bc68c29c9352ea526062c2088010cc02a747fef26e619f554496649e0b140055926
 EBUILD libfmt-8.0.1-r1.ebuild 784 BLAKE2B 483b0edf71a10536c233b5ede3f12326119ccfa6ca2417dc01c275d0d37140452f320b58c30d25cf62abc9223c50ca92271e80131c67f134d42bd50de050dde7 SHA512 dd7cdc4589d7054cdaa77c13b99cf39e440944163d33d3f7b0994dd3f54db808eb9d45fbea5fa31690036f452d80668b39834e2d5dcd3d4fc2e57b15bfefca55
+EBUILD libfmt-8.1.1-r1.ebuild 841 BLAKE2B d6a66f2881c113d5194f01f50d49ede5a406cdb4fc20d1a452823913cf90b5e146a9d8096cece3f0d31bcebfff34238dab40b4c00f6f3ed62d8fe8fbe522164f SHA512 b648807a1ee735d1a134e98f676278f519d5638a1eebd49eeb18df2a2430c967041080ccaff6c4b7c53324f0a001807a745e3c60f34687920b28fa7616c1adec
 EBUILD libfmt-8.1.1.ebuild 784 BLAKE2B a4f6a82298967ee7fd4cde9ecabdf910bc4f1ca6bae4667b15f86b170264928772ddd8097afedf69ef0b76e3281f77e395e061b7bcab60881eca9d78ad67cff7 SHA512 3756c94a13bf6a60a0b9dc66a7853de1694b16b5472f18a4f89c2fee17e0553c8b0f764b5294056281b1e9cc52369a1259d55d9e59f15de7feb84c63b10989bc
 EBUILD libfmt-9999.ebuild 784 BLAKE2B a4f6a82298967ee7fd4cde9ecabdf910bc4f1ca6bae4667b15f86b170264928772ddd8097afedf69ef0b76e3281f77e395e061b7bcab60881eca9d78ad67cff7 SHA512 3756c94a13bf6a60a0b9dc66a7853de1694b16b5472f18a4f89c2fee17e0553c8b0f764b5294056281b1e9cc52369a1259d55d9e59f15de7feb84c63b10989bc
 MISC metadata.xml 382 BLAKE2B e67d9bbfe9721b994b68130e570826f819088bf0c891073ecf1451a4fb54611e2ed1465588314cf6d1b69be91d7ac2c082da8aa4e2ed5b4d531a40fce7143bac SHA512 21bd1200ee00e4f664b5d992281492c1c4a61229aa408c387280db08a9438f75b2215ef0c0ee1aa9db0d7537bfff074fba54176d44f1f105db611ebe1e45e742
diff --git a/dev-libs/libfmt/files/libfmt-8.1.1-fix-static-assert.patch b/dev-libs/libfmt/files/libfmt-8.1.1-fix-static-assert.patch
new file mode 100644
index 000000000000..9f29d7fb111c
--- /dev/null
+++ b/dev-libs/libfmt/files/libfmt-8.1.1-fix-static-assert.patch
@@ -0,0 +1,76 @@
+https://github.com/fmtlib/fmt/commit/8f8a1a02d5c5cb967d240feee3ffac00d66f22a2.patch
+https://github.com/facebook/folly/issues/1705
+
+From 8f8a1a02d5c5cb967d240feee3ffac00d66f22a2 Mon Sep 17 00:00:00 2001
+From: Victor Zverovich <viz@fb.com>
+Date: Fri, 14 Jan 2022 13:08:14 -0800
+Subject: [PATCH] Fix handling of formattable types implicitly convertible to
+ pointers
+
+---
+ include/fmt/core.h |  5 +++--
+ test/core-test.cc  | 21 ++++++++++++++++++++-
+ 2 files changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/include/fmt/core.h b/include/fmt/core.h
+index f2d21e5c5a..12571ce0da 100644
+--- a/include/fmt/core.h
++++ b/include/fmt/core.h
+@@ -1398,10 +1398,11 @@ template <typename Context> struct arg_mapper {
+   template <
+       typename T,
+       FMT_ENABLE_IF(
+-          std::is_member_pointer<T>::value ||
++          std::is_pointer<T>::value || std::is_member_pointer<T>::value ||
+           std::is_function<typename std::remove_pointer<T>::type>::value ||
+           (std::is_convertible<const T&, const void*>::value &&
+-           !std::is_convertible<const T&, const char_type*>::value))>
++           !std::is_convertible<const T&, const char_type*>::value &&
++           !has_formatter<T, Context>::value))>
+   FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer {
+     return {};
+   }
+diff --git a/test/core-test.cc b/test/core-test.cc
+index b2f2097ea1..c9eea8ffd8 100644
+--- a/test/core-test.cc
++++ b/test/core-test.cc
+@@ -737,6 +737,24 @@ struct convertible_to_pointer {
+   operator const int*() const { return nullptr; }
+ };
+ 
++struct convertible_to_pointer_formattable {
++  operator const int*() const { return nullptr; }
++};
++
++FMT_BEGIN_NAMESPACE
++template <> struct formatter<convertible_to_pointer_formattable> {
++  auto parse(format_parse_context& ctx) -> decltype(ctx.begin()) {
++    return ctx.begin();
++  }
++
++  auto format(convertible_to_pointer_formattable, format_context& ctx) const
++      -> decltype(ctx.out()) {
++    auto test = string_view("test");
++    return std::copy_n(test.data(), test.size(), ctx.out());
++  }
++};
++FMT_END_NAMESPACE
++
+ enum class test_scoped_enum {};
+ 
+ TEST(core_test, is_formattable) {
+@@ -770,11 +788,12 @@ TEST(core_test, is_formattable) {
+ #endif
+ 
+   static_assert(!fmt::is_formattable<convertible_to_pointer>::value, "");
++  const auto f = convertible_to_pointer_formattable();
++  EXPECT_EQ(fmt::format("{}", f), "test");
+ 
+   static_assert(!fmt::is_formattable<void (*)()>::value, "");
+ 
+   struct s;
+-
+   static_assert(!fmt::is_formattable<int(s::*)>::value, "");
+   static_assert(!fmt::is_formattable<int (s::*)()>::value, "");
+   static_assert(!fmt::is_formattable<test_scoped_enum>::value, "");
+
diff --git a/dev-libs/libfmt/libfmt-8.1.1-r1.ebuild b/dev-libs/libfmt/libfmt-8.1.1-r1.ebuild
new file mode 100644
index 000000000000..1c6b0f4fa2dc
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-8.1.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+LICENSE="MIT"
+IUSE="test"
+SLOT="0/${PV}"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/fmt-${PV}"
+fi
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-static-assert.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+		-DFMT_LIB_DIR="$(get_libdir)"
+		-DFMT_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 77304080ad6f..a6214496f09c 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -3,10 +3,11 @@ AUX libgamin-0.1.10-armel-features.patch 1490 BLAKE2B 5fa50ed67cd357e5108db27e29
 AUX libgamin-0.1.10-compilewarnings.patch 526 BLAKE2B d070507a937b3d94e7cf276983134b2b4822bf7cfc62176d69f5075bd78602802839326c6e7b22a95232ab18783ffd00ef3531ad834319e1f2ecaf3fe605f91b SHA512 f413fbd5db1e0412d1fabe6b46e049d347735cf6db7a7ca1eecc9ede1b299a7e622be3c508df40990159e05470d285069a0fa4e2cfcf6fd80378d0aa2b69fd0f
 AUX libgamin-0.1.10-crosscompile-fix.patch 764 BLAKE2B 7302b238724927ace5753b5103434533e60563e1d74d9ee9762b961d8e36ace465cb081639585dc7124be5bb0fb5c9f80832d1bfc09a3bb61869acec5abdbfca SHA512 11aca975f98d9364bfdd8e28162f922a96493012fb3c6c704115d33155b2a2e9bbd20aba64354db922f16c3589b88a07091590a5bd6aa806582b9b7875ba8e23
 AUX libgamin-0.1.10-deadlock.patch 2090 BLAKE2B 252b7551ca9ec48af631765ac0413c81c280c478cb9ed5b23efafc07f8c1dccd26305f4688842eed3e587c6bdc19b57c045922158026335e9c6af4abafc57287 SHA512 c0a4a318eb78b9666930e9d1a6fac5e7762f38796e5892d849c893df524310408020ea75fb02a4d79000be3440435ae640340cf2a3dd43fa031df5787762f8de
+AUX libgamin-0.1.10-musl-pthread.patch 1124 BLAKE2B 7ebf59b1e304211d54601c5a942edd948b2fca7b2fcd5d412aee584d12863d83a1908165a59a275a83d5ccdfe80e618c417161bffbc404a71d15688ee6bb3fd5 SHA512 798959c19d95bb0b323a72ec242511fefdb8af682aeaac5135d685cd0cbb335ffd638f0bd3cb5bc666a8c39c3da36b417f5722c6542df0b1be4da4eb5e078df6
 AUX libgamin-0.1.10-noinst-lib.patch 2207 BLAKE2B 28ebca731a16fb10c0f186c3eb75d731a18fd72c239a380a7bf97afacab65792003b433c9030e06c8d7748c0dabe84a92bbad8221d40c9fa9d33c6c00b0dd40d SHA512 ba7ce391f4da1a6b4c75941b8440a72f483b6f2597592f64ddca720bf46b1269e64a20a27da9c35b134100a121990d84e28ac737cffef48e90974a017ba3a4cb
 DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD libgamin-0.1.10-r6.ebuild 2955 BLAKE2B 7cbd9a8e12b2bc76dd913783a9ff7988fb49280ac6fa9c098ff632d3a5a594372a8bf6eb71dcbd64136bb157cc69d1fc28b25744a540acaff0098bea23aadb4d SHA512 23882cd46206d5aea1d83a38379a755de70e85263d73294ed6d8ef549dc6d9d8b647941b67f4de1eae5e10ed9c362150d0b55bb23fbf427eeb58b623329c90ca
+EBUILD libgamin-0.1.10-r6.ebuild 3050 BLAKE2B 1fc0e635ec6b818236b128a891c442db6404223914eff8f4e3beb1a4487de1be44860526e1fbf0ed20d72ceb49a841df24a336507407397f55de43d1c0ebe430 SHA512 87cff8725b1f61ba621321a014c622ee95113f59295c83ffee264d99e446db5bef7f1125a87fa710c01a8fcd4f861556338222887528bb63f5f30a453fd37373
 MISC metadata.xml 225 BLAKE2B 293ebc97ac40be7df2825c558f7def8026a2c8b49af06c8a5fc0dfb58657ee3093306f2a6b90bce5f7fc10f9c3165eee3cd77b58fcea8d293dacff5ba2f04657 SHA512 6f3645f7fe9f5362268973d150b122dcaef666c61e30ddc96917485c617568105aadf7b8d78bf06e402f8592c90369fdc7d949832b9fda13258b4693f1c4c6f3
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-musl-pthread.patch b/dev-libs/libgamin/files/libgamin-0.1.10-musl-pthread.patch
new file mode 100644
index 000000000000..35ad2602c46b
--- /dev/null
+++ b/dev-libs/libgamin/files/libgamin-0.1.10-musl-pthread.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/538474
+https://bugzilla.gnome.org/show_bug.cgi?id=588337
+
+From: Felix Janda <felix.janda@posteo.de>
+Date: Mon, 2 Feb 2015 20:08:40 +0100
+Subject: [PATCH] Use PTHREAD_MUTEX_RECURSIVE unconditionally
+
+Previously the nonportable PTHREAD_MUTEX_RECURSIVE_NP had been
+used for portability with glibc. However since 1998 glibc also
+has PTHREAD_MUTEX_RECURSIVE if _XOPEN_SOURCE is >= 500. So we
+can use the portable version for all known systems.
+--- a/libgamin/gam_data.c
++++ b/libgamin/gam_data.c
+@@ -2,6 +2,7 @@
+  * gam_data.c: implementation of the connection data handling of libgamin
+  */
+ 
++#define _XOPEN_SOURCE 700
+ #include <stdlib.h>
+ #include <string.h>             /* for memset */
+ #include <stdio.h>
+@@ -470,11 +471,7 @@ gamin_data_new(void)
+     }
+     if (is_threaded > 0) {
+ 	pthread_mutexattr_init(&attr);
+-#if defined(linux) || defined(PTHREAD_MUTEX_RECURSIVE_NP)
+-	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
+-#else
+ 	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+-#endif
+ 	pthread_mutex_init(&ret->lock, &attr);
+ 	pthread_mutexattr_destroy(&attr);
+     }
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
index 5353e67256ce..87a88a7e7a0c 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
@@ -59,6 +59,9 @@ src_prepare() {
 	# Fix possible server deadlock in ih_sub_cancel, upstream bug #667230
 	epatch "${FILESDIR}/${PN}-0.1.10-deadlock.patch"
 
+	# Fix musl build, upstream bug #588337
+	epatch "${FILESDIR}/${PN}-0.1.10-musl-pthread.patch"
+
 	# Drop DEPRECATED flags
 	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 0f43c2bbda72..93680bdfd90d 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,11 +1,17 @@
+AUX libgcrypt-1.10.0-musl-jitterentropy-includes.patch 723 BLAKE2B 8cfd1f1026e7252de843cb4ca8df68ac2735a332be956b116dd3dab3330d216bfa1e0cce8a9d93f5caf88ea4b053c2765167a7646bab3c2850ad0c469e395e50 SHA512 6cde4a5235ae5f42f2affd28acba5509825aa190beb8e2324b9efc756b61245b57ad556f9f819295b66840a00a57bd1e585ea835860c0d8dd9bdeb6a9b832513
 AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8c4b6c621e4f8704c4841fd95d48773f0af850a456c6f80b80deed878be1334f08f8181f97dce64ed9e61f5cb1bae5 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791
 AUX libgcrypt-1.9.4-arm-neon-compile-fix.patch 1389 BLAKE2B 548fc764050f322786f3c0ec8f806a6a897987115db0cfd8a2a4f1ffc134a31e9069dca4e334a7a5288f5176ce8e2e8450dc2003c56915d5fdd4dc3c11012c0a SHA512 0b83ab2585502d65d1ccf36440f4a73aa9a9d3a8cb40375ca6a4e81fcc962040fb233df9a345c823281605c061b8ea0e509e0e16a5c3a32581a279e5904bbfd0
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
 AUX libgcrypt-powerpc-darwin.patch 444 BLAKE2B 37b95d21f0df07c5c06cd7e1e1efe73d02b9ac59dfe2a31d43b7a535bed356ff24095d528662d58a0cdc9c3eb25de50b5b5a4d9feb0ddb917a42f9332b33982e SHA512 2a2e7e84222f4672a70df827955bb8592e714580fecf6b5238e131038460169f9d80fd04d63d6e232f6fc448c04e0acf214993537ef22e297ea98a4d12c6ade5
-DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060
+DIST libgcrypt-1.10.0.tar.bz2 3774491 BLAKE2B 7ebeced542c19de7a23fc16b03b030f535097665d3304817219744e2e5f9d02cadaa811ab24bfa3b706776b586daf6f0266b444a1a7c4eb8756ae0d7319e05fa SHA512 785c2e14272308956bb6adcea9567c4097edf103122e18cd3907fb42a110a48a5d59c0057f05a438acd7f221c70c7f7ff87e176bd6d7ed99d16e847f9d7be087
+DIST libgcrypt-1.10.0.tar.bz2.sig 119 BLAKE2B 3d19256687993a38384934c4d9c3a4e7ac0cc11c2e9ff901d3432d7145d39a561904ca5879651a4e26ad4bfc105ee3d39f47d4eb7d0da3a5f15d605f2e33c5ac SHA512 75201612225b206faaae284297e92d1b25dcaf0665bcf1f4c5cc9a3a750a803063d0f7bd0af556dbe419f1276c953ce047554fd18a144a90085a42a7ec885168
 DIST libgcrypt-1.8.8.tar.bz2 2987685 BLAKE2B 7b590c06d91403f1bbfa108379b3747271e9c83acc5547a4d43ef9ada9b0b7c78654cdc24f6cd0db012d50628ae4ec9320dcb63a901ec2dadde6a7ed56dbed7e SHA512 9861f3b5da3cb013eb79efbf2859864f8c2c11b41484b051c981c45cc0bf1569202838226da10ebddeb7a7b7f39ebd3a95f107b9bf6f908074ccc9a51ea94db8
+DIST libgcrypt-1.8.9.tar.bz2 2988243 BLAKE2B d778bc3007dfcc08f3fab0325609911aa2cde5eb46703fab11f0fdfaf4670a9fde0634b40eb408957a9942e9d3fb0a69290c0878bed59770ffe56bbe6103bcf3 SHA512 6d5a06c5bded61cc740b7883a011e65fd8d878d446160714f26cd42203a32a134ccb302e7577762ae43fec4887cdb6fb4b5413e77614c9e4cfba15ae0a093516
+DIST libgcrypt-1.8.9.tar.bz2.sig 119 BLAKE2B 147fd4701eb5c91c43e1ca21f56b36f8d999c5b1a23bb2f454a05e1ef657a4a96c06b27f2d5c867c8adb9764b9d6d80480a69160b2cd2ad1704c1ff18a37fac5 SHA512 785cb3b3950e6b7102d81cee3690b99b11aa60102ab4333370e60874ad8bbdb2f89ce1b5e0ce9215adce1cdc2a3fe84bb7a92a80830594aa3f74e4129d16ad95
 DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
-EBUILD libgcrypt-1.8.7.ebuild 2307 BLAKE2B 07fbec8932d2aa100e835463a98cae64451eac74ad8e0f9d96d642d7f7430bd4e778b82e6851c537f3e31a11b5acc52a396bb9c86cb21d81556417e0ee49e922 SHA512 8225fbe1f3154766235ae022bae1e0a31287ff6b27f6cd68b549724c13469ed32bd6387817b95bf6e2baa5a6b6be28b0914043b995cd1d0ffd258dfc200134a5
+DIST libgcrypt-1.9.4.tar.bz2.sig 119 BLAKE2B 4012c22259a9fd56f9da6c87d60077cea0dbfef85d4d4ad1ff6a2375ddefafc4cd03ee9083d18e080c14c95887b495062af886732a9593bcf1b8f187d21073fe SHA512 4aee16449b4b50dac62bd80217e769f32f43fb7cd994402b7d9cffbb1934b2771041c8c0c41a63ced9c8d9408025f9c5608ffc7f00e5e9a9b92a07cb5118a98a
+EBUILD libgcrypt-1.10.0.ebuild 5033 BLAKE2B b9c2315616bacd5b5f4b7791c31b2ef008795864bc0cce5de7b4c5f23f1625c3b917141776f371d4a6671ad938922816cb15a0e5c4e0f42ffb4beb2e45ca932c SHA512 09d28b60dd8eb4d9abcfbdc0dfe73dcb758332fec9b99daf1655a35aeb773e070eac21462b60b5e7112d079743b44af2a7ae34d91e308a5300e0b229fc0d3754
 EBUILD libgcrypt-1.8.8.ebuild 2318 BLAKE2B 335fffac9a01ebe760a019fb668ce229f22ac6bc6aea38d2fd893fdda587d76895b0bf27146a32c4817d955eab4ac5ae9aa032a3157f9dcf3ae07a98599cc60e SHA512 eea978726cb25bb0c9de94b8617cabd3e5c28b20010ccfba2f4124a4609b655d496ea376d9d72bf07c031116433f74c03d69335950ce295d922ae83801a19ada
-EBUILD libgcrypt-1.9.4.ebuild 4414 BLAKE2B a41923959d6ab0fc6a75c9c799cee492293b656628a50acec6c3692bccdddc1f7e4ec8b1a8764da64c69ccac4bea8f4d757f3b30cd1efb93eea98fcab236fa0d SHA512 344586cc5b6c373b920a53b7c3835da6c2e76108102d5b8569671510b2c1e38f5e12036b0256a07036ef335c02ed1ac5ae38fc2de99579dd421edbb173c49c54
+EBUILD libgcrypt-1.8.9.ebuild 2934 BLAKE2B b9b08095da2b6a5e42d986bac58c47ebfc2715cb15e2ac7bec4d45d35a50e164beff508aa57502e15bb5e4c15dd1578e0dd0456cb5f3820f325432b232887609 SHA512 fdfe2903216563309ca7e36d15182b31ffa7b273d70f392cfc3257839204250b3d53be5329e6c8ffabac00bf97a14109f1ead74c698336a758e7d01a2f4a485b
+EBUILD libgcrypt-1.9.4-r1.ebuild 5022 BLAKE2B da966c552e2b4dc96e7cf799246d94bc14588545bebdec3f1e6609ac3926c7b1f9cc0fac8ba1ca2b43d6499d9ae9652ec60b6ceea4b27f88cf6bf3aa535b8efc SHA512 412ca793fe764ce72614e7c3547ad40714f55d12a86d1971da0f175432d53fd5ba3b9f591a9453d4785e15f1288fd2595bb80226ee13572994517aff3639a632
 MISC metadata.xml 597 BLAKE2B c16e58e302622a51420a94adf5a3f47bf16e49cf5c3e21f5c552d1f64a533aa9ad9a58ae15fb4a314bf7bc833706f0a35ca74305fe96e40a6f8a5b20a267e2c6 SHA512 0d5ea002080a6e0d656c2be39b725168a323ec9536ec85cf791d64d7f0dd8255e3dd541934866c61d61d19789860fc71b2f6fa11ffdfc9b83c8177773f451632
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.10.0-musl-jitterentropy-includes.patch b/dev-libs/libgcrypt/files/libgcrypt-1.10.0-musl-jitterentropy-includes.patch
new file mode 100644
index 000000000000..205944dd7a1b
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.10.0-musl-jitterentropy-includes.patch
@@ -0,0 +1,26 @@
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=ffaef0be613121d3ee37867d82932a7a30c2bc6d
+
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Thu, 3 Feb 2022 22:46:41 +0000
+Subject: [PATCH] jitterentropy: Include <fcntl.h> and <limits.h>
+
+* random/jitterentropy-base-user.h: Include <fcntl.h> for O_RDONLY
+* random/jitterentropy-base-user.h: Include <limits.h> for LONG_MAX
+
+--
+
+Fixes the build with musl libc.
+
+Signed-off-by: Heiko Becker <heirecka@exherbo.org>
+--- a/random/jitterentropy-base-user.h
++++ b/random/jitterentropy-base-user.h
+@@ -39,6 +39,9 @@
+  * DAMAGE.
+  */
+ 
++#include <fcntl.h>
++#include <limits.h>
++
+ #ifndef GCRYPT_JITTERENTROPY_BASE_USER_H
+ #define GCRYPT_JITTERENTROPY_BASE_USER_H
+ 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.0.ebuild
new file mode 100644
index 000000000000..763e29359827
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="https://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +o-flag-munging static-libs"
+
+# Build system only has --disable-arm-crypto-support right now
+# If changing this, update src_configure logic too.
+# ARM CPUs seem to, right now, support all-or-nothing for crypto extensions,
+# but this looks like it might change in future. This is just a safety check
+# in case people somehow do have a CPU which only supports some. They must
+# for now disable them all if that's the case.
+REQUIRED_USE="
+	cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 )
+	cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 )
+	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
+"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+	"${FILESDIR}"/${PN}-powerpc-darwin.patch
+
+	"${FILESDIR}"/${P}-musl-jitterentropy-includes.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+
+	if [[ ${CHOST} == powerpc* ]] ; then
+		# ./configure does a lot of automagic, prevent that
+		# generic ppc32+ppc64 altivec
+		use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec=no
+		use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec_cflags=no
+		# power8 vector extension, aka arch 2.07 ISA, also checked below via ppc-crypto-support
+		use cpu_flags_ppc_vsx2 || local -x gcry_cv_gcc_inline_asm_ppc_altivec=no
+		# power9 vector extension, aka arch 3.00 ISA
+		use cpu_flags_ppc_vsx3 || local -x gcry_cv_gcc_inline_asm_ppc_arch_3_00=no
+	fi
+
+	# Workaround for GCC < 11.3 bug
+	# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=0b399721ce9709ae25f9d2050360c5ab2115ae29
+	# https://dev.gnupg.org/T5581
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102124
+	if use arm64 && tc-is-gcc && (($(gcc-major-version) == 11)) && (($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
+		append-flags -fno-tree-loop-vectorize
+	fi
+
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+		--enable-noexecstack
+		$(use_enable cpu_flags_arm_neon neon-support)
+		# See REQUIRED_USE comment above
+		$(use_enable cpu_flags_arm_aes arm-crypto-support)
+		$(use_enable cpu_flags_ppc_vsx2 ppc-crypto-support)
+		$(use_enable cpu_flags_x86_aes aesni-support)
+		$(use_enable cpu_flags_x86_avx avx-support)
+		$(use_enable cpu_flags_x86_avx2 avx2-support)
+		$(use_enable cpu_flags_x86_padlock padlock-support)
+		$(use_enable cpu_flags_x86_sha shaext-support)
+		$(use_enable cpu_flags_x86_sse4_1 sse41-support)
+		# required for sys-power/suspend[crypt], bug 751568
+		$(use_enable static-libs static)
+		$(use_enable o-flag-munging O-flag-munging)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+		$(use asm || echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild
index 104cd442afc7..98812288ba3c 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.7.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild
@@ -1,22 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig
 
 DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
 HOMEPAGE="https://www.gnupg.org/"
 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
-BDEPEND="doc? ( virtual/texi2dvi )"
+BDEPEND="doc? ( virtual/texi2dvi )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
@@ -29,6 +32,7 @@ MULTILIB_CHOST_TOOLS=(
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
@@ -39,39 +43,53 @@ multilib_src_configure() {
 		# function for that, we'll have to abuse cflags for this
 		append-cflags -Wa,--divide
 	fi
+
+	# Workaround for GCC < 11.3 bug
+	# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=0b399721ce9709ae25f9d2050360c5ab2115ae29
+	# https://dev.gnupg.org/T5581
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102124
+	if use arm64 && tc-is-gcc && (($(gcc-major-version) == 11)) && (($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
+		append-flags -fno-tree-loop-vectorize
+	fi
+
 	local myeconfargs=(
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		--enable-noexecstack
-		# required for sys-power/suspend[crypt], bug 751568
-		$(use_enable static-libs static)
-		$(use_enable o-flag-munging O-flag-munging)
 
+		--enable-noexecstack
 		# disabled due to various applications requiring privileges
 		# after libgcrypt drops them (bug #468616)
 		--without-capabilities
 
+		# required for sys-power/suspend[crypt], bug 751568
+		$(use_enable static-libs static)
+		$(use_enable o-flag-munging O-flag-munging)
+
 		# http://trac.videolan.org/vlc/ticket/620
 		# causes bus-errors on sparc64-solaris
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
 		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
 
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 }
 
 multilib_src_compile() {
 	default
+
 	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
 }
 
 multilib_src_install() {
 	emake DESTDIR="${D}" install
+
 	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
 }
 
 multilib_src_install_all() {
 	default
-	find "${D}" -type f -name '*.la' -delete || die
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
index b921a352a0e5..cf2e518df50e 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.9.4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
@@ -3,11 +3,13 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs verify-sig
 
 DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
 HOMEPAGE="https://www.gnupg.org/"
 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
@@ -30,7 +32,8 @@ REQUIRED_USE="
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
-BDEPEND="doc? ( virtual/texi2dvi )"
+BDEPEND="doc? ( virtual/texi2dvi )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-multilib-syspath.patch
@@ -66,6 +69,14 @@ multilib_src_configure() {
 		use cpu_flags_ppc_vsx3 || local -x gcry_cv_gcc_inline_asm_ppc_arch_3_00=no
 	fi
 
+	# Workaround for GCC < 11.3 bug
+	# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=0b399721ce9709ae25f9d2050360c5ab2115ae29
+	# https://dev.gnupg.org/T5581
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102124
+	if use arm64 && tc-is-gcc && (($(gcc-major-version) == 11)) && (($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
+		append-flags -fno-tree-loop-vectorize
+	fi
+
 	local myeconfargs=(
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index 9b34be60b9d8..b78e9b83c640 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -1,3 +1,3 @@
-DIST libgee-0.20.4.tar.xz 684068 BLAKE2B b40d37f5d90abb8d96d5e90c67056573960bd54cadfb1cb5daf7fc07147a9e1706e23bf0240b84245c7e1ffb814c5e358f12e974a0d8a038b0179be25f271d90 SHA512 9a4b1db47543e80a6191054fa8fb04a8c07468befe05f738409ede317e64a8b884157bb488b330cd27f3dce3af5eeb7aefb74a180c2913ed8c834d1bde8fe9c5
-EBUILD libgee-0.20.4.ebuild 691 BLAKE2B 7c1b2521c3d22409d287f97fba56fe43e29c882b76679d597f7949ffe80545e63b780a79a90c2dfb3a15f78657aef525dfe7f104580cd7ec9c4b5eb6b55219a9 SHA512 0678e1dd5254068b1eaf4d3094398e2967c2881fa3b724d97ac5a4673912653b1616c4f210880f2fe0bd48ca1331d52904e0ba3b1de78fc989a4ea86a1e6885c
+DIST libgee-0.20.5.tar.xz 687440 BLAKE2B 0f9c1d42c28a080ed66a4ad4ab7e84bf4489e936a5b800a435dfd5a0d812d2ca9a47eacab28fca8862c4dfa57dab6595ddf7a0ff6955150b58c12fef77c5a26a SHA512 64d498c5323c4c0978391a01fb3a36e9a00ef9d5dc8e95e3b2dc9cc33f6ad55ec1096e18629c5cad9539b083c42917d91d068824dac4d06f53ef9a682cccc8a9
+EBUILD libgee-0.20.5.ebuild 691 BLAKE2B 17c1bdbcdb7508eaf45dac55faaee82f6d355dba639c570d0eefbd1e9a1460c9ae92f334061589b1e03ee068a2d5ea9ed252d5ac8b7937b03abc575f23dafa2f SHA512 ece4dbd537013793cb28c2f209acd150182e6757f508fbe0f8a01c1aca4c7c5ae3152ec8551059b49db517d9c5520883f81978969cda9f9294f59df8af62c392
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libgee/libgee-0.20.4.ebuild b/dev-libs/libgee/libgee-0.20.5.ebuild
index 34b8acf67c9d..92d774e85027 100644
--- a/dev-libs/libgee/libgee-0.20.4.ebuild
+++ b/dev-libs/libgee/libgee-0.20.5.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
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index f528cc480948..677b42af11b4 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,6 +1,3 @@
-AUX libgit2-glib-0.99.0.1-vapilink.patch 848 BLAKE2B f37a6220afa807eb45c5e0fa45792c863c2b64d6217f40466f72771e0ff708b9952316c2f354d0d0b303cbf26615155d5ef75e494d9e92d6b1e93ffcfc61dcfb SHA512 86ba5754300ec4852aa09f475e6ad29fb8dcadb7634a919d14c88525b8299e0af6fd2a5640feff6c07ae94f2116584933e58466dd5ebc6bae09c17e58b3e0e34
-DIST libgit2-glib-0.99.0.1.tar.xz 140996 BLAKE2B 0c163467ea43ab236b2c856416940b1ed7c93e6ed8ce9980d2d146f0633830ab3765d8bd34bdaab31efdb4096e88e0513c9585b9e06a3efc800d5c32a0d29479 SHA512 48b34ba84b5315d23d0429a684753c3a64c62086d70a67fdb4dfbf8f2ee883f5a90d7e59cfcfd229682794c455b668eb9bd7bf6159d6bfa45a99ddc2461d7c25
 DIST libgit2-glib-1.0.0.1.tar.xz 141664 BLAKE2B a99ad6db55d0d4bee4d7d96b92e92d12712843e41e25e5ab57f5722926fe3e95109a33654d0ab94b7f919bd5d51a0b159dcae720eee763200c964d0327b8a37d SHA512 8e156791783f79d585fa83267a5e14a4a93324fcca75e836478ddd5b5c53d9e827b07a3738c67116478435613639aab0992f32413b9a4de5fc4ff641dd042e80
-EBUILD libgit2-glib-0.99.0.1-r2.ebuild 1303 BLAKE2B a78542a2d8b2f822d1624c5ba098ea681ccad65feeef0db9f34648925e1d41cbad9e7d4f799a957e650fae3b5789f67e3c9afee6284d1dad66237f0d5a0dc2e8 SHA512 1c177814b210279e7d82e34f452d24dee5a959d3a05c84f10ab5aad2cc36c37ada017974b494332dda1c20fb75fbab52a01422818e7af9e0ab54ddf3a94e8dd0
-EBUILD libgit2-glib-1.0.0.1.ebuild 1255 BLAKE2B a443a02233fc3487ce0cd7ebd415bbea61c663b42135c1da4fcdad9f48ee73011e54d96dca7b0728ac9dd6ed5513beda99fcee96b558a4d182f4c1e7511f1306 SHA512 e06912996abbd6186b37458a09e774e0216acc5aac0edd4e126224e2abb05592321523187abc27defad05d8a55ac398ae53e14f0b2e4702cecd924f0abc3f0fc
+EBUILD libgit2-glib-1.0.0.1.ebuild 1253 BLAKE2B 69db594f58807be22ad29aceed690eb17f96387403ade7577de007238556f1aa172cf380b874aee29e23c416e2924ea80ffdd3a0b1682f400b06ecfdabc2e4e6 SHA512 551dd9264d1f2a3e052b4dfe3bd829b136b1ecd20a0b4fb40256a6d47dbabd32f80027e853c64c3ae31b379c369020076cea073046685dcfe42914dec9720313
 MISC metadata.xml 432 BLAKE2B 69d6aa326333089515925cd4c8cc5c2d86318cbe148349f2e2f1554afd8c659a5ce3aed28ad02562d8552317bb010f866e10e3793e47f5a7a5c82d11d8702e51 SHA512 bf228fa30f58c6d860b7648eb40e841c72398390539980fd48e35860f6874e141c3b81c373ee3ca1cb8bbbde5dec36a94c5381b102e1ec33e91962455d9fa8ee
diff --git a/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch b/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch
deleted file mode 100644
index a1838b403ab8..000000000000
--- a/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7f63349fd0405439532f2ff0896a3697c73ccaaf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 27 Feb 2020 15:20:20 +0100
-Subject: [PATCH] Fix meson_vapi_link.py to respect DESTDIR
-
-Fixes #5
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 6d314b5..3a423b3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -135,7 +135,7 @@ if enable_vapi
-   assert(enable_gir, 'vapi support was requested, but introspection support is mandatory.')
-   assert(add_languages('vala', required: false), 'vapi support was requested, but vala not found.')
- 
--  meson.add_install_script('meson_vapi_link.py', libgit2_glib_datadir)
-+  meson.add_install_script('meson_vapi_link.py', get_option('datadir'))
- endif
- 
- # Check for libgit2 ssh support
--- 
-2.25.1
-
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
deleted file mode 100644
index 24d9151a5225..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson python-r1 vala xdg
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="gtk-doc python +ssh +vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/gobject-introspection-1.54:=
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgit2-0.26.0:0=[ssh?]
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/libgit2-glib-0.99.0.1-vapilink.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		-Dintrospection=true
-		-Dpython=false # we install python scripts manually
-		$(meson_use ssh)
-		$(meson_use vala vapi)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule libgit2-glib/Ggit.py
-	fi
-}
diff --git a/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild
index 72d8c26339c1..ee3a43c9aa88 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="gtk-doc python +ssh +vala"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index d307c68878de..c98e5485591d 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,3 +1,7 @@
 DIST libgit2-1.3.0.tar.gz 5599575 BLAKE2B b701c105bb0a5bdcdd5ed1db180662ad4949c540944664d5d8c2f5d78998f15d15bd3669ae3e3d43bfa1b81207c0a94b7e49fc76e57f4cc8ef791ab26e62fc70 SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e
+DIST libgit2-1.4.1.tar.gz 5629087 BLAKE2B 7c8316003c168c4b366fa4376d5e4dfa0a70dcb0cd0cc0b4ac7287f7b04eba50127cca89c4bcda94f86e5331b6a2951532b5108d5376a2a3fed7a68c31472151 SHA512 66943d82811c5e24687231696bd1ce8d7d58f44081c00a7030e01a69a7c920605a427c315a26af6c57c9bd7c1d1d31ab857f80615fce1ba4b981d01f733215cd
+DIST libgit2-1.4.2.tar.gz 5629585 BLAKE2B 61e269fd08beb9579838a13b661b4270f1e8d2d3d1e67f6b8357e92a5ee4aaccbe637644dc87cc8b04d9c181e37808352077b75fed8753a4b2d8868eaf248b62 SHA512 144bec7f8e66d97b20335d87d1eb68d522f5e59064b0c557505c088d3c486d45704f023d701f51de572efa8e2eb111e3136eb5d23c035e29d16698206b5ec277
 EBUILD libgit2-1.3.0.ebuild 1691 BLAKE2B 60ba697df7bf967756ee9c0d2501e035803f09a0b4ffdc20274788d174de2735afa3d5a2cde3ec248e07e9c843a62547c240514edd9897f4dab1cd4a8c4455c8 SHA512 c3c00367cdd0f9d4699fc017f760eb193c324ed280149b8264d8f2680824308948437e771ab0ea901185e558a9fa535c13e906ffa0aca732fe2480874492554f
+EBUILD libgit2-1.4.1.ebuild 1646 BLAKE2B 91667e774f00a64aeb4a78cca562eb99f04130ac87320d152f77fd16f345d888eafeabf02515f938dbe66904bd867390065dc72ec51195441d5ec67dc5a5c0c7 SHA512 7da2def0d3ff13b956234d2c2819fbdc1215dca6874c3707c867173137f5b64e2e305ab9ea75034d76a5d4073318e203d74f1f773e1dfb632a8c14e3cf4ae162
+EBUILD libgit2-1.4.2.ebuild 1652 BLAKE2B eaf07d61f3304ef007041617c60302484af1886de11f16eb98bc4d4327b43ecc05a3d9447bcc2188dc065855614103cd3492e698069e75cb8f98767da959cd94 SHA512 d773a05d502924ecc28b61c2a7f1312ad05547d6d9d46dac015d5abbdf9e607630d252a9e0acec3477df14cc9c7ad48a3cffcbd57458cde0f72c28321ae6cbd6
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.4.1.ebuild b/dev-libs/libgit2/libgit2-1.4.1.ebuild
new file mode 100644
index 000000000000..c607c9e82f59
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.4.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# relying on forked http-parser to support some obscure URI form
+	sed -i -e '/empty_port/s:test:_&:' tests/network/url/parse.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DUSE_SSH=$(usex ssh)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_HTTP_PARSER=system
+		-DREGEX_BACKEND=pcre
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libgit2/libgit2-1.4.2.ebuild b/dev-libs/libgit2/libgit2-1.4.2.ebuild
new file mode 100644
index 000000000000..8727c6dbff6b
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-1.4.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-any-r1
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+IUSE="examples gssapi +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre:=
+	net-libs/http-parser:=
+	sys-libs/zlib
+	dev-libs/openssl:0=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# relying on forked http-parser to support some obscure URI form
+	sed -i -e '/empty_port/s:test:_&:' tests/network/url/parse.c || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DUSE_SSH=$(usex ssh)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
+		-DUSE_HTTP_PARSER=system
+		-DREGEX_BACKEND=pcre
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index 124232671d2c..ad99f0ac9e49 100644
--- a/dev-libs/libgnome-games-support/Manifest
+++ b/dev-libs/libgnome-games-support/Manifest
@@ -1,3 +1,3 @@
 DIST libgnome-games-support-1.8.2.tar.xz 45328 BLAKE2B 6df5e49629f65a12a683b6c026afa0629132ef3462d714f751fe75595a74dc3d3ab24c50c4a05e893999271ca66cd8395f36fc56ad01139a16b7f0c610fa2def SHA512 6c622b8a64df02be53b56cf8f2da6c9bc866f30042eb61c621db5ab38c4b88e90151c81a71eeba4f8d182b76d581df31f822409e633b45ee928737001f65f16e
-EBUILD libgnome-games-support-1.8.2.ebuild 646 BLAKE2B 58d76ebc67c020abf58ab247d7bad72b61b42725012c8c0b0c04b6a293467a279a46b02422490f163c6bba6b495790c02a61e2ba1157441925e59cff34a4a543 SHA512 ce34f0719c73d142efae615e2c6d3b48d8d11b740ef4bc458a9583cd1f3f0f809d819405923e3c060f7ce2dc584375cca6346b5a968b446df15ea61608a126bf
+EBUILD libgnome-games-support-1.8.2.ebuild 645 BLAKE2B 45dccd029189634f514013993789fe18471155ed705c5383b2a5fce01e293a8d25ed2178bc10c8947f8efd925f40a41d9a2b727dec3dc93a77430823574ad73a SHA512 a5a130c36deab9e4237a0834f2309867ae84cfcc35ff7e15038cc528509f718b94936f0b5bf4567a1575656b9c2d4e04d7289621688f63852ddde81d3ad56858
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.8.2.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.8.2.ebuild
index 5c6809aaca4e..2eb330143a14 100644
--- a/dev-libs/libgnome-games-support/libgnome-games-support-1.8.2.ebuild
+++ b/dev-libs/libgnome-games-support/libgnome-games-support-1.8.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgnome-games-support"
 
 LICENSE="LGPL-3+"
 SLOT="1/3"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE=""
 
 # glib dep in meson is 2.40, but vala is passed 2.44 target
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 83639fe303c3..6439068b228c 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,5 +1,3 @@
 DIST libgusb-0.3.10.tar.xz 42972 BLAKE2B 4c49aa15cbbbb56d5ee5b896adb3e34b45332cd846933fd3aa86a645e7d897418d0e7a30d9972980e6527f1e60fc6e579f5df119708a12b3e504ff695c94d922 SHA512 66bd7c292cb9df2799b02acd48dc4b07794e7339ea1bd6473ea512dfec1b8e7e58abbd40f16a2a4805240cc8df4aec050335edb4f4178ad12ac5275438b8ae59
-DIST libgusb-0.3.7.tar.xz 41844 BLAKE2B e0829430a7c4c9372ebc061ca8245ecd6b30f0922e4e37ae41f7f65055e7339b5a3a882c5526ea5e5663be3b7c1ad71fee7da5cffb501d63bd1cda2b618fd40d SHA512 65a35be62bff689621f418abf045f62f946c67488dd021d363ab252b9b3a2380898ec763b374f7da50901945eda666fdcae7cbfda7e143544175d7ade3ebc20d
-EBUILD libgusb-0.3.10.ebuild 1519 BLAKE2B 41ad01720c407eaf9fc9e6a7d11d646103457289231280568733be44a89de05ace36554255ebbad0f517b1e6e6ca6687f717ae57904658889c122af365519d22 SHA512 443e57694504ae04e6b51030b599b9f840518dd11d0e6ede6195e5b831ab7d8833803012af118e2b4c2b0f662d85c7dab68f3077a3f4ff0aeb0cb9e4fa751d7c
-EBUILD libgusb-0.3.7-r1.ebuild 1513 BLAKE2B 6a36977eae498f15a9292723c26624d8bbc12ad07907cf98b7a3c95ea6348e68bdbbeb81ec2744c678e9f1ffee81443805af39367526a7dd4d660da913cab730 SHA512 361111fe47bc09d5a715a98561e70e5f9e99adc617753142282236920d0a9e5805b2e5d2a647c3c5f6ab4b340be75102c0cb5310cdd38f14951e5ad2c0fadcde
+EBUILD libgusb-0.3.10.ebuild 1513 BLAKE2B a2844455dd147db290fb5ba7223e47e220abd90cb8a6ada11ff16538cad60e22efcb946eb3fc1bd2e5832ae297155d30278523bfece703c3f2dc31508a94954a SHA512 410357283edfd1230a74ed44e68c86a4e88a20c27a6eb4367b7a3bf8b4e37d56a31c303366c4b24dbd761c0d0bb17d33c010746bc585937d9e7c00d896b0cce6
 MISC metadata.xml 344 BLAKE2B bd362d7e89ba2d88c2f220ab47593b4ae25bc4ca486bdafda16448407213d7558d7ea807c489e5aafbb8ec83a40e8e339c8ba20d3bfc3957da33a7e7711c6898 SHA512 93166c6dd4d764901c87fc567ab1c67add1c654b7ea1f3326e7144d5c14789bdee2a1e37874f8b6158136e03363372bf1d972f49f96095b0e3e568af89c4af34
diff --git a/dev-libs/libgusb/libgusb-0.3.10.ebuild b/dev-libs/libgusb/libgusb-0.3.10.ebuild
index 7953a2c05123..09ced73257ef 100644
--- a/dev-libs/libgusb/libgusb-0.3.10.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk-doc +introspection static-libs test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libgusb/libgusb-0.3.7-r1.ebuild b/dev-libs/libgusb/libgusb-0.3.7-r1.ebuild
deleted file mode 100644
index 6fb3c9af5241..000000000000
--- a/dev-libs/libgusb/libgusb-0.3.7-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit meson-multilib python-any-r1 vala
-
-DESCRIPTION="GObject wrapper for libusb"
-HOMEPAGE="https://github.com/hughsie/libgusb"
-SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="gtk-doc +introspection static-libs test +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
-	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	sys-apps/hwdata
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4
-		dev-util/gtk-doc
-	)
-	vala? ( $(vala_depend) )
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	default
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_use test tests)
-		$(meson_native_use_bool vala vapi)
-		-Dusb_ids="${EPREFIX}"/usr/share/hwdata/usb.ids
-		$(meson_native_use_bool gtk-doc docs)
-		$(meson_native_use_bool introspection)
-
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest
index 0172d189dc65..9fad8f329dec 100644
--- a/dev-libs/libhid/Manifest
+++ b/dev-libs/libhid/Manifest
@@ -1,5 +1,5 @@
 AUX libhid-0.2.17-configure.patch 651 BLAKE2B 734aec3525837a5179fe75057628fa5c9276603b62d5075a95f49c1813f2bbff94dde8a538fe82a25c07a0b101a6ace518e5f496b261c8b9d8063bedea001766 SHA512 da06305f3846c24e5faac1bd3f69f2527801a0e2bff127414fecd78ff658a6c25221441a61c24a97d465523b44bd8c8d7e3396fe20b11ad6ff3a5b96902740fb
 AUX libhid-0.2.17-man.patch 500 BLAKE2B 404b7163651258a28369458a76cdcc591ebc8285b53b60e84c41f899d3449e6493b191ff6411668ad168a9ea91b024b5c6d738ca86c91a49f115ba58bf7b01c0 SHA512 de3364eeff10e5e0dc287b4c04bc680ab44c487cd539d3642ef72ebc11384713021bff750f6bf1a46819e59842ad51c37e2eec0d0d9e20afb8a194b5844fe1ce
 DIST libhid-0.2.17.tar.gz 218501 BLAKE2B d7110dc1854829023531f1fd58fd6668f5d15dc3b98f9a6c799b3bc4725ded907de645921d17161a37cde8d9759ec371f96caf4fbb8d6f7bd480dfe2a352b399 SHA512 d82ef95871460e22e26f4fddb88edb83c262a8d0cd70beb7e65cacb443bfc21e12f868d50b8b4ea0ee00acce7c2d0f5bd06437b69cf89ef39dd118c21c73b977
-EBUILD libhid-0.2.17.ebuild 1024 BLAKE2B cdeb236a4725dca98dfa3f6f95cefc6f9607f553aa237c68c0170d21308f45a149fa6377c500b1bad6695e40303e1b5dc717a8494198137f7f5db674d94d5d44 SHA512 1f9340e799f490c16d1b24cc56ac3d6f032875a0bb88ac76510162715f1e6cf04ccee418068d953da7e6da5f8d984de6dd2d49f084fdc8d538ab4fdd3db776e5
+EBUILD libhid-0.2.17-r1.ebuild 1024 BLAKE2B d10731ba5fd724eeb076a10d5a48694a07509d9c0cefda47775022e77bc9417d60e0096d703b8a74de72ece38781400e29ec1f920afaee2b55b9c36c9fd418fa SHA512 986945932c8f3a8edb647a6fa924a757bf10a94a4e247ecf14e1df27b40bd2efcd3ce966160c5f0829d5d41f3aecbebffc27a75db3a0523278eb53500e9a384c
 MISC metadata.xml 580 BLAKE2B f2e2be3f798df0ae51fb3c1cf1d777325842c41059d342f116cd81e47aa897399884af15dd78ae64a2a332c5a885eab5d1852386e05d2b5b1d45c742ab5d58bc SHA512 febae925412addaee2185dcd4d7a5528f98d5b5d9849ec0e34f6399d5924a15967503f2fe698a15058a0314ef8780311df3f20939280b534311928d05a2e0d72
diff --git a/dev-libs/libhid/libhid-0.2.17.ebuild b/dev-libs/libhid/libhid-0.2.17-r1.ebuild
index ee87c17c2674..908ad8e00008 100644
--- a/dev-libs/libhid/libhid-0.2.17.ebuild
+++ b/dev-libs/libhid/libhid-0.2.17-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 0bee25ce9cbc..b6c04b273979 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,5 +1,7 @@
 AUX libical-3.0.11-pkgconfig-libdir.patch 612 BLAKE2B 90b53adfb90684dd8c18f91a4de5d87df9cf590e097e414eef7ec92221dddbc5b0ade7b3deccd1aed6c7c61c1d9bb16663d2e1910718ced1f21a55ffeffe7a16 SHA512 bf1af662e65d62778fcc946543d41e4fd592a90bb643a8b584916c4d62ddb100c1746aaf0d4b4698c1b97de19926220f7c3c8dd03014febfdce32015571f77eb
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
 DIST libical-3.0.12.tar.gz 883537 BLAKE2B a67cbf767f5dba7717c80b2ed90f257025544b6fbbd85e4d10712fb63ec5d750c00e9a1d664b0c75f7e833847aeee2fc1412866bf4b599ead663132b3665835f SHA512 e97aec11895d4c51fcb1fe32598f5fc23bbffc26274d1f46e74d1b9a365bea65446563224b852d13a763334eab0375e77cabb5ba535d3b2f89b652bbe24b4517
+DIST libical-3.0.14.tar.gz 887795 BLAKE2B 8c073b77b5e4e6b24e3dfae7ac7a5f88da874bdfa53489cd04afd4d458d2fc963d39c2816691e777003ca9af510ceaf7bab9d7e1021942aa9c3adaad32ca8341 SHA512 36da5516672976c71b049a12af36164d91f9b655f81f1884766558149f25e80c30e64d15da848842f8a629295d708f39ce6fa63a3b0da39b5cbeb91911a4e6d8
 EBUILD libical-3.0.12.ebuild 2470 BLAKE2B b88d73cf9650df8db27900f7d6cf7dec9147fbec3baa47739a2952d04b7296896db5a045822462b5083791ab744da8572f875c9c3cfeb0b56638c6bfd91e1ac5 SHA512 1ad241526b56cf35498e582887e66813486b7922eef140b92b0a12861f6ef2d373b798961eab25870e031f352909ed9e20443e0991bf725f25e68f7e2f5c1163
+EBUILD libical-3.0.14.ebuild 2483 BLAKE2B 2c8f9a13664b4bbf048ddb2ff2d527fe19afa756ebeb6095ec499476e3e5905c5096ba29065b4debbff0e8e748a0c648a982fbf7629a348904e958a34c159c69 SHA512 d756f5e5513b0b313222ca381fb2c3c48522e7928c6b1454db2336cbb09de4819d90da890f962186638dcf8acfe219c00e5faa89a7afd41aaf1b217e27aa7124
 MISC metadata.xml 415 BLAKE2B a03d59a58e875698695319e5f427ef82ef11dd8aaa457cc6647039ec57583d730d53c5040b5b76007bf9662a78684968791f0a15ae7172007d4c49ffe8fd2318 SHA512 0663988285e1881903c0e8f62bd5ef99c26089b54f4abfeaa0a97f5ecc9820586b1a20077ddea24bf4e513b8049110f08c33acde433777adc1dd6d03f7ea7966
diff --git a/dev-libs/libical/libical-3.0.14.ebuild b/dev-libs/libical/libical-3.0.14.ebuild
new file mode 100644
index 000000000000..d42636f3b9c9
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.14.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_USE_DEPEND="vapigen"
+inherit cmake python-any-r1 vala
+
+DESCRIPTION="Implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="berkdb doc examples +glib +introspection static-libs test vala"
+
+REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/icu:=
+	berkdb? ( sys-libs/db:= )
+	glib? ( dev-libs/glib:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	glib? ( dev-libs/libxml2:2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-libs/timezone-data
+"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		glib? ( dev-util/gtk-doc )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	test? (
+		${PYTHON_DEPS}
+		glib? ( $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') )
+	)
+	vala? ( $(vala_depend) )
+"
+
+DOCS=(
+	AUTHORS README.md ReleaseNotes.txt TEST THANKS TODO
+	doc/{AddingOrModifyingComponents.txt,UsingLibical.md}
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-tests.patch"
+	"${FILESDIR}/${PN}-3.0.11-pkgconfig-libdir.patch"
+)
+
+python_check_deps() {
+	has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	use examples || cmake_comment_add_subdirectory examples
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package berkdb BerkeleyDB)
+		-DICAL_BUILD_DOCS=$(usex doc)
+		-DICAL_GLIB=$(usex glib)
+		-DGOBJECT_INTROSPECTION=$(usex introspection)
+		-DSHARED_ONLY=$(usex !static-libs)
+		-DLIBICAL_BUILD_TESTING=$(usex test)
+		-DICAL_GLIB_VAPI=$(usex vala)
+	)
+	if use vala; then
+		mycmakeargs+=(
+			-DVALAC="${VALAC}"
+			-DVAPIGEN="${VAPIGEN}"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile docs
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+
+	cmake_src_install
+
+	if use examples; then
+		rm examples/CMakeLists.txt || die
+		dodoc -r examples
+	fi
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index db1edb374174..7f5a015b2b6c 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,3 +1,5 @@
 DIST libinput-1.19.3.tar.xz 655164 BLAKE2B a07d91603a3d4e759aad25ee46b11dbee47eb013a2361f1b70acd616fee0ed9660e6fa8773948d6acf3686179fd7aaf76bf8285f3dc3137a4b1b605ec0e4d6d2 SHA512 f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298
+DIST libinput-1.20.0.tar.gz 982547 BLAKE2B 6a30ec5473b7271b89a50cb5147900928bc1ac370cb30bb7a9282517f9ced1973e7f83e864a865c840a1f1fe447459c329b8966211cafcd28f8d1285a36de593 SHA512 b92345809f4e18b2335e3c377d1a8edda523462ff23fba6abcc5f8cf01b80fc4c6e4e06886088788c4b04873d37da210876f201bb81203af2f9f614bc659e6eb
 EBUILD libinput-1.19.3.ebuild 2260 BLAKE2B 5ff2aed88d53ebaee2c869ac6173fa946cc324ad58a1918105571dcc21e191fb2a94d95326aa74fcc77603ece590807878861ddbab63f38948bb4e186a93983d SHA512 0e1da4863310b22e9fa96c1b353091da77c406788adc282483dd5c376085d27b8b8809a7751276e3e5ca6be38e96df5c8c96ec9530c5b13982e8ccc7340f16db
+EBUILD libinput-1.20.0.ebuild 2283 BLAKE2B 867defe25d1b809da4b6bafcc8a8d5fd6c8b07194fef4492234196a64bb5ead4e55a11022ac7da584908e91fedda9f44f13bec464693ef1e2039ea4dcd94e3c4 SHA512 d77f2cd866cca6b86cbe420650ddff486a84e04d9b35f272184d3353049663d97dfd7bb8ba94a285416dbd2471c37c1a8a346fd88e3a5178039c4b63308a9884
 MISC metadata.xml 449 BLAKE2B 677e5fee3bf4047ba47b90aca7f30b9ce57e947e6b5f6903cbb93c214b084f0d93f6253980090544d4ff4a821263c156e0706ae5499cacbb2e52d629f3a7b253 SHA512 103e8b39ad6b9ffde159095dbc4553d8b695db44e49582518055313c79ff6123bcc424c3980cbbaeabaa455e00a828039f73c1f3424ce038d5a2d63ed3e7849d
diff --git a/dev-libs/libinput/libinput-1.20.0.ebuild b/dev-libs/libinput/libinput-1.20.0.ebuild
new file mode 100644
index 000000000000..c14415db2dff
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.20.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2014-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/10"
+[[ "$(ver_cut 3)" -gt 900 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
+	>=dev-libs/libevdev-1.9.902
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/check-0.9.10 )"
+
+python_check_deps() {
+	has_version -b "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version -b ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed "s@, '-Werror'@@" -i meson.build || die #744250
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		$(meson_use test tests)
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	pkgname="dev-python/python-libevdev"
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
+		einfo "${pkgname} must be installed to use the"
+		einfo "libinput measure and libinput replay tools."
+	fi
+
+	udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index ef6cfc512607..d8fb4347c842 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,3 +1,3 @@
 DIST libisoburn-1.5.4.tar.gz 1623904 BLAKE2B 3bb6ba88ad0422e1f3fbefdadb60231ea338a6bb8f39087fd25d58d68a4603c445d5d02b54c0a69897c321b4620f2ceb46eb8899552d2486e579a34f345a9d7f SHA512 5fc8532a13caf6caa5a0711753ca99ee2b3f4d5e2db9b3ed2aeef76714e3ae6de6d9c2db0d8297c0d749c42c5ab84fe92989751d8da24d41457b98656eb1bd86
-EBUILD libisoburn-1.5.4.ebuild 1844 BLAKE2B 41ef930e9f5ee9cdfc903b8a52b957cd50a4872a999142ab71751cebe56569e6a308483ea62807c99447aea5b8c4faeb6d1ce31f7fd422ad5bcd9b5af0b5c5ec SHA512 86b40818a6eed435f94968f1d6e0c76b73b5026d48612698d3bc017eb3f19d744c13e6bbcced9ad6d1e3b8a4d8e475296eaa4170b44b5338e5d8c2567683a054
+EBUILD libisoburn-1.5.4.ebuild 1843 BLAKE2B d2ff026f4ecd4b9d721f0646068e96e934e8abc9772564b418def4b23a10724ed063c3c853cfcd17ce65b87ecebe83695a6293702e23bdfa21e200129c2d4270 SHA512 8f8c1126ed2f7d1b53f252a3d1a317742a664827f5552804b660b7f445f1315d5c8e1e2c624172a48b0098c867ae8f59938cf6b067baba116377c16202b8238b
 MISC metadata.xml 830 BLAKE2B c89f5f41f77640a55e5e48c2e1b16fa87fab35fd6b9b2d5c428e3ad700aaa088682d1ff6ca1ca674025b2b110cad722453b9a80889e81d021e941d41d7e14fcd SHA512 b687baf3d21a495da1036196fc653b92934d2de797ff0b149dfd94a81dde6d965778db7b8fd4284ae09cb07d01205eaa983f586bf4adee7092d1b3b3a8b72ed9
diff --git a/dev-libs/libisoburn/libisoburn-1.5.4.ebuild b/dev-libs/libisoburn/libisoburn-1.5.4.ebuild
index 74241677864c..7b60d179c5a0 100644
--- a/dev-libs/libisoburn/libisoburn-1.5.4.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.5.4.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
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="acl debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 8025b36015f1..591e58596798 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,3 +1,3 @@
 DIST libisofs-1.5.4.tar.gz 870395 BLAKE2B 2cb9d247219c368e9808dbb2b7bcbe22829e78683a6dc6d8a182b54ebfe6d8c8a082990179b784f891fc79f2ed4830f09dd43c64bfdce60cbff6c34fae2150e7 SHA512 a06e834e81081358478cdd27d1dcc6f3bb52ffd2ea57ade59f3ff2f69868fb6886a0b38fd1580d24295b7ed936ac471f107df64d62c1ff42b57dd8ce0810e3f2
-EBUILD libisofs-1.5.4.ebuild 976 BLAKE2B c7eba7846e48520112085ea9b1e5c24a594d6f9683963f4f45806b7359ce36d3ffb3a645de0a2f55c1289f0188d646c850d312746bce160249e75027b9af89a3 SHA512 785c8ade5ee3b1914937286362ba971f175ff6e738587f269ed2bce1675ca5183d21ea7e9307ba7cf509141fe571cb6576b14907a7d334b571d4623153e8a7c8
+EBUILD libisofs-1.5.4.ebuild 975 BLAKE2B b2a7de6c3c530d1cfdb410ae5a21399de35fc62752f0fe8ef9bab2be9aca588cbb234dfa8028199bd373de75a7b6d2879e539dbdcf8c28b956f6419de9e93d08 SHA512 9417553fc5a9ade0286ce56842ec80139c9a790986c8976dec2d89bbffc4c9b5e4dce452859d32891122577c144c245281958080bbe9ff20bcd2159354ab0a70
 MISC metadata.xml 321 BLAKE2B 88d0d1ac9eaba1741f02a93cbcd6c55dc6f2cf22f6051969e9bbdc497f515fbedb024f6027517893342466cd04fbd94cdead3b015c311c99aaedc4f3681f193d SHA512 870d6fd484548245f01fdebf2fc2e664d6445cbca7a47c34065f4d077709cc9c989a0157f799b811a37345b8c1a87d07f72f66658b86319f8425bc02c0609f47
diff --git a/dev-libs/libisofs/libisofs-1.5.4.ebuild b/dev-libs/libisofs/libisofs-1.5.4.ebuild
index be926a02cb69..5285031f778e 100644
--- a/dev-libs/libisofs/libisofs-1.5.4.ebuild
+++ b/dev-libs/libisofs/libisofs-1.5.4.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
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl debug static-libs verbose-debug xattr zlib"
 
 BDEPEND="
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 5e5985b3d5f8..ac1d7e4de10a 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -3,5 +3,5 @@ DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b45
 DIST libixion-0.17.0.tar.xz 499836 BLAKE2B c8c31b07ad14dd49be259686af3e39e6f5d4aeeb8680030ea7bd2697c8baa72123f2659b3087f224f956612dc444c97e6a6d331fd3deff780981bab4d5b6ad25 SHA512 0acdb2eae5250236a94b1a3344ca990058ea8db7b1e741545bcb7160f9e28d21a3c2ec336621fd590df10188a4d5feadfbb3a63f57e9bfd2cc1bffc04009ffad
 EBUILD libixion-0.16.1.ebuild 1252 BLAKE2B 75b64af1f6eea1a0d4dd256cfa579137555e9c0476e485ea70b3ec5dd4c65a39a78080bdce38ac49575219e03c7e37595e0647cd7efff43fa664d7a35d7c7de5 SHA512 c13486e9162c1b0e81ad859f65fee8cba74128ac8a5cbddabea96ae7787f248468fc7d10b797e600c2ea8e10b1a4e6dbdbd4de472c84005801e41f06137b4030
 EBUILD libixion-0.17.0.ebuild 1282 BLAKE2B 549a1c593004915a7aa169c4efbf544b8db36052ec7ff25e8f27127d8db9aec8890bbf031f9338e234c83cedd9ab873583f8092d766a150ca609732ada2cf802 SHA512 ac7472d5af05f8d58581fc657ca83dc96583401eff67cdf6edbbd22219a33108e4823012540041854a10563ba181de1de933e9312f847e8bd79a4fd4cab18235
-EBUILD libixion-9999.ebuild 1211 BLAKE2B 73f2b1c8cea767b32ea24537851021cafda7c6578f1eb1be92861bcdb3feecbc992f5af523a5082b7ec26d67d2986c449df9156bf4376819ab6c8f442b9f0ddb SHA512 88c4ad412ac0361dae2a157a553a14d6505cb4f8ec46e46380007c5bda5fc19cc9c871c99d83f25f35c5670dee408ce63d6a8d34bc8f04e5bc1f7365f469ce9f
+EBUILD libixion-9999.ebuild 1211 BLAKE2B 4c7340dc18b7640b81d83c1ac6c3e0f9063c50c84d6d0f000b6889ec44833a165eaf5a1bf5c28b758cbcf51b03254826f20a74990a8ec9385ad00ae069efecbc SHA512 344450f3e309eec3b422792a21478a9714379828abe6a7c8890ed690d5b32147d6ce8227db867570b8cc98dcc2799a538b9089b7484bf663968643d20cc720c5
 MISC metadata.xml 398 BLAKE2B 0c2320063cc47c8a993ed456ac3a68466ce443b910d43739552d0f365dd178ed59ff76b2e23bab38b1962b9ce8cc973c03125096074a8bc33b09c8789ef236a5 SHA512 6599412f7feebc12c72eba06522563ff16d700e953d6ebc54f88544e49ad5e48e265b939a4fcfd788776abfb03110a8a27800dee71f031ae27eb207a8f924451
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index c9e0cbbd5438..b0af1e9eca10 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="MIT"
-SLOT="0/0.17" # based on SONAME of libixion.so
+SLOT="0/0.18" # based on SONAME of libixion.so
 IUSE="debug python +threads"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 637de0023187..be7d9eb25fe2 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,6 +1,6 @@
 AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
-DIST libjcat-0.1.8.tar.gz 64828 BLAKE2B 86ebc635364cd78c05694baf3d5fe7d9bf6764629f4530f5ab8a9502887884b3d5369860806a252493a7a3208367b848e470730fb8c32d4c66cc8eb92df51990 SHA512 058bcf7ddddc7a3cedefcfcef9947c5f318fa806c8673b991be29f36e4fa0e09e51e972c0bebe0404fd92060715f8a497a0c0566d743bf6f3fa71bc3d94688c9
+DIST libjcat-0.1.10.tar.gz 68126 BLAKE2B 7e8bd2dd42f784bdf0c067ea870c8095a0fc9579f6041bb9a984d45d46950861d285238d49181243cd320f83c25f443300dd405fb0c1d50c8055fbd5a0af6b90 SHA512 437a792d438657e5b92dfab332d16eb430d8c3be2a8f0d82f1f1cfd5d3a0db1a0a1175dabb87dcd57ac7cddc8017e27c00f7a959cb57244a1e63fb963cae445b
 DIST libjcat-0.1.9.tar.gz 64884 BLAKE2B 30e7c9f6c5fc971144f27bc495443928b8406a199e3a03399f2081a5ec3d09d10261bec6804e8d92c8c4a44ad31f821f302954fee66abe16a6b0b0400b627036 SHA512 d4d51d95edf1223d5876464feb476d3e9a47f60fed7724690d247cb3b759c5adaa04ba71a0221d5e520d0077d52ea6610c0188f2e5c70a323210ad68c134e83d
-EBUILD libjcat-0.1.8.ebuild 1456 BLAKE2B 693445986907a3d10a21e6fd3b9c95cc6850ff3786ab234715cffc181268d7d1c41a536ec0bfd5fad23519584d9601ce7c7b152d5fdb3adc68a8cc61040d43f9 SHA512 364b7c724954d39ca04c932f98fbda319dafae35482bfddc9bb081c3c863f6fa578b4b3e29faffb25591bfcfa853067a2c3c85bf3b8c8e3d2e0aaed7c06407b0
-EBUILD libjcat-0.1.9.ebuild 1456 BLAKE2B 4849b8147be57ecfafca5fe498b53f76fc21d15c9696b039738e9b1b051ce3d0a8f10c30beea0d0838e1dfca74fff3940594f0ef21ae38d068acc8180ec31f2b SHA512 fa9ee43462bb802a3a7ecb5bd300c4b163b8af148f0e5c29747a355084a8f2919c80092259b4dee84a8cacede12d8fc82a1fe129ea85dcd8f81fdc2601adde5a
+EBUILD libjcat-0.1.10.ebuild 1460 BLAKE2B 766f9d7e7025246ec376ab943748abaf97c9d863971113dce07119bb1dd15a88cb91338592bb8e0408ae74a171fcefccc61f6487a33ee09155bd0717f0eeb711 SHA512 4bcb536048ffccdc8115c518d443bb8a6a3aba79f1023d950ca6b367f9792e085d7c5d859b46b7f1b0246086e26e69f6804b3311ab7c371763a791fe3c9ad65b
+EBUILD libjcat-0.1.9-r1.ebuild 1458 BLAKE2B 84b75cfd715fe91612b8ca871c3bd8d3a799ba917c33caf5a35b304bed88c24ec05d8bbe1911ae9492ac237d7ec825fe3d83b91fb597997319e5e767d858e813 SHA512 2007a285263841bb3a018a71a2af8af754c2f68f607887d75630532b533eac6241617468322925959b4b3bafd8247eeb808472a8c390fad61096c707422a7e9b
 MISC metadata.xml 937 BLAKE2B 95095d1f33b1ebc992688672e5084d67fcc8fadb33e31b367576f4bc73b4fc2baba435a78a0ceb863ae3a2075dfa3d6b936922bcc3890f367ef67fc7afa16abf SHA512 3fafd34b736ec15cd9f202afd1b64df241699a24d5b938422a95e05ef1acaaf6fffd5e95815f8dccbe414d83b47ea98308d375078f02aefef771b23cf23a7bdf
diff --git a/dev-libs/libjcat/libjcat-0.1.8.ebuild b/dev-libs/libjcat/libjcat-0.1.10.ebuild
index 1740585297c8..c386fbd02fa3 100644
--- a/dev-libs/libjcat/libjcat-0.1.8.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml"
 
 inherit meson python-any-r1 vala xdg-utils
@@ -14,13 +14,13 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+gpg gtk-doc +introspection +man +pkcs7 test vala"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/json-glib:=
 	gpg? (
-		app-crypt/gpgme
+		app-crypt/gpgme:=
 		dev-libs/libgpg-error
 	)
 	introspection? ( dev-libs/gobject-introspection:= )
diff --git a/dev-libs/libjcat/libjcat-0.1.9.ebuild b/dev-libs/libjcat/libjcat-0.1.9-r1.ebuild
index fe17a3465a41..530eb115d6af 100644
--- a/dev-libs/libjcat/libjcat-0.1.9.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.9-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="+gpg gtk-doc +introspection +man +pkcs7 test vala"
 RDEPEND="dev-libs/glib:2
 	dev-libs/json-glib:=
 	gpg? (
-		app-crypt/gpgme
+		app-crypt/gpgme:=
 		dev-libs/libgpg-error
 	)
 	introspection? ( dev-libs/gobject-introspection:= )
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index 3b229961aa78..1bc9b785a1e8 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -1,3 +1,5 @@
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
+DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
 EBUILD libltdl-2.4.6.ebuild 1089 BLAKE2B 0adab6d846d7b0582778434cab8efe131a930dd35ffca24e0ba208e2e1eb2f7f5daaaf8ef9cada8b39d0735e50ff0de2364273965812e7caa98d5e8f62540572 SHA512 834278fbd9e8c5579f90d5e652a0c588d1f2e7cb12a42b5308f8dfb97b5496bb4da611f10d370177416684154f4c016a718f7cdc3a4da88d10e29351d710dc99
+EBUILD libltdl-2.4.7.ebuild 1125 BLAKE2B 5a3121c8e5e9add687c4397aa8320f45d88f630ce3112962beeebb01c811a61c572e134bbf31ce6bff053579c25fa603747bcbc18f57e43bda30608f167d3f2a SHA512 3c699f4b0b6ed75979a61a52a4243804749272bca01b2b389d1dca29d28240851ecf8f25c52fabf710d830846f329472059d9dbd2becad41d97c572c84c78753
 MISC metadata.xml 331 BLAKE2B 4a4cfaad20b2f1c22b0b5ab23b4557e1bef50dbc49d0b7d821d4099e06bf488fdc6c7cb4a29431910d0e1b8cfb7c8b565cd3296afb30925a08389e023c777150 SHA512 9ca8e937181de31beb06558475dc8c10e61765d5280a882576a2d1e4e87fb750bc1c2e99aafdfffe343343797e0565814c0a5f8c18c7fba5b7fe9275100f2609
diff --git a/dev-libs/libltdl/libltdl-2.4.7.ebuild b/dev-libs/libltdl/libltdl-2.4.7.ebuild
new file mode 100644
index 000000000000..3b9b846936fb
--- /dev/null
+++ b/dev-libs/libltdl/libltdl-2.4.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with sys-devel/libtool.
+
+inherit multilib-minimal
+
+MY_P="libtool-${PV}"
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="https://www.gnu.org/software/libtool/"
+SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}/libltdl
+
+LICENSE="GPL-2"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+# libltdl doesn't have a testsuite.
+
+RDEPEND="!<sys-devel/libtool-2.4.3-r2:2"
+BDEPEND="app-arch/xz-utils"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--enable-ltdl-install \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# While the libltdl.la file is not used directly, the m4 ltdl logic
+	# keys off of its existence when searching for ltdl support. # bug #293921
+	#use static-libs || find "${D}" -name libltdl.la -delete
+}
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 8d5736b48a86..8498ddfab1d2 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,3 +1,3 @@
 DIST libmanette-0.2.6.tar.xz 43236 BLAKE2B 3b2a6979aa368117fa5d61623c26e6cca61388770ad77e759c3427fcba64d40361b1e1a4f87a2931281edbf5c2943a44c2ee3b0485ef52ddbf183a9e72344892 SHA512 e10a1b3e493a6472b0cf7562e3dfbba839ee69bb878676b2e3521363e9ff7c5df7d379923a4781366797e889f3c8985397080ae606264dc9bd3a4459bce0513c
-EBUILD libmanette-0.2.6.ebuild 998 BLAKE2B f2d31459add4ca57e40b9345c8e7e6ffcf63caaf7f2b0ae2ec2a02e46a5fd831422dd9132d09c52e20e2f2697cdcb388e388fd8a7a2ca68c635192572bf3821e SHA512 1af5a8ac658d23ba6c7d0adfd53322225ac492e26b97e11085b8b2fb1fa8047ce794ee4a09ea06fd4a5bb1547f12502ebdb07614508c4d9add369dcf6f007754
+EBUILD libmanette-0.2.6.ebuild 1010 BLAKE2B 9c30f6fcfbe794728d745d8a56c41c09db8c11998052dcd23ebd064824b638320e15d9fc85b70d0c59208036cdd41ef30a1295e2d15ce87007f579e6f16e28aa SHA512 db0e05139e241992a2935b54ab1986084d21e5759a547baca3a7c834bec9d6e16e8f5f433e7310a4ae9f14b2650829e2d9154c7780292772ac2e015b82c893fe
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libmanette/libmanette-0.2.6.ebuild b/dev-libs/libmanette/libmanette-0.2.6.ebuild
index cdf714b17c27..394a5012c527 100644
--- a/dev-libs/libmanette/libmanette-0.2.6.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.6.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
@@ -20,7 +20,8 @@ RDEPEND="
 	dev-libs/libevdev
 	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 "
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	vala? ( $(vala_depend) )
 	virtual/pkgconfig
 "
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index 603530285251..1bdd7d36729d 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -1,6 +1,6 @@
 AUX libmowgli-2.1.3-cacheline-Ensure-sysconf-var-is-defined-before-use.patch 831 BLAKE2B 552140cae8b31f796826487319286fc5d59972e2036bb33a8a2c6febcf0fc8fc8bea502a0d5aa3d00e0028534c1891e19ba92ee0c4071ba3fd8b8fd9bea5158d SHA512 8f572b47fa62918be88dc11028a916897aeda46691b5b4975f87227aad2141fe472fdcff3431d61c42cdeb8322aab1e065d8ac155f2f367f4c28a6ae97799271
 AUX libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch 531 BLAKE2B 13627cf2420f8a9f1c90010e9b40fd4234a6c6603857f463de7d469a1e2e148bdf1ac5dc620ddfc622b2fe6da64f52f9756b2e980e529a78d519bcdd9ef36cf6 SHA512 b4e35ea2cb241a48ce698f7fe094a9a55b0c901f3a9f613a308898714496c4b3b531380d81ab34651b6f24dd877341eeb1c694120d420096854daad03240bd01
 DIST libmowgli-2.1.3.tar.gz 227742 BLAKE2B 9ef5c30880644247df3c98dabbd87694d0a7c92e7de0c44a73842d4c5bbc7f19a32db24acc52b27fe5f204b1f74a5c730c64edd1e8edd23bc320e4c0dc4a554c SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533
-EBUILD libmowgli-2.1.3-r3.ebuild 995 BLAKE2B 609d1ed9e3944f844b995c4b73d47507e40ec1093a2d6c36d851f19e7556532ba57e44d9e5e01ffad1ecb5e0c04d665d77610e58a4035991e75d55039180e793 SHA512 4c490656991842bc7defbc70e2f09e35645cd167833114acb6ecb7b9df71295aca2e466b878f6bd0ed14e085da796e54388d966201fadf8346d1a1ff7b1a16ee
+EBUILD libmowgli-2.1.3-r3.ebuild 1002 BLAKE2B 5bf1fc6f0d52ea7d016109d22b9c115d9d65709738996fccee04951e55ff82e9c7be3fe6c2e90d968b9bfd08ef2177621200b2b1ab1c65981bd6ff4485ed6607 SHA512 70fe3f40ea9e3c0d834b13a68d6d6a207ca630c4a836a8fde9a0bc5357de8dc96536a6c112b1ec38e2777e8bf16e712d62c6a6235b38df20ef1d40c47b293037
 EBUILD libmowgli-9999.ebuild 544 BLAKE2B 28587dc8b9503a3826127bd7eb71e6d31d98d3a3f0be5e5113f7bcd4cafff467f1251ed096edd15baefc50f31419366bd97386b2db9ce77bd710b183e9582cff SHA512 29fe335d9aa56893845413a55838e85a9d699571dad0d4d9ecd3eb06cf6a3f7cbcb0cfa67cddd361ed6574805d33d011ea92e322a661cfac597366b02beebf16
 MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
index 3f74c221f3fe..9290dd9b018c 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ssl"
 
 RDEPEND="ssl? (
diff --git a/dev-libs/libmpack/Manifest b/dev-libs/libmpack/Manifest
index 06ba00c5b118..0934eb9733b9 100644
--- a/dev-libs/libmpack/Manifest
+++ b/dev-libs/libmpack/Manifest
@@ -1,3 +1,3 @@
 DIST libmpack-1.0.5.tar.gz 32966 BLAKE2B 8ad01de11c740c3efc7b42046b89f7691dd32d228e126485bc49224e54789e7f12a611982c0fd9d2bbe8b06d1ce2df1ceea1b302e139e30d0a8c31f251129166 SHA512 6e30edafcacfb580b410bc6749ed7fe8f18b3be0cb98959339853e77bc3ec0cda6df08a0f1f22768cfc773458a2ea6bcef4f0421eea55cf56c58981d13711a04
-EBUILD libmpack-1.0.5.ebuild 1320 BLAKE2B e97ffd6f0577790448f2e13fd534f090b644f1b67321373095377326a42a51f8b8d8cd875aa5d659cf742647fd1287d170c95ef6ffb5e49e6c4ab0d71874d29f SHA512 19c0158d623da72c4346dabe22268a97d80f109b740a5614ea2e3b155ed871ebe97032d2bd47a68b9a1787e22825b03600f9de3cf63e8026d5fb1a32f719b65d
+EBUILD libmpack-1.0.5-r2.ebuild 1298 BLAKE2B 105ad8baeabbc915a33cbbc2d2a62aa6e37b422f969533ca38293bf9299ad67d3b29be8ef20190ee692d56357c67d111a7b5ab0d989f74bf13bc7bb69ed8c6ca SHA512 a3395fa0d99cf4913040c0318e28115e8ade54fa44cdc76fcddc173744b054f646d0680fdb3a2f3e2ce46a44526787b5868c02b5552544dd2f8a9aed1c4cd46e
 MISC metadata.xml 333 BLAKE2B f3e54e3a241a85adad55693f7dd3cc47cc646d1432b4281c264c849fb2a2bfc050aee53f5ae766063335b72c3ca91ed9054bac758d82c969acb61913f7282940 SHA512 aa83f4113099ecf8b749a070014b9d9c09fc1c0d4836f2cf621b2966088cf3ee73e26ab4f365063713db353671ad5937f98ffe4c87762c6e196cd57c8eb595ea
diff --git a/dev-libs/libmpack/libmpack-1.0.5.ebuild b/dev-libs/libmpack/libmpack-1.0.5-r2.ebuild
index 3b35596600f3..b0bcd1ed763a 100644
--- a/dev-libs/libmpack/libmpack-1.0.5.ebuild
+++ b/dev-libs/libmpack/libmpack-1.0.5-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -13,10 +13,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
 src_prepare() {
 	default
 
@@ -30,7 +26,7 @@ src_prepare() {
 
 src_compile() {
 	local myemakeargs=(
-		"PREFIX=/usr"
+		"PREFIX=${EPREFIX}/usr"
 		"CC=$(tc-getCC)"
 		"config=release"
 		"LIBDIR=/usr/$(get_libdir)"
@@ -45,7 +41,7 @@ src_test() {
 
 src_install() {
 	local myemakeargs=(
-		"PREFIX=/usr"
+		"PREFIX=${EPREFIX}/usr"
 		"DESTDIR=${ED}"
 		"LIBDIR=/usr/$(get_libdir)"
 		"XLDFLAGS=-shared"
diff --git a/dev-libs/libnest2d/Manifest b/dev-libs/libnest2d/Manifest
index 5b99a09c4899..fdf2b625022e 100644
--- a/dev-libs/libnest2d/Manifest
+++ b/dev-libs/libnest2d/Manifest
@@ -3,5 +3,5 @@ AUX libnest2d-0.4-add-soversion-to-shared-library.patch 901 BLAKE2B 32d77c3c0705
 AUX libnest2d-0.4-fix-cpp-version.patch 205 BLAKE2B 3fb0503ec974b00af5d9f48a87be245bb1ed560034bee1ac6ee045074762e4d51a903ece3a15969a3f5d50ddd8c0d3b771cff97196bf25c056058b8cb4edad44 SHA512 c05cdf4fa075b16c694fd7279e25d4f9533f339318650db55d486528def6c697529a51135eafa7bb2a2de07bc8d7bbd520565b356316c135d3814484bfadd855
 AUX libnest2d-0.4-gnu-install-dirs.patch 812 BLAKE2B 98072c6fd6547ed138a23a8aa0d48df17d588b773d7ef16ac382da18fa1328c975c843d897829db4a1d043b4845a453ab86cd5d2d9686444422e651c996bee35 SHA512 4f0785271dd62d241ff38954daa77603121ae0f434fdd1644823caecdcc794202f11608527ed27f4d63815dc5ff435aefb98cbbbba79cdce6ed0ce2f2805fbb8
 DIST libnest2d-0.4.tar.gz 365065 BLAKE2B 74a4aef18be22d24e4e73288dd3e330b2f5baa3b2c705683c22767dfb0394a7b332bad957321f57ec7eaaf4740cff9ca1ed86f9d552be65df1b2af76ceba61e9 SHA512 fadce18986b844eed13a581f84055df909a17407a0980deb6c7c24248a969a537a8840650bcfc673e61973810ce9a008acb599e3b8e00c9bff6b566ca41cd62c
-EBUILD libnest2d-0.4-r2.ebuild 1072 BLAKE2B e11178120bf9d91b67fa81079be0b0f697e9a834a3c8488d926003ec741ce58413279b6633b6518571e8c6239f0d36ebfabaabc323014ca21827a5eab0938fe8 SHA512 3348f9019b95f7537ec4aa38e8620ff0baff53c6603159ba63c21f3741eda445800738ecee855500245672b1e14ea503a9ece140bd7589e40c2f85f70996c362
+EBUILD libnest2d-0.4-r2.ebuild 1071 BLAKE2B 0b2678368bd021ab5f0d7ebcff8e605b1c2f0d913c6f3e26962898e64d3763c6eab2d6821722270b0fc5516c13c447467ad1a67b5a84a6c9de9e96c132c9829d SHA512 f755562616e955699e38023a9f653bc0e4853b21f4b552722bc7126c6d70a01e37ddbe7a556d986d324373ad24e3a2b511a8300a6e98afe03e30bf859b7ed066
 MISC metadata.xml 1407 BLAKE2B d22e24bac0a2033517e4f4cf6709d9692e64d490c83b55bc600aae433d2c0f59b208cefe4e7400e4a2f7b328968c3fe5a0e0f3a1d0a9149cd3c868d97d31c94e SHA512 74046f0c81b509ce5b091b66c975afd87ec5c3982ca15febc4b0501170d820ea01d393bdd800b79b2ab6faf3d2d278f72dff079fefd26b1d7747514f0ca6adad
diff --git a/dev-libs/libnest2d/libnest2d-0.4-r2.ebuild b/dev-libs/libnest2d/libnest2d-0.4-r2.ebuild
index 88a93621c9d5..a70f129172c3 100644
--- a/dev-libs/libnest2d/libnest2d-0.4-r2.ebuild
+++ b/dev-libs/libnest2d/libnest2d-0.4-r2.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tamasmeszaros/libnest2d/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="LGPL-3"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 IUSE="examples static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 7a628b4cafb9..aa310a34f5ee 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,8 +1,8 @@
 AUX liborcus-0.15.4-gcc11.patch 1874 BLAKE2B b01e145fc9204e1504e34959c0c1c97101eed287e7291734e32e81a1e219a3bbcb6487ad7cc8c248019feccbebc94e03e3b3f7346c38074c9f284a159eb1d55e SHA512 61cd9afe40f6a3da6fc1177627fb17716286d48168d282fc90de3729f46bcd4cf22cb4fa9ed2962b59806d58d0569365f80b633e74225257ff9beb5eab01ad7a
 AUX liborcus-0.17.0-test-fix.patch 1691 BLAKE2B eff681313577d7964eb9c58bf9e2e68951ea6430303b81cefc26ef1e63337188f415b4a5f2b44cbe44111776c99ade992aa40ca6692e126608a9d15bd89fb44b SHA512 fb46233985a69fc9b5991efddf9e855217b4641eb558aa1b5df7bed4d1639e702500b03ce8526cdcee9cd22f139b4efabef18aa36367f840754aee49b3ec9f66
 DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739
-DIST liborcus-0.17.0.tar.xz 1826696 BLAKE2B 4cab8696f698510de6c995aa6a3e59a8407297d6a60bac89ca7ffa1f74576de555c69a38de97eac63e2aed1817a3377ec7e15b1da7b5c01b49d049092d8756ff SHA512 1ac24f3c10973d0e0f6e3db7982391434631ec998ae07bb011fa8e000e48ca430c07a0c2588871a93b6d9bf7a19e30d4f05d34aef699dfce1f59a4556c7727e8
+DIST liborcus-0.17.2.tar.xz 1839188 BLAKE2B d274e3af71df16866e305403d63d3978613915753412ac9de19d7de7802930c3886d8653d6d48a8d9a971dc0ee284f8f83af8dc07850b5f28fcdab2815b6d9b2 SHA512 8ad8db46c23673260057aff555286d95ebfeff0a027bdeae24f11f8aa12456284f7f4446edddb91936b3011eb1227cfe1618ab3c4d909f8356c8c151f5739d79
 EBUILD liborcus-0.16.1.ebuild 1477 BLAKE2B af207820355c3f6839538034fd406335d1cf2ac1e426ceb4aac19baadd953e2ffc45ccff7c965779bd21b22aa7e0a5a235ce0505ac7a59dcdf5c55775a146f62 SHA512 cb189f615cf0c5f040f5cefbc832c4ca3322de32015907454d479e9c1e60048f8c1db912a74ef0e2b6e003ba6645936c73b5b4338181fd375328dbabba934117
-EBUILD liborcus-0.17.0.ebuild 1448 BLAKE2B fb6c7dec3e460f1d8f3963541221fcf81a810bee065339b7c584c5e294b7554e44190d55f55610012a2425d294678c1bbc5d7aaf2d5d378a4e8aa3d59e983e01 SHA512 d5c208118bacfbe05bf501dfc9bfcba1da11f9a01bba26e13d75669d84096f1cac298c42671a9f66aaeaabe81967fcc46daf4711293a1ce3123e5aa24f719b76
-EBUILD liborcus-9999.ebuild 1306 BLAKE2B 374e57ba2e812f5b4d5851ddde95e3a6eda4e751401b2ff0aa8ccc3262771066a2f1ae8c3ae00ef4d2e112e520fe860e99e72b7c0e026cb1af701affc22c195a SHA512 de85faa06b439c8c50432749f2f43b903eb87748c1324acc28bcef9787d69a1848e159f2d3ebfa50fee9a10ce549962dda8a722348ed3e5b5ad307b55fc95254
+EBUILD liborcus-0.17.2.ebuild 1458 BLAKE2B 86c55feee736e9fc96aab3ec1081334831dd4e9dd763656dd17261d46c6509cc8f0e6ec280d89da38aedd0390ce0d28e9f87c3f92e6c29b571df07fd0fc859a4 SHA512 f4c01b9aafe21079858a96ca664ea71dc14421166f95d0d5679b136ea476addb83835b41a94f3bd034fdc3183c817bf01184e1353ddeb9eb7b05e68d4bd94e02
+EBUILD liborcus-9999.ebuild 1449 BLAKE2B c993233e271bb4cfc885bcae0bdf8422267e949ccf0bc3f411edaa2a0773c1c8e8980387710c87c3d1605a86a60e8011df471cf04574e74c14a59da9cf82f6ae SHA512 89e0d1acb0be5ab01e179f43f9dae77ce1f3a161f7e28adec10961ceda4201eefb5e1ea9c6bb303f31fdc2efecff381f2a081cb192ec43f938b1d169a01d3b02
 MISC metadata.xml 557 BLAKE2B b8dd01b0df50a1c6dafedc40f4cebbbd7851ee67fd1ac94f4c8107f052db8721ce12b0ae486e42f459e0b5d337525edc0359e9e94b8da1261e3521c11f66ef64 SHA512 2eca4f5fd25121bdb3ecb9470b66c2c5373ab266c53bf7af55b3f46245ad6973f3cd65ff80c6d1c33cb738136cddf22489b61dc1863701225842ca9dfa4e2c9d
diff --git a/dev-libs/liborcus/liborcus-0.17.0.ebuild b/dev-libs/liborcus/liborcus-0.17.2.ebuild
index f8f315cf8e63..fe61595a66fa 100644
--- a/dev-libs/liborcus/liborcus-0.17.0.ebuild
+++ b/dev-libs/liborcus/liborcus-0.17.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit autotools python-single-r1
 
@@ -11,7 +11,7 @@ DESCRIPTION="Standalone file import filter library for spreadsheet documents"
 HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
 
 if [[ ${PV} == *9999* ]]; then
-	MDDS_SLOT="1/9999"
+	MDDS_SLOT="1/2.0"
 	EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
 	inherit git-r3
 else
@@ -44,7 +44,7 @@ pkg_setup() {
 
 src_prepare() {
 	# bug 713586
-	use test && eapply "${FILESDIR}/${P}-test-fix.patch"
+	use test && eapply "${FILESDIR}/${PN}-0.17.0-test-fix.patch"
 
 	default
 	eautoreconf
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index b923d9595f82..24525403dd48 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit autotools python-single-r1
 
@@ -11,26 +11,28 @@ DESCRIPTION="Standalone file import filter library for spreadsheet documents"
 HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
 
 if [[ ${PV} == *9999* ]]; then
-	MDDS_SLOT="1/9999"
+	MDDS_SLOT="1/2.0"
 	EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
 	inherit git-r3
 else
-	MDDS_SLOT="1/1.5"
+	MDDS_SLOT="1/2.0"
 	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	# Unkeyworded while libreoffice has no release making use of this slot
+	# KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0/0.17" # based on SONAME of liborcus.so
-IUSE="python +spreadsheet-model tools"
+IUSE="python +spreadsheet-model test tools"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/boost:=[zlib(+)]
 	sys-libs/zlib
 	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( dev-libs/libixion:${SLOT} )
+	spreadsheet-model? ( dev-libs/libixion:0/0.17 )
 "
 DEPEND="${RDEPEND}
 	dev-util/mdds:${MDDS_SLOT}
@@ -41,6 +43,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# bug 713586
+	use test && eapply "${FILESDIR}/${P}-test-fix.patch"
+
 	default
 	eautoreconf
 }
@@ -59,5 +64,4 @@ src_configure() {
 src_install() {
 	default
 	find "${D}" -name '*.la' -type f -delete || die
-	use python && python_optimize
 }
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index 742d83c92aaf..0302110e1a6b 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -2,5 +2,5 @@ AUX libowfat-0.32-ar.patch 1564 BLAKE2B 43477182d5ea37327376511ff1f6a4db9ac117a1
 AUX libowfat-0.32-gcc10.patch 633 BLAKE2B fdafa991694156b4c9bd93a6ad1a77b8673c9b176735da0bf525faf2549336121e4ca6a17dd7a35e58292ed6fc66ea176656b7cb97884f1fff3400194de3ef00 SHA512 ba3eef982f8345a96b2612bfbb8a97dc6477b21a58a35cda513ecdcd346b0cbf752574d565003f1d6887cda4467d8efc5777aa4d80fd50f731d35387028cda84
 DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
 EBUILD libowfat-0.32-r1.ebuild 1039 BLAKE2B 534907ee194eff327e07f903df0f5dc5728572b013fca29e583aa3df3e852db91c3145f2f2d604b0017963d8423a0c946c2eaeff93da0785f486da939e055047 SHA512 71e1d1a579943fe2b1d53c22ed23c579745ab3d4d058033d7a789563ac0ead400039232472a116ae9abb7ee83df3421d7a43dadbca187567bd8fdac2157b3e86
-EBUILD libowfat-0.32-r5.ebuild 1571 BLAKE2B a93b47796265af32d5b88711c11275625ba42ba5e038f95f8fae5e991c4907ea499d1bb24a9a76074e847c89e0012e46ec3be7184374739b9f927d4c65eca6fb SHA512 cd392d2b30c05dc86585c85d565698ed7aa721fde18bb19573f1e03a91f7f34b71aa2a82bf7f43b9847e59363b3e323257ef527cc0650e6ea5a20b2240e8d6b1
+EBUILD libowfat-0.32-r5.ebuild 1567 BLAKE2B 48b00e2eee504790d5700a00c06359f1f75e733ab3cc701a00c80f0d9385e6dcba892df641316405f40fe605658979d08d7d1969b86f4774e6a3525ec4bfef07 SHA512 7c6fc464cbbb41f4aa374553bc2dc14d8dbe3e35efe9c7ebc3b164b50e3a0c9846081145e826220b39c85476c45d68703e92cd1881e6aa6aa4de0d651050eb56
 MISC metadata.xml 480 BLAKE2B 49c7453e40ab25a232a9c3c107e81d96a1a320fc550ae0855deccdba949747c5eb42119302e21abefe2233308f43a65221e1ce57dd60484790e0224ef64e011f SHA512 54c8b37a53ee832a917721328b30277847e4e8c8562c186edef8f0c28f3b50fb9fbf5745617d051b92c0f99f9a62f81a510ee256d9107a2149a00bfc807356d8
diff --git a/dev-libs/libowfat/libowfat-0.32-r5.ebuild b/dev-libs/libowfat/libowfat-0.32-r5.ebuild
index c85792782f66..6dbdd3e205c5 100644
--- a/dev-libs/libowfat/libowfat-0.32-r5.ebuild
+++ b/dev-libs/libowfat/libowfat-0.32-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.fefe.de/libowfat/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 hppa sparc x86"
 IUSE="diet"
 
 RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 28cc485620c6..a583e7a79772 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,4 @@
 AUX 1.26.0-lua.patch 3695 BLAKE2B 16f370ea0707743db9a28cd511f6b9521d285bb37eb3a49d916fcce84965c84490253c1a30e729b21eb528b3a6397cab9bb372b9afeb22bed05e278048734bc4 SHA512 d8939b9a21b838db8e34ddfba7f54f17e88c4387cc3baa15f4df6386180677b419bb9989cecd8e0757442a45bc04f83bef06df5a8df86c17f6812a41044a7eb7
 DIST libpeas-1.30.0.tar.xz 193108 BLAKE2B 071e24530934605a6364816165d8f47ac9c94887e80eda9175b163d9af64b2624d42df75c7697220e888f2f9150c6e121bd1dc2716de5bcf0d392722938de945 SHA512 10ebcc61c8aa42b5f6892a74d5e02a52dbc8fe4c35280d78f41adc915dd9c08e9756608f8cbdbaf3d63c44074f0b9e9e531dd077ba201b416acfdcfb94b4bc42
-EBUILD libpeas-1.30.0.ebuild 1969 BLAKE2B 70cdf310399ca03c7ad52c01678b5627cf669eec971175c5842c502bc4561ca42997eed6581182ae8ab474b1fd8b86ab179e78f751842b77a8dacea64cb302ce SHA512 9524e9a8904337dd4a15aae436da9ab184265dcdcb8ab5595da19d305bf8a1a0eda5820873e88cb4f76a325d9c2317b711c272f3ac2790ad793eec97b2dcd9de
+EBUILD libpeas-1.30.0.ebuild 1968 BLAKE2B 893e1a059f197ecf3b2bcd71a34a9ec430098e15f49cca5b7119a699aecb7b7014be85cc1ce2fab4c5973c217ff5730028e29383f005e18039ea2f79c784b927 SHA512 e09f5a8698f520fd5ac39898460d92461e5ad95b1cd25b858d4f02207d870404f998dfd1abb5991babe2eb5284bcc21127dea5f88fd877462f48d9a25891bdd3
 MISC metadata.xml 416 BLAKE2B 9383d1583b61f2218efb3b8c7bf6855e30ab8ee3f4e0829b78f17832af533a6839e713c702e0dbdcdeb24a516badb446b935e0ee1abc112c2342c2f0ce321d81 SHA512 3fb271973b7b510983e84c2d0188688f04a1f6a1a80aabc15dcbdb14276608ed59ee3ea1f77feade9b08785651ea4f85e400d928a267651c40f0e490c175da62
diff --git a/dev-libs/libpeas/libpeas-1.30.0.ebuild b/dev-libs/libpeas/libpeas-1.30.0.ebuild
index bfb4cc876dbf..a760f2697bdb 100644
--- a/dev-libs/libpeas/libpeas-1.30.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="glade +gtk gtk-doc lua +python vala"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index a7408551f865..aa04760a1301 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -1,5 +1,5 @@
 DIST libpipeline-1.5.4.tar.gz 1040952 BLAKE2B 1e8fa839df90d61add79c704856d606599800f1887e056430f0fb0bd61e511c2a0bb98f2f3766f793aa648b404dfc054277d740ee5dd8a27bec740e7a23e0d13 SHA512 98d630553843176c9f6723e4df1fd844df2e71c402ef869027fb5ebe327eb9d55605a11cc159725f191ff3ef2a3a0b5eeff2d3cb1146b0fef5970923b01e433d
 DIST libpipeline-1.5.5.tar.gz 956089 BLAKE2B bfa8ed4c96c4dc7cb8360cac201835276dfe39429c993e614d8f396ad9c3175679f5a1ea205a9bf2f8738f8d3066cb50d09a9a5b5fd3d1219ba20adbb40b0e8b SHA512 adb228325c1f11e9f3566f2fc63541a90c88fe24656fc74ed0294d1eb3b80073bf4741fe7c289f53b340702145b11637d37682e3036dce41ec0fe45dcc6d62c5
 EBUILD libpipeline-1.5.4.ebuild 692 BLAKE2B d51a87036526d3aafd54d2e3319bc993d1a4ce2e3d947f7d44243a9e15cb7b85fd883c89ecce15c38c90ba6acbc5e1ab9c4d24575be40f231b34b7784362f79c SHA512 850349bce4001ec72a32af456f34e24a8a7ea30ddf5e3f9b02a397d0b035356fd91999874376238c6e3f67bb05d8914492338c97d703aece5895dbe5267a1979
-EBUILD libpipeline-1.5.5.ebuild 700 BLAKE2B ba5b73851c9e050a36e5fe0bc35732243c4b1b809aaac7358d131cdc17e32d827c2f9862101a26c9a070a1b969a5a7fa7a289f0183e287616944bcc39c700ea7 SHA512 58fc4111521cc8e609008359e9148999602d50b828a5a72f01c3ad96e79a48e7301c91585e3b22fa07fd0bf20ca75cbe2f8d64563ce0bfe310b207ec31bfac43
+EBUILD libpipeline-1.5.5.ebuild 692 BLAKE2B 22b40ee35b3d5cb46b2f209741786789b049e7b2346d3cb5e41052cd14b21e1bc41fa321f35371f516dce77a48d73739fc352db0a0cfaa3ad4b0edfc335e6004 SHA512 11fed81eb842d65bc15fc868bba23e7f98ed99fac1dc3eaf4bd4d27f034aea8a0cb6c02671c6183d440333e459f41634132f909885f965f2822539c4d91df77f
 MISC metadata.xml 343 BLAKE2B 4632f82a8ffc94214282c093d731958c3f41439d1c8448ae6ab36713a3431299fa028bca9f95849e856de529a3220f18467f9454aa0feb894d49e366fee479b2 SHA512 151480a72adb05e78fa0be5e4dd3ccab73dd056135f3264f7916affac51d00af84803040b780805cda665a4d02c47dcdbe1790ea8a555653c7c8f38f6c988f29
diff --git a/dev-libs/libpipeline/libpipeline-1.5.5.ebuild b/dev-libs/libpipeline/libpipeline-1.5.5.ebuild
index 760fe72bfd35..4e2936431feb 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.5.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libplatform/Manifest b/dev-libs/libplatform/Manifest
index 5feb9d059759..ad3a29509815 100644
--- a/dev-libs/libplatform/Manifest
+++ b/dev-libs/libplatform/Manifest
@@ -1,4 +1,5 @@
 DIST libplatform-2.1.0.1.tar.gz 75257 BLAKE2B 99887e7d8b1b51578a5b84cdb63c71caf75cce1674ab2c7c658bb9bbf67b69a23f4facdef8d4a4a9e2f7c0101886a5350fd92708cde3aa3010589c7055bf6a50 SHA512 76e6f1ac64b61e4def7d99965708d0f05698379e0f3e846317174f0bc12a9654b3341afc84bd8a3a70f101ecab6c692dea96b57d7e000dfabf6cedee2b8dcd8a
 EBUILD libplatform-2.1.0.1-r1.ebuild 656 BLAKE2B c3bdbc205079149539e6ed13cd370f028382bc261095cbd728e87e6f580a6df9e5c37916c7cbf3a7d0bf6ded83c775e4ab123deaee7815b6e922b02697f6e43c SHA512 2716924e8c1c7b50f8772e4c5b40180f181d7b05eca461e911730b32c576cfbcd81e6c98065ed8282a2582c5c502b062d7594a995efe000097235c7d6f3214bc
-EBUILD libplatform-9999.ebuild 652 BLAKE2B 917369a687338cc365c74fc57511e5605457a95772f9a8a6b7ac4ca59e36dda3fd53d097470a0f5672052bb09ff70b2537e0f51cb9c8537379eaa398f1937773 SHA512 fcda25e97e51b1e83df9459db7f2c61fba84b3ec732f9ebd746346dd623752de1916549dcad46a13ea77175019ba2dea85ca28e8e52f68f1df8e88db21f96f09
+EBUILD libplatform-2.1.0.1-r2.ebuild 653 BLAKE2B 9f204460b6c31930f42e8373816bbb1054b42eca150fdfd21902e77f513f6806cd0d2745394ea6429f62748d9c56d3f22d1709b33238f25816361fc8aa987bc6 SHA512 d85ef9cacf3a5a2546a2cdb2623ad70837df29e5da344db228776cf1bb68358655ef09c06e27fe474ec21046937ebd90fedca7c9c6a0f84a5a2cbee7fc60d474
+EBUILD libplatform-9999.ebuild 653 BLAKE2B 9f204460b6c31930f42e8373816bbb1054b42eca150fdfd21902e77f513f6806cd0d2745394ea6429f62748d9c56d3f22d1709b33238f25816361fc8aa987bc6 SHA512 d85ef9cacf3a5a2546a2cdb2623ad70837df29e5da344db228776cf1bb68358655ef09c06e27fe474ec21046937ebd90fedca7c9c6a0f84a5a2cbee7fc60d474
 MISC metadata.xml 258 BLAKE2B b102146651dbe13e0ab75b8127588c3be7c5432bb6a367be30d33f57f5841ce4f1e9078006c4af258e94f4e6c1c93bee9c66e772baac634317f7d273ab8519c5 SHA512 b06d9ff5f3d62f9a810aa2ee992283f61f031b9794a3e2315c8b7a0c437b29662e6ef100c532603f3f6817296bddbd13c02c0b2dc2b197e03b2803f7d6d02852
diff --git a/dev-libs/libplatform/libplatform-2.1.0.1-r2.ebuild b/dev-libs/libplatform/libplatform-2.1.0.1-r2.ebuild
new file mode 100644
index 000000000000..ed44eae38b02
--- /dev/null
+++ b/dev-libs/libplatform/libplatform-2.1.0.1-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="platform"
+MY_PN_PREFIX="p8"
+
+DESCRIPTION="Platform support library used by libCEC and binary add-ons for Kodi"
+HOMEPAGE="https://github.com/Pulse-Eight/platform"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/Pulse-Eight/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Pulse-Eight/${MY_PN}/archive/${MY_PN_PREFIX}-${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${MY_PN_PREFIX}-${MY_PN}-${PV}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
diff --git a/dev-libs/libplatform/libplatform-9999.ebuild b/dev-libs/libplatform/libplatform-9999.ebuild
index 4ef9c153d093..ed44eae38b02 100644
--- a/dev-libs/libplatform/libplatform-9999.ebuild
+++ b/dev-libs/libplatform/libplatform-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 MY_PN="platform"
 MY_PN_PREFIX="p8"
@@ -21,5 +21,5 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/Pulse-Eight/${MY_PN}/archive/${MY_PN_PREFIX}-${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${MY_PN_PREFIX}-${MY_PN}-${PV}"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
diff --git a/dev-libs/libptytty/Manifest b/dev-libs/libptytty/Manifest
index cd57bd77e344..9c0c3a4292a7 100644
--- a/dev-libs/libptytty/Manifest
+++ b/dev-libs/libptytty/Manifest
@@ -1,4 +1,4 @@
 AUX libptytty-2.0-rundir.patch 183 BLAKE2B 51316869ccd9b490b3087ac1a825d7a7e570a79fe7e5758e76be756b8135a0af2b4a518baefd19f8c0e8f71b95488035f28b6bab9b42eae473f644ca2f8bff83 SHA512 266fd3df8aa88894f832ecff15e88e4f08cc2b188ce585a779b58d19bcdac83b8e7ea921cd96226ea74c402a4e7fc873a7764029af72a81c5ddea7efd307eb51
 DIST libptytty-2.0.tar.gz 45673 BLAKE2B 81112267157c1ba785052b2e1667c4af251991816005375d44efd1c4d9c58cc5e59324df35e556d45e46df6bceccc654d71e6c264dae5a15ea100cc9db63c5a6 SHA512 9cca5fddbcc4025c2bbe043e3367ac902d0024a34301258dafcf0de70935c055279d88227168d112d0e4c0dc37f1f49e1ea587bd6bddf0b9d92400657bc7be08
-EBUILD libptytty-2.0.ebuild 712 BLAKE2B b04ed70a06e059fc457f4df03092a23776b726a1296505f192bbaea01520d9e02e8f51207d4a96d3f2ddd4777f3addb0a3a27ccb572e583dc2d1e6db220a7786 SHA512 e9b714b5ad2ce0ea447701ac57caf20d24c89cc9ba67677a86827e0701ad64652cc2e65cec62ed5256b365d89af4b6165ac1856823a7aec2551f10dff308753b
+EBUILD libptytty-2.0.ebuild 719 BLAKE2B 99f5bf213e3966e290304f2cd88036ae586eac44e0dbec0ad9d0dacdc8452d0843f46404ac1020f20826e0bc2c703ef5ef32e9c76b7a2816801bbc30c491a1de SHA512 0ee8c77db0d81480bda00aab55cac4024866bdde1c24f65760fbdbe9c2bbce1c97d299aa990f349af47b2e5db789608e9aa0509aecaee1725d13f5d7e04ed48c
 MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd
diff --git a/dev-libs/libptytty/libptytty-2.0.ebuild b/dev-libs/libptytty/libptytty-2.0.ebuild
index 84050835b54c..cfa4b8a6b1fc 100644
--- a/dev-libs/libptytty/libptytty-2.0.ebuild
+++ b/dev-libs/libptytty/libptytty-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dist.schmorp.de/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0-rundir.patch
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index 4dcc758e1e39..7b8a39e26461 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1,6 +1,6 @@
 AUX ratbagd.init 336 BLAKE2B c6f2ef095cd7d929c3097a18e912ae4b3615bd0ebbdfdaa9f4151b312614c016af2f3581c2fbb2853472cb70ce47d5f26f254772fb9f3dabba2ce93626b672b7 SHA512 3908b3481b49bcebc84e3023ff911dcbc1773e4322356def0067ed4aa426184cf43e12de702e98210157d17c2806d57c1cb4bc79ddb0b8660036a6fe3974607e
 DIST libratbag-0.15.tar.gz 249492 BLAKE2B 0f5b35800cb9f82cb892dacd5e3b041843cf5513507ee4882ec5b3f8c8aec8a24594736f2eb1c8e373a0ee38ace1e6328cbd4816d6e5b2cd1f2154ebd803a5fa SHA512 add47a6b3d771de77c6307e128a549f5295e216059b5a2375aa6b2b6bbebcf9a93d7bf148181b3f39f855976e9b6f57072dd9198d07828bebe85409f4ad994aa
 DIST libratbag-0.16.tar.gz 253080 BLAKE2B ede56838c822519b4fe4c6846f5d6d237104fc06f96fb17aa62b4c712965f00827973ebe732ee5ac9a16f101baf0b63eb445fbb97746df3b8ed24d6e085b34e1 SHA512 b3f2fee39ec85c0e08d257753241fb0e553de53eb7409a3b95f93a0fac3989a9411c53c915e72bef19bcfc5682fe9cdafaeb1f41f2718ab02766859f565415e3
-EBUILD libratbag-0.15.ebuild 1958 BLAKE2B e4bf7db7c49a78ac78abeffbf1afc38e6acdfd069db6e8812cf5e593f52d085f5d5cdfbb8f570774379ffc3cea6f6534faab6e60c339905df5588898f379e195 SHA512 76b0afa674f72cb36f08d8479735797fbdfb8cbb22f0cd22de065918e25beca60ac27886b0e8bfc40ce0a235ec3a0076fbb05cb0e2e21aa7c9c2bb477cfc381d
-EBUILD libratbag-0.16.ebuild 1958 BLAKE2B e4bf7db7c49a78ac78abeffbf1afc38e6acdfd069db6e8812cf5e593f52d085f5d5cdfbb8f570774379ffc3cea6f6534faab6e60c339905df5588898f379e195 SHA512 76b0afa674f72cb36f08d8479735797fbdfb8cbb22f0cd22de065918e25beca60ac27886b0e8bfc40ce0a235ec3a0076fbb05cb0e2e21aa7c9c2bb477cfc381d
+EBUILD libratbag-0.15.ebuild 2107 BLAKE2B 43fc8590fc94903bff93459e34ba9e182eec2186609d730908aed5fc6257667f5e72471962047c12c39bcb2fa4e635dc484f708645812a77cf934ba42d82d966 SHA512 fb893059bc1ba1fc8ada517d0983c09c6149e184228bf3854b7973306385f43a92f0adf9f95524d91048f8568b99e3d70ecb7375c60bfc049d457f7b8a7ed14a
+EBUILD libratbag-0.16.ebuild 2107 BLAKE2B 43fc8590fc94903bff93459e34ba9e182eec2186609d730908aed5fc6257667f5e72471962047c12c39bcb2fa4e635dc484f708645812a77cf934ba42d82d966 SHA512 fb893059bc1ba1fc8ada517d0983c09c6149e184228bf3854b7973306385f43a92f0adf9f95524d91048f8568b99e3d70ecb7375c60bfc049d457f7b8a7ed14a
 MISC metadata.xml 624 BLAKE2B 99e4140b689d5246ff0e169ab9acb651277154b24b1d6b57954f1639475a167d7e7e6dbed979c546968be8abdeeb81dce7f209bd3fcdee7c22d3751fb47da8d3 SHA512 ec37fe4ead6930aa2624ab6df088736e642c1d146e118b1e03e4160a2fa174d759a11dd5294097b6fb3143a1160b8cb3a9e4dc8a97dc1d11cb79c7dc926b1ccd
diff --git a/dev-libs/libratbag/libratbag-0.15.ebuild b/dev-libs/libratbag/libratbag-0.15.ebuild
index b46974b3385e..9b8dda025eb3 100644
--- a/dev-libs/libratbag/libratbag-0.15.ebuild
+++ b/dev-libs/libratbag/libratbag-0.15.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson python-single-r1 systemd udev
 
@@ -25,7 +25,12 @@ BDEPEND="
 	${PYTHON_DEPS}
 	dev-lang/swig
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
+	)
 	test? (
 		dev-libs/check
 		dev-libs/gobject-introspection
@@ -39,9 +44,11 @@ BDEPEND="
 RDEPEND="
 	${PYTHON_DEPS}
 	acct-group/plugdev
+	dev-libs/glib:2
 	dev-libs/json-glib
 	dev-libs/libevdev
-	virtual/libudev
+	dev-libs/libunistring:=
+	virtual/libudev:=
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/python-evdev[${PYTHON_USEDEP}]
diff --git a/dev-libs/libratbag/libratbag-0.16.ebuild b/dev-libs/libratbag/libratbag-0.16.ebuild
index b46974b3385e..9b8dda025eb3 100644
--- a/dev-libs/libratbag/libratbag-0.16.ebuild
+++ b/dev-libs/libratbag/libratbag-0.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit meson python-single-r1 systemd udev
 
@@ -25,7 +25,12 @@ BDEPEND="
 	${PYTHON_DEPS}
 	dev-lang/swig
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
+	)
 	test? (
 		dev-libs/check
 		dev-libs/gobject-introspection
@@ -39,9 +44,11 @@ BDEPEND="
 RDEPEND="
 	${PYTHON_DEPS}
 	acct-group/plugdev
+	dev-libs/glib:2
 	dev-libs/json-glib
 	dev-libs/libevdev
-	virtual/libudev
+	dev-libs/libunistring:=
+	virtual/libudev:=
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/python-evdev[${PYTHON_USEDEP}]
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index 3856fbfa8825..30bbd91995cf 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -1,5 +1,5 @@
-DIST libreport-2.15.2.tar.gz 1859867 BLAKE2B f890e3cb8b2a23647e4c3fb0caaf984b1b21fd32e066d04f835f8a475e317cbc75287375e0a10a01b91670d04bba1f15b1180065f7029b8d7d1c0a2fb890914b SHA512 c98003325fa70d674177c9f602a7f121815a9675701ee780ad8908ed69862f2c69be65c7483fd3f017ba299dda51ba304f0908c771c9d97cb5bba057e3a9c5dc
 DIST libreport-2.16.0.tar.gz 1901880 BLAKE2B 520ad157de02dbe5fd15b2ffcfc9b0a09587c3696b41a202f0a78b53a2d366a2991906437aa38d7c84407dcd4a788d358b9e320f70c30e602f1b903433288717 SHA512 cbb456bb63b92a255fecb87191160c2e515b4434cbaaa9404fb69f4f78421fe98c4057969f4b6b99e1b52e815d83c483bdbbe606a4bd2e34cf5268769e7bd40f
-EBUILD libreport-2.15.2.ebuild 1942 BLAKE2B fffb0d535a1c653c12ef66c4c216276dd5cbcec78f83f9f7a947d0aa645503c05b52be1b2fd1be1c181909adaf2fde992df058898d83c37edd19f68252e3eae7 SHA512 bb7477486d972a73b543444925290dea0eb5b68f1e14db85e6f7a653d5c5bc9f2c049451c3ab346712ff380d1beb936bc56a6bca302c9bf39a547aee8d44632c
+DIST libreport-2.17.1.tar.gz 1904056 BLAKE2B 3bb4bade768e585af620cdf9f0f353528f24145a157a295fed449b6064ab846757946d38db5fd607e82b784156637f02e7eb66e01ac70c170b2006f4edd950f5 SHA512 35c5031e0a361040153ea45a249613b9f2d2bb38191c6375b197cb797be153f1a4b46480dbfa5fcdd9c5c00b075f84997f6da70c3b59b8b8251fd29a7180bd9b
 EBUILD libreport-2.16.0.ebuild 1949 BLAKE2B 7b103e6feec98f7bc70478fc06f6865397c7cbeea7d2022002ef2dcc4332c996b648ca3a720af58c7d410470535331aea61146d66aa418360c1a00c73a66e9b4 SHA512 b6ba7594be9f8adc9c659ec4409f1c20716a964526d38c3aa0da99f5310b4fca9aa69e1c5b8f30081d21f1d8e130cb009b78f8f5e72813a45ffe22369a088237
+EBUILD libreport-2.17.1.ebuild 1949 BLAKE2B 7b103e6feec98f7bc70478fc06f6865397c7cbeea7d2022002ef2dcc4332c996b648ca3a720af58c7d410470535331aea61146d66aa418360c1a00c73a66e9b4 SHA512 b6ba7594be9f8adc9c659ec4409f1c20716a964526d38c3aa0da99f5310b4fca9aa69e1c5b8f30081d21f1d8e130cb009b78f8f5e72813a45ffe22369a088237
 MISC metadata.xml 240 BLAKE2B 1f4d972fe6e8f4096f8905fe5ec3f77b8689f3b0e01ac676ae4e55ce3aa66c18473cc82b5766131f155b9f4cd3fa6c541ab3bd32bfd233ff89722937105f968a SHA512 2e9f28bd0e525aa062cb098048dd176668b1ca2220e0018279ec4779eb80a2e8ad4f1ea73899aded97b7d27379e88d2f60cc80af4a6992880edf6e301b7e1090
diff --git a/dev-libs/libreport/libreport-2.15.2.ebuild b/dev-libs/libreport/libreport-2.17.1.ebuild
index debf3b612b4a..f8d64e4b1687 100644
--- a/dev-libs/libreport/libreport-2.15.2.ebuild
+++ b/dev-libs/libreport/libreport-2.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ DEPEND="${PYTHON_DEPS}
 	app-admin/augeas
 	app-arch/libarchive:0=
 	>=dev-libs/glib-2.43.4:2
-	dev-libs/satyr:0=
+	>=dev-libs/satyr-0.38:0=
 	dev-libs/json-c:=
 	dev-libs/libxml2:2
 	dev-libs/nettle:=
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index 180d96ff161b..c6cc01384cde 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,5 +1,7 @@
 DIST libretls-3.4.1.tar.gz 435404 BLAKE2B 11b828f5c058b929d1d4bc0cd3c53f17592c113f10f6bb73f8b7e672b5ab376e768e33893c4fcf5c0b447bc5cd30012c8aaaf5b639cb4962f4e0849ac3ee6cf1 SHA512 5d8b8d6cafd4b3c7e97eb417dad35a415bd69d599e9ee720f5598452a6750589b570ffa52718062d2ae3477df81b2316064577a25d2c68fa673082bb766b16ad
 DIST libretls-3.4.2.tar.gz 435457 BLAKE2B 2bfe4af4ea8d773f79b6607e7a0a2e7ae7cfae40690312e940c583bfc6de98087f328d1613e65695f46cf6ba1e11f9ef5f043185d21bcd595004f70cec6f3ef3 SHA512 0ded26558b74a00e5e05629d577c07ad9b8a8955aacbd7f97d6d1c81d4e7ccfe7c2fe0cc5bcb03fffb282cd51b8404236371d0074e39508099d1990fc3e065ba
+DIST libretls-3.5.0.tar.gz 438466 BLAKE2B dac7442bb2bd924ff516e24f82905ddb69f20f697e7ceee04477f4a15560db358bf81e5a2ff68d088f13a99c2d8cdda93bb71c5a05a5a77111d691f9a9183265 SHA512 21f60dfc3147862df8499f81b5dd3d11fa9c6e481b06e9494797cfd78313982465fdd3ef0c4ec0373a708029df0acba7919620fb13142d5afec0bbe136760249
 EBUILD libretls-3.4.1.ebuild 663 BLAKE2B aae0f351b3aa8bed9e12226fd7f323e2c58771d750e424c2caaf2cba0fd98559224e75ce84738a5c89301bf37c5a934dbbeac981cbff2188a7cbc2c4fca66893 SHA512 abb227cda09a245991959d7015bce467eac2b2ba0eb5a7f55c9ed7f40abbbeff2d3e45708233fb73742dadbda507c0c2a4c605d2b0e26ff6ea645353444c32ed
 EBUILD libretls-3.4.2.ebuild 669 BLAKE2B 21ee067e2e922e487172c93c2abbfc8b076549125c4afe97c0ac97a6898a023d50e57273a12fd6de7f468f44f6d8ba1c4c3f1dd463fb6652aa396ee5209f3f4f SHA512 30e790b4c21a4dd580762971f82efc9d893a8c0de126d1c8966c68af4b9869dd4c09b1e12a695ccdf50ed5044988a2fbc1e17f371ec0f65830d9064f5372bcea
+EBUILD libretls-3.5.0.ebuild 669 BLAKE2B 21ee067e2e922e487172c93c2abbfc8b076549125c4afe97c0ac97a6898a023d50e57273a12fd6de7f468f44f6d8ba1c4c3f1dd463fb6652aa396ee5209f3f4f SHA512 30e790b4c21a4dd580762971f82efc9d893a8c0de126d1c8966c68af4b9869dd4c09b1e12a695ccdf50ed5044988a2fbc1e17f371ec0f65830d9064f5372bcea
 MISC metadata.xml 361 BLAKE2B 9f05ddd1ac3e1a634962c9c800c3bdf60554488c61dff9b215866b24e0b2472d7c0873f0fd6bacec2abbab0e79faca728a4b22e34633c3dde64995b05b86db61 SHA512 c7b186da31da21b4ad5c5662325cb2757e3ee8d7cfd84d75a49b07aebd4dc882cb9b0e16ffce99a8ae2409a53dd750dfb5ec6eff0f9da9f4afee013f102ef688
diff --git a/dev-libs/libretls/libretls-3.5.0.ebuild b/dev-libs/libretls/libretls-3.5.0.ebuild
new file mode 100644
index 000000000000..777d4586d76b
--- /dev/null
+++ b/dev-libs/libretls/libretls-3.5.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Port of libtls from LibreSSL to OpenSSL"
+HOMEPAGE="https://git.causal.agency/libretls/about/"
+SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/22"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DEPEND="dev-libs/openssl:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index cf03f7fc161f..dfccbfdc5d37 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,4 +1,8 @@
 AUX libsavitar-4.7.0-use-system-pugixml.patch 162 BLAKE2B fa5f648f8288cf954cd2e1b0583d3e7ab7d55d288101576580119de6de1b3ffbe1e9037d6ee04731e34c27a3a0432f10f006ce387bee838d8acda64ebaa4ca73 SHA512 c32caa0c0a9d422cfc367b617d6ac6dd14e4c7104533377d46043734ed461a233ed436c0ae197ba78e9b02e6b3b1942b56debc11f68c17571181db18b5950f72
+DIST libsavitar-4.12.1.tar.gz 100730 BLAKE2B cb9dd3ed6802e88235769f70092dbd50113d107b3d2ec17851120338ad6b6ee809c1243f406ee0c96358e5e618d883640e2c3ff9c7f3b41fa6e3a4993939c044 SHA512 c848730cca44b942cd0aba343880a68b23f1bfe95b3348cf1d9d490d9a99be3db9d1940ae473a74ad695823404fab86b728327783c8cc3cfb04ebff8cc6a1b3c
+DIST libsavitar-4.13.0.tar.gz 100723 BLAKE2B d631c572e20fcf92cb2053959fad7c806b18981eaad7a0ad1efb52870a7f5874459d4012a7583be8bcdd7cbfad863dea9c4f8c13579269db3ea3a3cf92383b4f SHA512 a446131c0bbcc34e55c093032af823b9750797f06297bea9fd4d64838e793811e71679a1f6ae99be9fc9382a23e8763140147c7a6eea0a310f6f2d40b53be3bf
 DIST libsavitar-4.9.1.tar.gz 100496 BLAKE2B 7700f110522298905c1e4cf42529e83c06c337ac826007db2fca8abf462abcb8dd9245d2d81773ba3e6663d9afa093685bf955a1cc7e27d48fc904913e56d62f SHA512 2b291a17603922a4a06292282392015cf381a813b5f9a374e8cb35da6c0701ead72cbf76f17e763793225885a4209b49e73114f462b40d6999f95db6de887a44
+EBUILD libsavitar-4.12.1.ebuild 1750 BLAKE2B 00c423703ff17155641b8fa101dc1d557b26e44c2afbd568b929705681d65008b56898558e7538fe1e662200d39281f924de0d1637f4ed3d04a947ffcb237703 SHA512 44c940c74668938c1a49177fc2a12ef2eafb577af8a43e0b5af4fb7b2ffcc25293f2ed139892ad5762ddfd9822f810e4c51827806959cef150253ab6d25f148a
+EBUILD libsavitar-4.13.0.ebuild 1751 BLAKE2B 8c8324f39f9abbbe2ec5f53038b95e66b08da3f1ba38d4d065918153833e0f7883891a32adc4bd90536fdb47eab8effc1e3c27f22e93f3c1dc723ed4a430255f SHA512 db217921582a2fc6b0a565a6d2e4f7053af62682d1c3608c6d4a393577f175c8fc7d043d48101c9d51bd3865e134489fe78d339b338f82f72858ce447057947b
 EBUILD libsavitar-4.9.1.ebuild 1751 BLAKE2B 40e8748df6934c20fc4843a8194461e49242fe6b344fa40a1b31dfd64ab84263612bc669039fdc926e48c7f6150916b803a5c9f783531b71f9d794d0209f6e18 SHA512 11fe811ee9165ed118957ed7576b7af8b2c7a070e0587327f110d00657d6a88680fc357059e7078a57494fefdcc066f43c5ccd243a9899bb53aa4471f65bb36d
 MISC metadata.xml 975 BLAKE2B 0d0faa17d5fad674babdfcbb4da1366f0a25eb8e28dfd091c006da263b5915b1909d2843cf9eb2cd8ae6205c56bd9b7fd3ac0d39f7594217c69f9b3cb727bc66 SHA512 91548b2cd344eb43f8b9e2e7596d86b9eec8c856c60dd5b41710d53da1e224d7c2c83283fe04031f7e0ede2be92bed1ebb46b3e897289d7b5a5de5fe93a6f1b8
diff --git a/dev-libs/libsavitar/libsavitar-4.12.1.ebuild b/dev-libs/libsavitar/libsavitar-4.12.1.ebuild
new file mode 100644
index 000000000000..dc295a503afe
--- /dev/null
+++ b/dev-libs/libsavitar/libsavitar-4.12.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+MY_PN="libSavitar"
+
+DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
+HOMEPAGE="https://github.com/Ultimaker/libSavitar"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+IUSE="+python static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/pugixml
+	$(python_gen_cond_dep '
+		<dev-python/sip-5[${PYTHON_USEDEP}]
+	')"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-cpp/tbb
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+BUILD_DIR="${S}/build"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.0-use-system-pugixml.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# remove bundled pugixml
+	rm -r "${S}"/pugixml || die
+
+	find "${S}"/src -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \
+		-e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die
+
+	if use test; then
+		find "${S}"/tests -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \
+			-e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die
+	fi
+
+	# find SIP for current python version, not the latest installed
+	sed -i -e "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+		CMakeLists.txt cmake/FindSIP.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+		-DBUILD_TESTS=$(usex test ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_test
+}
diff --git a/dev-libs/libsavitar/libsavitar-4.13.0.ebuild b/dev-libs/libsavitar/libsavitar-4.13.0.ebuild
new file mode 100644
index 000000000000..6d2bdda023f0
--- /dev/null
+++ b/dev-libs/libsavitar/libsavitar-4.13.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+MY_PN="libSavitar"
+
+DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
+HOMEPAGE="https://github.com/Ultimaker/libSavitar"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="+python static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/pugixml
+	$(python_gen_cond_dep '
+		<dev-python/sip-5[${PYTHON_USEDEP}]
+	')"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-cpp/tbb
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+BUILD_DIR="${S}/build"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.0-use-system-pugixml.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# remove bundled pugixml
+	rm -r "${S}"/pugixml || die
+
+	find "${S}"/src -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \
+		-e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die
+
+	if use test; then
+		find "${S}"/tests -type f -name '*.cpp' -o -name '*.h' | xargs sed -i \
+			-e 's "../pugixml/src/pugixml.hpp" <pugixml.hpp> g' || die
+	fi
+
+	# find SIP for current python version, not the latest installed
+	sed -i -e "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+		CMakeLists.txt cmake/FindSIP.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+		-DBUILD_TESTS=$(usex test ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_test
+}
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 6599c8138746..46b2947d554a 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,5 +1,5 @@
 DIST libsigc++-2.10.7.tar.xz 4791304 BLAKE2B f3e41a753097d55d2e6f47407033139733dc813d84ffa8ba97ca94dbb2f1abc714a541fd90347c1477736eb9be109dd25d5ffc9998430b7d0fe9c627a9b2cfde SHA512 075f120f7261eac020a92956a4b2d8bfa380a63bf4e78d057d93b035dcb0590df1ee1e2d3af59edf97e3c30cc01359d259d24e4fc69bdb99952d4c9c02eb6015
-DIST libsigc++-3.0.7.tar.xz 790604 BLAKE2B 2363fda42744c3c4a2c31f236a2160f8dd63bae098e8190e2ef20acc23296de26cb7c275b928785c99c33d23f15709e411dc51f973d4fdd6a0556b11b0031512 SHA512 0ce4b56d85ccb0041096e2241523b9ca5bf0fd52f9655d2216e2280d5902075a4685023aa60058eb8ee9b7ed0ffc945d652940b0bda73f2fc7ce4de7371ca984
+DIST libsigc++-3.2.0.tar.xz 785900 BLAKE2B 6c128a0c426814bde26b092c20f9eca1029712f5130a12088bf7cae10c56105334a12df0b26fe1234ed4c262cac576312d2e72abb926b6422e6fc111ccee8734 SHA512 91315cecc79a1ad6ea165b66a13a5afd4e5bc101842f9d4c58811ea78536c07fc8821c51aa5110a032ed71c09f85790b3a02f2ad7fe8cc3aed6e03b2bafcd70c
 EBUILD libsigc++-2.10.7.ebuild 1206 BLAKE2B eb92a7ae54679ea39eeb0114afac7f6443332a735661df1175090ea9e691e27aefe204f208cad01cda9137fa5c080ef8b2d022e2cb90e64b39d3f28293670d2b SHA512 125251432e93d3968ad618a08a942e55fc732e67ffc033c18925560e522000d866dfe50596b160360d8b67d56ea1fb9a037589037d48b12f25b3b39867c175ac
-EBUILD libsigc++-3.0.7.ebuild 1169 BLAKE2B 09e319589db805edb4de5602a0e162391822e6ab2bf317914fd8c18e8b07fd9e0bf65b797534cf9b9215ccb6276a0a11a5d4453c90bddbd52f21dcb388ca91e8 SHA512 11c70390586ed5f88eb59595ab06f65e445f1265c66a4c15c250289f8d76674e088399eb8c99b834a881324fab011c7b845fa386d085cb332437729e53289b18
+EBUILD libsigc++-3.2.0.ebuild 1163 BLAKE2B ae17aa5c7469ba6a02bcbebe12cbabc5a17836306fca35a879c7592626cb5d9e242e0dc89901c08cc95bda0dbbf0b018244d6a288b9de8993e7b8a23eeb62e6d SHA512 8315d24b8d9334ee8a56510c3bb3b4b06f4214365a54e33090d89d69abd6523d418e1159407d098156abfca9da907542a861a5da8e373e9b05311aa7e4280790
 MISC metadata.xml 331 BLAKE2B ffda3a57ba88aa23bef07566cf4ccd6837d06642903eddc775a2ac8888b13dda42978a2e8e5b49a669242b542163ffea51545dedf8a6977404b9d4d9788369fc SHA512 6d18ed50013370a09b8d6b8ebf109b89e69b0bca3f91104db725d6f4cdf13b961863841863bd1a2fe7f645c71c6351ca0874bfd7173008d3b07e4bd6991849c1
diff --git a/dev-libs/libsigc++/libsigc++-3.0.7.ebuild b/dev-libs/libsigc++/libsigc++-3.2.0.ebuild
index 8851111453b8..8b9439d5696a 100644
--- a/dev-libs/libsigc++/libsigc++-3.0.7.ebuild
+++ b/dev-libs/libsigc++/libsigc++-3.2.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest
index e9bd887a3030..888572ddef4a 100644
--- a/dev-libs/libspnav/Manifest
+++ b/dev-libs/libspnav/Manifest
@@ -1,5 +1,7 @@
 AUX libspnav-0.2.3-makefile.patch 1329 BLAKE2B 8eccfcfa539703437326b4800597dc7b6074d7bda0246c27a819114969a6906901b6063a11cdf8dd29148cbf9ecef5d5301f842355b86600b3077b34d61cd6d0 SHA512 8cdc05d5b0d4aa16de59752d0ce204dd0db1df63554c53c2e0b9ea04a7a1b32a0fded8ba4f9f5fc94456f6d4b7b87213284f88944931903986f4df81784cc64f
 DIST libspnav-0.2.3.tar.gz 11985 BLAKE2B 134a0c3f7c9a7ef7c4f68910e0266880958e2b74e253b75237b0fa8d3e482bcd1f42e715b85f0ffca3a62103530e854090818564d9c241bfc55de039cc4883ee SHA512 b2c452d979d455fc99bfdc172c8a2408a6e8dc40acc52964fa64f4d75a8ee77dda12e5e212c0c4e07a0a24d055f16f85bb6ce6287e24e6bd0665de457e37e6a7
+DIST libspnav-0.3.tar.gz 12386 BLAKE2B 6598e0eb3cb41c9e13f0cb62715cd199d2fff0903d8f62726fa82227f2aa49f4dc41083929cbdde18974dfb08c23947158b465bb552c12ea8c9f9fd754962c2b SHA512 1bd61c1ccda37af9b3eaeda6d8f269777f7d13b1c3d3ed4d194b917199bd232d79c9513bcdae6fce6c298ad8460c095a98e3cfd98ee76e1852fc0e93e478c252
 EBUILD libspnav-0.2.3-r1.ebuild 1228 BLAKE2B 3ebb19e747735af2df2a4bd7e7f484ef45f2dc787fbea11085fc14728e9b3fa3127275e11c3195f208775678163caa6e53aa4ebe16044164f1cbfa296b7bc451 SHA512 d81c66fb8cb2651f44824f2d2a739e146aa700b83672dc4d5ea935f20fd6487fe6e06582faaa4798ae1f7a77854de02552d7155deb08bfef0976a922dc668ba8
 EBUILD libspnav-0.2.3.ebuild 902 BLAKE2B 2ad55473d8968bdb60f8524277cbb63f9f396e981a7f4325af10f2c89b827e3f732325b1cfb0723dc4f8ff8e3bc1817561cd025e37c6f7c71a178a4ce3c12c24 SHA512 673f746c05b2c3ef44452f9206b4dbbd03c28203e952228902972f380c71e8d437f58e83ad42546876dff5362c9ec041eb8bf35f28a5bbb1aca4f50ecfa92093
+EBUILD libspnav-0.3.ebuild 1211 BLAKE2B 2217b4a605a93d11c9664ef1f60f3829cc335163c031e8786a02d83d5ba2411e801745d9a443c075e636ae4202d18f9321b294a644dda35ecdafa0d6c75a172e SHA512 bcd9c916186729183d0f37a4997f7f1f3640f7c4c8e3aed181badcb1f209de2697b27e48e104801a51c5e112caecaf34fb4714e00a6ad92087e19f86fe4fc9d3
 MISC metadata.xml 812 BLAKE2B ced6d51e37b17056923b89e2bbe6eba4a8224690d97826db96693c01b3c97442997a61a36f020114a65191ac9a6d2cc99098f42ca65882dbec955ee44168bd77 SHA512 55fd9c851ddce1d70eb22d30af4f8d185d3fb3dd037d4739d698ba79202ec9a4e7389f29f4fc763cd24304fec26bc1e5607ed15e0c8c37a458d4c6b9da0b05f2
diff --git a/dev-libs/libspnav/libspnav-0.3.ebuild b/dev-libs/libspnav/libspnav-0.3.ebuild
new file mode 100644
index 000000000000..c4af54f4d64b
--- /dev/null
+++ b/dev-libs/libspnav/libspnav-0.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+MY_PN='spacenav'
+DESCRIPTION="libspnav is a replacement for the magellan library with a cleaner API"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="https://github.com/FreeSpacenav/libspnav/releases/download/v${PV}/libspnav-${PV}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="static-libs X"
+
+CDEPEND="X? ( x11-libs/libX11 )"
+RDEPEND="app-misc/spacenavd[X?]
+	${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+src_configure() {
+	local args=(
+		--disable-opt
+		--disable-debug
+		$(use_enable X x11)
+	)
+	econf "${args[@]}"
+}
+
+src_compile() {
+	local args=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		incpaths=-I.
+		libpaths=
+	)
+	emake "${args[@]}"
+}
+
+src_install() {
+	local args=(
+		DESTDIR="${D}"
+		libdir="$(get_libdir)"
+	)
+	emake "${args[@]}" install
+
+	# The custom configure script does not support --disable-static
+	# and conditionally patching $(lib_a) out of Makefile.in does not
+	# seem like a very maintainable option, hence we delete the .a file
+	# after "make install", instead.
+	use static-libs || find "${D}" -type f -name \*.a -delete
+}
diff --git a/dev-libs/libthreadar/Manifest b/dev-libs/libthreadar/Manifest
index 811df957b42e..5ac30a474c91 100644
--- a/dev-libs/libthreadar/Manifest
+++ b/dev-libs/libthreadar/Manifest
@@ -1,3 +1,5 @@
 DIST libthreadar-1.3.5.tar.gz 443192 BLAKE2B d8e06c7b58636b51bd2ffd50f51a8a024780e4955693a28085296ccffeef8ad2866ac12e53b3c78b37a650c4b1c54b5fa8dcbacd1002577cdd7b30eccee2ef69 SHA512 c4c34036a7882d1ecdbc025e0d927b6712fb067aaeee8bae5bc740a5259c5f49d651a8ad6323ddf6cdf13fd2e5e7c396f9c134ef3447b3743ae8e64abd646850
+DIST libthreadar-1.4.0.tar.gz 445672 BLAKE2B ce4165bfa507f27ea071dab067e1cda61e0812fd106ab80f0ef04a53ac68ce866a3d7c5ce6a26d6e9fc2c2085de7b8636492711a15a7103cc16b773d0a87aebe SHA512 3665817cf6327d4d24792d8cc2bd0a458bda1651b471e3440c1f63c22f397cfb4c8d81482f937e13f67f5ff1414662b1f69d9c311362a0a7a9249e8bc0236751
 EBUILD libthreadar-1.3.5.ebuild 487 BLAKE2B 82d3fabecec2c763e21f2296315270c01d554b47540afc6780cc47e336e2716a9d3495aa7aaf91a5adad33147a03465ea6930c4deb1cdee6f7222fbb6dc01afb SHA512 15584e850b6870de765c9598f175fb346ab55301c51e1d7fb3d92bd744e86ac3fe0bf26beb66f9a6b0a7b192692a6bff0fa795cf20167b84009279c3ca1bada9
+EBUILD libthreadar-1.4.0.ebuild 758 BLAKE2B 44a9dd935c10306620e16791d67126030a3e400cd18b1d31179e4cfd76e21d061e87f0e0fc67363413552257054a14dd948a32e28908e1328268c8d57287f0d0 SHA512 f6ec66407de9d4b882912f7e3fc6c7359e9070860def473292f7683d13ff7f29e4aa1145da77f0bafb033f23a1db69a2e307772e72ad745b9233d364f00ea0d7
 MISC metadata.xml 890 BLAKE2B aaf5d415466806037fcc87f048d8ebecc04d3c04613e828a3783e194f265bd25938d98e1f83d778c0e970e458115654faa87826af0e1af58f02a5cc1660df08c SHA512 7bf58461d45c6c9e00e3987aa7d66202cab8382fc84e775c17c59158404bdd5d179975d0afdf383ed654e34105820fcf2a83436716eea11c3f808a746d7291dd
diff --git a/dev-libs/libthreadar/libthreadar-1.4.0.ebuild b/dev-libs/libthreadar/libthreadar-1.4.0.ebuild
new file mode 100644
index 000000000000..7ad10216fc22
--- /dev/null
+++ b/dev-libs/libthreadar/libthreadar-1.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Threading library used by dar archiver"
+HOMEPAGE="https://sourceforge.net/projects/libthreadar/"
+SRC_URI="mirror://sourceforge/libthreadar/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+src_prepare() {
+	default
+
+	# this is an example binary that is not installed
+	# the original Makefile tries to compile it statically,
+	# no longer supported
+	sed -i -e '/^test_barrier_LDFLAGS/d' doc/examples/Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install
+
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index 28c62573b2e8..adafafc069c8 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,4 +1,4 @@
 AUX libtpms-0.9.0-Remove-WError.patch 508 BLAKE2B 33178598a1fef1189039c30814996f00ec37215b3f10a0ff9df521a866147b2a6844d86c3b372e450f701e6e2ae3e587443765c39848076536861342e5b42d63 SHA512 e0d55045bcb667278dc1ae1c509b7be466f23421683f8b0b7c830d724f83b1923b09a61f2a8e649e08150d1d313f0456cfc5f5a1b5fe3bf168565e443595dd12
-DIST libtpms-0.9.1.tar.gz 1261528 BLAKE2B 8a81fbea7dff44fe55da048f5121511c22ce264aaa64778ec28b6e55be64677f46f8266bed9edaeb57605ccede755ddfa7463a10e8fc806a86ea09d7a1f9283e SHA512 15ae14bca4ac24391ba06accae37d7e914e410ac9dc1aeae0743295371c9a0e0851f191c55bffb765cb731e8d397188be6441d2b6c1f5011b56a354428c4dad1
-EBUILD libtpms-0.9.1.ebuild 1297 BLAKE2B 60e19a6be447a90167fa15bfda53f9e8ce1724046100a59590c1e27ecf609e0ff0f6565325f24ecb43603e1fcc655aed7a51b9d44c0d5b67a0bc4bc0f1578276 SHA512 6a979e72dab2bacca9bd53d97984d667ecb588878127d7b598873e46e4279a1a53b5e66fe4b49b7e648974caab34b05cd7362de2d21665a30b7de11f9789e24d
+DIST libtpms-0.9.3.tar.gz 1263192 BLAKE2B a58cc2f76775f0a0a266cf6da898d6c8e310998c201dc47a802d67fc07dbe1632a68e81b78da68a6350e1d64727c7b47154479b4d9bc19a55324a2d881cad94f SHA512 8616c712f958c28a415b0a97a3a24f439f757682c4b60642584eb13e4ab2d7895838e8e6e57936ff583259506f9b379ec47c76d5780c1b257f25513a5911c3cb
+EBUILD libtpms-0.9.3.ebuild 1304 BLAKE2B a59602976b1c6564c1a75dd97418dc35c9537e4adc997e8a6ac63ec833a9d8d4e154425d9ea82311cbadade514a26a60e8c5b7ae2008f434c1b9ee0568c239b8 SHA512 59fe0fa80df39422df62858552384ae88613a7d037ec1ac9de3687d80959903a3d422c11fd6f6ac196eab9d75573003ca9f2adca59d28f1034e8d7a619b43d31
 MISC metadata.xml 536 BLAKE2B 75236814e21cb3e98feaa2646ccf680973a71e168d5ccd95cdd12f06214a1b18454cb40b1825df9335e3c4881b7d8d3cffdf03c48dcedd99da4a0dd50d81fe1b SHA512 3abebe84fc62f5082d22e0a3d146a22e7e799d0b1d0f3cfa282aac408ca8c0b8f396f7b081c92aec290037bb7405e672ce7f6f4f8da5b1966a0b4eda8005d721
diff --git a/dev-libs/libtpms/libtpms-0.9.1.ebuild b/dev-libs/libtpms/libtpms-0.9.3.ebuild
index 0eed7e6454dd..fc15af9bf0f4 100644
--- a/dev-libs/libtpms/libtpms-0.9.1.ebuild
+++ b/dev-libs/libtpms/libtpms-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/stefanberger/libtpms"
 SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libtsm/Manifest b/dev-libs/libtsm/Manifest
index c3ec2993690b..85fa4f52f890 100644
--- a/dev-libs/libtsm/Manifest
+++ b/dev-libs/libtsm/Manifest
@@ -1,4 +1,6 @@
-AUX libtsm-4.0.1-cmake.patch 500 BLAKE2B b666c52e7c271df3499134cf6f90a9ade31158fdf862851945434df6b40305c785f011ee447a1460b8a783089d69627e075762d55012a8075982dbeeb093d91c SHA512 53673ed55b66bc196cda7cb9aaf151304cfb3e6127be1c349a7b14dd250b346e4b544e7a1f2b03f7da090b33a459cf2e801daa8de74a3e5d04daa1fcdf09ab29
+AUX libtsm-cmake.patch 500 BLAKE2B b666c52e7c271df3499134cf6f90a9ade31158fdf862851945434df6b40305c785f011ee447a1460b8a783089d69627e075762d55012a8075982dbeeb093d91c SHA512 53673ed55b66bc196cda7cb9aaf151304cfb3e6127be1c349a7b14dd250b346e4b544e7a1f2b03f7da090b33a459cf2e801daa8de74a3e5d04daa1fcdf09ab29
 DIST libtsm-4.0.1.tar.gz 157161 BLAKE2B cba597870d58907e647b9929cf9b97db76b6b38655d56dc3fe0ad0f534db8446cbc82d69a0ec10e58506e001aaf610dee4ab3ecb785b79b2f0571805c04d726e SHA512 28a5ac3d9cf12c4655b3e69ce90b814829ab517f69b88e6339e26dfab6957321a292e96fff687308a39cd16b499e8b29aa133216eb531750e4502a691a907752
-EBUILD libtsm-4.0.1.ebuild 403 BLAKE2B 1ff0cda94f29dfaab48a2bffc79a0188375676747d49d3a8871ab84ba19b9cb059ad87130f3f83b96033d4b79b551235caab02c29a7700ec8f87e03b3a0493ab SHA512 41201a25eb3c90000c04fa18a981efbfe983eb5eaaf90544533f04642acbfa67d93264f71df563ff07612a0bec9841aa69f9fcd116df2c9a07e6089731a6f19f
+DIST libtsm-4.0.2.tar.gz 148135 BLAKE2B 4d81d5a19003ca1487e85bcea22604990e88770484a08a072105a2f193a0c7aa40832c9a81197c0fa26acc9c8d39d1ab796d4b92fa6af790f5ef803b8c68af05 SHA512 58eb955012fd154b7c165d799d0f80c9a71a504481e78471103fd299f2e73f3b7d89487387166895a9a5996165344335baa56f0550317caaa2eec6b0bad55e59
+EBUILD libtsm-4.0.1.ebuild 404 BLAKE2B e1704f91deb0ffe5e94b27c8c78e7e7dc7abb44f21f6857309e7e6f9b0815fdf19f7fda9371d24cbae5bb153614cd29d5b02775b0bf349ac052db0a9db103ab0 SHA512 b88d84bdf5b883c23fc9810aa6abb6f7154c6979010b194e109679612ee9b36d2e8a38524eafe2a8cf46688f0ef40ca31018e7af7313f27b9760f3f9f14d8093
+EBUILD libtsm-4.0.2.ebuild 404 BLAKE2B e1704f91deb0ffe5e94b27c8c78e7e7dc7abb44f21f6857309e7e6f9b0815fdf19f7fda9371d24cbae5bb153614cd29d5b02775b0bf349ac052db0a9db103ab0 SHA512 b88d84bdf5b883c23fc9810aa6abb6f7154c6979010b194e109679612ee9b36d2e8a38524eafe2a8cf46688f0ef40ca31018e7af7313f27b9760f3f9f14d8093
 MISC metadata.xml 241 BLAKE2B 21028072176eba52753ea8ad1554d6581dc934f0177e558f0b8c2addc0f6b6cc41d612205e7872032d97344c147a08899ae6cc78eac0442e2869c5ebfd204951 SHA512 c9a5430a3f74432f15277d9477cb811c3728735456de4aec57372e20eda20fef2c94392342955b030fc77f1297780bf59448fb2fd5251bd3dc2382561995f2b7
diff --git a/dev-libs/libtsm/files/libtsm-4.0.1-cmake.patch b/dev-libs/libtsm/files/libtsm-cmake.patch
index eae34cf1aca8..eae34cf1aca8 100644
--- a/dev-libs/libtsm/files/libtsm-4.0.1-cmake.patch
+++ b/dev-libs/libtsm/files/libtsm-cmake.patch
diff --git a/dev-libs/libtsm/libtsm-4.0.1.ebuild b/dev-libs/libtsm/libtsm-4.0.1.ebuild
index 29e150fe9c61..eb01dbb7c6d8 100644
--- a/dev-libs/libtsm/libtsm-4.0.1.ebuild
+++ b/dev-libs/libtsm/libtsm-4.0.1.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
@@ -14,4 +14,4 @@ SLOT="0/4"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=( "${FILESDIR}/${PN}-cmake.patch" )
diff --git a/dev-libs/libtsm/libtsm-4.0.2.ebuild b/dev-libs/libtsm/libtsm-4.0.2.ebuild
new file mode 100644
index 000000000000..eb01dbb7c6d8
--- /dev/null
+++ b/dev-libs/libtsm/libtsm-4.0.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Terminal Emulator State Machine"
+HOMEPAGE="https://github.com/Aetf/libtsm"
+SRC_URI="https://github.com/Aetf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${PN}-cmake.patch" )
diff --git a/dev-libs/libugpio/Manifest b/dev-libs/libugpio/Manifest
index 2f1afad41186..83df35e4433e 100644
--- a/dev-libs/libugpio/Manifest
+++ b/dev-libs/libugpio/Manifest
@@ -1,3 +1,3 @@
 DIST libugpio-0.0.7.tar.bz2 300015 BLAKE2B 430a17651f3c443424694d50817e562ab3c682ae2006c14d2ca46ee3078993e85214a0ca0b9323d148ca3aedaa758985cf5e2e45527e1d1278d3a36c3648ecf9 SHA512 27f8b00b13b4865635fa26e9b14c7fe217ee005c316500f0f344268d82f8d2858def524bd5cee11e9cca9c2a534a50546d5fc3504ecd1f88bd96c6fbefe1586e
-EBUILD libugpio-0.0.7.ebuild 605 BLAKE2B 0dfdf4c9244fd34a79ca8713c6503a16beef07851b5bd1f89bebcbd555793146dcd9edb20f1a24e9d7d9edb5465192c3a2a223c68eb5d8503d4850e973543f96 SHA512 daf3dedd5f830e04ed23f087f3e10f8c15ae77979abba53cd66206260b1bc51987ef4f41fd05dc2c40d46198b12b8e399f5cf1cfc5a3f6a46810b8814d58e936
+EBUILD libugpio-0.0.7-r1.ebuild 605 BLAKE2B 18fa0f38ac7016c079bf8afe12dc071b0f46c300a231e45cad51effa66a65ced5423574baf1f63bee4b1edda0b9a07adc3ace830252c70deca8d1025c5f8e899 SHA512 3b93dc7df70d5f5807dab9c0dfb1ac2688d8847ae0d296b20c78c52b5db03860b1f5d2d57cb08191ed83efb0ecc9bacff84e39bb140bed24cc0717737e61236e
 MISC metadata.xml 635 BLAKE2B a9c453b0144ea42e129a2c2c270aff978b592d8f32a4c99653359b7cbabf002477d84d3f5466ff77771fd8cfb49a2047fd0ec047fd8bfe75cf7dc139d7569a9c SHA512 b66f084b21dbab42ed2ec586d9c210a4b7b11c5618d505a7c2e09bfe1cdb966fe796c2eddaf2be4ee905dfb9a96b4c23431c5c53c2e7b5944e318ab4d9829dd0
diff --git a/dev-libs/libugpio/libugpio-0.0.7.ebuild b/dev-libs/libugpio/libugpio-0.0.7-r1.ebuild
index f36b3a392322..649d6f40165c 100644
--- a/dev-libs/libugpio/libugpio-0.0.7.ebuild
+++ b/dev-libs/libugpio/libugpio-0.0.7-r1.ebuild
@@ -1,7 +1,7 @@
-# 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 linux-info
 
diff --git a/dev-libs/libuninum/Manifest b/dev-libs/libuninum/Manifest
index 2167e05bfae9..b9a9eb729360 100644
--- a/dev-libs/libuninum/Manifest
+++ b/dev-libs/libuninum/Manifest
@@ -1,3 +1,3 @@
 DIST libuninum-2.7.tar.bz2 276712 BLAKE2B 0894c632d7e9081f35d543895809bcc04fde6da674d4e6adc7cdc914f4bbb257a3e683b381e6496a08b65790731f73315d8263970265a351f40fe504f210c883 SHA512 4536a90b9f34fbabd3cc0560c1ff385063151bc381de51e6ca0253d2a42c2290b92329795b1a12ade305c3cb5757b02fe9d92817829977f50da2e34852936274
-EBUILD libuninum-2.7.ebuild 547 BLAKE2B c8e43c650e8ce680e1b6ee849eb04e7c2b63e2f013ea99ce5dd67f423a3fa54fa6274d400233cef5e3655a8d52c119adac85402292678cbe3b4bdded27d1128d SHA512 3de4909ef04b5acb3307279b58c2fcaecff59e0cdf7c395667a5cc71f719160f4d938c3c45325ab0838ff2b60151594845432033d952e717f81fcc915e3ea089
+EBUILD libuninum-2.7-r1.ebuild 547 BLAKE2B 12e74679be85c9f358fb88daeb3bd64b0aa70dca3379e08d48cdff5b4dc4a19dc0fcb18e2f289e2223b5327dcd890c0a6856f98bdeb4b5cbbc25806f52b269f3 SHA512 0c1868496446b94aa60538ec0efd0ace5d721399000ec3512a908f6224a7c05eafb26a6a28dbbbbb287cdbd5d5e43889e7cabdf2259ee7d17789faa4b168368c
 MISC metadata.xml 688 BLAKE2B 186bacb0b23253d1dbbfcdf05e0611bf6c5c26cd68852b492dc65cd2f0f86ecb34f51965d32517b1354afacd04dec68899babd64424e27dceb34186d117cb27d SHA512 378145a6c5b69cae0a072cb28d1bbfa5a6fa3f708e450ae92bdd99e81ed862b9b8b290a13299ef928a1bcf06e1e6e61bf9dea51d5054007bd609932f394da5b4
diff --git a/dev-libs/libuninum/libuninum-2.7.ebuild b/dev-libs/libuninum/libuninum-2.7-r1.ebuild
index d13f676205bd..0307915cebf4 100644
--- a/dev-libs/libuninum/libuninum-2.7.ebuild
+++ b/dev-libs/libuninum/libuninum-2.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="A library for converting unicode strings to numbers and vice versa"
 HOMEPAGE="https://billposer.org/Software/libuninum.html"
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index baf36df7a606..c44005b555b0 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1,5 +1,7 @@
 AUX libunistring-nodocs.patch 287 BLAKE2B b351d572e702a17cc4b1df97f182b6fa5ca232c77a4775572097043814a868e16adb7e6dc4022ea07c614d6accac255a6c0262916e5a36275949e069a17b4a80 SHA512 f7bded4ec621039121c93c9808e384822613c670df886c125b00d8add6ab8257a5152298fa483cbed21222da78097a98433a2f0b364467ed82bda5f98a8c1847
 AUX libunistring-test.patch 549 BLAKE2B 2ead1452792a3786ccfb22382d9fa59d5ed873ce4fd7fb791f928f960ddb98b37ba4c3ba8386369a303b1c8be28cd9f22f964dbb9064858d9078b1555631fa4c SHA512 3312cb67ac033f9ced3dbb4c6ac5c93f2d93fb7bf04e996f2087c3f25ad0795c4dfc09b59c23bfd59a1b35b0938f50abb6c720b1f29f8b292f7b63848d3d704d
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
+DIST libunistring-1.0.tar.gz 4214306 BLAKE2B 177f21d9fb6d81ea6bb2fd05f9ca31cd6cecb5a16be273de8817a8fb6ffac997421ebf108acebcb3392b8df423b7e3e150f24a731e0909e2ba171b4bae2fb53d SHA512 6125e3911d15bea8fea5c0b97864f928eab8c8476f1a24c7349b0552e2d11d9b73c1fa0fcb354917e42407d4e5adea55d0c8012121fa0a53c60faa7b0911aef3
 EBUILD libunistring-0.9.10-r1.ebuild 1034 BLAKE2B a829098b2dc18731a31de741925b1a0220de3bfaa3ab6d7576e97b9edd279d46af5419a72f7f1ff3fea1b7d9c32605c8c87b033e817e440dde71748579696624 SHA512 fc22fbe238b2d6dd130e44e6686662f79664edf07cd6bf09f9648d769523b311b3116bd23285bb834321b5a2d7530474e85338a1f882977f3261f6093b509cfb
-MISC metadata.xml 942 BLAKE2B d9d1c7343696ab1bde6bc2394e2f3defb656922e152bd7da16b67303f605e581789d58cfad3e24af07215eef455987c4bdaa63dd735cf8e3d98752aaa7ebbb82 SHA512 eda85fa190a036c02c2edeed7127ef8a94ffec1bd7971fe62c74fce9331f8da52d3e93af954bfc8d568d2b612a4596fc797d6f7b0d986b6fa193aee0bfda3c5a
+EBUILD libunistring-1.0.ebuild 1008 BLAKE2B f9df2a8e674d9e0e85f5623557a35bd458a7c4885e44513f2d2d56e9526ab9108f288ca9bbf0ffee58a7dd7378376dc6df9bd6c436288109813e589940da32b1 SHA512 6853df2d760e998c7890901fbaf0d4306132484ac0487cc1e88f275cbadb283981854f5b30fa910d47829cefdf34b5dedc9ef7c910fb0ff1af663b2e6f70331f
+MISC metadata.xml 974 BLAKE2B 367ac9d8c34135ea5c1b1a7fafb89254ad3c25deaa183a82f40ab4289c76a311eff909e4d1a2cbb361104706786471f24bfd0f9a1da20e1eb20bec3178c43b5c SHA512 89ea5c6b84a94c713ef72b9c3b921fddb3a87b8d0ea72eb924d379eb7d46974cc9b60e350007752aabf802bcc0fcb5fe6437d11e15d1b74d1efd0a537a474bcf
diff --git a/dev-libs/libunistring/libunistring-1.0.ebuild b/dev-libs/libunistring/libunistring-1.0.ebuild
new file mode 100644
index 000000000000..2f294b42e0f8
--- /dev/null
+++ b/dev-libs/libunistring/libunistring-1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
+HOMEPAGE="https://www.gnu.org/software/libunistring/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-nodocs.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize  # for Solaris shared libraries
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	default
+
+	if use doc ; then
+		docinto html
+		dodoc doc/*.html
+		doinfo doc/*.info
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libunistring/metadata.xml b/dev-libs/libunistring/metadata.xml
index f92a99d42baf..f757bba21c45 100644
--- a/dev-libs/libunistring/metadata.xml
+++ b/dev-libs/libunistring/metadata.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-<maintainer type="project">
-	<email>scheme@gentoo.org</email>
-	<name>Gentoo Scheme Project</name>
-</maintainer>
-<longdescription lang="en">
-	Text files are nowadays usually encoded in Unicode, and may consist of very
-	different scripts – from Latin letters to Chinese Hanzi –, with many kinds
-	of special characters – accents, right-to-left writing marks, hyphens, Roman
-	numbers, and much more. But the POSIX platform APIs for text do not contain
-	adequate functions for dealing with particular properties of many Unicode
-	characters. In fact, the POSIX APIs for text have several assumptions at
-	their base which don't hold for Unicode text.
-	This library provides functions for manipulating Unicode strings and for
-	manipulating C strings according to the Unicode standard.
-</longdescription>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription>
+    Text files are nowadays usually encoded in Unicode, and may consist of very
+    different scripts – from Latin letters to Chinese Hanzi –, with many kinds
+    of special characters – accents, right-to-left writing marks, hyphens, Roman
+    numbers, and much more. But the POSIX platform APIs for text do not contain
+    adequate functions for dealing with particular properties of many Unicode
+    characters. In fact, the POSIX APIs for text have several assumptions at
+    their base which don't hold for Unicode text.
+    This library provides functions for manipulating Unicode strings and for
+    manipulating C strings according to the Unicode standard.
+  </longdescription>
 </pkgmetadata>
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index ee3e84f86f32..802fef920db6 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,6 +1,7 @@
 AUX libusb-1.0.24-multi_device_config_parsing.patch 2340 BLAKE2B 28e8f3916843599e3b2f03228d2366de29a9332fc0a147e32c61f8944bb0f77fe1b57b3f323f161bafd00f5ef8434c33afeb5c89ad4a0d658b54daf2ba5dc541 SHA512 78af84f9dc33589f89e6f97d5aa81ec11208dc65c3bd8b8c947837d0f70d68e5313ce3a68853d4d6cc8af4cc2f237b5c95ac2db563f0013652f88479dbcfdd68
+AUX libusb-1.0.25-fix-O3-warning.patch 1156 BLAKE2B 8bb4a8fd0edf73036439511c78c69ea9a022e01a1f1c6faa7963624faa1e59848ad91b0163d9c3b601eb31ec0251bcbb79e7e0ca64c7a35d66b8abe4b39ab98a SHA512 0547d439f9bf30b47df97227f03e9504a3b53b9a859505ebe17443380b923770812e684f76161cf1f3425af25502dbf8393c312ee7f3a6206f5a808b9bff2cdb
 DIST libusb-1.0.24.tar.bz2 606593 BLAKE2B f6188b5af1225cf8b6d1486b6efcf48e837ee4f2e3592adab3ae6aae0a74a67aa54f40f0dd547f951a194d40954f2ee33acf741d2eee0b8449ce64f2edcf1018 SHA512 5aea36a530aaa15c6dd656d0ed3ce204522c9946d8d39ffbb290dab4a98cda388a2598da4995123d1032324056090bd429e702459626d3e8d7daeebc4e7ff3dc
 DIST libusb-1.0.25.tar.bz2 609127 BLAKE2B 3aecfbf9fc068fdfb8e612918bb895988f8400dc2c3ffd96a81792ab844d632f0c098947200512ddc37cfa9003956f8454c1d0362973a5d646a225f81cc2923b SHA512 f1e6e5577d4bd1ff136927dc66c615014a06ac332ddd797b1d1ad5f7b68e2405e66068dcb210e2f0ae3e31681603ef72efbd88bf7fbe0eb41ce700fdc3f92f9d
 EBUILD libusb-1.0.24-r2.ebuild 1772 BLAKE2B 8ce1e44dc5838e83968a70c5a165468eb39bdccf1f818a8604fc0efacd8d1f0dbbeb222f65d3e4416ae988c7b327acfc46b060ba02bd580c418b897ec8f1b87b SHA512 0e851aac8a4012a6d89acb2f797ebc462f00c0c6b1dd9f1a673ade1a056ea802d2dc6204e83d20b606b0366f9562d7be0f5960240945e5acbe911232fbcda2c6
-EBUILD libusb-1.0.25.ebuild 1688 BLAKE2B 6330e6be3ddf43cc551d3196aa1b45d212e6a2c2bfb4f9a084baef0f559ab30a077238c66008ffea950d3e7f8406197130bce567af1fbd3255bb1c991d4f4cc5 SHA512 5673513eb6023e471f77822bd12629d21635340d46b5153187b6c4a966fe32a1dbbe463c400b9044e2bcbed0f14a1a581683e63cf286619f65ce774f33763ef3
+EBUILD libusb-1.0.25.ebuild 1742 BLAKE2B 4b8b8529f03c7027d20549ffb8ff4b3380fe295ca6a915f9fe5ebea8faca1a3a865a3b7453650dea22a2c24faf0e28f892288cc1f6ff6c54edf0e9fcfa6a1be8 SHA512 8f6b87c28fc05e17be1877087e0fbf4bb5e6faec1f0c49b1c31dde56259b4159da6b802ab3ad86ffbcc69ea334b4c2af9667ef722f127211cea16d1d9e4aa249
 MISC metadata.xml 336 BLAKE2B 8598a5e3d01ee5d7efb7ef2d48fcde99c13ee9e5915d3fe4fb2b16689482dfb31ea23d27d75e638aa7e429f725b876e834f3319eccc188f4af6704d3fed14c4f SHA512 8bfb8a1c4a2185393c1cc00b6ba17a9e04276e7708ab5c590209eb7c522212c8b45981dd935ef15421f5865ac7861c5dadfbc7d8f53ab4a42b3f0315696b3713
diff --git a/dev-libs/libusb/files/libusb-1.0.25-fix-O3-warning.patch b/dev-libs/libusb/files/libusb-1.0.25-fix-O3-warning.patch
new file mode 100644
index 000000000000..7270b057d172
--- /dev/null
+++ b/dev-libs/libusb/files/libusb-1.0.25-fix-O3-warning.patch
@@ -0,0 +1,32 @@
+https://github.com/libusb/libusb/pull/1062
+https://github.com/libusb/libusb/issues/1063
+https://bugs.gentoo.org/832732
+
+From 8bb81fe72286cdcb782c7af4f0d7ef715b2e137c Mon Sep 17 00:00:00 2001
+From: Yegor Yefremov <yegorslists@googlemail.com>
+Date: Sun, 6 Feb 2022 07:12:14 +0100
+Subject: [PATCH] linux_usbfs: fix maybe-uninitialized error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Initialize active_config to an invalid value to avoid the following
+compilation error:
+
+os/linux_usbfs.c: In function ‘op_get_configuration’:
+os/linux_usbfs.c:1452:12: error: ‘active_config’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+ 1452 |  *config = (uint8_t)active_config;
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+--- a/libusb/os/linux_usbfs.c
++++ b/libusb/os/linux_usbfs.c
+@@ -1429,7 +1429,7 @@ static int op_get_configuration(struct libusb_device_handle *handle,
+ 	uint8_t *config)
+ {
+ 	struct linux_device_priv *priv = usbi_get_device_priv(handle->dev);
+-	int active_config;
++	int active_config = -1; /* to please compiler */
+ 	int r;
+ 
+ 	if (priv->sysfs_dir) {
+
diff --git a/dev-libs/libusb/libusb-1.0.25.ebuild b/dev-libs/libusb/libusb-1.0.25.ebuild
index 328fa227b1de..71c8364d0b70 100644
--- a/dev-libs/libusb/libusb-1.0.25.ebuild
+++ b/dev-libs/libusb/libusb-1.0.25.ebuild
@@ -21,6 +21,10 @@ DEPEND="${RDEPEND}
 	!udev? ( virtual/os-headers )"
 BDEPEND="doc? ( app-doc/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-O3-warning.patch
+)
+
 multilib_src_configure() {
 	local myeconfargs=(
 		$(use_enable static-libs static)
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index cf4a493be1ff..341e5f797627 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,7 +1,7 @@
 AUX libuv-1.41.0-darwin.patch 1747 BLAKE2B a5a2d3ac70468515e395f69c9a80748d6db261f8ae7c4979fc3965d32d7d8acd6c6edad4a4e9afc449e36df0f7544ecd1823bceba17ba456f21b221c78341243 SHA512 23be80dedc692cae3dc67d66834c937a890f781a9f73c68ebc3181130a5f33f981f822ef026464f77aa134701505054cbf76cf852429d0b3194d6a48773a0b8d
-DIST libuv-1.42.0.tar.gz 1293478 BLAKE2B c2b46492167d759fd781b704dd256de100ca5bed62b0afe74fd8c46d5ecce15c53c4158d2e938314c578f26978e9be0bc69c4ffd0f40b2cd8419fa120df5dc2e SHA512 29982c975fccb99dcf28c8cc0f9fe9f15a0c546778b0723596a790021441b8be1ccece17f63319b5a1f0ccda8a846c0b544f9259d3482e84e14138461a0d882b
 DIST libuv-1.43.0.tar.gz 1295972 BLAKE2B 82cf4a0eff25aaf941eaa1b04030af1d21b758c0a99ba9cd3a13753879dcbea4f167d94b8e67de4d5674e02f84f9902198faa3159fc7e8f51d52391e842f46b8 SHA512 66ee11f8f6fc1313c432858572789cf67acd6364b29a06c73323ab20626e2d6e3d3dcea748cf5d9d4368b40ad7fe0d5fd35e9369c22e531db523703f005248d3
-EBUILD libuv-1.42.0.ebuild 1358 BLAKE2B 9747dc11abcd8beecfb0c266b7ab6614d9b4e59da41dc26adb95099f7c586039bfcf4b962dd08bab5fc6d4a07011b83689cc8bb5825f39c8cad90e3f123a2d4b SHA512 470307b8d473833c187302907a74378e20123a16a382d801a4850d2b8adcaf610f019e6592b9766a304c807a12614a4d018d3da7b6b74ee746be8259ce046d29
-EBUILD libuv-1.43.0.ebuild 1366 BLAKE2B 317685224f005bbd58245c880d2837deb3450f248e7448a64f4e907075e9ad76306f77a91d1784bcd6afb02ca9ca684906c33c3e48c6643bb6700e367371cbe0 SHA512 8faa01179521808df3de19c1754dda31a8471fa9930b3f606ee220839277bcab2fbeb87c86662d0c784aa9c4011d04510ebdff662db94d5402bfe4a464e7a81f
+DIST libuv-1.44.1.tar.gz 1301786 BLAKE2B 34418fbf8ddffe368b4df8f8b668888ec9f3e369c0d8794efa993ace5c37a3359a020d7868b9287b31abece6d0d3cf839ca412e959a4ee970650755f37247c29 SHA512 050b5f91540d126bef0a35681f8dd347296d3be32671b1c785494e78f5367b4ab064ece3f594523e09b08bcac284377d5fb123ba441fb570d25c5146aa484c8e
+EBUILD libuv-1.43.0.ebuild 1358 BLAKE2B fc897f62f27b258f4e88c69596d3c2141e01039156e6cd78cf4f1cca9b699d8304fcc8a30e3ff5270a9506d619a3ed10e56d6e40ae2b1c92d2665888213dad6a SHA512 6210053cb2667450a8b191677a6de94f7b5efc61ea7cd9fc0188984e18adb40d14bf232b77049117471deb29cb2973aa8f83006fe4d8c4bf8514a526eab94d2d
+EBUILD libuv-1.44.1.ebuild 1366 BLAKE2B 547b0f699cc9cf02bdb793ea626c0bbc6d2669afc555fc66ae5f5bd5e34f916dea7053b09d1f468369b413409dd63e682d75690423f28cfa5d9d8bc47fa5aa58 SHA512 adcf5fad076095133ee773e30fb07971ab51b1bcebefb61ae6d69af7f6333e225c5b8807126e9b632a9eacb5e74b0c0bfe63043e131a163d3f890b4c126b54c6
 EBUILD libuv-9999.ebuild 1366 BLAKE2B 417a761a89412ec9010fe8f7e28c64dd9faaa8c5dda6c5b920d372eb3283665db7cba9b73976264dbe043f898ae5a90e35e508cc628bc32491d803d38e141555 SHA512 265ab2037600825d36c12df3a4ff6db43631c28c481116963d9c5ba6bce555e18572bf91ac7900d74c1fc70d201d93499055bf89c9c8912b49ae7dda318b9479
 MISC metadata.xml 1426 BLAKE2B 79a040706bd2e88560fdf7cdd75226c51384f1b27f8f86798f3a694d1d4b02ce309edef4f1921f73e498533e37deff9051ebdaa6ae565defabe9d4546aa33bd4 SHA512 a6fa2c3217de06d7d324b37b00e0cb19e8d0b192cd10736d32f5d459c701c14a6aa296d7d4d292f7c56120953423df0068f3f71495941295c97e86c283b084d3
diff --git a/dev-libs/libuv/libuv-1.43.0.ebuild b/dev-libs/libuv/libuv-1.43.0.ebuild
index 116ac24044e4..f257414de42a 100644
--- a/dev-libs/libuv/libuv-1.43.0.ebuild
+++ b/dev-libs/libuv/libuv-1.43.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/libuv/libuv-1.42.0.ebuild b/dev-libs/libuv/libuv-1.44.1.ebuild
index 082ca534234d..d9e07add0a2e 100644
--- a/dev-libs/libuv/libuv-1.42.0.ebuild
+++ b/dev-libs/libuv/libuv-1.44.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools multilib-minimal
 
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index dbe175004b67..2bfd5c8b6ed0 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -2,8 +2,12 @@ DIST libvterm-0.0_pre20181126.tar.gz 65524 BLAKE2B 00ad4cbc60739aae173e86ae7aa35
 DIST libvterm-0.1.1.tar.gz 69044 BLAKE2B 2e521a26238772370718e3c643e2225c9be7877f6312573d54c8cf3b34e38996886f1100ddae12e34ced1c8eace1a307238024fb91b2a96e6b9e2e85d30a5073 SHA512 beb21ae2bcc5f5e7dbc8cb645e004ce923f2b77f756b48a9ec835dbe1c99afa8cdbce12c5f982b5ca880b5b1ea113570d48733a1d043a7b16ae271f5718a6757
 DIST libvterm-0.1.2.tar.gz 69050 BLAKE2B bd547e14ef2b2b7c733a88ccd975db5ccc936ad5df49221cc6877be223e48da41fd8e5cf40dbc8750a95d6efaa6e5b97d337d4a013ec534a4bbfd68279325bc0 SHA512 5d6a17b98d4dda9d0529c3686cadc1f788e48667fa133100bfb0cdc92a6b08d0ea2f1a6058f58941e1408788c4f1d5a86941ec2457e31c6582f5ddd13bcdf7c4
 DIST libvterm-0.1.3.tar.gz 69115 BLAKE2B befdb173a75652a42f3ba72682cc5c411ee170f2cfe46a22f133ca2b414f40f3af97331a4aaa34ca2a36f39b2ef92b63f2730bd872db8181512fd18f95921034 SHA512 de68b36c589638cc727fdd8153af66cc9288d32567bca1213e3769418a7b98afff68565dfd34f73f74625c39e66b60da7e658e9afa9bef4efa2072ff91d872e5
+DIST libvterm-0.1.4.tar.gz 69122 BLAKE2B 4f0acc9ec6755c4a840e5df6c32c44e12c5316b5c5918d0e8eada19d819736c3e5b9090b468e32b3141a7fbb5ba226e365be27d6d1d9ca22f9f5e365fc3971c2 SHA512 90b5d47417e3f469df5c6574a27d12bd6bd1571d17cab7c4ac0ee61b1dbcb6361987f6fdfd11e314ea32f8958ec165c319a34d0f77288947c7cbc11de697d524
+DIST libvterm-0.2.tar.gz 79712 BLAKE2B db17d15550a595652368edd7ee0ccab2a69effa79677a23d6ee94731fc05d685df0de843d2e953cd59d2077922e72834d7ab09eaf5260aed869d9511cfd224a7 SHA512 bc99ae4fbdc165ced92c10fb0168ae6da2ed702208064616fefcd42aba71c57b7d42a08bc5b0e7e1ebda8cc4b5682d16059bdd2edfb12fbd8ac97527e854b14c
 EBUILD libvterm-0.0_pre20181126.ebuild 819 BLAKE2B 407c20beaada04be4a5ccf381780f9c4f3003a621f6fef0a300a261e58380a1771ab5448c4cdcfa2492dac558b18a083c5ec10bbb8a27b2ab948d08c72951249 SHA512 929568c1d1c5c56c43c39fb502cc1d08691dae6a6da69c6673baee415d8f17e6f0e7a0296d09d51ccac227d1accae9d147aef24762c665b516cdd154a552be07
 EBUILD libvterm-0.1.1.ebuild 877 BLAKE2B d7ccb94b2b5302528a32d1c5eb9cfd93b55a201059f117e5c07911a5f734e05d3b7a62c4694aec0b1e519c820e550ee65a41a28ae57f96454589477d031595af SHA512 f1a89cd21460683084fe86dfb511897ad60a45eae00f5d5f90b5053876f047fcbc4b8d1e81d1278e0486bf1e856f69c43a0673d5bd94e21b6197d5ebfeb5d85d
 EBUILD libvterm-0.1.2.ebuild 856 BLAKE2B f0280c1a73cab89dc1b306df9f2e690bb7ae4a524af4d1b5ba4bc1dfa12c07b4a777bf08214ce5fc27725e334fbd0dcf1a5d8baaf3e7ab808816caaa18620e7f SHA512 2de243264c74a0cb432b49615aa4400eb64833c502237c8eec95706625ca0b2130a5201a4f97c94b50d93d187ad9d79803e09a796a37100ffc31729249b98fcf
 EBUILD libvterm-0.1.3.ebuild 881 BLAKE2B e47aa30b6d333e556fd2970d15081166bc64b318f0a8e51089209e85e11f7d0c63acdd93c79e9d6164a6dfc9160d8853a284f92f4d758f72e97a6c118d254760 SHA512 591a3ebe5ddfa0f73d575abe1b78ad59205df61d6f4c507ac91c74279bc8a351fa06dd4c6f6d8cd76228176084546b15827d05cab80cda05eea312c70ff94312
+EBUILD libvterm-0.1.4.ebuild 885 BLAKE2B 563129e9cf4dcd86b211c60d24481a88a0f028ba0a3ebc469e9e1ac5571b481f463c243d073478720c9317a46b74853131e6fa01091c045b9e942712f7844f9e SHA512 d03ddfd8738cafe7d010d4a1b57f91beac9f4a9f2c224ce95347e1a86d9207b8fe84403854ab23ea787afddafbfef273ae93aad58e12d8060d5de7f0ed34ddd3
+EBUILD libvterm-0.2.ebuild 1098 BLAKE2B afaf31a7a3da3eb8817b796f70d8388a26f8006bbbed97d4906ff365e5f81864be7009e91c94aebfa0c76b56f396e7f3d58920733ad0108578b4acf9834be6c0 SHA512 ad3e3b00c078bf7d59682e8072058223cae92251e7fdbf9095efd37c4b4555a0c1da2f21f8712a4f712c17e8f3a0ba47001d9e5e9f8220e930f6496e1e455613
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/dev-libs/libvterm/libvterm-0.1.4.ebuild b/dev-libs/libvterm/libvterm-0.1.4.ebuild
new file mode 100644
index 000000000000..21001f797e99
--- /dev/null
+++ b/dev-libs/libvterm/libvterm-0.1.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
+HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
+SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-lang/perl
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+RDEPEND="!dev-libs/libvterm-neovim"
+
+src_compile() {
+	tc-export CC
+
+	append-cflags -fPIC
+	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake \
+		VERBOSE=1 \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" install
+
+	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
+}
diff --git a/dev-libs/libvterm/libvterm-0.2.ebuild b/dev-libs/libvterm/libvterm-0.2.ebuild
new file mode 100644
index 000000000000..84e1e689e51e
--- /dev/null
+++ b/dev-libs/libvterm/libvterm-0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
+HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
+SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+# Fedora have a revert patch for now:
+# https://src.fedoraproject.org/rpms/libvterm/blob/rawhide/f/libvterm-0.2-fix-resize-buffer.patch
+# so let's see if 0.2.1 is any better or if this is actually needed for us?
+#KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-lang/perl
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+RDEPEND="!dev-libs/libvterm-neovim"
+
+src_compile() {
+	tc-export CC
+
+	append-cflags -fPIC
+	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake \
+		VERBOSE=1 \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" install
+
+	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
+}
diff --git a/dev-libs/libwbxml/Manifest b/dev-libs/libwbxml/Manifest
index 50c5ad1ddbcc..e7c213f5de89 100644
--- a/dev-libs/libwbxml/Manifest
+++ b/dev-libs/libwbxml/Manifest
@@ -1,3 +1,7 @@
+AUX libwbxml-0.11.7-expat-compat-fixes.patch 5005 BLAKE2B 705cd2068fc95536a8ed329de2e77cacb044b01273689c110d78f9a6500914961e4f7f23da05a18fb3743c89ad78f7f2ab618c8b187e4280d18dd10c0d71f102 SHA512 e2ca3c5134bfe4800489ba215c443f85ff85612db45da6896c3d6bed6b493eefc4b904b3b9a3b8fa8a6b2ab8f5c294866512dd064ac315ebc689756882a4395f
 DIST libwbxml-0.11.7.tar.gz 427429 BLAKE2B 1ec456032d4d343f5b11c60dfe5fa5dfb8750c87f1e05c48b1671257822ce7ec121a7006ed9749aacd84d4ce9f5dfa0c358cf3f3581a4a24a34db1c91338f74a SHA512 fc855650661593596a158527682d2c40d800c1fa44169d79e9ca9c6d64d67b6c660807ed89b1bddd644f114c27711356627ac919af91fd7f19d409879505512f
+DIST libwbxml-0.11.8.tar.gz 362833 BLAKE2B 8501a578c1937097a7f0993baf0bed1d645d14441fca149142a8d338f9b6aece7f726576d9170dfc298388c66937d8a6549d52ed75305cab2c427c82b1331dfd SHA512 14b74e3d25f21ce4bf05f4ed546087817c698b5a44190c569b7691e26510b117118bf828e15beccaa4bdd2e744c45f9b5695b38eb7994f3af0f4f81f90ecff69
+EBUILD libwbxml-0.11.7-r1.ebuild 761 BLAKE2B 7622ce155b8348dea4c9a6d607637476ffe54dbfcab1b9888714b2941e4ebc2ef7cf496c5da9c84657bf1b5b7e03ea8aa8f56d810ca396ea352575015409e919 SHA512 d8f03a241a8c461a1babe616c4c405c3be14015cf82ec9b0ec16d74451477f5f6bdee2b2e8afd2f6f2da75268859d13a749c3599e1db4c7eaa2f0715304d7190
 EBUILD libwbxml-0.11.7.ebuild 700 BLAKE2B 9798f8f3aa8461d32f86089d9ef4cc059ce393b65afd31d77bc984d0538d960c35a8f9c42fe5418850d35ffff0782fcc20b1e2a905d92cc307f8936cd789d2aa SHA512 dfa8c1f81e264b465015631865bd23b38237dcbbfae252d21fc776b6826770dd841af503717d0a8f559099e42bcb5ef861010ac09f04be855639204d21f12e41
+EBUILD libwbxml-0.11.8.ebuild 703 BLAKE2B a501bdabe2911fad1552fab29d2926650f426ac254c68106eb45455d3eaa5b23c16bbdcc9a4878a09e751b8369efe08d00d48ea93b0fa6773b0136999151a4ba SHA512 b1ce25f7fa5a4ef9d5bb56f0a074abef22c228879f1b55e7ba28170222276b71358bbbae20efca2301da0df792c960d6f653f7551c1b27c3222114e2931c0998
 MISC metadata.xml 393 BLAKE2B 270d88949c326fa1d283b9e7e9a168dc5fce083a2545c6933efc9792e407ecc1742dc73a06ae8d071c14b9816487f6d7690e4c5ffde6fc0e00042d1442d8dd89 SHA512 6a5daed5693df3ac31def8d5e1f909bcdd65b8aa459c9cb3dab6659f652ed510fed64fc815a048447a5bbeeaedcda5942a44d74b3232e01344f80ec50d53285f
diff --git a/dev-libs/libwbxml/files/libwbxml-0.11.7-expat-compat-fixes.patch b/dev-libs/libwbxml/files/libwbxml-0.11.7-expat-compat-fixes.patch
new file mode 100644
index 000000000000..00479c7f6437
--- /dev/null
+++ b/dev-libs/libwbxml/files/libwbxml-0.11.7-expat-compat-fixes.patch
@@ -0,0 +1,116 @@
+https://github.com/libwbxml/libwbxml/commit/4664d476fb5029073012b91880ce2a9bbc0b4725
+https://github.com/libwbxml/libwbxml/commit/4425e80f74b93a590b2c99638b9c5095e6a66244
+
+From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
+Date: Thu, 24 Feb 2022 20:30:18 +0100
+Subject: [PATCH] Allow the use of a namespace separator specified by the
+ constant instead of hardcoded colon in the SyncML related code.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
+--- a/src/wbxml_internals.h
++++ b/src/wbxml_internals.h
+@@ -156,7 +156,9 @@ typedef enum WBXMLWVDataType_e {
+ #pragma warning(error: 4761) /**< integral size mismatch in argument : conversion supplied */
+ #endif /* WIN32 */
+ 
+-#define WBXML_NAMESPACE_SEPARATOR ':'
++/* Separator must be the same in both cases - once as a char, once as a string */
++#define WBXML_NAMESPACE_SEPARATOR     ':'
++#define WBXML_NAMESPACE_SEPARATOR_STR ":"
+ 
+ /** @} */
+ 
+--- a/src/wbxml_tree_clb_xml.c
++++ b/src/wbxml_tree_clb_xml.c
+@@ -33,6 +33,7 @@
+  * @brief WBXML Tree Callbacks for XML Parser (Expat)
+  */
+ 
++#include "wbxml_internals.h"
+ #include "wbxml_config_internals.h"
+ 
+ #if defined( HAVE_EXPAT )
+@@ -160,8 +161,8 @@ void wbxml_tree_clb_xml_start_element(void           *ctx,
+      * potentially embedded documents.
+      */
+     if ((
+-         (WBXML_STRCMP(localName, "syncml:devinf:DevInf") == 0) ||
+-         (WBXML_STRCMP(localName, "syncml:dmddf1.2:MgmtTree") == 0)
++         (WBXML_STRCMP(localName, "syncml:devinf" WBXML_NAMESPACE_SEPARATOR_STR "DevInf") == 0) ||
++         (WBXML_STRCMP(localName, "syncml:dmddf1.2" WBXML_NAMESPACE_SEPARATOR_STR "MgmtTree") == 0)
+         )&&
+         (tree_ctx->current != NULL))
+     {
+@@ -255,8 +256,8 @@ void wbxml_tree_clb_xml_end_element(void           *ctx,
+             /* End of skipped node */
+ 
+ #if defined( WBXML_SUPPORT_SYNCML )
+-            if (WBXML_STRCMP(localName, "syncml:devinf:DevInf") == 0 ||
+-	        WBXML_STRCMP(localName, "syncml:dmddf1.2:MgmtTree") == 0) {
++            if (WBXML_STRCMP(localName, "syncml:devinf" WBXML_NAMESPACE_SEPARATOR_STR "DevInf") == 0 ||
++	        WBXML_STRCMP(localName, "syncml:dmddf1.2" WBXML_NAMESPACE_SEPARATOR_STR "MgmtTree") == 0) {
+ 		/* definitions first ... or some compilers don't like it */
+                 WBXMLBuffer *embed_doc = NULL;
+                 WBXMLTree *tree = NULL;
+@@ -277,10 +278,10 @@ void wbxml_tree_clb_xml_end_element(void           *ctx,
+                 }
+ 
+                 /* Check Buffer Creation and add the closing tag */
+-		if ((WBXML_STRCMP(localName, "syncml:devinf:DevInf") == 0 &&
++		if ((WBXML_STRCMP(localName, "syncml:devinf" WBXML_NAMESPACE_SEPARATOR_STR "DevInf") == 0 &&
+ 		     (!wbxml_buffer_append_cstr(embed_doc, "</DevInf>")))
+                     ||
+-		    (WBXML_STRCMP(localName, "syncml:dmddf1.2:MgmtTree") == 0 &&
++		    (WBXML_STRCMP(localName, "syncml:dmddf1.2" WBXML_NAMESPACE_SEPARATOR_STR "MgmtTree") == 0 &&
+ 		     (!wbxml_buffer_append_cstr(embed_doc, "</MgmtTree>"))))
+                 {
+                     tree_ctx->error = WBXML_ERROR_NOT_ENOUGH_MEMORY;
+@@ -289,7 +290,7 @@ void wbxml_tree_clb_xml_end_element(void           *ctx,
+                 }
+ 
+                 /* Add doctype to give the XML parser a chance */
+-		if (WBXML_STRCMP(localName, "syncml:dmddf1.2:MgmtTree") == 0 &&
++		if (WBXML_STRCMP(localName, "syncml:dmddf1.2" WBXML_NAMESPACE_SEPARATOR_STR "MgmtTree") == 0 &&
+ 		    tree_ctx->tree->lang->langID != WBXML_LANG_SYNCML_SYNCML12)
+ 		{
+                     tree_ctx->error = WBXML_ERROR_UNKNOWN_XML_LANGUAGE;
+@@ -305,7 +306,7 @@ void wbxml_tree_clb_xml_end_element(void           *ctx,
+ 				lang = wbxml_tables_get_table(WBXML_LANG_SYNCML_DEVINF11);
+ 				break;
+ 			case WBXML_LANG_SYNCML_SYNCML12:
+-				if (WBXML_STRCMP(localName, "syncml:dmddf1.2:MgmtTree") == 0) {
++				if (WBXML_STRCMP(localName, "syncml:dmddf1.2" WBXML_NAMESPACE_SEPARATOR_STR "MgmtTree") == 0) {
+ 					lang = wbxml_tables_get_table(WBXML_LANG_SYNCML_DMDDF12);
+ 				} else {
+ 					lang = wbxml_tables_get_table(WBXML_LANG_SYNCML_DEVINF12);
+
+From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
+Date: Thu, 24 Feb 2022 20:31:15 +0100
+Subject: [PATCH] Change the default internal namespace separator from the
+ colon to the pipe.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This solves compatibility with libexpat >= 2.4.5
+after fix the security problem CVE-2022-25236.
+
+This resolves issue #76.
+
+Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
+--- a/src/wbxml_internals.h
++++ b/src/wbxml_internals.h
+@@ -157,8 +157,8 @@ typedef enum WBXMLWVDataType_e {
+ #endif /* WIN32 */
+ 
+ /* Separator must be the same in both cases - once as a char, once as a string */
+-#define WBXML_NAMESPACE_SEPARATOR     ':'
+-#define WBXML_NAMESPACE_SEPARATOR_STR ":"
++#define WBXML_NAMESPACE_SEPARATOR     '|'
++#define WBXML_NAMESPACE_SEPARATOR_STR "|"
+ 
+ /** @} */
+ 
diff --git a/dev-libs/libwbxml/libwbxml-0.11.7-r1.ebuild b/dev-libs/libwbxml/libwbxml-0.11.7-r1.ebuild
new file mode 100644
index 000000000000..d351e183714d
--- /dev/null
+++ b/dev-libs/libwbxml/libwbxml-0.11.7-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Library and tools to parse, encode and handle WBXML documents"
+HOMEPAGE="https://github.com/libwbxml/libwbxml"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/expat
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+DOCS=( BUGS ChangeLog README References THANKS TODO )
+S=${WORKDIR}/${PN}-${P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-expat-compat-fixes.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_INSTALL_DOC=OFF
+		-DENABLE_UNIT_TEST=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libwbxml/libwbxml-0.11.8.ebuild b/dev-libs/libwbxml/libwbxml-0.11.8.ebuild
new file mode 100644
index 000000000000..8a8e8ca6f73a
--- /dev/null
+++ b/dev-libs/libwbxml/libwbxml-0.11.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library and tools to parse, encode and handle WBXML documents"
+HOMEPAGE="https://github.com/libwbxml/libwbxml"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/expat
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+DOCS=( BUGS ChangeLog README References THANKS TODO )
+S=${WORKDIR}/${PN}-${P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_INSTALL_DOC=OFF
+		-DENABLE_UNIT_TEST=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index b4a42ea4dabb..c605bd2c6e06 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,8 +1,10 @@
 DIST libxml2-2.9.12-r5-patchset.tar.bz2 7231 BLAKE2B d9d0d56ebccbfe234a8af04cc5343c1a02d84fbd998c2373fd48be59cf92807a9417db650a6bb6ba309e101994c4ae2b28edda7bf635c7728eb8b8047d0d3391 SHA512 b2db0fe4595c1559d9f8dc836ee6eee469191f6c490fc95d25d9fa99a544e80858894cc35b6e4a6624a38d0309800540badc929e86ef29950c1107caa4656a14
 DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd
 DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656
+DIST libxml2-2.9.13.tar.xz 3243336 BLAKE2B 845a8283cf1ff9fd9f7926cfe0042c042a9de5ed184520d8057f7b33312687d5ff28abdf30dd2674795d78dc80326203a907f9e22cd261805309403ecdd585f5 SHA512 fc51980cb9222bd3b5242f73d28b55fa15a80e68e52e1c45274f1eda11500ed385853209edb3b2a1f06b9de0be304c159a9bd898c7d84b0899eacb00723d98b5
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.12-r5.ebuild 7434 BLAKE2B d103ffcb4e2eb6f3e6cc1e57be90fb18e2bac3b4eda91c1a444eb82b208f5a2767f70f17f319ddd6c0419be68c32bb68de78a899f7c0bc81a108790ef4752e5f SHA512 cccea99b6dd67b9e4b785836ab33023e423616842a910db486e66440caa408ce80f3a18fa3bdecf5a6b45a504e384d162196a41e003d393ff4acb68ac011ba69
+EBUILD libxml2-2.9.12-r5.ebuild 7424 BLAKE2B 872e88ab344e86efb89f3d5cbe560f20e3a35e8b0a7fdccaf6ebff0fe5111ddf47789f236398666856489dc7272baaa221c8e347c4fbbaec218aaf72bbe2573b SHA512 90ef531d12bd73136f1fdeb8855b1ccead6ee00a3a47fbcf91dc6a03c5c2868a0314497f7433caadaf204ed2acab245d228715276bd6c107ba794397dc0e6a95
+EBUILD libxml2-2.9.13-r1.ebuild 6583 BLAKE2B 9c49b05043e933fff56084538ba5dca1f93d59d38af5a084de4fc02f5543df6f9ad1dc1afb8ae02d6e83889fd431712f69d3ed2223bcf8e645167a286c81d925 SHA512 75f535d26e8607b594baf443dc6e2fd7a7d085f74a5939c92041289efa18d02ab129c31007ef5307569f9abc05fa8b0f8c84907a811b1840703bd331fcf7e96f
 MISC metadata.xml 458 BLAKE2B 318644d7202e85490c0b2f7a6fd36744cce5e4fa8929534149823d679a7fd01d118b9653ea5039c9e82b7cdcd423bf4541313cf550027ccfab8393f0b9b8ceca SHA512 b173246c3ec8351343bbe16f5572728ce6c6740056a0cf96e9eb4d975c181d54213d06c41ada9c38ac11727359d14d453cd1e824b29a52f7291a7ee50bfa5ed0
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild
index 7dd8d6761000..9cc72e7d06a0 100644
--- a/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.12-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,7 @@ SLOT="2"
 # Dropped keywords for now because it's a minor LDFLAGS fix, and it will ease upgrades
 # bug #802210
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
+IUSE="debug examples icu lzma +python readline static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -148,11 +148,11 @@ multilib_src_configure() {
 
 	libxml2_configure() {
 		ECONF_SOURCE="${S}" econf \
+			--enable-ipv6 \
 			--with-html-subdir=${PF}/html \
 			$(use_with debug run-debug) \
 			$(use_with icu) \
 			$(use_with lzma) \
-			$(use_enable ipv6) \
 			$(use_enable static-libs static) \
 			$(multilib_native_use_with readline) \
 			$(multilib_native_use_with readline history) \
diff --git a/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild
new file mode 100644
index 000000000000..5d7a300bba44
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PATCHSET_VERSION="2.9.12-r5-patchset"
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+inherit autotools flag-o-matic gnome.org prefix python-r1 multilib-minimal
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20130923.tar.gz"
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
+SRC_URI+="
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
+	)
+"
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug examples icu lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
+
+PATCHES=(
+	## Gentoo
+	# Patches needed for prefix support
+	"${WORKDIR}"/${PN}-2.7.1-catalog_path.patch
+
+	# Fix python detection, bug #567066
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
+	"${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+
+	# Fix python tests when building out of tree #565576
+	"${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+
+	# bug #745162
+	"${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
+
+	# Don't bother copying Python's libraries (bug #798942)
+	"${WORKDIR}"/${PN}-2.9.12-dont-copy-python-ldflags.patch
+)
+
+src_unpack() {
+	local tarname=${P/_rc/-rc}.tar.xz
+
+	# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2
+
+	cd "${S}" || die
+
+	if use test ; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Avoid final linking arguments for python modules
+		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
+		# gcc-apple doesn't grok -Wno-array-bounds
+		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
+	fi
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	# We now need to run eautoreconf at the end to prevent maintainer mode.
+	#elibtoolize
+	# Needed for https://gitlab.gnome.org/GNOME/libxml2/-/issues/338 too in 2.9.13
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# 1) USE zlib support breaks gnome2
+	#    (libgnomeprint for instance fails to compile with
+	#    fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+	#
+	# 2) The meaning of the 'debug' USE flag does not apply to the --with-debug
+	#    switch (enabling the libxml2 debug module). See bug #100898.
+	#
+	# 3) --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--enable-ipv6 \
+			--with-html-subdir=${PF}/html \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	libxml2_py_configure() {
+		# Ensure python build dirs exist
+		mkdir -p "${BUILD_DIR}" || die
+
+		# Odd build system, also see bug #582130
+		run_in_build_dir libxml2_configure \
+			"--with-python=${EPYTHON}" \
+			"--with-python-install-dir=$(python_get_sitedir)"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_configure
+	fi
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+
+	emake "$@"
+
+	popd > /dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		local native_builddir="${BUILD_DIR}"
+
+		python_foreach_impl libxml2_py_emake \
+				top_builddir="${native_builddir}" \
+				all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake test
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		install
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl libxml2_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	rm -rf "${ED}"/usr/share/doc/${P}
+
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ -n "${ROOT}" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# Need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# We don't want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e "${CATALOG}" ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 945bfaa6f896..c10ca04c8bfd 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,7 +1,7 @@
 DIST libxmlb-0.1.15.tar.gz 92923 BLAKE2B 97b6af812397dd279e7e3c038627fcf8228cbfa5c3af91ceeb5361e32d37d357eda6a193f627a5f4442426fb08abca1ff11684fe199d9d3a4add72ca4f3f5d08 SHA512 58268b3a690af36c0923afdee3ae58e88bf778eebbc6a439be1bc85ed985efdc20cd7006c976586f7be87310dc091d67dddd370f4bbec58379fc4e7349bfa3d8
-DIST libxmlb-0.3.5.tar.gz 118335 BLAKE2B bc644ec810d8cfc8db4da5fd9eef0f97eb02efc4d634bb414e0404984ca7fc35be04dd2041dc4661d63515789a65217ae5ba60e8eb8dfc2d117beca73a69cf43 SHA512 2da4fbb0942a5b42c81bdf49926822b75b5a4b497a7f1c0c704b8ff4c249adeb85d22568a28b68b57a66e0019c13e129fd14d517ad49c7dbead4cd39ee790be3
 DIST libxmlb-0.3.6.tar.gz 118521 BLAKE2B ba79d80216705b8f2f6e02a10ebab7cb3765d3718bf821bff4c6fbfe3cee7c2128230f670751948b430bd206f34924be438d4293dc154bcd69338e85cea90032 SHA512 2ea8592aa950be597254beefe1db0097ea3fb36b42e8ace04a13e34a17718bd74f232633e1555cc90283d81568fdfe2a198b68151ead5e0fa5628d344de8df9b
+DIST libxmlb-0.3.7.tar.gz 121055 BLAKE2B 5dda4695041af85a3fbb6c5ed9888ed822df1ddc6c281a89629598c82c022a8c55fdebbb4e49c553ed99d38c97843855569a3fcc5c2531b698b024e4b68638f6 SHA512 398d49e190aedd5c1f0eab2a8b6ddf5fc1cd866d575459c049e55399fc8fb54512783cc024b8f3016fbf19232502ba86781eea5b937871a3aed25b5ed28a5edd
 EBUILD libxmlb-0.1.15-r1.ebuild 1207 BLAKE2B 1ea024b9a69ee5da1d849c1f5ad7f13fd78621498591faa5de9ff48a6889c428018ab880472950ec5ea9fa10c70e2388e7661cee6f7a81942926330008d0b93f SHA512 332919207fd280d33be7e4087b356745b065b8af8be7be3149c40cd741173eaa1d92b3928f6704471c021f61aaf0d13424d6204f60e1733f145dbc92c6985c66
-EBUILD libxmlb-0.3.5.ebuild 1204 BLAKE2B 0fb25cf75ae6f8c8c6a0bf19609f31f9f62f6283deb5ae429e972c498e2dd351321b3069876032d71fe66d3ba5e64dfe5fbccc829cc99ec14a28adf98e69bddd SHA512 e863b1407d90806a4360b7cd50dc7dd9b01363205a035f692f00cf8e7644e829732790f7456811aca816bfa3712271cd50107e9b8b703fc57d3ff43e582c4037
 EBUILD libxmlb-0.3.6.ebuild 1204 BLAKE2B 0fb25cf75ae6f8c8c6a0bf19609f31f9f62f6283deb5ae429e972c498e2dd351321b3069876032d71fe66d3ba5e64dfe5fbccc829cc99ec14a28adf98e69bddd SHA512 e863b1407d90806a4360b7cd50dc7dd9b01363205a035f692f00cf8e7644e829732790f7456811aca816bfa3712271cd50107e9b8b703fc57d3ff43e582c4037
+EBUILD libxmlb-0.3.7.ebuild 1204 BLAKE2B 7f650422fea3e1d88e1ecf474f09d8c38ff89ee957d6a8e05e5196f5f903e4a6af64ace26b47120cb8386b75d9374311ff120a0fe54e92734cbd335da56b9e9a SHA512 9b60a17ad5a2e31fd2ff3c8b234ac3baf80679addee8e689e9121ea14f5d13c3809afd3fb1899fd547e0290beada174251fe0429c627163c007880d7b3f9a8f7
 MISC metadata.xml 542 BLAKE2B 86e3ac797d222e3ac17592e2920f516387e530e02c5e64df4c64ec246d4cfb32fd80f994814cff093722ab1ae3d14169dd3f3bf17b3a022aa2d4d2f64069bc38 SHA512 52a50c11d1b4b036d22d3c2fc42b22b1b6bdcc04ec5d86b7567e3bcfe3080423867c5689657479c4b17b0826b06325b20d0d4ee8c45a6bafeb1cc2b0616d23a8
diff --git a/dev-libs/libxmlb/libxmlb-0.3.5.ebuild b/dev-libs/libxmlb/libxmlb-0.3.7.ebuild
index 84e2880a46ac..86105c7d3ce4 100644
--- a/dev-libs/libxmlb/libxmlb-0.3.5.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 56c375a2c21b..fb6504ad723a 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -2,5 +2,7 @@ AUX libxslt-1.1.34-CVE-2021-30560.patch 6053 BLAKE2B cbeae5b4f87a6a5872a015848b1
 AUX libxslt-1.1.34-libxml2-2.9.12.patch 4178 BLAKE2B 00dc945c2a4d50bb4a428c1ae5fe16128565d6bf8174b245c035c65281c3b1e9c798b61054b538341a2ea099fa4287be99e53c2efae67b8b43649946d6b0b643 SHA512 f688a68e7f9b005a2073722c0857dc4de786a9fb18d50065d9b5cda9bb5cc4597f3f34b4ba5448739b993dab46fb49ee22d3cd15c7c7434bb56d04dc06896e0b
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
 DIST libxslt-1.1.34.tar.gz.asc 488 BLAKE2B fff407ab2c2bbafa804e5a1f84ca447c706d75fd7489c99ac6040b625d0417a0e6c189be3457e6cc6ecd6b7860829875ea95a132fef24f8a532156361f8a5308 SHA512 9b155d4571daede99cdbf2813a85fb04812737b5e23d3f7c9840225b38f3dbf171623a21645daaee190e7ff9ba38bde932922e96a2a2312c203ffa9917c3baea
+DIST libxslt-1.1.35.tar.xz 1827548 BLAKE2B 9667a93e61f50098a512c1351bce2ee937fc5d29488d010b525122d28ffedc73e0930402f3df2d378161a031dc016a15f0f03bdc343f0c4aa5d0b5c454f8002d SHA512 9dd4a699235f50ae9b75b25137e387471635b4b2da0a4e4380879cd49f1513470fcfbfd775269b066eac513a1ffa6860c77ec42747168e2348248f09f60c8c96
 EBUILD libxslt-1.1.34-r2.ebuild 1977 BLAKE2B bc92b5ce86af6e6c83109b094e5b1e32d3eb903359f43b9e1c388de29dd44da03c813a34caabd6e5a811d67f09fca7b0385f04a313c39bdb2a7f6ce0b834e3f5 SHA512 608488b624330f72a52204b2062c12b834630c5b0665198e9b470691317e475ef24c0b772c2c550accfe30e69d9adf1dd4ea178c39ec40f1fada798ca7bbb353
+EBUILD libxslt-1.1.35.ebuild 1720 BLAKE2B 512996f051cbd27a9ec51f5da583cf884f22dc4b335398a2915ade39789f38f24f24c508dc692e4ea1d034d912dddff0f06f1e3b91818da95e4214fe71f81a65 SHA512 d6857c96f8e7b8c67f5da8701a158cf0399583aeb6d11f4891518320e7ec6a2d35b3218c92db6625bfb5ecc731cbc941776b55f80aff5a7736bf411ce404a9dd
 MISC metadata.xml 458 BLAKE2B 75fd3316bf24367ed9748bf7fefd6ebc36811d1cef9606b9fd68155ef7412d192ebc3cc883a79f15210decb7ef7707ff82155ec2f04974c2dca84496660519a8 SHA512 9baf1253900f23539a78ef57cc03cca552eadeb92721517e2f3f54c3df72be8d364b30449ad433793c38a2c1872273231f0b3fe865b2ace2e605a1ae290c4f6b
diff --git a/dev-libs/libxslt/libxslt-1.1.35.ebuild b/dev-libs/libxslt/libxslt-1.1.35.ebuild
new file mode 100644
index 000000000000..3dac6a1a7af9
--- /dev/null
+++ b/dev-libs/libxslt/libxslt-1.1.35.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org libtool multilib-minimal
+
+# Note: Please bump this in sync with dev-libs/libxml2.
+DESCRIPTION="XSLT libraries and tools"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt debug examples static-libs"
+
+BDEPEND=">=virtual/pkgconfig-1"
+RDEPEND="
+	>=dev-libs/libxml2-2.9.11:2[${MULTILIB_USEDEP}]
+	crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xslt-config
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libxslt/xsltconfig.h
+)
+
+src_prepare() {
+	default
+
+	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
+
+	# Prefix always needs elibtoolize if not eautoreconf'd.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	# Python bindings were dropped as they were Python 2 only at the time
+	# Work in 1.1.35+ is occurring to add prelim. Python 3 support, so could
+	# restore if something needs them.
+	ECONF_SOURCE="${S}" econf \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-html-subdir=html \
+		--without-python \
+		$(use_with crypt crypto) \
+		$(use_with debug) \
+		$(use_with debug mem-debug) \
+		$(use_enable static-libs static) \
+		"$@"
+}
+
+multilib_src_install() {
+	# "default" does not work here - docs are installed by multilib_src_install_all
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index cbb5e96b826f..c8aa9c6b5eeb 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,3 +1,3 @@
 DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
-EBUILD libzip-1.8.0.ebuild 2377 BLAKE2B dfcff8979333cb16b1ab1af1e9a9589177f2d29348ebeea02e84becc73dd3d3748c9e4e4b6d51f657f12b2ccb6665fca491b11613643633fcba425f915d5c330 SHA512 3d596a6173000f4cb441f1e334646521f812bf13c431d880b2e88a5a0457bc91c9ef4da6dfe8088ccde5f629728602b5250b3a2c1e3d781582081866b43a38df
+EBUILD libzip-1.8.0-r1.ebuild 2437 BLAKE2B 45d8062185a433a80f329d3459cd23a4dbfa719190f92daab4861c6fb506404410368abf75fa8edef0d12719dcf88a5559097bbba2d25ae20ec124ea929fd17d SHA512 74f2a2d40c44cb947d12a5c51935e5371941b4cd0ca97a2fc8d5333b9718825a94132ecb7eddaf049aa4bace6d0d04855637ebc3c3b18ec23c27208352eddb1d
 MISC metadata.xml 510 BLAKE2B cd0e88d175985805badcbe4b6aa771fd65ab9e8e86a3d37e18531e61ef9fac92ba191ba4a3806c37743a51541b1f353f5bf58b7195898de74eb2c389623a6994 SHA512 e073a6f074e9d5dc8abffada8338c608915527ab3c76f693cd261c6a99aef73e18c0e0088d508d62032619f779f1c6d9445cdd0273aeb61e41b9e3b449762337
diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0-r1.ebuild
index b5bd1678c9c4..63d0cba908af 100644
--- a/dev-libs/libzip/libzip-1.8.0.ebuild
+++ b/dev-libs/libzip/libzip-1.8.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0/5"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools"
+IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd"
 REQUIRED_USE="test? ( tools )"
 
 RESTRICT="!test? ( test )"
@@ -31,6 +31,7 @@ DEPEND="
 			!mbedtls? ( dev-libs/openssl:0= )
 		)
 	)
+	zstd? ( app-arch/zstd )
 "
 RDEPEND="${DEPEND}"
 
@@ -48,6 +49,7 @@ src_configure() {
 			-DENABLE_COMMONCRYPTO=OFF # not in tree
 			-DENABLE_BZIP2=$(usex bzip2)
 			-DENABLE_LZMA=$(usex lzma)
+			-DENABLE_ZSTD=$(usex zstd)
 		)
 		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
 			mycmakeargs+=(
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 06c92adebfdc..7733e105f339 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,9 +1,7 @@
 AUX link-grammar-5.10.2-musl.patch 371 BLAKE2B 989e27593b2780401a4df5ef292f8487a32f4fe0287e4745143bed6f72a7d0af71b20a1d8e06144bc116fe12f1778a3cf8f3e8f86922f3049d99d82a82b7076a SHA512 d2eb12fc12cdd1129420d976facb7f652bd475336c71d683b9d561dcb4a9001c60d127d27446f3c1f93757ad6715214a53d3170e03ee1952cb3c37ea03368a05
-AUX link-grammar-5.8.0-dont-inject-O3.patch 621 BLAKE2B becccc08314e45416ee96ec52a5b03b3cf5b1fc141a427a774c7d2b816cff985abba54a99b8bc308e9e75759045b335380a186031d647cc8df00582669615ebd SHA512 71e05d722d24a4647af9f879c14d74d2875ee5435f1b70acb8f962f9e7e602e044e8ed98e118e3ad9ebf725a9701a302ca1e5ea75aa8662326f29251c1317138
-AUX link-grammar-5.8.0-out-of-source-build.patch 1189 BLAKE2B ba89966a0744b39f0f24fa3359a031041cae61f3ec26aaad42eb6e05cbc5c33e54f927c460b33f8d1d37b3987e149f1c88da1ebaab408d322954eefa755b38cb SHA512 e2f094f341bf943a57ce04f10f49a1aac8345ced88a63c54fdfceda946ab575ff088c597d61847d9a9bbebf10af9ad1c284239f29004fc7917deddcd79ddce69
 AUX link-grammar-5.8.1-lld.patch 531 BLAKE2B e7a64032d8e8394205d4529e270bee1ec121a6b29b6a779e885cae825678679e521b2f4eb2bec6b6b6c8f1c5f311337c7b2e205a5cb1966538741e72b7e7cb37 SHA512 03dd3164c7626d70019851189fd35d7ecfcbc112b594dafc0c3390f0d533b67611838cd9207a486139f4e4c8ac78f81da87d0c00a0238ad417c90942bcaa2c6b
 DIST link-grammar-5.10.2.tar.gz 3853934 BLAKE2B d2cb64a6b0146f40ce5b197c21ded94f1256360615c2332a1c546f6b6c71c98d2500e97b0fcabae964377a04143fa13ba3af324f2de729cfccd280e53f6fb7c3 SHA512 71bc881cb628fe1898403024d8e949b2fbf44f5d20445f6fff7bb6038646840556d734434beb7eb43b63f661e18333657deaeb1b8c96b50d5fe3b6ef727565c2
-DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e
-EBUILD link-grammar-5.10.2.ebuild 2955 BLAKE2B 9110a507c8574d8fcd73441275831e59b35b28d824ffbb0dd3b21143241faad23e4d906f08abcad9fbfd44ab4b0ee47a4d154c380dac6b2f58dab6813fa2f13c SHA512 2f2fc15e568326559ca3f65db137ee0a0948c63e4c99f7c0daffe5d949c66818be1eaf4e2df561b7e6656a5b4193e9560cd2155e37a6de4a61fd9ed33d87f057
-EBUILD link-grammar-5.8.0.ebuild 3187 BLAKE2B c571f8e5efd48157f76551eadef5de79f6d1092ee98299b4d0fd0d7059dd7971140445913dbab7236dcebef7e113a469eeba70b2a4d5c6d0b7a5c072f2235177 SHA512 2971f78f62d10407e12764b930c2f63ce25b2ff152ff9d8cf399163463461c029b83d14db4b5069b41e476509ccbb8c23dc5b0b0b354aa86f43c0471a24d0ebc
+DIST link-grammar-5.10.4.tar.gz 4593602 BLAKE2B 0515aed27ae8df85ceddb9685ce90db2b6e7671235b9b445b6728b1ac417d6d43b3705566066ff9735fc98c32746342c224f2399bb0f2573784f20b5f998e7be SHA512 a215694f76e15286c478884ea8a13b32976d06ea45d10897dc1b303f256a2c0af94c9f90da26b314ce5e03009b494ab526c729b66f2b1ed46ff3e8b02cb6fd08
+EBUILD link-grammar-5.10.2.ebuild 2953 BLAKE2B 48c814085ec491e5a806bf83d9005435ef02c2fb4f9bfbd58737c6abd1773b7a84a5a3777d4d7f4f171cc831c9bc0c005c22ada79ad6812da0e78d02a1a1c981 SHA512 f2ea6cb09dd955b6ec32a4b8e65688667465abdc3cb8a28af9f1143508a7ecfed9d91bc86e81ade810d612a9734c056f066f8c9cef9a0c25f7cca70e73437a8b
+EBUILD link-grammar-5.10.4.ebuild 2923 BLAKE2B 8559d949ea26e420c97628d02f9f9ce5b467cc9339fdd59ab60c406af6807177ec2cb4f046d039d8e2d3fdb124320a7e6b53b121caef5524b7c0f719c97a5bb6 SHA512 635ebd792e697ac282ab9451c8e95dfe2e46064aa7f5919c5ee62927c347c77a1dc6739d2f09be266dbb39307aa7e955461250e215581e999ad3a8e40a971951
 MISC metadata.xml 1069 BLAKE2B e657e7727730c54d4aee903c585378978a2adf7a3a6851e6995445afe64e966e48bc4bfab6e930449c288b3ffca3436b9fbe67e88f9e790739ff0c8a079a79e2 SHA512 ba898591c96b8d05601389837891f6cda7eece200c10e014e86e0189aeeb5a0d0c04327d348ce2d77fa3d72dbbe3eec5b96953ff6903bd9670f305886f869229
diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch b/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch
deleted file mode 100644
index 2d97b7cc7627..000000000000
--- a/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,8 +137,7 @@
- AC_SUBST(HOST_OS)
- # ====================================================================
- 
--CFLAGS="${CFLAGS} -O3"
--CXXFLAGS="${CXXFLAGS} -O3 -Wall"
-+CXXFLAGS="${CXXFLAGS} -Wall"
- 
- # The std=c11 flag provides the proper float-pt math decls working,
- # e.g. fmax  However, it also undefined _BSD_SOURCE, etc. which is
-@@ -908,10 +907,6 @@
- 
- AC_FUNC_STRERROR_R
- 
--AC_SUBST(CFLAGS)
--AC_SUBST(CPPFLAGS)
--AC_SUBST(CXXFLAGS)
--
- dnl Save the compilation definitions for an extended version printout
- AC_OUTPUT_MAKE_DEFS()
- LG_DEFS=`$ECHO "$DEFS" | $SED 's/\\\\//g'`
diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch b/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch
deleted file mode 100644
index 1616e933664e..000000000000
--- a/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/bindings/python/Makefile.am
-+++ b/bindings/python/Makefile.am
-@@ -4,8 +4,8 @@
- # Created by Linas Vepstas February 2014
- #
- #
--SWIG_SOURCES = ../swig/link_grammar.i
--SWIG_INCLUDES = ../../link-grammar/link-includes.h
-+SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i
-+SWIG_INCLUDES = $(top_srcdir)/link-grammar/link-includes.h
- built_c_sources = lg_python_wrap.cc
- built_py_sources = $(top_builddir)/bindings/python/clinkgrammar.py
- 
-@@ -18,16 +18,16 @@
- 
- # Files that get installed in $pkgpythondir
- pkgpython_PYTHON =                                 \
--   linkgrammar.py                                  \
-+   $(srcdir)/linkgrammar.py                        \
-    $(top_builddir)/bindings/python/__init__.py     \
--   $(top_builddir)/bindings/python/clinkgrammar.py
-+   $(built_py_sources)
- 
- # Apparently, anaconda does not work without this!?
- # This seems wrong and lame to me, but see issue #298
- # https://github.com/opencog/link-grammar/issues/298
- pkgpypathdir=$(pythondir)
- pkgpypath_PYTHON =                                 \
--   linkgrammar.pth
-+   $(srcdir)/linkgrammar.pth
- 
- # The make uninstall target should remove directories we created.
- uninstall-hook:
diff --git a/dev-libs/link-grammar/link-grammar-5.10.2.ebuild b/dev-libs/link-grammar/link-grammar-5.10.2.ebuild
index 16ede02d89b8..2d703fde38ff 100644
--- a/dev-libs/link-grammar/link-grammar-5.10.2.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.10.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE="aspell +hunspell python" # pcre
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild b/dev-libs/link-grammar/link-grammar-5.10.4.ebuild
index 0b97d446d773..9cd72d301f29 100644
--- a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.10.4.ebuild
@@ -1,20 +1,20 @@
-# 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
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools java-pkg-opt-2 python-r1 out-of-source
+inherit autotools python-r1 out-of-source
 
 DESCRIPTION="A Syntactic English parser"
 HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
 SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="aspell +hunspell java python" # pcre
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="aspell +hunspell python" # pcre
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 # XXX: sqlite is automagic
@@ -24,10 +24,6 @@ RDEPEND="
 	dev-db/sqlite:3
 	aspell? ( app-text/aspell )
 	hunspell? ( app-text/hunspell )
-	java? (
-		>=virtual/jdk-1.6:*
-		dev-java/ant-core
-	)
 	python? ( ${PYTHON_DEPS} )
 	!sci-mathematics/minisat"
 DEPEND="${RDEPEND}"
@@ -36,23 +32,18 @@ BDEPEND="
 	sys-devel/autoconf-archive
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${PN}-5.8.1-lld.patch )
+
 pkg_setup() {
 	if use aspell && use hunspell; then
 		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
 		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
 		ewarn "you want aspell support."
 	fi
-	use java && java-pkg-opt-2_pkg_setup
 }
 
 src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-
-	# http://bugzilla.abisource.com/show_bug.cgi?id=13806
-	eapply "${FILESDIR}"/${PN}-5.8.0-out-of-source-build.patch
-	eapply "${FILESDIR}"/${PN}-5.8.0-dont-inject-O3.patch
-	eapply_user
-
+	default
 	eautoreconf
 }
 
@@ -60,13 +51,14 @@ my_src_configure() {
 	local myconf=(
 		--disable-maintainer-mode
 		--disable-editline
+		# java is hopelessly broken, invokes maven at build time (bug #806157)
+		--disable-java-bindings
 		--disable-perl-bindings
 		--disable-static
 		--enable-sat-solver=bundled
 		$(use_enable aspell)
 		$(use_enable hunspell)
-		$(usex hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell '')
-		$(use_enable java java-bindings)
+		$(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell)
 		# $(use_enable pcre regex-tokenizer)
 		# $(use_with pcre)
 	)
@@ -119,7 +111,3 @@ my_src_install() {
 	# no static archives
 	find "${ED}" -name '*.la' -delete || die
 }
-
-pkg_preinst() {
-	use java && java-pkg-opt-2_pkg_preinst
-}
diff --git a/dev-libs/log4cplus/Manifest b/dev-libs/log4cplus/Manifest
index 57b3f7c989c6..3dff397d6493 100644
--- a/dev-libs/log4cplus/Manifest
+++ b/dev-libs/log4cplus/Manifest
@@ -4,5 +4,5 @@ DIST log4cplus-2.0.6.tar.bz2 1197177 BLAKE2B cb2d4635b109690a81f2e228d48424a67ad
 DIST log4cplus-2.0.7.tar.bz2 1210637 BLAKE2B 59e9c3c351c7893c7e9c39e9d12616579cff3b4dfdd3e069f0adb4b75fb2b46d6fe8efceea2b6103c5531a723f015518bf10ce6a581724b6ae5f49e994b74c72 SHA512 9d1b36d0c2347dd9d9ab8852114b8138f56063c51625eaab7f4c680ee852e1e6872c6712465b10057ec9e42305b83d956f6753100dfd3ec58518d6620cc4106c
 EBUILD log4cplus-1.2.0.ebuild 1608 BLAKE2B 9a57f60b53167c615a168a58eb9d6c600c22de0b6494256ee433c360cfb9fcff284fd531ea6c728f56b72ce508c0ac400d01fac0eff27273aaf674a78d908945 SHA512 0a2827afef22fbf973f3dc67edf8c9491e29b754770896c819d1e0ef468b933036e0751a0f7c610a4962c74993c34676d83d89ebf8596e4311cb56ed634ffe32
 EBUILD log4cplus-2.0.6.ebuild 996 BLAKE2B 91d9916ceebb2e64d210f9cd4c2c614d3092d4b3b19d93b55e1ca64c61769dc1bd6a49dad7ee3e83703f9284baabf7eca38d428218c049555625a1c2f37cbf2c SHA512 57bc4981805da36bce56484daf73d70898ba8dae46bbb88a74a9e3544f3014c94fc601925bb3411ae736e8dfebed6e841e817df89957e64a2978e12ece6035a2
-EBUILD log4cplus-2.0.7.ebuild 992 BLAKE2B 56a27c121e135b21806fa17f11e0765825b609c1a8e83668535c8670a8fa435792fac4515ec0cdff94bd318fe9e978610c43f3aa032d89f5f90fa5f0bbe10770 SHA512 b78e3d1adf59851cd4baf3b044304bb7ab7b8fdc05322d9e52aa8d0e75c184b9073e93e2b7d300ef9d422d826c92068a97980fd56ab6091dcd185de054988518
+EBUILD log4cplus-2.0.7.ebuild 999 BLAKE2B 485e5b26b1b5cc036b169af385ef4d9b238d2fa90c9609b3e7b90fdcb4806c7343477404bd8a3e35c2fb79ac17c4122f93354bfc95aeb5f92c6a2c57998eeb73 SHA512 a58a8dfd2300a3d2f6da90deeb5bd1b7baae33d34b0858efd413eb8364c29e24b65b7f16c44738dae09be692ca2ed47bcbffef9fe398686c4be885fd676616f7
 MISC metadata.xml 1019 BLAKE2B 4656573d247296e8ef15672860d7131eb38e2ec19b6a020d545a0df5b2cef3bb2ab23098dadb747960914a0b1afe0e95b3c9598001b4f23f43e531d0ea04c765 SHA512 e0568fab0d1b3d20bf05c3cb1feb65f3e6737de39e5df251ab9fff20b4142e67b143c99749e374edfd6c6c23326e90a4d294551efd2be60b2c849bac40bd6593
diff --git a/dev-libs/log4cplus/log4cplus-2.0.7.ebuild b/dev-libs/log4cplus/log4cplus-2.0.7.ebuild
index 8897b1ac07c7..efb2755fc7fd 100644
--- a/dev-libs/log4cplus/log4cplus-2.0.7.ebuild
+++ b/dev-libs/log4cplus/log4cplus-2.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="explicit-initialization iconv qt5 server test threads"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/luise/Manifest b/dev-libs/luise/Manifest
index 6e7410221a90..568ae810a5a1 100644
--- a/dev-libs/luise/Manifest
+++ b/dev-libs/luise/Manifest
@@ -1,3 +1,3 @@
 DIST LUIse_0.1.1.tar.gz 393815 BLAKE2B be7e35e1f4d5f6227f92bfeb5ed414593215c194e8d7ab67036ac7316cf6faeada839bbef15d8569b6fc276f3bddf41bdaf66e7315f6e8ff1341f8d697327895 SHA512 821b62ed476088c3818cb478a3c525e1d92e9879ef4059da0eb534852a294f802550ad7169066fe439f0cb3645e98656f405594db633061029ae9d7eff86f31d
-EBUILD luise-0.1.1-r1.ebuild 991 BLAKE2B ef3adc32a45786e68f1eb8490a64b801b94597d478b98f03d7b52d5af4dc692a053cd264e03d0bd010903c93f89668e9b73e3ddcddf9da00f32f8bd8febe903d SHA512 24b9b8d8fbe50f97711c01d63664f4b4b58149f6076339937991a8837d00dd4ffde3210fce9909f03d04016a71ee88328f72e84a1b805284f19de82a2c5fe48a
+EBUILD luise-0.1.1-r2.ebuild 990 BLAKE2B 37091f447b83ce4875d5f13a433b520d5da08a0072f05246be9364636f262ea8f04b3e78ee0b48e6c095b78dc620520e30f4064fb197760e0b86cde271016d7f SHA512 af319e9fe721b89b62c48bdce7cc1f9ea3ae8950f3559cc4122517253557a61fe526c14d0173ef44209fb7df971b06f7c94ff6631dc2910b2b6fe31f516eeb49
 MISC metadata.xml 1195 BLAKE2B 794a11d7008985a11f70022f18629d3069f035618da980ca2f92508d62d119e5f0a70f6275d802afec7ee8d9e9fe2deec65e254fa0f162be382bb204928e4530 SHA512 4b654a31f25b65200e7e140a4e7c897587df524b3ab2675d4b53551ccb2e7cbad314690a1eb87e6e5ad94673fd8f4e1e1d013883e2f93102d0e1d9b06f685e76
diff --git a/dev-libs/luise/luise-0.1.1-r1.ebuild b/dev-libs/luise/luise-0.1.1-r2.ebuild
index d2dfb59779fc..f877a4e78d63 100644
--- a/dev-libs/luise/luise-0.1.1-r1.ebuild
+++ b/dev-libs/luise/luise-0.1.1-r2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN="LUIse"
 
 DESCRIPTION="Programming interface for the Wallbraun LCD-USB-Interface"
 HOMEPAGE="https://web.archive.org/web/20140102061822/http://wallbraun-electronics.de/"
 SRC_URI="https://dev.gentoo.org/~conikost/files/${MY_PN}_${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}_${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -16,8 +17,6 @@ IUSE="examples"
 
 RDEPEND="virtual/libusb:0"
 
-S="${WORKDIR}/${MY_PN}_${PV}"
-
 QA_PREBUILT="
 	usr/lib/libluise.so.${PV}
 	usr/lib64/libluise.so.${PV}
diff --git a/dev-libs/mathjax/Manifest b/dev-libs/mathjax/Manifest
index f76db5fa29c1..5ae766d5ecbb 100644
--- a/dev-libs/mathjax/Manifest
+++ b/dev-libs/mathjax/Manifest
@@ -1,7 +1,3 @@
-DIST mathjax-2.7.0.tar.gz 24594403 BLAKE2B 7cadfe7565a7ebba3569fb298a097f07081926b843a06c3c32447757eb0a5d463d654f20c42821010c81c59819bb14fdc5e84a39e87106bb6808bd6c9ca52bb7 SHA512 2a7c2b4a4991485c18f78dda4115da05a31c1a2d952c403726e99d22fd26f166298199238ad482e53b63b5414be687f325b586f5ebe4e2d552447c929415b350
-DIST mathjax-2.7.4.tar.gz 25355532 BLAKE2B 0bed5224356757c64989de8b9355f5c2505f1fa951456c52caf1cc0a9b5a864633ce5299cc9b67b1e5c743e39bcb6aee787a76d6871fc998b614d62e12499f6f SHA512 cddc4c64c188620307f0ede3b0bc7ba071f78702ba6315426d8c83129543a6b81a3a9a115f88017e23b5094b7aefd934c39aeec9688419830e33f9fd0fb1de7e
 DIST mathjax-2.7.7.tar.gz 25347766 BLAKE2B c1f11bc854c95888d7f04ee627094a2e297e7554b0380dab30c08e2c4405495df611b440da0efd1e6456150513e07fa4ef90808d2332f9fb83785c118228de18 SHA512 471bd22475827a13d79de7d335f3e51ace06dfc04f575e8829b4505f428949f1dbe58798635cb434ed02ae0cd3fd8d1d577196b4961365fbcb399cc075d3284f
-EBUILD mathjax-2.7.0.ebuild 1221 BLAKE2B 4ff6312f8abe475a5b04b33af927a6c0bd5d23dbfc47d44c7aaf2ec9a7fc60d0f74df33ad337cb1f839d85d04f5265bfd8ae4f59bfb944b9e51d7bd7504c0d09 SHA512 1569474015ab59649e2cfff5eb76179216e39359730561b9ce8e58edd496e1f92f10821b036a3fed3bc557d6ea2481157172800d614e584c7f35e9587914a90e
-EBUILD mathjax-2.7.4.ebuild 1225 BLAKE2B 9179ab6dc16043b5a7d2882e0b9524ba965e12f581d50f32f824be900075979b060d69009563b949ccc6dccdc673a064ae6f4c7582a6adc4571dc308aabe50bd SHA512 51715934fdc95a540123f82534adff380ac7170c23a3cb9c3caac547a96d763368b110b3babb1b732782a06d4cfcf407b604a6557dcff2a0ac4786898c4899b4
-EBUILD mathjax-2.7.7.ebuild 1393 BLAKE2B 1877438d02fd1b5ea2be34f0c6c3a482691eceef13995109210cb459b711118a52ae846e96e6663fce225e5c24398139c6b5f3ec8f11908b82fb0ec6b145f327 SHA512 dabec1eb3e9372184115ef786905c3f4e631aa7faa569a7d1781f6d012d4d89cc03c2df68333cb5ca2410ea092016c831e8d3bd76573dc27832bd51aadff70bd
-MISC metadata.xml 1031 BLAKE2B 443d480cafaf805f15cd458c74a1e924500891efb2a6d8ea55f43526c96e23b09680ee8c60c6781c14c3d2dea4bc2f405ed21aa53158084b5bfa03bb05f50435 SHA512 7dc43317b8ded022ac97992df27e9fca2d2d59daa94cf4da2a0c3a6f552894b2e2516e6ffd688b233f3b2e0103c5a29522236449b692acbbb1cb4ae2f03aee8f
+EBUILD mathjax-2.7.7.ebuild 1392 BLAKE2B 3d169d6597ed895ddeb1d825847553ea6bafd98a0593617009d4ef9dbffac9ee088d23d26ac42308045277a5c31b86f5eb50bbf7ecb6df8587118439e6acbca0 SHA512 57bfb5d9f3eecd0ac61d60ea7a5a38c30097477ef945d3bbaee9ff5455c36e4d9d42ef40ff8d6ef15bb37daf75760f2d1d0e80b8542c6cff8222701bfb9ae356
+MISC metadata.xml 1056 BLAKE2B 905d5202bff6dd94ddca2e496a114ca6325c21771bccd37d0eadbd6af46efc34eb04b5eb2b4a97cd4a1d1086a1414b8b1d3c24989bddad720b0af59cbd82d942 SHA512 75c671023cdca274b6d0e196a6f41c4e81a423b9e0c3ed3d51f1b10422b61d47d802c59761a789fda879bbd756c70df2bdf1831249ba5f716bbbe9b68c6d5b42
diff --git a/dev-libs/mathjax/mathjax-2.7.0.ebuild b/dev-libs/mathjax/mathjax-2.7.0.ebuild
deleted file mode 100644
index b61ec426b028..000000000000
--- a/dev-libs/mathjax/mathjax-2.7.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-clean
-
-DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
-HOMEPAGE="https://www.mathjax.org/"
-SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/MathJax-${PV}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RESTRICT="binchecks strip"
-
-make_webconf() {
-	# web server config file - should we really do this?
-	cat > $1 <<-EOF
-		Alias /MathJax/ ${EPREFIX}${webinstalldir}/
-		Alias /mathjax/ ${EPREFIX}${webinstalldir}/
-
-		<Directory ${EPREFIX}${webinstalldir}>
-			Options None
-			AllowOverride None
-			Order allow,deny
-			Allow from all
-		</Directory>
-	EOF
-}
-
-src_prepare() {
-	default
-	egit_clean
-}
-
-src_install() {
-	local DOCS=( README* )
-	use doc && local HTML_DOCS=( docs/html/* )
-	default
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins -r test/*
-	fi
-	rm -r test docs LICENSE README* || die
-
-	webinstalldir=/usr/share/${PN}
-	insinto ${webinstalldir}
-	doins -r *
-
-	make_webconf MathJax.conf
-	insinto /etc/httpd/conf.d
-	doins MathJax.conf
-}
diff --git a/dev-libs/mathjax/mathjax-2.7.4.ebuild b/dev-libs/mathjax/mathjax-2.7.4.ebuild
deleted file mode 100644
index f27ee1117965..000000000000
--- a/dev-libs/mathjax/mathjax-2.7.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-clean
-
-DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
-HOMEPAGE="https://www.mathjax.org/"
-SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/MathJax-${PV}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RESTRICT="binchecks strip"
-
-make_webconf() {
-	# web server config file - should we really do this?
-	cat > $1 <<-EOF
-		Alias /MathJax/ ${EPREFIX}${webinstalldir}/
-		Alias /mathjax/ ${EPREFIX}${webinstalldir}/
-
-		<Directory ${EPREFIX}${webinstalldir}>
-			Options None
-			AllowOverride None
-			Order allow,deny
-			Allow from all
-		</Directory>
-	EOF
-}
-
-src_prepare() {
-	default
-	egit_clean
-}
-
-src_install() {
-	local DOCS=( README* )
-	use doc && local HTML_DOCS=( docs/html/* )
-	default
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins -r test/*
-	fi
-	rm -r test docs LICENSE README* || die
-
-	webinstalldir=/usr/share/${PN}
-	insinto ${webinstalldir}
-	doins -r *
-
-	make_webconf MathJax.conf
-	insinto /etc/httpd/conf.d
-	doins MathJax.conf
-}
diff --git a/dev-libs/mathjax/mathjax-2.7.7.ebuild b/dev-libs/mathjax/mathjax-2.7.7.ebuild
index c38ed9a4f288..ddbeca772756 100644
--- a/dev-libs/mathjax/mathjax-2.7.7.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/MathJax-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="doc? ( app-doc/mathjax-docs:${SLOT} )"
diff --git a/dev-libs/mathjax/metadata.xml b/dev-libs/mathjax/metadata.xml
index e279f40f7309..7be374c2389f 100644
--- a/dev-libs/mathjax/metadata.xml
+++ b/dev-libs/mathjax/metadata.xml
@@ -5,6 +5,7 @@
     <email>gienah@gentoo.org</email>
     <name>Mark Wright</name>
   </maintainer>
+  <stabilize-allarches/>
   <longdescription lang="en">
   MathJax is an open-source JavaScript display engine for LaTeX and
   MathML that works in all modern browsers. It was designed with the
diff --git a/dev-libs/metee/Manifest b/dev-libs/metee/Manifest
index 9e2ddd8d66c9..3498166f1d1a 100644
--- a/dev-libs/metee/Manifest
+++ b/dev-libs/metee/Manifest
@@ -1,4 +1,3 @@
-AUX metee-3.1.0-make-docs-optional.patch 2583 BLAKE2B f95c85a91178e2986dfdc8e98630616c3d1364c533cd10f2b69fa5e04184e719d149a2df46d9aa9296df222b56fdef56cf2b265de5eafcbfbf3d019d8e8ea857 SHA512 d2e84ab41ebdfa1fc4d1905cd9cfeed0826512409832e6c99cd946cb71f6829ef52130146a326868d42538c55b26ac1f866809688bce73415f0ebb19338ca0ff
-DIST metee-3.1.0.tar.gz 70185 BLAKE2B 7f0c595b52b608e1136c77df13244681b73f099e384fae6f5ccd350ccf679f539c8b0bc8ac062f386fa41cec9c9edf3064a6c6a981af4ccdc978629a9ebc0d90 SHA512 a967df238f2a51ecbee6fe3fe8a0d63aa321c35a520f0297688a6dab1d760358bca53a6d3cf3446f1fc9cf7f0a6c13746f5d3aa1e2064e753b1bbdb2bd356e60
-EBUILD metee-3.1.0.ebuild 691 BLAKE2B b5953cae207fbd1adaf3e653eb5834e0feffe789f3b639c74d0d25669218621f3c7913b446531d97c312525bf09ef7482d1751aabd6db06cac258b5d6b610af5 SHA512 541eaeb08d582eba338fbb68588478be073eed46f1815be75cbaf625cc32073dfca96c8ff3449d31f96c94e94225ed8e17f260608a4275c9f387102c2d3941c4
+DIST metee-3.1.2.tar.gz 70404 BLAKE2B 811b33dafd6d0f15c6860a97ba9ffb20969548e7fceb3bcc25f96e9eefd27576d076629c21ea7b9c83f934815a6c27229465818c64e2c0fb8996ab9fd6c36a18 SHA512 e1a741a4ebb0971356c00ad51c8b17d273fc3d6453ebe374766259bab855b721cd5223b214447df52f0991474f720010549d88000d47846619252e1c19f84347
+EBUILD metee-3.1.2.ebuild 617 BLAKE2B 94d8f50230611a53c17fca2a037773c3d53d4e86f8c720d58e195fee891ba252f249c1a96c01c723691f2bdbb97e513f2943be06211a9c792d931a4ea5a6deb8 SHA512 b059a3d8f2bbc90174e5704e7ae0cd6e0809156e4f3148765fb1237e53f94082f36395a3aaa27ae8b07ffd91e8c5ea0efda16f610b9118e314acc24d8a4adb40
 MISC metadata.xml 576 BLAKE2B 9e2b068fa33c961eabea553ea1f9fe539f1429467ea52baefbc7cff84bcd3bc802ba5024ed71ae96ef9e810636aaeb1d711f9bd294215bf6cab5e122eda03d7d SHA512 c529229f880fd0f02881265c26a2e7e2841ec02b719a67887423a874253a9414f68614399dbb0cd433b7e9fe5b7ba6785c8fb789795f3b1a8f6c8597949aede1
diff --git a/dev-libs/metee/files/metee-3.1.0-make-docs-optional.patch b/dev-libs/metee/files/metee-3.1.0-make-docs-optional.patch
deleted file mode 100644
index 9e4eda27e2d8..000000000000
--- a/dev-libs/metee/files/metee-3.1.0-make-docs-optional.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 95c36b4f09eb3697877610a8a995befe32536b78 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conikost@gentoo.org>
-Date: Sun, 22 Aug 2021 14:16:56 +0200
-Subject: [PATCH] CMakeLists.txt: make docs optional
-
-Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
----
- CMakeLists.txt | 51 ++++++++++++++++++++++++++------------------------
- 1 file changed, 27 insertions(+), 24 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b2696d..cd56dc3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,6 +3,7 @@
- cmake_minimum_required(VERSION 3.5)
- project(metee)
- 
-+option(BUILD_DOCS "Build docs" YES)
- option(BUILD_TEST "Build self-test" NO)
- option(BUILD_SAMPLES "Build samples" NO)
- option(BUILD_MSVC_RUNTIME_STATIC "Build with static runtime libraries on MSVC"
-@@ -43,32 +44,34 @@ install(
- )
- 
- # Documentation
--find_package(Doxygen)
--if(DOXYGEN_FOUND)
--  set(DOXYGEN_INPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
--  set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
--  configure_file(
--    ${CMAKE_CURRENT_SOURCE_DIR}/include/Doxyfile.in
--    ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY
--  )
--
--  add_custom_target(
--    doc ALL
--    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
--    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
--    COMMENT "Generating documentation with Doxygen"
--    VERBATIM
--  )
--
--  if(UNIX)
--    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/man3
--            DESTINATION ${CMAKE_INSTALL_MANDIR}
-+if(BUILD_DOCS)
-+  find_package(Doxygen)
-+  if(DOXYGEN_FOUND)
-+    set(DOXYGEN_INPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-+    set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-+    configure_file(
-+      ${CMAKE_CURRENT_SOURCE_DIR}/include/Doxyfile.in
-+      ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY
-     )
--    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
--            DESTINATION ${CMAKE_INSTALL_DOCDIR}
-+
-+    add_custom_target(
-+      doc ALL
-+      ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+      COMMENT "Generating documentation with Doxygen"
-+      VERBATIM
-     )
--  else()
--    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION doc)
-+
-+    if(UNIX)
-+      install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/man3
-+            DESTINATION ${CMAKE_INSTALL_MANDIR}
-+      )
-+      install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
-+              DESTINATION ${CMAKE_INSTALL_DOCDIR}
-+      )
-+    else()
-+      install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION doc)
-+    endif()
-   endif()
- endif()
- 
diff --git a/dev-libs/metee/metee-3.1.0.ebuild b/dev-libs/metee/metee-3.1.2.ebuild
index 25509cef0437..56bfb574467d 100644
--- a/dev-libs/metee/metee-3.1.0.ebuild
+++ b/dev-libs/metee/metee-3.1.2.ebuild
@@ -1,12 +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
+EAPI=8
 
 inherit cmake
 
 DESCRIPTION="Cross-platform access library for Intel CSME HECI interface"
-HOMEPAGE="https://github.com/intel/compute-runtime"
+HOMEPAGE="https://github.com/intel/metee"
 SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -16,8 +16,6 @@ IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}/${PN}-3.1.0-make-docs-optional.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCS="$(usex doc)"
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index d5e38f4302e3..c0b1ba11f89a 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,5 +1,4 @@
-DIST mimalloc-1.7.3.tar.gz 908042 BLAKE2B 6a96fc33148261e3f69a55196725bb2cf2e45f08a668b3d74fd6e06f808c1ce40fbb4783c5df50abe58dbae8b9c1dd264e6fcc6cce0a259b2cbec397d4667736 SHA512 e5a17b98d77a27d2a544869c2e0302a7e3bf77b5b494b2ee8ddc7af18bf9da152fea41702a8a17eb7e128238259fba6f96fa5bac549f5927453dc9a0bc06d013
-DIST mimalloc-2.0.3.tar.gz 917461 BLAKE2B 4b803881ab75afa358cb2dd251268c0934472074bf1983c3851a9d4f8c8ec0ea3907b52c40b0efe1cc09916cf4c5aa93f786a606e0b999536118b91bb5800310 SHA512 275a5249d09a57c9a039714fc6eef24ae778496954972419f3ac8e33f3d12e9837ba0691a3c08a4ab807c26b868aad3a5b2c28ee10ecaa60fe21ffe1d416f08f
-EBUILD mimalloc-1.7.3.ebuild 637 BLAKE2B 552662f1b43b295fbab238b23057817d390b4b3996e0b89edeace2928c06700eb061b4aa8ee7fb22cbf1fdb9424d1db887bc956498bd03337c5993205b668eda SHA512 173520d36a96e6b8cd4634592c948d41de78b3cd87437add909768ee4fe2f139f18010b830a827d4dab0e6f4a296ebcef699192845324f3d0e6676bec3f1d312
-EBUILD mimalloc-2.0.3-r1.ebuild 761 BLAKE2B 6e6187c1bea297633a50df0d45e8b244e3d4bcfcb003f726578337b08b8754fb96155d98864b93e8d25640228f10bd4fa9606712d0068e38c2439976b241fefe SHA512 108a0ddbbbd54899e569bf667d4633edeeab643c1fa6f4294747a826c5b04dc1d674c92215b51a8a93f4a41d8edc32ffff9115c1eee4cb356a3a24d1dab1fc0d
-MISC metadata.xml 323 BLAKE2B 15c8d2f369c245843b6a8370d0ca2bbaf6325c7872901c0b3ff74be816d9407b46c51d33144b2cfac7f961a9b7d83b44738ca362572dd0e32d4840f69266f493 SHA512 f53bdf6c2703bd59d6cc7505f1f9f8d9c57bc67c2923018d0998b8acc51d7e4251f3dbee44bfa1fe674ad44889747738e83ae7f4a18ff72cbc32422eb9c050dc
+DIST mimalloc-2.0.5.tar.gz 1125567 BLAKE2B 9148ba4af7620eec36e1dde0f6fd2d1e3e9937bd2286ac790a727052402c3286b55387236de3a77e4405983c080bb7acae8deb3334cf9103fcf3f90250080204 SHA512 d164392ace523a3fa0aa00fc58d8a9e8fbe913f07957e19ca977675b389e6d2a2eaf4772e72cae0d87aabb960f3fd6ea3923a066ece4ba4fdaa0c6860cfa414d
+EBUILD mimalloc-2.0.5-r1.ebuild 776 BLAKE2B f969d9c42f6aaf6d1dfdd2e25033bae22e17ce1eac11b8bc542d6709b05d15e8a9c88601f8b3cbe3b3c9552ddeee5f8d0f72f2f5c6870551b5fde9c26ddd3d5b SHA512 816481dbb9515bf7f792eb9232f76d42bda9d8cc461455536973b6caf46dbd541c21e655f6756cba7df0a60d6bf95170a3f94f991c33fc73414710182c194049
+EBUILD mimalloc-2.0.5-r2.ebuild 687 BLAKE2B 5ef83444ab509531e923a058f1343bd9ddd100f3c9a47be3680abdf7e8bed60e8d2504757134699097f7b6c6606e94dc198596945cdb57f236ad9ba77beb5c4c SHA512 eb2e98d4642f151ca70bdefd6c91d1688553ee97ddce5da9c9a1e6571a474eb922c25ee20c97ed3e78abb9dc54e450d9e0a7eae5c02ffddfb5959fcc591894b5
+MISC metadata.xml 431 BLAKE2B 6b4122d0fc6609b5ee6d4fd345727301fdf1bf0943507240002d4a574aeb84622a1be6af2f095d231c9d3da303de39485234b7136a91a2d819a5434859eeea35 SHA512 9506d3cd5946abbad9a051e8cda535d361040d015e57b3b0f73a7a144e63d88e972aa427d52373ddc96b60868ee5d21e0f74b6001332343f2f57971ee27e5ab4
diff --git a/dev-libs/mimalloc/metadata.xml b/dev-libs/mimalloc/metadata.xml
index 356c7a2700cd..465023490e6b 100644
--- a/dev-libs/mimalloc/metadata.xml
+++ b/dev-libs/mimalloc/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
+		<name>Matthew Smith</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
diff --git a/dev-libs/mimalloc/mimalloc-2.0.3-r1.ebuild b/dev-libs/mimalloc/mimalloc-2.0.5-r1.ebuild
index 0f720eedd8eb..0e19c310b3ee 100644
--- a/dev-libs/mimalloc/mimalloc-2.0.3-r1.ebuild
+++ b/dev-libs/mimalloc/mimalloc-2.0.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+inherit cmake-multilib
 
-DESCRIPTION="mimalloc is a compact general purpose allocator with excellent performance"
+DESCRIPTION="A compact general purpose allocator with excellent performance"
 HOMEPAGE="https://github.com/microsoft/mimalloc"
 SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -24,11 +24,11 @@ src_configure() {
 		-DMI_BUILD_TESTS=$(usex test)
 	)
 
-	cmake_src_configure
+	cmake-multilib_src_configure
 }
 
 src_install() {
-	cmake_src_install
+	cmake-multilib_src_install
 
 	rm "${ED}/usr/$(get_libdir)/mimalloc.o" || die
 
diff --git a/dev-libs/mimalloc/mimalloc-1.7.3.ebuild b/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
index b3ea5f3bc374..805e1fcc85d2 100644
--- a/dev-libs/mimalloc/mimalloc-1.7.3.ebuild
+++ b/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+inherit cmake-multilib
 
-DESCRIPTION="mimalloc is a compact general purpose allocator with excellent performance"
+DESCRIPTION="A compact general purpose allocator with excellent performance"
 HOMEPAGE="https://github.com/microsoft/mimalloc"
 SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0/1"
+SLOT="0/2"
 KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
@@ -22,7 +22,10 @@ src_configure() {
 
 		-DMI_INSTALL_TOPLEVEL=ON
 		-DMI_BUILD_TESTS=$(usex test)
+
+		-DMI_BUILD_OBJECT=OFF
+		-DMI_BUILD_STATIC=OFF
 	)
 
-	cmake_src_configure
+	cmake-multilib_src_configure
 }
diff --git a/dev-libs/miniz/Manifest b/dev-libs/miniz/Manifest
index 240b2f36a76d..bdcd9ebc5d70 100644
--- a/dev-libs/miniz/Manifest
+++ b/dev-libs/miniz/Manifest
@@ -2,6 +2,8 @@ AUX Config.cmake.in 65 BLAKE2B 520fd3e379b53671d4bb9cb62567ec0f569c711d18019b428
 AUX miniz-2.1.0-export-cmake-build-targets.patch 6510 BLAKE2B 1622c34af849f7b8818463759f205f71e7b64ba52ecc4cb8a552c457577c95cdea5beb94d5f6ffc986960e5a071b00adb54eda7cd1b34a5aeb692f359d989a2f SHA512 b36377b8d19a8b1d8099e0645d90e9f5778a4947de9da0d0bf04eb344a2ab24a1f84e8410115159e59bdb5569268761944409caecb6bb860aff5f42a57b3d9b1
 AUX miniz.pc.in 315 BLAKE2B d05cd14a7acb4039e5f0521a68e6e5eeed00849a5b5d639fbbd4de45c1e0eab8ed33a22cc608761ab1dd1e1142021b8e5bfbf8e9bab589bfb2545701828f5f7b SHA512 8c1828759a45c58a96bebaac9fa5196d95be85a76be8d4fdd30eb2b4db5dbe582a7e0156fc9a4249c84426bbe69b30d31b2faf162c8d619810012afe6e1ad0ed
 DIST miniz-2.1.0.tar.gz 104502 BLAKE2B 9a7b3818b454809cdfec523d98f13bef3a52e27b6d3857d289438978d12997e38c71aa97fffe060a6b765f8fbbdd8fe8cebced4a45d9f1f040dd3e39cf2a8055 SHA512 e0aba16afdf230d1e54d0a9cedd336b0b158b02744839f0547e14ee47a97fc1a6668f3a181bd46e969b01b158af18dc8ed3c0a4210b3b620242338a2788806b3
-EBUILD miniz-2.1.0-r2.ebuild 711 BLAKE2B 639316c2389f57bda50c675671aa829accfe17111a869c63d6defacc73f63562ead4f47f723e6dfec3216f2bd6e7e8a392bfb2d1bda3d20e320ed4f59d2b6f20 SHA512 756f4f758d18cb07dd5e3ebdb62722847360452b2526cddb7e015f3996b4049333342d26cd6d728d4c79b5e4792bc2052276e1fd8cbd0444d4f8eac49750edba
+DIST miniz-2.2.0.tar.gz 113592 BLAKE2B 110a71712396fb22075818f681d2e691b8b361e6c8eb786485f9fd3a1e00fcfc95bae4d470b8b1644a1e9674e69617abdba70e337f318969096db222f7a4c3d2 SHA512 0bb2b0ac627715b90ff9fd69ca8958a0bea387bd7ddf5c200daba953b98ef788092e3009842f4f123234e85570159250c8897a30c1c1f2d4dea9bca9837f6111
+EBUILD miniz-2.1.0-r3.ebuild 716 BLAKE2B dbd066b16a5cf7288a9af6b554bc44e0bb10b9259407627f5ecac365dd6ec95047f19386d28a270dda3bcf72e39d7a3af314e17242c79efb712f29491e58e625 SHA512 2956345154f2408dd60cbe472c58605f5f94cc4cea5367ba610af8c2cca78f9df51545483fd8b5fd50533ff97fc48e5a0236127a00c1aee28c7e909f497619b6
+EBUILD miniz-2.2.0.ebuild 411 BLAKE2B 73164596838b7072b0d6cf1058630981f4930290af9ffc4434058cc8512625021377373be724ef993421b9f5d24d5df4dfc2113a986ebd07302399cd360c910d SHA512 67af664ce10ff44a4b7e01799b94c3468e4493905494f0c3ec0b919ab60752c9c2c8572edb2c2ca827bf71e40da1b52583cf3a053891443a00c6410a28e06c9c
 EBUILD miniz-9999.ebuild 868 BLAKE2B 4c35c1ff7de11247e71860fbe61c973b77d456db29a87cf01b3e34a83df0d61b3a2b3d0f5a938081cf1f6f578a97a1489e292ee50b46d1e0ece1bc049b70b7b6 SHA512 9cfb04128eaa89af0a0d005ca8aa03a410addb3953d6522be5c480bbb93e765c1c2b6dbc145c91d57fc9931d7267bca47eb34e711561f4bc2ca7835cf98647bb
-MISC metadata.xml 1039 BLAKE2B abcf47a1154eada5c2f5fbe0629f1f065db0f81db5202e58aac598b8b88237bf953eb4aa5c973e70e8371fc7ef4a033a4a7f8c1da83507c477509440f737ad2c SHA512 48f92a799a49ae6dd6ed589a50f746cccd9ab87e2e5370dc63c98c6ac663037a0d1d57f04a8170bd319bb5d17bfa16b4451b71a0df38233fc5a47c902927c690
+MISC metadata.xml 1119 BLAKE2B 1524ab132d535eadc17d6897113e61c1f4fe85a693a2f1c7241293e11d7751cb1aa708b227a3afe5c269e6e6cc5d9d4981ef8394cacca00f30b1442a738d90f2 SHA512 8704444d82aa2b7a091b06e6ccf872c477ad9515e860c41f939d628b5b0a7742b8343a50c6e4be202acd9c8cbc98450e7a90ce951a625282dae0beb54420e278
diff --git a/dev-libs/miniz/metadata.xml b/dev-libs/miniz/metadata.xml
index 9ae3e1edddab..c43f3b1a6204 100644
--- a/dev-libs/miniz/metadata.xml
+++ b/dev-libs/miniz/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
+		<name>Matthew Smith</name>
+	</maintainer>
 	<longdescription>
 		Miniz is a lossless, high performance data compression library in a single source file that implements the zlib
 		(RFC 1950) and Deflate (RFC 1951) compressed data format specification standards. It supports the most commonly
diff --git a/dev-libs/miniz/miniz-2.1.0-r2.ebuild b/dev-libs/miniz/miniz-2.1.0-r3.ebuild
index cc26fba366c0..87ac7070f3c8 100644
--- a/dev-libs/miniz/miniz-2.1.0-r2.ebuild
+++ b/dev-libs/miniz/miniz-2.1.0-r3.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
@@ -10,8 +10,8 @@ HOMEPAGE="https://github.com/richgel999/miniz"
 SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DOCS=( ChangeLog.md LICENSE readme.md )
diff --git a/dev-libs/miniz/miniz-2.2.0.ebuild b/dev-libs/miniz/miniz-2.2.0.ebuild
new file mode 100644
index 000000000000..482aadff9922
--- /dev/null
+++ b/dev-libs/miniz/miniz-2.2.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A lossless, high performance data compression library"
+HOMEPAGE="https://github.com/richgel999/miniz"
+SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( ChangeLog.md readme.md )
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 769827ce3441..b79f83414ae6 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -13,5 +13,5 @@ DIST mpfr-4.1.0-patch12.patch 6768 BLAKE2B 15ce68eb9941ac5d6544ee18a062cb12026e0
 DIST mpfr-4.1.0-patch13.patch 3344 BLAKE2B 1239cf16dfe32a71bb6fc7b156978cd451bcbe4e1b04842fdb3549352a43607d44d58120e38bf448ffd33e36bab7f7cfd4ab65b2eb3aac2fe9bbd86d8f425f5a SHA512 ddd5f54d12584b6e10fd4eba12b8568c5286dba10bd3b5cdd429415b78bc827bd0ed3957bd06ca4c2c63a2f5e877fd9d86eebade8929d61aafe84ace8454d016
 DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
 EBUILD mpfr-4.1.0-r1.ebuild 1061 BLAKE2B 945f47250941a8eb20ba260e7a15441995c1918064a86572d108067952aa1f02898b6618ec24f2a64494726fc937b25ffc2dc9b33a0c0482feeeea754d5a37da SHA512 694154aa8944576b75ed96c6838de6715461b9cb317ffc945c99c8c78615eefcd8adfcf5051cf9b34e28024c91186233682311658231cc871ca5e41c7c0748a9
-EBUILD mpfr-4.1.0_p13-r1.ebuild 2571 BLAKE2B d6fe812ee6d6eb8c12ae699d8d8659b88edacfca8f5f52529e7cf1afe11125f6f247d24d938b34739296aaabf686481983606651bb661816fc2f67dadd26b7dd SHA512 c11937671cffa02c2b81c4e49c4a11aac1e151ac67729c047a79b4d240fc2f57598184dd5244d428de0371764341e75fe603d10cbcce6e31d6dbfd356f2e3597
+EBUILD mpfr-4.1.0_p13-r1.ebuild 2693 BLAKE2B 91592f5c6cc48809eba0f31068c62f30e0b41f8b49ba9aad2fd94da72ed1782aff39a60761ddd1eef315a46df8e11b05de832c3098b103ccc4cfa47de8949e12 SHA512 bc3b6e72ba18c9f6d700ca9a7edad57a483901c161cea915bb82698ca371235d25e915107b319146b8b014526bb7c48222bf6365c1415c0895ec19fcb66fe8ae
 MISC metadata.xml 262 BLAKE2B fe330d67755784d14f5c5d664d7127d3cdb9edfab55b907ae3632f434d86323604f5095e1c1a9fbd169ae7a4cbb38f359e55f75047531786247c0674a4a53715 SHA512 3bcaca4e730edeed06fed73e79a5ce0a3358174672735ea4b27240c6c421ac9c33bc2b63a31e596fe1bbb6b1816c16cbc7ef4f258ca906ba04ea7db4aedc86b9
diff --git a/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
index 0ac19f7cd365..14f2319304bc 100644
--- a/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
@@ -12,6 +12,7 @@ inherit multilib-minimal
 # https://archives.gentoo.org/gentoo-releng-autobuilds/message/c2dd39fc4ebc849db6bb0f551739e2ed
 MY_PV=$(ver_cut 1-3)
 MY_PATCH=$(ver_cut 5-)
+MY_PATCHES=()
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Library for multiple-precision floating-point computations with exact rounding"
@@ -21,12 +22,11 @@ if [[ ${PV} == *_p* ]] ; then
 	# If this is a patch release, we have to download each of the patches:
 	# -_pN = N patches
 	# - patch file names are like: patch01, patch02, ..., patch10, patch12, ..
+	#
 	# => name the ebuild _pN where N is the number of patches on the 'bugs' page.
-	my_patch_index=1
-	while [[ ${my_patch_index} -le ${MY_PATCH} ]] ; do
-		SRC_URI+=" "
-		SRC_URI+=$(printf "https://www.mpfr.org/${MY_P}/patch%02d -> ${MY_P}-patch%02d.patch " ${my_patch_index} ${my_patch_index})
-		my_patch_index=$((my_patch_index+1))
+	for ((my_patch_index=1; my_patch_index <= MY_PATCH; my_patch_index++)); do
+		SRC_URI+=" $(printf "https://www.mpfr.org/${MY_P}/patch%02d -> ${MY_P}-patch%02d.patch " ${my_patch_index}{,})"
+		MY_PATCHES+=( "${DISTDIR}"/$(printf ${MY_P}-patch%02d.patch ${my_patch_index}) )
 	done
 	unset my_patch_index
 fi
@@ -42,15 +42,20 @@ IUSE="static-libs"
 RDEPEND=">=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]"
 DEPEND="${RDEPEND}"
 
-PATCHES=()
+PATCHES=(
+	# Apply the upstream patches released out-of-band; generated above
+	"${MY_PATCHES[@]}"
 
-if [[ ${PV} == *_p* ]] ; then
-	# Apply the upstream patches released out of band
-	PATCHES+=( "${DISTDIR}"/ )
-fi
+	# Additional patches
+)
 
 HTML_DOCS=( doc/FAQ.html )
 
+src_unpack() {
+	# Avoid src_unpack noise from patches
+	unpack ${MY_P}.tar.xz
+}
+
 src_prepare() {
 	default
 
@@ -61,9 +66,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# bug 476336#19
+	# bug #476336#19
 	# Make sure mpfr doesn't go probing toolchains it shouldn't
-	ECONF_SOURCE=${S} \
+	ECONF_SOURCE="${S}" \
 		user_redefine_cc=yes \
 		econf $(use_enable static-libs static)
 }
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 763deaf71083..3251a573556d 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -3,6 +3,9 @@ AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a70
 AUX newt-0.52.21-fix-non-POSIX-backticks.patch 794 BLAKE2B ffeba1923f7ce7d9f8349e6880b1439c3376f47cfa742e2b236b2072e3420120e1c6858437e1921295b752d63389aeea27eb5b22d39967d88f4894d153e22d42 SHA512 2e4c4c68add4a6ac107efa08fcff20d4a557252ebf246d38875d2f428432ba739469ab4200d94d3dfaf7ddec28e0b029e628e3b18678fad0cc2af731e7477032
 AUX newt-0.52.21-makefile-LDFLAGS-ordering.patch 1201 BLAKE2B 58d895ba0da3a1ce139a7257035ff41279c3432d002e57261e0d9051b6c6baf8044e774329bb24ed6807f42099817a4ca7cb2138ee3dbc37e3c3dafbf1d7d816 SHA512 e1f9e54238e2e6c700d301cb3017797b7dd396691528a7007bf4b316684269d6e4daf1f6973389e0403341bc650ffbed4b01ffa890e8d53af5a761941e93a03f
 AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4
+AUX newt-0.52.21_p20210816-makefile-LDFLAGS-ordering.patch 1221 BLAKE2B 410dfe5140867bc3ac2a6f5d1718ee3b63fd7a5ae8870c008015eb88303452099a40e5488739572172bdc9b52b5f1dec2f05cc11de2fc32d1aeea7776143eb94 SHA512 0700ea717cbe380d0facea31f22c637e837fb050a115273c147629d945eb87780a3b10f05aa8b7ca52c31c80dc6f9f356b154041b7f5a80b51d438934d1c8ad8
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
+DIST newt-0.52.21_p20210816.tar.gz 128555 BLAKE2B 97c791d7301b657bec68045f2cd9bbe16eef0b099a6304e2336414837b36492bd794be04d0bbcd9eadc6fcd000ba2563a5ab90be5d61249390a6ea5435091f97 SHA512 06c1d5634d88a6126de5eddd1c4d436639a4d739b100f391638b0429a3941eabcaa0ff7398f498d735ec0af5e88deb14178110ab11bf5301ef661f7953692bc4
 EBUILD newt-0.52.21-r1.ebuild 2229 BLAKE2B 974b87429d91ba6d6a9565e13e5c1d569c02d244638ec99e4dc2a620098687942596b54deb9a4662e4c9f8ad16f7feae38faad0e6b9ba48ce7df1892fedc235f SHA512 4d5baa9a7179d6853b19cb6a8157a32105a697079985d39cc244efa0278270399dc3f511bea2ff250eb6b3bd4997d3ebf095dc3a2a245f51fae731e39fb5a533
+EBUILD newt-0.52.21_p20210816.ebuild 2334 BLAKE2B dce1b9f84077bf0f3f421c84940948b86f648a1832ef1c3376f00cc73417b6cdc568678ec13b410a5ac749817eab2fcc4e6166087b41709bb1e39cbfe05b7dea SHA512 dee9f71df13ff7d255dc9fe6813297559fe04a6a562fafdd1eb5e3126a12dba57f00d89130803a9f20aad838591b747843120c6ad777474e572c80dad05483b8
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/newt/files/newt-0.52.21_p20210816-makefile-LDFLAGS-ordering.patch b/dev-libs/newt/files/newt-0.52.21_p20210816-makefile-LDFLAGS-ordering.patch
new file mode 100644
index 000000000000..445637b7ca0d
--- /dev/null
+++ b/dev-libs/newt/files/newt-0.52.21_p20210816-makefile-LDFLAGS-ordering.patch
@@ -0,0 +1,30 @@
+From 22d44d2cbfcbec216d0028ebdf274247139a8045 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 14 Jul 2021 05:12:32 +0100
+Subject: [PATCH] Swap order of LDFLAGS and P*FLAGS
+
+Needed to respect as-needed.
+
+Bug: https://bugs.gentoo.org/798945
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 1047efc..f0bc417 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -97,8 +97,8 @@ _snack.$(SOEXT):   snack.c $(LIBNEWTSH)
+ 		PLFLAGS=`$$pyconfig --libs`; \
+ 		echo $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+ 		$(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+-		echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
+-		$(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
++		echo $(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
++		$(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
+ 	done || :
+ 	touch $@
+ 
+-- 
+2.32.0
+
diff --git a/dev-libs/newt/newt-0.52.21_p20210816.ebuild b/dev-libs/newt/newt-0.52.21_p20210816.ebuild
new file mode 100644
index 000000000000..f38fc22cf2ff
--- /dev/null
+++ b/dev-libs/newt/newt-0.52.21_p20210816.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools python-r1 toolchain-funcs
+
+COMMIT=a7533580cd092e6a71c4ed722e830da4eb884d06
+
+DESCRIPTION="Redhat's Newt windowing toolkit development files"
+HOMEPAGE="https://pagure.io/newt"
+SRC_URI="https://github.com/mlichvar/newt/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gpm nls tcl"
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/popt-1.6
+	=sys-libs/slang-2*
+	gpm? ( sys-libs/gpm )
+	tcl? ( >=dev-lang/tcl-8.5:0 )
+	"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.52.13-gold.patch
+	"${FILESDIR}"/${PN}-0.52.14-tcl.patch
+	"${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch
+	"${FILESDIR}"/${P}-makefile-LDFLAGS-ordering.patch
+	"${FILESDIR}"/${PN}-0.52.21-fix-non-POSIX-backticks.patch
+)
+
+S=${WORKDIR}/${PN}-${COMMIT}
+
+src_prepare() {
+	sed -i Makefile.in \
+		-e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
+		-e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
+		-e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
+		-e 's|instroot|DESTDIR|g' \
+		-e 's|	make |	$(MAKE) |g' \
+		-e "s|	ar |	$(tc-getAR) |g" \
+		|| die "sed Makefile.in"
+
+	if [[ -n ${LINGUAS} ]]; then
+		local lang langs
+		for lang in ${LINGUAS}; do
+			test -r po/${lang}.po && langs="${langs} ${lang}.po"
+		done
+		sed -i po/Makefile \
+			-e "/^CATALOGS = /cCATALOGS = ${langs}" \
+			|| die "sed po/Makefile"
+	fi
+
+	default
+	eautoreconf
+
+	# can't build out-of-source
+	python_copy_sources
+}
+
+src_configure() {
+	configuring() {
+		econf \
+			PYTHONVERS="${PYTHON}" \
+			$(use_with gpm gpm-support) \
+			$(use_with tcl) \
+			$(use_enable nls)
+	}
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	building() {
+		emake PYTHONVERS="${EPYTHON}"
+	}
+	python_foreach_impl run_in_build_dir building
+}
+
+src_install() {
+	installit() {
+		emake \
+			DESTDIR="${D}" \
+			PYTHON_SITEDIR="$(python_get_sitedir)" \
+			PYTHONVERS="${EPYTHON}" \
+			install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installit
+	dodoc peanuts.py popcorn.py tutorial.sgml
+	doman whiptail.1
+	einstalldocs
+
+	# don't want static archives
+	rm "${ED}"/usr/$(get_libdir)/libnewt.a || die
+}
diff --git a/dev-libs/nmeap/Manifest b/dev-libs/nmeap/Manifest
index 3eaab59fcb69..be2d5bad710d 100644
--- a/dev-libs/nmeap/Manifest
+++ b/dev-libs/nmeap/Manifest
@@ -1,4 +1,4 @@
 AUX nmeap-0.3-fix-unitialized-variable.patch 275 BLAKE2B ad143d8be7c773eceb10413d2ac7c06474ac4a565da9afa09c6b2e3d2c16de8b9ac905a996420dfd5239a5eb3d060bfb2306241fff13805a05a1af5691f65e06 SHA512 cc8626e1b6e71c45550f9bb1de83c1f3aba41dbd05da904d29825179107bb79df88a19eb96955aa9f9a811cea25d46f58a0f6a94c534f8ed872b84ce01b01e59
 DIST nmeap-0.3.tar.gz 29380 BLAKE2B d4828a1a3d8a66ae529e40c034bf180da9657c2a3dec1ab09f32a9062430952a568612d2071acb887c6f1afdb19de82cb4b6d1788c6e9c2e1e859d9914209b3a SHA512 064a7fe27a192b4abe1393f8f343c8956bd9dd1d0de1441ca96597ab1f155001905b9b0b35d47b61e1f68891b820c602c024e4c74fb809719108711c5b1df815
-EBUILD nmeap-0.3-r1.ebuild 1216 BLAKE2B 2f57fc0c90221f88ff6aea08f402c93394772e6f3e0c5d31d1555eeaee98f685c64adfda2d2ee47609d1e210e494bd0ca89bf9294071fb8c4f025b2c9ecc47d5 SHA512 d61cf4288d9f1051d168bcfa01b38df3d576d968a9e5db86334dbf21cacdff3060b863fb9e192b66eb728f50b0e540949a1ca99b7268fef8e23411d995050e97
+EBUILD nmeap-0.3-r2.ebuild 1216 BLAKE2B e5df77610ddaf1a7ed15b4e8d813d1944b97529473ea04739e44daf788b6091a098e47e1138e91e00f0ba65970abc5957e6b5880c25ec033d4c79fdebb2a1a95 SHA512 f1e223a16c1773d2ac2b2209600a476708b9ebe8d75199fea1ff64ff329e9e330138db898c3899cb879173605811ba646414bd3062a296120d17a8ccb1517710
 MISC metadata.xml 595 BLAKE2B 3a02a3804280ca6aaa7d605c8502d73b43bcb467b0dfdeaf9b46aaaeec1c5282345ca7872597948e3664b5b75e77b92d4536bb5a9da1a111f013e796c99ce2bf SHA512 a8e45aee3fb8b386541390e7436d4ed567d124112b59837bb6bd23dcf9f8bd156cc0cfd17459027b540ba14c0d207fbbba9118a0539e3a72ab7fc186c14b1f0a
diff --git a/dev-libs/nmeap/nmeap-0.3-r1.ebuild b/dev-libs/nmeap/nmeap-0.3-r2.ebuild
index 6a69fd4d389a..7a9a57bd5f27 100644
--- a/dev-libs/nmeap/nmeap-0.3-r1.ebuild
+++ b/dev-libs/nmeap/nmeap-0.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index b740036d33e5..dd875b3e5876 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -5,8 +5,6 @@ AUX nspr-4.7.1-solaris.patch 411 BLAKE2B 0c1f0e621aec9e150bd8c279f46c18256c451b2
 AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98c61cdd4245da21a51d5f9b10149e12f5326992d587f0fe04bab79c26acee4aa2e4dded5ddf8c697b5cd4f2e34ea730c6ca7fe0 SHA512 dd00bc2108d6c7a64945afeaf97f31189250c90c3d63c86fa2b2b091ef812cc7c5f8c0f17211a02b497f50efc1c3668c840e21a45f514ff1103e22c659e820f2
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
-DIST nspr-4.32.tar.gz 1079004 BLAKE2B fda56b2a3fbbff8542e213b20a5935376694ea171d2cd014f93a711980411afe195835996c1612376d37eac028071ce58008e1fbf7a16176141fc18aa8163a73 SHA512 da9b65b374783d20a2e589211b411816d899e296e91175d376e59df1919144c1808c155a234d6ceefdf7b8ae8f47cec98d92a5aa3150a579513251860e50dcb7
 DIST nspr-4.33.tar.gz 1078948 BLAKE2B b46e1c02ab7e5c442288a2cba2868166adb9461950d35fcd76074e3340734057f2b1bbeb3c700f38edf3710323ffd34576dd644814c379033de2a380c54d4fe3 SHA512 8064f826c977f1302a341ca7a7aaf7977b5d10102062c030b1d42b856638e3408ab262447e8c7cfd5a98879b9b1043d17ceae66fbb1e5ed86d6bc3531f26667e
-EBUILD nspr-4.32.ebuild 3914 BLAKE2B 7e2aa7935be02a5bc117d56705907c80c057c44c5376d1a32e3d85b0a839111ab461cb3c2e0fc305967a4d862840db7e14fdf1b01683bc505772027c78139fcc SHA512 97baa995c88eda154a069d528ebf7453d04911a8258aeb997c984a48620f28d0a049ae9ed7dc2db6bc0ff219ace0cf862bc7246b54826636ae71bd48e840f18d
-EBUILD nspr-4.33.ebuild 3922 BLAKE2B 2e6c841d15e1259bb45f7ffad8b8dd1d85f5b8606ac9ce23b8eddac2c378fa21512d92f379ea5f1ee83e3d211e52bf42d6e6c02819deb4c841f34545fe3e50f7 SHA512 e2e62141a4f8127ede2e155e6ebbd5fdc1788fee169d35b244b08fcca022541323820db8476f244002b17fc7489fb62a899f109923de33a7b4f0f19968a36dd4
+EBUILD nspr-4.33.ebuild 3914 BLAKE2B 7e2aa7935be02a5bc117d56705907c80c057c44c5376d1a32e3d85b0a839111ab461cb3c2e0fc305967a4d862840db7e14fdf1b01683bc505772027c78139fcc SHA512 97baa995c88eda154a069d528ebf7453d04911a8258aeb997c984a48620f28d0a049ae9ed7dc2db6bc0ff219ace0cf862bc7246b54826636ae71bd48e840f18d
 MISC metadata.xml 350 BLAKE2B 0f4d7850a3ca725af4e01a47e4db4219d2465b6d4db8c44e12b8f57d2064fd3c6ddbeec16888a316627f96e1f9415777f3fedecbd7065e4d13516bbed473a6f6 SHA512 2cc7f3e6eefcb5ba16c4b2127e751c47ea7a6822eb71080c96c6850ef741acff8d424c520eb60288ca32ccdbe825568d7aced9f57148e304dddd0afb7f4a8883
diff --git a/dev-libs/nspr/nspr-4.32.ebuild b/dev-libs/nspr/nspr-4.32.ebuild
deleted file mode 100644
index 7be0ae41e449..000000000000
--- a/dev-libs/nspr/nspr-4.32.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs multilib-minimal
-
-MIN_PV="$(ver_cut 2)"
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="https://www.mozilla.org/projects/nspr/"
-SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nspr-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.23-prtime.patch
-	"${FILESDIR}"/${PN}-4.7.1-solaris.patch
-	"${FILESDIR}"/${PN}-4.10.6-solaris.patch
-	"${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
-	"${FILESDIR}"/${PN}-4.8.9-link-flags.patch
-	# We do not need to pass -L$libdir via nspr-config --libs
-	"${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
-)
-
-src_prepare() {
-	cd "${S}"/nspr || die
-
-	default
-
-	use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
-
-	# rename configure.in to configure.ac for new autotools compatibility
-	if [[ -e "${S}"/nspr/configure.in ]] ; then
-		einfo "Renaming configure.in to configure.ac"
-		mv "${S}"/nspr/configure.{in,ac} || die
-	else
-		elog "configure.in rename logic can be removed from ebuild."
-	fi
-
-	# We must run eautoconf to regenerate configure
-	eautoconf
-
-	# make sure it won't find Perl out of Prefix
-	sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-		"${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
-	# We use the standard BUILD_xxx but nspr uses HOST_xxx
-	tc-export_build_env BUILD_CC
-	export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
-	tc-export AR AS CC CXX RANLIB
-	[[ ${CBUILD} != ${CHOST} ]] \
-		&& export CROSS_COMPILE=1 \
-		|| unset CROSS_COMPILE
-
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_enable debug)
-		$(use_enable !debug optimize)
-	)
-
-	# The configure has some fancy --enable-{{n,x}32,64bit} switches
-	# that trigger some code conditional to platform & arch. This really
-	# matters for the few common arches (x86, ppc) but we pass a little
-	# more of them to be future-proof.
-
-	# use ABI first, this will work for most cases
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
-		n32) myconf+=( --enable-n32 );;
-		x32) myconf+=( --enable-x32 );;
-		s390x|*64) myconf+=( --enable-64bit );;
-		default) # no abi actually set, fall back to old check
-			einfo "Running a short build test to determine 64bit'ness"
-			echo > "${T}"/test.c || die
-			${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
-			case $(file "${T}"/test.o) in
-				*32-bit*x86-64*) myconf+=( --enable-x32 );;
-				*64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
-				*32-bit*|*ppc*|*i386*) ;;
-				*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
-			esac ;;
-		*) ;;
-	esac
-
-	# Ancient autoconf needs help finding the right tools.
-	LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
-	ac_cv_path_AR="${AR}" \
-	ac_cv_path_AS="${AS}" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Their build system is royally confusing, as usual
-	MINOR_VERSION=${MIN_PV} # Used for .so version
-	emake DESTDIR="${D}" install
-
-	einfo "removing static libraries as upstream has requested!"
-	rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
-	# install nspr-config
-	dobin config/nspr-config
-
-	# Remove stupid files in /usr/bin
-	rm "${ED}"/usr/bin/prerr.properties || die
-
-	# This is used only to generate prerr.c and prerr.h at build time.
-	# No other projects use it, and we don't want to depend on perl.
-	# Talked to upstream and they agreed w/punting.
-	rm "${ED}"/usr/bin/compile-et.pl || die
-}
diff --git a/dev-libs/nspr/nspr-4.33.ebuild b/dev-libs/nspr/nspr-4.33.ebuild
index 3f4ceb883969..7be0ae41e449 100644
--- a/dev-libs/nspr/nspr-4.33.ebuild
+++ b/dev-libs/nspr/nspr-4.33.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index c3b34dd92143..df3974f53cee 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -2,8 +2,10 @@ AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117
 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
 DIST nss-3.68.2.tar.gz 82406396 BLAKE2B 0542278f63770e9d4f3ce51516d7786680f2a869907ec91b2c4160f9fcad60703dd0e2a77bae91306349ff56908af0020e9479815e2b15392da7b14b27f8c7bc SHA512 31fe62f9e6f1695546bf8b087ae35ac2d3f39fde6be6ab3fcbc81ef66cf6290fc34b799e3809fcba4e913d0e305c476ee8ee1f22d0f957ec6978025920bdb9de
-DIST nss-3.74.tar.gz 83937875 BLAKE2B 55881f0e78e0ccc9b246c4323f6f2a5f7a84cb5e57aa3902d3d5a4068ec0be6f2669a9da11377b86d11d2ce400c2e73a6132fd4e490a04aad96be399110edbea SHA512 6fb322b64a5b42e5e22e803c8985986240d2990849d576cfc4b94cdc5c4ab27f683ebc4e1cf5e0ad16c636fc32debb24ec3b2d02d5baedc8fbaedec79c908226
+DIST nss-3.75.tar.gz 84738291 BLAKE2B 35e8b1c3a6e2817d30e16b04288a5382332fa37d07f934de139dfb664c6a0ddd6a0e585902bd402cf45be5f9f9ae799c055a51cc4ec4a82c8dd12a454832e141 SHA512 0ad42f663b48649d7d16dc8b8956d2971a9566c0f7f655dd0609b94877f400977e5ad693f2eb44e1e277e55d1669294f07b3ba7a32573d3d72837b3944adf86d
+DIST nss-3.76.tar.gz 84623743 BLAKE2B 4e7ce8cfbfccae4d92357a86a0170427a50594387a73bd101e7400c85945de6104247900b4a0d5c0571370f718dc01b40749eba460b87ff339e097c07769412d SHA512 ffbdd8a27f60b796e1204912cde2fa62ac99747ce550258ccdd6fe96d60a46c6ac3f82758a7aba3c7ee58da4e7bf09f1bf817fb9f0fa4e62faaea08a6301b8bd
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
-EBUILD nss-3.68.2.ebuild 9537 BLAKE2B cab6e2a96b12ece321375fc3613c9be11c5e269f620ce1fc79cbada50a1dd15ad5e7331cd0f11cb9a6542b28994152a444607f775ebef5ba57f66524e0734a95 SHA512 8dfd349b94766601f5a8e8ce36c93bd69c48730cd96d4a78f551161bf2542f9915c6d5d39aa7fa7e35662078ce5b14d4f309253e51e33ef4967a87b8dfb5d0b2
-EBUILD nss-3.74.ebuild 9545 BLAKE2B db225789dfbea45ad8d975feb0dbd85d276182eab69b82494f2378561535bccd5da1b08c7579ee050dfdb24c22b5da7d39685bc3e1d76d9e692e8a2c3815d793 SHA512 16b63ad55f8405d11a7647826b64dc14a3ee3c1f6533eaff66ef528f41855e619d4c1e2e1df3191ebe0c1fafeafc846173ec12d835209e6caa2d070f5279e412
+EBUILD nss-3.68.2-r1.ebuild 9291 BLAKE2B 28a867ab12837bfe8652a31a8feaa2cc9e915a875c23a4ef361677a6ad8af5c52b73a31c658113bb9f8be73f2a63635db205fceaccc15c3082f3b0cc3b418e26 SHA512 a976cd29fbfbf8f6b68f36dddfce37d037a84445b088adc056896bf063fb2ce9ada41cadef964a41eecde473e6e2c42ce263c3290a882209e3aaed1beaf5e451
+EBUILD nss-3.75-r1.ebuild 9299 BLAKE2B 046416eeb98364cf71c08cba8f1d1d49c7155f64da66ba960a0907d83ac72388cc3b3c0020324473b974f64513efd2019aa4176ec80a223ae57f7e204ef542de SHA512 7c2b1f165457e8a76d88d1750bc88169b2414df49e706df082dfd5cfc9942245420aadc95fb68fe58446e65a15f8f0eba45ca80bfadfd3bab3a28bdf990b2422
+EBUILD nss-3.76-r1.ebuild 9299 BLAKE2B 046416eeb98364cf71c08cba8f1d1d49c7155f64da66ba960a0907d83ac72388cc3b3c0020324473b974f64513efd2019aa4176ec80a223ae57f7e204ef542de SHA512 7c2b1f165457e8a76d88d1750bc88169b2414df49e706df082dfd5cfc9942245420aadc95fb68fe58446e65a15f8f0eba45ca80bfadfd3bab3a28bdf990b2422
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/nss-3.68.2.ebuild b/dev-libs/nss/nss-3.68.2-r1.ebuild
index 9f45dee60454..8d2e934a1557 100644
--- a/dev-libs/nss/nss-3.68.2.ebuild
+++ b/dev-libs/nss/nss-3.68.2-r1.ebuild
@@ -335,12 +335,6 @@ multilib_src_install() {
 		done
 		popd >/dev/null || die
 	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
 }
 
 pkg_postinst() {
diff --git a/dev-libs/nss/nss-3.74.ebuild b/dev-libs/nss/nss-3.75-r1.ebuild
index df96481cbb3d..225e7a316b86 100644
--- a/dev-libs/nss/nss-3.74.ebuild
+++ b/dev-libs/nss/nss-3.75-r1.ebuild
@@ -335,12 +335,6 @@ multilib_src_install() {
 		done
 		popd >/dev/null || die
 	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
 }
 
 pkg_postinst() {
diff --git a/dev-libs/nss/nss-3.76-r1.ebuild b/dev-libs/nss/nss-3.76-r1.ebuild
new file mode 100644
index 000000000000..225e7a316b86
--- /dev/null
+++ b/dev-libs/nss/nss-3.76-r1.ebuild
@@ -0,0 +1,361 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.32"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index 4ce112bf6d37..e09e2b73d0b6 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,5 +1,5 @@
-DIST opencl-icd-loader-2021.04.29.tar.gz 81650 BLAKE2B 399aa3cf3b3fd5fa5bef94302face8630f7b3485c01000960687f77c823311a28f9f867f929c4c03ec873b724ae02e1ecbbe974fe3ddddf4334064609cb61b51 SHA512 4b57a168fe75cced8162e173bc1f5d32fd11285a0443478f938ace1b88f6422007d05ab6bfb272a28838129122ffcd98d33634a55e82b9df84be0b6d4e609178
 DIST opencl-icd-loader-2021.06.30.tar.gz 81832 BLAKE2B de36c69a46582a468594dd61997d2c3e44f523613b3da4b9c4a20ae764e4be47b00e656f6f79e371dc32174c6be0a827e3a1a8830af92ab552799e2837f62c66 SHA512 baee7fa33fe654034aae60cf9886d79a04f4dc61a1546bfa1016c66bfba103caa9fb7b55ee79854f2f7435afb40c82b1b6ff8022507279dea271ab4d96b0076e
-EBUILD opencl-icd-loader-2021.04.29.ebuild 887 BLAKE2B dc8dfa8729cdae1efaf08ef950051ee8d40385ac9ac85b61172ce9ccce8794d4ac208c190d6a0572ad4f02008b01a9437b8312153bf3a5716f7460bb83c273fb SHA512 14e1ca4a25d3dc5819abe67218371ac1b2bc603323c3123432a7789fc345eaec3d62b7bac85cdaca2c2d82355dec8ec9357a82352262fa79f329218c5f02eeba
+DIST opencl-icd-loader-2022.01.04.tar.gz 81969 BLAKE2B 20018654ae1e9566d806f4d1de64301e0f023ffad2d432c852d4dcf7e323c9c1d60f2aa49a1290cc1263e0e9386b7b0ae4095341f9aaffd6a27edf53b1d1b49e SHA512 060769ed8c84d906b2feacb4be5402c67b5cd561dc2334b384a731e66f301840ad2fc2ed143d32cfeab246d91a6c1f5377b6c9db4d8fc0571a90838c575aca01
 EBUILD opencl-icd-loader-2021.06.30.ebuild 887 BLAKE2B 152f167a5385e89f7e6929f78186aa8472abca2bfac911ffa223200f3c8231455b9e9d83de56ec36f9708f7a4d27df7c169e01061db30c0b6a4a342c777d3d2d SHA512 1d26f1fb0fde5932ed82a935b6893e0762d7ff8aa419f0ed1afbb69f02b7e72f31c0ebccae5aa7255ecf717b7d1d70dcfaa400e258b298615c93245e38fa60dd
+EBUILD opencl-icd-loader-2022.01.04.ebuild 889 BLAKE2B 74508f06d68773e9c5d8b98abc8da9278976fe70d818a4b202dc0b6bfdab2629de3ea79f62b42f88df2b1b5212f5d095b04fc3843f085baffbfaa55224aa35c8 SHA512 de1befcae806ea5fdf9a8c55b3fac8faa3a7dae09b4aeea0f454eaefb684a96293283d46405c02a71bc5ef8af9d405746e4a1b86fed270298f628978705ec22f
 MISC metadata.xml 341 BLAKE2B b49a18b36fbbf0c978ad2445ee4688f32cafd66001f04e02256a420b9dd1e808f85c32e43adb15e5814957f5273a135f82c5fdfe37baf7e6fa73abe2c8fcd990 SHA512 5dcf111b1e5ec3e7532258ed2e29946cab993051193bec1413096b52148117c935b028e071c501863620c4a51e81aee333b9e4375caa14fdab3701524da99268
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.04.29.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild
index dc98e27b7a14..6a053ce77bbb 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.04.29.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_ECLASS=cmake
 inherit cmake-multilib
@@ -15,12 +15,12 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=dev-util/opencl-headers-2021.04.29
+DEPEND=">=dev-util/opencl-headers-2022.01.04
 	!dev-libs/ocl-icd"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index 37df390d461f..69fff18a4cc2 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -1,4 +1,5 @@
 AUX openobex-1.7.2-version.h.patch 621 BLAKE2B 90ef501688d2313b70d755a5d6233c027eade70870bb135c018eea180993d5138fdaf614fd1cc396a1521a2d522f8d03c132dc3d3c14839664c7021fc2e657b4 SHA512 9c060d3f4af4ca78ccbc931df26311d1e37c1a86279a56358eb468162746ef3e3d6324fd419f9b38c072ae4c1bb0e9df64643b5de0cdb876aff54530daa83262
 DIST openobex-1.7.2-Source.tar.gz 127248 BLAKE2B c0405aef2f15f16e31641f4a60ac01da26c2a61a5114b8f3990f0fcf64bd55c730ff7aa5f524b450c1e6b5653b9616c0861686102594818ba3bdf2314a3c51ff SHA512 22f1b0d99e7186da9fa12b510ef9dbb6f7d76777d58b235ab2f627703d07b6f6b0488cdc9c6d8c0ab7bc86d6d19117c55fff9273fed02736c0210f9b1788bf4d
 EBUILD openobex-1.7.2-r2.ebuild 1093 BLAKE2B e90f1bcf3c18d19114c7f52dfe168e04af5312f61b633c77df9994118ce9d68e5b419a34ea5e02bd361ab33f56261b42639346c4d2bd5ce680149922c1ccd81a SHA512 df464b66c3b92e73d7b662b3fb62cc6d062777f1dadfd1963af95feca2e7e7a90baf77d5b94ca272a4f8ad2a48be06675a8baef63aee1eb3881978dd122b8579
+EBUILD openobex-1.7.2-r3.ebuild 1086 BLAKE2B bababc7c9713e25c06ef5fbe9a2ebde5cd50bdcb663037c514bd28ad817803d54254ff503b9f5b345ac57179a5f66afd492022c62e223123e1b6506faa0d6d54 SHA512 d58506bd7cabd651f3932f80687e10b5823e243b619dcc46a7b43f20f73dd7e457b3130ecf286f4b68306e94229f5e910f1570a421b4bba8552cb36810395452
 MISC metadata.xml 391 BLAKE2B 308e54929dd0b54459df73def6f3000720755140285c80200f90d728370b148db88ed43e57f2262d8a4dde15236d00cb7dc6e926acb353e51fea433d9b3a686d SHA512 46b90dd0b36258872569b982412b810f4a4c4a77bd3f15bf5531aee9b624bd6d964fb0b3e3d21bcf2af5fd1c0b78e4d46ce144eb34d96d68a33030fe372a8722
diff --git a/dev-libs/openobex/openobex-1.7.2-r3.ebuild b/dev-libs/openobex/openobex-1.7.2-r3.ebuild
new file mode 100644
index 000000000000..ce0a1b44448b
--- /dev/null
+++ b/dev-libs/openobex/openobex-1.7.2-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev
+
+DESCRIPTION="Implementation of the OBEX protocol used for transferring data to mobile devices"
+HOMEPAGE="https://sourceforge.net/projects/openobex/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-Source.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bluetooth doc irda usb"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+DEPEND="
+	bluetooth? ( net-wireless/bluez:= )
+	usb? ( virtual/libusb:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}-Source"
+
+PATCHES=( "${FILESDIR}/${P}-version.h.patch" )
+DOCS=( AUTHORS ChangeLog README UPGRADING.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DOPENOBEX_BLUETOOTH=$(usex bluetooth)
+		-DOPENOBEX_IRDA=$(usex irda)
+		-DOPENOBEX_USB=$(usex usb)
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	use usb && mycmakeargs+=( -DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)/rules.d" )
+
+	cmake_src_configure
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 795c5cfcc876..76194f29eff3 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -8,13 +8,21 @@ DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b
 DIST openssl-1.1.1k.tar.gz 9823400 BLAKE2B e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121
 DIST openssl-1.1.1l.tar.gz 9834044 BLAKE2B 9e8739015db63a013c05587e3d164d67c3f65f1f6c5fc75e4592bcd038c036cde88a7bc95fbc1f1b4ed876f6124ca4dabcd4f5dbb45d1b84299f2efe1a59431a SHA512 d9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0
 DIST openssl-1.1.1m.tar.gz 9847315 BLAKE2B 163262933df11afdb7b0c58fbbf0454b05e02951d28ed24e2c530affa18dee884d86555f7314506852ebfcc092bb509b6f9cd33893e30dab67bfb6f5713946eb SHA512 ba0ef99b321546c13385966e4a607734df38b96f6ed45c4c67063a5f8d1482986855279797a6920d9f86c2ec31ce3e104dcc62c37328caacdd78aec59aa66156
+DIST openssl-1.1.1n.tar.gz 9850712 BLAKE2B af530258d9f7ca4f1bd1c6c344eb385e766e465c9341dd08797676165f67bbb82d3fd549ed7559dc12fb8c9c4db5e04fa6ec7ab729ec1467f5e8bce469ff5398 SHA512 1937796736613dcf4105a54e42ecb61f95a1cea74677156f9459aea0f2c95159359e766089632bf364ee6b0d28d661eb9957bce8fecc9d2436378d8d79e8d0a4
+DIST openssl-1.1.1n.tar.gz.asc 488 BLAKE2B 8fc18fdc884473dc4c243499cc3528691a9ecc184e39e8d942450d41c42d22a96398036ae804af23c4f28d082c62f5babaa275ceb2e13b33b5acfd59a802c186 SHA512 24abc3d187cabed830dcd3189a34c2dc29e0b8013a607011a0e85cc68f0ec48c1de14a005053a4de3a4013cfa9658016ac65cfb8cfac58da55231371926beeda
 DIST openssl-3.0.0.tar.gz 14978663 BLAKE2B 64721ee958fc47d57a479dffff91be5692d80d10a6727d804f8a9da66fcaea799b67fda8987f9ecdfb2777ec42033c5e8a6a135e30784d6422eb3c65e676abe6 SHA512 1fdf769ef69631eb802671a9e0bb3a01883d58282f651986212983c2d7c9d3499dabe99a6dee0411e997e6fcfa6f682b121b7698596de0d6c78850c2200241b1
+DIST openssl-3.0.0.tar.gz.asc 833 BLAKE2B df0dac703a5259bb312e4e2a9cb81d061331e69426633097354dbcc0658345f6723eaddf74303d97bb3d849bc93f07ecdaad0fd807ab9272e01a419e8f1f4abb SHA512 b51d3ec06b5d7bc7ff7297a6530154ff718b288e7daafa28cff1ca8396de229090e8addaf63da2322b0b17f51be8fa114ddc71da2dcd118b7d7d1bdc73b6f46e
 DIST openssl-3.0.1.tar.gz 15011207 BLAKE2B ea1e560cbebbd3fdb560cbd7db518db2f95d1b7a8397435483829eda815e9f74a175693949c3d013205c43c936d703755ca14afba29077570361fca75164a719 SHA512 4eb29386a6c2c47bebc668e68b61872eed1d136e5620d6f8971393ae7dd8d0f640257278735c76adc0c9569a315fdb929c175a2931d52d3fcc4c527ad6a975ce
+DIST openssl-3.0.1.tar.gz.asc 488 BLAKE2B 26e44d5ad4d4c986c6c03f7ddf0406efcbc0748435039c7d121a9040f7494e30ed59a639946e0fc86c43871c433e815f694f7ffa45c7709aae70ac6087b34820 SHA512 085e8734b74e58a7c345cf2170fd476e38fe0a3b6eb1a1c417bd1dab962f96a6e2256c409aa4c650bbb57228aacdc75b8a13b693ebea571932de528d7ce622d6
+DIST openssl-3.0.2.tar.gz 15038141 BLAKE2B 140c4c80a0cad89cb0059fef6a4cd421460e6af9a3973f7a3eb5e39f64c0d44794d46e7a869e5235fced139f2249351e37a9ee5ebaa17f2708d63141ebebf919 SHA512 f986850d5be908b4d6b5fd7091bc4652d7378c9bccebfbc5becd7753843c04c1eb61a1749c432139d263dfac33df0b1f6c773664b485cad47542266823a4eb03
+DIST openssl-3.0.2.tar.gz.asc 488 BLAKE2B 2f6482114271c4f512159fa159486a3b3470637d770cd1614fda004918d06ed9ab562e655d1580d2ebb05745ec72987488c2161b72d078017cc157003d4205da SHA512 4303391a58107c76ad9b05510f5bfc95f687f4cb2f9ff5b03fb262ba99b573423ab83f0437471199954496799b343191b889ad9ef8fabdd7ee4ec3ec9b5f1d81
 EBUILD openssl-1.0.2u-r1.ebuild 9933 BLAKE2B 5ad3b7befdf48c6ddaa7c849b3970730b8b693ba722beb012d89d41bb3af98e4037b811587072ec5dd2b70e5eb3683ce5800907d2ae8cc4e03886da15720a627 SHA512 20aa5cecdaf61e66a126125da6d17696b47891f01939c6932d0b9ecd89a211fded135c0fbfa7eaff5d7cf46433c4b356961baf5fb325c698743b8862c7fef284
 EBUILD openssl-1.1.1k-r1.ebuild 10295 BLAKE2B fb0806691eda400dcd36862b91bb1bfd8ce7be60a85bcc8f1de2c74b1421dd33fd22c00451f6c55aad404616b82f2c971aab751de1d243cb4dc6cde23615e18e SHA512 2f594b4df0c9a408a8208f98b9bbdb0ffc63f3d3e84c3c242b307b2d4cd1eb5b34ec8b30735c2c4bb0f9c0842fe6264dd71722adca04caed79e4c32ee25c005c
 EBUILD openssl-1.1.1l-r1.ebuild 8467 BLAKE2B 5416eaf449db4d7e785cf8ba2b83a829a9b57237c9d561900029ede389205a3905411b9b19d170f801d781fdb7ff3f8e562c0b037a87ad1cb48830cdac8091f5 SHA512 826f4e77f5388fa0b3cdd754c5d39c049987f4c7c038fa416da1611e084c866339ae95ccae722fb2058689953c60ed56562247feb11baaaf869516eea5a56b00
 EBUILD openssl-1.1.1l.ebuild 10295 BLAKE2B fb0806691eda400dcd36862b91bb1bfd8ce7be60a85bcc8f1de2c74b1421dd33fd22c00451f6c55aad404616b82f2c971aab751de1d243cb4dc6cde23615e18e SHA512 2f594b4df0c9a408a8208f98b9bbdb0ffc63f3d3e84c3c242b307b2d4cd1eb5b34ec8b30735c2c4bb0f9c0842fe6264dd71722adca04caed79e4c32ee25c005c
-EBUILD openssl-1.1.1m.ebuild 9043 BLAKE2B 8c6875b8cd5fcbae1d56698da9b74476b631c284c72d9048a4b454a5e79ceacb2f6540815cdb525c7a2b73b432de693d938129f58ecf097020c2c02a4ca9812b SHA512 28bdb7f5443f3798805e60c1f5ba7075b89464dbd4856234ac073f544c047bfc61511cad6829c4313fd8f5df9ac21c7973e4e35fe8630331ef6eeb1bffbbd1ac
-EBUILD openssl-3.0.0.ebuild 8207 BLAKE2B db8b946532034cfb9a9daaebca0202eff8af61157ad73e6d755de66dc9d249ea893bfc753f2a423be01876e184d439e6b9508dcc3ddf4a345181bbdc864cd4f6 SHA512 625c7bd53dfe8e96d50b6ea8b52d7386cdb425af05ec5a17475514cdb7d29e02a2283b2e58a1785c78bd5d7817f96fbf4af3747bb68b2107720326893f50b300
-EBUILD openssl-3.0.1.ebuild 8207 BLAKE2B db8b946532034cfb9a9daaebca0202eff8af61157ad73e6d755de66dc9d249ea893bfc753f2a423be01876e184d439e6b9508dcc3ddf4a345181bbdc864cd4f6 SHA512 625c7bd53dfe8e96d50b6ea8b52d7386cdb425af05ec5a17475514cdb7d29e02a2283b2e58a1785c78bd5d7817f96fbf4af3747bb68b2107720326893f50b300
+EBUILD openssl-1.1.1m.ebuild 9036 BLAKE2B 998fbd22a08de53c635cb928dc236827e0982e5758f51d179d92a087771f46fbff227624868bb0a682d0df2daec093d7c64bfb3812a6c5035f529030bbec7e8e SHA512 d976a3e28a9914a6ca0cba3d6a852c787f80d51b381bcb400ab88bcbc9d6e956c60dbb439781cfbffe47d1227301aa4ceb7729718f49a239f784dcc239815f93
+EBUILD openssl-1.1.1n.ebuild 9241 BLAKE2B 668ebb22634516767883f9789d986045fc39ab74dc44325bf24e230c5c986303bdc025fb5f034cbb4c241ba41469cc8d26471be8624f90f57cc5cd64bfe05c22 SHA512 7d5cf64848ada014a52d5e2d8c0e56cb7554a0f726c372f6bbd156a257e8b3400c2356ca80f1580db60c1c000fcb56e080d1f3fb0be6cbdb883979a6f26cd4ce
+EBUILD openssl-3.0.0.ebuild 8414 BLAKE2B 29ed3955931fafb29299b1513cd27bbb6f6c299a6b3c9bf91133222835100e25279199fecb915e46c5a720ff1f3dc5cde29707f4f9505caf258ebad5386b33c9 SHA512 6a8a08cd86cf1b12c98b3e6cf700106978a706e5c815305fb78dabe6a25fcf28704f9d40411e4a8f26adb74cce192f55c791f99938ae007560a85c0ae04b7c97
+EBUILD openssl-3.0.1.ebuild 8464 BLAKE2B 8e024cdae9836cb5135089482d22617b0a90b9617bc5b4f9ab79669c9b28a8c623218de11a452e2525ba29456a7ba9be7ac16724eb0dbcafd2d653b26fd77e4a SHA512 28e4e5be320a1a0c2ea726ec0872d6d42c79f3b5eea9ef23a2501e24e1ca6ff27226ad7720a7717e61642399a4a0d5d98ef406d8b8856ef98934ea7c3015d1a5
+EBUILD openssl-3.0.2.ebuild 8414 BLAKE2B 29ed3955931fafb29299b1513cd27bbb6f6c299a6b3c9bf91133222835100e25279199fecb915e46c5a720ff1f3dc5cde29707f4f9505caf258ebad5386b33c9 SHA512 6a8a08cd86cf1b12c98b3e6cf700106978a706e5c815305fb78dabe6a25fcf28704f9d40411e4a8f26adb74cce192f55c791f99938ae007560a85c0ae04b7c97
 MISC metadata.xml 1486 BLAKE2B ddf79f8ea66471d1aa2809dce9b3b87973c38a1367566ec77222dfd22062963535241314bd4fd56387f2d133825e43627f363edee9329c14565717511b5cb870 SHA512 92f53ca3d3867ab8cfc4093ac92a9d9885eee8c10ac43f80c4dfb87911fc253557118064ecf1b1fae48c50e1273ef3821c9db84f00760dd0af8d5104a49595f0
diff --git a/dev-libs/openssl/openssl-1.1.1m.ebuild b/dev-libs/openssl/openssl-1.1.1m.ebuild
index 397cea96f3c9..c5999a3fb88c 100644
--- a/dev-libs/openssl/openssl-1.1.1m.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1m.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/openssl/openssl-1.1.1n.ebuild b/dev-libs/openssl/openssl-1.1.1n.ebuild
new file mode 100644
index 000000000000..57dee5fb869d
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1n.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib-minimal verify-sig
+
+MY_P=${P/_/-}
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssl.org.asc
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		kernel_linux? ( sys-process/procps )
+	)
+	verify-sig? ( sec-keys/openpgp-keys-openssl )"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+# force upgrade to prevent broken login, bug 696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if use test && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	if use test && use sctp && has network-sandbox ${FEATURES}; then
+		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
+		rm test/recipes/80-test_ssl_new.t || die
+		eend $?
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+
+	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
+		# use GNU ld full option, not to confuse it on Solaris
+		sed -i \
+			-e 's/-Wl,-M,/-Wl,--version-script=/' \
+			-e 's/-Wl,-h,/-Wl,--soname=/' \
+			Configurations/10-main.conf || die
+
+		# fix building on Solaris 10
+		# https://github.com/openssl/openssl/issues/6333
+		sed -i \
+			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
+			Configurations/10-main.conf || die
+	fi
+
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	# echo "__uint128_t i;" > "${T}"/128.c
+	# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	# 	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	# fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		enable-ec2m \
+		enable-sm2 \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-compression zlib) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-3.0.0.ebuild b/dev-libs/openssl/openssl-3.0.0.ebuild
index e52ca896a3a6..a42efd8d9f4e 100644
--- a/dev-libs/openssl/openssl-3.0.0.ebuild
+++ b/dev-libs/openssl/openssl-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit flag-o-matic linux-info toolchain-funcs multilib-minimal
+inherit flag-o-matic linux-info toolchain-funcs multilib-minimal verify-sig
 
 MY_P=${P/_/-}
 
@@ -15,14 +15,16 @@ if [[ ${PV} == "9999" ]] ; then
 
 	inherit git-r3
 else
-	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssl.org.asc
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0/3" # .so version of libssl/libcrypto
 
-IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla"
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -37,7 +39,8 @@ BDEPEND="
 		sys-apps/diffutils
 		sys-devel/bc
 		sys-process/procps
-	)"
+	)
+	verify-sig? ( sec-keys/openpgp-keys-openssl )"
 
 DEPEND="${COMMON_DEPEND}"
 
diff --git a/dev-libs/openssl/openssl-3.0.1.ebuild b/dev-libs/openssl/openssl-3.0.1.ebuild
index e52ca896a3a6..81ca32b7cb63 100644
--- a/dev-libs/openssl/openssl-3.0.1.ebuild
+++ b/dev-libs/openssl/openssl-3.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit flag-o-matic linux-info toolchain-funcs multilib-minimal
+inherit flag-o-matic linux-info toolchain-funcs multilib-minimal verify-sig
 
 MY_P=${P/_/-}
 
@@ -16,13 +16,16 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssl.org.asc
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0/3" # .so version of libssl/libcrypto
 
-IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla"
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -37,7 +40,8 @@ BDEPEND="
 		sys-apps/diffutils
 		sys-devel/bc
 		sys-process/procps
-	)"
+	)
+	verify-sig? ( sec-keys/openpgp-keys-openssl )"
 
 DEPEND="${COMMON_DEPEND}"
 
diff --git a/dev-libs/openssl/openssl-3.0.2.ebuild b/dev-libs/openssl/openssl-3.0.2.ebuild
new file mode 100644
index 000000000000..a42efd8d9f4e
--- /dev/null
+++ b/dev-libs/openssl/openssl-3.0.2.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic linux-info toolchain-funcs multilib-minimal verify-sig
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
+HOMEPAGE="https://www.openssl.org/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
+
+	inherit git-r3
+else
+	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssl.org.asc
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0/3" # .so version of libssl/libcrypto
+
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-misc/c_rehash-1.7-r1
+	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+"
+
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)
+	verify-sig? ( sec-keys/openpgp-keys-openssl )"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}"
+
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openssl/configuration.h
+)
+
+pkg_setup() {
+	if use ktls ; then
+		if kernel_is -lt 4 18 ; then
+			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
+		else
+			CONFIG_CHECK="~TLS ~TLS_DEVICE"
+			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
+			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+
+			linux-info_pkg_setup
+		fi
+	fi
+
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if use test && use sctp ; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user
+
+	if use test && use sctp && has network-sandbox ${FEATURES} ; then
+		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
+		rm test/recipes/80-test_ssl_new.t || die
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export AR CC CXX RANLIB RC
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	local myeconfargs=(
+		${sslout}
+		$(use cpu_flags_x86_sse2 || echo "no-sse2")
+		enable-camellia
+		enable-ec
+		enable-ec2m
+		enable-sm2
+		enable-srp
+		$(use elibc_musl && echo "no-async")
+		enable-idea
+		enable-mdc2
+		enable-rc5
+		$(use fips && echo "enable-fips")
+		$(use_ssl asm)
+		$(use_ssl ktls)
+		$(use_ssl rfc3779)
+		$(use_ssl sctp)
+		$(use_ssl tls-compression zlib)
+		--prefix="${EPREFIX}"/usr
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
+		--libdir=$(get_libdir)
+		shared
+		threads
+	)
+
+	CFLAGS= LDFLAGS= echoit \
+		./${config} \
+		"${myeconfargs[@]}" \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile \
+		|| die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]] ; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	if ! use static-libs ; then
+		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
+	fi
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+
+		[[ ${m} == openssl.1* ]] && continue
+
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+
+		mv ${d}/{,ssl-}${m} || die
+
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
+		ln -s ssl-${m} ${d}/openssl-${m} || die
+
+		# locate any symlinks that point to this man page ...
+		# we assume that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index 536bd91cce4b..0b820157f665 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -1,13 +1,11 @@
 AUX ossp-uuid-1.6.2-fix-data-uuid-from-string.patch 1036 BLAKE2B 97287165ba55e00a92f53bbb819ebdfdd9457d8f6b4b8c37c6b2d0ad4880105a094da00f0ad9ac118e4ee8a9edb50b923350b01b69effdbecf8031b2a199624a SHA512 67b8107fe83141bf7e98090ddcd9c2c03d9a52d4d421395941281c22acfa350007dcbeaa8dbe48c421a26166c4a161dc721efa687fabf10ea902b926919e3860
 AUX ossp-uuid-1.6.2-fix-whatis-entries.patch 1127 BLAKE2B a02258db69254d2737cd88a687286584ffd98cda245c7d9b28ce69dfdeb2a2cfcec945eb46c206ca7c6eb21977a54e004f9abc33d2bf49d6d399e4cae9385b75 SHA512 99c2af0d000a51994f11b1c944cadd935c77a7ce65ee733dafd3ecaa92696defb0599883d8f80bdd4a292b4d7b08a50a61d9f989905c5cfadafdb9dd50116a15
 AUX ossp-uuid-1.6.2-gentoo-perl.patch 1114 BLAKE2B d9fa53c6bdbfb0055788bbeb18a4f6e720b568be99e58519bfc4fe00de986652fcc59c05212db9a569eeb7f06960fb899c7282043896c7dafad21fc96e4e07d2 SHA512 c4cab9327b49ff0c31b05744b299e2955ed48551744b7dcbdd8c736bf54580d7fe7708b0ed6ef99342fd9aa35df1e790f1d7863dba71c51876701d105100c5fd
-AUX ossp-uuid-1.6.2-gentoo-php.patch 1761 BLAKE2B 23cc32abcd906ccfed254e4b13332a49b65b3aa9b2323f4b0206fc9513457b4aa11f083495f7d4bcc2b38015f745b489638b473b24ca46501300b91eae9edf66 SHA512 e1ae6bf5e4069ac9157484e5cedb24167343c34df86a0ba0a89966ccfe2d856403a5cc97d84f8d1935212ecac1294a24351285cd8fb95b4a8af060145b2ac3af
 AUX ossp-uuid-1.6.2-gentoo-r1.patch 2896 BLAKE2B 74ff1d57f43f5b99bcbd8ae3295e19d1cf43128eb39fe6990895874642a72d9d1060d6a02b6d2d3f6e88a1061d124e4f42c9f3e95b41cbb65763775a8afc548c SHA512 e2fc7c1736e831ff640177de1458253c2303957dfc8b50de1e6056b18cd9f60ad8a9a2f067c2e2295248a4ffad11368298684f8f01d755e41e2ca06489affee0
 AUX ossp-uuid-1.6.2-hwaddr.patch 4535 BLAKE2B e91cb616e6f60f410e6d214359da6f785d2c4a685e3796d22c5ec3d5b49bb5b0e65f9f4b87fe2b24c946805d11201bf0a8f3015279a022c47e0f7e1f86f31ab5 SHA512 36d86dacd20cabfa432c3696b227ec1b385b8569cd9ae5c7c00470b26e87d013b05a037602310359b1be1343eac5494196280c6fc7a433c200c0b11807e91bd7
 AUX ossp-uuid-1.6.2-manfix.patch 539 BLAKE2B 040ee470f34d74ed076264310898697a6ee6a624dc96e226f9f696e5db9380b5132a0b3b0fae528fdcd6d8281f60fc94c34d4f67a4525399ff85310c243b0d72 SHA512 d0467ab931e153b10ac95a45830d55848fd40f23704bcf9bdb9445effa5056c164c966cb84f883c6c290cd1a711f1ea821ef0fff6e027e6fbd4008e9feee8bae
-AUX ossp-uuid-1.6.2-php70.patch 11172 BLAKE2B 8cd653ff28f8eafb8f47eefb830a18bfa6c2edb519d630b1c9cd5381077a67dd60e31e8be4cfd79ce8ddf6fcb116afcd3cb92ff34f60d5eea0134990cf5e9d77 SHA512 42aaaccedd40126cd1556ee3d5b4b4dbfed720445219d6121abd49cca36b974ae419d53d199d21b5ada41ba7a72948a29b702630cf77154217f78871246ca965
 AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 2535 BLAKE2B b5d2aa2673ec14779f4bda0c28609c807071eaf88a876d472bbc19de891b04aad47bdd4105712e28e604a968062ffdf199b60f1903fd89dd4caabd919bac2348 SHA512 64634327b2095bac0f8f9778b5c6e09edbaf3f6993aea344e3d8ff0bb661d0e0afae9806a364a33c3be6ca7dd7a23b9b8a501c742e99ad88fbefb88d0c4cfe8c
-AUX uuid-1.6.2-php54.patch 6096 BLAKE2B fcfc58f1c1e1e7b00b669a212d6154db0c2512da137c1cf43efc6703c0e7cbe3623cff2a30607e971f25a8bdd59fb5fc18b7532397ecf7cfbc9ce05e98011069 SHA512 6e3919ffa87e2bb16487761e1b33c0096c8db51bf49e6ba82c3c8f7275d2585c7a7196651a679827c547d8d73ce3739b9f44e44d3f3866aca10ded520547c527
 DIST uuid-1.6.2.tar.gz 397048 BLAKE2B 2240c2e19a09c7b7df0428fc316b46a69b3476ec852321f1ca43c0688b73da647cebf06e8efd8a89f55c11108ef4b9627a33ae1ec235cdda1ac7922389903c3c SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e
-EBUILD ossp-uuid-1.6.2-r6.ebuild 3009 BLAKE2B b300bce259b16d12838928273e4c9a40b1b0a919b018e25cb368f76dc83daef870a2b5aa36afd5e81d5437d97793f7664093e67fc7cef3b2a9f855b00635c1ed SHA512 7b3684c833ae9dfbf9ee468c9e218acd5657a45782388c876d81fa69ebd517456f95b67184479ca64bc3508d9cd1113b656528a0821c391e1e996c2b63a7e736
+EBUILD ossp-uuid-1.6.2-r6.ebuild 2173 BLAKE2B 4b519dfedca832601ec5c253f3c05bc9f591116dc651fe7d4b2ae77f6a77a44bb10acfb512164e5cf43ecb4bd86270116e8ed4c77979d4411021da03c7d5f958 SHA512 b01c2e04a003a85a469417c973bbfd03f2a1d164003a50c137c8f08e37cafbb8f9260086edcae22c6f8045cf55c2787e649ceb285ab7bbafe8998b5910fba78a
+EBUILD ossp-uuid-1.6.2-r7.ebuild 2254 BLAKE2B 80afa68600304a2423bfc9b2f3f989d5350813f0c9d11132a73bc1cfa586c3cc47eab4a1258fae787ebccc1150f58ff7776240d0fcfc29c20ecce2e392f48222 SHA512 a4384fcff252ef8b841f5336b186915d31b52fc2b18de0644d94678838bdd7771a0e85c9bfd6272444bd0bed4dc5b2a7e104930eff2dc98cf8d8170019e32883
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-php.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-php.patch
deleted file mode 100644
index 69c788bf1a05..000000000000
--- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo-php.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur uuid-1.6.2.orig/php/config.m4 uuid-1.6.2/php/config.m4
---- uuid-1.6.2.orig/php/config.m4	2009-03-21 12:52:49.142847389 +0100
-+++ uuid-1.6.2/php/config.m4	2009-03-21 12:53:06.282809038 +0100
-@@ -33,10 +33,10 @@
- if test "$PHP_UUID" != "no"; then
-     PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
-     AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
--    PHP_ADD_LIBPATH([..], )
--    PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
-+    PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
--    PHP_ADD_INCLUDE([..])
-+    PHP_ADD_INCLUDE([../uuid-1.6.2])
-     PHP_SUBST(UUID_SHARED_LIBADD)
-+    LDFLAGS="$LDFLAGS -L../uuid-1.6.2/.libs"
- 
-     dnl  avoid linking conflict with a potentially existing uuid_create(3) in libc
-     AC_CHECK_FUNC(uuid_create,[
-diff -Naur uuid-1.6.2.orig/php/Makefile.local uuid-1.6.2/php/Makefile.local
---- uuid-1.6.2.orig/php/Makefile.local	2009-03-21 12:52:49.142847389 +0100
-+++ uuid-1.6.2/php/Makefile.local	2009-03-21 12:53:06.282809038 +0100
-@@ -42,7 +42,7 @@
- 
- test: build
- 	@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; \
--	$(PHP) -q -d "safe_mode=0" -d "extension_dir=./" uuid.ts $$version
-+	$(PHP) -q -d "safe_mode=0" -d "extension_dir=./modules/" uuid.ts $$version
- 
- install: build
- 	@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \
-diff -Naur uuid-1.6.2.orig/php/uuid.ts uuid-1.6.2/php/uuid.ts
---- uuid-1.6.2.orig/php/uuid.ts	2009-03-21 12:52:49.142847389 +0100
-+++ uuid-1.6.2/php/uuid.ts	2009-03-21 12:53:06.282809038 +0100
-@@ -36,7 +36,7 @@
- 
- print "++ loading DSO uuid.so (low-level API)\n";
- if (!extension_loaded('uuid')) {
--    dl('modules/uuid.so');
-+    dl('uuid.so');
- }
- 
- print "++ loading PHP uuid.php${php_version} (high-level API)\n";
-
diff --git a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch
deleted file mode 100644
index 0124003bc1fc..000000000000
--- a/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-php70.patch
+++ /dev/null
@@ -1,337 +0,0 @@
---- uuid/php/uuid.c	2016-12-18 01:23:26.000000000 -0500
-+++ uuid/php/uuid.c	2016-12-18 01:23:43.564329483 -0500
-@@ -41,7 +41,13 @@
- } ctx_t;
- 
- /* context implicit destruction */
-+#if PHP_VERSION_ID >= 70000
-+static void ctx_destructor(zend_resource *rsrc)
-+#else
-+typedef long zend_long;
-+
- static void ctx_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-+#endif
- {
-     ctx_t *ctx = (ctx_t *)rsrc->ptr;
- 
-@@ -120,16 +126,23 @@
-     zval *z_ctx;
-     ctx_t *ctx;
-     uuid_rc_t rc;
-+#if PHP_VERSION_ID >= 70000
-+    char *param_types = "z/";
-+#else
-+    char *param_types = "z";
-+#endif
-
-     /* parse parameters */
--    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &z_ctx) == FAILURE)
-+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx) == FAILURE)
-         RETURN_LONG((long)UUID_RC_ARG);
- 
-     /* post-process and sanity check parameters */
-+#if PHP_VERSION_ID < 70000
-     if (!PZVAL_IS_REF(z_ctx)) {
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_create: parameter wasn't passed by reference");
-         RETURN_LONG((long)UUID_RC_ARG);
-     }
-+#endif
- 
-     /* perform operation */
-     if ((ctx = (ctx_t *)malloc(sizeof(ctx_t))) == NULL)
-@@ -138,7 +151,12 @@
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_create: %s", uuid_error(rc));
-         RETURN_LONG((long)rc);
-     }
-+#if PHP_VERSION_ID >= 70000
-+    zval_dtor(z_ctx);
-+    ZVAL_RES(z_ctx, zend_register_resource(ctx, ctx_id));
-+#else
-     ZEND_REGISTER_RESOURCE(z_ctx, ctx, ctx_id);
-+#endif
- 
-     RETURN_LONG((long)rc);
- }
-@@ -158,7 +177,11 @@
-         RETURN_LONG((long)UUID_RC_ARG);
- 
-     /* post-process and sanity check parameters */
-+#if PHP_VERSION_ID >= 70000
-+    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
-+#else
-     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
-+#endif
-     if (ctx == NULL || ctx->uuid == NULL) {
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_destroy: invalid context");
-         RETURN_LONG((long)UUID_RC_ARG);
-@@ -185,21 +208,32 @@
-     zval *z_clone;
-     ctx_t *clone;
-     uuid_rc_t rc;
-+#if PHP_VERSION_ID >= 70000
-+    char *param_types = "rz/";
-+#else
-+    char *param_types = "rz";
-+#endif
- 
-     /* parse parameters */
--    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &z_ctx, &z_clone) == FAILURE)
-+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_clone) == FAILURE)
-         RETURN_LONG((long)UUID_RC_ARG);
- 
-     /* post-process and sanity check parameters */
-+#if PHP_VERSION_ID >= 70000
-+    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
-+#else
-     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
-+#endif
-     if (ctx == NULL || ctx->uuid == NULL) {
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: invalid context");
-         RETURN_LONG((long)UUID_RC_ARG);
-     }
-+#if PHP_VERSION_ID < 70000
-     if (!PZVAL_IS_REF(z_clone)) {
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: clone parameter wasn't passed by reference");
-         RETURN_LONG((long)UUID_RC_ARG);
-     }
-+#endif
- 
-     /* perform operation */
-     if ((clone = (ctx_t *)malloc(sizeof(ctx_t))) == NULL)
-@@ -208,7 +243,12 @@
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_clone: %s", uuid_error(rc));
-         RETURN_LONG((long)rc);
-     }
-+#if PHP_VERSION_ID >= 70000
-+    zval_dtor(z_clone);
-+    ZVAL_RES(z_clone, zend_register_resource(clone, ctx_id));
-+#else
-     ZEND_REGISTER_RESOURCE(z_clone, clone, ctx_id);
-+#endif
- 
-     RETURN_LONG((long)rc);
- }
-@@ -230,7 +271,11 @@
-         RETURN_LONG((long)UUID_RC_ARG);
- 
-     /* post-process and sanity check parameters */
-+#if PHP_VERSION_ID >= 70000
-+    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
-+#else
-     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
-+#endif
-     if (ctx == NULL || ctx->uuid == NULL) {
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_load: invalid context");
-         RETURN_LONG((long)UUID_RC_ARG);
-@@ -254,7 +299,7 @@
-     zval *z_ctx;
-     ctx_t *ctx;
-     uuid_rc_t rc;
--    long z_mode;
-+    zend_long z_mode;
-     unsigned long mode;
-     zval *z_ctx_ns;
-     ctx_t *ctx_ns;
-@@ -266,7 +311,11 @@
-         RETURN_LONG((long)UUID_RC_ARG);
- 
-     /* post-process and sanity check parameters */
-+#if PHP_VERSION_ID >= 70000
-+    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
-+#else
-     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
-+#endif
-     if (ctx == NULL || ctx->uuid == NULL) {
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_make: invalid context");
-         RETURN_LONG((long)UUID_RC_ARG);
-@@ -281,7 +330,11 @@
-         }
-     }
-     else if (ZEND_NUM_ARGS() == 4 && ((mode & UUID_MAKE_V3) || (mode & UUID_MAKE_V5))) {
-+#if PHP_VERSION_ID >= 70000
-+        ctx_ns = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx_ns), ctx_name, ctx_id);
-+#else
-         ZEND_FETCH_RESOURCE(ctx_ns, ctx_t *, &z_ctx_ns, -1, ctx_name, ctx_id);
-+#endif
-         if (ctx_ns == NULL) {
-             php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_make: invalid namespace context");
-             RETURN_LONG((long)UUID_RC_ARG);
-@@ -314,21 +367,33 @@
-     uuid_rc_t rc;
-     zval *z_result;
-     int result;
-+#if PHP_VERSION_ID >= 70000
-+    char *param_types = "rz/";
-+#else
-+    char *param_types = "rz";
-+#endif
- 
-     /* parse parameters */
--    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &z_ctx, &z_result) == FAILURE)
-+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_result) == FAILURE)
-         RETURN_LONG((long)UUID_RC_ARG);
- 
-     /* post-process and sanity check parameters */
-+#if PHP_VERSION_ID >= 70000
-+    zval_dtor(z_result);
-+    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
-+#else
-     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
-+#endif
-     if (ctx == NULL || ctx->uuid == NULL) {
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_isnil: invalid context");
-         RETURN_LONG((long)UUID_RC_ARG);
-     }
-+#if PHP_VERSION_ID < 70000
-     if (!PZVAL_IS_REF(z_result)) {
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_isnil: result parameter wasn't passed by reference");
-         RETURN_LONG((long)UUID_RC_ARG);
-     }
-+#endif
- 
-     /* perform operation */
-     if ((rc = uuid_isnil(ctx->uuid, &result)) != UUID_RC_OK) {
-@@ -353,26 +418,42 @@
-     uuid_rc_t rc;
-     zval *z_result;
-     int result;
-+#if PHP_VERSION_ID >= 70000
-+    char *param_types = "rrz/";
-+#else
-+    char *param_types = "rrz";
-+#endif
- 
-     /* parse parameters */
--    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrz", &z_ctx, &z_ctx2, &z_result) == FAILURE)
-+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_ctx2, &z_result) == FAILURE)
-         RETURN_LONG((long)UUID_RC_ARG);
- 
-     /* post-process and sanity check parameters */
-+#if PHP_VERSION_ID >= 70000
-+    zval_dtor(z_result);
-+    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
-+#else
-     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
-+#endif
-     if (ctx == NULL || ctx->uuid == NULL) {
--        php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context");
-+        php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context from first parameter");
-         RETURN_LONG((long)UUID_RC_ARG);
-     }
-+#if PHP_VERSION_ID >= 70000
-+    ctx2 = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx2), ctx_name, ctx_id);
-+#else
-     ZEND_FETCH_RESOURCE(ctx2, ctx_t *, &z_ctx2, -1, ctx_name, ctx_id);
-+#endif
--    if (ctx2 == NULL || ctx2->uuid) {
--        php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context");
-+    if (ctx2 == NULL || ctx2->uuid == NULL) {
-+        php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: invalid context from second parameter");
-         RETURN_LONG((long)UUID_RC_ARG);
-     }
-+#if PHP_VERSION_ID < 70000
-     if (!PZVAL_IS_REF(z_result)) {
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_compare: result parameter wasn't passed by reference");
-         RETURN_LONG((long)UUID_RC_ARG);
-     }
-+#endif
- 
-     /* perform operation */
-     if ((rc = uuid_compare(ctx->uuid, ctx2->uuid, &result)) != UUID_RC_OK) {
-@@ -392,7 +473,7 @@
- {
-     zval *z_ctx;
-     ctx_t *ctx;
--    long z_fmt;
-+    zend_long z_fmt;
-     unsigned long fmt;
-     zval *z_data;
-     uuid_rc_t rc;
-@@ -404,7 +485,11 @@
-         RETURN_LONG((long)UUID_RC_ARG);
- 
-     /* post-process and sanity check parameters */
-+#if PHP_VERSION_ID >= 70000
-+    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
-+#else
-     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
-+#endif
-     if (ctx == NULL || ctx->uuid == NULL) {
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_import: invalid context");
-         RETURN_LONG((long)UUID_RC_ARG);
-@@ -428,28 +513,40 @@
- {
-     zval *z_ctx;
-     ctx_t *ctx;
--    long z_fmt;
-+    zend_long z_fmt;
-     unsigned long fmt;
-     zval *z_data;
-     uuid_rc_t rc;
-     void *data_ptr;
-     size_t data_len;
-+#if PHP_VERSION_ID >= 70000
-+    char *param_types = "rlz/";
-+#else
-+    char *param_types = "rlz";
-+#endif
- 
-     /* parse parameters */
--    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &z_ctx, &z_fmt, &z_data) == FAILURE)
-+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, param_types, &z_ctx, &z_fmt, &z_data) == FAILURE)
-         RETURN_LONG((long)UUID_RC_ARG);
- 
-     /* post-process and sanity check parameters */
-+#if PHP_VERSION_ID >= 70000
-+    zval_dtor(z_data);
-+    ctx = (ctx_t *)zend_fetch_resource(Z_RES_P(z_ctx), ctx_name, ctx_id);
-+#else
-     ZEND_FETCH_RESOURCE(ctx, ctx_t *, &z_ctx, -1, ctx_name, ctx_id);
-+#endif
-     if (ctx == NULL || ctx->uuid == NULL) {
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_export: invalid context");
-         RETURN_LONG((long)UUID_RC_ARG);
-     }
-     fmt = (unsigned long)z_fmt;
-+#if PHP_VERSION_ID < 70000
-     if (!PZVAL_IS_REF(z_data)) {
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "uuid_export: data parameter wasn't passed by reference");
-         RETURN_LONG((long)UUID_RC_ARG);
-     }
-+#endif
- 
-     /* perform operation */
-     data_ptr = NULL;
-@@ -462,7 +559,11 @@
-         data_len = strlen((char *)data_ptr);
-     else if (fmt == UUID_FMT_STR || fmt == UUID_FMT_TXT)
-         data_len--; /* PHP doesn't wish NUL-termination on strings */
-+#if PHP_VERSION_ID >= 70000
-+    ZVAL_STRINGL(z_data, data_ptr, data_len);
-+#else
-     ZVAL_STRINGL(z_data, data_ptr, data_len, 1);
-+#endif
-     free(data_ptr);
- 
-     RETURN_LONG((long)rc);
-@@ -474,7 +575,7 @@
-    return error string corresponding to error return code */
- ZEND_FUNCTION(uuid_error)
- {
--    int z_rc;
-+    zend_long z_rc;
-     uuid_rc_t rc;
-     char *error;
- 
-@@ -483,7 +584,11 @@
-     rc = (uuid_rc_t)z_rc;
-     if ((error = uuid_error(rc)) == NULL)
-         RETURN_NULL();
-+#if PHP_VERSION_ID >= 70000
-+    RETURN_STRING(error);
-+#else
-     RETURN_STRING(error, 1);
-+#endif
- }
- 
- /* API FUNCTION:
diff --git a/dev-libs/ossp-uuid/files/uuid-1.6.2-php54.patch b/dev-libs/ossp-uuid/files/uuid-1.6.2-php54.patch
deleted file mode 100644
index c00f560f1fd8..000000000000
--- a/dev-libs/ossp-uuid/files/uuid-1.6.2-php54.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -up uuid-1.6.2/php/uuid.c.php54 uuid-1.6.2/php/uuid.c
---- uuid-1.6.2/php/uuid.c	2007-01-01 19:35:57.000000000 +0100
-+++ uuid-1.6.2/php/uuid.c	2012-11-06 16:05:03.354913764 +0100
-@@ -60,7 +60,7 @@ static int ctx_id;               /* inte
- #define ctx_name "UUID context"  /* external name   */
- 
- /* module initialization */
--PHP_MINIT_FUNCTION(uuid)
-+ZEND_MINIT_FUNCTION(uuid)
- {
-     /* register resource identifier */
-     ctx_id = zend_register_list_destructors_ex(
-@@ -91,13 +91,13 @@ PHP_MINIT_FUNCTION(uuid)
- }
- 
- /* module shutdown */
--PHP_MSHUTDOWN_FUNCTION(uuid)
-+ZEND_MSHUTDOWN_FUNCTION(uuid)
- {
-     return SUCCESS;
- }
- 
- /* module information */
--PHP_MINFO_FUNCTION(uuid)
-+ZEND_MINFO_FUNCTION(uuid)
- {
-     char version[32];
- 
-@@ -115,7 +115,7 @@ PHP_MINFO_FUNCTION(uuid)
-    proto rc uuid_create(ctx)
-    $rc = uuid_create(&$uuid);
-    create UUID context */
--PHP_FUNCTION(uuid_create)
-+ZEND_FUNCTION(uuid_create)
- {
-     zval *z_ctx;
-     ctx_t *ctx;
-@@ -147,7 +147,7 @@ PHP_FUNCTION(uuid_create)
-    proto rc uuid_destroy(ctx)
-    $rc = uuid_destroy($uuid);
-    destroy UUID context */
--PHP_FUNCTION(uuid_destroy)
-+ZEND_FUNCTION(uuid_destroy)
- {
-     zval *z_ctx;
-     ctx_t *ctx;
-@@ -178,7 +178,7 @@ PHP_FUNCTION(uuid_destroy)
-    proto rc uuid_clone(ctx, &ctx2)
-    $rc = uuid_clone($uuid, &$uuid);
-    clone UUID context */
--PHP_FUNCTION(uuid_clone)
-+ZEND_FUNCTION(uuid_clone)
- {
-     zval *z_ctx;
-     ctx_t *ctx;
-@@ -217,7 +217,7 @@ PHP_FUNCTION(uuid_clone)
-    proto rc uuid_load(ctx, name)
-    $rc = uuid_name($uuid, $name);
-    load an existing UUID */
--PHP_FUNCTION(uuid_load)
-+ZEND_FUNCTION(uuid_load)
- {
-     zval *z_ctx;
-     ctx_t *ctx;
-@@ -249,7 +249,7 @@ PHP_FUNCTION(uuid_load)
-    proto rc uuid_make(ctx, mode[, ..., ...])
-    $rc = uuid_make($uuid, $mode[, ..., ...]);
-    make a new UUID */
--PHP_FUNCTION(uuid_make)
-+ZEND_FUNCTION(uuid_make)
- {
-     zval *z_ctx;
-     ctx_t *ctx;
-@@ -307,7 +307,7 @@ PHP_FUNCTION(uuid_make)
-    proto rc uuid_isnil(ctx, result)
-    $rc = uuid_isnil($uuid, &$result);
-    compare UUID for being Nil UUID */
--PHP_FUNCTION(uuid_isnil)
-+ZEND_FUNCTION(uuid_isnil)
- {
-     zval *z_ctx;
-     ctx_t *ctx;
-@@ -344,7 +344,7 @@ PHP_FUNCTION(uuid_isnil)
-    proto rc uuid_compare(ctx, ctx2, result)
-    $rc = uuid_compare($uuid, $uuid2, &$result);
-    compare two UUIDs */
--PHP_FUNCTION(uuid_compare)
-+ZEND_FUNCTION(uuid_compare)
- {
-     zval *z_ctx;
-     ctx_t *ctx;
-@@ -388,7 +388,7 @@ PHP_FUNCTION(uuid_compare)
-    proto rc uuid_import(ctx, fmt, data)
-    $rc = uuid_import($ctx, $fmt, $data);
-    import UUID from variable */
--PHP_FUNCTION(uuid_import)
-+ZEND_FUNCTION(uuid_import)
- {
-     zval *z_ctx;
-     ctx_t *ctx;
-@@ -424,7 +424,7 @@ PHP_FUNCTION(uuid_import)
-    proto rc uuid_export(ctx, fmt, data)
-    $rc = uuid_error($ctx, $fmt, &$data);
-    export UUID into variable */
--PHP_FUNCTION(uuid_export)
-+ZEND_FUNCTION(uuid_export)
- {
-     zval *z_ctx;
-     ctx_t *ctx;
-@@ -472,7 +472,7 @@ PHP_FUNCTION(uuid_export)
-    proto rc uuid_error(ctx)
-    $error = uuid_error($rc);
-    return error string corresponding to error return code */
--PHP_FUNCTION(uuid_error)
-+ZEND_FUNCTION(uuid_error)
- {
-     int z_rc;
-     uuid_rc_t rc;
-@@ -490,24 +490,79 @@ PHP_FUNCTION(uuid_error)
-    proto int uuid_version()
-    $version = uuid_version();
-    return library version number */
--PHP_FUNCTION(uuid_version)
-+ZEND_FUNCTION(uuid_version)
- {
-     RETURN_LONG((long)uuid_version());
- }
- 
-+ZEND_BEGIN_ARG_INFO(arginfo_uuid_create, 0)
-+    ZEND_ARG_INFO(1, ctx)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO(arginfo_uuid_destroy, 0)
-+    ZEND_ARG_INFO(0, ctx)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO(arginfo_uuid_clone, 0)
-+    ZEND_ARG_INFO(0, ctx)
-+    ZEND_ARG_INFO(1, ctx2)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO(arginfo_uuid_load, 0)
-+    ZEND_ARG_INFO(0, ctx)
-+    ZEND_ARG_INFO(0, name)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_uuid_make, 0, 0, 2)
-+    ZEND_ARG_INFO(0, ctx)
-+    ZEND_ARG_INFO(0, mode)
-+    ZEND_ARG_INFO(0, ctxns)
-+    ZEND_ARG_INFO(0, url)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO(arginfo_uuid_isnil, 0)
-+    ZEND_ARG_INFO(0, ctx)
-+    ZEND_ARG_INFO(1, result)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO(arginfo_uuid_compare, 0)
-+    ZEND_ARG_INFO(0, ctx)
-+    ZEND_ARG_INFO(0, ctx2)
-+    ZEND_ARG_INFO(1, result)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO(arginfo_uuid_import, 0)
-+    ZEND_ARG_INFO(0, ctx)
-+    ZEND_ARG_INFO(0, fmt)
-+    ZEND_ARG_INFO(0, data)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO(arginfo_uuid_export, 0)
-+    ZEND_ARG_INFO(0, ctx)
-+    ZEND_ARG_INFO(0, fmt)
-+    ZEND_ARG_INFO(1, data)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO(arginfo_uuid_error, 0)
-+    ZEND_ARG_INFO(0, ctx)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO(arginfo_uuid_version, 0)
-+ZEND_END_ARG_INFO()
-+
- /* module function table */
--static function_entry uuid_functions[] = {
--    PHP_FE(uuid_create,  NULL)
--    PHP_FE(uuid_destroy, NULL)
--    PHP_FE(uuid_clone,   NULL)
--    PHP_FE(uuid_load,    NULL)
--    PHP_FE(uuid_make,    NULL)
--    PHP_FE(uuid_isnil,   NULL)
--    PHP_FE(uuid_compare, NULL)
--    PHP_FE(uuid_import,  NULL)
--    PHP_FE(uuid_export,  NULL)
--    PHP_FE(uuid_error,   NULL)
--    PHP_FE(uuid_version, NULL)
-+static zend_function_entry uuid_functions[] = {
-+    ZEND_FE(uuid_create,  arginfo_uuid_create)
-+    ZEND_FE(uuid_destroy, NULL)
-+    ZEND_FE(uuid_clone,   arginfo_uuid_clone)
-+    ZEND_FE(uuid_load,    NULL)
-+    ZEND_FE(uuid_make,    NULL)
-+    ZEND_FE(uuid_isnil,   arginfo_uuid_isnil)
-+    ZEND_FE(uuid_compare, arginfo_uuid_compare)
-+    ZEND_FE(uuid_import,  NULL)
-+    ZEND_FE(uuid_export,  arginfo_uuid_export)
-+    ZEND_FE(uuid_error,   NULL)
-+    ZEND_FE(uuid_version, NULL)
-     { NULL, NULL, NULL }
- };
- 
-@@ -516,11 +571,11 @@ zend_module_entry uuid_module_entry = {
-     STANDARD_MODULE_HEADER,
-     "uuid",
-     uuid_functions,
--    PHP_MINIT(uuid),
--    PHP_MSHUTDOWN(uuid),
-+    ZEND_MINIT(uuid),
-+    ZEND_MSHUTDOWN(uuid),
-     NULL,
-     NULL,
--    PHP_MINFO(uuid),
-+    ZEND_MINFO(uuid),
-     NO_VERSION_YET,
-     STANDARD_MODULE_PROPERTIES
- };
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
index 95c81c8ffa6a..7afc78c9b5c8 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
@@ -1,21 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 MY_P="uuid-${PV}"
 
-PHP_EXT_NAME="uuid"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_S="${WORKDIR}/${MY_P}/php"
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_SKIP_PATCHES="yes"
-USE_PHP="php5-6 php7-0 php7-1"
-
 GENTOO_DEPEND_ON_PERL="no"
 
-inherit perl-module php-ext-source-r3
+inherit perl-module
 
 DESCRIPTION="An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID"
 HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
@@ -24,10 +16,10 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+cxx perl php static-libs"
+IUSE="+cxx perl static-libs"
 
 DEPEND="perl? ( dev-lang/perl:= )"
-RDEPEND="${DEPEND} php? ( !dev-php/pecl-uuid )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -43,18 +35,6 @@ src_prepare() {
 		"${FILESDIR}/${P}-fix-data-uuid-from-string.patch"
 
 	eapply_user
-	if use php; then
-		pushd "${PHP_EXT_S}" > /dev/null || die
-		eapply -p2 \
-			"${FILESDIR}/${P}-gentoo-php.patch" \
-			"${FILESDIR}/uuid-${PV}-php54.patch" \
-			"${FILESDIR}/${P}-php70.patch"
-		popd > /dev/null || die
-		php-ext-source-r3_src_prepare
-
-		#Remove call by reference which is error
-		sed -i -e 's/\&\$/\$/' -e '/?>/d' "${S}/php/uuid.php5" || die
-	fi
 }
 
 src_configure() {
@@ -69,10 +49,6 @@ src_configure() {
 		--without-php \
 		$(use_with cxx) \
 		$(use_enable static-libs static)
-
-	if use php; then
-		php-ext-source-r3_src_configure
-	fi
 }
 
 src_compile() {
@@ -84,10 +60,6 @@ src_compile() {
 		perl-module_src_configure
 		perl-module_src_compile
 	fi
-
-	if use php; then
-		php-ext-source-r3_src_compile
-	fi
 }
 
 src_install() {
@@ -99,13 +71,6 @@ src_install() {
 		perl-module_src_install
 	fi
 
-	if use php ; then
-		php-ext-source-r3_src_install
-		insinto /usr/share/php
-		cd "${S}/php" || die
-		newins uuid.php5 uuid.php
-	fi
-
 	use static-libs || rm -rf "${ED}"/usr/lib*/*.la
 
 	mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
new file mode 100644
index 000000000000..1054159a937a
--- /dev/null
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_P="uuid-${PV}"
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit perl-module
+
+DESCRIPTION="An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compliant UUID"
+HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
+SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+cxx perl static-libs test"
+
+DEPEND="perl? ( dev-lang/perl test? ( virtual/perl-Test-Simple ) )"
+RDEPEND="perl? ( dev-lang/perl:= )"
+BDEPEND="perl? ( dev-lang/perl )"
+RESTRICT="perl? ( !test? ( test ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo-r1.patch"
+	"${FILESDIR}/${P}-gentoo-perl.patch"
+	"${FILESDIR}/${P}-hwaddr.patch"
+	"${FILESDIR}/${P}-manfix.patch"
+	"${FILESDIR}/${P}-uuid-preserve-m-option-status-in-v-option-handling.patch"
+	"${FILESDIR}/${P}-fix-whatis-entries.patch"
+	"${FILESDIR}/${P}-fix-data-uuid-from-string.patch"
+)
+
+src_configure() {
+	# Notes:
+	# * collides with e2fstools libs and includes if not moved around
+	# * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3
+	econf \
+		--includedir="${EPREFIX}"/usr/include/ossp \
+		--with-dce \
+		--without-pgsql \
+		--without-perl \
+		--without-php \
+		$(use_with cxx) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		cd perl
+		# configure needs the ossp-uuid.la generated by `make` in $S
+		perl-module_src_configure
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+	local DOCS=( AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS )
+	default
+	unset DOCS #unset so that other eclasses don't try to install them and possibly fail
+	if use perl ; then
+		cd perl
+		perl-module_src_install
+	fi
+
+	use static-libs || rm -rf "${ED}"/usr/lib*/*.la
+
+	mv "${ED}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc
+	mv "${ED}/usr/share/man/man3"/uuid.3{,ossp}
+	mv "${ED}/usr/share/man/man3"/uuid++.3{,ossp}
+}
+
+src_test() {
+	export LD_LIBRARY_PATH="${S}/.libs" # required for the perl-bindings to load the (correct) library
+	default
+
+	use perl && emake -C perl test
+}
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 8a79d819df84..5207a666b699 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -3,6 +3,8 @@ AUX pegtl-2.8.3-gcc-10.patch 1499 BLAKE2B 55d866cd49d3c3ea157981c948127f7b1b29a7
 AUX pegtl-3.2.1-werror.patch 1486 BLAKE2B 86a1b3e9a40c19a5f959d9a3c100eb4417edff831c92629806ee0e78be602a5457b4fa9dc60eaa4cb143fd4a06343d7c0845ed775a74b6bdfa9b2d3524aa9c4a SHA512 4a1dd50fd206045c1c78a577f792c481edd5e1d2220ce4428074c2cc3b78e9cc67d8f3f5830477cbe8ce76b13f3ba9f0dc280aaff4bd072ae5715eee6d14bdd1
 DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
 DIST pegtl-3.2.1.tar.gz 244746 BLAKE2B f1d4ab0bfbc0be09affc83ffdf07796705be949e1addd06e241b8c06dd34bea3844a34b6dfe143269e110279615238afa606944c52af32f8cf6ea34398c40c7b SHA512 6297adea085bb3043a60c28eb3a868a7c2d203b351f907ea3fdc4ef34c63f87a5786ac7d297531f8b8c8c3414f5ddef658a025a7bae2515bdc750e974975f6ff
+DIST pegtl-3.2.5.tar.gz 248904 BLAKE2B 008f7b058c5a62910911815bee671baead509e673ce8f67bebc4244edd1abed4c2467a03cb47e55e75c3be17b937834915f568a0a47066ba80949b868aa69494 SHA512 e531eaeef614d822e4bddbc6662fbe116cc1536fa308109f28ce5433607e6102f4e754a31094f9c349e4319914da6c83450dd2e8fa10dcfc3eee5a5dca547c14
 EBUILD pegtl-2.8.3-r1.ebuild 735 BLAKE2B 954e7a6b26792e51e8cfcc80a3fa9923a117e36cd9afe091322501eefd06c3398796de9b50ec3d63bc015333e67ec4de840ca868b11d3428c655389856f385e2 SHA512 dbdf8f3c6eccc8992800b3261c220d8394ccf03f4142baf4b3ab2f3347be1c5901039d9efca36d47a6baf05977b78544b5114cf5ba693eaae2aa9935331535f7
 EBUILD pegtl-3.2.1.ebuild 644 BLAKE2B f13a446fd6c4a49de02f678a2035835ab231c7a638de5ed37b0c81f565c3818de36687f3dfdf8c26ec63787270cbec90a26382309974eda7a44e78fd5620bd80 SHA512 bff8430db834d07082d0437909858730ff4e22863925b72d9f30186f08944d4bd9dffb75c19c31c901ef4f9ab926679f937d7972d8791d0bb8f602eb8c81af05
+EBUILD pegtl-3.2.5.ebuild 651 BLAKE2B cbc29c4dba17343f6ae26ff7e2a4bbb1978ef37ca9b99e031cab00601670e267289a7a2d799f17f7c2196cd84fc62655ce26ca53bd4be7607ba6b96fcf375fc7 SHA512 b9c453eb3f0e578a79547c63cf951ea3311423a55ebe512e2e1a9d0499c747435f9550930f73288ad9867110128e3cf220b5ba893dc41311fbcb2d558f1dbc63
 MISC metadata.xml 331 BLAKE2B 12e6c4cfaaa53a618b8522bd05d8405f2a302d4e191350442839e393e2f97163444670d63b30afa6d103978d5f5218b40b4222a928cea413de52853108cba66e SHA512 b21bb068dca39dc56e95bf6ae50da18a0b9662e70bc3bc7896919b92a204c695baa7152312ad9a7db857bb42ca35b01cbdd78bc3e697a4aac617459dc8ae3e20
diff --git a/dev-libs/pegtl/pegtl-3.2.5.ebuild b/dev-libs/pegtl/pegtl-3.2.5.ebuild
new file mode 100644
index 000000000000..dc1661ab7be0
--- /dev/null
+++ b/dev-libs/pegtl/pegtl-3.2.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar"
+HOMEPAGE="https://github.com/taocpp/PEGTL"
+SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P^^}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-werror.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
+		-DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index 4044a84f0be1..f3d4dac67943 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-wayland-protocols-1.5.0.tar.xz 41488 BLAKE2B 1235506ffb69fdbabd2d8a0b6c9b477a50c83431571b000a10907caa16b178ddbe628d63b4fdf2c98905fdb8a8fdd0699ca13dc3b718ab672b08719f9f434ea3 SHA512 bec83ee401e71fff3c5a38768034b0dfc1dd191af634b9ffa765bf86d9c14143abc2c5abd743dc53cc6c0aac1dbbf79104683c9ff5c6d880b03e71399806a6d7
 DIST plasma-wayland-protocols-1.6.0.tar.xz 41752 BLAKE2B 63f733b63e6e707a340cfbfa0f0a774833e119ba53b8754ef6c05e09b42413284642740b9bcd6abfd7a06f1b651faf3807ee11121aa82b6ff9b1b20894f831cd SHA512 a9306d30032c46e8046ffbc8713e1afab732ee48a43922d0091cff25f0aaf407bee6fd08c333d9a83d064b903ebd1699d7d0ceadfe8b939ffd4d5e2129c22cf8
-EBUILD plasma-wayland-protocols-1.5.0.ebuild 456 BLAKE2B 425946fef6cfee0f1cccefb45d8707eafffb73dc52da77e0c5a39db71fb4b3d6827a80b98c2f7453924a0654474d66ff66e032a5f2ba2a572a64980814826e43 SHA512 b04df25f624c2317b93d7e985b21f19c00e1aaf31ba0a744a71ff96c6bc735cee639a5ccd832be1e62259438cb8fdf7b90b1a2f214216e6139921dfcc6120c74
-EBUILD plasma-wayland-protocols-1.6.0.ebuild 459 BLAKE2B c05eae4ba93f37cf0039b597891869b52491a41a70d5e5170db96ffdaaf1771f0b131e58fb208dd48a955eafb282d8ab8787bf32b5ec201ee77969cbc93169d1 SHA512 46033ce4c2e0272546f775ce3361f6d2cb24364d6cdbb630918bddd358ed29d6d6c6a78472ab3bdd1af6b6526ef40fd1d587d0df0e25187b2b373e4adc49d30b
+EBUILD plasma-wayland-protocols-1.6.0.ebuild 456 BLAKE2B e5ba5ecd1d0111f4c6567c1db52bb9e967f0831cdf48c031cfc77711a72566fb64b493fb8bdc8d9d4023e6bde06cd792fd929d1756888dac25caa2414167d3bb SHA512 57f44a144aca8e2545e0664e4c577b356c70c0785aa0380c450e8bad40e828a66adae19895ae95d4e11ab34404a9a5ae060b5821784e121ee98022fa60fc2c38
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.5.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.5.0.ebuild
deleted file mode 100644
index ddaf7dc1bcb1..000000000000
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.5.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_NONGUI=true
-KFMIN=5.82.0
-inherit ecm kde.org
-
-DESCRIPTION="Plasma Specific Protocols for Wayland"
-HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.6.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.6.0.ebuild
index 1b2528ddee83..b1c7475188e5 100644
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.6.0.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.6.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 745522abc40e..aecafe812f9f 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -2,6 +2,6 @@ AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43
 AUX poco-1.7.2-iodbc-incdir.patch 321 BLAKE2B 640c0b69e8c925d48da6f2bfc59cd2c77a02662ad1d8d447bb8c7ca23234ca1859c4aa9497d5703ef5f675d9096606254a9142770c6fffa4334cf71b1ca6953f SHA512 f3a0b4032fd4f71f0281d58c00241b1cd2f92da1a23a8501c420949621167d1fc7e2a2ed3ec48b6f75d35569f6443e3391eaf19a8c8fbd17e24d1cbd9ffd892d
 DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767bcc99dd6b6107a13d64ed7ac83d499d74f04084c666bbf5ef6f033d57d2fb1de0b8b8487844e3aaf8cefe6fba8 SHA512 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73
 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
-EBUILD poco-1.10.1.ebuild 3771 BLAKE2B 74964571e0a493a721d1336f7e039f2e6da6e2f0bca7da2131188746e669f30cb6b6cd9f649ac643ab9199598d5ef40eaa24fa10bdf60899b538d75ace82a261 SHA512 33f04c62da4d52c6c72e58e57c683e8532ca2a3eb8aa79d6734b17e31d224f742b61a9dfbab28c17a0ad65bc600762e5ab24dc0efa116932085bdef66b00a013
-EBUILD poco-1.9.0-r2.ebuild 3784 BLAKE2B 0e03a468a231f441c59b2e5900ef3b47694b822ef01abde89aa3d5d142e0db2a776c8f2c817e84ee890338b87cabd8f89d07fc34c41d7709380a3664f94bf8fd SHA512 2f9918b32a2fc7a78569f305a4bc270f6d2f80aecffbffeac2573c98d0981bfdd11b65e757a1f8b78965b2009d11e43fb73eff15a13c9455915158db1d55cf20
+EBUILD poco-1.10.1.ebuild 3785 BLAKE2B ca9eeac5cedc288c23fef5400d2428704b09aa707fcdbe02d12d9905caf3d72beed144a1588e6a440c66f59751f7b7e3d9e81cbcc86acbfaee0dd27222e54028 SHA512 f67bb94b6b08ed7f5d17d3c3b6f7186d7d7bd834bb8eedf1db045e001d683ac8ddc3be94ef3e2e1e0a27c65ee5b88525e46208907dfda88c7b17fa5d4c1261d6
+EBUILD poco-1.9.0-r2.ebuild 3763 BLAKE2B aba656a0393b241efaa6f94568d799b75a6a1aa2b65157b59bb2ef3f74e2cac2a587ecdc989d994050aaadcb9e5ec3febdbd685deb3556ffad07dfe6aacc950b SHA512 0bd3e60116ee8aeae272edb85a5e16134ad4e4b529b5008ef9d522dc46977340d54b3cc11b2a35b173d6b5b234c7d8c7329b733069eae3bbec04e3403531d3e7
 MISC metadata.xml 2584 BLAKE2B 666f63e00f654571eece88d1d4679673323570c5b68e4dda840ec94413461307a1b2eade7acd89852e0bf5163cafce9ed7d75c55fa3be7071a2d9445ffcbdca4 SHA512 c6526c758b0d06cc5b2b57b56f6e61f92950f88f62e38967948edcaa2b3fc618836b667ff57dc9b8c52e71e5921b14181376c79a8cfead7e607cfbc554f73dfd
diff --git a/dev-libs/poco/poco-1.10.1.ebuild b/dev-libs/poco/poco-1.10.1.ebuild
index 47a8c8a18c4c..ffffa6b8dd9f 100644
--- a/dev-libs/poco/poco-1.10.1.ebuild
+++ b/dev-libs/poco/poco-1.10.1.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
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}-release"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 x86"
 IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/dev-libs/poco/poco-1.9.0-r2.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild
index 6e68ea76db7e..191b5135b95c 100644
--- a/dev-libs/poco/poco-1.9.0-r2.ebuild
+++ b/dev-libs/poco/poco-1.9.0-r2.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
@@ -126,8 +126,8 @@ src_install() {
 
 	if use examples ; then
 		for sd in */samples ; do
-			insinto /usr/share/doc/${PF}/examples/${sd%/samples}
-			doins -r ${sd}
+			docinto examples/${sd%/samples}
+			dodoc -r ${sd}
 		done
 		find "${D}/usr/share/doc/${PF}/examples" \
 			-iname "*.sln" -or -iname "*.vcproj" -or \
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index bb35ee2d077c..35634ea41fcf 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -3,5 +3,5 @@ AUX disable-mipproblem2.patch 1098 BLAKE2B b15da536e0e46a2edbec44e4c68a97e57b96d
 AUX fix-clang-build.patch 1546 BLAKE2B ba0557f5cb36defa21cc5afdfa8d65bda9fe2a3b8d6262609eccf70e29f6442a7b261b22ffc112ff30cfddc0b8f2a80ffd787d2e9f14f8bb1ba35c095110d695 SHA512 d802c597e408ca50fe01e240c868b2fb5cc2ca3ff00cf15ff1de1c1dc5d0cf0b88da25de0d1151f8011e331f85e343348150285bb515c9ffc17806ff4edd082d
 DIST ppl-1.2-r3-disable-boeing-tests.patch 21485 BLAKE2B e68bab59710c63726f04a139e84d72b277e85625bc405c594a22c005186a2c3aae3850e17b81d38fa0231dcfd08454d488bbad2474ed810be78ef646d9c92559 SHA512 fc8dc020e493e5726167741d1548c661bac07991a982bf09ff61f593adfd2faf723886cbcb16d741db61e46530c4dddf49b6b61b67fef7d5ac15ca577c7fc46d
 DIST ppl-1.2.tar.xz 14136236 BLAKE2B 060b73384dac558dc8b2b0f1027ed0aa270b0adf0992c2ca1a281fa7bcdf959cba3a9e8ee29e978d12c3eee606b819075c5bcab59f4aed24fbf1c5512b5e2c36 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350
-EBUILD ppl-1.2-r4.ebuild 1806 BLAKE2B 931f118129c87474a029d671e0d3e41a7fb5544a8d40597bae821819db298165013f85f43cdb7e8c0d52a16d71c776a54abd9a4e8b1fdf3bed1f7c6413c10feb SHA512 e3cc6129659520df0fb52797d4a81417bb37586da7ef40aa44a4753179e786b54484021724b94399127e11c850e103dccf4b5eb5aeb516641e2021de9fb05ff5
+EBUILD ppl-1.2-r4.ebuild 1807 BLAKE2B 366052cd9d0fe920886556a93f525df1cb700cca0954ed591a447337f9d25b3f355bfb838536547c1b29f7fbf71c5afafa32d3588bfd70e66db483dd28d75146 SHA512 e2fa2d70907fc818de1b2299529f3ccf36901d760cf73f85f3430cbd1ce9d4aa611acb373b162da4001a263661b851a24badf253dfd973ea59a4eaace10bd936
 MISC metadata.xml 890 BLAKE2B ff950fbc0699a9817b2b364e5e4d21aa8d60d40608c8e6ef322e25474c4e528573063e8f62a733e8df3312afbbd8648f5d5bd8de6aa09b1a3cae7cd46fe81a05 SHA512 32ac8e0aca7d550a2a485f6c354e0a71409a3a8c80202609b864e7ceda023d86560787e9c6d38d67276816fadb1126dbf57ff67a0acc247b2833cee85af8c79d
diff --git a/dev-libs/ppl/ppl-1.2-r4.ebuild b/dev-libs/ppl/ppl-1.2-r4.ebuild
index dd41b374a8a8..6ce0fa97ee98 100644
--- a/dev-libs/ppl/ppl-1.2-r4.ebuild
+++ b/dev-libs/ppl/ppl-1.2-r4.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
@@ -12,7 +12,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~sparc-solaris"
 IUSE="cdd +cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx(+)]
diff --git a/dev-libs/processor-trace/Manifest b/dev-libs/processor-trace/Manifest
index 366efd93095f..8f0f57d77cb7 100644
--- a/dev-libs/processor-trace/Manifest
+++ b/dev-libs/processor-trace/Manifest
@@ -1,3 +1,3 @@
 DIST processor-trace-2.0.tar.gz 338965 BLAKE2B cc536139ab0e6f7e0d4a99e906a32e9636e55444e4c5fc37fb18a0df538bb5f6ae4c0cf4bc207afab6d0490a2fa7678fc8a0696dd1b16055869d6fdbd73618db SHA512 ec63151e842c81cc73ea11ba560b63e005cefbe19d98de24ae5c8caa4de7c9c1d71d1ec5b6214a347592eac675b75a3d2b26d4691ca86f91020ebfea8e912939
 EBUILD processor-trace-2.0.ebuild 571 BLAKE2B a5077681da3182ef6a2fd8f3e881b81e166730d8f214343370b616bd9664794a70836b19d47bace9643ca6fdb23b4fbf8622dceb5e81af446b7cb35eace3e11e SHA512 70553ee2b00358a367a3f7b1edd676e3e775b54e733dd53c3dbe31463064da66cc1d40a7246f638f62860617f009f1bd3ed5f2384a9a849d910f0552a5c623cc
-MISC metadata.xml 400 BLAKE2B 1c88e05c2a2c165ec9cfd9bdf699fcc681aa2756732d5431d3869492bd25302dc2045b52d5fd6a36d53d135d5c1bea010109b054790b0f332a1bd6ef7b5be6eb SHA512 73f48b81eb28b4c3f0d18714894a7354deae4fddba4826a13628d922282441b97602a5c9474ae043061a098e951847e2a1314517adab92b5fd6b810182d37341
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/processor-trace/metadata.xml b/dev-libs/processor-trace/metadata.xml
index 1685549b1d9f..115e9d64a669 100644
--- a/dev-libs/processor-trace/metadata.xml
+++ b/dev-libs/processor-trace/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jollheef@riseup.net</email>
-		<name>Mikhail Klementev</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 0613a126f595..51c9387ea155 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -3,5 +3,5 @@ AUX protobuf-c-1.4.0-include-path.patch 8092 BLAKE2B d1abcadbaf41789a882427cbae6
 DIST protobuf-c-1.3.3.tar.gz 500505 BLAKE2B 6f00eac847f5287cdea5afaea5be05d660eda10b30a14bbab89331ef134f93b8a77d3f6546cab246447494b0283b32218f794c56a7d081906c49668631b14505 SHA512 85308348929487e3a89158c6078dab39cee0b39a0611a4d5ba73d20520e41d96915e42a0d6060ebd3eb7d922c82444f5ca000ea4f8791b37734485cbb7e283b1
 DIST protobuf-c-1.4.0.tar.gz 505251 BLAKE2B 5f53238c064f82de87012eb739bf6a44c202d0dbf2fc5af394accdc52a9934d1fb9cea2bb4a4d529fdf98959546aaa672c1c991a9a7016803d16f65accc907cd SHA512 6a2e5031b85b5986e863661437dea002eba217257a50a27db88d29fa1a3db1014ed6ec7c21d89df700d181b18e169d1037146cb6475c10cd5a068a91e522e3c3
 EBUILD protobuf-c-1.3.3-r1.ebuild 1080 BLAKE2B 030805a9c9ac7dbf9fa6d9f2815b6ddb74821abdec9b4ba1d540df15d97a8f29c6f0b7d144c88392740d99bfe134e8b52d6be90da9ccb48138f7741ff552e173 SHA512 4c3fbacee9cb0f9a636158544cf68e58b0f648f582459b8741a45b4022dbf563f735b42d4ba6eb4ad48e7479e305f9a7dbe5972c072d0b5e35650ff8f6c04fe4
-EBUILD protobuf-c-1.4.0-r1.ebuild 1144 BLAKE2B 11ecd13a8592703af7d6e00558a397fd7f94b8178eb011713d8c1fe2403d9861a163ac06c04790ed4972555c255cb1689d7006f61f5b0bd5e525688e7588e38e SHA512 58e507b57839c3106b98a20963aac04ea432608535518ab529e06ec3a47ce9a64fbb596473336905089aeb42e3eb1d88d747bafe717bd2952045c824beab7661
+EBUILD protobuf-c-1.4.0-r1.ebuild 1140 BLAKE2B 0789c5324e6ea659307381050a63eb9e0ee33b5eab24f759dbf11be661f613820b9c3ca724ba4b4a7d234ac4545e96c1c8d2ca6f8fe0cc0c57c2a10e7599b182 SHA512 72a4d5a3c1d572ee3d8b946b97e99460868644d8400cf10c51dd161eab881307f54b53c00253fddf9db6a4faf0da453b7279656ed7f4ddc510daa19a074896e8
 MISC metadata.xml 259 BLAKE2B 650e53279ca9375b8dcdec83d1065b370b820ee770225c753fc93d8600781aa4c191fe2a8016e34f5a24b4f9a94b922bc48eb75550c25a2d85672674866c0b62 SHA512 12f8cbcc9bac27c99a9a80b6f9ae803a8cde6b765ce0487a08cf76e83347bf0ac9793d50cc00d692a6069906d0e98af684c7b060262ec95f57621850ca47677c
diff --git a/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild
index ae984fd64d87..8e8ab4e49d70 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.4.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index a7120cc55e66..d5db5232efb7 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -7,19 +7,11 @@ AUX protobuf-3.18.0-disable_no-warning-test.patch 1620 BLAKE2B af958e23f5229706b
 AUX protobuf-3.18.0-system_libraries.patch 7514 BLAKE2B 480217c0192f7948592a44804b33332f0e50e331f9219896eae36d5bae39f2541ffc3c4939f65a61cb58c8b4ebe377b5837a22eeeb16dc97e7e432ec55bac784 SHA512 c5b1a195dc50b7dc50317613d32511fc771ce2f3c78a2bb54eef2e00f822dba0ffe421c6d708c5230f769ff93aefe8c12d4d134d06190fdb7cc2f2e42fb343ef
 AUX protobuf-3.19.0-disable_no-warning-test.patch 1620 BLAKE2B e4f324ed59b2c31662cc625e9d3f1fdb20ee2a25769dbf86093e5000f73a01e11f05459989aaefeaf0414648cd52f1f1025b9d4f1423cdca4844e42e96f54836 SHA512 8c4bc72976a7eb3418b51e7a1c45b49d7ffaeb91a86f440008e6f162773b1db7afed4a6ae1d0b3510d49361c369b6552a9ba4976d104d804d825227aa7113d95
 AUX protobuf-3.19.0-system_libraries.patch 7514 BLAKE2B 1ff5c226232c325ed48cf16e2c47652615c4bd1503f1be8560e7f2e8658ffefeffeef72a6baf4368f758e30a4a81d582769b61dd0b3e383c8188cd03bf409c01 SHA512 b6a58e483dbb1f6151c2f7c735fbd55f34bcf98d6370eabb425dbd96e10cb87e8dfbf5024ad8f888cb80a095bc26598aceb55d576d37166550ee62db41c51a44
-DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36
-DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8
-DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98
 DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
-DIST protobuf-3.18.2.tar.gz 5272935 BLAKE2B f65caa4483d3ff4186f9ea388e2a9ef232ab758cfda846cfb5993df1f991e4574e63a33b175dd00c72f61c0a23ed12d3c62eb658cd397bf43b805c41fb34c47e SHA512 8ca613fdeefcbd93e866fab65effc38aa8508060aa3de0109dbead68f2e27eb22ad0a8aea10c8b4c3e9de181d62185c93b369fb5abf96de02a170f2e5c27e0cd
 DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
-EBUILD protobuf-3.17.0.ebuild 3963 BLAKE2B defb3effe35c18bd6643ad86bcc45b912d619492201b69acf1948d992003980cc5be7a76c57c44d2089da7951172a587fddf70e514752afdea79517bad192cad SHA512 7b47d28f8ab0b8a07a49115e9feea9e7eb92c5ed797332eece04c009d6cede9d1a27d8573a1528a9a20fce3a440246b42aec32d6b57cf5595b7f633ec414893d
-EBUILD protobuf-3.17.1.ebuild 3963 BLAKE2B defb3effe35c18bd6643ad86bcc45b912d619492201b69acf1948d992003980cc5be7a76c57c44d2089da7951172a587fddf70e514752afdea79517bad192cad SHA512 7b47d28f8ab0b8a07a49115e9feea9e7eb92c5ed797332eece04c009d6cede9d1a27d8573a1528a9a20fce3a440246b42aec32d6b57cf5595b7f633ec414893d
-EBUILD protobuf-3.17.2.ebuild 3963 BLAKE2B defb3effe35c18bd6643ad86bcc45b912d619492201b69acf1948d992003980cc5be7a76c57c44d2089da7951172a587fddf70e514752afdea79517bad192cad SHA512 7b47d28f8ab0b8a07a49115e9feea9e7eb92c5ed797332eece04c009d6cede9d1a27d8573a1528a9a20fce3a440246b42aec32d6b57cf5595b7f633ec414893d
-EBUILD protobuf-3.17.3.ebuild 3963 BLAKE2B 354826907c0820d5238b21cd8c3047ad4e75cb215fcd88592f4740e8bdf19803fe3e21e7b9f512af086085d83f3c6c4059316ee9d731aaa5268689e49d5efe9a SHA512 fa9aed179f0b781c1a02706d70ac5d6b172e495c5d51ecb79b4e5be1e2cdc2afd128f5569d6a621298b8724d5d3f484309bc6953ccd17477c8aea57396829a05
-EBUILD protobuf-3.18.2.ebuild 4163 BLAKE2B 66946fad9676382e10d5a4e6e36b149c9778a78c80062f22d772f796b77a3af60e2828c8e9c9359252ceb8e74adbaaf53a7a0f77f24929d7d53d035e1e5fab3a SHA512 f7e6cfd41a05621999a9c412cec7cfb75fbdff53062fcf500cdc844faef207b13c616ca3f8488ba0f14b90e70a791b8da90f3f08e88e03b15a14b1f6b63c80c4
-EBUILD protobuf-3.19.1.ebuild 3938 BLAKE2B 8a495968d8cd4272f19506e0108e903364775211c8d5f1fbc6d65ff291db66e12596d5fbd48e7490ac84ecbe20b5377fc9fcff6d774a1f73fded6544f064a82f SHA512 46bd3a0f653b807627e1cdddab4ce91d7c7fdf224183437b6566fb782194450c4f2b3e13b12661c95529787d4ddf01f8b51b48bdb22d3f348619316fb116c1c5
-EBUILD protobuf-3.19.3.ebuild 4139 BLAKE2B e6370e9d46cd62d2668481e2ced7b2a78e9d93ed8d0502d84ad28545422c405ec7e71599cdefbdcf19a200afeea2ee376d033a99200060305f73815340c61327 SHA512 61c62718e911a344f584072b041ebdd1c1312c73da89f6d64921df40f39a8a8bcea97e73d7de36f5596230296b5fc2686f8d6986fbb11f8454e6aa1eb8b252fb
+EBUILD protobuf-3.17.3.ebuild 3962 BLAKE2B ce7bdfc88b34eb0ac4a5f1cbf4ea50390c2e3e541a8465039b2c8c6d30d67ba88cb7529beeaf22bd2ef648c97e6e8a027c4fd03256d124213c2751ea57351fd0 SHA512 84db0ad5516ddfc3ee71c0465344200fcc83e20de1f3fb2ded37392220b3ada8cc54d51d00ee7ae11c6926430968f9ba4f26c1af6e09775f9bc1f6239b19ee21
+EBUILD protobuf-3.19.1.ebuild 3937 BLAKE2B 91f50e666933ee1c60528513827bec42fef40aa8c1d3fada8bef9c8407b870c6e925515edbba8202c0261d197f76de004d644b57f0a7f1808faebf5c8cfdb02c SHA512 f8d3b796169d113bdbd7b81e7433a121af13a0722c991bac50a6a009a2869ffbac4307857e649f08756c268732367d6005403e3b505e97407659e5237373325f
+EBUILD protobuf-3.19.3.ebuild 4132 BLAKE2B 15b71474760e3cdb22d5d82ebdd436e7bc5e03fec4ac8d3c1d2f2bf95182d7f7e22d65437614e6b4853332660998bc23dae14fa5620a18a3f137caa922752112 SHA512 a3c2cbac121819025c9408af4af5de93f506142bb10dc749db7d7e26bf48546f8f899efdf4cdfb9bb9e8b8cb87ae90fe1c81575e8d1ae864093ff2b6915beba8
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B 5627d3ad014e4360622b5837088bd6bdbc24b78886d734b1b37d01b474a4013e1ddec73422224c235e4908e8c1601e9650a69ee13d2ddb024d734c05080ab344 SHA512 bf151189787bbd05ff37f7d4e7e160d29b52ae1740704dd2b3446cb94e34e141e41d53b5a28d829c74c50e7f3fa5fd36a6bf528f0ad00af7fdc5be972c5738fc
 MISC metadata.xml 595 BLAKE2B ba1b916e26b1e53f68e660f03d2e53fea8d22db04e8241ebec3ec20fbb251c2b164cf25d5fb6118423ce7721a822ae2302aab137b0748730e9a6860bf8e65668 SHA512 785e2550621b79b6350e1a6b52ed9992610769885fb29a9e92ee45a35158cc08707a3590dfcbece9ee9a5e16e1abfb614e8186132da7b942f2761b5e6ecfa827
diff --git a/dev-libs/protobuf/protobuf-3.17.0.ebuild b/dev-libs/protobuf/protobuf-3.17.0.ebuild
deleted file mode 100644
index ab50d514273e..000000000000
--- a/dev-libs/protobuf/protobuf-3.17.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8459
-	sed \
-		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-i src/google/protobuf/arena_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8460
-	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/9392
-	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.17.1.ebuild b/dev-libs/protobuf/protobuf-3.17.1.ebuild
deleted file mode 100644
index ab50d514273e..000000000000
--- a/dev-libs/protobuf/protobuf-3.17.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8459
-	sed \
-		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-i src/google/protobuf/arena_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8460
-	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/9392
-	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.17.2.ebuild b/dev-libs/protobuf/protobuf-3.17.2.ebuild
deleted file mode 100644
index ab50d514273e..000000000000
--- a/dev-libs/protobuf/protobuf-3.17.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.17.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.17.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8459
-	sed \
-		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-i src/google/protobuf/arena_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8460
-	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/9392
-	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.17.3.ebuild b/dev-libs/protobuf/protobuf-3.17.3.ebuild
index 400858520580..c021f1f1885f 100644
--- a/dev-libs/protobuf/protobuf-3.17.3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.3.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/28"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/protobuf-3.18.2.ebuild b/dev-libs/protobuf/protobuf-3.18.2.ebuild
deleted file mode 100644
index 0aea6a331d06..000000000000
--- a/dev-libs/protobuf/protobuf-3.18.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 2008-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/29"
-# -hppa for bug #831728
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( app-editors/emacs:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( app-editors/emacs:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.18.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.18.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.16.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8082
-	sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8459
-	sed \
-		-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" \
-		-i src/google/protobuf/arena_unittest.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/8460
-	sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\  if (sizeof(void*) == 4) {\n    GTEST_SKIP();\n  }" -i src/google/protobuf/any_test.cc || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/9392
-	sed -e "s/^AC_PROG_OBJC$/AS_CASE([\$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])/" -i configure.ac || die
-
-	# https://github.com/protocolbuffers/protobuf/issues/9433
-	sed -e "/^[[:space:]]*static_assert(alignof(T) <= 8, \"\");$/d" -i src/google/protobuf/descriptor.cc || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.19.1.ebuild b/dev-libs/protobuf/protobuf-3.19.1.ebuild
index affbc3d58502..8cdee6955692 100644
--- a/dev-libs/protobuf/protobuf-3.19.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.19.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/pro
 LICENSE="BSD"
 SLOT="0/30"
 # -hppa for bug #831728
-KEYWORDS="~alpha amd64 arm arm64 -hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/protobuf-3.19.3.ebuild b/dev-libs/protobuf/protobuf-3.19.3.ebuild
index 9171eaebedbc..606851de0768 100644
--- a/dev-libs/protobuf/protobuf-3.19.3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.19.3.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/30"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index bcf6dc9c16f3..c54fdc094207 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,4 +1,6 @@
 DIST pugixml-1.11.4.tar.gz 386229 BLAKE2B 93d9c537f10e3a12297e4d6a39f2866bd5c9678c6aff83e20fb79b6587191b6586b1fe4d9dd995a7be05cc9281cd9910fae3eddf6b2eac216873e918a5cf3231 SHA512 c83f57ef2492eee359d979597fb5089b8eca547bb9d41cfbb6bcf43d59fe75e6780b0f31dd593145ec9888c065153aba52702667e2de213fa080cd51e9e13a38
+DIST pugixml-1.12.tar.gz 389685 BLAKE2B 190ebd1e7ac298a4ef6bc35769151f4d606a88185d29cfad7acb813990e3c9b2bf5b17c461f321942a3af0688c2244a896eb0129df8def5aff63b1d65aa3f6dc SHA512 1d23fc8b0aa643b932d34012be6d545734f5177d7db711fe1f0b82e318d72b5850a8c3d8513393b86b5a1e83ee7bfd825877f9efbf801369adfcb88041b52a93
 EBUILD pugixml-1.11.4.ebuild 570 BLAKE2B d48ab88ac4014ac2a5fa31e2a9adc1c3ea93100f06c97275e9c7442aef426c5d87e47ad19710e17486d87fa714cfd0bac266ec48b8ec7571b91e9b872c5a5fea SHA512 198d20b624cde5812c82b6d18d1e5b8d573712f9cf758ec21c72b99d0d024d4cfb570e5a1fede5afccdaface8a912b8bfcdecc4f6a0b2a72121f34fa0c778e3a
-EBUILD pugixml-9999.ebuild 569 BLAKE2B 353fb5e610b766647e1e3bd921a05390dec00f185d193437f96d7a8cf0bbfda8813168243dc80bf0b3cc1fd8c4e1c9e8e83b27590e1a3018f3a5ef1947f66e41 SHA512 248a298f4cde950be75592de172fc89fd36d979fcd76684c63e652456a60cd84a6bc0f2312248de003e4bc0771ce3bf2c9b28ff5c72087be245c202af50fbc99
+EBUILD pugixml-1.12.ebuild 582 BLAKE2B a86c4f8ba0551078485c2d5fd7d15e9b6771f09a4658c105318ae877246396602376c41d9e3b3fb1c2083e89fc4008cc647ff89da6f8a3a998f84f97c220ccee SHA512 29a154f5f3d1fa4e2b8314effee0c8ff08a5fb82c1998823c9c9c196400b675b68f9d8aa76eb761ce69252d565b6f1923c16e496d9d8e6d168b296c0d3ac0d94
+EBUILD pugixml-9999.ebuild 575 BLAKE2B a0d46d8a41900827ff9dd1e837fd17af8a07287443e2f96fcaf50069941433d0d1d8b6479fee2ce211d0e5789a3b186a5a6a987565da58271b3d35acac56837d SHA512 063b603e7620e285822bc6b90880c345690b438dc317a728fe52e7778b2eaac43a5931ab61c5278d53390e7f5884ee843c2c2ed7b12b77822a93690c46e8e5b6
 MISC metadata.xml 347 BLAKE2B d86121989c61d616a24c02c5a7455be56522faed7d6d025a43b3035e9225fad555222106114800e37b765c6c4b73f3db90ac7afad2289c08269392429b413586 SHA512 fded6654794919a99715f373c129bf51b4f21d931f7ac696a8ec078310585128aae7dd7a76f7ad0227d5de3aac8ab2bef129a3ca5b73054293ca55b8561364bc
diff --git a/dev-libs/pugixml/pugixml-1.12.ebuild b/dev-libs/pugixml/pugixml-1.12.ebuild
new file mode 100644
index 000000000000..f9990c10dc68
--- /dev/null
+++ b/dev-libs/pugixml/pugixml-1.12.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/zeux/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
+HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml"
+
+LICENSE="MIT"
+SLOT="0"
diff --git a/dev-libs/pugixml/pugixml-9999.ebuild b/dev-libs/pugixml/pugixml-9999.ebuild
index 13e703458881..dd62094ec7ee 100644
--- a/dev-libs/pugixml/pugixml-9999.ebuild
+++ b/dev-libs/pugixml/pugixml-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -10,11 +10,11 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
-HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/"
+HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-libs/qqwing/Manifest b/dev-libs/qqwing/Manifest
index 8ce03d1bb2c6..568548e58ba1 100644
--- a/dev-libs/qqwing/Manifest
+++ b/dev-libs/qqwing/Manifest
@@ -1,3 +1,3 @@
 DIST qqwing-1.3.4.tar.gz 352060 BLAKE2B cf78a3d06c529ab1d47739ee0914e268fe8375d5dd7eb73a05ed91fcd7231b0f2103ae2490a8edf438ebce5ec77457f2686338edb61c38a804af34df78763c31 SHA512 6762b97d7595e7831edb80d9fac06ca784c6dfb6c5717e72adaac6973ec94bec417806f8ae4b80ed95b876388c8c1a00906b0fa8653a115998c5170db25aab0d
-EBUILD qqwing-1.3.4.ebuild 371 BLAKE2B 4b7fe7bad429d29b7c5de164b92bea763ca22472fb90bc2e72c2ac50bd69f9c042faa008b84a97ee4fd6b6a638601367f659d044243fcaf32805e17b31e2c089 SHA512 a16e254a5dcad62d77e3a1ebf1a44c8dc2f226c9e233f91a7d1a2de7c9a1c44c1c277f512cba0fb673af6183056d3c32a129c4815e8b0797351b4238a5e2795d
+EBUILD qqwing-1.3.4.ebuild 370 BLAKE2B 6ee3869e0d81de63a936e378dc800c8afa6ba73cc54bc35a320c03355ecae79f2746031deb724477fdb2ee1b3d90f86ec4ff13744e19d4b3850bdc741e382c3f SHA512 cccd1ca6200df6995b9c2e59e80f23700d652acee1168a5b3a867ae33cd05a7fe8a95234f42ab1162da3f9afae0f95cc6ca4b34d94140740cfc3b3741361c88f
 MISC metadata.xml 344 BLAKE2B 7ccab937a954c7bf6a62964af9cf5da988d468441feea89de8c82870e4d414b8d916e63db83e026886c636d5d204d4415581a84b408e8e453293285e94d3cd38 SHA512 d3bb75e12aee5f1d3126b583c178048d365f28bb219953e32d20b1b59e809d24e916ae81617b16f3e31a5ba9f9ddd87cac9fa20e38a65d757fa41184f8f51640
diff --git a/dev-libs/qqwing/qqwing-1.3.4.ebuild b/dev-libs/qqwing/qqwing-1.3.4.ebuild
index e5ac27d32409..927b08ed0527 100644
--- a/dev-libs/qqwing/qqwing-1.3.4.ebuild
+++ b/dev-libs/qqwing/qqwing-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://qqwing.com/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0/2"
-KEYWORDS="amd64 arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 src_install() {
 	default
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index b6e52304a9f6..dc810078ff3b 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1,5 +1,8 @@
 AUX raft-0.10.0-toggle-zfs.patch 955 BLAKE2B bb9f351a6b7d0b7d95b7cdb6cf89db8963d46c44bd2613c69c7f3bd2c910cc185c8409cd80d218cab1569fe4729f649ac922ad1eb2b5652e5eeba441642e9588 SHA512 907f50fd1dc907d2a9aa1a89601064205c26d48956ddf56389a843e8c81b00acbc461125cbea5caef315be4a4a1d3a8f9bfd0a45ff0dedbeef1e0851e899b277
+AUX raft-0.11.3-disable-automagic-check-for-lz4.patch 2819 BLAKE2B 132e07bd4dc447bb67b2521c89e06c697dce9554d1f2b737aa460a22be9f7a2999f39ebd1b25f81863ebd764ef127856dceeadcb2a12aecdb01cf01f1cc22bc0 SHA512 9de7af38c778366e63e03991fa147844695dd0b4cd2e62559c5f82a0a2e914abf1bab5b905ad3cf26512d6d48670bfdb40a0683ef7dd1383eb0229f6718a70a4
 AUX raft-0.9.25-Always-skip-init-oom-test.patch 1140 BLAKE2B 03ee957f5fa7a1ef3c9a5223a5e67df07176110c601f790c905751cfcba7aeb4a160ac2a5547ff6440cd7c292a3e7d1913b3334f24151a288fd2c95e19865b86 SHA512 e138f113fef280fd8bbf8055be6410b81a163ee7813ac13f539e38923062306c6bf37831a298f56530a954d68f3975069af6e31f73679b4924274c5091ae7679
 DIST raft-0.11.2.tar.gz 325098 BLAKE2B d9366547440b431edec75a22bca3a50bb6d714b5d950c061723f0585c5ad33704d23c32f2e325dc566ebeab71e15e10f07932c854657837e190901b52c9b4950 SHA512 8be47270cf3b888ff6adeeec2480ccd5065b45c3c546da089cbb326cf429f0bcd4396001e20fbf52587c00d5757337812c834ec5064fafa4815a978a7cf0c35f
+DIST raft-0.11.3.tar.gz 329571 BLAKE2B 08b145bfbcc26b50f69c550599978ed365ccbbd021b9c4699784c08bd7e0f17f366b1709c22df1a467fbdb524668a753f431744419da8f18d57ea52c5b33de38 SHA512 7d1a7455ff8d58ed1f3d259cade1c74fcb22732a55242dcf761cc6554739c0ea1c462aa02591d28d8fa2b343b23e6261a5e15d02e2a31467969b7d9f9f3b5e92
 EBUILD raft-0.11.2.ebuild 1031 BLAKE2B c1bb5e5a07ec1d08b60dea5193de4561fdc3e8edadc737af4e6fffdac0d07ea2b204bfd9af9ad62f7e86c9486e978629848773033fc1c1d5a027ed8566c23c52 SHA512 c8322b60b347c6e40fd95c4f54918b5812833e034fe8eeeeae0821ddca0cf76e1b173001b786d42330113353ec742f1a0435b338b9848eeb034791ada3142a1e
+EBUILD raft-0.11.3-r1.ebuild 1096 BLAKE2B 830606018fe823faba2bfba7b1c5d4a4cb4ff9e7ccbc70f2bbcbbfabc100e68723000d225c020fe0b025f758e708353439643d4202b1870fd5872550bc32ad4d SHA512 bc42c406b1bdfe5a86e0bfb9ab78c82b515aba15b90e274924b255ea75c6f23d1bb4339a6f53a4625e0c7cacd3200501fcc6db882a402adba8dea9db92f31b6a
 MISC metadata.xml 813 BLAKE2B e2ee68230ca6938ecc09c7cf9a3c4acbe961c1a6c44cfc5521f5d1fca93d7b1a62c1bcf10290207288f3e5c04b8ecebb7d4ee4ba2b1a12326eb58e80e0276ee6 SHA512 e163b16c585f79757c35d5a84ed017cd173a40fdef5ea736f4a01c24ffc3db2f5f0d69486c58217d8910eee47757da5da23e8353f4254990ba13c2cd56ddaa57
diff --git a/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch b/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch
new file mode 100644
index 000000000000..7cd81e53cea9
--- /dev/null
+++ b/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch
@@ -0,0 +1,79 @@
+diff --git a/Makefile.am b/Makefile.am
+index e0dbfc8..e595cb7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -80,7 +80,9 @@ libraft_la_LDFLAGS += $(LZ4_LIBS)
+ endif # LZ4_AVAILABLE
+ if LZ4_ENABLED
+ test_unit_core_CFLAGS += -DLZ4_ENABLED
++test_unit_core_LDFLAGS = $(LZ4_LIBS)
+ libraft_la_CFLAGS += -DLZ4_ENABLED
++libraft_la_LDFLAGS += $(LZ4_LIBS)
+ endif # LZ4_ENABLED
+ 
+ if FIXTURE_ENABLED
+@@ -210,6 +212,7 @@ test_integration_uv_LDFLAGS += $(LZ4_LIBS)
+ endif # LZ4_AVAILABLE
+ if LZ4_ENABLED
+ test_integration_uv_CFLAGS += -DLZ4_ENABLED
++test_integration_uv_LDFLAGS += $(LZ4_LIBS)
+ endif # LZ4_ENABLED
+ 
+ endif # UV_ENABLED
+diff --git a/configure.ac b/configure.ac
+index df7bea9..0e2949f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,47 +23,13 @@ AM_CONDITIONAL(UV_ENABLED, test "x$have_uv" = "xyes")
+ # explicitly disabled.
+ AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [do not use lz4 compression]))
+ 
+-# Thanks to the OpenVPN configure.ac file for this part.
+-# If this fails, we will do another test next.
+-# We also add set LZ4_LIBS otherwise linker will not know about the lz4 library
+-PKG_CHECK_MODULES(LZ4, [liblz4 >= 1.7.1], [have_lz4="yes"], [LZ4_LIBS="-llz4"])
+-if test "${have_lz4}" != "yes" ; then
+-    AC_CHECK_HEADERS([lz4.h],
+-                     [have_lz4h="yes"],
+-                     [])
+-    if test "${have_lz4h}" = "yes" ; then
+-        AC_MSG_CHECKING([additionally if system LZ4 version >= 1.7.1])
+-        AC_COMPILE_IFELSE(
+-        [AC_LANG_PROGRAM([[
+-#include <lz4.h>
+-                         ]],
+-                         [[
+-/* Version encoding: MMNNPP (Major miNor Patch) - see lz4.h for details */
+-#if LZ4_VERSION_NUMBER < 10701L
+-#error LZ4 is too old
+-#endif
+-                         ]]
+-                        )],
+-         [
+-             AC_MSG_RESULT([ok])
+-             have_lz4="yes"
+-         ],
+-         [
+-             AC_MSG_RESULT([system LZ4 library is too old])
+-             have_lz4="no"
+-         ]
+-        )
+-    fi
+-fi
+-
+-AS_IF([test "x$enable_lz4" != "xno" -a "x$have_lz4" != "xyes"],
+-      [AC_MSG_ERROR([liblz4 required but not found])], [])
+-# LZ4 Can be available without being enabled, this allows a user to activate
+-# it at a later stage through an API call.
+-AM_CONDITIONAL(LZ4_AVAILABLE, test "x$have_lz4" = "xyes")
++AS_IF([test "x$enable_lz4" != "xno"], [
++	PKG_CHECK_MODULES(LZ4, [liblz4 >= 1.7.1], [LZ4_LIBS="-llz4"])
++])
+ # `LZ4_ENABLED` will cause the libuv snapshot implementation to use lz4
+ # compression by default.
+-AM_CONDITIONAL(LZ4_ENABLED, test "x$enable_lz4" != "xno" -a "x$have_lz4" = "xyes")
++AM_CONDITIONAL(LZ4_ENABLED, test "x$enable_lz4" != "xno")
++AM_CONDITIONAL(LZ4_AVAILABLE, test "x$enable_lz4" != "xno")
+ 
+ # The fake I/O implementation and associated fixture is built by default, unless
+ # explicitly disabled.
diff --git a/dev-libs/raft/raft-0.11.3-r1.ebuild b/dev-libs/raft/raft-0.11.3-r1.ebuild
new file mode 100644
index 000000000000..bd9c3e128919
--- /dev/null
+++ b/dev-libs/raft/raft-0.11.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="C implementation of the Raft consensus protocol"
+HOMEPAGE="https://github.com/canonical/raft"
+SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="lz4 test zfs"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libuv:=
+	lz4? ( app-arch/lz4:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch
+	"${FILESDIR}"/raft-0.10.0-toggle-zfs.patch
+	"${FILESDIR}"/raft-0.11.3-disable-automagic-check-for-lz4.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-uv
+
+		--disable-benchmark
+		--disable-debug
+		--disable-example
+		--disable-sanitize
+		--disable-static
+
+		$(use_enable lz4)
+		$(use_enable test fixture)
+
+		$(use_with zfs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 4173051293f1..9e17f2658701 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,5 +1,3 @@
-DIST re2-2021-06-01.tar.gz 403726 BLAKE2B 1919cc564f84073198062dace3c390b14acdea8b6be7b87d7f7548655dc6194b8fd5f0cd27567297ce80ba69b0b5a6bb824a2b9382ef2bd60d3c40bc4e3f412b SHA512 cf18a9b437d07046294ada992693c5af7c560c36a3435e525a36ef542f352d33627fff8903434063795cd124f7e5c0e30ca7eadda847a0fd9f7d97ca207d4b42
 DIST re2-2021-11-01.tar.gz 408934 BLAKE2B 31662b1e9cdfec67347cbe146763a29cc8970683d545965e649a5f54ac318c40cd6daf553b6098fae7024a944f73914641b05970f1274511fac6766abe6b9130 SHA512 9ea04638b7a8667fa9a9d9894c543417c86dde21a93bd4508ae8a43fdd21384092866a3f55e93249942f36488c165e93bee18c61bab3cf138a920654563b8122
-EBUILD re2-0.2021.06.01.ebuild 1352 BLAKE2B 4ad2554b45cee9027bb7fbf9ee731ed1e8b20648613a0a980a260e60c408edeee71208c7e91d3901fc7171bdfb59eb6933b1632c0ceb48bcf0441597706bee43 SHA512 f174c10a29fb1952841a7bd30ba28d03a13fb07423d5a7343c90b04d1b4027ab6c51a57541cb0f5fab24e75c13085362ca77256ba8e47d5f4fab1680862f62d2
 EBUILD re2-0.2021.11.01.ebuild 1352 BLAKE2B 4ad2554b45cee9027bb7fbf9ee731ed1e8b20648613a0a980a260e60c408edeee71208c7e91d3901fc7171bdfb59eb6933b1632c0ceb48bcf0441597706bee43 SHA512 f174c10a29fb1952841a7bd30ba28d03a13fb07423d5a7343c90b04d1b4027ab6c51a57541cb0f5fab24e75c13085362ca77256ba8e47d5f4fab1680862f62d2
 MISC metadata.xml 486 BLAKE2B d99b0956f406a1e5fbfaf9a8516aaa86c328829bbfd6b4c3cfc2e925d2862e08dd31cebb730c957ea38a9b5aa84a3010ddd51760e2db8385f9b5d608b40b4d37 SHA512 e882f04350157da3e0ad7438f2c6a340853f6b589996041931f6686860d61c861e003692f5df616282e498c18266ded4803fd63760c2457dfbd04ca1b5d93391
diff --git a/dev-libs/re2/re2-0.2021.06.01.ebuild b/dev-libs/re2/re2-0.2021.06.01.ebuild
deleted file mode 100644
index 707fba0b63f3..000000000000
--- a/dev-libs/re2/re2-0.2021.06.01.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2012-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="9"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="icu"
-
-BDEPEND="icu? ( virtual/pkgconfig )"
-DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}" shared
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
-}
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index 8746011f5223..ccc9ef7378c4 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -2,5 +2,5 @@ AUX redland-bindings-1.0.17.1-add-PHP7-support.patch 2359 BLAKE2B 04cc1122a8a226
 AUX redland-bindings-1.0.17.1-bool.patch 502 BLAKE2B 09ab5d8b5b3cf2edd046830bbc88a275c2df804dbb9e09a411bada838afd7f30c592dc48f02995752822a5d738af35c208f124c9d9d008cbff3395bbcfd7b404 SHA512 158e06e58ad66ca88ac8eb4646df0628f423de8d22638e78a737be3ea12fd123fd3bcf63b75478ff7f82ec3b444773a2e8d467fd737b8de0ae9143ef79e60a65
 AUX redland-bindings-1.0.17.1-php-config-r1.patch 2249 BLAKE2B 83d9a65d6db9411531b827d25aaaec721b6756c4a5503179a477fa3d452fff4deaa1fdcaa78c66f5cef0b4cb0d36e06a89050e520a2e0fd36694121eb8a71669 SHA512 406e0d0d97c7c181a16c2a72ec291582ada1c1dbec1cdb53ca62ec73f954a1116462b97f3cf85ada4adfc4ebff35081ac4ce0ce9e2b7155e61402dbb64f57c20
 DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
-EBUILD redland-bindings-1.0.17.1-r100.ebuild 3924 BLAKE2B d9fba280de9e10a62508ea91d5a64af105bda36aba653cd7eb3deb373d4d1f9b23e9fa0c730561052634d3616f145c30f0053a013433d277c89657717a9c8054 SHA512 0775b0fcbf23687f54d66af542efee334184f060692bf92cbd846df7f50c359838ba20c8939978d2eeca496efedf967eb30671c5f4a2f912ef32e38c60610aa4
+EBUILD redland-bindings-1.0.17.1-r100.ebuild 3925 BLAKE2B 8fcd8814a2a5fe2bd4a2e3f95b25686eb4ba952c13b0f72e054d48c79717d5466d2b434dfb97e8a908390291d04d1ba742db70064b715852a8946d9dfcdc3e88 SHA512 12c5bfed035846bbd56941c709bdc9b60cacf35e55a53bf521a51c76dd8ebafce3e21da2897d3e89cd202358c0d3a601c0ce543743130a7fbffa7726286d2c37
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild
index 47cee2fee840..e5c4cde5b39a 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.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
@@ -21,7 +21,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-linux"
 IUSE="lua perl python php ruby test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index 0f4d2441ac53..58d37c1f570a 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,4 +1,4 @@
 AUX redland-1.0.17-mysql-8-my_bool.patch 462 BLAKE2B f1a34d640698149b45a6a23c961690c79c02760b16c1087a79c27e8443cb956e953b02f9d435176c890500e4942cd37fe2c0105295490a3f4a629a651146fe33 SHA512 c796f5b6a3231a150310a889890137a7dd510cc75c8b80fead9db3c8fa4de27a132c58ad261188a6c6359f1debcd9b5ba273b7af4af3242035d4f6bc12364643
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
-EBUILD redland-1.0.17-r2.ebuild 2537 BLAKE2B 8810955d4024ad3bc65d84e297903964be5d0d97af1d1d324acb7b5a0ecbcdec5e51b7f1113cec5b683407f0bc5e9ce59ecb71246639dce006d709fa33856122 SHA512 a6e5e9650cb1de3446734696406d2d959f709b0db13d9dbd4fa2fa954d843c4d49c58aa2f83f28ef48b40973e49867a9e4646cf63c342d264ff7b7998dd97a57
+EBUILD redland-1.0.17-r2.ebuild 2538 BLAKE2B b319b82ab865d47ca3217177ec3ec82d86d8d4f98f36b495ca607015f3ba4aadcefc8502a50b490f472cf420c096683fc9ad353ad846845c811ab632c0d135f7 SHA512 9391a54cbee61d1ee54f2a04f2dc1604e0b837d247c9b629b71ac35f4225156cec9bed62236c1cdf407fb0ac1951a7fc534ab167c231f780b676cbfb439e16aa
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
index 598623f138bc..2e53e182c36d 100644
--- a/dev-libs/redland/redland-1.0.17-r2.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r2.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
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index 552554ff4eb1..56d4a6a45924 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -1,8 +1,10 @@
 AUX rocksdb-6.14.6-libatomic.patch 2994 BLAKE2B cac08dfa6fd490645e341148701ba0372aa97f76c84010e3ed94e3aa3a501762c7b2ea09cccc9e895912204e79d7430694b5ab7302fccb7b25f1c7f2ebba4afc SHA512 9f3814133699d7069ebff35b0513ad113a744d7adf21d7ec1d7975fc4fbd114430618760fd38dea69c6948dbf1dc4f5a994f7b347b40423c0244d2867276e448
+AUX rocksdb-6.17.3-add_timer_for_riscv.patch 1647 BLAKE2B d1e78c98149f534ce8d02754f5e15b5aeccadb99cf82586bd24c44c68aef5134bdd5d00f5f81699bae59f27ae9f565f40069afedba081f7a76ec54d90a37462b SHA512 ebcf6c5df091860bf53edf54af47678e90da251f28d0ed46be7ac1cf32f50528f8185e94d82ec770c97aa23d24dfcbba634ffcf2671a5dad5fcfd6104115bb69
+AUX rocksdb-6.17.3-libatomic.patch 2131 BLAKE2B 2f12fee9b062cf4bf633d784bd4234a1076d0b763f85b9ab0332c828661674944251098e7784b07118e95aa2f4729360cfe3b7b0c95afe58772ea0d3579afd96 SHA512 4717fb67b322f34a2fa351eac1d8fdcbf239acedefd8bcb69c07f11f472f0adc8579e7ddf01be6ba9239009f81d8df4b1cbfb1b88e996ad63fc1d3ff8b801526
 DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
 DIST rocksdb-6.15.5.tar.gz 6501252 BLAKE2B f85c6b54043019692a7174e41b69625650d072ee4de1f2850628854af4b5672ff7072ab5c41de84bca9ad0713a1eea7ad7c5cca5ba9b3b96c4bd492a01b5e859 SHA512 c0918fd48bc1e57be9e30452c5cd0c2ba627a15012ab6922404d6cddffdf80799e4442b14d03cbe13a9a9acbdf1736c505cc6f5406efefbf68aba71ec05cf5f0
 DIST rocksdb-6.17.3.tar.gz 6651009 BLAKE2B c032bdf61d93a35e84c65146ad6d1f8639e9f36a323c142fe4131b501051bfb9c4c4edb13b69c86e35740117029996bb4c94887ea690d1957926bdfd347c744a SHA512 085adab94b7eb22859b4119b0356f148231800413571e932a7248967b1866d40a0be4b8265f2a9c6c21c600d3b2254c36e64ce7851171ff7c439a17306a84981
 EBUILD rocksdb-6.14.6-r1.ebuild 1160 BLAKE2B 5009cd00349faa37165a5367a5ff79200b8c20422e6de77658f72da663478b283d8b084f7d7f76c23f83a7b22ff2b7b42d536858adb45742395a90cdc924ad19 SHA512 a8b462f530fa1b158722977ded10f60426b09d8fd538f2d1511dcb781abddd198de7e0f83f88a097f2f6b13da65f999685e54e745c8f06a95f6d19115a61e70d
 EBUILD rocksdb-6.15.5.ebuild 1152 BLAKE2B 1f8cfcf17f8b74bf9e6eb8fdeed62cf75b59a807f4f153ab715bc46084f313271fa7199e1fa2eb8f09b5e77b712a5f7a6baaca120efbc64bac723d42fe14692f SHA512 f7a0c6457c609e0c2341e389fce1124e2ba64107f620c04506ddf39901135561cd3af9ce48211fc5f5816985d273d578bb93ce1aad0ee7c02b4590bb1cd7fa7d
-EBUILD rocksdb-6.17.3.ebuild 1159 BLAKE2B d8409769d990b81de0cc17fbf7c0f0dde178c6894af6b2a076bacdce813a3996236818ac3832883e7ba75022bad89ad105edc635bf225da5faa96ea84af8102a SHA512 39bd04fab4b745e1f656e9fa0b027e40690510e0378b3b26d4b96956db0257ef2d7042f24059a92ba31eb312774b290ad7483be79ff5fce32d59f86bd2e8dcda
+EBUILD rocksdb-6.17.3.ebuild 1213 BLAKE2B bb2dd1c56e07e52ae6056943088e3a75b6fb6bdea645976fe1badfda1ea8c9c42d2053ee23fe423599c80fd7f8a01167b4c1278cebb3df850c5a818e6e4a2762 SHA512 3ec1f528013ed9e5dd88f9f186f8bd9ceeb449878f0cfcf1faecfc18fcb8a45db5c1fa550aa626c3da1998550b26623bc93fed843c090597669c5a58975bab08
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/dev-libs/rocksdb/files/rocksdb-6.17.3-add_timer_for_riscv.patch b/dev-libs/rocksdb/files/rocksdb-6.17.3-add_timer_for_riscv.patch
new file mode 100644
index 000000000000..b98cc9dc5fd6
--- /dev/null
+++ b/dev-libs/rocksdb/files/rocksdb-6.17.3-add_timer_for_riscv.patch
@@ -0,0 +1,40 @@
+Add timer for riscv.
+Upstream PR status: https://github.com/facebook/rocksdb/pull/9215
+This PR hasn't been merged into the main branch.
+https://bugs.gentoo.org/834855
+
+--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+@@ -101,7 +101,7 @@ int toku_clock_gettime(clockid_t clk_id, struct timespec *ts) __attribute__((__v
+ typedef uint64_t tokutime_t;  // Time type used in by tokutek timers.
+ 
+ #if 0
+-// The value of tokutime_t is not specified here. 
++// The value of tokutime_t is not specified here.
+ // It might be microseconds since 1/1/1970 (if gettimeofday() is
+ // used), or clock cycles since boot (if rdtsc is used).  Or something
+ // else.
+@@ -133,6 +133,23 @@ static inline tokutime_t toku_time_now(void) {
+   return result;
+ #elif defined(__powerpc__)
+   return __ppc_get_timebase();
++#elif defined(__riscv) && __riscv_xlen == 32
++  uint32_t cycles_lo, cycles_hi0, cycles_hi1;
++  // Implemented in assembly because Clang insisted on branching.
++  asm volatile(
++               "rdcycleh %0\n"
++               "rdcycle %1\n"
++               "rdcycleh %2\n"
++               "sub %0, %0, %2\n"
++               "seqz %0, %0\n"
++               "sub %0, zero, %0\n"
++               "and %1, %1, %0\n"
++               : "=r"(cycles_hi0), "=r"(cycles_lo), "=r"(cycles_hi1));
++  return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo;
++#elif defined(__riscv) && __riscv_xlen == 64
++  uint64_t cycles;
++  asm volatile("rdcycle %0" : "=r"(cycles));
++  return cycles;
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/dev-libs/rocksdb/files/rocksdb-6.17.3-libatomic.patch b/dev-libs/rocksdb/files/rocksdb-6.17.3-libatomic.patch
new file mode 100644
index 000000000000..56cc674d09a4
--- /dev/null
+++ b/dev-libs/rocksdb/files/rocksdb-6.17.3-libatomic.patch
@@ -0,0 +1,71 @@
+Fixes check for atomics.
+
+The upstream currently does not have checks for atomics in v6.17.3.
+However, since v6.22.1, rocksdb includes checks similar/identical to 
+files/rocksdb-6.14.6-libatomic.patch, which is superseded by this new patch. 
+See: https://github.com/facebook/rocksdb/commit/47b424f4bd51078591e674ff936de5a270530ce2
+Once the upstream adopts new methods for checking, this patch may be removed after testing.
+
+https://bugs.gentoo.org/834855
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -289,6 +289,7 @@ else()
+ endif()
+ 
+ include(CheckCXXSourceCompiles)
++set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
+ if(NOT MSVC)
+   set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul")
+ endif()
+@@ -305,7 +306,6 @@ int main() {
+   auto d = _mm_cvtsi128_si64(c);
+ }
+ " HAVE_SSE42)
+-unset(CMAKE_REQUIRED_FLAGS)
+ if(HAVE_SSE42)
+   add_definitions(-DHAVE_SSE42)
+   add_definitions(-DHAVE_PCLMUL)
+@@ -313,6 +313,37 @@ elseif(FORCE_SSE42)
+   message(FATAL_ERROR "FORCE_SSE42=ON but unable to compile with SSE4.2 enabled")
+ endif()
+ 
++# Check if -latomic is required or not
++if (NOT MSVC)
++  set(CMAKE_REQUIRED_FLAGS "--std=c++11")
++  set(ATOMIC_TEST_SOURCE "
++	#include <atomic>
++	std::atomic<int> x;
++	std::atomic<short> y;
++	std::atomic<char> z;
++        std::atomic<long long> w;
++	int main() {
++		++z;
++		++y;
++                ++w;
++		return ++x;
++	}")
++  CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" BUILTIN_ATOMIC)
++  if (NOT BUILTIN_ATOMIC)
++    set(CMAKE_REQUIRED_LIBRARIES atomic)
++    CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" ATOMICS_REQUIRE_LIBATOMIC)
++    unset(CMAKE_REQUIRED_LIBRARIES)
++    if (ATOMICS_REQUIRE_LIBATOMIC)
++      list(APPEND THIRDPARTY_LIBS atomic)
++    else()
++      message(FATAL_ERROR "Host compiler must support std::atomic!")
++    endif()
++  endif()
++endif()
++
++# Reset the required flags
++set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
++
+ CHECK_CXX_SOURCE_COMPILES("
+ #if defined(_MSC_VER) && !defined(__thread)
+ #define __thread __declspec(thread)
+@@ -1354,3 +1385,4 @@ option(WITH_EXAMPLES "build with examples" OFF)
+ if(WITH_EXAMPLES)
+   add_subdirectory(examples)
+ endif()
++
diff --git a/dev-libs/rocksdb/rocksdb-6.17.3.ebuild b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
index 76c4d651f8af..948eba50fa13 100644
--- a/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 -riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
 
 DEPEND="
@@ -26,7 +26,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.14.6-libatomic.patch
+	"${FILESDIR}"/${PN}-6.17.3-add_timer_for_riscv.patch
+	"${FILESDIR}"/${PN}-6.17.3-libatomic.patch
 )
 
 src_configure() {
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 7fbbe240f097..be205cee68ca 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,11 +1,13 @@
 AUX rocm-comgr-3.1.0-dependencies.patch 1241 BLAKE2B adaebf5f5da85687b431ff237b9ddd49b1afeccc81f9306b26aa35f2bce5309ec45f1449d464b59f8a63b86cbcd43bd58014733f4ff0e3babad91be966379ed2 SHA512 f6162acd8af142efac6596b8e95199b3b14dc7d3906f30515b10b422a74fdc97fef1563d392e8c67bbec2b7c0ed532690c16f4a3bbfffc1b274e0c86c345bcef
 AUX rocm-comgr-4.3.0_strip-usr-include.patch 820 BLAKE2B c6f30de65db0dc690a41d1563bab100d1bc3503101867092e45480d256408d77a1104f49bbea9e38be41fd9b693d7a4e6a0d81ff9b6879681b3f07342abbbb73 SHA512 2c58214bbab369365b8bf38565bb141362041f3e56035e5f4e31b839d7440a62eec627c2fdd87ab1d3f5409a9d49844d14a293887acab5cdb2c53cfac3994761
+AUX rocm-comgr-4.5.2-dependencies.patch 1255 BLAKE2B 544a23e8066a2b308e2f90bfaf7e538ebe9b4becd5d84f3c4e8d563c01148e298c556fcec8639861749ba4cf838bf73e98a8231e0d19faeda6ea5d7df8459629 SHA512 4f7be98945217fca917b788f3ac93f9d5356d410d3c17f5fadda753d6bd5121c57ecc2c758c430f6d4a2997bc61b5d54b3b8be6f6af1d575c0190c635cb64426
 DIST rocm-comgr-3.10.0.tar.gz 98322 BLAKE2B a7245531eb7e5e7a306a91ca917f03b25a159729a8fbd830cbb02355f807900f439d3d793c416ea277aa0aa64829e697ef8bb32a246a3618ed9bc2c42d25acdf SHA512 b9e0ae6d10a39d55855c35305560af8c5cdbef8f9d41022c40dc60b4fcc629a73a91c6d7235dd0785aba5e14f566f7ce0911a5a1c52c39cebd947f7b585c4d5a
 DIST rocm-comgr-3.9.0.tar.gz 98316 BLAKE2B 424ff5152d99b1ea001985fbd9a6ca1a0925931579205b487505a6c3733d95fe4ee21d91453c538995b3696984acdf4d45cc77c43e1a7c75db78ad1164e3f9e6 SHA512 f49c91ba0db244a0f0d820edeb60013c8a09220e9e1a6be464c48766ac3322b18ed1d0f009e5b1df58340a6dd324a75717194696214e2bb7455cb85e516f071a
 DIST rocm-comgr-4.0.0.tar.gz 98316 BLAKE2B d96200d2fe8929631d1f40577a115b72e2341a66941e9de9de2e61c3d9eab9cb4a0cb51f3b2abc183be832ee86404b5f24d053396615038f4ca6bda23a7331d5 SHA512 fdbb334ff1cb2cd5eb40b9dcf1bbcb138b95d24fac80a90c12c9b5b2ac24226eed4f30ac2fa1923c274fae830e52542d5725436a77c404d1680266b103444549
 DIST rocm-comgr-4.1.0.tar.gz 101923 BLAKE2B 227317d3c96d577ff2df352721e3ffcf75e25548bfef29c425a3417af2b6fdbceeb80bc86508a9a510e9eb7f4dd2ff5c6da3c13af122dfb0dff6475d73a5c9ff SHA512 def3774072262ac6e5c836d7dcd23770045765882e76c8de87e21d04515a562ba213685736ccb4e5b01814de846b68aa9db77e40f0d834a68fc4a9b3301aaff9
 DIST rocm-comgr-4.2.0.tar.gz 101877 BLAKE2B 6796ab4fc7139224af9e26f6adc5ac3ef260b36d125517766bc4adf3dd819709e5aa816680ae073f00db635d15d2a3bde7bfc69bdfbea0f49453f75930fae90d SHA512 dffc00d166eb060c6cf848878cc6c7fc63858168cd20b5f22df2b7cbf3ac7a3253fbab5df4df055823028a06c3dca3e3f379246305ae9872eb94bcdbd30dd602
 DIST rocm-comgr-4.3.0.tar.gz 106250 BLAKE2B 40a3a69147ae4fc96d3713331d35ae65d952dbf92fb3c92bee75bbef394342b11f383cb51c6def85c256326905c5067b1da816e853f793fd3c40a5af9a6e0122 SHA512 5961720bdc78c6d3fc626bd83f52be0aa32b01178bf4db0a503a0639fe05c5c589b7feb2dcbeb78021d36a40ac6f936cb1262cd5ab5cda4689e8e642ab7eddc3
+DIST rocm-comgr-4.5.2.tar.gz 108521 BLAKE2B 9fe238a17bac5739d2d103d859a8dd16cb95d0333f9f85e7fd94463c4ee8bd88801b7b1d1278d978fda7425f391de5e9043a3539583ed3b8d45393a613c19bba SHA512 c466a9bb1b725b79d056673824c6dd79919866f42db88b611e4ac24b0624b12c078affe8bfc7ad7c1373ce0ca60607904c46f13751b47c9f4deaf4105e2c7cd3
 EBUILD rocm-comgr-3.10.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
 EBUILD rocm-comgr-3.9.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
 EBUILD rocm-comgr-4.0.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
@@ -13,4 +15,5 @@ EBUILD rocm-comgr-4.1.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe9
 EBUILD rocm-comgr-4.2.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6
 EBUILD rocm-comgr-4.3.0-r1.ebuild 1084 BLAKE2B 1386328f3b75963b1b16e9b28b3894fac2f246c8ba5094c7cf8e4f784353086278d064072a295ed391319794df3fc3212dfd85dce41a023863bd6950baa0eb1e SHA512 949ff3b7670c09c7f702c233854a05547415996cbd04d77fd5de1b2f4b3b3557d0bb4129daf0a3b49e16e890017d466d1ec72822f6f4af05a1f92b6d718feace
 EBUILD rocm-comgr-4.3.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6
+EBUILD rocm-comgr-4.5.2.ebuild 1097 BLAKE2B 2a8ec9f20371b7c86295dea6a044da83c96a0774c55f774b4b01118fb3c27185beb7b09a94144b43d95e75eed3ac2fae780314244ec7e2f55b7b3f82303a8969 SHA512 7fc5a888c252736f1777580208d6f2701a8b52690ce1753a10f259e5534d0027e09161a12b7d8bb9717c921fd0b1d31a89fda787ce9fb1f605d78d9ab5af2a07
 MISC metadata.xml 382 BLAKE2B c49984c9ac37bdd2ba8f4345d91d4b6e79f4e8d91e0b89dcd286ef32ede9477c964554cafe52419ca1d696a4b2b7391d45c6a8a4316e3a3103268153fc3bdda2 SHA512 d8d0ce6840a73611e02721c1fd458f9756962583484a61c6fe9051dcca1641091008eea4c01a71d4ee70649eb4c29e99d86e1f24861c05e4a542d0c60d388590
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-4.5.2-dependencies.patch b/dev-libs/rocm-comgr/files/rocm-comgr-4.5.2-dependencies.patch
new file mode 100644
index 000000000000..13cff2e52dfe
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-4.5.2-dependencies.patch
@@ -0,0 +1,53 @@
+https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/25
+
+From c65cba2e73f9118e128b9ab7e655ee0f8a7798e7 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Sun, 1 Mar 2020 19:24:22 -0500
+Subject: [PATCH] Link additional required LLVM libraries
+
+Without these additional required dependencies, linking fails with errors such as:
+`undefined reference to llvm::errs()'`
+---
+ CMakeLists.txt | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1794a07..c7b852a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -207,7 +207,11 @@ install(FILES
+   DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}")
+ 
+ set(CLANG_LIBS
+-  clangFrontendTool)
++  clangFrontendTool
++  clangFrontend
++  clangBasic
++  clangDriver
++  clangSerialization)
+ 
+ set(LLD_LIBS
+   lldELF
+@@ -218,8 +222,21 @@ if (LLVM_LINK_LLVM_DYLIB)
+ else()
+   llvm_map_components_to_libnames(LLVM_LIBS
+     ${LLVM_TARGETS_TO_BUILD}
++    Option
+     DebugInfoDWARF
+-    Symbolize)
++    Symbolize
++    Support
++    Object
++    BitWriter
++    MC
++    MCParser
++    MCDisassembler
++    Core
++    IRReader
++    CodeGen
++    Linker
++    Demangle
++    BinaryFormat)
+ endif()
+ 
+ target_link_libraries(amd_comgr
diff --git a/dev-libs/rocm-comgr/rocm-comgr-4.5.2.ebuild b/dev-libs/rocm-comgr/rocm-comgr-4.5.2.ebuild
new file mode 100644
index 000000000000..772aeb9b4102
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-4.5.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/lib/comgr"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
+	KEYWORDS="~amd64"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.2-dependencies.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+	>=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index 98cd15dec20b..2c43817f4d97 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -6,6 +6,7 @@ DIST rocm-device-libs-4.0.0.tar.gz 230486 BLAKE2B 17d82a29e03d558a408e39550acd9f
 DIST rocm-device-libs-4.1.0.tar.gz 230813 BLAKE2B 699c23f3b08989765e90d3168e1369d1bf627a51c1f606160e29867718ce237a78ed7b5859ab60b58bbe9790452e75192fb9407819f25cceffc2af94aa006582 SHA512 b4d7ec17711345de27daae7a0d9fc4bce7a5501cfdade51da41788d1a015a4688d47e60031317b2bcc6c395bb096b2cbd4ba35a07b62cc07fe4779ec531208ec
 DIST rocm-device-libs-4.2.0.tar.gz 231971 BLAKE2B 292798ec29b6feb268928a41d7a321b9cffeb2e624557fc4c04b9fa48347a29838f53217b3006b52db53db0981d87b8cc4df6d95578c17d8d10b00b24211d773 SHA512 78aa285f97916ad68aa6108fea22b2c5f223c0c36fd631a4c8f565cf3eb26c0ad58ea31b5e700369a8b13a86f1c076e6cfdb829952cdf03c88a7827c14371aeb
 DIST rocm-device-libs-4.3.0.tar.gz 234910 BLAKE2B af306219df395f9c5e65e6e06dff976698b80009d3b0c330c396c3e9475dca124bee4c96ff31724763bf40b3fd611f1ef55a7fb675f5ef82b992e496bc3a2d6d SHA512 6e93b435d782a50f45d17bafb466ee05df88c39d665a8d796b68d588b6074629934c44afaae233fc84a238dc9c93d15917efeec7633349b4e894f3b3385bf57e
+DIST rocm-device-libs-4.5.2.tar.gz 244532 BLAKE2B fd13f3e518dc0922bb4e2a49863e3b86238158431189f4d4e9665f7e7b1adfa78ca96d915a3737b0da476cfbffcf0a0ad8840349a22062f59a83f59bc9edd05a SHA512 5da2efd685c279ebb1bf67e27e1a8febb20dcdcf33136667b9bf2ca0d3684b366237358269a0c221dd602af37503aa766842cd1932b2711b562c1fc94cd2ae70
 EBUILD rocm-device-libs-3.10.0.ebuild 992 BLAKE2B 69f88d0cca4b3bd54be1d9d97eef7941b2892d6301f83f52810474406c951dca13108ea1f63738d901eaf7d0ac701ac18315e57cd73bb73100a189206a02654f SHA512 bc21b9ae816795ab076fc763a7d7a62e1d0cc2902317a6afbb60f5058c02d0590dcf8577ea64c92ffe64b055d356653ad6045d8448ecb5c59a01f5053fb4f44c
 EBUILD rocm-device-libs-3.7.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
 EBUILD rocm-device-libs-3.8.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
@@ -14,5 +15,6 @@ EBUILD rocm-device-libs-4.0.0.ebuild 992 BLAKE2B 69f88d0cca4b3bd54be1d9d97eef794
 EBUILD rocm-device-libs-4.1.0.ebuild 992 BLAKE2B 02897f1fdd8427b3ae26202b9b28f7ed029ae387a2c1e1c620eb723d839ca6fdd09f4cb869712e67302c248ffe7948960b7c3d74b636d9b2a45714b7a1182462 SHA512 0f8da526d5577a466b47e7dec0f29b2c9592884e83b2c7ed2b51a3ca241dff06142e6ab768eba1c886403889eebcaeff8743a0d7c4cb79f4c9018887f90b8e9f
 EBUILD rocm-device-libs-4.2.0.ebuild 992 BLAKE2B 02897f1fdd8427b3ae26202b9b28f7ed029ae387a2c1e1c620eb723d839ca6fdd09f4cb869712e67302c248ffe7948960b7c3d74b636d9b2a45714b7a1182462 SHA512 0f8da526d5577a466b47e7dec0f29b2c9592884e83b2c7ed2b51a3ca241dff06142e6ab768eba1c886403889eebcaeff8743a0d7c4cb79f4c9018887f90b8e9f
 EBUILD rocm-device-libs-4.3.0.ebuild 992 BLAKE2B 02897f1fdd8427b3ae26202b9b28f7ed029ae387a2c1e1c620eb723d839ca6fdd09f4cb869712e67302c248ffe7948960b7c3d74b636d9b2a45714b7a1182462 SHA512 0f8da526d5577a466b47e7dec0f29b2c9592884e83b2c7ed2b51a3ca241dff06142e6ab768eba1c886403889eebcaeff8743a0d7c4cb79f4c9018887f90b8e9f
+EBUILD rocm-device-libs-4.5.2.ebuild 1018 BLAKE2B 21b067394e03510c311f4a52b3d311fef129bb7b2b6c3155a60136261c60b89b7a81c7cd19b5f8472ee97c7b4839f2f2601a18bde399d0177ab51be09244be2b SHA512 ecfb42ce61993db1056fbb977a82aa41196d0d687618002e910e5459bade69e42fe2eb6fdc52e1671e91bce7807451ee6c6298a1bd20d23246e7edf307700383
 EBUILD rocm-device-libs-9999.ebuild 804 BLAKE2B 89a47136834feb8bebd6487d0fdc7ba0ca921764f01938812959bd6a006df704524acc14ccdb67a7d08bd032403837bfad358c5837bf4e6e8957293c3b159d72 SHA512 e76d6647cf9ecf6beebb15541503955cd469c50f39c462e1c45be51d87072cbff603fddc9979ad795ad5ec746d625485e24eb751d41610522fbefd8aad64496a
 MISC metadata.xml 378 BLAKE2B d4defdfb2ce3bab811d9c2ac75b92b7892d46d87dad9f89c26cde140b3b167b43bf4022128dee45e063e332d6dfafc3ee8d78b0112909a7ce2d4a4a44c6cfa14 SHA512 0732d51019f0d27ffb1ffea32d76cad8a6d82927cb8788ff983cdb8dcc472015dbe36ba568bda7459d0b32837e89e1a32064ab7dfcefd2b88458cbb4438f452a
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-4.5.2.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-4.5.2.ebuild
new file mode 100644
index 000000000000..0bfbe92e6376
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-4.5.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 1d4ffa7a648b..31d46659585b 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -5,6 +5,8 @@ AUX rocm-opencl-runtime-3.7.0-amdocl64icd.patch 503 BLAKE2B 33154b45dd539c068cb8
 AUX rocm-opencl-runtime-3.7.0-change-install-location.patch 2523 BLAKE2B f31cd13f8b50ea75c3ababe89905881ef92ec0319057a98978ff49514f213e5aad0f72d2eda75d300836ee4e90d1ac8b6b897442c968b30ad4c8af6c31f61fca SHA512 945d37ef36adec5ff6915bc4f3cc30801776370bce8097b53bc4e72568d4801fb7f092ebc0103ec0f625a0297d8ab5a43dcaa84d59f7145ea87610a7bc855f79
 AUX rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch 576 BLAKE2B adf9f72b83b57ca9a0205d520b8ffefd44b9b6ea13bae37ba3289ed39ad8bf7a93a1ca4c640c15dd79297fdaee34ca8b8c0f2f95c670d1a26873a73b7b2d02a7 SHA512 e3c673c649ed9a1e4c90c1d51e3f05431f61ea07287056f80879ae24b917474ebb9665ad83c361bbf2c3ca5a01b0ecc1d3d51b845a1c6e5c755fa40f7d92aaaf
 AUX rocm-opencl-runtime-4.2.0-opencl3-header.patch 3227 BLAKE2B f9a23194e9531da59839e3b6636a523a1e50a20bc57af9615f49ad390912af1032131d67ea3c157c76c35529d4776f26fd3c1806342e2b67a71737cc9bd108ae SHA512 4364cad8e0f20dd2df1c3e23d6099be6e96ff585d95fe665e63d926b37e5d03aa4e5729af53e1575066e501230c1c766cebb86da47052d0d9f4dc23da7069b83
+AUX rocm-opencl-runtime-4.5.2-remove-clinfo.patch 577 BLAKE2B e8d57ae30b3ad97721f3afc254d780262c6f73259731d226445a320d7fc620c00398c781c5309bd4b43327ce45a747b5add3421c3abab0600d9e07c46cc20549 SHA512 83b7e1ef6d14f0cfefc2498fe5df191f2442b0265139cc3f2661346b55ff3621cf590a40476e156e729604fffb1285243df705010191b343596cbe3d67ee8c64
+DIST rocclr-4.5.2.tar.gz 846950 BLAKE2B beefc6a98d9a8a1a6c00b03cbfd960215888201002f7d4a0ee079db1fc29f2faa9f53326d49c1ad00f2c3a507d5047aae8175a3abb50ae0a74ba36fdc7df9e22 SHA512 121cfb711172596d9e4d429a38fb333bbb10e427ad49cf337324dc187a04adcd99e94521cda65ba21b6ac3bfd7837f607e4c0fe38c6ebca3d58bb090128d0a43
 DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B 3d2539d24f8b3fd039424d606ebe36d7d8d1db2425f646d093a1a48d95c1c8b1c20821674fc628e622c2a5e7cbb30547805c3b84af16ad53f860f1064efa572b SHA512 121d0f310b4b235adf5f34dbf1989016b4c875bb47779b18d35fd9fab01c2118d1860e520cc6202a6fc3405b4c7897f491f611193c992cc25fe48e12bdd9f83f
 DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
 DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
@@ -12,6 +14,7 @@ DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a
 DIST rocm-opencl-runtime-4.1.0.tar.gz 1005255 BLAKE2B 5833cc4bae3ecd5c9a3f601334424d03596bfe798bfc7c11ffa9d66b23d36f3fe6cfb1dbfd38c208a63ba824d6c5634f69448ace29ada6728c8ef544afcf1c0e SHA512 228c1bb337778b32c86d645fb874d03e9d6ee39ebfad23c813c0b2221a0421225aca63b2526d60c34d84f64147daad3e9324c2063db4b112aa30250359babbd2
 DIST rocm-opencl-runtime-4.2.0.tar.gz 1005604 BLAKE2B 09e100081295e8c3da1f8b6b4371d372bcde8dade66ba2718111044364ab6a9cf1c598bd650c57670759def20aa7e638c5ecfe2076191b51a76d68e57b536605 SHA512 49b07a07949506dfd74a047d01a0bd9e2f719f6a618b4e4786861f9d59a77ddf15e06e1d13e6bda08866e096f5bd73be8656eae3ad9806661149d20cfdd68566
 DIST rocm-opencl-runtime-4.3.0.tar.gz 1006792 BLAKE2B 29fd5843bb0153c7d3fe5250898f0fbdd089db6304122698c9ec9a5436e3a6845916f241f1a1e79a614e369f000297ac12413620edec0660d859ccddaa978d07 SHA512 a514d626700350f2c663db468427479eaa9e39dd912266ac2db6830d712351ffbc18737b208fd37f7ab5afdc2c9f6412d8d765973d6c72759bf51f864fc6bf1d
+DIST rocm-opencl-runtime-4.5.2.tar.gz 998488 BLAKE2B f5b92fca4b8aec8a709fccf6817bb3c6a1074f90a0ca8d38c23efe614672daf597f03e947dffbeca715619595878518e1eb7b8d3e3fd00dd02cdf076135fe626 SHA512 6c26b5517bebb2c3096efaec42bfdcb7485e13551b75397f029fa9b4925fe85201e749b91e3a068705cdf4284895d1d996b2819faf4013e1ed34a10319240452
 EBUILD rocm-opencl-runtime-3.10.0.ebuild 1959 BLAKE2B 55455b2b6c94f4c48f29b49873ad15fa2409441b184c6b6adf679f7e8656f373705b115d6b5a4c6563c75385d0b418590a2041ab69c6948a42950319e1abd85b SHA512 3c4f68ed353c7eef6f44b6f0f81549c4cdc2fa8d0a652a2d84157b29ae5a5b63583744192384d21af2cd5e93fded4fa0886fdfa0ac57b9af090415080881e00b
 EBUILD rocm-opencl-runtime-3.8.0.ebuild 1958 BLAKE2B d9aa4e4227e5e9d9fc7d590f9c1e03c6a408fd910aa070833e0fc6b9f344c0c3470b3d4be6bf8fcc67d96d286814ec366dab5c758e76ead4b9b5b5f21d77849f SHA512 cb7e217a3a416bdf55ed756bb19d27cbf6b15b49ccc7482f0b611d210368e3d6bbb983cb9a1e684efb3df273297c12e90047d766a2195d67a36095435d9b3507
 EBUILD rocm-opencl-runtime-3.9.0.ebuild 1958 BLAKE2B df047f8b49eabf718ad126e9c14ae9313d51ab1fa4c32895229987e375499500c97549ff7f620b6bbdb1b47abe8e7cc2c2f85bd9622cc5ee2132c03385ae7707 SHA512 ff9e05cd503d218f65b5749d056832e543f74ece0f7585d4e89b43b8a450532864dfb44f09e16cbea9b18083cc0460347a9cbdd3eaeabfa3d1268a5265bb856f
@@ -19,4 +22,5 @@ EBUILD rocm-opencl-runtime-4.0.0.ebuild 1723 BLAKE2B c9d75c187aac9926441f35c3fe8
 EBUILD rocm-opencl-runtime-4.1.0.ebuild 1723 BLAKE2B c9d75c187aac9926441f35c3fe8da16f2f908a42e979a3f1fe996f1d8297f157620d7f636ae78220f2a5b73c21f140cd90c471d8fc874c75ab9ba6fc9374b59c SHA512 08b5304d7b9c1b3d11cb811c2bb2a114f3b02cff622d9d5f03ee1d82176b910ac6619b0183f375f0a4a7a6fa27d237a6a1fd4ce1da9c7502c801d053d428472c
 EBUILD rocm-opencl-runtime-4.2.0.ebuild 1764 BLAKE2B 05fa06033a0ee255ebda6bc17c9341b7b08a8b3f086c29f3104c07a8d78db105ce8d28c83b21ed259569b4d0c5bd00851e0553d84bc2650bd2c9b0f77aec7461 SHA512 88f7343cc137f039b5b374092a5f81cfb1e1223c36b9da9ee3b471e05fd770d9cde6b7d68f9c4288d421d4aa9350e2fa16b02e976411efc790ab4fa86e6e5dbf
 EBUILD rocm-opencl-runtime-4.3.0.ebuild 1771 BLAKE2B 6f89d392b1fa396abbff5bf4c72c874d759128eebd8ecdf9460750b654447f0f2b0e09f9d7bf1c7a468754e055b533f05f679439c0f1fd10c08f8dfbec1aca29 SHA512 a1132d242d3c5fe6718bb207a4a5430b036e77958267dbfe2485dce7d29ff1714bd7984f92c428b5e47cdf246bed1ced6fea1d01d9c1ff2f0b411dd5851b2bde
+EBUILD rocm-opencl-runtime-4.5.2.ebuild 2098 BLAKE2B 927e8c40f12b2dc9648b54af826e0ffa38f28a47dbbf33f3dc5f6504a1201d3a11abf8620486f7df5984dd7388a1160029be2e0d1c9a4f1bc2663d3fed852b34 SHA512 6bb18a36e3a77d83035306273685e3ab6397b91e2d311276e4f3bf469039e6c0b3ab70a73c29f30318fe2dd959244c449334e138e64ec3327c4b9870d5bafe5c
 MISC metadata.xml 381 BLAKE2B fbd9237f4928b42544799482f55fc0e72e872a554bf96c3066ea59213e7d840d432c320f834cc333a09498d6deabb0fc751657ad0e861be7997fba6f1788ffac SHA512 8d05a33637e38b0596a98f5dfee096a91bba41ca16c4eba5f5e93f05f800290c480a0393bf4d5a7ce70cbff0a541b95e52d3c95b02cc7a079343c8f740b8e479
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.5.2-remove-clinfo.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.5.2-remove-clinfo.patch
new file mode 100644
index 000000000000..e466c14b2a08
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.5.2-remove-clinfo.patch
@@ -0,0 +1,11 @@
+diff -ruN ROCm-OpenCL-Runtime-rocm-4.5.2.old/CMakeLists.txt ROCm-OpenCL-Runtime-rocm-4.5.2/CMakeLists.txt
+--- ROCm-OpenCL-Runtime-rocm-4.5.2.old/CMakeLists.txt	2021-09-27 18:33:06.000000000 +0200
++++ ROCm-OpenCL-Runtime-rocm-4.5.2/CMakeLists.txt	2021-12-15 19:04:23.315989714 +0100
+@@ -14,7 +14,6 @@
+ set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/khronos/headers/opencl2.2" CACHE PATH "")
+ add_subdirectory(khronos/icd)
+ add_subdirectory(amdocl)
+-add_subdirectory(tools/clinfo)
+ add_subdirectory(tools/cltrace)
+ if(BUILD_TESTS)
+   add_subdirectory(tests/ocltst)
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.5.2.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.5.2.ebuild
new file mode 100644
index 000000000000..a90a016047af
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.5.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic prefix
+
+DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
+SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz
+	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	>=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	>=virtual/opencl-3
+	media-libs/mesa"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/rocm-cmake-${PV}
+	media-libs/glew
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.2-remove-clinfo.patch"
+	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
+)
+
+S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+S1="${WORKDIR}/ROCclr-rocm-${PV}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+	# Remove "clinfo" - use "dev-util/clinfo" instead
+	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
+
+	cmake_src_prepare
+
+	hprefixify amdocl/CMakeLists.txt
+
+	local S="${S1}"
+	local CMAKE_USE_DIR="${S1}"
+	# Bug #753377
+	local PATCHES=()
+	BUILD_DIR="${S1}_build" cmake_src_prepare
+}
+
+src_configure() {
+	# configure ROCclr
+	CMAKE_USE_DIR="${S1}"
+	local mycmakeargs=(
+		-Wno-dev
+		-DAMD_OPENCL_PATH="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+	)
+	BUILD_DIR="${S1}_build" cmake_src_configure
+
+	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
+	append-cflags -fcommon
+
+	CMAKE_USE_DIR="${S}"
+	local mycmakeargs=(
+		-Wno-dev
+		-DROCCLR_PATH="${S1}"
+		-DAMD_OPENCL_PATH="${S}"
+		-DROCM_PATH="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	local S="${S1}"
+	BUILD_DIR="${S1}_build" cmake_src_compile
+
+	local S="${S}"
+	cmake_src_compile
+}
+
+src_install() {
+	insinto /etc/OpenCL/vendors
+	doins config/amdocl64.icd
+
+	cd "${BUILD_DIR}" || die
+	insinto /usr/lib64
+	doins amdocl/libamdocl64.so
+	doins tools/cltrace/libcltrace.so
+}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 519906b5288b..2b3c13cd785a 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,5 +1,7 @@
 AUX rocr-runtime-3.7.0-cmake-install-paths.patch 4032 BLAKE2B a4252fc7a6740c64a5695ccecc6392f31acf9a341b9886fab37686916c6d0298da8ccd8d723710aaa944f6e2c26afba9b3f0bae84d5a755bf87dc8700c3dd598 SHA512 d29bf929a136dc4f6b0ddc6f2821a3ad73ab31e1c7a265e73344d69712cbe18a0a2a200d23b094fcfdddbcd37275a75d7d6313d163a6994d323a7b7f611a0d75
 AUX rocr-runtime-4.1.0-cmake-install-paths.patch 4031 BLAKE2B 144df57dc9fa014779d6490217ded97511228d88a7e8864e4eea2870f8b48ec361b4a16ca5e3571ed27a1f91e32d07d694d93c3a2075c60af626c57112ae4e86 SHA512 28f6b3db96df74ede81219005d5d62194f2d41b0628de92202a4293983384390e68c9da1005af86b2b2d2f19f1de6fc2ca4ac1f4dcf9358f66ca519c894f2043
+AUX rocr-runtime-4.3.0_no-sqlprofiler.patch 1084 BLAKE2B dfc2b9bbea0360fdbbd04988f0dbed76e53d8d9f9d2a5217f154e02e39f7b78f3408edb0204a93b6b4e927103b2c041788bd6befb8475d3f4e333bdc6ad19a0d SHA512 f90b92eb547640bc8cf71d042f12a55504371e4c3e624b02435c026e7ae9d5885e23a2be3a0f5c443fc502b3a1c8a03fdb5efabaeaabe8be33a28aab3ac9d9ca
+AUX rocr-runtime-4.5.2-cmake-install-paths.patch 2683 BLAKE2B 9f4c3e232e81e7544e77c7388c5f555bd564e4806814d40012820023c4293242bdbbcafb788141e437fdfa6a3269d241710d74587492a657cc80fcb8f9cb29e4 SHA512 62165ed65c9d26194bbd4c3a9e1dae6d0ce2b8d61a6d421d5800e2a9a885e94cde648290090cc3654bf8b4a4c5263899c52e556d1d42e08d6d75f4bf00860928
 DIST rocr-runtime-3.10.0.tar.gz 691857 BLAKE2B 68403081180fe1aead570f8055f91d13083516766afe6c9fd18d7619162cc12fa6dd0ec824ffdc44832d1ab7e823ac2cc399b7cbb4e603f95db54e492de152c5 SHA512 9ca7c7a22ea2a35437aa1a23a331c36684ada1af0f389f697bd6c1e35c4f9493b851d7e7176a0892be36d3d7de93000f7db37e3d2c109fa6c1932851c3bd703b
 DIST rocr-runtime-3.8.0.tar.gz 691209 BLAKE2B 0664b099a7ea4105e37cf42ee208c31dc58a1900aa35bbc0295df0cabba25e5352b3def0dbc1a8ea889ad4876321f99a73c4c6c9ec042186efda9b3308583825 SHA512 d968e96cabc98951890435a2b9bfc9943df9435848f0c6026a59953c78ad4c1048e7c532a8093e5f633fdc5d32622fb88ba0212f32f317d5473fd7e957e4dc4c
 DIST rocr-runtime-3.9.0.tar.gz 691645 BLAKE2B c90cdba93be510532a65ebfd69322972c61603b23932b95982d9a2bea742979b14acd83728a37ecacd7ec540268311bd313801acece89ec02a234dee66155dbe SHA512 e117536300ad05db27ccd92d2f9fadbdb9711fc724953ef65609c7af1ef369b8cf132c8b0f72d33e7ffd43acc3e59dc5525bacaa1507fd01fab79685f6b8d86e
@@ -7,12 +9,14 @@ DIST rocr-runtime-4.0.0.tar.gz 691835 BLAKE2B 328f7ea54767294036f435894d63354694
 DIST rocr-runtime-4.1.0.tar.gz 698452 BLAKE2B fb1ca1219d2c59db4d8bff414f40eaf6e7cec899a70ed930ce3dc6e2906a173db4823ac4c445fc57cc297a932f83b140747e35ee3d77fa0ed11cec97718fdc47 SHA512 d2162f431adf0b8f8ae5bbfe43ed389d4d94db5897fc8d1b4eb9b152a74f605fa2cf5d80175e6f9cda45e39803ededef6151aa9bdea99f38a16ca2dea29588d9
 DIST rocr-runtime-4.2.0.tar.gz 701445 BLAKE2B 901c256bae823861813a7afdbd3e9f80b6f86cf2c7002815e04c762cef241a9f32274093067c97578e05fdf5c4e699287b7835d00917cb4997302c455e5d593a SHA512 44a798efd0121c7107f3f5df868eb83d0ff9aad1e11c01105d5852bef159c019db6d2aeebe02e8e187dc45a2542d72f145fb5390b27abf64e0b427e192772d6c
 DIST rocr-runtime-4.3.0.tar.gz 709075 BLAKE2B 6856681bd3d56827e517f76838886f793f4d709562c2c7c4f480ef5786c5a5fac25654032b80d565ab5da241f76329d39ab3189daa4806b8cf1564d9f08a837d SHA512 749a8f84a302f7ed518f87688f68cc2a094eea2d104cddc25b3e5d98ddf6e534285750828ca654976054bbf986a61735e17ad211505557671627e44f6831dc0c
+DIST rocr-runtime-4.5.2.tar.gz 717648 BLAKE2B f3acf32943b73b65f1272317bbd8928d1a05e9985ec6242f0480cfdb988052caef198900643fc42288af6acd5fbe2052f063b022219b2ef0d3fb843032de6c92 SHA512 69d7a3f7960ffca339d706a9356e0994851761a135e1b7e7b9b451bcff5782c119b99756432546e7f066f8b60b8717557340cf382f8a9beae6336d23d90ecae4
 EBUILD rocr-runtime-3.10.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37b61fa5e209e12caba4ee4e2f1497795a8c73078ba8d482b438e7c06d1cf20b41797d218d2c3799bb10037aaaa54419 SHA512 d0c778bb535ac890f87914752fc4f3cee93e915e567c4bd7226bcc6c999293c7fbec89209458384330f33e3e7738dabdd495b27f4789666010c211c48bfe3387
 EBUILD rocr-runtime-3.8.0.ebuild 1494 BLAKE2B 559ea5454433cf167cb1da2369700ace96729b1b4648f729e251b7e8f41368775766f0c2c288e986af26a5eb2655a9c35115497e8bf3e08e247c2237bca9556a SHA512 32986094590e367f61dc70a2be74716c81a95c03ee063f37321b9b579c5adcc72e1ebbdd71d1b23d6dc6e83a617d2d1ba6d0f3c0e65e6247414d8e7a0208cbea
 EBUILD rocr-runtime-3.9.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37b61fa5e209e12caba4ee4e2f1497795a8c73078ba8d482b438e7c06d1cf20b41797d218d2c3799bb10037aaaa54419 SHA512 d0c778bb535ac890f87914752fc4f3cee93e915e567c4bd7226bcc6c999293c7fbec89209458384330f33e3e7738dabdd495b27f4789666010c211c48bfe3387
 EBUILD rocr-runtime-4.0.0.ebuild 1530 BLAKE2B 065d3d28d95d8832f8630496e023b264b28e25f7a99d253be765251047472a3bd4364cb0bedce6b7025221e3b6e92ed1964713884f08bd595017597e8b904bba SHA512 099d1810b5ea7d2fce49e4914b0f4453fd7c202dcee62a2e83875f7e0b47e59c6741e6c21a648f422b6d4c28aa5ccd18d6aa93a6b32d10705b6fac4f5aa68151
 EBUILD rocr-runtime-4.1.0.ebuild 1648 BLAKE2B 6e654ed96e97b9a60e25db92eb8ab80ace4d773dc7c4082adffc805f20dff9ea8b0b139e421df625a99764f1b61d22700864e25296011848bb91f8025b373362 SHA512 abc3ab62999a8e3bb6c6d0616e528b3e2c3914a67e1b40548d71ff31a409ed53f81dfb2c9e0dfdfa23e9d5ae8ca4f092d575bb003acef8695d373dd7fca36c01
 EBUILD rocr-runtime-4.2.0.ebuild 1502 BLAKE2B 6f7d48bc7bcc89ae585b202ad2bd4b523142fec9d00418efa297248548867bd02ddff6812fb01572d03bdb70438837437d777384a78e706d1eb420a12d61eae7 SHA512 df94dcb2549a9da7048b7a9d22ec4c4e5a617b85e95d0f5d576a770ee5f1ac3d1a71504e9b1a92752904568cf1dd11ec0fd8a35b11d17d8329c07dd0aae762fc
-EBUILD rocr-runtime-4.3.0.ebuild 1411 BLAKE2B 124fd6521312b6cce8213b57a9a5827ca66cb1399bd9955c73a55ca12aa1a5dcf1fb7af35a1d81ab00fb6a89883b05cf9837621d70137146a45dacac2340322a SHA512 334105c14895e524a65226e4ee2800be55efb7bd13754bb7fc956d2a86593e3a7d8cc9de6992d67a198f5d6d08807ca5b7d1fcba3a2a351f9a78c0c0db99be05
+EBUILD rocr-runtime-4.3.0.ebuild 1471 BLAKE2B da97efe7c43ae47cb314a285fe6ba4cc970c0f166460cf09fcee567b15d378042603fc8f37ccc6b71d5d8daf9629b340aaf4a5e9c8a4c2fbecba1a26b8eac13f SHA512 46f6a6d34dba469a8aee43d2c543347f9bb43433871cb34c5a21a520de2fa1a78b1e3cf58e9fcedc157674c1c96a31bd04afff1b7d7d6289ae98d283774c9742
+EBUILD rocr-runtime-4.5.2.ebuild 1414 BLAKE2B 0c0e4b7d3e1d643e5fda6d3636789811e6a10dc3e990a84900643c0fbae667b2f9ce0dec2c79b801b2730acf83a5ba7de025bab6b0b353363d177891f2884591 SHA512 a1967d10a99f3dfa250f9cec2a244b5e670c80a0c895ee92a0feee00f600428ee7037465ec09b99b15437158c9f69d14d2bfa249cd5dfab7689015c43468b924
 EBUILD rocr-runtime-9999.ebuild 1628 BLAKE2B 16ac148adea537c587db359add7d324183b6ec4039f59d1c81905db332d37a225e84e5cd0f7b370f994637eda0698535263e61d3ff62896f5c232e7fc1d11e95 SHA512 2cd282faa8ef6417029ff002d75ac2c7fcff602239b82246496daaeb587b663399ec9e4250ed3f5dd922318f1ff83aa36448e3481766661602a3ac283494a199
 MISC metadata.xml 515 BLAKE2B ccb566413bfb5e7027d1596b040f6c957dc8d58fc413859c4a08fbd484ab16d536948bcf24cdd1edd5bdc8a4951b5abe6adbb3da6fde37e5a9ba1bdcfd312827 SHA512 6d0f0ab69b8f04a9106d71003f17c00e693b42c03aa5c430ebb03f7ffb3ecb8f4b10128fd22462692b97870c23e85aa3f037433fa65c55a342d64038f0db5a93
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-sqlprofiler.patch b/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-sqlprofiler.patch
new file mode 100644
index 000000000000..fdb34b75b2d2
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-sqlprofiler.patch
@@ -0,0 +1,29 @@
+Index: ROCR-Runtime-rocm-4.3.0/src/core/runtime/amd_gpu_agent.cpp
+===================================================================
+--- src/core/runtime/amd_gpu_agent.cpp
++++ src/core/runtime/amd_gpu_agent.cpp
+@@ -861,11 +861,6 @@ hsa_status_t GpuAgent::GetInfo(hsa_agent
+         setFlag(HSA_EXTENSION_IMAGES);
+       }
+ 
+-      if (os::LibHandle lib = os::LoadLib(kAqlProfileLib)) {
+-        os::CloseLib(lib);
+-        setFlag(HSA_EXTENSION_AMD_AQLPROFILE);
+-      }
+-
+       setFlag(HSA_EXTENSION_AMD_PROFILER);
+ 
+       break;
+Index: ROCR-Runtime-rocm-4.3.0/src/core/runtime/hsa.cpp
+===================================================================
+--- src/core/runtime/hsa.cpp
++++ src/core/runtime/hsa.cpp
+@@ -471,7 +471,7 @@ hsa_status_t hsa_system_get_major_extens
+     return HSA_STATUS_SUCCESS;
+   }
+ 
+-  if (extension == HSA_EXTENSION_AMD_AQLPROFILE) {
++  if (0) {
+     if (version_major != hsa_ven_amd_aqlprofile_VERSION_MAJOR) {
+       debug_print("aqlprofile API incompatible ver %d, current ver %d\n",
+         version_major, hsa_ven_amd_aqlprofile_VERSION_MAJOR);
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-4.5.2-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-4.5.2-cmake-install-paths.patch
new file mode 100644
index 000000000000..063fafe336f7
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-4.5.2-cmake-install-paths.patch
@@ -0,0 +1,40 @@
+--- a/CMakeLists.txt	2021-12-10 22:55:24.000000000 +0100
++++ b/CMakeLists.txt	2021-12-15 15:33:43.545084656 +0100
+@@ -286,35 +286,17 @@
+   install ( TARGETS ${CORE_RUNTIME_NAME} EXPORT ${CORE_RUNTIME_NAME}Targets )
+ endif()
+ 
+-## Create symlinks for legacy packaging and install
+-add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../include/hsa hsa_include_link )
+-if ( ${BUILD_SHARED_LIBS} )
+-    add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so )
+-    add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../../lib/${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} )
+-endif()
+-
+ ## Set install information
+ # Installs binaries and exports the library usage data to ${HSAKMT_TARGET}Targets
+ # TODO: Fix me for flat directory layout.  Should be ${CMAKE_INSTALL_LIBDIR}
+-install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets
+-  ARCHIVE DESTINATION lib COMPONENT binary
+-  LIBRARY DESTINATION lib COMPONENT binary )
++install ( TARGETS ${CORE_RUNTIME_TARGET} EXPORT ${CORE_RUNTIME_NAME}Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+ 
+ # Install license
+ #install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT binary )
+ 
+ # Install public headers
+ # TODO: Fix me for flat directory layout.  Should be ${CMAKE_INSTALL_INCLUDEDIR}
+-install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION include/hsa COMPONENT dev )
+-
+-# Legacy symlink - not packaged (CPack is bugged until ~3.18, see https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4637)
+-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION hsa/include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa )
+-
+-# Legacy symlinks.
+-if ( ${BUILD_SHARED_LIBS} )
+-    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary)
+-    install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${VERSION_MAJOR} DESTINATION hsa/lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${VERSION_MAJOR} COMPONENT binary)
+-endif ()
++install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa )
+ 
+ ## Configure and install package config file
+ # Record our usage data for clients find_package calls.
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild
index c1f5f5a3a07b..2be1fb23feb6 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,8 @@ DEPEND="${COMMON_DEPEND}
 BDEPEND="app-editors/vim-core"
 	# vim-core is needed for "xxd"
 
+PATCHES=( "${FILESDIR}"/${PN}-4.3.0_no-sqlprofiler.patch )
+
 src_prepare() {
 	# ... otherwise system llvm/clang is used ...
 	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS ${EPREFIX}/usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.5.2.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.5.2.ebuild
new file mode 100644
index 000000000000..d5c28fbc1b76
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.5.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.2-cmake-install-paths.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+COMMON_DEPEND="dev-libs/elfutils"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/roct-thunk-interface-${PV}
+	>=dev-libs/rocm-device-libs-${PV}"
+BDEPEND="app-editors/vim-core"
+	# vim-core is needed for "xxd"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+	# ... otherwise system llvm/clang is used ...
+	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS ${EPREFIX}/usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
+
+	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
+	sed -e "s:/opt/rocm/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 9d3a6d1d509f..3fbe8dad0108 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -3,9 +3,11 @@ DIST roct-thunk-interface-4.0.0.tar.gz 2694100 BLAKE2B 49ca128902335fc36d44b9e71
 DIST roct-thunk-interface-4.1.0.tar.gz 2697077 BLAKE2B 6d5d35c57d73c7d23fe28f438421372c1dcd51b1bcbf8720dfc993ce56a4afb3cd2c5d14185f4424436db4ce6d1d48dd5f802d0fc24ea1dd78ceb5cff7604103 SHA512 adef8c6c8f375d6d402c1066859fdb45f1e938578011fa0008ad242e1365d3672c5cb02a50f98b6f2d760269b4ef46b33a77f237521b76afe42ac883c71ecd86
 DIST roct-thunk-interface-4.2.0.tar.gz 3162877 BLAKE2B 48196c2334a5514c17a5b6ca122f0beaf964040f1705bd60532e4379a01d8d6a9b462a7f74916d80841caa9d3a57d5b6e2fb030a9556a1305b879036f9bcec5f SHA512 007cd64e33bada7707f340bffddf6eb9531b0bd5227a5da522c0ff4f0e2efe4a113fc50bf52da19d58fef73008af70a352aad8b41387b327f2ba19b54ede9646
 DIST roct-thunk-interface-4.3.0.tar.gz 3177655 BLAKE2B e3746bb361731484acb5da8c48246fa9ce6cce46919bc771e2670bc4694e09147b51b65274cc58d690e06ce6781aca54d67508625d9ffc1e30f42dbd69adabd5 SHA512 c0515784696464feef906d6ef4446c9bddb77b5abe62e982a7d75331a8b7fb84e94f12ebeaf2e128be28ab8f903bf6894cbf2302aa5ddee23eaf9b2cc807c872
+DIST roct-thunk-interface-4.5.2.tar.gz 3178434 BLAKE2B 3333b3416d1f7f26401a543ff5ef1b728a6efc38c5c9306d98cb03f034f8b0e10f961f9863192c23a6b7a70ff543e2d8abb60169a4a9a0c5992f2483e6f69db2 SHA512 6f51956df14532a3428f56a80479357c703c26589c68b054a340d751e34435211500c441fc90d7edbbb7c6c327a8ba71afafc8355c8c0e7a1cd45a9c9d0d99e6
 EBUILD roct-thunk-interface-4.0.0.ebuild 982 BLAKE2B c48fd4af78d9d0ba922049ded53f1e768e4e9781b85780575e33c316af2e82762869d5e1e184bf4cc92d2d08168bc1b3992e76482a15a82790c5822289a49679 SHA512 1c4bbf21b2cbfc453f4a9859c227a15eb92f31e580625f1fbdb19de2c7bde809aff347983464c8ab25cbf4b0efda8ac7bc64f52cac66bc183d3f3b893f3f8183
 EBUILD roct-thunk-interface-4.1.0.ebuild 1056 BLAKE2B 4e20e7086cb909f309899ba94ec5e58d9bd439d954a7f44301ccc36515dee99fdecb2b7e59afeeaf397a0923a9e3e5205b0684c85dd27cca98874e55af32db53 SHA512 1159c9431f4b16098642d32b4ec9d48002088c30bb070e8173528c66a188b443936803b0494dd22f63d078b20348d4ba466a98a145421d932451649bf6e61b73
 EBUILD roct-thunk-interface-4.2.0.ebuild 1056 BLAKE2B 4e20e7086cb909f309899ba94ec5e58d9bd439d954a7f44301ccc36515dee99fdecb2b7e59afeeaf397a0923a9e3e5205b0684c85dd27cca98874e55af32db53 SHA512 1159c9431f4b16098642d32b4ec9d48002088c30bb070e8173528c66a188b443936803b0494dd22f63d078b20348d4ba466a98a145421d932451649bf6e61b73
 EBUILD roct-thunk-interface-4.3.0.ebuild 982 BLAKE2B c48fd4af78d9d0ba922049ded53f1e768e4e9781b85780575e33c316af2e82762869d5e1e184bf4cc92d2d08168bc1b3992e76482a15a82790c5822289a49679 SHA512 1c4bbf21b2cbfc453f4a9859c227a15eb92f31e580625f1fbdb19de2c7bde809aff347983464c8ab25cbf4b0efda8ac7bc64f52cac66bc183d3f3b893f3f8183
+EBUILD roct-thunk-interface-4.5.2.ebuild 1107 BLAKE2B 2d5bc5e7e2cd317cb93ef743e4eaf3c99f4ee969879e0025f2b9525ac39ec57f259348bdf680f819f57948cec57e7fd66b46da5aa37c913509092f711dafc18e SHA512 c1b19d3a7763df634626e64ba1223a1da0e93a4bfb3ac9015cf934ef68c27724c28cba535dd155b74fbd84ba15127896eedb15a94d9cde42a414a15bc670cbf3
 EBUILD roct-thunk-interface-9999.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 MISC metadata.xml 674 BLAKE2B ceb6cc04ddd9f957a765c89bfe83de382412c5d04bce87e3fa9c0fdfe72fa2d24e597aa47287488463fa34d85a91556d2b7ea073b19c341a48045c9e7f51f9f3 SHA512 8cb0feb4d6ea9d3de4a45a9be0de498b5ebb36a779af03e58f5c04593082e5bd618614c1daf2707f3bb1de019bf88292605669e2be48d9bede6e708c39aae7e2
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-4.5.2.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.5.2.ebuild
new file mode 100644
index 000000000000..a141d6d4299a
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-4.5.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl"
+DEPEND="${RDEPEND}"
+BDEPEND="x11-libs/libdrm[video_cards_amdgpu]"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	sed -e "s:ubuntu:gentoo:" -i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index bc9a43cff763..3440254fee57 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1,9 +1,3 @@
-DIST sdformat-9.2.0.tar.bz2 644484 BLAKE2B 2f6382414bd7d47bfafb66c8352e5a90cd236bdfcfc7c3119eab154b8d0bb5fddf2127b16e222bb90326dbf91f95b111643eede17ebe38f27bb164cf31d7f263 SHA512 bc9422207f56d7fd5f53249f856be5fe00f078e168d7e93ab10f5544e4963888cb7c0a1b1f449739e2490b0d5aad3c5a72d8408333dd6ae550b5d66f6bcde42a
-DIST sdformat-9.3.0.tar.bz2 648239 BLAKE2B 3dfedbcb7b52d3c9384f7a4b119b3e664b9e6bd6bd93bc5ad7a5db4228474bd3e6f8d98d1fd761f49386175e45b7083b57cee02cf4a930e19ba8ef78187af71b SHA512 16ff7643baf5738a1a833f1484c79566960c9093c4a3842ae82a14faca14feef34e7293fbc78c0fea78e8a1b1b9710414587ca5260c17562759df245d458b942
-DIST sdformat-9.5.0.tar.bz2 651125 BLAKE2B 08ca0e9df9620345905e5307b555fd72c106a59090b7d2fd8fb9cc32198d07fa31fa64e60a25dc47844ebc279bb6e3ad78e457e6ba563158404a3198222d08e9 SHA512 b96797df2a7f43b4d426673fad7dbc0a5e20a846a66d804c7c3eb01ec008b52f8bc119ae1e6062a4a748240fb7172c909fd1e66ac3b52f3d01bc5a347d734908
 DIST sdformat-9.7.0.tar.bz2 699483 BLAKE2B a7f831fa42cc6371afaee47876bee5d2b8e9ef3b05a9fa8281e1746d0b038fb75b0f96d5e84b615b114a25424de65be08dbea052a53813d01b07ca8a1c0d08b9 SHA512 8b05dfaa47dea7cf55dafbed828b3c361f1c13f368fd4ac50cd35c1be859e401bdbd500a79286f7b8b0e6bac04f92a4c406e910a22aa1a9583aa8ffb660c1f89
-EBUILD sdformat-9.2.0.ebuild 952 BLAKE2B 6f46f1735ee83f84243dfd9332cd394726bea3013373c59511838e83f4125bb488eb27046ee367daea372be35c1e25d30dffbd4a3d0dfe61979290c99fdf48b6 SHA512 1f7e0a34746133bc8faaa549d462b4f2d1027a3fc89773183a9beed1f39c67211e6f6c503408e3b9fea343a364730ad01f47afa8a01547b48badb8ed402800f0
-EBUILD sdformat-9.3.0.ebuild 952 BLAKE2B 6f46f1735ee83f84243dfd9332cd394726bea3013373c59511838e83f4125bb488eb27046ee367daea372be35c1e25d30dffbd4a3d0dfe61979290c99fdf48b6 SHA512 1f7e0a34746133bc8faaa549d462b4f2d1027a3fc89773183a9beed1f39c67211e6f6c503408e3b9fea343a364730ad01f47afa8a01547b48badb8ed402800f0
-EBUILD sdformat-9.5.0.ebuild 952 BLAKE2B 6c79ad8f8f87fa02dd88f32d63477134198f136815a12cf7ee03033b916575a11b8a93e83e270c69a35a0e7b49f7f69a75b673afaf459b746d522d970213bebd SHA512 9d8a6344d42ba5583faa6c78a57929a8c95cc4dc60b075ba56ddb3f332237bfe52854a60d2222dcd3673242217b023c54202e32f9261dabfdc0c522c1f98f9a1
-EBUILD sdformat-9.7.0.ebuild 952 BLAKE2B 6c79ad8f8f87fa02dd88f32d63477134198f136815a12cf7ee03033b916575a11b8a93e83e270c69a35a0e7b49f7f69a75b673afaf459b746d522d970213bebd SHA512 9d8a6344d42ba5583faa6c78a57929a8c95cc4dc60b075ba56ddb3f332237bfe52854a60d2222dcd3673242217b023c54202e32f9261dabfdc0c522c1f98f9a1
+EBUILD sdformat-9.7.0.ebuild 808 BLAKE2B 00efeb0f8266d762d3d509d5d3b2257117dc7757e788218e30f8096fdcce3ff57da627e90e75b09d8f2bb41f51d236b147083cdf5149ff708e4680ab441a992a SHA512 fcbc2147f6b49eb76016029d7fff1ad1a6c77f16d31cd5592b46c18e143ff518027ac257dd8a3a7ec0813a32c137a438b6f5020d1a7d44680b0418fa1ced0330
 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af
diff --git a/dev-libs/sdformat/sdformat-9.2.0.ebuild b/dev-libs/sdformat/sdformat-9.2.0.ebuild
deleted file mode 100644
index 2e44e5b271f2..000000000000
--- a/dev-libs/sdformat/sdformat-9.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Simulation Description Format (SDF) parser"
-HOMEPAGE="http://sdformat.org/"
-SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# subslot = libsdformat major
-SLOT="0/9"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/urdfdom-1:=
-	dev-libs/tinyxml
-	dev-libs/boost:=
-	sci-libs/ignition-math:6=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/ruby:*
-	virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_configure() {
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	local mycmakeargs=(
-		"-DUSE_INTERNAL_URDF=OFF"
-		"-DUSE_EXTERNAL_TINYXML=ON"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/sdformat/sdformat-9.3.0.ebuild b/dev-libs/sdformat/sdformat-9.3.0.ebuild
deleted file mode 100644
index 2e44e5b271f2..000000000000
--- a/dev-libs/sdformat/sdformat-9.3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Simulation Description Format (SDF) parser"
-HOMEPAGE="http://sdformat.org/"
-SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# subslot = libsdformat major
-SLOT="0/9"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/urdfdom-1:=
-	dev-libs/tinyxml
-	dev-libs/boost:=
-	sci-libs/ignition-math:6=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/ruby:*
-	virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_configure() {
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	local mycmakeargs=(
-		"-DUSE_INTERNAL_URDF=OFF"
-		"-DUSE_EXTERNAL_TINYXML=ON"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/sdformat/sdformat-9.5.0.ebuild b/dev-libs/sdformat/sdformat-9.5.0.ebuild
deleted file mode 100644
index 7e9289e7fc28..000000000000
--- a/dev-libs/sdformat/sdformat-9.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Simulation Description Format (SDF) parser"
-HOMEPAGE="http://sdformat.org/"
-SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# subslot = libsdformat major
-SLOT="0/9"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/urdfdom-1:=
-	dev-libs/tinyxml
-	dev-libs/boost:=
-	sci-libs/ignition-math:6=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/ruby:*
-	virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_configure() {
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	local mycmakeargs=(
-		"-DUSE_INTERNAL_URDF=OFF"
-		"-DUSE_EXTERNAL_TINYXML=ON"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/sdformat/sdformat-9.7.0.ebuild b/dev-libs/sdformat/sdformat-9.7.0.ebuild
index 7e9289e7fc28..4a78444096c6 100644
--- a/dev-libs/sdformat/sdformat-9.7.0.ebuild
+++ b/dev-libs/sdformat/sdformat-9.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Simulation Description Format (SDF) parser"
 HOMEPAGE="http://sdformat.org/"
@@ -13,7 +13,6 @@ LICENSE="Apache-2.0"
 # subslot = libsdformat major
 SLOT="0/9"
 KEYWORDS="~amd64"
-IUSE=""
 
 RDEPEND="
 	>=dev-libs/urdfdom-1:=
@@ -26,14 +25,18 @@ BDEPEND="
 	dev-lang/ruby:*
 	virtual/pkgconfig
 "
-CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	cmake_src_prepare
+
+	# get rid of default flags
+	sed -i -e '/_FLAGS_RELWITHDEBINFO/d' cmake/DefaultCFlags.cmake || die
+}
 
 src_configure() {
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
 	local mycmakeargs=(
-		"-DUSE_INTERNAL_URDF=OFF"
-		"-DUSE_EXTERNAL_TINYXML=ON"
+		-DUSE_INTERNAL_URDF=OFF
+		-DUSE_EXTERNAL_TINYXML=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/serdisplib/Manifest b/dev-libs/serdisplib/Manifest
index 129cf519c221..7a28fc9e181a 100644
--- a/dev-libs/serdisplib/Manifest
+++ b/dev-libs/serdisplib/Manifest
@@ -1,5 +1,6 @@
 AUX serdisplib-2.02-disable-static-build.patch 3327 BLAKE2B 677d3dcc121cbc42345e987055aa202ea8118c74bbb5edd0f5d50dc7408ec77e6f439e38d1277fcba87e31932be4794021c45fe55115d7e1325cafe506abc750 SHA512 ca19a3f05fbc70693892d201efb938c9fd1c298d9e4551a51e802d99999b91568607fa73696c4be991a833432969ae0981fe3daa1e2cd5d18bbc0406bd925faa
+AUX serdisplib-2.02-musl.patch 639 BLAKE2B 4428488881962784503b74d952aec573d512150d69117099f89972ed3ba020437708a472aa9017f3fbef826d40fad0c46b0a9641a256061e8d078ac2a4bb1c59 SHA512 b81a2e0de075e6d112f8131dd37f787dc3eb2652762a92d84b7a5260c42bb07b2b20c214fb12098ecb3fc6934beea8e11b811d7071185898f048e2ade0376560
 AUX serdisplib-2.02-use-destdir.patch 3400 BLAKE2B 77d9adc8c9a44586cbe352c6273677704d7335fc75c82d50a681c361a10a45484ae0dfb3241bf9d99ba242f6548df9cb036992b46e157f9c4ec3ca098397be7e SHA512 370ace46b39ba5e67d7f728a3cb3980b75a2c7e6e5fb25273f9c3bfbe10f33479bfcff92e3074a2cb80985c114d161b78115410dd88330810f654875e57d7575
 DIST serdisplib-2.02.tar.gz 497028 BLAKE2B f35b6df60303a288b2a279d821a510089802019f33b7ee36b9c2fd1d1d6bef0b3118793e6d965076c1665e1e2555a553186ef1a9210712ef9d2bc1e090ec0a98 SHA512 d9936c25dc14e24eb02876f203476752340e621d8ee5c87ee99862575e45199bf46ff8487dfdd80b16a89543958fdf5a16a2aaf78d5cade06811cfb1592c45eb
-EBUILD serdisplib-2.02-r1.ebuild 2817 BLAKE2B 5b8a3bb31704f99a64523d6e5654162a0bb08457f22cbc2e450ec4bcb161679a664f34a3b17463c4839806546769d85be24af8cde68ca3f5f307e6615b53f7f7 SHA512 3c82e14965dc5e595039314cab3d89f84317216aea0edf25b8c7b0161abc8608df0ce74a54d8eb17df6eb6449068c4e2c7d3f939d4cc4d74aa3122b5fad33cda
+EBUILD serdisplib-2.02-r2.ebuild 2854 BLAKE2B b05fbab0e902821045819f16dc7f8257e781396c7246bb9f05fd8942c716596d4475aa05f440a092c6f4c6751ff27b13f4728101546a399b82c8952c1ce1abdf SHA512 1835e00931f40852dfb162fe8c678ce41e49a980e98a9618f655be04fc2289ffa22410b1887f72e1b35237eab3e673fd276c9ef7ff667ff65e9d8ead6c915158
 MISC metadata.xml 663 BLAKE2B 006db175fbd12bc996c0718a226bb2aabc967e0896dc78c351da1990246850a0a4fe67eb84281342d7fe02fd65f26e59a2a22323520a086192aa9f4922a92229 SHA512 539a6ee6568d6db434c5bf23548a116d72103e9efe878d4aec1563e3c3384b2e5012c45699357188f3003bcd81c29bb60b274a59f66648b65bc85359ba376d37
diff --git a/dev-libs/serdisplib/files/serdisplib-2.02-musl.patch b/dev-libs/serdisplib/files/serdisplib-2.02-musl.patch
new file mode 100644
index 000000000000..4307c6d9c9c1
--- /dev/null
+++ b/dev-libs/serdisplib/files/serdisplib-2.02-musl.patch
@@ -0,0 +1,19 @@
+Include <sys/type.h> before defining "ushort" macro
+
+sys/types.h uses a typedef to define ushort. If ushort is defined as a macro,
+this will cause a compile failure.
+
+In file included from serdisp_control.c:43:
+../include/serdisplib/serdisp_gpevents.h:75:19: error: expected identifier or '(' before 'unsigned'
+   75 |   #define ushort (unsigned short)
+
+--- a/include/serdisplib/serdisp_gpevents.h
++++ b/include/serdisplib/serdisp_gpevents.h
+@@ -50,6 +50,7 @@
+ #include "serdisplib/serdisp_connect.h"
+ #include "serdisplib/serdisp_control.h"
+ #include <sys/time.h>
++#include <sys/types.h>
+ #include <stdint.h>
+ 
+ #include "../../config.h"
diff --git a/dev-libs/serdisplib/serdisplib-2.02-r1.ebuild b/dev-libs/serdisplib/serdisplib-2.02-r2.ebuild
index 7a1a31b7f338..22cb104e7e06 100644
--- a/dev-libs/serdisplib/serdisplib-2.02-r1.ebuild
+++ b/dev-libs/serdisplib/serdisplib-2.02-r2.ebuild
@@ -1,7 +1,7 @@
-# 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 udev
 
@@ -47,6 +47,7 @@ DOCS=( "AUTHORS" "BUGS" "DOCS" "HISTORY" "PINOUTS" "README" "TODO" )
 PATCHES=(
 	"${FILESDIR}/${PN}-2.02-use-destdir.patch"
 	"${FILESDIR}/${PN}-2.02-disable-static-build.patch"
+	"${FILESDIR}/${PN}-2.02-musl.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 0d9d826e3911..77fcdc8602fa 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -1,7 +1,9 @@
 AUX skalibs-2.11.1.0-respect-user-provided-flags.patch 1207 BLAKE2B caaf3b25d9b588aa2edf974fb1c680da80aa7eb0a46764faa65e7faa3dcd0cd0483114094fdbb855f2300be73f32914127a8a1405ec79f5340b7995278bf0389 SHA512 6637398016c16be07429cbb58d150bb7ca75768b162b2ae0a05c77dfbd0f0346b60cfc53b1ef2df7b887caebda9350cba4b1d396b8d3f16357861a7468695bba
 AUX skalibs-2.9.3.0-respect-user-provided-flags.patch 1215 BLAKE2B 48efa77149dfe60b2c77bdbc778bc71e73fd9d90a2e33ca1c2fd922839c1c7c03d8f85b099640d0994654c7b82fc1404b687207fd36a058ae0c0479ef93d62bc SHA512 b2f2c44a9c99ee56d9773673b8edd335934b9342d1560cd260e4ba773b7596e1fd9765454e47270bf8c2d0f6ce21afaae76a3164b8184c88d6ef602c02f7a1fb
 DIST skalibs-2.11.1.0.tar.gz 218300 BLAKE2B 9ab30a43065745a8d2d846167dc9887b0353ec55ec7d4b26f663870fef8dee5eebbf73056346829c1187946f1a64de05eea5067e7b6ea4d5be522f586915ba27 SHA512 7db390b887234437d52f3b9388f7398e92877cde4c93de76532abff64ee1a127524181c53a0fdddd86bd84247d84f704527bd89c5581e27433081862e9970af7
+DIST skalibs-2.11.2.0.tar.gz 219085 BLAKE2B a8aeca79890465784cae5e958d73359544416b11ac3ca4fb412ba00e59db28ee041c745653efb9f1553944974579238b0d9e8e5b3696de9a07d4e2e11333d631 SHA512 174e92be03cfb8ee41d9dc78bfd183a435d01481ad9835b74b38e000012cf6fbadd30f97c27203dbc942102641349626f92000510636dc73f413a5aebd7f7942
 DIST skalibs-2.9.3.0.tar.gz 231372 BLAKE2B f0d0b530eab4d0c98346a94af078604d741a6da4ac9625b6b903011b791c16789a8488b562623376bfc1119fca5a2ab1c2dc35b563cb1d8ff36edad2d7793922 SHA512 41e867fcaf16da437840b796a41b2d34ea53aafedde8b4fc86d712934ec533e9f7f2a8b7902542570ea6b5bcba772569fc4f47bccef770b5dee4f9d113b3df11
-EBUILD skalibs-2.11.1.0.ebuild 984 BLAKE2B a6de74599b83362820b14241ee24370dbf2c39b69f68afbfd66b0febe9cb286e1ff87b2b0ce30ac3e856c770e3ca27dd278bffafb7ddb230bcf3a2df1dccbb7c SHA512 10222496b25a0404a4485dde0336e90c85f5ab95721a2e2bdec8c826883e61fc74e3fe489f0926e5cec4440b806bddfbe81e58916d499506bdb7e114be8121c3
+EBUILD skalibs-2.11.1.0.ebuild 983 BLAKE2B 3fe869abdbae938681c9cf39ec25e171338d0404c03d903ffa01877319bd5de2cddb3d8416ecadf758274e81c3db38ebccb27dccbea6c3d274bb90b3146b5d72 SHA512 fe640fcf574f1dca0c839d33d80248a81931b5fd6d109dccf58124029ff631b21bedc1c34aacd373784d63fb5859bae92c454a0cf77e687998d8539fae49937f
+EBUILD skalibs-2.11.2.0.ebuild 925 BLAKE2B f60df8e2420b8cffd2782d1ae966a463e12cf3b06638edac0413f508612fc7e63dc16c087250e2f131ef45589c00e9101b2dbc2e689e6ef7f7bab2c7404fa0ee SHA512 005fecc565e4a69f1e9323c9445569235d9991d74299558930cb2462e67f09a2b0ac24751e6a72cd5ff812957e374470ad6153adb6bf26a29618b881ec0b1c46
 EBUILD skalibs-2.9.3.0.ebuild 1033 BLAKE2B a020fd7b3c911e796d3059d4ae1263b9cb5285f2908af24d8f5b0b767ec87f037da81e3c0a3a0b397756fde1943eff9fc59cf25e74e7236610ad79de2bfea18e SHA512 b4de37ef321d442c12ec8a6e2ceae183b6ec7c577f3f2d849bc0ee89df36732d4abc4b50bfeeeaebe6288084987644c7f38ed18a393502c664e63e8f983a9b83
 MISC metadata.xml 500 BLAKE2B a0a2130490a01139a57fa7cfe6fb63532250b5d26b3d94bce3cc5da02552f53b84c0f6e714604040026c95ef6031adcec3cfae5f002e2d4f830aab5c594c9d20 SHA512 401f71564f9d41c07bf1271789654f4a1ff6bb957ff03945dc62a501c1dd9f3f3a49c5f1a4177d6f79182283cd9ef62243a7083d0f0c3efd076935d304f0cdc9
diff --git a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild b/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
index 69fb41fd5e6c..8d028da75aea 100644
--- a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
+++ b/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="doc ipv6 static-libs"
 
 HTML_DOCS=( doc/. )
diff --git a/dev-libs/skalibs/skalibs-2.11.2.0.ebuild b/dev-libs/skalibs/skalibs-2.11.2.0.ebuild
new file mode 100644
index 000000000000..0eb6a5c6b8ab
--- /dev/null
+++ b/dev-libs/skalibs/skalibs-2.11.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="General-purpose libraries from skarnet.org"
+HOMEPAGE="https://www.skarnet.org/software/skalibs/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc ipv6 static-libs"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--datadir=/etc
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--sysdepdir=/usr/$(get_libdir)/${PN}
+		--enable-clock
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable ipv6)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 4f731ddfe3be..bb093ccbed5e 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,4 +1,5 @@
 AUX spdlog-1.8.5-libfmt-8-fix.patch 483 BLAKE2B f0412cf6755ee0a73ec444e5d9bf614e8367f2c71e490af83ee321a242e3eaaed15b77b5da91858a8f90b02cfc1baa43fd89d8472be2d187640fddcfe5f5b6bc SHA512 08c2e0a639eba9b13ef01400d9cf538afc2dc10981b52064e811d89f49c861d29bff12fdb948215581f39a2e868353d478b5c24df8760f3f5d49c50355ff32da
+AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692
 DIST spdlog-1.8.2.tar.gz 319010 BLAKE2B a17ac7691c74600e435cff9d45495a7f7e8ae5439400a9f0b02c3891daca232aa57b25ba6d619ce19d50bf053b28454a7e4f205ed439ca4345dd044390512a29 SHA512 7a0a2353a10187cc314253b366fc46be8f9fe2480d2cbac3a96a8e6825ee4b62b0a5ebb3add2b22b5d7ca8fe6dddd963926603e5296e3431c0a4f7ac42beda7f
 DIST spdlog-1.8.5.tar.gz 321229 BLAKE2B 2cdc1902a9e6f51da5c1af02b2961914a5437cfefec13aaaca8b996166c0990f602c811f69569a8812d880f995b401af44457ec4255bc5a0f9e46b51266d1b43 SHA512 77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c
 DIST spdlog-1.9.2-update-catch-glibc-2.34.patch.bz2 54615 BLAKE2B 62b707fef02c7876692f7cc67119ea2b1a712d005d5367e5afdc50f42d6762f370a463ca3194e6850c059c679aef0e908471e0362afa2dc44a8bf7aaf19af2b0 SHA512 5d9868de7968ecf2c17b5fbb1199e70b064551bc2474fe563770d1e8d4b5f6d46d371091284c3bd10b47b3c7e94b134252e16f26b1834eff4390896acd773ecb
@@ -6,6 +7,7 @@ DIST spdlog-1.9.2.tar.gz 327799 BLAKE2B 8e4cce17887509512c0d3a63485f9271098bdf7f
 EBUILD spdlog-1.8.2.ebuild 937 BLAKE2B a9db146ab6298a6e26f4766688f44698c0481d92fbbbe4dc55d8fa3e9d49f1daa0e8700f57aef54a1058b12a54f4d2e3c1aa043aa564ea40dd341e736c65cc8d SHA512 00b74e07d570faab50f7ddd15b974eeb555da6bd497872d1b29befc141d7c6bb19f31557def0dd45f7d79c11f56a4e6adb71666c3d75b85627013b766b6437de
 EBUILD spdlog-1.8.5-r1.ebuild 994 BLAKE2B 6ef1bcad152f806226fb961fa9b104b1b6eefa6125d32e417fea3897e6d956f4c8db9285f5af0e09fd496015cce771beee8477f5ee53937e19eb2102c3a921cc SHA512 1b2f31d7a7e3318426d6d40a74979bb089ac37a087e213cfa999642166d959e0b50f97acaec467a3991a174dc52253170e27e26164a70e7f005604f6f206afd1
 EBUILD spdlog-1.8.5.ebuild 943 BLAKE2B a71c7a4086fcd802596747a90a598d9c5007c42fbe0fb350217f8695a4f591b254e4108d93ebfe412ffd60586b0e03021eb15c58aadafea889302347899ead5e SHA512 b8a1ea0a002c2e66fe9617d8779c3df8f69820e9380275c91292e2d86a38cdbdcb74a84f411e08997542faa785e17d4727b06a3f5b46bb14f93b6c7e9d4ac43a
+EBUILD spdlog-1.9.2-r1.ebuild 1217 BLAKE2B 38b19d6543a8f5a16b4772184616e6d23fa2f3c9cce17a5ec383e8fc43a693c5e2a1a3c7b4a2d9c3af3976f515debb9017774dcd28ada0dd35deca2687a23ad6 SHA512 ad839cf006344e954e0c9b2edb4306f70e4f0db61f36c23ce4b7c036767475e87230e73ce9263026351e2b96863a072cc0b63b981bdf733f87c3b6a30c3066b8
 EBUILD spdlog-1.9.2.ebuild 1159 BLAKE2B 8b2a3c7a564ef377e75c36999c21c499857446e6c022af52126863adfde6d7312b9cf3870b2623ef4f5ac41875fc51a79f4b350459f56ec1c3a708e88f51a102 SHA512 12280b7498a4b00806db8edd928a473e9ab557a9d268878e59d0c15b9be72f2f3875f40c24d196dfb2d2fac4c0cc8bf1a80809257c6cd53860c70f4bd077fe4d
 EBUILD spdlog-9999.ebuild 943 BLAKE2B 2648bd5446a12ed2e55af185461a42ce4a02ce83c6dcc97470fb2a4bf4a8fc20526a34773ae8499efb3886e974444e6e1e39785a5f200ce7611432d2ac82fb60 SHA512 e960e95684bcc5c8d73d9fdfd2d45348362fca6c4d991453a7ee64b6dd5014c158bdc3bef11d26ab4e8c68437f9ecd5d53b3e809765a5687a749330f516378fa
 MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c
diff --git a/dev-libs/spdlog/files/spdlog-force_external_fmt.patch b/dev-libs/spdlog/files/spdlog-force_external_fmt.patch
new file mode 100644
index 000000000000..79bbd94b34cd
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-force_external_fmt.patch
@@ -0,0 +1,15 @@
+diff --git a/include/spdlog/tweakme.h b/include/spdlog/tweakme.h
+index 24361f30..6b4fc14c 100644
+--- a/include/spdlog/tweakme.h
++++ b/include/spdlog/tweakme.h
+@@ -71,7 +71,9 @@
+ // In this case spdlog will try to include <fmt/format.h> so set your -I flag
+ // accordingly.
+ //
+-// #define SPDLOG_FMT_EXTERNAL
++#ifndef SPDLOG_FMT_EXTERNAL
++#define SPDLOG_FMT_EXTERNAL
++#endif
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ ///////////////////////////////////////////////////////////////////////////////
diff --git a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..c8f6d4c67329
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Very fast, header only, C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gabime/${PN}"
+else
+	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	# Temporary for bug #811750
+	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-update-catch-glibc-2.34.patch.bz2 )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-libs/libfmt-8.0.0:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-force_external_fmt.patch" )
+
+src_prepare() {
+	use test && eapply "${WORKDIR}"/${P}-update-catch-glibc-2.34.patch
+
+	cmake_src_prepare
+	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSPDLOG_BUILD_BENCH=no
+		-DSPDLOG_BUILD_EXAMPLE=no
+		-DSPDLOG_FMT_EXTERNAL=yes
+		-DSPDLOG_BUILD_SHARED=yes
+		-DSPDLOG_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/spsdeclib/Manifest b/dev-libs/spsdeclib/Manifest
index dd7a853b33ea..e58ddda215ac 100644
--- a/dev-libs/spsdeclib/Manifest
+++ b/dev-libs/spsdeclib/Manifest
@@ -1,4 +1,4 @@
 AUX add_symlink.patch 804 BLAKE2B 2b0eec3a3a9008b887cd4af8f2900631fa347890cd37ced2930fbbe21b05cf213e6b088d2798173ae6c89a75467db0e6111e3e3e738d37eca7fbc884725b66ee SHA512 ca370e101057851e214009ef6880afa4a96711407d28e3ce34592317200c7da623996c7fcf7c31aefe55ffd6b649ab5ff970fc0134435114234f4436919b93ad
 DIST spsdeclib_5.1_source.zip 282236 BLAKE2B 6f37a3f0791baf9ca7a6bb3532be4cd7bcf90cdc2fc51def4d5daf4419c6b8c08aef87275555f359394e37e5ab6cf34d1e4903bea542ff99f7dc317238dd52b7 SHA512 26db037096c7c98c1af800577ce298c6b572541f665b512e80c6268818075d3c46d296b282268bd27a73a34f4063607ae8dd9d6d7a9301c441eb9cfce780f439
-EBUILD spsdeclib-5.1-r1.ebuild 1186 BLAKE2B 704fb98a7bf8f4f786b64ea5765650a9510dfdfea13bb9c9825c3342dd3817d8c03179cb230845f23f98d4ac9deceb684f7445baf2e1036c11ee4627d9f33b0d SHA512 d40a34762665886dba0e674521e71c3083cb257fabb178cfd81fa16f6d707ba2daec404b11097970f30ee583e6c3da86e0cb6b31008ded2985de45c76c7fbaf5
+EBUILD spsdeclib-5.1-r2.ebuild 1185 BLAKE2B a6c01a5c47f93f75542c5e858919e8f09cb0f74fad4ccd34fc2b0b1c112276ed2bad940c150cfdc9acb234cd10ace5cbfdc471bad0392860425af3f2b8c273ed SHA512 449df5a6737955fc47367292013749ef460680aa72c0072f55ce14c2874453619cf036643a6bd825efa5a585eae88ec887abee08398517d0ea95e2f2586da874
 MISC metadata.xml 446 BLAKE2B a4a6c043212e63abb81de3dd4fc00a1ee45a5861ea8c60706b89a5e05fd74a337df14a71ab0e1358664f04df0a2d1702d0d67e056457bc5eb6544d499c8d1fb6 SHA512 871d5f5b51f2ade118d5b259c2bb29409a46250f63db2d9a946aeaee97e4cc2d8a3a1ae2cb3c77b195c11f85fd906f377f96dc621a9d50fb089c990c64378770
diff --git a/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild b/dev-libs/spsdeclib/spsdeclib-5.1-r2.ebuild
index 8fff26de0fda..866010b95ab7 100644
--- a/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
+++ b/dev-libs/spsdeclib/spsdeclib-5.1-r2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="Kryoflux SPS Decoder Library"
 HOMEPAGE="https://www.kryoflux.com/"
 SRC_URI="https://www.kryoflux.com/download/${PN}_${PV}_source.zip"
+S="${WORKDIR}/capsimg_source_linux_macosx/CAPSImg"
 
 KEYWORDS="amd64 x86"
 LICENSE="Kryoflux-MAME"
@@ -15,8 +16,6 @@ SLOT="0"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}/capsimg_source_linux_macosx/CAPSImg"
-
 DOCS=( "${WORKDIR}"/{DONATIONS,HISTORY,RELEASE}.txt )
 
 PATCHES=( "${FILESDIR}"/add_symlink.patch )
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index 8a90c940d940..ed1a44a0792c 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,7 +1,7 @@
 DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
 DIST starpu-1.3.8.tar.gz 12895856 BLAKE2B f04096b03d5c035fb9cc6c193a482bfe9cd348c2245ac9e5cc22ad7595f8bd61ee71d7734c6e10db227c4185fc5719d3de804d82639ce0446b923ecb5c0c4249 SHA512 cd1a8c0246d91c6d405576329222292577282fa175201c758a9d5bd75d827ff59c7e2d9418082ffd5f14a26272fef449eed4a34778d0376d44c3594a2033849a
 DIST starpu-1.3.9.tar.gz 12961635 BLAKE2B a6eede7c369cacaba5b7330bd6a003f624f58972432d43619aeaf47c1e9e16da871a18c24f8f511f002cb7667c247c13562b4fed2348e2af4f8e402418e1801d SHA512 7150fc11828e8f9ede036af782ff0f89946d9aaed341771436eb8cbb91be7b0faccb6280a5c3bd63800d1a73ec8518a45a02d9f3e137007751cf1c5979678295
-EBUILD starpu-1.2.6-r1.ebuild 2238 BLAKE2B c2a106da7a1e6888a24d09f0a9aedb4bd54b1048cfef51a1c41610cb828c93afe18d7a9f5da602632776f546d34b31098bc1aef36331dbbd6848f868801bc48c SHA512 a53f1d9418e7f20f5d39a5671ad3c9254d1611eddb482e9ed547df5ba2d6542962acdb4b336563a50891a01bfab5431e943a62e0185a7b5b6c67526ae6a29e90
+EBUILD starpu-1.2.6-r1.ebuild 2242 BLAKE2B feffccd34974b0ed015ca55a7a5fa655fab48f38909dc820e1dc5f5f3b39ae629578bc8be9441c763d1f28315950a7413e29a9a1f65f13f51c7ecf1aa1f5e1ef SHA512 fb93af293e078ce350635b4d72a0e0636c854bcdc915485fb017f23a63beb164502f11d85ea9985c816ca77fe05d2d9443b4e17ec270b6058643196d2a9ab3e7
 EBUILD starpu-1.3.8.ebuild 2714 BLAKE2B 566fac6d80e57eb1cf3d3bd9561f299df6def4a57a0985f91d7942b3425ebc3c7156f363e4be49038298d4888586789cabce2bee48adf7860ecc1e7f009318c6 SHA512 ca3d3e98f826392182325a3ff2c26ba5c877f4b02bdbc402cf5bab4856e0cbd6432fb42b97e5b297a15cc8d395c72133ab814fd5370ad6ba896a78d1009812e3
 EBUILD starpu-1.3.9.ebuild 2721 BLAKE2B d0f9aa20ef267a088ec9d771b8758fbb0b08f9aa070c1ab0107645c84459178bfa093efb3e5b4290ddd0a2c9a23e23862e1e029880f2006beac4642760dcc330 SHA512 7b5d647b4a6fac538b558a9167376acf21232cfe7da522f414f056d7be52b5de39e85c699e8fb5eddbc4c04c62306fd92ede5bf02cdd8abb8cc753a62f76cc3d
 MISC metadata.xml 988 BLAKE2B bfede0842fa1b62f1d0d75100b4efdbaf79940933ef579d9f52344df20a9b235a9e2f77739f488cb1906a89349d470738636d17dd4e2083235c7a1cfb2b55afe SHA512 5755a2d92298f299a164b60d40040edac8eb6ac86205e214cc89bbd7a0c71aa097315a9a107b358a9e9238d7ebfbf57ef33168a368ec4a2cec970636b42e7838
diff --git a/dev-libs/starpu/starpu-1.2.6-r1.ebuild b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
index 5b5cac74c943..1670ddc579cc 100644
--- a/dev-libs/starpu/starpu-1.2.6-r1.ebuild
+++ b/dev-libs/starpu/starpu-1.2.6-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
@@ -82,8 +82,8 @@ src_install() {
 	default
 	use doc && dodoc -r doc/doxygen/*.pdf doc/doxygen/html
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/*
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/stb/Manifest b/dev-libs/stb/Manifest
index b79f75d9a8d2..b8cb2753e69c 100644
--- a/dev-libs/stb/Manifest
+++ b/dev-libs/stb/Manifest
@@ -1,3 +1,3 @@
 DIST stb-20200713.tar.gz 1378579 BLAKE2B 13f2deecdc20c95fe3dfd1820346e9c8d1046004082a4b6044934efa7e20270b253953fb8e2d9eecf2a263ea342b740d87807e50da48178c0eb4c7028bd27488 SHA512 a9ba80d19dae4e527171bb02e1caa4d3eb0704cdf7f8fef1a7a09e6b05c65b829b0aa580f469f158a39bf13018289f40c1680ab5c22bfa5e932bff94eced475d
-EBUILD stb-20200713.ebuild 719 BLAKE2B 51077574a1751160fa47f7a15cc58069fa7a51db0002ff0e97ebb50df58ad3f843eb57b642f782efb1c0df0f712939a3f09ce3234b4905525131397e3babc18c SHA512 5216946ea6ddbdc04776adbdc71a44895cd62a0e33ebf5fd54a279d8e4f39beac2cabd82bc884ec4d6b549f2523dcd77a7d109d61b4a6cac5b998e85ea2bd987
+EBUILD stb-20200713.ebuild 718 BLAKE2B 9d093b23681e01d7246fc2a217668da74ead8def78a2ea20c76adbffe98611f234be9a20fdb633814f913b03d56ecacf85b78b5e9a16110196ad632fdf0b2322 SHA512 2d35e0c1592a454defe0f97d8a50bbcaa7e34503a162c2de506895d5815444b0a3d96f2d51dc5b2c16df1cca315462cee7c4fe1df70a6a050990034e8dc046f6
 MISC metadata.xml 657 BLAKE2B 981e6b50cf2d4583dcd230e5fc5ed2adcd26c193d932fed79658e117f553593dace68d57a43a4a59e7046f5c11aaa82ec251fea664a9dcdada691846119820f9 SHA512 086f821db8f43371e2d411251afa1f17af5c7d3ac213daa4480ed15b00e0505e1368c73f73f91ae176dc92a3e96bdb4d002745f394069879bb8d980f83405479
diff --git a/dev-libs/stb/stb-20200713.ebuild b/dev-libs/stb/stb-20200713.ebuild
index 2e4c6ded8b9f..17561e11cde8 100644
--- a/dev-libs/stb/stb-20200713.ebuild
+++ b/dev-libs/stb/stb-20200713.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nothings/stb/archive/${CHECKSUM}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( MIT Unlicense )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 IUSE=""
 
diff --git a/dev-libs/teakra/Manifest b/dev-libs/teakra/Manifest
new file mode 100644
index 000000000000..9b8c88c32da0
--- /dev/null
+++ b/dev-libs/teakra/Manifest
@@ -0,0 +1,3 @@
+DIST teakra-20220224.tar.gz 983295 BLAKE2B 79c399f2bd3358fd558b4e7558dbbfb95a74ea16d8c9e79037a5ae258066bd5dcab903bd776b2cd355dacb60ee4dfb5de2802ed318d12985a4655f87dd958604 SHA512 b8c37b9d82431b00bcd22554e3f507466f0e6823bcd0cb7c22d38cf5ffd63bf270dd6f70472063adf4db02cac3e4dbe85ceba2946d7ba0ca13b166bf7f197e02
+EBUILD teakra-20220224.ebuild 779 BLAKE2B 425ae698ae86c6c9eb0d0ad93f93e6693a6a847a8cbba7b57d6e74f647bc6b2e5104b32b446767e3a4c5c35524de95712d8f0111bcc545f07c56adec7631d1a4 SHA512 04b506fa2ebb8067e3dbd8326ad4c33c0f54ac89bf97370fb6c1ee8668e6691a68d6039cb77823dd344c1bf240607f2110bcdc3820d7249aed8a256d065e91d5
+MISC metadata.xml 399 BLAKE2B 4e2f75b603401bfe8ac3d275d343728996602ebf01cdbc834ca2338ea255a4a5ec314bc5ede4dc9442aca8f701e228415a259b077cb591d8377daf8fc223c485 SHA512 3e67a8e432beb3ff9c1a647c36d168e6cbc8fa150a9c137df425ef34f48df2fefd3bf9f69367d54823a0e32308cc782e5527de880eb12801f888fd1f0fffdc5f
diff --git a/dev-libs/teakra/metadata.xml b/dev-libs/teakra/metadata.xml
new file mode 100644
index 000000000000..98208183c8b2
--- /dev/null
+++ b/dev-libs/teakra/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/wwylele/teakra/issues/</bugs-to>
+    <remote-id type="github">wwylele/teakra</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-libs/teakra/teakra-20220224.ebuild b/dev-libs/teakra/teakra-20220224.ebuild
new file mode 100644
index 000000000000..33314aae07cb
--- /dev/null
+++ b/dev-libs/teakra/teakra-20220224.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=01db7cdd00aabcce559a8dddce8798dabb71949b
+
+inherit cmake
+
+DESCRIPTION="Emulator, assembler, etc for XpertTeak, the DSP used by DSi/3DS"
+HOMEPAGE="https://github.com/wwylele/teakra/"
+SRC_URI="https://github.com/wwylele/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:"${BUILD_DIR}"/src/ cmake_src_test
+}
+
+src_install() {
+	dolib.so "${BUILD_DIR}"/src/lib${PN}.so "${BUILD_DIR}"/src/lib${PN}_c.so
+
+	insinto /usr/include
+	doins -r include/${PN}
+
+	einstalldocs
+}
diff --git a/dev-libs/tllist/Manifest b/dev-libs/tllist/Manifest
new file mode 100644
index 000000000000..646fe44662c5
--- /dev/null
+++ b/dev-libs/tllist/Manifest
@@ -0,0 +1,3 @@
+DIST tllist-1.0.5.tar.gz 7022 BLAKE2B c0c6db1682d6ab408c43c434ffc8e58d2cc4076121e8c11e2612678af12faa93661dcb547371bbeca4f78c1b7c99843ae9cbff8ab4e2389ce1c395f0e65e66cd SHA512 e8d55a727de56956c6823297e92ba4656292096ece7d22f3d8834b86811ede9b2fdca580bea55e0beda35322f418140357770592d85c0c07ea09c1642c7ff1e9
+EBUILD tllist-1.0.5.ebuild 471 BLAKE2B 890fdf5fdbe1ae8d562a11d1ac5f946d7d33dddd9b3a5725c3268095eaf987ccecaf285d7f1b3ce8e49d519615977e22ed886870ccee7950cd9475ac0e532b61 SHA512 8d300e4bd8032e0884123ca832ab568d9cec03dcd3b04c9dac2ae609017ee22dd11474e9e82b7f37edaa32f8842a5f2818532d7282af32301d91bc5c72d1e0ec
+MISC metadata.xml 395 BLAKE2B ab339b3a0e03010977d4ef364da63a1cce6d1986829234a158c6d3c6bd9d639235d081d34bf8a49f8deb9d567b05320479718a5c79cf6b5a8113067fc69e2ad1 SHA512 d04b9e89a98877d7c39b48af3221705f3e2ebd0ed34fb0508bd13228c196350dda1a21a430b42777ccf9349e2e1ab76f39c20961de4429b10d5925a81855a291
diff --git a/dev-libs/tllist/metadata.xml b/dev-libs/tllist/metadata.xml
new file mode 100644
index 000000000000..a3805e31ed69
--- /dev/null
+++ b/dev-libs/tllist/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>arsen@aarsen.me</email>
+		<name>Arsen Arsenović</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/tllist/tllist-1.0.5.ebuild b/dev-libs/tllist/tllist-1.0.5.ebuild
new file mode 100644
index 000000000000..5a71e470c6bc
--- /dev/null
+++ b/dev-libs/tllist/tllist-1.0.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Header-only implementation of a typed linked list in C"
+HOMEPAGE="https://codeberg.org/dnkl/tllist"
+SRC_URI="https://codeberg.org/dnkl/tllist/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+src_install() {
+	meson_src_install
+
+	rm -r "${ED}/usr/share/doc/${PN}" || die
+}
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index 5880c2907ccf..c09ed5e1efa2 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -1,5 +1,5 @@
 AUX 0.8.0-CVE-2016-8559.patch 2658 BLAKE2B 12a7d12d35e2d61457fbb9e368cfa738bad74ac490ce4ffa59d1494d879d9db481b89b0e3ef3a2a4601b8280ff8f1c54f4ccdc00716a904bff291923c4aaa02c SHA512 9f45299ccd21cc4e78946ad22963d4505e9cd430f49f275fbb742696029530e7e6eb848b0ae4bf55bb5e2a2ee77d3cf272b02e2a6a2ba7c3bd69f68816e300b2
 AUX 0.8.0-pkgcfg.patch 420 BLAKE2B 6b04ff4db2abc5dffdbca50bcbbe20974fdaa24ab25875f2538eca5af42921a729550e7ea5188225d3d73661e9ba05b96ff345fb4d931130ba4255b14c3944d2 SHA512 a6e4713aa0f9619abe256e9e1ea7c5bc8cbeb9ed173dd856972af70612ac435206e2b294ca5947e93223c17de875ba2620bf57949332b19ecff9965e2ee1a9e6
 DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
-EBUILD tre-0.8.0-r2.ebuild 1462 BLAKE2B aff6f0ee8949b4c81669fdd89ab4ac5dba8b71a456cb9d78223bc457671d0ca1b8406114d953c3975069f236c9dd07570350a30b770d54658270690d0eee7655 SHA512 2349c6d58d9e29fb505895a2d74e83109a6c1a7995cb9b047c99b805419818e302bcb083444aaf50b57908a23d439954a04ecf99d43716a1ee42f3d51d83dd4f
+EBUILD tre-0.8.0-r2.ebuild 1461 BLAKE2B bf3725fde8e7a6c740d958956ab2b8789abee70619576a41c863b8e7be744cdfd879b598a545f287613e241f21fb96b5e5397d3ae9dc4f287895b37e2a4acb47 SHA512 2a33c2871e81f7671d10aa6b2cb2de9397ea8d8e9ea9ec419c9450208124aa153e64cdb2c3b88e20aa128b2580b777c130ebcb5c88ee830416d8e745243dbda4
 MISC metadata.xml 354 BLAKE2B ebe62e551444e71cca88ebbdf04e1ad583c7b2ec5cc588e4f949f2f2f1ce60f666bf84cc5a45e08e2e7b83c6ea61e86f6de7b43ca84f7d93a338d72ef60b63ed SHA512 cb14e81dd473b72e816159e690939c1894cf5cca1fa37072e05b8ec24f0894e0a4d30e8397f5ee81372d53a8ffc3fcbce67a8923d4b220cb9e1dd5f3f3a970d0
diff --git a/dev-libs/tre/tre-0.8.0-r2.ebuild b/dev-libs/tre/tre-0.8.0-r2.ebuild
index f3c3ce1a75bf..4558fd3f46e8 100644
--- a/dev-libs/tre/tre-0.8.0-r2.ebuild
+++ b/dev-libs/tre/tre-0.8.0-r2.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/dev-libs/tree-sitter-bash/Manifest b/dev-libs/tree-sitter-bash/Manifest
index b9d2797256ec..6de417312f5f 100644
--- a/dev-libs/tree-sitter-bash/Manifest
+++ b/dev-libs/tree-sitter-bash/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-bash-0.19.0.tar.gz 187286 BLAKE2B 8812a593366a65a9cae3eaac5bb81c71e95f4abe8558a01b908333e471f05714b1c768b71e66d3890d1e63202819290813e499a5e8ba49e72bb466b9b0f245f8 SHA512 62bc8bc25c999f9c79632bd6b236edd21ef15b14365dd1a956237b11a32f5e60a2f420ec67b60d46203699b7841d4bc10978fc0307d0c4013b376c6c024d89ae
 EBUILD tree-sitter-bash-0.19.0.ebuild 286 BLAKE2B 8b459c593b349ce49613db0f1322f0385296f5851ff1ffacef1c2c4f6d2126d264ddba863966c830cbf0983c3d02a81a74151289d2eb8304744f036722ac336a SHA512 7a5a5ebebd7e062353f448bee5fb7952e8952339f24411e7582ef863d746864f7722736409e5c16b90ee85754c6553d47307eb076444c1de60f19823427d8187
-MISC metadata.xml 475 BLAKE2B e64991a9811c7b7df1b3e634018aedbbe204453ac82390e16892f54d1fef5ab4f3e3bc776d4dc2189fda28129b8239092e2da8b6c9c00747a2f12749ae155fc3 SHA512 164e04719dbcc6b1e45d33058f06f550f0e5e324e5c2999994d443233f6ef00c0a755e50a2fc39ab821e3bb6fe3ff49aeffb7331f45998b53fdde455e928a6e7
+MISC metadata.xml 446 BLAKE2B 60052c2b380610a7baea0e630cbe82709976827341183e1a1a7c846913f3fb0ae8ad85c40701ec827685592e326405a9b2cab1674d015c7111c1df90ad8a162f SHA512 e845bf4cd56026aec1b531cd23ea6bf5eed38ac0d3f91dedead87907e4708bac82db87b3c7ccaa1135a4c25911f2b369836c2689faac9ad54782978dd2c8f95b
diff --git a/dev-libs/tree-sitter-bash/metadata.xml b/dev-libs/tree-sitter-bash/metadata.xml
index 32d01ca517bb..cfc3dcc2ea73 100644
--- a/dev-libs/tree-sitter-bash/metadata.xml
+++ b/dev-libs/tree-sitter-bash/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-c-sharp/Manifest b/dev-libs/tree-sitter-c-sharp/Manifest
index cd5e6661fa36..f3999952b754 100644
--- a/dev-libs/tree-sitter-c-sharp/Manifest
+++ b/dev-libs/tree-sitter-c-sharp/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-c-sharp-0.19.1.tar.gz 842687 BLAKE2B 741a6be6052d739b9aa066adce84b492aa48726653a03e7b58bfc6b5e35d6b928b02deb32b568500a156466d39fd430abe1a452d24213ca4f999d01ddc081bd6 SHA512 74b91086d2aeaba5be7932cc2a479040291db754bdca46bd59cb3af8e42b38e9113d99de3b88d4c1dc41227e2e84ee18715a01709af72c374f0b6c8f36cd94eb
 EBUILD tree-sitter-c-sharp-0.19.1.ebuild 287 BLAKE2B 955334d8a5e4f597c84e5dcc24836295e07a5541d0d862ac77b92f2ca5a72979b21590712afcd4abffdb0f22d5cbd697c9dcd1ba0bb1c5f0f644a2db248cc814 SHA512 8cfe6ce538dd8ad974df564cbfc919f3716a2510cbfcf9cc079eb81e0a37fb0570133f0bf06524b20703aa3514bf07ad4698267c688a8561c33409db3719e003
-MISC metadata.xml 591 BLAKE2B 934a0a7abc9d7e78f6f367472143a533e3983a3728e5d1a209eff1e60bff48e458d84bb7ceff8c8711839b9dc1916af3aa05f0eb2eae7e1de8047b01513c72b9 SHA512 d4c8a9261603de29f560314647f4bff68780d070d5f116c92621373299b033490089017a24b8e6844ea9b504a22f94dad1f0ace7283f06d14bba5ed77671f7c8
+MISC metadata.xml 562 BLAKE2B edec236ce7498fcfda35b5ffd6b5236557d610f57f7513072217eb6e1bfafe9c9dcf3071d12954ff3347a556307bb107d7ac1f7d82f640dbff798cd0bd437018 SHA512 d79d52cef2c77dd7529fa8edf0d27f39d1b1b12602d3d2faebd9bcb812157b3f54353cf8d94a09b27b45f1370e01f296d343b2200252e4537286923d517a8e5a
diff --git a/dev-libs/tree-sitter-c-sharp/metadata.xml b/dev-libs/tree-sitter-c-sharp/metadata.xml
index 09096aa6cbec..02f666e7b8e9 100644
--- a/dev-libs/tree-sitter-c-sharp/metadata.xml
+++ b/dev-libs/tree-sitter-c-sharp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-c/Manifest b/dev-libs/tree-sitter-c/Manifest
index 5eee9c396526..7dcd93ffe298 100644
--- a/dev-libs/tree-sitter-c/Manifest
+++ b/dev-libs/tree-sitter-c/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-c-0.20.1.tar.gz 244061 BLAKE2B 94cb11c80fd54a89b3c6c3ebc7937fdaa077a11c5128866e0e43c970bacc3b7f14743b3f19ceca515ef70d4499d2d3893fce6d948ce9a42bf2f499c58844a8da SHA512 b2f5b6d54fe05e7706708b50a5dd821a5669a121c916da4de3f80b6c57ebdd99f12f37c80051a8719f9737d4b0c00542aee62b45823dbb878acd4e02974f7a67
 EBUILD tree-sitter-c-0.20.1.ebuild 280 BLAKE2B 2ffa82c71779586e1d17db3d0e8b075ad53d49927aab613a936653b1c70e3227d60481e1a78fcfca200718a1f526fa1704362907097a146e79abf68b3304edab SHA512 c0791c8673d269daed621431aa4ba38a9f28ad13a012cdd3a9d41df0d0b1556fec4ddfca48067eea94b13b159256d9c0eb8f99f7bc8dfbcf5338544f38efe8a3
-MISC metadata.xml 472 BLAKE2B 07c7dc3cc9bfc755835057c51e2a32053edfbc9fb9c26d553a1e0664e0cc8c10e0d8f9c6d4544f90eca7756346724646c2c4a13e81b3739ce13e5ad2277de99f SHA512 710a37e184581fc78cfc8be70a7d48107d3cd79fd3585d49eb41d9ae3c9e05638cabbf59b4bcf16bbb8aed8f25b44542cffb752dad98f07e0c31277ce73de76a
+MISC metadata.xml 443 BLAKE2B c991c80494cc1964b793eb2ff67aaf92cd85c5d18c1a223bd61b09e9714a314c3594af86cfcaf55e11d5788e80f68578e8b7ffadfe63c0ab0adb2d250b05bb16 SHA512 e62b93fb4eb9f7a0bf2cdc2f8a25fc099f55289c040eec3d4f51a26e2497d6c6695e110e9019d435227856ef33da97677845e6a6b21fa0cb964acb309202c166
diff --git a/dev-libs/tree-sitter-c/metadata.xml b/dev-libs/tree-sitter-c/metadata.xml
index 2fb30809a735..fb0cac7dd1c4 100644
--- a/dev-libs/tree-sitter-c/metadata.xml
+++ b/dev-libs/tree-sitter-c/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-cpp/Manifest b/dev-libs/tree-sitter-cpp/Manifest
index 551891b3bf56..76e52a41b18e 100644
--- a/dev-libs/tree-sitter-cpp/Manifest
+++ b/dev-libs/tree-sitter-cpp/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-cpp-0.20.0.tar.gz 504679 BLAKE2B 654f72f7a56a66dccf437ba5a2b2b5f627358ae58aeaafe9a507e0876443937d42b244ddb34b8a72a6723c28e6c10c95851b1fdb2775b3080c344426c0386e4d SHA512 c97d02c8250c93721ed5b951c97cdb1cf6558e20cbef353a33c9937f6b3116e328bbdd4e9e7a70a23dba3e144cbd6318e37ebbb9b6345ac085c62100d09ff34d
 EBUILD tree-sitter-cpp-0.20.0.ebuild 284 BLAKE2B 53024727167055f5937e21ac3299b35338ccda64cb8f4eed2fdebe4cfab6f88ea08646260ece28858aa2a0a61b3d19e46c539a08d5623343c645ca1ee94de10b SHA512 81baacab2371a65d28e5d2e055d2bb7b4c814f5eb9800170d0a229f5c63c1b1806a8acd7cecdf28302088c9ce78df6c886cc7f76bde1655ae38e18a280f39afb
-MISC metadata.xml 474 BLAKE2B 408001832a1fc68ae4fbad9d462ce6d1c070871374a611da194659d57e6798415ecb3aa03735d05e73419e0d7f4e519284424c322dbbcc6a1643a17db9de6ed7 SHA512 bbae18f2cd034726b24e737fe3d66dd16fd54eef764f1ec99e082610a7f21b89a9b687dbc55abb34b70afed8e44eabf8b7ef6c6b59bf64c522f2b820b2f04619
+MISC metadata.xml 445 BLAKE2B 38d48d1eecf642f04f8e069f60c9676668736864260ba6e59bb0ba1d67992a18267afbd2854e9455974d8f4db3179c7cb78c34411f8b838f677494023a87e6c3 SHA512 525b59cf53de56d7168998af64fa2b8bbce684defc2e3cecfcdec6e68aa8fa0adb45a4b2afcaff7dc5f4678a69db124785d9d1ca21dd73702bc90a2f3cd6e207
diff --git a/dev-libs/tree-sitter-cpp/metadata.xml b/dev-libs/tree-sitter-cpp/metadata.xml
index ab56d355774c..98219c3cf694 100644
--- a/dev-libs/tree-sitter-cpp/metadata.xml
+++ b/dev-libs/tree-sitter-cpp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-css/Manifest b/dev-libs/tree-sitter-css/Manifest
index 478c75e88ca8..0027950d86a3 100644
--- a/dev-libs/tree-sitter-css/Manifest
+++ b/dev-libs/tree-sitter-css/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-css-0.19.0.tar.gz 80823 BLAKE2B 5a011981bea8dca3ea51d3615c88eeefb2e0dafae52a947b58a930f9521cfd5759ff22812d4f49283453cc86f52372a798dd507b1982fb55dba086156a5842fb SHA512 8811118f8506ae6cc25bf30285361b751902cd4af9d25cd64eccacd1721cacd8b66277c7c950c825fe6e72ac3155dbd39c24ee94090faaae9ee8b67ce61fc1c4
 EBUILD tree-sitter-css-0.19.0.ebuild 284 BLAKE2B 650b39baa9cab66509899d209ff06597d2fd5b7730df80388148a29104561e3c95f8aa0cd86aa301e05708e9f4bca6753838dee1e43651a89d69891bbae798b6 SHA512 fb3c44f8736e2f280e6324a5df69f9340aea5ff421d147bc7618a705d248288a73128cda2b0b00b4c8bb063725963ec5d7d9933ee0b3ace2b650ab7ca463cee9
-MISC metadata.xml 474 BLAKE2B e5e877168cc5a458da80a87f524587368df26eb5aab1c2845126243a5093634c7138f4f2927f860c3c7419b8d0c1945957ec0c4881a8873528a38c0ebdec76b9 SHA512 55600bb91c7e68fee883ad49d2878196438f9cf2f5b1585e14218acb4f00d28f242b492e680fe62939a3efafec7169f55a242676d94494237bda6321a1e82fb8
+MISC metadata.xml 445 BLAKE2B 6a62ef389271d5683d7933c2c136fe2e43e29e83d6c0db40fcd61b8b5305336958c00977c4c55f9aa93ac31e90fa9877d3e9dcdcd8c210b3501a8089d4955208 SHA512 c31782d8cc015829477f33d73cf3f09ec96d4c26e57ba6c8a40f77c5456be9a4526bb1184c67f5ee798ec0d69de65fb7f7a27bfb0bdf4a885ecc190f5061d107
diff --git a/dev-libs/tree-sitter-css/metadata.xml b/dev-libs/tree-sitter-css/metadata.xml
index 6e7834e213c1..4a2ac735d1ee 100644
--- a/dev-libs/tree-sitter-css/metadata.xml
+++ b/dev-libs/tree-sitter-css/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-embedded-template/Manifest b/dev-libs/tree-sitter-embedded-template/Manifest
index afd8588cf6ca..35b330cf9ba8 100644
--- a/dev-libs/tree-sitter-embedded-template/Manifest
+++ b/dev-libs/tree-sitter-embedded-template/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-embedded-template-0.19.0.tar.gz 11228 BLAKE2B 31d2e6afb4ec82db57266f642c8e7ec1794dc74e2b86853f069dc0673b3651a736bf5b86916b00be2bd4ee3e1ae75375b994c46fac5c00a732cee43aa315be4b SHA512 960db15be1e740908e1ee623de1371a82ca13a240cd7dff9f4e8490cad5168252880a2f4cf432e8537fa826585a55a0f1032c1becbea868a6b1971ac480cf839
 EBUILD tree-sitter-embedded-template-0.19.0.ebuild 338 BLAKE2B a8af61c9b2eb4c6ab29d84c16ae572ed517c4a64720ff0391b276fe0195a29cb57982d9d464d07d0be521664d606ab7714e56ac7fbe2a59e739664501a3b0553 SHA512 de89f284d268130813079bdcb1c9548f8a019f5ca15a32b2809fbaccb8a029f0e1e032a8b3624d2f4667e767da91a9c246c4e689632150bbc58785fcf2860c4f
-MISC metadata.xml 601 BLAKE2B d169afb02f016f8d818c627b4eaff9919b429f50905bca27f36b2cbc1f6459a623e6248bce775219a03bc49df3162d7f19741a713975e3369121438a47bd694a SHA512 8bd293144c3490c02b883e57a4858e01ba71d4a783ea461aef65d2187285a12f0860aaebd47071598c4030798a7f5a84b366978d5a768be48340262ebcbd9c64
+MISC metadata.xml 572 BLAKE2B 4f979caa05fabc1532d361b72150754fa14569f20b9fd8b40d5e6cd9b5bd5a2db1a5ea7d5910aec0da4e1fae56b1ec96c9a30ca7325d3f3d886cae2d3cf349a2 SHA512 a9e9cdd8d73cbf1dd55fe58580f1f8ace11d13105332d0055b5b0be9b8b4eb99911845e726c1d30cdb728af733ade3bce264a399efdda7213617b15951f96623
diff --git a/dev-libs/tree-sitter-embedded-template/metadata.xml b/dev-libs/tree-sitter-embedded-template/metadata.xml
index edb56989e7c5..95926c8ae18e 100644
--- a/dev-libs/tree-sitter-embedded-template/metadata.xml
+++ b/dev-libs/tree-sitter-embedded-template/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-go/Manifest b/dev-libs/tree-sitter-go/Manifest
index 8d1a9d742908..b705a8e4eeee 100644
--- a/dev-libs/tree-sitter-go/Manifest
+++ b/dev-libs/tree-sitter-go/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-go-0.19.1.tar.gz 160180 BLAKE2B f92bbb342eae3a7705dbd6f6564a16fdbad1a25c405970bca1e8df01ff6d0c20b45f9849a0d13d53e2f56d95b71db0f7813765f64e0dcdfd9ca617d1f71e688d SHA512 8390dd3e39daa42ec5254b4c6c0b15fec0caa7ae64a9ec3b9116a10f9e9f1b6940cd88c8cf14dc50b28b97ea588ff302ebd16f3c88e0bd6983e76b5526a31b45
 EBUILD tree-sitter-go-0.19.1.ebuild 300 BLAKE2B da6f61f1df0427b01886ddb7db912827e5ac61476da9a37a8ac88da979f87cd8e8ced343b0f0cff06eca9a229651fd2f84d00e9359f6711fe4904a888839c492 SHA512 812a7e62a4eb07a9f3009c4f7eb049ff581c0447f62c3d2c3a5aa88c827168a591c132e6a2d5c0f5f597a36408b4b2aead0d01483cf0b196809a9d162a2295b2
-MISC metadata.xml 473 BLAKE2B 1e8eb859ae03ac4266f4cc8f8cb976a4405997dbf7760b0c41fc36cdcabcc67ff8e4466bfdccb085deb2913f882829931130558d2d3db1bdd59e429ab5e0a3e7 SHA512 af327be41c1ea78a0b17489e36a3e00abc54364e97aaa1863b589f26cc929e43a16d5aa8a57d230b78f313c2709eb09743cb6dd9d0b2ef389c49ae64d90fee4a
+MISC metadata.xml 444 BLAKE2B fa5fa7e6372e8bda6a7bc00aa4b7904f721ce2cfcf11cf9df7f582846a304f31750d23c6090b1e93584500bd1cca2b528c3ae14ac85bf31e7999ccb557ad8807 SHA512 372434b52dba0f7a4adfbc7ecd975fe161852a9b9c1c599cef12d3071c973a514e546e9182e0f3bb840a4d71109df5ab3e9ff6e1c86f72e6112551c8e37c0f57
diff --git a/dev-libs/tree-sitter-go/metadata.xml b/dev-libs/tree-sitter-go/metadata.xml
index f72d829c4128..a57a99683ab0 100644
--- a/dev-libs/tree-sitter-go/metadata.xml
+++ b/dev-libs/tree-sitter-go/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-haskell/Manifest b/dev-libs/tree-sitter-haskell/Manifest
index 8420c69d7d64..4a07719ec51c 100644
--- a/dev-libs/tree-sitter-haskell/Manifest
+++ b/dev-libs/tree-sitter-haskell/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-haskell-0.13.0_p20211114.tar.gz 834925 BLAKE2B d7cadc960ddb49efa6c439dfc13b674d398a4576fb85fd5ef12b4015049fd629722fe0d2788ab4c0052f1a3a6baa9fe5de925d86f7098495429190871340823b SHA512 db3f2ddd20195521a5a03d6ecf1305dc222343ba54ebdabf0cc68db680553908ce6d0ccba4fdcf9073e4f5187b2a6fae6364bda935167ca8d4e421500a86fdfa
 EBUILD tree-sitter-haskell-0.13.0_p20211114.ebuild 342 BLAKE2B 1f0ab8a065932c5d5a8b1c596988f2e0e2aeb6a1b2981c4dcf068afd6f0ba31828dfd65835c8d07616339e8e93f5637b73415d77ddb50d1e140d34c2913f56e1 SHA512 fa96c6fd3d0720ae3e8580238c57a76b8f8db5f83c609d3ada52e8e59e11bc382d47cad64e6551a9769c0284c9f3b795872cd1aa99114c263ca6281b660467d2
-MISC metadata.xml 591 BLAKE2B de43234859632c502bf05ebba13511c342b7ff50ad8351b823f9c669e5be5317ebbc97b6695244e48d0aeeb5e15e8c39ad9e99544f14fbd0c9e59c07f8d1c1e6 SHA512 31cb8a6a08586adf8ae4cfeb6083c18d3638ac125156e3d3fc1152b8720351b5e4dcd2cb8c985c4dbc88343e7632b3d9a3b0611362860f2d478642b567b0bc1b
+MISC metadata.xml 562 BLAKE2B ab519db8453fcd7f3609a3704a7ce3da66a02ce806720c329d6866f8258adc0a332f1cb8ba25cd4d0ff9286224f2687926b2e54a761beef81ae7700a03269b28 SHA512 36c67807b4105ecf2fb1b7b160ad87a3078fe639d4fa8fd3266d6bd3cf4edcd117d3d658f6de047d19bdbcf1c3b9fb0ac633885f58fb54d967dae80bc1eea00e
diff --git a/dev-libs/tree-sitter-haskell/metadata.xml b/dev-libs/tree-sitter-haskell/metadata.xml
index c2c1fae88cf0..babe5b02aa10 100644
--- a/dev-libs/tree-sitter-haskell/metadata.xml
+++ b/dev-libs/tree-sitter-haskell/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-html/Manifest b/dev-libs/tree-sitter-html/Manifest
index 5d777e66737e..6896f880ea0f 100644
--- a/dev-libs/tree-sitter-html/Manifest
+++ b/dev-libs/tree-sitter-html/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-html-0.19.0.tar.gz 18785 BLAKE2B 40a2f8a1b4d9943ed15003073e8499fb58aea00979359f793c30c4e7d431905620c20f8e77286a56dbc040642081effa61a7ed9fdd3d61d44bfadfb327793ed1 SHA512 7816e5f4e74c7a64a4fb715000123f5350dc3c6ebfbf5d71ea6dd660cd58a7b4327413ef3e8efa8c177c7308f43bb8b4d60fddbcf518a99841148a37aba95b71
 EBUILD tree-sitter-html-0.19.0.ebuild 286 BLAKE2B b55976efc335ac22200bc5793413405a2035d04861ede52ae1e432eadee1d5a00c2a78aab42cae289eb9144837dad862a5b348bb215dfa2109f7a79f60243d4d SHA512 d74129cc1faa140a8c07121483bd694805c9f704152bc6c48fa7fe2d270f31f9fd6c4cf6c7e0f01e8e13df86a754787840bdf5135ca619861c48b526104600f5
-MISC metadata.xml 475 BLAKE2B de1fc471c9aa249c32e4362bc1f3a5edacf4ab4c0949cc19f298930e8031786785c4753b72477b131efe97b6f0a89ef29cb8c34bda68861af8a6082531d6f586 SHA512 81bbd31233ffdda9d7985c9994eb05c9f7aa6b8e5544cbd58c7c7607cfe8f9e8781004b47bfbf68cc6e503506ae0a393019bd19511e3b7ddcd88d19fbf87c431
+MISC metadata.xml 446 BLAKE2B 493337923f0020a5c4e9355839d4884641a18f52df0ca852544870bb7153da875864124190e60dc2968491aefa012ee311fba1b873c045d31e401b07fe3a470f SHA512 c0b08417107266ab03dd705f565cb2655322191c0783cf92e41cf81b3f51f6af843ab37c37e286075aeee714fac52c8917e01f1fef80e11fe26a5d2c8f6a4105
diff --git a/dev-libs/tree-sitter-html/metadata.xml b/dev-libs/tree-sitter-html/metadata.xml
index acc1cbdd1c4f..3523175e5040 100644
--- a/dev-libs/tree-sitter-html/metadata.xml
+++ b/dev-libs/tree-sitter-html/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-java/Manifest b/dev-libs/tree-sitter-java/Manifest
index 91e159514812..2533dadc0e3d 100644
--- a/dev-libs/tree-sitter-java/Manifest
+++ b/dev-libs/tree-sitter-java/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-java-0.19.1.tar.gz 134115 BLAKE2B 92b2388d644659fa84646deeff06cda9c1c3bf3dbf6d06bda8e8dea14c2e748813cbaec440a458f98e0f1182e7543ca6a1d4c30ecbd2ba7733e09acf3aeff623 SHA512 71bd34132785f1b95538ce321eba4d6258fff309abf6150852b749336d7ffa5e4bd06f52fb5b6db2e2845592e6faf2ad4cac226289a0078f06cf2fc2f74152bb
 EBUILD tree-sitter-java-0.19.1.ebuild 286 BLAKE2B 68e4ac588efafbd6712ced67283f4b1173e5c3e372764e67832fd17bfb5933c3aec53d7d48bf006fc814af230f08128888519d4e5420a7a1feac615c0e7952f2 SHA512 ed6cf11b1f47cb45e92bae6ab85f26d2ff806470c4c73993884b5aee4c2b9b95110aea0420e52d60b7dd8b43c150279daf3bd1b501a4844f9a373a22ba525d93
-MISC metadata.xml 588 BLAKE2B 88ce9555955c499803acba69db7733648c601a313c72341e7d6d2524c6c5cf2531240bfa8f4bfa434dae5701329962c063541a783afef62ef7dabf0a1b8baf59 SHA512 89656f51a155338c4a5ede3b62af175ce61bc8936f3f3d3012c61889f1062abd0c21aa5c89d960f2f57fab67b8115fa1565df6d995a1df65b20b5594c51f8912
+MISC metadata.xml 559 BLAKE2B 2a33b73a90591c3af8e0023e8cc6ad0be46b007255e7c3137fb5e2a0763f22493d89f70463ba59c9250a62aaef680271bb8a876926a2b967a3f9fec3647c3e25 SHA512 22e3de0937611b46f49706bbefc34fe902a0ab284ec41e04e0312859cf20e51168a49564d6a4c4ac8959312a1e5755b03f9f88885ee14d5e0ffc3569f4663ad7
diff --git a/dev-libs/tree-sitter-java/metadata.xml b/dev-libs/tree-sitter-java/metadata.xml
index 4c98a62d0f91..ab4809aa51a7 100644
--- a/dev-libs/tree-sitter-java/metadata.xml
+++ b/dev-libs/tree-sitter-java/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-javascript/Manifest b/dev-libs/tree-sitter-javascript/Manifest
index 03a457aa2305..147c1e4e9d1c 100644
--- a/dev-libs/tree-sitter-javascript/Manifest
+++ b/dev-libs/tree-sitter-javascript/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-javascript-0.20.0.tar.gz 278831 BLAKE2B cd66005e7ebdae154a192ff556d4cb35e91d93a2ab645a24b9492217858278adc1f7917a7dc5033bbcfd84ca7ef41a3e7ebb1ff934bb09b79c8923469110e1de SHA512 778e0f2f5bf276d7ffb6eab0fe3f7473b56605de707c8e2f491fbb5826da94067b9f1bc476306013267001b5ecaab11a956e896b78520cdedd27006fac97fe41
 EBUILD tree-sitter-javascript-0.20.0.ebuild 316 BLAKE2B ec26c68d8bc15867219be82ad963f91e2d4194a01e3da51086a1a3e22a14ce4b3ad928401e84807e6fa87fa3b1ad9975535f853fb46e00dee5fd52d6ad1301b8 SHA512 4274f3adc06c523da6045b0f59e3937d394dda54560647f2fd6278ae9cbaf81a535f94fd4c5a645c489e0bc002cf11611dd000707f0f9584e0cd95d211dde22b
-MISC metadata.xml 481 BLAKE2B b9aef2a8dc8b20999d515625983d3d75a89ee160395f16b9abb5b887062dc763bc2bb011f754c75e7d1d7c2769897ebcaff5275e8c342dbb098845447187af92 SHA512 1637220c13331600d293f70a930c944846f02e8cb9705bf87893956db720bd02bcedd33e9397d7802da8c7761ccb5217b9712e2381ba090963dc67c784971bc5
+MISC metadata.xml 452 BLAKE2B c0a1b41f1e185ed114d88bd150adb7c0db6b3f4519a40bf84947706621725cc592f31d30d83a2068458026fc920a6e273a480a63f9d90a136f7afab93cac4481 SHA512 e05141731ca0a84b6d6037e73c5ffe3a11cc6bf86f8d2c4642333ba05dff558eb93d8fb062cc67059e3ebe4d9b75041eb6f1ef3f79b38b1dc1abd9fc4c6fc77a
diff --git a/dev-libs/tree-sitter-javascript/metadata.xml b/dev-libs/tree-sitter-javascript/metadata.xml
index e4ca3c1b4c14..0846068ba5d8 100644
--- a/dev-libs/tree-sitter-javascript/metadata.xml
+++ b/dev-libs/tree-sitter-javascript/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-jsdoc/Manifest b/dev-libs/tree-sitter-jsdoc/Manifest
index dd58986095db..d7eba2508b1d 100644
--- a/dev-libs/tree-sitter-jsdoc/Manifest
+++ b/dev-libs/tree-sitter-jsdoc/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-jsdoc-0.19.0.tar.gz 13214 BLAKE2B 25a8d06201d0edfc3243a0dc178cc2074141f9df24482535c4accb6e23b7493abb7b3b0d7b2a73b5bb25f1d261e214cdab5667c09fe9114f1837012f0fcf3085 SHA512 abffccff5f5b11aebee1226db87fa79d87e675111b32f8d1651679d7d68634201b2d74e3993bc514de03c5b93440e73bdf2ae6c1c879a7dc361c8d6ae550e972
 EBUILD tree-sitter-jsdoc-0.19.0.ebuild 288 BLAKE2B d591d0b8c372deceb86434e9a1bd27bb49de32774ae3c0f7f148f73cc4beda4a3e6880c1dd2144e059cb1c3d098633b6060f77fc691406d7ed145ff0c71f5431 SHA512 a14ba6fad38415b2c070d40240b85ba25325084ccb63430bb68f28d1312c554d8037374ab580ed197769ac65c80708f32cc5e50c818ecf06b32d626939c773f8
-MISC metadata.xml 589 BLAKE2B 5514864afa23ed829ad2f14014189fc48f82d2581f49f7ca2e443981d29010d208ed24c6e53821d9cfa5ba5840f6e0223ff955639a3ab490da91bfd28c66f5d7 SHA512 eae30d7183f1f1a1ed58676a17cc8ce651d7302654f2d62897661c6045fd8ef3d95778894a7f4f5ad08d030bbc56ed5d0a2c99144995ee2bd3007e779f3280be
+MISC metadata.xml 560 BLAKE2B 26916fd19039620cf51f880e88a994fd1441b7f6f0c61ac387dd3797621be3a2b1d0135824ce44da275f6bd9ead861c1cedb096b968a8249b48a9e7d9d9f3d40 SHA512 12381a0ef5063165b6d780121f97e57a4c79b9c3e1fd1c6c902e2172b3a7bd0af2928e653c388d0b62de01d09f9d7d4a9394fd58fef60a124134f0703b8b5dbd
diff --git a/dev-libs/tree-sitter-jsdoc/metadata.xml b/dev-libs/tree-sitter-jsdoc/metadata.xml
index ec13b7ca75b7..0947bc05e5f0 100644
--- a/dev-libs/tree-sitter-jsdoc/metadata.xml
+++ b/dev-libs/tree-sitter-jsdoc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-json/Manifest b/dev-libs/tree-sitter-json/Manifest
index 7fe26173fb29..5103d68655d0 100644
--- a/dev-libs/tree-sitter-json/Manifest
+++ b/dev-libs/tree-sitter-json/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-json-0.19.0.tar.gz 11102 BLAKE2B 8530b53dffa59fcc844501dcbfc9fc8a39a4d4fda6653e02b17261c23da43c8f3dd2bcb1e312a58861ea9af7835d4f2b9208e7960bfaec8ffeecd754e04416d0 SHA512 f4ef90d1ff7cb96093e7b54fb0b4904f7c19256c2e0938c03f81d89f3699f0c0922da54d1d770aa786b9cf10b08f9afa762771a207546a29cf7ff7f1710dadb6
 EBUILD tree-sitter-json-0.19.0.ebuild 286 BLAKE2B 6a7b2a6cd58fa6dffecab733401ba2e38aef795ac1b05abca04f4c239e595e29cc16fbe250ee5b60147228cefb6a4e3fa8276c393471bccb1a2dc71f99d62d59 SHA512 814c82acf65dcc92d38c69853a1f8aa00edf19cb8a363e28903362a9fc4ab06bdffd7a4a7a1ad1ecca175802c6ee2e2e776315fb87bc87b1a0f79e7183417f46
-MISC metadata.xml 475 BLAKE2B 40bcaba31d4108aa669617964691ca51af6b1411461d1ac34e91fa8125648dad6c409ef7f8b91ed39eb5eb03279ec612c5466fc4a8b5ab504460f07ae8472f81 SHA512 5bc37ffd898acff2743cd060e9bf0e18dba996464606b04cf2bb7571b688736c8db8c1971f7d6525a7007c61b056c80bff142d61fb25db4b8a752a3c4a07201e
+MISC metadata.xml 446 BLAKE2B e0b0f3f8f0cc350e914c6db53993b1c73ad53448cc6bd9691de39fb0f7b8cf49a14e0803721a36bf027ac33ba29a2b3666325d2ed9bee51d3832137caffa084a SHA512 d05f69c9d9f838b94cd16cb8b937b7798a7d61139cc13b2056b343070a4a197558c9e01fb8a27a2d8b90f8a15037e7b7bf08dcc9c3d636bb9c09dfd84b538b32
diff --git a/dev-libs/tree-sitter-json/metadata.xml b/dev-libs/tree-sitter-json/metadata.xml
index 54551edf7eea..0e1551210dfc 100644
--- a/dev-libs/tree-sitter-json/metadata.xml
+++ b/dev-libs/tree-sitter-json/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-julia/Manifest b/dev-libs/tree-sitter-julia/Manifest
index eaa893ac1df0..06f4d31fed1b 100644
--- a/dev-libs/tree-sitter-julia/Manifest
+++ b/dev-libs/tree-sitter-julia/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-julia-0.19.0.tar.gz 591870 BLAKE2B 0a15485ce7eb87f080add5b2dae19004349f3c79a048b77552915ae776860d722d6d6e07422ab82fb932f795285b545fe1b6579824a8f4905fbbdd4b96f16ea4 SHA512 ee3943683413e3d16d60ec1bf1f3cc816011c4d458b5c44d7ce42e5f14c8aa22e35ce07747f0737c9b514fa7ea8b866d4fa6af5c53069b755e0d6d3f7bcc8e2a
 EBUILD tree-sitter-julia-0.19.0.ebuild 288 BLAKE2B b93db5b8625d5235e48a25a0de7860743e64481139cc5930a52230a99dd3e2469ccf86027caf57b4d48b252f0b76b631b25c380e603dc2df496205bc70736fc4 SHA512 be9b1b51f03b43a0006d3f66ce209930fb5011ff662883952324b74f0155f358588a0336e4e893de71cf1fa1448b175b973758b12256bbdc8b4cde27c4635820
-MISC metadata.xml 589 BLAKE2B 8cabdc9290613e525855bec3c8a1b79d4b153d35041c2ce4cf5bd969d97e5642bd81c1595c957ce7dec7fea2c4a07bf148145ce5819ab859f0215e3e8ade4687 SHA512 e8313866f62b7591d777b3d077af71aca77206eb5d733e3ac80e1aceba4171f16fc3cdde23fffcc37b15efe59e3add0e3a9a80567e01ff0d6256dbae6438afba
+MISC metadata.xml 560 BLAKE2B afcf7a33574a8bfd53ef9e9fd0dccb8c3b28bfa51b6a4a66c856fc84962710f387af304e6cbe098acfb448f2aaebc0f184c2a87333029219201268fad2622c01 SHA512 4460f6793e83fbadc9dd359211c2cf7d153b9f450f1133cdf2e19e38b1bae33f7010f8420cc81ab2f072674e19595042a22582304b7a67725668c4d517da65a1
diff --git a/dev-libs/tree-sitter-julia/metadata.xml b/dev-libs/tree-sitter-julia/metadata.xml
index c9980de7efc0..781c30634bf9 100644
--- a/dev-libs/tree-sitter-julia/metadata.xml
+++ b/dev-libs/tree-sitter-julia/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-meta/Manifest b/dev-libs/tree-sitter-meta/Manifest
index 11645507e970..08890b898e87 100644
--- a/dev-libs/tree-sitter-meta/Manifest
+++ b/dev-libs/tree-sitter-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD tree-sitter-meta-1-r1.ebuild 950 BLAKE2B 9a081ac05e3123232fb60b573b5c9c6774ff352bcc7946161f69e713a088b0ed2b49607bce9e2022c660e36e96d63f88616676c58b56826eca58a31f235e1bdd SHA512 4adfaa3d76351a4a94c61fdf50221189545038f962b9c31b52bc34d0d5b0cb0ab7ce1512541f0b42f9ff78a4fb54cebd504a53c3871191b67332436460df45f7
 EBUILD tree-sitter-meta-1.ebuild 631 BLAKE2B 258966b03e18ecf79927eab5378a2e54a9e2358d970078635d51153dc0d167487bcbae9ffb406ecc6e78083e0e04e1673030695d0bde575ae328465077b6890d SHA512 21f4d32458d18bc02aabf9dcacbce05ac81145a5cab4c9b031d8c4787ad878a265cf2bd6c21cb78ce56874a5972d72ba0a5dfb23e926a0f40836639f1dbc8f73
-MISC metadata.xml 382 BLAKE2B 103f3f60a545373c69cb5c69db29e1c48a78251777620b4ee3a90e3e420709403e46c587a2110ae9c744e1d1a754ad69305b40fe5bb73286ee5128a4686ad20a SHA512 1709fc6aa4004efcef3fee80ce1226f1d9b1d2427ae53c8186589360aeda358f8ef629907b89ac7aade02660ec4f2a5e8fef4bfc1558ed61d517dd42a1840c64
+MISC metadata.xml 353 BLAKE2B 37c7e076c05097bd49ad4b4a74ba03c9626b746f5b69f168d72331ddf98f266cc9fad580803a56f6ab12e4a1d25aca5cae5d8e6a343e571b187365e853fc468e SHA512 450c7c6f5d38fa9f31781c098b724d77b45ecb25f0ad2dd5525c66d185c77351c1a50cb5b4af50040c842a5729bbc8652ed000d818caa6539f8e6e30be022fd1
diff --git a/dev-libs/tree-sitter-meta/metadata.xml b/dev-libs/tree-sitter-meta/metadata.xml
index 07830709cc3e..6e7f9e7ff033 100644
--- a/dev-libs/tree-sitter-meta/metadata.xml
+++ b/dev-libs/tree-sitter-meta/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-ocaml/Manifest b/dev-libs/tree-sitter-ocaml/Manifest
index 9bb0a12a5fd8..e5ab56e1dadb 100644
--- a/dev-libs/tree-sitter-ocaml/Manifest
+++ b/dev-libs/tree-sitter-ocaml/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-ocaml-0.19.0.tar.gz 1314747 BLAKE2B 8bceac43a40b11b27395a52a450ab734312fbb43cd4b711ca27e629f16599a04cbb55b13a05540ad20f7aa00f068ef57752b7ba42c45bbc75fc87c344133a743 SHA512 897ce5fcb58241c8ec123536ce52eba64698cb5da08403801f4d1760fab1addaced0b3cda5c24460cf2b4531215becf3a6b29c34ba871370b02b467a13b171ba
 EBUILD tree-sitter-ocaml-0.19.0.ebuild 319 BLAKE2B 4aa49f72bcd9d4634076a5495d5c3bdae9808fa8435c12592ce944fd3c524314ad831c936f44d485f1e8a53fdb8c1474179925fd2af30264de9b72bf66ef0b2a SHA512 f1bdfe01a9a52566d6a63c33678393e823330883350c7eab618a1fe5ff7608bedbd5f4c70929bef950f079072d9ba07f73346e1bf39cc21a01ae15c32944464b
-MISC metadata.xml 589 BLAKE2B 835c1f29c9b98a4708d0c3016f27f5fd7e01681a13e0de424b8be5b303e0c5d322ddbbbed82e1b1366f1006bec368d9e6392d33a598092cf788154e37284c5e2 SHA512 9ae243be11018b6327ff783b44348475dbee8fbfa592449653e0c1343d36f53c0f4b8cca2c30acf87b955cee2aeff4cddccae88c35e95351e9f25fb51c08e99a
+MISC metadata.xml 560 BLAKE2B 550bcbe717df1b3ba199b5895fb4cf884c3297713602f2f891445647f4c1dc574b371e3b5346eafe25ea4fe7f4290cdaeead02a70b05714a05f55ff2caa2e107 SHA512 4c56aa12beacd6ae57f60372fce8997e49a73b95a3b94487d9dff5a25ad42f771ae3b0af1a4f20d0e1e05c150bd16047c180d5a3e46db4f3a73dff51e9e0e3ab
diff --git a/dev-libs/tree-sitter-ocaml/metadata.xml b/dev-libs/tree-sitter-ocaml/metadata.xml
index 38ac08cf86e4..681978881386 100644
--- a/dev-libs/tree-sitter-ocaml/metadata.xml
+++ b/dev-libs/tree-sitter-ocaml/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-php/Manifest b/dev-libs/tree-sitter-php/Manifest
index 3a0f9abcd7b3..7bd33d714a89 100644
--- a/dev-libs/tree-sitter-php/Manifest
+++ b/dev-libs/tree-sitter-php/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-php-0.19.0.tar.gz 155930 BLAKE2B e78b0a719f2e8cde6398a5645023c09135f61bbe138abeff8160bb1688bab84fa7ca51438e380d79fc0e05efa2e4897a7ff05fd677ac0b8cb4098e27d576a10a SHA512 bf82af3a4c0da96f58e93aaee2724f327c11e297bcd455998e0863aa64ab6ae85d1d212afa51b75c8e8ab998568cc71b0309ee3d1d41b632ef0283478ecc5711
 EBUILD tree-sitter-php-0.19.0.ebuild 284 BLAKE2B 33836d9eed4c3bfc1e34cad53193863f6fbc92486c523e4c713b8f832c9986566b723703cf562a52a2fea426aa81ec0860911254888481998b3853ff4be727c1 SHA512 f591cfbb19333261184f0e7a16a13b948c9bae6a994b1d44139a2b22f9b66df9aae3edf9e958097f291f2dba1666ee7e3025a90bc82f539bf00ae319f70e8a66
-MISC metadata.xml 474 BLAKE2B 330a4df7c512fd53d7c9f93e6a945687d408577a5171ca6996cb8062c85c07b07f13ae4a376f08bcdd656db4680dbdf6eb5e9b2f877101262152394043222dbc SHA512 d1477e7c7edfc5669637548f1a4d76929e71ad431ab2e7a7969018e32c187233de278cb6e9c746df7a57588cb4e97903e093d7b217dcff9701b9e1ee29ec9346
+MISC metadata.xml 445 BLAKE2B f28e6b9a54a45fe0e9b9965b2388bf049ec819fb8c7599fa9faca7815074edc962b64f90b5cb3feccc566a88c8ff4b1d91db7dcd4ca576957f5a6d738f56ae00 SHA512 2fdb1e35a5a68b9f582f16c96810c507e6b96b897fc82c13c3b6d2f1490f1d021a673086d499221c5ce03e868469350fcabeeedc553fd126680e58ecc73ea45e
diff --git a/dev-libs/tree-sitter-php/metadata.xml b/dev-libs/tree-sitter-php/metadata.xml
index e11305e07a95..0f4f3a9a2eeb 100644
--- a/dev-libs/tree-sitter-php/metadata.xml
+++ b/dev-libs/tree-sitter-php/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-python/Manifest b/dev-libs/tree-sitter-python/Manifest
index e7d94a3cac72..ea6da0643df9 100644
--- a/dev-libs/tree-sitter-python/Manifest
+++ b/dev-libs/tree-sitter-python/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-python-0.19.1_p20211112.tar.gz 141155 BLAKE2B ee524faca6bebf6c7f27d34ba418c4494877d6cf33a17b4ac0e5c148db58a8e17b2ec8ba992139b72e1fc88c9c93bcdb6a8cbd4a47b9cc65ad3097e08b4ee339 SHA512 25d5b3f8bac1daf8c9971278b8c209f2d953310cd31afd2e375d48354845930e553d0067dd9c0e93565d1996a803d0b5445f48720b0bc7f3d38e73f40cdbbc90
 EBUILD tree-sitter-python-0.19.1_p20211112.ebuild 340 BLAKE2B 8c8f3adf3cde7fecc1228886b2e9bde51e36a16b0bbcf5027c8763666d6ae1748c7f3345ff5ad3308fe7f293a9a964fb00b7f5d6771c2aa01be798ddaf6ab8a8 SHA512 7ef197eeb4080aa48f9576e182381fce2b728a696fc3cb3c1473d0277fb7436e90628b128678d4071586a3a5d299abe81d2c05e24e1c06e0dc8d7f4a072d2ecc
-MISC metadata.xml 590 BLAKE2B 314aa76372b84c4db68d6df9e87c0dc41ee11a581a293204d8d949a01836906ef4cb313723b715a3e5a1beec5446807a0d3be4179d63caee3d9ffa5bfd583d7a SHA512 8030c58b69c07ce20ba3b4004dc3bd47160708ec4546b4a8782a342bb6359b15a0141ff73a0d08d3a3fc8b5275cf894668e49ffbe305fe9e71318e25c9f1b583
+MISC metadata.xml 561 BLAKE2B 940672a7aee286697c4ce7511e489d0eb01be80fe5814bfc46d8dffa16c628618691a9d613782c88066b54ee961e050b200763af88539918a2c953a501ddc99c SHA512 c3e7a47cd19750d2d2d8d1cbf800fc92ce9166bd2babf0704743a41c2415eb7d9023ae0f1fe8c9e555e785d75794b821f63b09c75ef9b9c0e982434d6dbe1c1b
diff --git a/dev-libs/tree-sitter-python/metadata.xml b/dev-libs/tree-sitter-python/metadata.xml
index 64809d1b4963..1150500b1da5 100644
--- a/dev-libs/tree-sitter-python/metadata.xml
+++ b/dev-libs/tree-sitter-python/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-ql/Manifest b/dev-libs/tree-sitter-ql/Manifest
index 1b84d8d1b35e..8b19d1f7814d 100644
--- a/dev-libs/tree-sitter-ql/Manifest
+++ b/dev-libs/tree-sitter-ql/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-ql-0.19.0.tar.gz 105323 BLAKE2B 3f19ba4b8f0504eb3857a69ea01a81bf22e26861390cfb964d80c6fb6677edf1c3683e29821f4becd548b4ddcc9a038407c74d945179a63acf3eb3bb7fbee80c SHA512 12ec3c85775dace0d80f426675bf27b06ffd96d4ffe4bac1e3018be911cf97184efce92a6c373ee4198639323a453e21350496074fbfaf82519a972acc763455
 EBUILD tree-sitter-ql-0.19.0.ebuild 289 BLAKE2B eaf913162960b0fd510a9dada333ae6f71ecc06bddb349b7cdecf52f70be2de4b885ff75f37e7e4824ebe9dfc2b963cf4f3620dafa695ea5c346bbae947072ec SHA512 50dd06c54d5a58742c1fb9f6ce5273cf731926b318a5a612a4366fd9dd754dd3f5de3539db99648bbd90e76a0065ba866a8291293237fb75257ae0bdddb77bd2
-MISC metadata.xml 586 BLAKE2B 676766925f94d5bc67849a84ab9772a696f637b7163879e3a3dec4095c89b9a5a2929da60b27da15580da2620c9b31d75c53e0b8ce10b53b98ae68f7a8c6ae0f SHA512 c308731c32af277ec0daa892a112759dc8c627ffb0e13f3586388059daeb66be11c3089829fb6b0bec8a3cd2be4c58f8d32e70a1c7c5471fba60d06c878e0773
+MISC metadata.xml 557 BLAKE2B 70a91606dd454977c1e6bd3889673da3599dbf5f0896d589ddcaabfb165d3602f603a254f861dc3b1510f1993e1de79b0ad24db83af9e8d2ed8de636ef97fb94 SHA512 e2ee45dd1f3814816309edf68b8b142634a3b9b6e7b4769f2db406f3e0233affc5ee990bbdc14b9baae3ad2aecc643c2cb721195c1deedad1609bbbe158d9e25
diff --git a/dev-libs/tree-sitter-ql/metadata.xml b/dev-libs/tree-sitter-ql/metadata.xml
index 193359552851..b500ca7f8954 100644
--- a/dev-libs/tree-sitter-ql/metadata.xml
+++ b/dev-libs/tree-sitter-ql/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-regex/Manifest b/dev-libs/tree-sitter-regex/Manifest
index d739bc2d8a2c..3e737475a524 100644
--- a/dev-libs/tree-sitter-regex/Manifest
+++ b/dev-libs/tree-sitter-regex/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-regex-0.19.0.tar.gz 17452 BLAKE2B a1a4db494b685c9e4df3dba790b8d4938d604c02c419c040d783aa11093fb1d988f807d002b798ff53e6b64f294df6b24b6774642bb331ad0dc2a9a61f2ad88c SHA512 d2ecc9637f7e130b16103b375592e449f3b58afcce7d284e269ba7a20e96ca5d6c118a8c99819e7c9d0f8d4ceeb139ba493fcf6e001da25610a70030db599991
 EBUILD tree-sitter-regex-0.19.0.ebuild 302 BLAKE2B f4e626c555ae7c2d6d3fefe59edb743043fc9eef0bfe3abeca925922a4578204461f094bb7ec46debeba97b9f7e065b68f2fb230a84e899c7a4919676f1d186a SHA512 5bf9fbe04ff1e795109567b91e6b9ee22a15567c3d8e27ba2c3622ce4b9defb3ae5be7e726d90e56ecc42a165a994625ac53b1435512cda69ca6100fff76b8b1
-MISC metadata.xml 589 BLAKE2B adede0c3b75681f6152e1cbfc86e11bdfb722910dd00c2510e85f31ac41defdb10a2398c35af26562336f481e052bc0fd0f3b2ea38dc1dd5a480cc50b06db539 SHA512 371059d9d132db944f7a5a1ad0b9a025e1cd1c1e8385dd5be96f70c9d3ed5a21d9e2c584d2f7a723c978d0302f58f06363577a586a23cda1acd42148c43ec535
+MISC metadata.xml 560 BLAKE2B e3d7e284b0830f39a8d942e38f3f956c13ef391b648e9c61e28cd089c26c9c8da397ac2ffb818dad97d40c5cf6c5db26910f14bc0f575c95a8a4df15884dd8e0 SHA512 8a6bf6e2ca7ffc1194fc30920974e258727ed9f25b4628cf0c37747951deb1e67f42b4a515b65148d9449b1bf509439f0372c559a2a7cf1d9a8a6d29c70c0684
diff --git a/dev-libs/tree-sitter-regex/metadata.xml b/dev-libs/tree-sitter-regex/metadata.xml
index a23cbbe1237e..e052fd0a6b1b 100644
--- a/dev-libs/tree-sitter-regex/metadata.xml
+++ b/dev-libs/tree-sitter-regex/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-ruby/Manifest b/dev-libs/tree-sitter-ruby/Manifest
index 599b32abd84d..8e8fc8e91484 100644
--- a/dev-libs/tree-sitter-ruby/Manifest
+++ b/dev-libs/tree-sitter-ruby/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-ruby-0.19.0.tar.gz 325077 BLAKE2B eb39ba999ccf582b698138ebb7a7f9cbd949510046460d84e37471634700b0751219a7a266652256225bc6fbdd80340cca38662b180c2314f82c5ed7de3324cf SHA512 dc092b55a73a7ffaf698c784e0a6e8fd115478ce8eb2de00301bb8c2455044a4b7f4cd04ab36eb19401386b55088ad3fba6cb9cce9856b6f607bd76caaf0900b
 EBUILD tree-sitter-ruby-0.19.0.ebuild 286 BLAKE2B 69415d6531792f875c976424dab2282e2897447979ee3ae53d4c2b186d976e9f5b3b452008b592f748da5e09cc302a6531ee83ae6ff079e4edec9ce38cc95f2b SHA512 e4f6da080fc8cf8b56b43fe065f5c1de41ae71d4598a8056679752d34687f8b457f5494413fe55f0feb8a07e216f5ed74e03dcfd3e76ee2990c83d4d8e175a5b
-MISC metadata.xml 588 BLAKE2B f65e4387bc73c2a5ea42d01200905c6baa8c1305f718000754cb9f434792b8f8b899622006a3802f5723a4caf5e49b3e79309f500ae12f670bdc4de406728b35 SHA512 a85270c5c86eaaaebcc1bbe849beb022e2ab8e465087c1e1b0f3279c7a9e45474b36770d5b30e32b5be8e44c338c5428e74c5094f17ffdb35e2e8b186b42b195
+MISC metadata.xml 559 BLAKE2B 152613d9b7937a08857d96b4f66803dee57788dce76181acb149bd2a372c1647035076171da2fb0b0745d1762589dd829486536befd1245ad0e2d917fd646d28 SHA512 5c353e6872add822be369b693ec38c2cc797be4c57c23c5a43b144407b7af987f0741c3dc56a173f6ebf05e2d3fad1484f7d8b45393d211ea7e1ae1c9d6281a0
diff --git a/dev-libs/tree-sitter-ruby/metadata.xml b/dev-libs/tree-sitter-ruby/metadata.xml
index 920a37c3ce40..f1cc3e07c912 100644
--- a/dev-libs/tree-sitter-ruby/metadata.xml
+++ b/dev-libs/tree-sitter-ruby/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-rust/Manifest b/dev-libs/tree-sitter-rust/Manifest
index bb5325d56402..f58ff6efb92a 100644
--- a/dev-libs/tree-sitter-rust/Manifest
+++ b/dev-libs/tree-sitter-rust/Manifest
@@ -1,3 +1,5 @@
 DIST tree-sitter-rust-0.20.0.tar.gz 308481 BLAKE2B cb5e8b210ab58ae0a771deb82f1963a8001310673b44203df20425df443f179289bff29dbab9f58e5450f0d1a2ec377ba7601204ffeac7c461c03be90789fc5e SHA512 1c7283e973f50989980a5a05217d664e87665c5ea2338978deaf0cf88f624c45fde8162848c68bb3b8836d32cbf9be80b1da6fa7aa03fa3cab8d8efb49e3694c
+DIST tree-sitter-rust-0.20.1.tar.gz 308918 BLAKE2B b226bf6eb2c282f62d3eef0598db38dc54d03ed2ea07313fffbb6c9d955cccc71bef5513b8b2c56460989789e9f4293fb27a2db152b5afa56085348427fe9ad5 SHA512 de799d76dbcbc7f68ab8560f747c3df3950dd3e640ac60cd44d65a60b23e118e271370e2b1b84d2d830c2d70341b5714f5f52592709ba15f6b164c05f3798f07
 EBUILD tree-sitter-rust-0.20.0.ebuild 286 BLAKE2B cb0ea2b972649a98f1ba9ea4865090950bef36c95971b0694fcb6f6bb85102c54c116b5d4f30633439352137b55ba8c0971ac34d57e68146eb1c78393d54686b SHA512 0d683371ab4a696625e4583e6f7c4f02c8067d80085f074f678ef82d8c16c3ea4b79fcab47b02c9e240f0764ef6c1e7304e145ab34d1b8f4f0c31692271fda2c
-MISC metadata.xml 588 BLAKE2B f4eba8aa545f8cf0e0582b56774b12bf22aa158ab6f4f54b8c3088e809799eb7df528c51b51a1ecdc55df1fc54619e26b5714833be982baf6b617336cc01c6f1 SHA512 b0008fcaf3f00f64e7f470e462a8e94254e537c4076e053ae172c5a3b67b1a25dd27a81eece8873d66f6a0f2310cf865c9b7f6aa1c70f0892c78bba877d4fceb
+EBUILD tree-sitter-rust-0.20.1.ebuild 286 BLAKE2B f5d762c771e3fe9e2be49e58a45d3d1f418e2575cbbe8508c33669c23e2ada5dcb13dfffa08aa192eddddbabee6594a3ac4c76214532f77c5d882cf7954213f9 SHA512 afad591ff15e02c1a2bc5ab5c24638ce3a0161b78a66bcf1fcf24267ee53cc5a4211647cee8cb59df3df7dd6fbef2892acac94989fdee7ae46505370aaf6f4e9
+MISC metadata.xml 559 BLAKE2B d585950ceaa197145c3a2df759e97a8a50114c0caf0b7492e3e16f26251751f694000acaf6231ae826cfa57e99153eb27f09773d2805af40df4dbd3825dbe46c SHA512 97b7d3b6bcc3da3c7fc6d4111e2a1e02fd84ec778a18a22570ae303052d01b4beebba83eb6df0174bd6fc29b8101d88ee20a5f78b855ce713311d87e1c0be312
diff --git a/dev-libs/tree-sitter-rust/metadata.xml b/dev-libs/tree-sitter-rust/metadata.xml
index b82170949bb8..78be01dc65ac 100644
--- a/dev-libs/tree-sitter-rust/metadata.xml
+++ b/dev-libs/tree-sitter-rust/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.1.ebuild b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.1.ebuild
new file mode 100644
index 000000000000..36fca638c421
--- /dev/null
+++ b/dev-libs/tree-sitter-rust/tree-sitter-rust-0.20.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit tree-sitter-grammar
+
+DESCRIPTION="Rust grammar for Tree-sitter"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter-rust"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-libs/tree-sitter-scala/Manifest b/dev-libs/tree-sitter-scala/Manifest
index 3fb09d39ec72..d151361b30f9 100644
--- a/dev-libs/tree-sitter-scala/Manifest
+++ b/dev-libs/tree-sitter-scala/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-scala-0.19.0.tar.gz 127779 BLAKE2B c0cde9adf3bc4dc25b84bc57d02e248613f42caf1531ad4eeb58e226a39c2323e28553154eb1a5a6d0ba1359cea847ab8e0dac67060d35df1d017bf475524acb SHA512 5845720ce7181f0272fbd9b5980258680d5cb9bf5f8276e4be28f4dad15694f79a2184e46ef94909ac54f510e44ffc67a9632f9767866034f5fa2a9945311661
 EBUILD tree-sitter-scala-0.19.0.ebuild 288 BLAKE2B 160db62e43fe4990e7163e6eb99822553d3726d0f5581ab397da158c73cd0b5d82aa030ca08ff9e96ebafcebfae66c4cca60934466e65d452fb04e9f5a207fa2 SHA512 949619e71073e90a062b2f8e063da08134d084aa9dfe8ed0eaab9b1f3061725a4d2e338bcee35035c7b7de1b0c5edd6706614fd295008908b17342e4aa9d0e9a
-MISC metadata.xml 476 BLAKE2B f15caf4353840f3f453f6cdfc41848564c14fb387eccf5595adb35a332a68db15951961b757ad939873a44a304e3cec9ed64356e65625a838d2c972563b90eda SHA512 85cd4ef960d8cf65919b8eb03a82ffd05a72c041f18672e5ca2aff3e4a2707496556dfadbf776945798884638726d80b5e8a1eb3b923a01395b7e35fb2a5bfc6
+MISC metadata.xml 447 BLAKE2B 562205a9f7e68770539a5b350fd5f0e20d2284d46a24d560e9b9181e99741bf774fb1870080a8b17043ddfda6fd868842d1bd7db9e86b2185483c80001f9514f SHA512 25726d1046d5fdf5c55b5cd6b7f2bf2cb109fb3cea5d76b95ae93bd1ea9b326c19624b021a73a360f86e2071071bacff955d1e1825cf54e4e00d87b5a524260b
diff --git a/dev-libs/tree-sitter-scala/metadata.xml b/dev-libs/tree-sitter-scala/metadata.xml
index 521d91df4f59..ea3cfbe901d4 100644
--- a/dev-libs/tree-sitter-scala/metadata.xml
+++ b/dev-libs/tree-sitter-scala/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-tsq/Manifest b/dev-libs/tree-sitter-tsq/Manifest
index a0a527f8089f..3e0f44f45ab1 100644
--- a/dev-libs/tree-sitter-tsq/Manifest
+++ b/dev-libs/tree-sitter-tsq/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-tsq-0.19.0.tar.gz 15030 BLAKE2B b6bf4e7915dcd7089d1b536aac6df963638df63d7a9a5e94615eba86da44b8e9a6240699dc237fc9f018598384c05af8730ce7d5a2cdd090a5190f2cc5a582f8 SHA512 2150af3463ca56da50c9212d3830e248c8088ae63e914967cdbf77ca72d535b4f09950f71c2d814844d4bc41fc0df36ac00ae391e579d7be9d6ee7e939ebf2ba
 EBUILD tree-sitter-tsq-0.19.0.ebuild 551 BLAKE2B c253b30c876c3fe2df08e9ab319d4276268ef6a2b3b0bc5bcab15feaadca42388a44c671787413a7d8422e71a741a2186266599f925464658ee346e9d80a1cdb SHA512 4d25bfe0ad482278f24d439c1ffedc812763b3be0e7f666162d8ceabb3453f63a3448d9fedc30e04880c937ad8636f03eb8dd8987648d3f004290e01edf40207
-MISC metadata.xml 587 BLAKE2B b4426339bf8f0b7c3833befb2fe392b322a61977fbccd4c93d75e92d978b271c14e93bad69887010860bd30ab4d990a2182888a0d40cafed42b885bb705b8577 SHA512 d036fb113357a4d7799d388a9c7a2c1caf99478f1dd9de7017f89f268d874fbd2e417a0ae0c004d25c20406e6c805b15fb5bf2397141e5041fd9f8778774aadc
+MISC metadata.xml 558 BLAKE2B 0caa98b365021e85b34530a2f8e2a092a06b77554d28f1f41934727bfc0f02b4c3adf9c0d409e99c6b448237e5292a00109632b3177458e85552840979d68f83 SHA512 ccb6360afcc0f0fc1e165e61ea91c61121e52f86472f5378cc846de4cd0b3d33200cb63cf517e9cc8482b38b857526a230c7f46f44ea1ab755140511e817758b
diff --git a/dev-libs/tree-sitter-tsq/metadata.xml b/dev-libs/tree-sitter-tsq/metadata.xml
index ee14ccfa4e76..54cdf7d9be5d 100644
--- a/dev-libs/tree-sitter-tsq/metadata.xml
+++ b/dev-libs/tree-sitter-tsq/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter-typescript/Manifest b/dev-libs/tree-sitter-typescript/Manifest
index f7823cc121ed..4ad7b78f9d27 100644
--- a/dev-libs/tree-sitter-typescript/Manifest
+++ b/dev-libs/tree-sitter-typescript/Manifest
@@ -1,3 +1,3 @@
 DIST tree-sitter-typescript-0.20.0.tar.gz 769336 BLAKE2B 12f5ac1f29963eda7a34d08832ca263cf91fd6a8335c998d9d1795851bd30d4a43ade36d004ffcb287c73b63e691582a79d640e24050df4f778fa308f5b0665e SHA512 99cbcabf58717eb17346b2139320f0d13846f1f335a81ed01fee6e748cd0d867218a9cc8d216162c3b9b9da86487024bedbced67e91adadab207633c25dc7e1a
 EBUILD tree-sitter-typescript-0.20.0.ebuild 361 BLAKE2B ef413e5a555ca0965e07abac101f18b6b8505bb8a85562187f395c97879ba24cb3e59e33e549b7df9a5861b93238fd80ee41c4a26b43488ac0b5ba5ccbba2c26 SHA512 a79de0d2ec96f2f4ebf3ccd503178e72a90125f45285dcdfe2bb733619d64c10245c773bd1bd6bed1a91cc0252cac1eea68477d656135d3bd3eb6a676b2eeeeb
-MISC metadata.xml 481 BLAKE2B 205158f5945a6fb55f069b82ba509e9f2c8598d1d8ba561e42dd3cc10719245207883ea3b455665f6887d65ea6de49dac3a3865bdfaab9fd85257f997fdc383b SHA512 7178040b718c6ff0645dd95ee58253417d283307e2bd91cc30499bd54c4f67122561dfd23734fdd99b387d1022db78c87b0f23b7dcd8b5d75af1549efa858fc5
+MISC metadata.xml 452 BLAKE2B 398c3e5901b36a7b49377e93dabce04d29f095eb6d0c5ddd5ebc29ad892121d2a4fce20bd4587737c7bc4f039aba0add3d01545993e0ae539ad9540d2832fbd9 SHA512 a9e3bee239e3abd86cd1bb00d318ef5e6529230b49ce0767e4b417e6abae0ee43637dbbacc27bce5e4f8f79d996aceea1ba0ed9afa1d3cc072f9bd502fcc0432
diff --git a/dev-libs/tree-sitter-typescript/metadata.xml b/dev-libs/tree-sitter-typescript/metadata.xml
index f486929bd436..09539cbda1da 100644
--- a/dev-libs/tree-sitter-typescript/metadata.xml
+++ b/dev-libs/tree-sitter-typescript/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
 		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 748b5eea0ea7..5f148434f7e9 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,115 +1,9 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
-DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
-DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
-DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
-DIST ascii-1.0.0.crate 31727 BLAKE2B 9733e1aa9d41e3b170ac07e63708e7be0f15f9eda73ba371cd239d9c46e881d1e46c2e80b5c5440bf1a1f0b8f6e66199241a455db9a3a535672881bca4e0d13a SHA512 5696e14883d4946c4acbace84ee4c65af527a6b1725a7d16ab5d5b8cc671ff211324f15f3fb0755cb1c9dcd598a054b32cd51c69ad06391e7e147880f5c97a1b
-DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
-DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST blake2b_simd-0.5.11.crate 34096 BLAKE2B 480fc200ce3fa3bb364ae05590fe26f59efb6f81fc2fcb7ae1593671677daa6f1b526d800099d002239e2ad435b919e9b32778021c0790954383079a49a90965 SHA512 4a7657db637869465637cb9a65cb82e7a119c554bd4d532aaf84f9cc77a494fda07d07db89c73e92e5bf4844bb1be53062fc61120e839e414e938e487e7f2257
-DIST bumpalo-3.6.1.crate 133836 BLAKE2B d67f19bd68e87c1c1360c77df2cd9b11e66f4db3ed5468463d266d2ce187006f2b2117f647a9c331838b8ce6c50519db2f9645fbce190ade2c10a0284b29fa06 SHA512 0d923bda2c98bae60d8ca09d63dc12b67c8fb5addd4a675e27b619bb41b36d3dfc0742696fb53e5fa538790814cf2401d15b110216daf49e5a2ce046bd540866
-DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
-DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
-DIST chunked_transfer-1.4.0.crate 9238 BLAKE2B b29737023c78041fa1166d56bb5fb7be2e502b06c56b0fe127c1ec2eaaf3ebdbf9bfdc8645d7234dc17703706529406072b90fb06a15df482b1065044d3dd4c4 SHA512 b3891bc1b101677c2ae6bbac19e74f5ad0aee7b499b0a339b78fa0af7150b2ae0b2151d640bd2a7c4d052a12cf935d16e04db3d37d0048ec1d79a9ff01f13389
-DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
-DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
-DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
-DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
-DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
-DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
-DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
-DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
-DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
-DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
-DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
-DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
-DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
-DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
-DIST html-escape-0.2.6.crate 29876 BLAKE2B 0ae67445ca39b0ac418a6faf269d6aa3bbb5a39f5a3c02df35cf20eb88c46cb7e8edadcd779eda8e274edc523715d6982c6af412aa955adcfe87888a45bfbf3b SHA512 42df48cb3e517adb7f0a907e8ecaf41fbf2bc17572454c16f0e343fc048a84eb77eb8db8a0f6492eda68b4b929bdd50c192b530325c9df59348b687abed7ea87
-DIST idna-0.2.2.crate 271070 BLAKE2B 3a07d53ea832d53a2e99ed3345d748b6299f6b4e6d4c33de17fd5ed70b9a46727272c9facf1bbb79e2981a4ad1953cabeb53d71cefcdc2a1e9e9f57c4a9f0d22 SHA512 71be89a626b087ca3a33576857799c15634263e2bbe43290750eaa6b074088cb6b54b3f778930e3dcc796a883daf662c0935178d4f096c751027bbe727124212
-DIST indexmap-1.6.1.crate 49644 BLAKE2B 605929e1b6b3473171fb2af7500d769783d7e3872244800c107664fdd7decb7603bd3657ba208d3022a931fc499bb2c2e6b8aed85f880d3ed1deb827dab70703 SHA512 a859cf4f2db46fe753aae0562ba6ea32dd529789a29784324e82b03f64f42a4f302789230ac298860513b1cd8cb238b7a150f6f865d342d606fcb7a2787f9a03
-DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
-DIST js-sys-0.3.48.crate 67010 BLAKE2B 8429e077997c953cd0fab9f40e3f02feb59b19e46e909bd25640c8e35c07f5c2bfcdff6387dd18ba797b94d691e94ff79942caba7471842a9d948d30600ca5aa SHA512 4ace82697ff6f4239c96c532a1f86a5ed74783fb19579eb266940c101c74ce434e7e1127a3d8d3a045bd37036998ccb5f4f01f201431f84f5c02d05104076f69
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.86.crate 522986 BLAKE2B 2643f7e71952c3c806ba02d3d9160963433115ce53fbb22189c6368813380a0403c7fb51ede36b4781ad0a609e02c57f2622062bdd536725a5c65a6f7aac5fd0 SHA512 b5a0c94b3717a620cb47b27d2f3bbfe04fce475c3e2feaab8bc4b14c8aaee190d47a61f0dabf26ed9e525e96e6aa611f4dd29b16e13b678898f88352d86c1b74
-DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28
-DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
-DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
-DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
-DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
-DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
-DIST once_cell-1.7.0.crate 28040 BLAKE2B 6b7be102447a7a23f7a8f3134794d35166e2210159c45781f43fb41d96d285979e40375fb2eea4507d9b9c0ee5b580c57ff24b5faef51808ec66fd8d7eb6c077 SHA512 b7ebfc328e02084191d145260cee671740d434a3af10f9fd8f6ac71d3b522f6e31bd320e095b1801f613398b3d128ecca825df785cae60c674cae94d1488bb5a
-DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
-DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
-DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
-DIST pretty_assertions-0.7.2.crate 79200 BLAKE2B b7736ce11bbc5d2a778c2525e80993858c5d2a7182123c3f5aa2cde6ffe5621ab8033a91d578f4fba9badc3f503a0f14873d234b41974161f8148f2b27510e12 SHA512 edf898bbb15f4f56d2d7688d90d44d0ee7913b7d78b4774548eb7a88e8f75b0de9635c93b107744a2501839202ecf828004d179c6edf84706ae160186d47d177
-DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
-DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
-DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
-DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
-DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
-DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
-DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
-DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
-DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
-DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
-DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rust-argon2-0.8.3.crate 28313 BLAKE2B 2d3468c7b5dc027fbbf6ceb264d77f4ae9b03526e0634c645ffd32a4c87532f5a84c224c6c39a15c9e267d268b187ec65210a2edf7df8294913e4958fbc83352 SHA512 f336dd3f90e1a49be107b641f9e9d513b6f8098dbdd1ab8aa2bd1fae329ce6840ad11a902b599922bef45d96ffb556d52b57d61218271bdccb7c85f9fe1da033
-DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
-DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
-DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
-DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
-DIST serde_json-1.0.63.crate 115110 BLAKE2B d62655c480702de6ebc772df9ed54e07cd1a0d19fa5d40c95547176ce073370f70f517ee43f63da55055ce15f143be25b4dbb75b67bbf05abe1b0edd1bed7499 SHA512 7de96ee7ac3d7668394cd338efab73550545b8652e0ab412e558470deb8f7cdb85c9de7559cb43f3c79063f80e98c91a8a831d39faa4b0e6393aa0c9cc90d29f
-DIST smallbitvec-2.5.1.crate 14761 BLAKE2B 8a18f8a0a13fdd90ec7d651e7243e4cb382b860480ac079cc1db0235ce12f01f4b415453538f829960e6581116ce8b940ff72531abd334d71552d68a61edc519 SHA512 348e30ef6982b6d50a398db9f19ccb9a14e5ce239dd33771366575c332396df91a2f6384e9afa13538daad5c726170518b19b367c97d9bd9f46b120b88e4ae47
-DIST spin-0.7.1.crate 21944 BLAKE2B cf272cd5a36718f67d2cb5ee7ba74ac84a54a09263a69c7a26b9297dc346b3f5686c42941378e3c0e191f3cae221210ddd59978333862a305464221a3d016adb SHA512 be7d79ef6182138407697d4de0c8696bfa35b0ccc8b1e6232eb2e3904282f5818008bb2a23b5544979f1b300643877cedd79179c3d91c5954423c2fdcfd0af07
-DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-1.0.67.crate 231889 BLAKE2B 28807964411994b126e132c42b1361d55788a641da24773d1f1006373d3c21048f78553682441766b7257e5b4a4a1833954075fd2c4965f949d8465ee57a3ca7 SHA512 06a5f203c7e4c6f6bed489bea7e171cc8f29020401eb32405373a838526c6a5bed47e1310f41636d475358c420b82837bc7c1f90374fa6d0e842dd0224de3552
-DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
-DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thiserror-1.0.25.crate 16690 BLAKE2B a03107d70186d46870050ef86cb1f49aa99d91e509bd9ab22ee6cbac28d37176b2bafbadedc237a25d233abf7816cb3d85d88c140f172ede40d309ddaa1223dc SHA512 f408c2722060c6f707b9afcc1d9f3cb175bcf955263c4e643ef7ee935fd68299af835f4ad489ace814a7bcad6dc428eec5df2858453834d0b6154d22a38ba1da
-DIST thiserror-impl-1.0.25.crate 13364 BLAKE2B 9b0eb7a6fd5f290d7a666de6065edc210ab9ef35960c424258d5039f24433baef7d1228ac2e962e8ef9dcb673979c9d3c09ef3f3d20533fe2ad1500bfcb20015 SHA512 a2d2f39d3c1e5a722d7020672f63fc312dd9f8ed73863971814f1fd12faac4ea5d8546e06b26838d8224b1f91161011f51dda476848b2555153203ee9f7ee3ca
-DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
-DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
-DIST tiny_http-0.8.0.crate 41711 BLAKE2B 2b0a1e4cff50e201ac1583b9538c407312808275517c81b0227731840cf9c9cbfe3a387a420976191480e38a7826377dbba54d55222cb6adf07f1e86b55bcb91 SHA512 f130905d537579afb401644b32da8a1d0bac0902a16c48039fb45935371ad75ed3a687ab0362d926922bf80a07a2df13193e285c2dd34a1aca4fecb37952058e
-DIST tinyvec-1.1.1.crate 39896 BLAKE2B 7655703bb7c3eda6a4bfb78c46cd10d5bd195ccc9aae9b8eab78c1584c904a6ac1a75511952b7f63eb953590b0b3a3c436296c13b6dabba11d279931ca769442 SHA512 de8de26bdb39d4b2255099b85c116a95b7f563f27549816d360a7cf68f04d3940745236aea4c73eeb86ed5427ae5f65d8936f0d60dae9b16076827134d77281e
-DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST tree-sitter-0.20.0.tar.gz 2876764 BLAKE2B 058f62c2067ce5fcf9440f281c63908f93fda09a6b3604d7196b9c56a15ba88ded7d75f9c21b4c5c4209f587fb5f326ae655cb5f5d84b46bfd783b2147048568 SHA512 a51fa0af45a6a99bb74ff53c15a4d7939eb24c6720e65ec7a96f74ffbce54801f14539e071ec6a4891dae778d7dea5edcecc6dd57716cc70a891c9e6cfa55013
-DIST tree-sitter-0.20.1.tar.gz 2903038 BLAKE2B 092b3110ca2dd2dc2f6298dad98c2400064ba7b7bce90cdf7c50bdfabf0bf52629f5315728b578ae46efc1a4c2f71ff024ffae202205a3b563188e3537565359 SHA512 172e9b2fba5d4610f663934dff1cf4580d09631a3d8d5d7249b6a80288aa9fdda9f5eac50a501935a87414563b46f843c3d98a1f7e45302a5c61dd3c08159606
 DIST tree-sitter-0.20.2.tar.gz 2904490 BLAKE2B cae19e3a66778ea72bf5cb0e5153bb6b7dfec0b059c01825377742886fadd52d789f456e82287d71841afad8bd5347361d5ef718b12e20e94c629480c43f4f33 SHA512 4b9a7da47b48b0003daf9af60f9d48aacf7c74d1c9e2645eafd74f62f568bc69e2fb36bb8f0c6b9f1dc85829e146786cc6bf7050ed1402167790b1552990665f
-DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
-DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
-DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
-DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
-DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e708bb8a67144f6c12e3781d07fae68166990bebaae60190a1a88dfa1d087d4982ed04d8cdfa59ae4a0d7e SHA512 f2065e68dd917cc174c222a44127ac10a59d25a87ccce6b88ac1e1e775856fd7d5931d728296db355117f94e71e12404fdd68a283545b543a2e00a659a6997ed
-DIST utf8-width-0.1.4.crate 2995 BLAKE2B a314ab41d6544aa024a1a8dd4c52f5fddbf53a3847256329ddd779d1a6af7391fb156a33d39551416dffcf8a17bad5709cd5a97e0177ce21ba511291a87901eb SHA512 4777d0f4c971c33eedd808c110e48fdedc92336c17292e6df0704637c8d63905e1b0b6825fe958eef8e4e98327aac7126897b8681b80fb22c916b3a352ae0660
-DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
-DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
-DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST wasm-bindgen-0.2.71.crate 159260 BLAKE2B 9b58bce9adf9f9d0aad7f36558125acdf474c5dab2d049f7535d91f94fe7fe2e1c3d7dba7fed9880a621c923bbb351598afabd8db5705d1d87a389987aa9e9bd SHA512 a1e20ad8f239ae6180bdefb0d48914c4b3bd3c8830e110a9037c001dee2d6345d0a8525ec68f9107029a989e659278011f8ab4a13c32bdf36b82a6429c75c639
-DIST wasm-bindgen-backend-0.2.71.crate 25432 BLAKE2B 939d5791d320b0a46781fb2e660b271cce17b1876ed1ac2efb0533cdfa7fb24b5a2b9a28451ba03d87cea0195f2aa7a864dfeb52e9d5e3518453cdcc5c06eeb0 SHA512 40e1c7e63c51ef149065f3c35ce0e735f4a221e3de3e5f0004f9e597ed29812bba690cb069314d97c3843474aa611ebc05664be4f97dfbf5d240515e3a3463cc
-DIST wasm-bindgen-macro-0.2.71.crate 11548 BLAKE2B 61f29f066c91ea85274c3155f07c4c2087297515c93037d9ea791c0d2bd9b0b2287721b7937b2edb1c61bb270caa57ce8a282c29c9cef64c2d753ca171aefba8 SHA512 7f5086af3e43f37d46e2a1f18a44f2af69e8483f6cbcce85dd9b84a3ee6ec4323e2904974b55987dd026073466a21241d13207664ec4771a1fcc9db3e55ad7d0
-DIST wasm-bindgen-macro-support-0.2.71.crate 17855 BLAKE2B 5f24ff07d1bdc58e2becba42506a347432b369932df9cac68ddb3536fc5331a38f6b0b501866d6a44077f4094a5b3cc11af607e7c9eb1f92ba30460b5329b514 SHA512 eae16c62999d0cd66fd64b1dcbb90a5b572bcec6ac3f2c2f06ce8a499dd282cd13e3535bffd0fdddac65bf33bc4338422c805e7f2989c5336a3dccd6a2e69609
-DIST wasm-bindgen-shared-0.2.71.crate 6693 BLAKE2B 4b494abcd8c548d635ed953eef9dc8d2972355c63ccca991fc3f740f3dfbd4d26a4c1ebb9e45fc740489055299fa48b72965600906a804186cf0bf6c562e062e SHA512 458b140966f52be47a0f4c68cfa1b46cb39a4fd6742bbe34c892255b42e7605f2ec3cc9cb9d31e3c1000eb5048a8dbb608e42261e30e90308a9db33b14385d40
-DIST web-sys-0.3.48.crate 648255 BLAKE2B 15d4530f6d2fb61431e4949d2dcc4ab2386df2d86a22004f6c78f33646314a634c92f582fd56e8bb038ee3f6af6fbe7fc4491c9ae0329bffcf249e9d230bfd52 SHA512 3b0a6227cbfcd2829bd2d44f1bc5d600fb05ed28222babd23b41308e3e79350b8724efc8716a060ecb70b4100613a41aaca0b6080a2f23b223c453ec60a7174a
-DIST webbrowser-0.5.5.crate 11194 BLAKE2B de9e7afab8606cecf9c39d84c743ef7e78a81d85e189c145a4e3235350392a55c2713fd8798e10a2ca133011f893df0475df3451096648ef5d13c958f33b6c3f SHA512 1a8332b3c5cb9114530beb83b15219d6dcf2aef628fa6f4a6b45f1b8eb3c38ad07ef933f3de21159c3df523fb904630f32ffcc14d75b209fd5e48d8e20e4ee94
-DIST which-4.1.0.crate 7684 BLAKE2B 4d8eb0a263c14b506f446fa808d9326c6e4e781cc2d79a1f6efcf7b9bb9a294d3266a2f3de4526ac0ec08ca65a18622ac064e9ae1e86dd1b325b122f684371f8 SHA512 4fffd3dd4ac73f5c232ee8a53bbc948a7295a2a51ec3f792d5d0aa84ceb6c2322fc11b35d29f5d3181c763b34c434c5ea2807ae6cc3393cd30d68b0fd44c7a22
-DIST widestring-0.4.3.crate 26215 BLAKE2B 7e5cdbb58a23004bb76cc12d451fd891ef08c05f730b059eb62a0f5e9482dde58c4059f9c0892fb1ebebbc8ee85dd20ece3ebf12c48790dca5eaeeb20b81dc34 SHA512 48561bd8a3b589f2a0328d1286177fbc6c5bc534756898912cbaab81d742b64ef898eed75073484d5e30762ceda9d2e88710074e7e9ce1a7dd43b5d871de3860
-DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
-DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
-DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST tree-sitter-0.20.6.tar.gz 2924556 BLAKE2B 17348717441497ea7fc91419a0e8796d077b9acda2b584e9c3e1ac4a7a3f1fa3f84d5b749f21144d0593aaa7bf2e7ff9665539e91c6e81cda4359850e0fcdb14 SHA512 f0fb1e0073867c2a6e69b230e07e5eec32a2b30d3c711ec188526e287d6a1ef06de266d476482f900ec7c9ff6c11909899fd35a802e96f0befc6e99815502377
 EBUILD tree-sitter-0.20.0.ebuild 781 BLAKE2B f37906ce4b8b84343fbf56d0323c0fb5e722ea7e8e9810c4b16c222bdeef9cf6cf6855e0fea8e161e5ea38a25c74a795a255779713e2419fd163e439adf20d96 SHA512 5b3280ad08766687a4288450fbf56b80bf56fd9cbf98e9d4f4a450cb373be75027df22c723cceafe17cd25c410b635f9e7a17d98fa13b29b4f6ce89b1beee7f3
-EBUILD tree-sitter-0.20.1-r1.ebuild 3266 BLAKE2B cc538897e8653277e19be6e35d5524ccf77dab19744a4861b432a9eaed9f50df56058db1a042263fae2faa3fe74af008e05d8c62f526c9799c7a686aaecc1320 SHA512 1a1f97fc77088d4aeed3540a50903a9552dd44aa2cb3da59c2ba8412285362661e6e9dcc3cd0810cc577c635efe6e031dd5dddb6847c327739768798bda3b1b7
-EBUILD tree-sitter-0.20.2.ebuild 3265 BLAKE2B dfad128235048ce8df41c10458160ef92a78f8c3a1c9ef4e2f928c194c0a230e3e33a543c3378bb704626b3f23012f67293c84a15010efad8c4bf22b149600a2 SHA512 b06a292162c3a2c40795d1e7ea83cf07fa58da7033ce9c54dad0c656fe5154f3c67849a686414c532911f1a5c64a58bee4f8b23806465113113a250afddbb28a
-EBUILD tree-sitter-9999.ebuild 1324 BLAKE2B 8e5eab460a867a3cd5b8db5c23d7d318bda3f24b8f033932d7bd64c7be06f6b9fcbd89ab58b8fe86aed039431d6d8572e70f5ea6110b0936fb943bfc58d4b087 SHA512 fab00e3f6fdd9e325739a09fafd8a4d22522a9c1a43c7b62f7776ab6f1ccea50d2a83c2f69dfa103a26a345af094d93fdeea36b68d8087c4f30f9173a08cd7eb
-MISC metadata.xml 948 BLAKE2B 6dc828ba11cefbf079df9a114e72d95bbf94b3443ef4f7a19362d7c07a16ee2fedef464e2fc7ca90e1f214959c90e8425628af037f29b12d5a2d1deec5819f5c SHA512 fee67486332a2e4c7eeed0f44046d5fbb595e77e44c0e578c2e115f8141b22af85da01ebf412454f02097433e8a6ce3bc01be136baa372b7bf54db9e2d1f3789
+EBUILD tree-sitter-0.20.2-r1.ebuild 907 BLAKE2B 73a75d277595a6d473aac238af11581bff7287278cf6bd9f4606f962168a76e747cf34e679e42fc0d3f23277be9d6d4d363f6a8b271317de9704e9798da6e548 SHA512 254e134fa31466f70e430457ff595e172e37b8f6c541eb4e1e7743b4ad97d639d5e1fc75bdf8cd6f4c769e191582849f22d5283626ba40f781385d76e9a68433
+EBUILD tree-sitter-0.20.6.ebuild 915 BLAKE2B 87ebda160b473b0432383faf18710f794ba17b0d5fcc0309fe9118eee1b9a52f0c45bd5efdfc3ac85bee4808f9bdd236c901830f6ad32d7b3e7290ae39f6d874 SHA512 7836b2b5e6a026adba5703239ea89ce1ab26214d0d13d3f0e2e0fab457668dd235bc245d9ca394090022b69dca1fc26f880491e39d9dd25866afef6520263b5e
+EBUILD tree-sitter-9999.ebuild 915 BLAKE2B 87ebda160b473b0432383faf18710f794ba17b0d5fcc0309fe9118eee1b9a52f0c45bd5efdfc3ac85bee4808f9bdd236c901830f6ad32d7b3e7290ae39f6d874 SHA512 7836b2b5e6a026adba5703239ea89ce1ab26214d0d13d3f0e2e0fab457668dd235bc245d9ca394090022b69dca1fc26f880491e39d9dd25866afef6520263b5e
+MISC metadata.xml 927 BLAKE2B 1b94b1e0f323461151d82920b4185cdee4aff41ff751f170d893b80f62423545adfd5efd8cc920c933f599089fbd72423ffdb4e43dc51f975bbc4eebe601abd1 SHA512 88e936a507fbd1154c1c167f6fc343ded2e3e6d2c073d2efce9a2e1c98ac1877e5c1197a903a597b403b444189cf2e4b519c4cf144a8eb1ad050c0a8b07ae101
diff --git a/dev-libs/tree-sitter/metadata.xml b/dev-libs/tree-sitter/metadata.xml
index 6c52f76c3daa..3ea27f3896b1 100644
--- a/dev-libs/tree-sitter/metadata.xml
+++ b/dev-libs/tree-sitter/metadata.xml
@@ -13,13 +13,14 @@
 		<email>mva@gentoo.org</email>
 		<name>Vadim Misbakh-Soloviov</name>
 	</maintainer>
-	<use>
-		<flag name="ts-cli">Build Tree-sitter CLI tool (for developing, testing, and using Tree-sitter parsers)</flag>
-	</use>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
+		<name>Matthew Smith</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tree-sitter/tree-sitter</remote-id>
 	</upstream>
 	<longdescription>
-		Tree-sitter is a parser generator tool and an incremental parsing library. It can build a concrete syntax tree for a source file and efficiently update the syntax tree as the source file is edited. 
+		Tree-sitter is a parser generator tool and an incremental parsing library. It can build a concrete syntax tree for a source file and efficiently update the syntax tree as the source file is edited.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.1-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.1-r1.ebuild
deleted file mode 100644
index e439a8fa3c4e..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.20.1-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=1
-
-CRATES="
-	aho-corasick-0.7.15
-	ansi_term-0.11.0
-	ansi_term-0.12.1
-	anyhow-1.0.40
-	arrayref-0.3.6
-	arrayvec-0.5.2
-	ascii-1.0.0
-	atty-0.2.14
-	autocfg-1.0.1
-	base64-0.13.0
-	bitflags-1.2.1
-	blake2b_simd-0.5.11
-	bumpalo-3.6.1
-	cc-1.0.67
-	cfg-if-1.0.0
-	chrono-0.4.19
-	chunked_transfer-1.4.0
-	clap-2.33.3
-	constant_time_eq-0.1.5
-	crossbeam-utils-0.8.3
-	ctor-0.1.20
-	diff-0.1.12
-	difference-2.0.0
-	dirs-3.0.1
-	dirs-sys-0.3.5
-	either-1.6.1
-	form_urlencoded-1.0.1
-	getrandom-0.1.16
-	getrandom-0.2.2
-	glob-0.3.0
-	hashbrown-0.9.1
-	hermit-abi-0.1.18
-	html-escape-0.2.6
-	idna-0.2.2
-	indexmap-1.6.1
-	itoa-0.4.7
-	js-sys-0.3.48
-	lazy_static-1.4.0
-	libc-0.2.86
-	libloading-0.7.0
-	log-0.4.14
-	matches-0.1.8
-	memchr-2.3.4
-	num-integer-0.1.44
-	num-traits-0.2.14
-	once_cell-1.7.0
-	output_vt100-0.1.2
-	percent-encoding-2.1.0
-	ppv-lite86-0.2.10
-	pretty_assertions-0.7.2
-	proc-macro2-1.0.24
-	quote-1.0.9
-	rand-0.8.3
-	rand_chacha-0.3.0
-	rand_core-0.6.2
-	rand_hc-0.3.0
-	redox_syscall-0.1.57
-	redox_syscall-0.2.5
-	redox_users-0.3.5
-	regex-1.4.3
-	regex-syntax-0.6.22
-	remove_dir_all-0.5.3
-	rust-argon2-0.8.3
-	rustc-hash-1.1.0
-	ryu-1.0.5
-	same-file-1.0.6
-	serde-1.0.130
-	serde_derive-1.0.130
-	serde_json-1.0.63
-	smallbitvec-2.5.1
-	spin-0.7.1
-	strsim-0.8.0
-	syn-1.0.67
-	tempfile-3.2.0
-	textwrap-0.11.0
-	thiserror-1.0.25
-	thiserror-impl-1.0.25
-	thread_local-1.1.3
-	time-0.1.43
-	tiny_http-0.8.0
-	tinyvec-1.1.1
-	tinyvec_macros-0.1.0
-	toml-0.5.8
-	unicode-bidi-0.3.4
-	unicode-normalization-0.1.17
-	unicode-width-0.1.8
-	unicode-xid-0.2.1
-	url-2.2.1
-	utf8-width-0.1.4
-	vec_map-0.8.2
-	walkdir-2.3.1
-	wasi-0.9.0+wasi-snapshot-preview1
-	wasi-0.10.2+wasi-snapshot-preview1
-	wasm-bindgen-0.2.71
-	wasm-bindgen-backend-0.2.71
-	wasm-bindgen-macro-0.2.71
-	wasm-bindgen-macro-support-0.2.71
-	wasm-bindgen-shared-0.2.71
-	web-sys-0.3.48
-	webbrowser-0.5.5
-	which-4.1.0
-	widestring-0.4.3
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit toolchain-funcs cargo
-
-DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="
-		https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		ts-cli? ( $(cargo_crate_uris) )
-	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="MIT ts-cli? ( Apache-2.0 BSD-2 CC0-1.0 ISC MIT )"
-SLOT="0"
-
-IUSE="ts-cli"
-
-BDEPEND="ts-cli? ( virtual/rust )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-		use ts-cli && cargo_live_src_unpack
-	else
-		# behaves as default too, so it is ok to call it unconditonally
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_configure() {
-	default
-	use ts-cli && cargo_src_configure
-}
-
-src_compile() {
-	default
-	use ts-cli && cargo_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use ts-cli && cargo_src_install --path "./cli"
-}
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.2-r1.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.2-r1.ebuild
new file mode 100644
index 000000000000..0ae7232aab0d
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" )
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		  PREFIX="${EPREFIX}/usr" \
+		  LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		  install
+}
+
+pkg_postinst() {
+	optfeature "building and testing grammars" dev-util/tree-sitter-cli
+}
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.2.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.2.ebuild
deleted file mode 100644
index f85c79757058..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.20.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=1
-
-CRATES="
-	aho-corasick-0.7.15
-	ansi_term-0.11.0
-	ansi_term-0.12.1
-	anyhow-1.0.40
-	arrayref-0.3.6
-	arrayvec-0.5.2
-	ascii-1.0.0
-	atty-0.2.14
-	autocfg-1.0.1
-	base64-0.13.0
-	bitflags-1.2.1
-	blake2b_simd-0.5.11
-	bumpalo-3.6.1
-	cc-1.0.67
-	cfg-if-1.0.0
-	chrono-0.4.19
-	chunked_transfer-1.4.0
-	clap-2.33.3
-	constant_time_eq-0.1.5
-	crossbeam-utils-0.8.3
-	ctor-0.1.20
-	diff-0.1.12
-	difference-2.0.0
-	dirs-3.0.1
-	dirs-sys-0.3.5
-	either-1.6.1
-	form_urlencoded-1.0.1
-	getrandom-0.1.16
-	getrandom-0.2.2
-	glob-0.3.0
-	hashbrown-0.9.1
-	hermit-abi-0.1.18
-	html-escape-0.2.6
-	idna-0.2.2
-	indexmap-1.6.1
-	itoa-0.4.7
-	js-sys-0.3.48
-	lazy_static-1.4.0
-	libc-0.2.86
-	libloading-0.7.0
-	log-0.4.14
-	matches-0.1.8
-	memchr-2.3.4
-	num-integer-0.1.44
-	num-traits-0.2.14
-	once_cell-1.7.0
-	output_vt100-0.1.2
-	percent-encoding-2.1.0
-	ppv-lite86-0.2.10
-	pretty_assertions-0.7.2
-	proc-macro2-1.0.24
-	quote-1.0.9
-	rand-0.8.3
-	rand_chacha-0.3.0
-	rand_core-0.6.2
-	rand_hc-0.3.0
-	redox_syscall-0.1.57
-	redox_syscall-0.2.5
-	redox_users-0.3.5
-	regex-1.4.3
-	regex-syntax-0.6.22
-	remove_dir_all-0.5.3
-	rust-argon2-0.8.3
-	rustc-hash-1.1.0
-	ryu-1.0.5
-	same-file-1.0.6
-	serde-1.0.130
-	serde_derive-1.0.130
-	serde_json-1.0.63
-	smallbitvec-2.5.1
-	strsim-0.8.0
-	syn-1.0.67
-	tempfile-3.2.0
-	textwrap-0.11.0
-	thiserror-1.0.25
-	thiserror-impl-1.0.25
-	thread_local-1.1.3
-	time-0.1.43
-	tiny_http-0.8.0
-	tinyvec-1.1.1
-	tinyvec_macros-0.1.0
-	toml-0.5.8
-	unicode-bidi-0.3.4
-	unicode-normalization-0.1.17
-	unicode-width-0.1.8
-	unicode-xid-0.2.1
-	url-2.2.1
-	utf8-width-0.1.4
-	vec_map-0.8.2
-	walkdir-2.3.1
-	wasi-0.9.0+wasi-snapshot-preview1
-	wasi-0.10.2+wasi-snapshot-preview1
-	wasm-bindgen-0.2.71
-	wasm-bindgen-backend-0.2.71
-	wasm-bindgen-macro-0.2.71
-	wasm-bindgen-macro-support-0.2.71
-	wasm-bindgen-shared-0.2.71
-	web-sys-0.3.48
-	webbrowser-0.5.5
-	which-4.1.0
-	widestring-0.4.3
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit toolchain-funcs cargo
-
-DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="
-		https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		ts-cli? ( $(cargo_crate_uris) )
-	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="MIT ts-cli? ( Apache-2.0 BSD-2 CC0-1.0 ISC MIT )"
-SLOT="0"
-
-IUSE="ts-cli"
-
-BDEPEND="ts-cli? ( virtual/rust )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-		use ts-cli && cargo_live_src_unpack
-	else
-		# behaves as default too, so it is ok to call it unconditonally
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_configure() {
-	default
-	use ts-cli && cargo_src_configure
-}
-
-src_compile() {
-	default
-	use ts-cli && cargo_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use ts-cli && cargo_src_install --path "./cli"
-}
diff --git a/dev-libs/tree-sitter/tree-sitter-0.20.6.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.6.ebuild
new file mode 100644
index 000000000000..9800235d12bc
--- /dev/null
+++ b/dev-libs/tree-sitter/tree-sitter-0.20.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
+HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" )
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		  PREFIX="${EPREFIX}/usr" \
+		  LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		  install
+}
+
+pkg_postinst() {
+	optfeature "building and testing grammars" dev-util/tree-sitter-cli
+}
diff --git a/dev-libs/tree-sitter/tree-sitter-9999.ebuild b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
index 74713d7aef17..9800235d12bc 100644
--- a/dev-libs/tree-sitter/tree-sitter-9999.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-9999.ebuild
@@ -1,11 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-
-CARGO_OPTIONAL=1
-
-inherit toolchain-funcs cargo
+inherit optfeature toolchain-funcs
 
 DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library"
 HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
@@ -14,50 +11,27 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
-	SRC_URI="
-		https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		ts-cli? ( $(cargo_crate_uris) )
-	"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-LICENSE="MIT ts-cli? ( Apache-2.0 BSD-2 CC0-1.0 ISC MIT )"
+LICENSE="MIT"
 SLOT="0"
 
-IUSE="ts-cli"
-
-BDEPEND="ts-cli? ( virtual/rust )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-r3_src_unpack
-		use ts-cli && cargo_live_src_unpack
-	else
-		# behaves as default too, so it is ok to call it unconditonally
-		cargo_src_unpack
-	fi
-}
+PATCHES=( "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" )
 
 src_prepare() {
 	default
 	tc-export CC
 }
 
-src_configure() {
-	default
-	use ts-cli && cargo_src_configure
-}
-
-src_compile() {
-	default
-	use ts-cli && cargo_src_compile
+src_install() {
+	emake DESTDIR="${D}" \
+		  PREFIX="${EPREFIX}/usr" \
+		  LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		  install
 }
 
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	use ts-cli && cargo_src_install --path "./cli"
+pkg_postinst() {
+	optfeature "building and testing grammars" dev-util/tree-sitter-cli
 }
diff --git a/dev-libs/urdfdom/Manifest b/dev-libs/urdfdom/Manifest
index dc9ec92b2e17..1cc0d90150a5 100644
--- a/dev-libs/urdfdom/Manifest
+++ b/dev-libs/urdfdom/Manifest
@@ -1,7 +1,7 @@
 AUX cb.patch 768 BLAKE2B d777c9c55e81019c496c4dffbe2b113d4e0586b713fd2f6c630616a5d9e3f5c83bc23f6dcfd9bc034c78a635a92a085afc9a3f51079805c30fd2d31f8f3c59b9 SHA512 fed91e83af1c3f5c3de9e51ce7134e6c9f94a262817cf14034b390c6527cece0b867e4742a0754debfdf358c0816c9443fc0b84d9cffa531094f33861bb1155a
 DIST urdfdom-1.0.4.tar.gz 276958 BLAKE2B 19353c38d8fa8f1d6d752302bc8b7b84b13cc6c6f83af31dba677184fa09fd42d7de0c00e6927f085c3d013d2bde664dd7ea69d3c69de4c14130c08d256e6f87 SHA512 2a7a0ec61445132b3e8f6ba8b2268b9fd7c035a72b3e4d61b5ed665d07e902a02b87d2c60c53fc9b0c385a871cd8d87f278bd4833f1f904635ec46755a544003
-DIST urdfdom-3.0.0.tar.gz 285706 BLAKE2B ef9cc251c67f20458c9038a738dd8b7a91d49b0180bbffe9cd12e793f12f4f1f10b5322a82f94bc36a5a46db7e015b157c84cda73535b7a60417f2f4bb389fe5 SHA512 1fa3372d5beed6b119444ef99d50991a417d42bc7a3152e4697dc26e1bd1e351d45edd4c56f9dfff6f2c8480b3f43c6dfe246d22890db0f676d68591a5c0aaf6
+DIST urdfdom-3.0.1.tar.gz 285714 BLAKE2B 1f27225dce2e715b421ad8290326f879c3c564146bb097f46d9602ab22a41d4f669df8a271db2eb700f23e75e6e1ffd98bfc06bf82b79fe0bc8ceda87e46f49c SHA512 f632aa3095f2ee27328ca1eaae2e10d1e69f540d1ae0a97337162ee57af0ba9be08c0a7456eb86cf949f849d1e4b727f0a8890ce9b5ee2e7fdac92b3aa0c4120
 EBUILD urdfdom-1.0.4-r1.ebuild 820 BLAKE2B fde755690e23f29d8513686cc252d9f711a7fcdceaa4c03865a44755897760170507dbced212ef38b163236a98850de0d69a73202d81fb3aceb3775022bfb65f SHA512 40b2bef45084b976a4913ffa9062ba8d46d9a4682fd39bdef786a20e599ec0719620a072f346d42e2b50605f3e94a6a8edf3b853b6ec8868c7ed2f42a15cc1d7
-EBUILD urdfdom-3.0.0.ebuild 652 BLAKE2B 8a3f4504a6f828948229d6d491fb4d5c179dd91c1bcaf7aa28df252d7bd4c7e1913ab20f5a139d022b4716a64b3bbbbca8d42cc5dd77754a088b1888fc708a2c SHA512 21b7ab7921a539b648a13d05f570f3bba4d8cef5b66ab07cffb54b04b7007dfd720b480e16aa09b1878998cba70dc83fc1a5b84aac1fcb0b9f43c32cb6929ca9
+EBUILD urdfdom-3.0.1.ebuild 652 BLAKE2B c47463d4cdfb01acd8b29f9f6cd36db1ae35c3a1948c9bd6df94f47840cbaed793653762f87a2ac643508b0c184170dc8ea33343e5f98b795053b93bc189ffc0 SHA512 9faaa5828d54e9786f470e622eb9a775f4ae05e63dccfbc5aa0a58cca92d0aad9d3c869d9190cd128607a1d4ee514d7cf00f0c90384a7d2a1a667b1eb888bce9
 EBUILD urdfdom-9999.ebuild 652 BLAKE2B 8a3f4504a6f828948229d6d491fb4d5c179dd91c1bcaf7aa28df252d7bd4c7e1913ab20f5a139d022b4716a64b3bbbbca8d42cc5dd77754a088b1888fc708a2c SHA512 21b7ab7921a539b648a13d05f570f3bba4d8cef5b66ab07cffb54b04b7007dfd720b480e16aa09b1878998cba70dc83fc1a5b84aac1fcb0b9f43c32cb6929ca9
 MISC metadata.xml 336 BLAKE2B f58bcfbda7136818c016ed571b04cb23d3f78072eee420280d354e3e24d752014ff884e064d4e5b402a60de04c802f818dba1e83fede7345ec44234bc72986b2 SHA512 8a12a7b50521d4b7d8675bc33fc94852152560c3dbfa6c0b52a0eed36cd1c9b926dcabfc1e0c33d84e9de69d333e2b306780ffac7abb563cd1dd81a60222599d
diff --git a/dev-libs/urdfdom/urdfdom-3.0.0.ebuild b/dev-libs/urdfdom/urdfdom-3.0.1.ebuild
index 37c71100352c..e21e9883c072 100644
--- a/dev-libs/urdfdom/urdfdom-3.0.0.ebuild
+++ b/dev-libs/urdfdom/urdfdom-3.0.1.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
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 6f8eada954ff..21a7256c66f1 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,11 +1,7 @@
 DIST ftest-20211106174116.tar.gz 3232 BLAKE2B 9a2184e82a19465333600b7c31de9a51e6716a4099f23145d93c967636da6539a0e71bfdd082507bf19a440df1199a1abf6f528b3957391f8b2a5c3e4dfb26ec SHA512 d92d3a3abd4f7b35971bfe7d74e1b822931818f60149a56ad29dd3238300ad71de1989fedc602a44a9c1a253da7bce758adf8d5b6da63ca6f322fb06dcefc98a
-DIST utfcpp-3.1.1.tar.gz 26374 BLAKE2B 93ad55c113c922e0105b509adf8dc1505e625bfeed0c60dabe7243ec288e3dd13b79b9382af2fff6daf780c5ebf9da32a492263d4998204222c1e446d16f4473 SHA512 720e2eba5c04f0bc4903a287138149a9cd432bc68bb163fe36b2e0d26d8bf616b4665f389b4a9c97af6ae7869e78973d97db976a4745512a241eebf774608997
 DIST utfcpp-3.1.2.tar.gz 26388 BLAKE2B f0ebf7f054c488259d2a409b2c5201b73e928901cf337cdc2a99a2f64deaf431ee60328b3b61e134d3cd49428eb0c921057ea248269029ef2838ed72dd8af7d7 SHA512 d43df19d9e8652291f1301a326ec0d592bad43d6ecf9086947037f0ae0c1e70c2d96082c48066639e2b7c57c0ea0e4782d6b215d017cf96a4c73ff3a15feec75
-DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9 SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
 DIST utfcpp-3.2.1.tar.gz 27377 BLAKE2B 27c4becfa7e1f5e8b63ee0e03b9f66cf5d6743cff3706222dde6e21c3feb51897eddd7dcaeaaacc66513fdb209d5be392e83ba22ab7a7d848bdf9721577d6444 SHA512 5798487f12b1bc55d3e06aed38f7604271ca3402963efcf85d181fd590d8a088d21e961e77698e60dc2cdae8cf4506645903442c45fd328201752d9589180e0d
-EBUILD utfcpp-3.1.1.ebuild 935 BLAKE2B 7baf8b90a10408faea6792eede2b0ec01ed88b7408141c769e0bf3a1ccd397298656a398cc6be46dfe4ebc949ec0260aad01f719a6596f53dc5a7ee323a79ed1 SHA512 9ad08d27cc85de20535298dc2429fa3f7937834170e2260fb444bd387540b023d7b932a86157393f25afe9e1c169cde57ff0cfc914a813a5507d04ab7ad6e72e
 EBUILD utfcpp-3.1.2.ebuild 934 BLAKE2B 799839e521d6c2c881b937c610cc7016907325d5ded407fbd452fda66ec1be1365fa696856b3fa8d18c11a822807c25f8f5c509bb023788b6d471afad856c0ce SHA512 a0b28f7086b5b2e3b4fc8b6cb4f0336a3697eaa9b77c9f711ae5e090561f2b7c62306c2abaea62f2424441fd0ffce5f3c8810878f25b579df8add3e300d441a8
-EBUILD utfcpp-3.1.ebuild 929 BLAKE2B 98b8653c0a5a8dfccbe50f191c8505fa38d5f707c1c229d6b65e6a793a270b6914f6849e0a3a56b12539a57ff88a65b35deec68ff224ff8cf28d3d1561ab9dd4 SHA512 b126f8b1ec192eda63d84dd44023c5c18a9772becb08f9b611cffb72938023212c65b2cda98e6009274983138a90fe8fa8e11759b8d30f2f440354862379e54c
-EBUILD utfcpp-3.2.1.ebuild 1364 BLAKE2B 1f76d53808d8578de1b735659ca8c79001ed4cba1ce626ddeb51ae74310066e33491f0fb9e700dd0bd65cecb817caa6ce1e26ac60b31536df15d19cec68c2742 SHA512 7bdf80c5da8bd190c8407a343621e061e479d4ba18e88d68767c45948a6abe82305e56145dc31da551ac0bb62285ed6f208a9de628ce5a95548791c3cb2a068a
+EBUILD utfcpp-3.2.1.ebuild 1371 BLAKE2B 429e8787a84bed10fedc25a4c3be1db6338fff90c42073aee1523cb39db3b46c740386d328879eb0dc6b4ed9394fd4c824b3a52a4c0a83cd62c4dcf1d6c32d18 SHA512 a2bdf8718f1d93ba590b477054046b335dd1b2072266821c0cf92f9598290abfe84b923e7dfc87953d0abd16f55dd158ab85b0a134be025523d6fd7c2f023211
 EBUILD utfcpp-9999.ebuild 1268 BLAKE2B 991a901db757f36b9ebc115a45b585ec3e0eca396820a3456106fd3c3872c22060f6821a5c3f6d35b7fed3f28bd8792df01ea2547e58325e92d477450fb99366 SHA512 067403e83fdbc062b9d82e676a156f7b867a4efdae70cccff1b3f00010655d9e65930874ae672d203a9a2c27fe4048ad42b709218111dbd98f530e9a2319b72d
 MISC metadata.xml 462 BLAKE2B 647bb7ccdffe7c2a5ca47f431b83c31d298430e4fbfba009bccaac39a3a514239318bab1dc946f5f49ea07169c79a1e1502b7d5d669e9e2afb886f405e8499ae SHA512 52bca2028d95d47e93f52295f9c3082e232e0cf14d24bf8e19eb4443d667703b3f1b34c641ed4a9038813cccb92ac1af2674acd20d6c2060db1f96878061a680
diff --git a/dev-libs/utfcpp/utfcpp-3.1.1.ebuild b/dev-libs/utfcpp/utfcpp-3.1.1.ebuild
deleted file mode 100644
index 14032157c03c..000000000000
--- a/dev-libs/utfcpp/utfcpp-3.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2015-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/nemtrif/utfcpp"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="UTF-8 C++ library"
-HOMEPAGE="https://github.com/nemtrif/utfcpp"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND=""
-DEPEND="test? ( dev-cpp/gtest )"
-RDEPEND=""
-
-src_prepare() {
-	sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
-	sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUTF8_SAMPLES=OFF
-		-DUTF8_TESTS=$(usex test ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/utfcpp/utfcpp-3.1.ebuild b/dev-libs/utfcpp/utfcpp-3.1.ebuild
deleted file mode 100644
index 65c032f5f0ab..000000000000
--- a/dev-libs/utfcpp/utfcpp-3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2015-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/nemtrif/utfcpp"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="UTF-8 C++ library"
-HOMEPAGE="https://github.com/nemtrif/utfcpp"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/nemtrif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND=""
-DEPEND="test? ( dev-cpp/gtest )"
-RDEPEND=""
-
-src_prepare() {
-	sed -e "/add_subdirectory(extern\/gtest)/d" -i CMakeLists.txt || die
-	sed -e "s/gtest_main/gtest &/" -i tests/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUTF8_SAMPLES=OFF
-		-DUTF8_TESTS=$(usex test ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/utfcpp/utfcpp-3.2.1.ebuild b/dev-libs/utfcpp/utfcpp-3.2.1.ebuild
index 91f09205a24c..3025331804ec 100644
--- a/dev-libs/utfcpp/utfcpp-3.2.1.ebuild
+++ b/dev-libs/utfcpp/utfcpp-3.2.1.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 2e4653cba3c8..eae52e3eaf55 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,5 @@
 DIST vala-0.52.10.tar.xz 3598676 BLAKE2B f1d54634ffb8a152e5672badc912338a2982a81f5ee998b05212de807197d3f5cdd5b08ec9b521a004933fa6585b24b1e45a9cbc1a375c9863460350d3d3749b SHA512 d7517c25228db9c69bc68e16ed3903ea5dda016d5e84183491fef0b65edbbaf34065e785b0e0dc48f3af2460dc9ac6c435436f460b01929b2403ef0b9a2ad2d8
-DIST vala-0.54.6.tar.xz 3908328 BLAKE2B 19930f2b130c194a4f70a191042c1c7f5243829297daff2e3d1c9210c15bfba3973ecdbe09b8ae7435a88f4785bf06515b166f7a5a770d550404d3132b1c811e SHA512 6943e11c5f351f9f76991b75fbe51c4d133eaf4858ea75e67d514b7216cfabd4f0d81f09c89af26ab22fdf26783938742ae75bb49b7de4f1c2696934e2d4d0ae
+DIST vala-0.54.7.tar.xz 3916868 BLAKE2B 0e9f1e20f7f2dc2e1b024baba6e64e9d192de7d9978c6f9b2ed37e5fff9e95e31718e7a44761c98e8fe2aa790e9464259df004610d4cf863ef39afe45cedd37d SHA512 7d3345984c496e9fe6324fea6c4fd8d2887102b271d825740b0f5812538dbdabe9c88ec4022d25c34121df686200cce48d4678ec6a00b2a002b9e74242475440
 EBUILD vala-common-0.52.10.ebuild 645 BLAKE2B 83357d9b5e013241456d8afa2caa3078a652686f76ececd9d5c7b85f0f7d0da13b7ff48f797db27419811ee15ed94e0e7ff2717587ff8eeb4ed2beafca6832a3 SHA512 ee301c5563e517cb3f194d58418353cb95fbc493c4125c1caede2b7f91beb8b56d31285eed240ef8e27fa5361f8de18540cd775e97c7ef097308ca206e4732f4
-EBUILD vala-common-0.54.6.ebuild 653 BLAKE2B 01e790e858e3e4f602c15f208309927cda5ef9c2a808ba7c524198e9ded3746017dc2dc37740a413a4dc41873cc2e197736348802099165c11272e64447709fa SHA512 ae5cac34fb4d0f7bbcebe84ab30378cce75749d593848991856aca9990143e5213cfc124b2a4eeeb96d30230efefc6219d17335057d9c5c6d4ab44efb29b4708
+EBUILD vala-common-0.54.7.ebuild 653 BLAKE2B 01e790e858e3e4f602c15f208309927cda5ef9c2a808ba7c524198e9ded3746017dc2dc37740a413a4dc41873cc2e197736348802099165c11272e64447709fa SHA512 ae5cac34fb4d0f7bbcebe84ab30378cce75749d593848991856aca9990143e5213cfc124b2a4eeeb96d30230efefc6219d17335057d9c5c6d4ab44efb29b4708
 MISC metadata.xml 326 BLAKE2B cd8c49993b750ebef93c620f819f42b858431d1aab4d2066a124a5118d5d18f4970b9d1eccb77121089264db7cfbe69ca06fb2fc2d2c4db98047629af9878db5 SHA512 52854d43fb74af5402cb1855409ab25d6741ea6fe48ae50416044d7b518745b02752e69cb9680e9c132e3a2f65ae29d92e9e771ac883e2ef01ae91effdf1097f
diff --git a/dev-libs/vala-common/vala-common-0.54.6.ebuild b/dev-libs/vala-common/vala-common-0.54.7.ebuild
index 40415607535f..40415607535f 100644
--- a/dev-libs/vala-common/vala-common-0.54.6.ebuild
+++ b/dev-libs/vala-common/vala-common-0.54.7.ebuild
diff --git a/dev-libs/vc/Manifest b/dev-libs/vc/Manifest
index 4d9e51c2d5a2..6e4801afda8c 100644
--- a/dev-libs/vc/Manifest
+++ b/dev-libs/vc/Manifest
@@ -2,5 +2,5 @@ AUX vc-1.4.1-missing-include.patch 417 BLAKE2B 97bc99422cf68cd2aad45bb15f8314bf0
 DIST vc-1.4.1.tar.gz 638797 BLAKE2B 38feab898a4ce2b15c4db508369426a6b470f24b81e6676ad0e667cc08efaf30e96ed1455c667372104192fe6eb2340fdbd367298fa68e3168350c2e134cc0b8 SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a
 DIST vc-1.4.2.tar.gz 639711 BLAKE2B e8ef5c1249f1d5bff26997dd2b9e7e5923682a5251119b23fe4e7d4f9a166b4f9bfa0f5599d1fc4fd6ca390515e51039051c2afb17aece4c2c40a3cbd6ab630e SHA512 9a929cd48bdf6b8e94765bd649e7ec42b10dea28e36eff288223d72cffa5f4fc8693e942aa3f780b42d8a0c1824fcabff22ec0622aa8ea5232c9123858b8bbbf
 EBUILD vc-1.4.1-r1.ebuild 458 BLAKE2B 9b13a354a7ee8d0b39bec13dfbf56444d792e951206bb38f830d69da503b6770403d3126e16bc7535eed3143fea589ae73146cdbb93a35290022cf66a814a4a6 SHA512 823fef7d55cf03bcee0ec4b0fd33a9563962c420ecc2f559a763b1f8d540d066c842f88a15d645bb8962fb8a65864aba1590fe8a49982dd183a082c450c4dcba
-EBUILD vc-1.4.2.ebuild 406 BLAKE2B c0d14df8f5d1e4ec35bdc8903f67026a4212fdd9ab81fb8be73372646adb4b6812e5b33f61c7613be931eaf20ae5b4ff37c626cc3e20f8067a96b67407c6311b SHA512 55521553bf5c7d4f34437505a92867bc60f6a8ee0bbbb6b894e0e3a7c9be9663dfa99ec43f3da1175dbe5b8131d500d45bbee42ddcde093ed2eb9bf46ad261b1
+EBUILD vc-1.4.2.ebuild 408 BLAKE2B de20c658fbfe1047354a258de32f66a7d74511079ff7349e21fbfc4483cc1772b268f1ca45983d0bf3a98fc8d3a25237464dce0b402119edff6f4cc3d5310c7d SHA512 1c7656f430a7fa55eb62bddfcbc5d30609a89f880e1db5cfa6e2588d0f13aed8be1864712da16b944bae4eb411b373671479d3fc4e2ef6e12d803d9da5de15e4
 MISC metadata.xml 293 BLAKE2B 26e0cf3e09132dad5bb15a404c6e05ad3daa89e93cbe81aac804cb3d1b3f2d963b2beacf6582ea1f797bef623bdef8335ea3d4773bbb3fc69e99f0223b61d254 SHA512 36dd5362844c25d6be6d7d3133dd24c5a3b7831c0dd5e73b7e2c7474a492cba5944e4c0182efb2fddde170e196b47725bb0c3c541f8c2dc4861389f6752cf651
diff --git a/dev-libs/vc/vc-1.4.2.ebuild b/dev-libs/vc/vc-1.4.2.ebuild
index a6c153f2082b..18321dfce7d8 100644
--- a/dev-libs/vc/vc-1.4.2.ebuild
+++ b/dev-libs/vc/vc-1.4.2.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
@@ -12,4 +12,4 @@ S="${WORKDIR}"/Vc-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index e2338c9e8d55..b83f655aaa55 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,7 +1,4 @@
-DIST voikko-fi-2.4.tar.gz 701807 BLAKE2B 978871a733b12be53287ec2d4637428f6991cdb3098a97cc7fc673d7b1e1ac85eb6811653c1121a1f04b23f40e1b6ff6340a5514c2d1231cf7be37879c70cf20 SHA512 00098fd52d4f81b30fe7f0ecb97ee8f240d898dfd511da1fdc5e6fd7046f2bf94c0230dc733bc6034f178d56d26c3ee69965eb61c04fc7b30087131767701858
-DIST voikko-fi-2.4.tar.gz.asc 833 BLAKE2B f4f470118716cf3ad2348b8ae74f57d95a03adff3ffee66a1f09ae569e240a99ff08e026cd7bf575347ec9941bf6e0174c0b3b468a3434304dd8356db3e4d35d SHA512 bb68fe81c0d8cea206b93484d94d5bfc9a9272827616f3ce8016721027a736b190ae37679baed70df0350c3f84235fdb3d6a525d93123ff561ef6d83b7717562
 DIST voikko-fi-2.5.tar.gz 703898 BLAKE2B 596425311bcdbbf8af97bc32cd69c59cdfa56300afbce22501f084b138ffbd7a915f08628e40a832110e9d366d128747d7e7a0ebdfa38a7734c4f1c1cb303997 SHA512 6de3c6c13a9fb05a463a55177dc1707d5e4ca01c7ccf08e0f8ab73cb3a353ee4935adc23a1b5f6c5da568dbb075c081a700d8d46eb99b6bcbed0efb4d977f59a
 DIST voikko-fi-2.5.tar.gz.asc 833 BLAKE2B 329d442064adee3967b703e19edcdfb20a03e3337751282129e2816f265fcd4ada9c2ce82c146bcde8a644e47b462404ce9abf99f5bc6d2fe2f986f83b73d1e1 SHA512 ccdaa4e76b81f8ee8fcc20c1d870200a1255f9aa84c8dae139f343e8b2cc9ecefb38a16af8653e9c94a1e5cba25c850b8309d406e3d5b323864c8c0ad38979eb
-EBUILD voikko-fi-2.4.ebuild 868 BLAKE2B d7184dcceec265824877e5d6234f68877abb798d687557bd635e64cb5588bb9a99a6c142a76bc53f057339051aea940ec4520d9260ca2cca5e324c7ed7a7db63 SHA512 37027aa58408aa4538a8a2962807e3ae95e7fd8cd95d508253eefd224ff291f39fdfdd1149412f17364d254df703095198a5a6fe3c60decd71a0d6ff84db643d
-EBUILD voikko-fi-2.5.ebuild 870 BLAKE2B 7fc9b1968ea849a782f95e1273f7d8de8a3b40130bc49f10c870b4006242c4cdd5d22429f59892190d73ba51727f8425837f23614b387a594fd6c5088c820954 SHA512 62d5868ce4aa4c54c3b8f3c310b985f31c9c9390ed25df0ca63a988f73060d4b3ef84bfae1c3ba01d65fc1f4d9565edd94aff2b77de5c2f86bdec3822db257fc
+EBUILD voikko-fi-2.5.ebuild 868 BLAKE2B 9797e4c2f23e4311049b8ac2c3d90a0314c05c80cff1ed588d48959ec1967a30feded1b48296539294f26cdadc6acebb2d93acf5fdd3f3c00fb6f303886c7c3c SHA512 de14f929ef2bbd6f555abe3eba0ba19fb6dd01f4c2a4285ea98f198419a628765c4e059bb856ae3c97b19bd9cddb09f039bd065530822e72f55f0fd463474c82
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
deleted file mode 100644
index ec16f72b2f4c..000000000000
--- a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="xml"
-
-inherit python-any-r1 verify-sig
-
-DESCRIPTION="Finnish dictionary for libvoikko based spell checkers (vvfst format)"
-HOMEPAGE="https://voikko.puimula.org/"
-SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
-	verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/${P}.tar.gz.asc )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-libs/foma
-	dev-libs/libvoikko"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-libs/libvoikko
-	verify-sig? ( sec-keys/openpgp-keys-voikko )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
-
-src_compile() {
-	emake vvfst
-}
-
-src_install() {
-	emake DESTDIR="${D}/usr/share/voikko/" vvfst-install
-	einstalldocs
-}
diff --git a/dev-libs/voikko-fi/voikko-fi-2.5.ebuild b/dev-libs/voikko-fi/voikko-fi-2.5.ebuild
index 3b00b9ca71b0..2701c83b09d3 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.5.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-libs/foma
 	dev-libs/libvoikko"
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 606e04f11930..454c559c3fe3 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,5 +1,5 @@
 AUX volume_key-0.3.12-find_python3.patch 894 BLAKE2B 7173a00937a78c2b883d554e7c14ced4502088c5dee3af0378f13091aaf4133e4c899df60d4ebafd8c3f629c6020fdb17c0d61afda7e6d87a9c05b15803a4361 SHA512 bdbdf24f9a7e6b0db28cb22e831af898e4faca26b51c386835ab8dd74c0d0d79d261fa47ebd18213fe24424fd0bed54836fec5f3993a908ca88a720168768c7d
 AUX volume_key-0.3.12-support_higher_LUKS_versions.patch 917 BLAKE2B a637ba7d7761032bbbae34378a1cd8da57cd96c762ebeb50fce0ca28b7b154df11bda89af203d18833e7841fbd9181c01ee5fcb11d80d765fd147e82440becca SHA512 e784115d85f782db46dbd67c40c3a6b0864b69ce8d13b6a67d70471d39079e9fc0d9d263bd543556d645d7dc922ef22f641491051dd736128cdaecd63df2ff22
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
-EBUILD volume_key-0.3.12-r3.ebuild 1164 BLAKE2B e527efaca8d8f5e33d58b3d85cdbd346ad2c8fb39afbbafaca8cb16e96fc95e0eb7b4ba417f448853d2a21c7057e9d39e794a65eadc3d30246f008b5766a043d SHA512 850052e4394f40d9ddda66949f82f89e0b2794975befd8d7a590651bc2f607b8b29cb40059c5863290e6a9feaa40cd51e70648f2ca0520113e0a7c73cab9406e
+EBUILD volume_key-0.3.12-r4.ebuild 1166 BLAKE2B 0daf06c11da8b9530373711de03dc0f6910a7644692b5906b5631bb0caf78583aa6f4f23a64639f3f5a6c45b4d06df6fdbc2577115a61d331d7e64dac13b6715 SHA512 7aa798c9d1030a9fb2ecfd294bfd88e9c7e0cf76db2b3d273e4fb4483acda272be6dd3952b28f9b72c2b3ac518115fa304b4df06b18c69d52d83d3984c0caec7
 MISC metadata.xml 258 BLAKE2B bd458e931e669f3599d041086b28cb8e05f9daca13a17504ca4bdf6a19f9e0e0bce389981d9b65875a04e7a6e068aab4d7f92819a6c545638a1e37ed462866ac SHA512 f3d8019f0e5fb12b60d75645d9d8468cc5ca283d1df19b23604a58221cf08b7a5b63744e4e99f26c80b798e2caf52c5a69f8d383c3aed06f7a1996e72f7f36bc
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r4.ebuild
index b2489cc3917b..cc8940edb1c6 100644
--- a/dev-libs/volume_key/volume_key-0.3.12-r3.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12-r4.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
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	app-crypt/gpgme
+	app-crypt/gpgme:=
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 45ef2e4fa739..d317923ce99e 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,6 +1,6 @@
-DIST wayland-protocols-1.23.tar.xz 74116 BLAKE2B a92f9d80e8d9062fb79c06e13141b46e0f43d0813f461e087a9fa724fa752df3b4fe5698e34e7431f3b43cca0adf7b86ab77c948060f6c02e4c7693f7975cd15 SHA512 11f09147da1dd01a9f5c921eb0bfc6244a72023a052ef96bc121e16437a2c43d0dbba748c2de832539f57371e90b16bd13069bec07391305717f8fca295ea2a6
 DIST wayland-protocols-1.24.tar.xz 77120 BLAKE2B 912132cb2b65b99184f25942e02000444ce5d37b60f33363999e8431db5835d3c0dab41dae312f0dbb02d03ab7e4f3f588e7b507e767ec132a82fd816700b09a SHA512 4b1122517db56f48a5fafd4bd0cb7f94faef6fdd2d80e6cec17e5a6bafbaf2f5a71b958ed12e6d13965494885c209b2fb6dd8331487b39c6f251e71f1e770a15
-EBUILD wayland-protocols-1.23.ebuild 748 BLAKE2B 66baf0847f72f4228caf589c9a331220d3554f4f0136995278544a758a31c87a93ea63154f254a0252bf77c0227b9b602183ecfb7b97efd64096a9c981ab590f SHA512 fabe125b1da30781e621f6d09c19ab23f41806dbc340100647a5dfe234d542956cbb8bd6e0983247d0da07c1031dfeac3ab8253ba1617620b8779f77187cebde
+DIST wayland-protocols-1.25.tar.xz 79784 BLAKE2B 6ca7fdc910bfd70ee5c3bb192bcf1c79c66c4bb713531b2d1d493bd3ec8509e1231176144d75f4e97a4c6ccc4ee1d836a7ac1cfeaaa59e927f10fa4a40cf023a SHA512 8269694a0780e4d32f1982ff4cbb50b1ef85f08157b9486bc6d7e489c64665a9d9f959121d0eede7c7b108a604d974b64d74cfdef8b5f14304465309afb0768f
 EBUILD wayland-protocols-1.24.ebuild 748 BLAKE2B 8b993cf653000a28fb907eca38e142b92a78d91f3e8a57bdf77650b3310b9c8fab3e5445e3daabe6fd11af00d2ced745e00ab0cf4b5a84086a6425107b65d891 SHA512 dc0b169ce9c4ad4fc89f47d0a09cdea9217046d0dc40cf6d79cf1b8f780cf5f9b94ff05d2d278cb53c798cdf265198db836bc4da4367e8d5943c5d26a6802434
-EBUILD wayland-protocols-9999.ebuild 755 BLAKE2B 3d37738cffe0026ce26377478390368b84bb188e337b29c28e8b64e7d35095c1222ba3d893245f26214273786e7587d1f760603906874c9e3aebbbd67646f740 SHA512 e5533d3931b9542b6b22e4d6a37db75c4548ea3a2fa648ddbaf8bd955eeb107c76f9c8e9f3b5c04a3e62fe930b0a2140fbe59fdcf48a3ee40ec3f988d431b217
+EBUILD wayland-protocols-1.25.ebuild 750 BLAKE2B 0d3f2a3a67212e46c87a65ab0a15ed15d7be6b0b3090fe5c73ece6dd43cc74df5cd28609d30c61dfdaf6a2f3bca59bcb3bdc1b61a9a76a01d4260337be83a0b5 SHA512 2a908f69260ff68d094b6824fcd705b9b58a582078c30853f69ab09673e5825d19abc4b94fc49e13f67b3c11c0f24cd8bc7e059f257062f8685e0e148a8167e4
+EBUILD wayland-protocols-9999.ebuild 755 BLAKE2B 78a1f3259f92eebe946bbdb6306dc6fb3ddcb3cf25b548f456b599be5b874fa73c19b6d0e492164f99fae8fc22528d962305b3fd48690a6a742f929a1eca334d SHA512 e2004b5792af48ec8dcbf42694644d962231b97991ae03fb40e640fc2c0668ba7a91fd4417e109381d9f678dd3f487e94df9d4a0db4dcfabee872d3a9860f9e0
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.23.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild
index 86d58eaed2b0..6c937ab49bdd 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.23.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.25.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
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild b/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
index f9b1910a51a1..0cd7ff00a4f7 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-9999.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
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index d56ee48e8999..fcc4a42b1abd 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
 DIST wayland-1.20.0.tar.xz 225188 BLAKE2B d607610ad8b30b6b3bbfc3945679f698030f271766cfb72425f98f170a96469fb085fb9a746a866b8562d7f452c844e61ad57f634dcf365474c7d050b76022e9 SHA512 e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215
-EBUILD wayland-1.19.0.ebuild 1469 BLAKE2B a44e69efbd172377a84d8bfe46ca35a9f10652f37ffc949d7b59d9130ea460ab42db6affacf076bc2bd574c70629d814cf829d452a88ae7cfc0c135097a08d72 SHA512 3a368fef2f2170c29ffc2598b0cf634109c10cb1d845803299a07a3a6634864650283190fe81cda401c2e4de488cdd0f632145a590caee959c25387461fe380f
 EBUILD wayland-1.20.0.ebuild 1509 BLAKE2B aec03209348120b00dd9381950c85463a1e36898db8ef098c5eabb0a13b7a32de6672a85ce4930c12f9c63bf9208ecfdbaafee1fb29c9738d856414c791ecf8d SHA512 251bc4c671f62c101544411971fe08a6da4a42226f2133a8df9b723fd2f834356a66f66095c97257268fe42cbc943e2c1d15d8520d9bdceb4e61fb9666abbdfd
 EBUILD wayland-9999.ebuild 1516 BLAKE2B e22d931ee9acbbb3649fb888e0bbbe911a7ce34824fff5187c1476e0614d152b2f7afa9537561e3ec8791ec51fe0683c812e35081f456b729e193fbc649442c4 SHA512 08c911a8941744012b548c16278b9c687cbcac2487cef6cd4409081aad531a22b663aa5008ee7c14866364a7ef5ac95d73f69a9c50c296ab0ba3c7a71ce9e9e4
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland/wayland-1.19.0.ebuild b/dev-libs/wayland/wayland-1.19.0.ebuild
deleted file mode 100644
index 1e94dde694a5..000000000000
--- a/dev-libs/wayland/wayland-1.19.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
-	inherit git-r3
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-inherit meson-multilib
-
-DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc"
-
-BDEPEND="
-	~dev-util/wayland-scanner-${PV}[$MULTILIB_USEDEP]
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.6[dot]
-		app-text/xmlto
-		>=media-gfx/graphviz-2.26.0
-	)
-"
-DEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	dev-libs/libxml2:=
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_use_bool doc documentation)
-		$(meson_native_true dtd_validation)
-		-Dlibraries=true
-		-Dscanner=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# We set it on purpose to only a short subdir name, as socket paths are
-	# created in there, which are 108 byte limited. With this it hopefully
-	# barely fits to the limit with /var/tmp/portage/${CATEGORY}/${PF}/temp/x
-	export XDG_RUNTIME_DIR="${T}"/x
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	multilib-minimal_src_test
-}
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 47e3da2d2232..cc989c3650de 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,6 +1,10 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
+AUX weston-10.0.0-backend-default.patch 828 BLAKE2B 2c6712737bc6e2d1a37d89b5ba4ea93fb30d137b8d76b77496f82503892bc295d19e97d8de223377328f8aa32721544f7a67f904c22bd1f1483fa99bf6c5f15e SHA512 e3cf66567ed8878ceeb0cde40f3c3aac8d20a04ce501d4fba8429f9d7552dc53ef4eec0cf103bf7e1e93fc9bdf224b20c628c9dede3e545455735fd95ae5dfea
+AUX weston-10.0.0-test-deps.patch 1052 BLAKE2B eaa6d9950a7a932686d11d9b9efb9ebfc602ac82db14348d4c1701a0420a85469e05c5af76568a6189546f4d8b5f05bac85c64e7168522af4cc0a5a3d31a8050 SHA512 7f59b5da1ec7a885d53bf48c12a13cceed6e7306c018e9921d64ec1856b8d125421f7af0aa227785d794924c6f035bc79a681eb9331adb17fb790f82c28d0f10
 AUX weston-pipewire-0.3.patch 11856 BLAKE2B aebe0f4859a0ac3144d8f631fd8b5e35c02f62217ad94106c138aa6095430a2aff7aedf88d67f95991d32e9c728b6704746fedc9858e41e5d99900722b6617ec SHA512 f3e028df4967672c58e1cac66fc8b7781252f15094439dca399d820d945156a15f1e420a8ed062584dcdd7c9577849127aa52974639877796ce91231123bf50d
+DIST weston-10.0.0.tar.xz 1774600 BLAKE2B b2b8fa4f7542aba03970ca8abf504f340f8f8da9f9581c16ceac5c702eac355f5d4244778393a8804017f39dff490431e26a48580746033158bd2d2b721437f8 SHA512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
-EBUILD weston-9.0.0-r2.ebuild 3782 BLAKE2B 58e2fbed3db81908433d6c8f5a8ed478c2afb5a48b027839a47703afe041551a3917db0d879357ef6a9a9c5f64582f32dc370f4e41c719801677f17ce098768a SHA512 ff7edcec85e03246ab5b2f83dcda0b3fcdf0984a86f8e30e918dcbddea41e156b56bd4473db79788af42a0a55c5730373acab429b5571c1fd7e625945d089aee
-EBUILD weston-9999.ebuild 3786 BLAKE2B 796acd0ff65bf5c3271ac8c09242024ffd33e7f2898cff0e80a39dfe0dd2a33763af9d5226910f6b48a128b8ce14457fd55471e432cafa7f8ef7b21d85c95abc SHA512 017dd76bec83bca30102daccd06b97d1edad078ad9b08c66266d8c1f37f774a384c7907528cc9774ee1c82ef2c27ccb1a401452afb3e1b904448c38460741cc7
+EBUILD weston-10.0.0.ebuild 3922 BLAKE2B 0c4dd1ff40b3d1c3f874b03e5106509b0b3cfd1e344b071c9b3cc9a99a59b1b5e679356fd559923447f25f86e809ed730ba421ce6ade58499d9371990e61638f SHA512 fdd32e6205ff2b8dd238ef99e859e3cdc6755d2aebfee162078da4d5e6d2a210702d962dba2a1cb48ea70299929e2c8009752da3b81c84859c2ee4fea2b1429a
+EBUILD weston-9.0.0-r2.ebuild 3807 BLAKE2B 7a8728b739b34c50c1f864d15acb1394b40783a2ac6161f5035faee9ca360777ea6efcbc0c1826e3a60ce7f53d3a05b6bb4b391e1b33727c95b538ea6d80f12f SHA512 fbbab98f6735ebd5b4d9427d9ddb481e09ef37c85199a22a68b066ef93a88d92bfe1d95f72c95d3335f614e4d4bb91de00f40a209713576c3d0f87e3be498a1e
+EBUILD weston-9999.ebuild 3815 BLAKE2B ffd80f511c1e14766f6a8f68ece3392aa1e0a1d2ac6e11732f98914656bd5075a09c55f73e8ff0a0453b481e4c067d9557335755c55ab2376302079372e6b7bc SHA512 b14628f84f9f71e6c0a26c94814bb4c22634a8f80c3bd12cca4916504d0f081eb2863a1f5843ff2456a52af24b5bae85fb3fb2bf0a62157e59202b30abe9c9ee
 MISC metadata.xml 1578 BLAKE2B 302ecc49dda1f6327a73d7dfcae61accf15323cf19e2d4dd322ae54612fa738331614efd044ec148a6bdb3d85895d789c962fad224a5fa88f45f2228421ef089 SHA512 104a8c428651e8c7e4ccdf8332be0af8bf00f3cd36afff301bf5fbd2f446fcc64e9b9ccf3acd636f4e4357a4d4d1ecac0cc747bdfb7089508900abdca5d96bea
diff --git a/dev-libs/weston/files/weston-10.0.0-backend-default.patch b/dev-libs/weston/files/weston-10.0.0-backend-default.patch
new file mode 100644
index 000000000000..710639e7e9c5
--- /dev/null
+++ b/dev-libs/weston/files/weston-10.0.0-backend-default.patch
@@ -0,0 +1,27 @@
+From 35e3fb72ac28af628aa1d2b7ee804a3f81720c47 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 4 Feb 2022 23:43:50 +0000
+Subject: [PATCH] meson.build: Fix -Dbackend-default=auto following fbdev
+ deprecation
+
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1c73e130..d761903e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -121,7 +121,7 @@ config_h.set10('TEST_GL_RENDERER', get_option('test-gl-renderer'))
+ 
+ backend_default = get_option('backend-default')
+ if backend_default == 'auto'
+-	foreach b : [ 'headless', 'fbdev', 'x11', 'wayland', 'drm' ]
++	foreach b : [ 'headless', 'x11', 'wayland', 'drm' ]
+ 		if get_option('backend-' + b)
+ 			backend_default = b
+ 		endif
+-- 
+2.34.1
+
diff --git a/dev-libs/weston/files/weston-10.0.0-test-deps.patch b/dev-libs/weston/files/weston-10.0.0-test-deps.patch
new file mode 100644
index 000000000000..cc6ad8c6e130
--- /dev/null
+++ b/dev-libs/weston/files/weston-10.0.0-test-deps.patch
@@ -0,0 +1,34 @@
+From 9516859b9fdb2899a37116b55200fb04f7726b45 Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniels@collabora.com>
+Date: Tue, 8 Feb 2022 22:39:42 +0000
+Subject: [PATCH] tests: Add dependency on screenshooter client protocol
+
+Given that the test-helper code relies on the screenshooter protocol,
+make sure it's available for us to build, and the dependency ensures we
+build in order.
+
+Fixes: #588
+
+Signed-off-by: Daniel Stone <daniels@collabora.com>
+---
+ tests/meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index d8e96e77d..955c4226c 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -29,8 +29,9 @@ lib_test_client = static_library(
+ 		'weston-test-client-helper.c',
+ 		'weston-test-fixture-compositor.c',
+ 		weston_test_client_protocol_h,
+-		weston_screenshooter_protocol_c,
+ 		weston_test_protocol_c,
++		weston_screenshooter_client_protocol_h,
++		weston_screenshooter_protocol_c,
+ 		viewporter_client_protocol_h,
+ 		viewporter_protocol_c,
+ 		'color_util.h',
+-- 
+GitLab
+
diff --git a/dev-libs/weston/weston-10.0.0.ebuild b/dev-libs/weston/weston-10.0.0.ebuild
new file mode 100644
index 000000000000..d488637fff57
--- /dev/null
+++ b/dev-libs/weston/weston-10.0.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python3_{9..10} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	colord? ( lcms )
+	drm? ( gles2 )
+	pipewire? ( drm )
+	remoting? ( drm gles2 )
+	screen-sharing? ( rdp )
+	test? ( desktop headless xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm fbdev headless rdp wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-0.8.0
+	>=dev-libs/wayland-1.18.0
+	>=dev-libs/wayland-protocols-1.24
+	lcms? ( media-libs/lcms:2 )
+	media-libs/libpng:0=
+	webp? ( media-libs/libwebp:0= )
+	jpeg? ( virtual/jpeg:0= )
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.95
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	fbdev? (
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	colord? ( >=x11-misc/colord-0.1.27 )
+	drm? (
+		>=media-libs/mesa-17.1[gbm(+)]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	examples? ( x11-libs/pango )
+	gles2? (
+		media-libs/mesa[gles2,wayland]
+	)
+	pipewire? ( >=media-video/pipewire-0.3:= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	seatd? ( sys-auth/seatd:= )
+	systemd? (
+		sys-auth/pambase[systemd]
+		>=sys-apps/dbus-1.6
+		>=sys-apps/systemd-209[pam]
+	)
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xwayland
+		x11-libs/cairo[X,xcb(+)]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0.0-backend-default.patch
+	"${FILESDIR}"/${PN}-10.0.0-test-deps.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		$(meson_use fbdev deprecated-backend-fbdev)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use xwayland)
+		$(meson_use seatd launcher-libseat)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use pipewire)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use kiosk shell-kiosk)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use colord color-management-colord)
+		$(meson_use systemd launcher-logind)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		$(meson_use examples demo-clients)
+		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		-Dtest-junit-xml=false
+		-Dtest-gl-renderer=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+
+	# devices test usually fails.
+	# xwayland test can fail if X11 socket already exists.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Exv "devices|xwayland") || die
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-9.0.0-r2.ebuild b/dev-libs/weston/weston-9.0.0-r2.ebuild
index b2013d85f980..27fdbecfc4af 100644
--- a/dev-libs/weston/weston-9.0.0-r2.ebuild
+++ b/dev-libs/weston/weston-9.0.0-r2.ebuild
@@ -31,6 +31,7 @@ REQUIRED_USE="
 	colord? ( lcms )
 	drm? ( gles2 )
 	pipewire? ( drm )
+	remoting? ( drm gles2 )
 	screen-sharing? ( rdp )
 	test? ( desktop headless xwayland )
 	wayland-compositor? ( gles2 )
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 75c191a28c7b..38b24ee38007 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.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
@@ -9,7 +9,8 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-inherit meson readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
+PYTHON_COMPAT=( python3_{9..10} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
 
 DESCRIPTION="Wayland reference compositor"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
@@ -18,19 +19,20 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing seatd +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	colord? ( lcms )
 	drm? ( gles2 )
 	pipewire? ( drm )
+	remoting? ( drm gles2 )
 	screen-sharing? ( rdp )
 	test? ( desktop headless xwayland )
 	wayland-compositor? ( gles2 )
@@ -39,14 +41,14 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.17.0
-	>=dev-libs/wayland-protocols-1.18
+	>=dev-libs/wayland-1.18.0
+	>=dev-libs/wayland-protocols-1.24
 	lcms? ( media-libs/lcms:2 )
 	media-libs/libpng:0=
 	webp? ( media-libs/libwebp:0= )
 	jpeg? ( virtual/jpeg:0= )
 	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.68
+	>=x11-libs/libdrm-2.4.95
 	>=x11-libs/libxkbcommon-0.5.0
 	>=x11-libs/pixman-0.25.2
 	x11-misc/xkeyboard-config
@@ -65,7 +67,7 @@ RDEPEND="
 	gles2? (
 		media-libs/mesa[gles2,wayland]
 	)
-	pipewire? ( >=media-video/pipewire-0.2:= )
+	pipewire? ( >=media-video/pipewire-0.3:= )
 	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
 	remoting? (
 		media-libs/gstreamer:1.0
@@ -77,7 +79,6 @@ RDEPEND="
 		>=sys-apps/dbus-1.6
 		>=sys-apps/systemd-209[pam]
 	)
-	launch? ( sys-auth/pambase )
 	X? (
 		>=x11-libs/libxcb-1.9
 		x11-libs/libX11
@@ -91,6 +92,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 "
 
@@ -103,10 +105,9 @@ src_configure() {
 		$(meson_use screen-sharing screenshare)
 		$(meson_use wayland-compositor backend-wayland)
 		$(meson_use X backend-x11)
-		$(meson_use fbdev backend-fbdev)
+		$(meson_use fbdev deprecated-backend-fbdev)
 		-Dbackend-default=auto
 		$(meson_use gles2 renderer-gl)
-		$(meson_use launch weston-launch)
 		$(meson_use xwayland)
 		$(meson_use seatd launcher-libseat)
 		$(meson_use systemd)
@@ -136,14 +137,12 @@ src_test() {
 	xdg_environment_reset
 
 	# devices test usually fails.
+	# xwayland test can fail if X11 socket already exists.
 	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Fxv devices) || die
+	meson test $(meson test --list | grep -Exv "devices|xwayland") || die
 }
 
 src_install() {
 	meson_src_install
-	if use launch && use suid; then
-		chmod u+s "${ED}"/usr/bin/weston-launch || die
-	fi
 	readme.gentoo_create_doc
 }
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 29e15636a41e..fc36215098f9 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,10 +1,5 @@
-AUX xmlsec-1.2.31-fix-nss-3.59.patch 980 BLAKE2B fb0d28e3a33a2d581796f03f2121f08c26cb964a727876a1bc7a1b9e63f92056a0213d315a0accc94bb582d9224fcbe10ef0c95528f70f29d6d69a34fa5e342d SHA512 a1857ad89b0d4d20d92deda23112abac814b312525a662af85edc44150c78e58fe54142d0cc92857e01a14719e698a810585df350ea4844544328eb7848b4680
-DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514ad92c4ad05b490aa3ac9ffb6be861ee81d660be30d37e26ae1cb327cdecd1c76d60055ec5aa900e390a4083099b3 SHA512 07152470a9fe5d077f8a358608ca1d8a79ee0d2777660f61ed5717dc640714a3adfe66843e6a4023898eb0f5ed79771d70c41132571f3a1aeda82c1894b69c98
-DIST xmlsec1-1.2.31.tar.gz 1989144 BLAKE2B ddc55e34867d5870fa434c739825ceaa68500a11fb2eabb482945901ad7fa0ba0d5fce7cd6c5f1b49c24d5bc07cee2875ff21833f09c0ec2ffeaf63875f5b001 SHA512 7a0e3d6f66746a22cf6468eb4d0691879c7468e4bef71fd8720e6a56b420f076a1d8a3094c35e721471dd029a643f5c4a553ef5788be5509f2786a419da1b7af
 DIST xmlsec1-1.2.32.tar.gz 1989258 BLAKE2B a1325f682efec42dbcdb066d3c242fb435daa721349905564b05829153e5337b772fbf6b996f4d249d669d76fa584055f8bec1630c4936c27fd330cda439522d SHA512 39a90e154fe760b9cb01090c0232aa6c88c595fea87a771bebdd7b38ab274e3be719d6314065d9f02b854c7be9c8ec3557e57e0158ff3696413de3424f14389e
 DIST xmlsec1-1.2.33.tar.gz 1991955 BLAKE2B d6bb68ad4ceb936d51165a4ef48824a8cb5d550670ca6015eb9916121555a1a32b3f47774eab1efc2bc5031346f22a0b21115a220dbeb44bba773412f2292bc5 SHA512 6354554b5cdc0a1389f6991efeac919bea912330b36d3be3d3496d61331e9edd2771786d50d2571a439f62ccfc3bd32be0a50bb5a037c4993aac076ad94b46e8
-EBUILD xmlsec-1.2.30.ebuild 1339 BLAKE2B 35fc887e954129bdeafd206a7bab29a04dce23b7d27b29b92bf0908f16a0393cf806423a932a8e0c4676d1b35c0f0d8ff3040cecbafb31aa4754dcbfdab517e2 SHA512 8f8680ef311ab24b814de101aeab5805f5b1da155bf799a0052334e516d301d22bbd2d33e51044902dee1f53a2dbdee840b6d6ac4e68315cef7a7c4fd68d0f82
-EBUILD xmlsec-1.2.31.ebuild 1390 BLAKE2B 80c4d0d4d9940651dedc1ce3f50c023b61422ffd686a14110f68470abad796d57ce0e88608cbf0f306ec6c8382ec5a7f2739503281bdfcf53388f803c04baabb SHA512 7fd7b30b8885c611a88df01a84bdb9924c60d376defc1126778ae5052947a6e58d10a118cf670836ad8eb52eeb79e22b792d151642bfc3aa48c15e309a76038c
 EBUILD xmlsec-1.2.32.ebuild 1345 BLAKE2B 0798c9743661798fb75d386fa0e11bffee38378637eddd9f5c310b1e15d44555cf437a128185cd8af8296c531ced8d26b1926e07bae5c6382816750d6a950e87 SHA512 4ed8cc44c6d57c18ed29121fd638944a1ec6a6d5bc7fbe8f70621ec18a885694eebb8f5c24f93853f79304158d9d2ade4e1eae4c0a3de3627f5f474919c397f7
-EBUILD xmlsec-1.2.33.ebuild 1440 BLAKE2B e28b75dd2403d4db30d9680e29c2ff6dd84ed73ed815bb5df32467a4b2b145040e057bf4ec8393ad9c8d93bfdc0630b14827d2f90a809a30c2be73226c3a704f SHA512 dc356ad0d12cbf660a8375bd49e67252d456864611d4be8a22e0b0d518857abb67aa8e79960a2a6d9932010828f66f0f576b431e8915760f6220ea3225b654ba
+EBUILD xmlsec-1.2.33.ebuild 1434 BLAKE2B efd38d2bacfc6cac33c5549b059bfc854d6cbced4c0c2a3c8e2471cbb7bcb79489d59cb62dbe03a4392316f7d9b0466e0d6c192e0439fa21afe9da5a0a5849d6 SHA512 321c2baac60d9f2e9ff4785a49820f1e9dc6098fe73fc61cfce43ed2f8882b9025673e91cb4c5f2b7353b1ba6149a1f0d67ee1a1240f0454a2660c918a316e4d
 MISC metadata.xml 493 BLAKE2B 3d3367384e8710f936e711a447ff8b2e29b66d597fb4ae77003d3860fa64647b1c235c65896d849d35ad0ced81c694436c22d644c2dd1bef7bb87d4aeaf567ad SHA512 ef0db238a551baaa696695d501bd740a37a16d33e3406343fcb0948346afc7c290c9a51aa11ae0b640d7040bf9aaad1868085bc899aab173cd33f22c1cae5f60
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch b/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch
deleted file mode 100644
index b70b8cf2d61b..000000000000
--- a/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/764437
-https://github.com/lsh123/xmlsec/commit/f3a59c721e38a663405093e2bbb30e2bf45853a2.patch
-From f3a59c721e38a663405093e2bbb30e2bf45853a2 Mon Sep 17 00:00:00 2001
-From: lsh123 <aleksey@aleksey.com>
-Date: Fri, 18 Dec 2020 16:22:40 -0800
-Subject: [PATCH] Remove MD5 for NSS 3.59 and above; enable nss test on osx and
- mingw (issue #305) (#306)
-
----
- include/xmlsec/nss/crypto.h      | 6 ++++++
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/include/xmlsec/nss/crypto.h b/include/xmlsec/nss/crypto.h
-index 223c1d85..614ac931 100644
---- a/include/xmlsec/nss/crypto.h
-+++ b/include/xmlsec/nss/crypto.h
-@@ -19,6 +19,12 @@
- #include <xmlsec/transforms.h>
- #include <xmlsec/dl.h>
- 
-+
-+/* MD5 was removed from NSS */
-+#if (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58))
-+#define XMLSEC_NO_MD5 1
-+#endif /* (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58)) */
-+
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */
diff --git a/dev-libs/xmlsec/xmlsec-1.2.30.ebuild b/dev-libs/xmlsec/xmlsec-1.2.30.ebuild
deleted file mode 100644
index ec33de36d7a6..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.30.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
-HOMEPAGE="https://www.aleksey.com/xmlsec"
-SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
-IUSE="doc gcrypt gnutls nss +openssl static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
-	gnutls? ( gcrypt )"
-
-RDEPEND=">=dev-libs/libxml2-2.7.4:=
-	>=dev-libs/libxslt-1.0.20:=
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= )
-	gnutls? ( >=net-libs/gnutls-2.8.0:= )
-	nss? (
-		>=dev-libs/nspr-4.4.1:=
-		>=dev-libs/nss-3.9:=
-	)
-	openssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	test? (
-		nss? (
-			>=dev-libs/nss-3.9[utils]
-		)
-	)"
-
-S="${WORKDIR}/${PN}1-${PV}"
-
-src_configure() {
-	# Bash because of bug #721128
-	CONFIG_SHELL=${BASH} econf \
-		$(use_enable doc docs) \
-		$(use_enable static-libs static) \
-		$(use_with gcrypt) \
-		$(use_with gnutls) \
-		$(use_with nss nspr) \
-		$(use_with nss) \
-		$(use_with openssl) \
-		--enable-mans \
-		--enable-pkgconfig
-}
-
-src_test() {
-	SHELL=${BASH} emake TMPFOLDER="${T}" check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
deleted file mode 100644
index 625dcba4bd42..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
-HOMEPAGE="https://www.aleksey.com/xmlsec"
-SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
-IUSE="doc gcrypt gnutls nss +openssl static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
-	gnutls? ( gcrypt )"
-
-RDEPEND=">=dev-libs/libxml2-2.7.4:=
-	>=dev-libs/libxslt-1.0.20:=
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= )
-	gnutls? ( >=net-libs/gnutls-2.8.0:= )
-	nss? (
-		>=dev-libs/nspr-4.4.1:=
-		>=dev-libs/nss-3.9:=
-	)
-	openssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	test? (
-		nss? (
-			>=dev-libs/nss-3.9[utils]
-		)
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-nss-3.59.patch"
-)
-
-src_configure() {
-	# Bash because of bug #721128
-	CONFIG_SHELL=${BASH} econf \
-		$(use_enable doc docs) \
-		$(use_enable static-libs static) \
-		$(use_with gcrypt) \
-		$(use_with gnutls) \
-		$(use_with nss nspr) \
-		$(use_with nss) \
-		$(use_with openssl) \
-		--enable-mans \
-		--enable-pkgconfig
-}
-
-src_test() {
-	SHELL=${BASH} emake TMPFOLDER="${T}" check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.33.ebuild b/dev-libs/xmlsec/xmlsec-1.2.33.ebuild
index 7f1d3ad81256..c2c0fecd89b1 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.33.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc gcrypt gnutls nss +openssl static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index e2609153597c..4cc9497c83f2 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -3,5 +3,5 @@ DIST xxhash-0.8.0.tar.gz 145909 BLAKE2B 3e4e715d20ad09da2fe706a69e89a305d9f4d195
 DIST xxhash-0.8.1.tar.gz 171552 BLAKE2B c0efc1aabf68130d7028a6e43fb04826de4ec485bfb5e915bd9dad823149b970f964784e14c35babd46b9811b961ce3d0be49feb1640e00780decf037427f5fc SHA512 12feedd6a1859ef55e27218dbd6dcceccbb5a4da34cd80240d2f7d44cd246c7afdeb59830c2d5b90189bb5159293532208bf5bb622250102e12d6e1bad14a193
 EBUILD xxhash-0.7.3.ebuild 909 BLAKE2B 4ddff20b80164afcc422e805b75312d62038e57266d16da0d691499728adb17a786f3cde155f1aec5e3619654088dae7aa986e74f5d779a7ed01c8f75c54b1b0 SHA512 503faff0defb0b06b4aa378b3ba587f9d791a0c177eecf087ff4aa36ee2c86d7b6679aa1d305e0612fa32bb0fa6e18edbcd6dbf89e62a7d01de4308a601c0142
 EBUILD xxhash-0.8.0.ebuild 909 BLAKE2B 4ddff20b80164afcc422e805b75312d62038e57266d16da0d691499728adb17a786f3cde155f1aec5e3619654088dae7aa986e74f5d779a7ed01c8f75c54b1b0 SHA512 503faff0defb0b06b4aa378b3ba587f9d791a0c177eecf087ff4aa36ee2c86d7b6679aa1d305e0612fa32bb0fa6e18edbcd6dbf89e62a7d01de4308a601c0142
-EBUILD xxhash-0.8.1.ebuild 1099 BLAKE2B 0b8ef717cc5ceb05f1b7e96c66a8c28d03b8f86c40a20b9b0b2493aecb2fb24f9172eb65fbfa7192d69d57706db00fdab511b8ff5bfd45bb94993030a7398ce8 SHA512 c6e97ce7055e16672ef1e8f5c30e7ad081d820758e1a59a362187ee3d3fc4bbe0adbc43fc8ad002ea16104c91af7dbf01b5ed77b503ee6891fa03245878bb61d
+EBUILD xxhash-0.8.1.ebuild 1091 BLAKE2B 78b75efb821899f44d87837d1b4c8f4bd62c8c2192846953acca406fc56fc3b9dfa18b9234bd429a383f883f2581634667648843426ed0b604ec490e556703b5 SHA512 ac6f7900a2a8e89c8e91783beb38a73620043fdc712ac86b7802f0a8e7f756379c86dd1d81b74542ed49e50e1bf307850fd25e6ca0c660914ae629149914fd0d
 MISC metadata.xml 393 BLAKE2B 7c331e1bd89d9e7bdc0693e0942d1e83418746a63c560c666722ba78c82948f39691a4e93bb5b5e1f021ac496b5fea312b97ace2dc8d5f5aa37590aa020cc6e4 SHA512 b96d0fb3f8ad4b65da25054883722d0abfa937b714f72d3fa8d0dd66ac4e224d5c5e8a0f7ae3bae5825ff9c198a2e13eefc6759a23b6ae9b79e3cda2648bca1a
diff --git a/dev-libs/xxhash/xxhash-0.8.1.ebuild b/dev-libs/xxhash/xxhash-0.8.1.ebuild
index b6f70f5fe92d..dadd1ef2ef3b 100644
--- a/dev-libs/xxhash/xxhash-0.8.1.ebuild
+++ b/dev-libs/xxhash/xxhash-0.8.1.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD-2 GPL-2+"
 # https://abi-laboratory.pro/tracker/timeline/xxhash
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/yaz/Manifest b/dev-libs/yaz/Manifest
index 00aea0401c9c..87911d513a65 100644
--- a/dev-libs/yaz/Manifest
+++ b/dev-libs/yaz/Manifest
@@ -2,5 +2,5 @@ AUX yaz-3.0.47-icu-automagic.patch 804 BLAKE2B 37016fbe77f2f611f4118ee5995b6f905
 DIST yaz-3.0.53.tar.gz 2164681 BLAKE2B e42a97d63e031f14234258c7c44735a615ebc83774c1532d7e1b50f1f231dc933168e41a1b35a139ec193e694f6253336a666daad627a4aae9a0c7ffe34ca360 SHA512 537d54757e401c1b29ad2120209b2cd038f26ff7f43ffc3c1e22808e12a1580aedee3880478e951fd4b3057ca9af4a34afa2a64c0b8ffcbec24f76deb83ddc89
 DIST yaz-5.31.0.tar.gz 2599598 BLAKE2B d56b3ccd3981d406bc09aeb7c9619e23f6c322cd80bf01db3a0621a40922dbbf32be34e69990eea0f8abbad84ed66d086d883db22693f3aab596c17001b4355b SHA512 93fe2320e474e3874704b9a899aed789e6128b5c626bb0c49bf650fd9ce0c107af4da6a13e5d1a56c98d018bfbb6cb918b53b6ce93e42bfeb8da0dfacbdb6667
 EBUILD yaz-3.0.53.ebuild 1505 BLAKE2B b810f7445c4580f824eed4613a50df7de3c57110126d3a6a6c903b225c71e2de7401bff616bc7a29fef3fe837a6cb481faf7a10549d3cd484c51957ce26ee462 SHA512 66b03d37d144c635621782a9fad5e43481c31ff58aa81dcb4e32aa1b726d2813387dc317c6f7ffc0f40c26aa7fbcccaa4e8624d3cf17daf87ddc6fc0585e48ae
-EBUILD yaz-5.31.0.ebuild 1377 BLAKE2B d736a697e57c033dd5c28ef6fb577efbd088b0b00448e575618a4340d4e3f9245b4b60122620f56c9b9f4168c1889eebe4a7510bb8ebf24e1fd7ac0dc484473c SHA512 9ecebca797b61c4eb70608ae9f7e1734788c43d124008f3acbe49b25170fa32c03740d648b3583d56441f7d83f483ccd8245be7f66398d8f3a093ef06eed9964
+EBUILD yaz-5.31.0.ebuild 1373 BLAKE2B 8bda15894165d1b03c8964ea9e25cbba1a6bf3181fb9a33fa90ce9fea13f08e4147dbb3ef7dfb98d5a433aa061a95b44c55fee9aaed4cbeee1a5047efc551f03 SHA512 81f994fec38ef3e7db0802b0778e9aaf34689efd78f92f5bb2719cb50bcf9a5366e2380e437985e205629a98f3e57b48e3b6b80a2016d278a46f86b853dd7729
 MISC metadata.xml 338 BLAKE2B 693e0c670d6743738015c3012d35cdd7a814429731c7233167dfa34b0de0226ce18a63d69c15ab01efe9e6b072e050863ec69beb095599a3c3ffaa7612c061a5 SHA512 9887a1010de64eac3786d1b78e37319922546e1d03aa5fdfeced4314b6fa57f31cd116e472295bff9308e52c58483e47dacd0255ef06de8bf10c4c114c2bb599
diff --git a/dev-libs/yaz/yaz-5.31.0.ebuild b/dev-libs/yaz/yaz-5.31.0.ebuild
index bb0efeb67186..b17a2030b737 100644
--- a/dev-libs/yaz/yaz-5.31.0.ebuild
+++ b/dev-libs/yaz/yaz-5.31.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.indexdata.dk/pub/${PN}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
 IUSE="gnutls tcpd ziffy"
 
 RDEPEND="
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 7a526ae0f0a0..c38c469d51a6 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,3 +1,4 @@
 DIST zziplib-0.13.72.tar.gz 1162175 BLAKE2B ff5617645e25040e4666e5440651fbb2b04c0505c7bda08b158f44c63c5dd53ec97a9942908314c3b103a4685be49368e964d249fcf9b9d685e328f0ebabdedd SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
+EBUILD zziplib-0.13.72-r1.ebuild 1275 BLAKE2B c63ad088360e7f0dc55c39324a36b7b47f3b5077f759d9f2270023e365a1ac0a3571ba047ec4d3ae6db28ed4fccb6347ed2cc7027a6d4ce42056c0eabec5919c SHA512 b8cad421ef427d959c44500effef18ac15f4bcaacc1273f294a2c92c3f5a6115e1c591d516887214cf04a45a50e7d453d0bd16cd43e8107e429df61a23d778ec
 EBUILD zziplib-0.13.72.ebuild 1266 BLAKE2B d481c3cc8ce2bf1c410684815b31b77e00c7f8f1771c7fa0bb6fa3476af9eb3e38d77b24d2f592e52cd66077caa2415897d278a131648110077b40da5630711c SHA512 3a5c1d92c211138d653197683734f6fbf774a9bc629ed53d1dfa182ea63f0a733fee7069e57e77fb1fd97043a3f8732503fbe81ae6b831f07608eb2d47340b74
-MISC metadata.xml 535 BLAKE2B 38ac12b42d8e3b079ad579728457b28bcb6af37af384df1041fb611804b0956336c52b7fc8e4d5fe517f9636e84d72c382214f1aa66e33d0681458276c885a58 SHA512 59dd99da1f9ca0ae11769fc1e14e25bfda2079eb55419e7d17a1cebc85053e4b7c9f9cadb657b52d00b1797c3ae4ed5086996a100e1355e1956c035f77ba7efd
+MISC metadata.xml 300 BLAKE2B 5bd0efee346b2d954d36b1dd83e1d8ef54944ec7f7fb3a88bdcba73b2f85d0236cd638f763388ed43a30c44f9db5b83223310d66232731e6d37ef57315c04129 SHA512 0a233cbfe081cd55c76d8229261f1d8d8a8bf1435886c36e938a3a059a2db9b44bed165b7aeddbe568756a3e19e3cbd12dbee659a5a8eb2feea21c5f2ab35d22
diff --git a/dev-libs/zziplib/metadata.xml b/dev-libs/zziplib/metadata.xml
index ba9e3444e762..5b652428f205 100644
--- a/dev-libs/zziplib/metadata.xml
+++ b/dev-libs/zziplib/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>gentoo@pogatzki.net</email>
-		<name>Volkmar W. Pogatzki</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">gdraheim/zziplib</remote-id>
 		<remote-id type="sourceforge">zziplib</remote-id>
diff --git a/dev-libs/zziplib/zziplib-0.13.72-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.72-r1.ebuild
new file mode 100644
index 000000000000..40f017c176cd
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.72-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
+HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
+SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="sdl static-libs"
+
+# Tests require internet access
+# https://github.com/gdraheim/zziplib/issues/24
+
+BDEPEND="
+	${PYTHON_DEPS}
+"
+DEPEND="
+	sys-libs/zlib
+	sdl? ( >=media-libs/libsdl-1.2.6 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# https://github.com/gdraheim/zziplib/commit/f3bfc0dd6663b7df272cc0cf17f48838ad724a2f#diff-b7b1e314614cf326c6e2b6eba1540682R100
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DZZIPSDL="$(usex sdl)"
+		-DBUILD_STATIC_LIBS="$(usex static-libs)"
+		-DBUILD_TESTS=OFF
+		-DZZIPTEST=OFF
+		-DZZIPDOCS=ON
+		-DZZIPWRAP=OFF
+	)
+
+	cmake_src_configure
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /dev-libs
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)