gentoo resync : 06.04.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-04-06 22:33:41 +0100
commit: e68d405c5d712af4387159df07e226217bdda049 (patch)
tree: 009ab0f3d427f0813e62930d71802cb054c07e30 /dev-libs
parent: 401101f9c8077911929d3f2b60a37098460a5d89 (diff)
115 files changed, 2108 insertions, 754 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index df61e3e0e75c..a4bab2f1c6cb 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 4a629e6374f9..844f1383dfd9 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,4 +1,4 @@
 AUX appstream-0.14.3-disable-Werror-flags.patch 449 BLAKE2B e6513b3c64b5f99afe8aa231d1885c157a8fb1a0849ddd4e2c015a87df58965ec6ae9c36b536bfdd3969ead61215686021f5e39274e00d9179e7e00c1f975aad SHA512 2e9e2597df81015c2eb91dabd39d3cbb6bcf01b3732a35e68e08e52df40e80edfade620e525d480f46126b5c1080027516a13a524da11d71f5c63844ce714ba6
 DIST AppStream-0.14.6.tar.xz 2403088 BLAKE2B 1eb85601c1782fc47ff21983517f301dc9493fb60347cfe8072c277cc4415e80bf6c11a93db80b6d7fe1eeda7ff1fa414fd10ce7ef0d7379b415326407d805b8 SHA512 810aa7427df50793f4bed27cc3cb5b72c156f0c582f241e06131aa8eabe82d59c8ac0bcc37a22877f7a19ac4640a9a831f8b567ce3e2d26a41ce999515affdb0
-EBUILD appstream-0.14.6.ebuild 1788 BLAKE2B 6caa408ff4ce96c547fddae9396d6e92d9721febf16d73c32052a93bbfe47add052c4b49185d8616eee1aa79ad3f69a9cac2caa5c6f4ff807063746f3db4ddb6 SHA512 b615ef8dc0d8ea2f87cff9c7b98c3c14eb2dd08369f69ff0119e735a40344fac6b370dcddcf78dc6e74f7433b7c0c81d5868d544cb1450affd846c8e694a377c
+EBUILD appstream-0.14.6.ebuild 1793 BLAKE2B 89217e43939efb668bce81eca458000961027308fd9dd7d1af3ae22f38a8d8ac8e8faabc32be7b2612c20fcd519f8e04c44149288d6313dbf855e78a4b2c584b SHA512 6a42df221f26a033fc454e3e438795f86c42b9a19e278cf6bb7236ca81b483d632738f24b8ed1886205da8293cb34adb51a470cb693f94d012e1fb97c6413168
 MISC metadata.xml 400 BLAKE2B c9855a1e3650a66c8b42fb9055d6de0aa0575ed86bb1e8695d112f2e7cdfbd5f55d6805dfeb0ed19c3354ee3cda8208fd8a4adf4e8313e791493fa1730fb32d9 SHA512 9723ac7481f748429bddde7579b81c7db2dfad2ecd5150c1c4023843c5ef47e02ce41ff43508437ae60ba427a072d09e8d46a6e6b82fc946ea3af71dd71c52f2
diff --git a/dev-libs/appstream/appstream-0.14.6.ebuild b/dev-libs/appstream/appstream-0.14.6.ebuild
index a67f828fd48f..c3f1c76f134e 100644
--- a/dev-libs/appstream/appstream-0.14.6.ebuild
+++ b/dev-libs/appstream/appstream-0.14.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
 	S="${WORKDIR}/AppStream-${PV}"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 729d0a77fcc5..29062cc664b4 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,3 +1,5 @@
 DIST atk-2.36.0.tar.xz 299100 BLAKE2B 46f0cc10052788643c09e27e36a3f74439864cf5c8fdfcf5850e3e7df596ac8a2a3dd8a01856503d43995ff1cc36ec0ca63884133f2c5f4a3634aad2c5119997 SHA512 d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634
+DIST atk-2.38.0.tar.xz 303952 BLAKE2B c89e13e413ea46667d94a3555a1764ee22be353b90b0940735fceaad823403026503c463b3ad200fa176ee4faee6dd3cf421542bf1e1a9dbc9a4844ae2963874 SHA512 dffd0a0814a9183027c38a985d86cb6544858e9e7d655843e153440467957d6bc1abd9c9479a57078aea018053410438a30a9befb7414dc79020b223cd2c774b
 EBUILD atk-2.36.0.ebuild 951 BLAKE2B 77085bb69eceb75d2a26db9cb6c74f90e4941f67d28e0b24f6e8ee5d08bfe2b026510cc71b63ebc34e404098db1e2eeed1792e5799ec64ece2b255e68c6df5ac SHA512 7f9ae82551d386b4b8b71c45eaa9749f369c767478a14e798a028be47897ac18ace5ed90f4d3d0c4d5279835d3f8129d0a97b374f7c840b9532ab87fc9bf80ce
+EBUILD atk-2.38.0.ebuild 959 BLAKE2B dc494882a26cbf34627f296c33a423cbc0d7ddf567de6eda55d7a2483dbeba786b9949b32145bc1547722c34f8e70caed143bfa04f46fdb201441f64431b0925 SHA512 60b9f597877878409f230a42873bcfcdb48310f7afaec986bd6a6fb4afe8c2990ad8acfdad8d5381596a87d80a8bda1d28280cd140b0a4d4bcd5a0cf62217e25
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/atk/atk-2.38.0.ebuild b/dev-libs/atk/atk-2.38.0.ebuild
new file mode 100644
index 000000000000..510b8b59fa7c
--- /dev/null
+++ b/dev-libs/atk/atk-2.38.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org meson-multilib xdg
+
+DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+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 ~x86-winnt"
+IUSE="gtk-doc +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3 )
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.19.8
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_bool gtk-doc docs)
+		$(meson_native_use_bool introspection)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/cereal/Manifest b/dev-libs/cereal/Manifest
index b9ea89fb52c4..961884d8e8bc 100644
--- a/dev-libs/cereal/Manifest
+++ b/dev-libs/cereal/Manifest
@@ -2,6 +2,6 @@ DIST cereal-1.3.0-fix-doctest.patch 148684 BLAKE2B 6ab6263db5b787b3ae41b9c177df1
 DIST cereal-1.3.0.tar.gz 374585 BLAKE2B 67bcdf8715585d8913c6ae4ff1a20d77df0eb95816b37a77620a3f08000b6e911afbd295236a6cd0394d3242ae0a3b2619f6e168503724517c9c66bc20f1d07c SHA512 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72
 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
+EBUILD cereal-1.3.2-r2.ebuild 1179 BLAKE2B 317830a782bf36f6cc5d0ed66d09500798a2853ed9553cb56057d7682531e3af46d16e51e0f2b08a849211ef5d4583a0e8307dcc6d708672e986b04427023428 SHA512 244c0e26bf2afb1e3023a6f254214b74b8dbd273ae4f09742779302408da25f68c3b60f1f911e8aa5b016581332f083303a0e6e18b3a23e77b6052b99abc9225
+EBUILD cereal-1.3.2.ebuild 822 BLAKE2B 4599c212ad8eb6f2d8354355fcfce5b8cb8732b4bcce8e12c5dd3afbaa4358d57cb1177d70e0bc8a0fe05a232488903cfc1269cdfe27e08648fea3bd4cf82b61 SHA512 b8420176989887f0f13f857710095050c687cc56bb532a4e9e14c9a21e2a8b700e65cb109b1fcb96603557791a6ea497734e2985b72d06be872096f563e0d568
 MISC metadata.xml 395 BLAKE2B 6a5de4941e400c48ca8148af6748f2054614eb28337e6f8ea6f282c4fa961c8f60a57fe2e98f87cefd32cd72de32c4cbe2d13f8f7bfc91d6ba1cbdc42adcf200 SHA512 344f769d49106b234ccaa39934eb2531f2161a018c302efd27bad57f072e7ee41501f8b3c189694a9059a6ef24053ea80219307a910f64838e9c0ff51588c850
diff --git a/dev-libs/cereal/cereal-1.3.2-r1.ebuild b/dev-libs/cereal/cereal-1.3.2-r2.ebuild
index 3a40d8fa882d..da3bf9c69469 100644
--- a/dev-libs/cereal/cereal-1.3.2-r1.ebuild
+++ b/dev-libs/cereal/cereal-1.3.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -25,6 +25,9 @@ src_prepare() {
 
 	# remove bundled rapidjson
 	rm -r include/cereal/external/rapidjson || die 'could not remove bundled rapidjson'
+	sed -e '/rapidjson/s|cereal/external/||' \
+		-e 's/CEREAL_RAPIDJSON_NAMESPACE/rapidjson/g' \
+		-i include/cereal/archives/json.hpp || die
 
 	cmake_src_prepare
 }
@@ -41,5 +44,8 @@ src_configure() {
 		-DWITH_WERROR=OFF
 	)
 
+	# TODO: Enable if multilib?
+	use test && mycmakeargs+=( -DSKIP_PORTABILITY_TEST=ON )
+
 	cmake_src_configure
 }
diff --git a/dev-libs/cereal/cereal-1.3.2.ebuild b/dev-libs/cereal/cereal-1.3.2.ebuild
index 807b51bc4c74..f342726f1ea8 100644
--- a/dev-libs/cereal/cereal-1.3.2.ebuild
+++ b/dev-libs/cereal/cereal-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/device-atlas-api-c/Manifest b/dev-libs/device-atlas-api-c/Manifest
deleted file mode 100644
index c1e5e1fe0519..000000000000
--- a/dev-libs/device-atlas-api-c/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 2.1.4-src-cmakelists.patch 1496 BLAKE2B 879dfb7943eee4c03791c25b1f73d5a1d1cdab07f5144f46891d610492dffd61dfa0cd03afb35177740615549a81ac403d0f4009992cb78d46fccb2f20efe922 SHA512 1f9097accda72d10bf5201110fc5ae099d99e4a6573ac30fac399744b88ce9957f6fa82e8c11275663e028865c8c4b376d07ba8894785b57e8324e6e2ea81f2c
-DIST deviceatlas-enterprise-c-2.1.4.tgz 51756 BLAKE2B f8dafdf31b608890da07214e14e9b2ec558e2c9c94c394a04c554e915cc1d4e2e886be1c0932353b0a68efaf90f190157696a2575db6ff2a86bbca3b492bc427 SHA512 5ea765738560c6dbc90799426f6bc0e6eb5e7775fa005279f046a68a4a984305ef99ae8b943dd9d32f88d88c1d24b6c09145643fa64a90eb834fc4a6ece05008
-EBUILD device-atlas-api-c-2.1.4.ebuild 992 BLAKE2B a82dc8b3f1e78572763a771cd8a59d80c719b6613e1591ed074864512811c0b3e3a5cf84e34a161c5312d7669a686b3072333a6e51d36dcaac1d98a4d91effe5 SHA512 bc9272a8efb0a99008403dc981d662a86800cd92e462a3c9d0c517b0ffb83a19d7a711abc3675a384d23d0a77a4b32b43755c81153bfacbf4ed0ca27d65a6486
-MISC metadata.xml 825 BLAKE2B e89864cd72277384374298687208ed42e2bb73bda2b7674b4bf20324334f6dc0139edcb74f5ceb71818bb40ebfa92e1ef1aaec79c4e339a8f1604dc0bd9c916b SHA512 b3547039be329be3cc8ecc83e311e3910855ac24056ea14f3245dd4749fd2db9cbfdbb94cc2cc9158a8a7115f529c67d24da6932c511bbabb38dced157e1f20e
diff --git a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.4.ebuild b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.4.ebuild
deleted file mode 100644
index 1f91f978318a..000000000000
--- a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake-multilib
-
-MY_P="deviceatlas-enterprise-c-${PV/_p/_}"
-
-DESCRIPTION="API to detect devices based on the User-Agent HTTP header"
-HOMEPAGE="https://deviceatlas.com"
-SRC_URI="${MY_P}.tgz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
-DEPEND="
-	${RDEPEND}"
-
-RESTRICT="fetch mirror bindist"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-src-cmakelists.patch"
-)
-
-pkg_nofetch() {
-	eerror "Please go to https://deviceatlas.com/deviceatlas-haproxy-module"
-	eerror "And download DeviceAtlas C API"
-	eerror "Save the file as ${MY_P}.tgz in your DISTDIR directory."
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		local -a HTML_DOCS=( Documentation )
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc -r Examples/.
-	fi
-
-	einstalldocs
-}
diff --git a/dev-libs/device-atlas-api-c/files/2.1.4-src-cmakelists.patch b/dev-libs/device-atlas-api-c/files/2.1.4-src-cmakelists.patch
deleted file mode 100644
index d66fdad8e4dc..000000000000
--- a/dev-libs/device-atlas-api-c/files/2.1.4-src-cmakelists.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/Src/CMakeLists.txt
-+++ b/Src/CMakeLists.txt
-@@ -11,6 +11,7 @@ if (NOT LIBTYPE)
-     set(LIBTYPE SHARED)
- endif()
- 
-+include(GNUInstallDirs)
- message(STATUS "${CMAKE_BUILD_TYPE} version")
- 
- include_directories(${PCRE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-@@ -33,11 +34,11 @@ set_target_properties(ci PROPERTIES SOVERSION ${CI_API_VERSION})
- 
- if(UNIX)
-     if(NOT APPLE)
--        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libda.so ${CMAKE_CURRENT_BINARY_DIR}/libda.so.${DA_API_VERSION} DESTINATION /usr/local/lib)
--        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libci.so ${CMAKE_CURRENT_BINARY_DIR}/libci.so.${CI_API_VERSION} DESTINATION /usr/local/lib)
-+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libda.so ${CMAKE_CURRENT_BINARY_DIR}/libda.so.${DA_API_VERSION} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libci.so ${CMAKE_CURRENT_BINARY_DIR}/libci.so.${CI_API_VERSION} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-     else()
-         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libda.dylib ${CMAKE_CURRENT_BINARY_DIR}/libda.${DA_API_VERSION}.dylib DESTINATION /usr/local/lib)
-         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libci.dylib ${CMAKE_CURRENT_BINARY_DIR}/libci.${CI_API_VERSION}.dylib DESTINATION /usr/local/lib)
-     endif()
--    install(FILES dac.h dac_json.h ci.h ci_priv.h ci_fwd.h DESTINATION /usr/local/include)
-+    install(FILES dac.h dac_json.h ci.h ci_priv.h ci_fwd.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- endif()
diff --git a/dev-libs/device-atlas-api-c/metadata.xml b/dev-libs/device-atlas-api-c/metadata.xml
deleted file mode 100644
index 715b905568b1..000000000000
--- a/dev-libs/device-atlas-api-c/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person" proxied="yes">
-        <email>bertrand@jacquin.bzh</email>
-        <name>Bertrand Jacquin</name>
-    </maintainer>
-    <maintainer type="project" proxied="proxy">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <longdescription>
-        DeviceAtlas is the de facto standard for device data across the web, telco, advertising and digital marketing sectors. As the only solution that is indexed for both web and mobile operator environments, DeviceAtlas' patented technology provides a common device identifier to understand device traffic across all connected environments.
-    </longdescription>
-</pkgmetadata>
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 78cb8a5dff83..a3c41b552f7e 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,5 +1,7 @@
 DIST expat-2.4.6.tar.xz 452468 BLAKE2B 8b30acc2628e3ce67ee57a4c9bee232f89f49ee70901588f7f5a34844e459cbc447fd225a734078100e52c96a73aa1f016e4f2d51d9a079128d661d97b2213c0 SHA512 830b00dbdfb92ef5cab69d783762a78443cd7d834bccda072d103c6178327cf480bde579089b1c3be884e67ddb862178fa734bd7e1f992f6f0ca29d83e21d737
 DIST expat-2.4.7.tar.xz 454136 BLAKE2B 441616f44ce585f75a67a3ebc2264e5723df55975dbfa9a9279039d3773d9e5a4b37c70a8e26787bbc8742fbc66a077e6845b540df6fede936d98065587fe3ac SHA512 e1a16cd48fcd6c4974dc7058d2e0284e0f91565835ec93f16d3f2c79647124470e5edb9f88f1ab9df5f403883a527750a4d63b941bd26fd43c05cd6f42bdcc48
+DIST expat-2.4.8.tar.xz 454428 BLAKE2B 25da91fdcdefe81740cc8129fa52bf4ceb0bbbee11f0d750485424dbc638f5fba8c30007d0f0b0e3ff5c84fe197b9b220852976272dfe5d6cc451d114297c2d7 SHA512 d19b0d6469537aed20c54bd9cfa4089d39e4acaaddde57809de7c6aec55dc870677c02480e7f65dac5620bd5454b889370453613518f9da647c74a831a2a1b7b
 EBUILD expat-2.4.6.ebuild 2277 BLAKE2B 5e2039ed2e5604aafde9f4ae1b61a931c3c8e7bade01349eb804e62efc12650ae0ead3531672df8064c7dcb9a257cf00314ed7c6a591b10731a465cc9279697d SHA512 e69a6ec9a906245e8d884cb5019b68644f0e86a48fb5d30d012c588442db761b3bdb115f5ab4c7e50e36251a0edf22389ead0f36823db59a6a9d873dbc10ca82
 EBUILD expat-2.4.7.ebuild 2277 BLAKE2B 5e2039ed2e5604aafde9f4ae1b61a931c3c8e7bade01349eb804e62efc12650ae0ead3531672df8064c7dcb9a257cf00314ed7c6a591b10731a465cc9279697d SHA512 e69a6ec9a906245e8d884cb5019b68644f0e86a48fb5d30d012c588442db761b3bdb115f5ab4c7e50e36251a0edf22389ead0f36823db59a6a9d873dbc10ca82
+EBUILD expat-2.4.8.ebuild 2285 BLAKE2B dd2061f953c915e133c608b5aef2e1f63fe546a92fc02e00e936ebe2fc91d9cdd9299510c9e742b3682de6184f6cf5cfbd4cd337d42c7efd4c0c7af8b4bfed5f SHA512 a81794a0eb965a9adbd7762abcf4765abac6078f3d10874306f594c66cb1abb6b01fe346e0bd12fae249127dcf6accbbf5d9c3efc05fb2e1d66264462bf404b4
 MISC metadata.xml 514 BLAKE2B e38c182f42192e0f3b567423b148733b59ed885cca58d36829dfd57bad88565baca743024aa5fc701f368fcfc8886a92ae20a94f549e190a3d31e2ca5c0e28af SHA512 6248f12ed1f3e2bc10d7f11117ad18dc86ccb5ecc1fc48aac32032a062d1273e956cd22e712a1b14cc670642047f9dcaf63606dbad08895e1e3b94b0573bd74c
diff --git a/dev-libs/expat/expat-2.4.8.ebuild b/dev-libs/expat/expat-2.4.8.ebuild
new file mode 100644
index 000000000000..f397e99485c2
--- /dev/null
+++ b/dev-libs/expat/expat-2.4.8.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+AUTOTOOLS_AUTO_DEPEND=no
+AT_NOEAUTOHEADER=yes  # because expat_config.h.in would need post-processing
+inherit autotools multilib-minimal
+
+DESCRIPTION="Stream-oriented XML parser library"
+HOMEPAGE="https://libexpat.github.io/"
+SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
+
+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"
+IUSE="examples static-libs unicode"
+BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+
+	# fix interpreter to be a recent/good shell
+	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
+	if use unicode; then
+		cp -R "${S}" "${S}"w || die
+		pushd "${S}"w >/dev/null
+		find -name Makefile.am \
+			-exec sed \
+			-e 's,libexpat\.la,libexpatw.la,' \
+			-e 's,libexpat_la,libexpatw_la,' \
+			-i {} + || die
+		eautoreconf
+		popd >/dev/null
+	fi
+}
+
+multilib_src_configure() {
+	local myconf="$(use_enable static-libs static) --without-docbook"
+
+	mkdir -p "${BUILD_DIR}"w || die
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
+		popd >/dev/null
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_compile() {
+	emake
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib
+		popd >/dev/null
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib install DESTDIR="${D}"
+		popd >/dev/null
+
+		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
+		cp expat.pc expatw.pc
+		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
+		popd >/dev/null
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	doman doc/xmlwf.1
+
+	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
+	docinto html
+	dodoc doc/*.{css,html}
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.c
+		docompress -x usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index d03e4d5bf67b..43df6db2a94b 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,3 +1,5 @@
 DIST folks-0.15.4.tar.xz 493004 BLAKE2B 0e067a39b4e89e8fa41b20f37c774e56fcb1e0c8de23798ced647177b0d9329509ae3c03ff85a00464887deb4ce275c96b2fcf50aa2dd44af02e20b6ee45fe65 SHA512 4dbd0bb82d56a8cb179ab8148ce531817ccd55bd40f8b562eb0d77555b264e5190669b356ff009c81a963fdcacaabc02fe871bf0c3c668a648f2c820da76f25c
+DIST folks-0.15.5.tar.xz 492976 BLAKE2B bb831a637dec44ba0e9bb815c2559e3b7f484734fc297293c392bb2c72dea77c5e8aec3e7c76a096288f84f463041fb0b52a3cb50a83c5d84bed818c6af72a27 SHA512 696d158234cc5b4c504491c6e01dc45ed53c4ac02e3e62e637d229207dde396a82a850d143d8615dc838d99c756edfce145405ea3972c556951d6408fb8487ea
 EBUILD folks-0.15.4.ebuild 2348 BLAKE2B 2a6b299326aa74168affff44885f41d61895e91b6c9785a89973abd6c17cd458248cf7e5a956be272bc8181cc68dca44984fd6a2534b402b52356ee85825c7ab SHA512 e0b5a04ee0215820366a79dac1acac2003c17241f0880dbbbc25c6731d065168783812bbd9feea2a1268c462910d367eccdf6671760a6aa7af7298eb78077f73
+EBUILD folks-0.15.5.ebuild 2341 BLAKE2B c4fb6b3a4df8108e1f965e9209b573abf6f0957e82a071c8e202c4d4b221c8d0b212c4d2a57f6c6e492ac70696434e632b97cf19a591d8d75219be90e387d2d5 SHA512 f8c5c669b91e0fda9c740090a245126327864cef1bd024800714f66a4c0ff70e22e54b5a23c8128914b60c8e616e9c25d6d1f9eb6cd2f628eb284a77bfdff840
 MISC metadata.xml 396 BLAKE2B f4e55d5af852a227b66080749510b9915ac9c3f7081c88051f06be73465235ccc326db015238366e62c40d6e8027eac233644ad8421eb0b59f881e2ec215a1e2 SHA512 4a6a15a7ecee35f43c7f82d24e82c32ca3811058f5135e473e15bcae21fc3023d61a6c9f638c9d97336baef3fa8126ab31a49eb036545f521dab2bf93c2a0f0a
diff --git a/dev-libs/folks/folks-0.15.5.ebuild b/dev-libs/folks/folks-0.15.5.ebuild
new file mode 100644
index 000000000000..9ee2c090d991
--- /dev/null
+++ b/dev-libs/folks/folks-0.15.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_MIN_API_VERSION="0.48"
+PYTHON_COMPAT=( python3_{8..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
+		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+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/girara/Manifest b/dev-libs/girara/Manifest
index c590e3c77cc3..7b4fb5771248 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,8 @@
 DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84
 DIST girara-0.3.6.tar.xz 60056 BLAKE2B 4a9f651e2127c7924cd3e55c7f955b3f80b90849b5ee06f2785388ae3adbb8910bb90e59f934f426fdb6d8e7d797ac82a52bc7b05becff56e1aff610e5e56081 SHA512 e9496b1bb629d59377ed1fee8a2fab2c7e5d60845e6777ed9bb796e1843fea20abda32d7de885f01e892654ea996490403c442021528b6b4f2aa50cf54d74c42
+DIST girara-0.3.7.tar.xz 60352 BLAKE2B 59515baf53d3ef46d98d5720437c253c82637df8380abe04a1649d4a2636124d6d0dfb001c9363d8a33a1bc496511e90b8c5365db34a29d489802fc780575d2a SHA512 9b91ef7e5047b3250327eab9280372f38615e9948884c108c3d1c5d3e81794f786adc827692b112d2bfdc2660e22206a143fafd5a814408df8ffd4c858148717
 EBUILD girara-0.3.5.ebuild 964 BLAKE2B 51d28f0e2c7655adcaebc3951b12895ec5adeca8d066ef901c236f93f5ee6b1734d3b98f6e2c85bd7b6aa00bbde60915e3fd15f01530365adfae7a4f1f4b18de SHA512 9540e0664f7c4ebfc3f856df9e78bed86dcf98403fbc43a2971635014a1968b63b1ee8257b35ca2eabdc2c989f0afa9dd76433aa94a09bde4ff3e1aee9500c30
 EBUILD girara-0.3.6.ebuild 964 BLAKE2B 51d28f0e2c7655adcaebc3951b12895ec5adeca8d066ef901c236f93f5ee6b1734d3b98f6e2c85bd7b6aa00bbde60915e3fd15f01530365adfae7a4f1f4b18de SHA512 9540e0664f7c4ebfc3f856df9e78bed86dcf98403fbc43a2971635014a1968b63b1ee8257b35ca2eabdc2c989f0afa9dd76433aa94a09bde4ff3e1aee9500c30
+EBUILD girara-0.3.7.ebuild 967 BLAKE2B 452082b511f4f1d49bf246de600a11243f525f3544ce13b82135bbc3bdb7896f6ab1d5b0af8fe61f81f4c084f646fece120c2642271c474b82bc8526efd112a7 SHA512 f2e61ad1796ece5c32450c9fe02958bccb55c4cd043883bc2c46184092e6620d4da66d4d743e07cd1adf839b82cb5b1d093bdf9c2e59b96fd5d3942943ff89c6
 EBUILD girara-9999.ebuild 1102 BLAKE2B 7d305110e6e6c72090a938d9f4c46f39f58a9cdf6cc5eb704b43c683772e069f9888f2bc4ec59e2ab1a8fefb64d0be165db2d8412383b4b3e0a5d78cc7e02192 SHA512 f0f8a6a60d25c2525b2724fb8143f6dfccfc5cb05cae8c1acf350575ddabf80fd4f1066797f9556a839f824a4a87e0c9ebcbbd5a2169e764232eaeb157cab3f4
-MISC metadata.xml 582 BLAKE2B 2ec3bae683d84fb4fd9fbf5114606ac1191df2ca8ac2fdf46b5b4da32999342af02881c67b96df28b39499bed88db1a6512922df437b2a3335fdf62ee56a57bd SHA512 86df21ee24a4f91bbe8329b197ebe7b327ffaa1949c66d7cea4a3cb955aeafa122192c2d2178234b014d5e3824a041641243ebc9869a789d5238942fd6c200cf
+MISC metadata.xml 667 BLAKE2B 67e62f5e585aa25094c1b1610a1c2796db659db5dc667f96aca37eb5900c9d079655b542b9bd2fe5a8e9a3a34c5e9c83fb2f75100f488847ef23305fbe92d9f5 SHA512 3449fc93878dd48d23f608f03e70a11b498a88a823555bc706f50ccff0612eff0de86bc832f4ac980b0cd46367efd8c382a3e34f6b944b8d80582c8d0a5fe3ae
diff --git a/dev-libs/girara/girara-0.3.7.ebuild b/dev-libs/girara/girara-0.3.7.ebuild
new file mode 100644
index 000000000000..4369250666d4
--- /dev/null
+++ b/dev-libs/girara/girara-0.3.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="UI library that focuses on simplicity and minimalism"
+HOMEPAGE="https://pwmt.org/projects/girara/"
+
+if [[ ${PV} == *999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc libnotify test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/glib:2
+	dev-libs/json-c:=
+	>=x11-libs/gtk+-3.20:3
+	libnotify? ( x11-libs/libnotify )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )
+	test? ( dev-libs/check )
+	virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		-Djson=enabled
+		-Ddocs=$(usex doc enabled disabled)
+		-Dnotify=$(usex libnotify enabled disabled)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/girara/metadata.xml b/dev-libs/girara/metadata.xml
index 71bb9e0c6245..4311c033d558 100644
--- a/dev-libs/girara/metadata.xml
+++ b/dev-libs/girara/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>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 		<email>mlq@pwmt.org</email>
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index e5d9a92bc0e5..9e8d785e6325 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -1,3 +1,5 @@
 DIST inih-53.tar.gz 16984 BLAKE2B 1242e6273c9dd9a11ea026a3495a487b2aa72d8e01f34304d8568c88897ae9c9bb425246f992dc16f4dc2210ec14c597d0ef595cec84ff98a5d6101ee5a643b9 SHA512 99bc40c294b521e9973184bfb30d60c129735991f33b387b3d023827a34672b0489eadf91e38895ea725168dbc7b27bb02c1975debe7573b4b209d0e947b2100
+DIST inih-55.tar.gz 18219 BLAKE2B 28b5e04e54e31b3e0392b44799a2c2e75c1fe00527491a857480b7e960302f2438d29652b131dae5147487c863d93f577b67aeff3ab5f863546d3661628d8236 SHA512 bcbef361a4400da017dbed811ad21672b58512d2b2b537cc0058cdeca709dd0d5a9def4045ce1c1972873c3d3d35182123337e4388676f6f0d16e8dbff967b0f
 EBUILD inih-53.ebuild 747 BLAKE2B 5694c1e0baae77e8bd82fbd66a96b641eee7fb4178100bcab61b9ee024a101506082d93625890f03adb793a71f63c93e81dd61ed43ea975ffade70aba6e5ff12 SHA512 f44c07465946ceae89fbfe11ef379145bf77c5cc8b33f9934405e3e2202f0d7c1040d1f6f1ca507d52d2c27d7c52fb268be75c10852ce9569b871ede0712ba6c
+EBUILD inih-55.ebuild 767 BLAKE2B 04d534baf6ef853122db7848ce278efb3a50be766a3cdc905d0e276c1c26c0c30a59b4273d9d2b9aa983399a8e1d1785e3ec1657e51f658b72fed03842c3aa7b SHA512 693b5899621026539e5594a869b0de424ae6f00913e40625888fedb449adff3bd7c80571e909e4a5f86d7a0241ab63ba70db4833f463a3da7614f26f0645883f
 MISC metadata.xml 520 BLAKE2B d067b0d423cb2ecdeee888a8b6588c1ee3a47d9080a83d0288736fd31d2521956e6dfb970d612ca27f3c9da8103f37e3dd3245eba9b57f9a1ce4d8631695da14 SHA512 47fafee9e35a1827b8d68ab35fea44e8895658dbdd77628f03d31160bbeb915e2cdad81a17c0530d3b0de713fd141999949992feb4c98fabf2ed9bcf717e6b1f
diff --git a/dev-libs/inih/inih-55.ebuild b/dev-libs/inih/inih-55.ebuild
new file mode 100644
index 000000000000..aaed5ec77fd5
--- /dev/null
+++ b/dev-libs/inih/inih-55.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Tests not wired up to meson and don't seem to be intended for downstream use yet
+# e.g. hardcoding gcc, just a shell script
+
+inherit meson-multilib
+
+DESCRIPTION="inih (INI not invented here) simple .INI file parser"
+HOMEPAGE="https://github.com/benhoyt/inih"
+
+SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+S="${WORKDIR}/inih-r${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+
+DOCS=( README.md )
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=shared
+		-Ddistro_install=true
+		-Dwith_INIReader=true
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/injeqt/Manifest b/dev-libs/injeqt/Manifest
deleted file mode 100644
index 8630f84c7bab..000000000000
--- a/dev-libs/injeqt/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX injeqt-1.2.0-gcc7.patch 588 BLAKE2B a2baa067eb643613bdedc1b0249cd3aa9bcc5e0e1e06eb828e8ac8af73042836299d68cd1972c927d31e6f79780dc6439806b8292d7516b65f26fcf1f21972ef SHA512 d61fefd0150b5429123ba4fc3a361e22f3663a7cdd14a8244537ff82d042479e04c254b2521761a05032c25e265ad4a42f4a48f8b546a42dd9f66787e49bc5c7
-AUX injeqt-1.2.0-no-Werror.patch 716 BLAKE2B 3c16470c0f40a96fc46a8a194d8cc5f9ed936c0df9ee977fa74355ecbc99aa00bd726d1c8b6269f1b644d09ee624fb7ef20c49de400351cc668ded695b66b7ea SHA512 ea31cd3e81d06d601bddbc0fa007f3916d733c22854e809c903239d3f04d845954449e243ac02afbdfdfceb39efbca36cfc48a0fb88b3bed81c498c23756f55a
-DIST injeqt-1.2.0.tar.gz 73787 BLAKE2B 1b265c14a04dff8380297905f1b717c09baff6e24aedf473a36ff37be83d7e58b7ccae7df0eaf9690cee8c40d5646cb0af43a54427630db5595a9fa59d10e194 SHA512 4783f662af3b7711ef639695350bf136e84a218c8e2f0ddd8a44cb9790e1db5dcb69168fd46c21a82bd76eaebc01e5067e11be87823409d6ca032d2b95bfb880
-EBUILD injeqt-1.2.0.ebuild 738 BLAKE2B c20add47f5b127a20930daf9a7bca600a4001a4422473c6a9a610453014ce3dfc85667a3619fe470eff2a705776bd8d5a6e67acecc3c8f22011362278301ccb3 SHA512 8c4a84b349670ad2b809d4c66e385ed6a8dd9fbc5a4953481390d956a3743e9beec082b6907986fc73b6092a60c3acb641f65e0807c3ae5abf05c426b24d292e
-MISC metadata.xml 329 BLAKE2B b6e12614e3d32f0ff22645749a988f52e823c7402570b4f1a2dcf91d3d6454ec0b8c5f0905a81bea94bc15d905ce1424755dc7eebe6ad9ccdf478bfd783fe173 SHA512 8ff4589b8791c8b86e5c20d1885345521ac4b1b597eae160453a7dd8d5b03e868e138aa44522277d890e8b428e509b3f5570f3efcd56d6037e9404388802abce
diff --git a/dev-libs/injeqt/files/injeqt-1.2.0-gcc7.patch b/dev-libs/injeqt/files/injeqt-1.2.0-gcc7.patch
deleted file mode 100644
index 33e51ce739e0..000000000000
--- a/dev-libs/injeqt/files/injeqt-1.2.0-gcc7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From de025e0c472bdb2fcabbc9dc2fd443b91ab28e28 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bart=C5=82omiej=20Burdukiewicz?=
- <bartlomiej.burdukiewicz@gmail.com>
-Date: Wed, 24 May 2017 18:52:20 +0200
-Subject: [PATCH] fix compilation for GCC 7.1.0
-
----
- src/internal/containers.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/internal/containers.h b/src/internal/containers.h
-index 8da4298..78dd212 100644
---- a/src/internal/containers.h
-+++ b/src/internal/containers.h
-@@ -23,6 +23,7 @@
- #include "internal.h"
- 
- #include <algorithm>
-+#include <functional>
- #include <vector>
- 
- /**
diff --git a/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch b/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch
deleted file mode 100644
index ffb8aae9b1b7..000000000000
--- a/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN injeqt-1.2.0/CMakeLists.txt injeqt-my/CMakeLists.txt
---- injeqt-1.2.0/CMakeLists.txt	2017-04-21 11:40:08.000000000 +0200
-+++ injeqt-my/CMakeLists.txt	2020-10-14 02:04:12.645803149 +0200
-@@ -37,7 +37,7 @@
- 	cmake_policy (SET CMP0043 NEW)
- endif ()
- 
--set (WARNINGS "-Werror -W -Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -Woverloaded-virtual -Wnon-virtual-dtor -fno-common")
-+set (WARNINGS "-W -Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -Woverloaded-virtual -Wnon-virtual-dtor -fno-common")
- set (VISIBILITY "-fvisibility=hidden -fvisibility-inlines-hidden")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${WARNINGS} ${VISIBILITY}")
- 
diff --git a/dev-libs/injeqt/injeqt-1.2.0.ebuild b/dev-libs/injeqt/injeqt-1.2.0.ebuild
deleted file mode 100644
index 42410678e47c..000000000000
--- a/dev-libs/injeqt/injeqt-1.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Dependency injection framework for Qt5"
-HOMEPAGE="https://github.com/vogel/injeqt"
-SRC_URI="https://github.com/vogel/injeqt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.4.2:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qttest-5.4.2:5 )
-"
-
-# https://github.com/vogel/injeqt/issues/18
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc7.patch"
-	"${FILESDIR}/${PN}-1.2.0-no-Werror.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_EXAMPLES=ON
-		-DDISABLE_TESTS=$(usex !test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/injeqt/metadata.xml b/dev-libs/injeqt/metadata.xml
deleted file mode 100644
index f55520d1290a..000000000000
--- a/dev-libs/injeqt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>reavertm@gentoo.org</email>
-		<name>Maciej Mrozowski</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">vogel/injeqt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index f03864800796..4b5288fbaf1f 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,6 +1,9 @@
 AUX intel-compute-runtime-21.31.20514-no_Werror.patch 346 BLAKE2B 0ffeef51d3f2aa4ccd295cf1317b58343e39c7b32fe2acd52e45c0596c22b4c5fd3d301c333010abc3386b797c05d20860e61496444598c8f271b5e4b0f4fcae SHA512 932d80d81947c96f543f9d8704120e851f1004ba93718566f578610cbe8c2c65a131246bbc0e392135f866f277270d6bfe4424abca25f6cceedcfe17a4e800ba
+AUX intel-compute-runtime-22.12.22749-metrics.patch 1567 BLAKE2B 51f69ba75dca353b059b4dfaf8b98ebf221e03417247caa528511fb5b66d40d4950cec0eb3c7cd23f6722f2743a9e8bed110f065661b50fb36c8e9f65c440acf SHA512 d71e25194d2dc13284c6939c094bd9fed08adee4b8185078e20ba9aa128e5b2cdf5efcc6d2723687101144ec70d934b1b8fc1698e1295579603783a2e4220df3
 DIST intel-compute-runtime-21.46.21636.tar.gz 4878855 BLAKE2B 0ada296b36567038b2abeba50c2dae6604981f00cdfc0d5d9d197c793534c887fa1d321ced34b37cf6760bdc9e2b8769cdc24fe3884036b78b983660c90b1ee7 SHA512 a63436d049737b955f0e23bbfc78684f665f3d1a668120e803165839792144154f3f42a52c6533611711592ba6e41408d81196a61e318746b1dae1392d1d29ac
-DIST intel-compute-runtime-21.50.21939.tar.gz 5106368 BLAKE2B 3a8613c7178975bf930f0ccbed06d31952f05c8316e7735db759a7bcc8b81b5bd3040af62bae6e63fc9781ce2e6e8f035751cd6696b4c7cfbb6025f3d4fcfd8b SHA512 cabcb0fb9816ca8e6b93fa069c73926ccdaf3803c073b11f62477f80d38af49a7b4e814765a40e3daae50a6159560872c5b5123f64e68a570556c80d47a120c9
+DIST intel-compute-runtime-22.12.22749.tar.gz 5234659 BLAKE2B 162c4781561a131af51779108817d2a39ea9676e3772a776603c1e7670b03eddd800593a6e9d77d852476b2401582f3ff87c8b9582b5fa0769ab5ec48be6ba70 SHA512 16e4c76a38284d4e1470977845d338dc05195351ac53d63528e93f1990b81d03a8f1a31c53c665fb8e19b5dc9f4ce38ff392ee1158769780de7a7cb83b2b361b
+DIST intel-compute-runtime-22.13.22789.tar.gz 5252140 BLAKE2B 81fe85e75b1f6257771950dd2716e48f8db61dbe62f747c13ed00be7385c9e6a2f2cd2a5d50cf4253962d13bd1fdb4449a5e646fe3a8b10af228f746b9880210 SHA512 e4d22d8f73463300424b2df9a9634f0b5ac341131de33e57d46ffd52ce0b3fbdbf62cf591876d2143ca14caeba42ec95f5aef201eb9895e5d36b2279b15e661c
 EBUILD intel-compute-runtime-21.46.21636-r1.ebuild 1387 BLAKE2B 7a927c6d9cf7d1d4b80b4586fbd989e2cdf8877036c79df2db01054152d5db346f63856b0a37cd4e3bb800d38f918daaf44fc34d4306fb0f06287954ad281c3a SHA512 0fc688519ac6251963974264a7ecdd1f721c4ed02338e6358a25f84a036a81cca4a8e44c7191f5082cd3d687e7064e559f018b722267a33dcfbc889b756955bc
-EBUILD intel-compute-runtime-21.50.21939.ebuild 1388 BLAKE2B 23f2f41c1fe8831bd41f0cf16a50aa3b3b9daa6147eec61935757c3c09174af829c853b9d611cdd0983b1d3bfc5d4b13f5290132f11b0d675d617027deefd23d SHA512 14107ee44ab961b472423d393fad05944f613ba5d207b967ff9b832ab9c981ba32392761670d105f2ce524aaea10453b4919072273ded6a1c289e409406d35b0
+EBUILD intel-compute-runtime-22.12.22749.ebuild 1703 BLAKE2B b5bfcd69ed035bd4c07d74424def5b1f2d284f84d4cd8335d92efece424cd2131a8642d2b62ab70b2b7b886c89c4e6b5ec48caf615b12364566c3c2c69f99727 SHA512 72eb8e2a5f0644242946d3057a57a8c70e525f0cfb465cb4f0bdce5d1e104b54e8e1411a976db5030c33f260551c9d478dec371f63d3b7326585dcfc342d76ba
+EBUILD intel-compute-runtime-22.13.22789.ebuild 1644 BLAKE2B 6f6d93437ecc6904ee436f1c126c67a65ecf44039ed3de0e68f014841006458208d7e7276d93a3bcbfbe1f3d27ef55a29754bd928f8fc3f7cbb9063634773631 SHA512 fc63c5e226862c5c8ebfe7870cbf3af2797cff83c07c18a7dddb492eb2c7f343f2edffa337c9ee4dfc0eee2ea63359c75d1976168279519a176a5c06f4a74b09
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.12.22749-metrics.patch b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.12.22749-metrics.patch
new file mode 100644
index 000000000000..f1449916ea70
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-22.12.22749-metrics.patch
@@ -0,0 +1,37 @@
+From a968cb223ea60d476d191a1f61dd4791178aacb4 Mon Sep 17 00:00:00 2001
+From: Grzegorz Choinski <grzegorz.choinski@intel.com>
+Date: Fri, 11 Mar 2022 18:41:30 +0000
+Subject: [PATCH] disable metrics discovery detection
+
+Disabling metrics discovery detection due to conflicts that the name libmd
+creates with packages from ubuntu.
+
+Signed-off-by: Grzegorz Choinski <grzegorz.choinski@intel.com>
+---
+ cmake/find_metrics.cmake | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/find_metrics.cmake b/cmake/find_metrics.cmake
+index e97e1d20b66..89445229b30 100644
+--- a/cmake/find_metrics.cmake
++++ b/cmake/find_metrics.cmake
+@@ -28,7 +28,9 @@ function(dependency_detect COMPONENT_NAME DLL_NAME VAR_NAME REL_LOCATION IS_THIR
+       set(OLD_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
+       set(ENV{PKG_CONFIG_PATH} "${LIBRARY_DIR}/${__tmp_LIBDIR}/pkgconfig/")
+     endif()
+-    pkg_check_modules(NEO__${VAR_NAME} ${DLL_NAME})
++    if(NOT DLL_NAME STREQUAL "")
++      pkg_check_modules(NEO__${VAR_NAME} ${DLL_NAME})
++    endif()
+     if(DEFINED __tmp_LIBDIR)
+       set(ENV{PKG_CONFIG_PATH} ${OLD_PKG_CONFIG_PATH})
+     endif()
+@@ -76,7 +78,7 @@ if(NOT NEO__METRICS_LIBRARY_INCLUDE_DIR STREQUAL "")
+ endif()
+ 
+ # Metrics Discovery Detection
+-dependency_detect("Metrics Discovery" libmd METRICS_DISCOVERY "../metrics/discovery" TRUE)
++dependency_detect("Metrics Discovery" "" METRICS_DISCOVERY "../metrics/discovery" TRUE)
+ if(NOT NEO__METRICS_DISCOVERY_INCLUDE_DIR STREQUAL "")
+   include_directories("${NEO__METRICS_DISCOVERY_INCLUDE_DIR}")
+ endif()
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.12.22749.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.12.22749.ebuild
new file mode 100644
index 000000000000..4b6c563cdd2a
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.12.22749.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND=">=media-libs/gmmlib-22.0.2:="
+
+DEPEND="
+	${DEPEND}
+	dev-libs/intel-metrics-library
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.10713
+	>=dev-util/intel-graphics-system-controller-0.2.4
+	media-libs/mesa
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.7.15 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-22.12.22749-metrics.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+		-DSUPPORT_DG1="ON"
+
+		# See https://github.com/intel/intel-graphics-compiler/issues/204
+		-DNEO_DISABLE_BUILTINS_COMPILATION="ON"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="1"
+
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.50.21939.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.13.22789.ebuild
index 211c859a70c9..a58424820a2a 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.50.21939.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.13.22789.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=8
 
-inherit cmake
-
+CMAKE_BUILD_TYPE="Release"
 MY_PN="${PN/intel-/}"
 MY_P="${MY_PN}-${PV}"
 
+inherit cmake
+
 DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
 HOMEPAGE="https://github.com/intel/compute-runtime"
 SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -18,43 +19,48 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+l0 +vaapi"
 
-RDEPEND="
+RDEPEND=">=media-libs/gmmlib-22.0.2:="
+
+DEPEND="
+	${DEPEND}
+	dev-libs/intel-metrics-library
 	dev-libs/libnl:3
 	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.9389
+	>=dev-util/intel-graphics-compiler-1.0.10713
 	>=dev-util/intel-graphics-system-controller-0.2.4
-	>=media-libs/gmmlib-21.2.1:=
+	media-libs/mesa
 	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.6.2 )
+	l0? ( >=dev-libs/level-zero-1.7.15 )
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
 		x11-libs/libva
 	)
 "
 
-# for Khronos OpenGL headers
-DEPEND="
-	${RDEPEND}
-	media-libs/mesa
-"
-
 BDEPEND="virtual/pkgconfig"
 
 DOCS=( "README.md" "FAQ.md" )
 
-PATCHES=( "${FILESDIR}/${PN}-21.31.20514-no_Werror.patch" )
-
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
 		-DBUILD_WITH_L0="$(usex l0)"
 		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
 		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
 		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+		-DSUPPORT_DG1="ON"
+
+		# See https://github.com/intel/intel-graphics-compiler/issues/204
+		-DNEO_DISABLE_BUILTINS_COMPILATION="ON"
 
 		# If enabled, tests are automatically run during
 		# the compile phase and we cannot run them because
 		# they require permissions to access the hardware.
-		-DSKIP_UNIT_TESTS="ON"
+		-DSKIP_UNIT_TESTS="1"
+
+		-Wno-dev
 	)
 
 	cmake_src_configure
diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest
new file mode 100644
index 000000000000..f28140224819
--- /dev/null
+++ b/dev-libs/intel-metrics-library/Manifest
@@ -0,0 +1,3 @@
+DIST intel-metrics-library-0_pre20211123.tar.gz 227022 BLAKE2B c718c5972ae1cb8d36c65f541832a36c7107af1299c2cd4101df1180325a97fca5ca2066574ee0bbc31eaac35286c27a00b2c292058453b5fcf41d745585a0ad SHA512 e54d68c5b31c59258086f89d56ea819ed4a680901d65862361dd17e172be7806cf21be9999d907a0f59fe8c3295cab541402dc0f7c41a944f4aee1481356c2a9
+EBUILD intel-metrics-library-0_pre20211123.ebuild 621 BLAKE2B 63170347699c62c4b1c963bd7c0e250402601ea0a1675f450c21f2709cf30f018470df2d2c70866023d8ec6a46cb91b50f3e4aed942442d17e5f8485981513f2 SHA512 8ccebafcdf472f1d069f4932f49d103efb1df52e96efc605bde79d1eef797f2a8042ac35b0523dfe6f2bc6f82d73aa70785f6156d52363ef3e5256df50a0f94b
+MISC metadata.xml 904 BLAKE2B 9b29e523b88f3d4eef193b4ecd90f03bf74d4e8521d3691bcc3518fc4133e4a97142b2d0f9a1354d86ea913ca79fa74972e99fe63a21eee7bb0fee78dd414e25 SHA512 ea9cd435e8b72549945ca370d318a84d03d8330ea995f726aa29f6c6a8fb1f353c9b5c2eab2fc56a2e89ffa6beb019be2a291f3f64d7a8e5782efc0c3935cebd
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123.ebuild
new file mode 100644
index 000000000000..e06f9566edbb
--- /dev/null
+++ b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20211123.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+EGIT_COMMIT="3fd6eb0544fadcec2ac762aedee7c2d5d6479feb"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake
+
+DESCRIPTION="A user mode driver helper library that provides access to GPU performance counters"
+HOMEPAGE="https://github.com/intel/metrics-library"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="x11-libs/libdrm"
+RDEPEND="${RDEPEND}"
diff --git a/dev-libs/intel-metrics-library/metadata.xml b/dev-libs/intel-metrics-library/metadata.xml
new file mode 100644
index 000000000000..f431a6dd5217
--- /dev/null
+++ b/dev-libs/intel-metrics-library/metadata.xml
@@ -0,0 +1,28 @@
+<?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@taujhe.de</email>
+		<name>Jan Henke</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		This software is a user mode driver helper library
+		that provides access to GPU performance counters.
+
+		Supported Platforms are:
+		* Intel Processors with Gen9 graphics devices
+		* Intel Processors with Gen11 graphics devices
+		* Intel Processors with Gen12 graphics devices
+	</longdescription>
+	<upstream>
+		<remote-id type="github">intel/metrics-library</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/intel-vc-intrinsics/Manifest b/dev-libs/intel-vc-intrinsics/Manifest
new file mode 100644
index 000000000000..b19c0c2f9e55
--- /dev/null
+++ b/dev-libs/intel-vc-intrinsics/Manifest
@@ -0,0 +1,3 @@
+DIST intel-vc-intrinsics-0.1.0.tar.gz 135780 BLAKE2B cb7c84c14a1fb9655e59ad559e24b3d1072f88390bc2b29ea614217049225dc371395849a7af81607a098a42228a249bdfa09fa72874eee4e20a78a0c4371087 SHA512 683c012900acfe331f29c4e88c0a0b0a4e5d84b146faed56757a70d5f9a94678a03c18bd46e269606761e0da4cad5b31f12cb50101d5f810044615971d2b5b9f
+EBUILD intel-vc-intrinsics-0.1.0.ebuild 796 BLAKE2B 7aca53f0e4960198eea5c422fa1bc7c8fd55bf2ef66931f9e066b56a5757f9846db117df2c4694edf2452dd9a95b7db2ec5cdebadbda39c6249e0008fd300e4a SHA512 48767ec47155bd35ee1d9c3c4faa4ca18be7cb2364daa41312699aaccd7af949cd337e8e4dc22ccc3c0d2a530fc28a5f15014de38e597e37951ff985606c4497
+MISC metadata.xml 778 BLAKE2B 2e8e4d7f56f18f7e4eaa488cdab5d4578e779e8ac75fe96c3e7d5aeae5fc65291401d8ac54a0e89194c44a2146bca4cf9d321917bfab65a93f2118c688422cf4 SHA512 de2fc4d84a08fb98a41bb3e5f11d31535810e6f796aacaeacf784e1ed0fd7d99c5aa3a5e689fe22bbc7149518ea695979b4e66b6dd2b876e4cc9ad126564618c
diff --git a/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.1.0.ebuild b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.1.0.ebuild
new file mode 100644
index 000000000000..365759d0b864
--- /dev/null
+++ b/dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="13"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake llvm python-any-r1
+
+DESCRIPTION="A set of new intrinsics on top of core LLVM IR instructions"
+HOMEPAGE="https://github.com/intel/vc-intrinsics"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/libxml2:2=
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/intel-vc-intrinsics/metadata.xml b/dev-libs/intel-vc-intrinsics/metadata.xml
new file mode 100644
index 000000000000..923708506038
--- /dev/null
+++ b/dev-libs/intel-vc-intrinsics/metadata.xml
@@ -0,0 +1,24 @@
+<?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@taujhe.de</email>
+		<name>Jan Henke</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		VC Intrinsics project contains a set of new intrinsics on
+		top of core LLVM IR instructions that represent SIMD semantics
+		of a program targeting GPU.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">intel/vc-intrinsics</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index 6ba03a1449fb..2e4aedc6ba2a 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -1,4 +1,5 @@
 DIST keystone-0.9.2.tar.gz 4433222 BLAKE2B 5654ae6a66ccf6832fbdbb8c1083a2318e413bb833a0fadc4e1374f0de601e3dad9f354b1dec92d9a944621923458e432510299c1b55579ac9bb6b6e90a818de SHA512 5d4dd30410410bc7848e75a2e31e8ecef6241ad25e21963aa7a07bbea21d95b75e235c80573129014102684c9647710ace3c0776a8401844d7e4b45cab7bd04b
+EBUILD keystone-0.9.2-r1.ebuild 1876 BLAKE2B 7fd92cfbe29c99791a6e48cb44692dc2d950c0497ce2ef68d49563eee9a6f5eaa268d9fd2dc6988e2188546475f7647b1c4633c80b0faf1a916ff333a12580a9 SHA512 83a26421a5a6e87d77015d082c8e81bc9ddc91bd795814415e04e47a3f53c6aa2e25d676c7e1d0bc387899875155114a83110e2b8f608c7a9b40f7875e34fe94
 EBUILD keystone-0.9.2.ebuild 1874 BLAKE2B 8442127195f6743206a934710a65490bf59606ce5c1ffcfbe3c556e07c77bdcdd82f552a83add6fc9ba8f2aef51d7853c95959737f710f3e2c0896976c824b9d SHA512 a34b154e207ef7a644f6bd9bfefaec165668fd6d8e092cccd3db05a693884aa1941098db9ed0fe9e0e8d639fa1e2cdb196de56685f5cb8a83957a5cdafdc4d36
-EBUILD keystone-9999.ebuild 1874 BLAKE2B 8442127195f6743206a934710a65490bf59606ce5c1ffcfbe3c556e07c77bdcdd82f552a83add6fc9ba8f2aef51d7853c95959737f710f3e2c0896976c824b9d SHA512 a34b154e207ef7a644f6bd9bfefaec165668fd6d8e092cccd3db05a693884aa1941098db9ed0fe9e0e8d639fa1e2cdb196de56685f5cb8a83957a5cdafdc4d36
+EBUILD keystone-9999.ebuild 1876 BLAKE2B 7fd92cfbe29c99791a6e48cb44692dc2d950c0497ce2ef68d49563eee9a6f5eaa268d9fd2dc6988e2188546475f7647b1c4633c80b0faf1a916ff333a12580a9 SHA512 83a26421a5a6e87d77015d082c8e81bc9ddc91bd795814415e04e47a3f53c6aa2e25d676c7e1d0bc387899875155114a83110e2b8f608c7a9b40f7875e34fe94
 MISC metadata.xml 257 BLAKE2B 76fe53d3c6c9b7020dac2713ef1617ad24c1fedd8029d5ba29598d2bde4d992f3e6bbf5055ac58176ccd6b9650f28c2702830ba9bc30d756cfffc35696d9f006 SHA512 73aac59c45a34e5709ce6efb1bf342b6309ffde68d632db53d83fe7da0d05e06fa43d74a6b90e5771aa7262d83531768f0a0da431a4c86d54ec05d5fe2383c4d
diff --git a/dev-libs/keystone/keystone-0.9.2-r1.ebuild b/dev-libs/keystone/keystone-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..c0221f1ff7a7
--- /dev/null
+++ b/dev-libs/keystone/keystone-0.9.2-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=14
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake distutils-r1 llvm
+
+DESCRIPTION="assembly/assembler framework + bindings"
+HOMEPAGE="https://www.keystone-engine.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/keystone-engine/keystone.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+S="${WORKDIR}"/${P/_rc/-rc}
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Keep in sync with llvm/CMakeLists.txt, subset of sys-devel/llvm
+ALL_LLVM_TARGETS=( AArch64 ARM Hexagon Mips PowerPC Sparc SystemZ X86 )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+IUSE="python ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND="
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[${LLVM_TARGET_USEDEPS// /,}]
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="
+	|| ( ${ALL_LLVM_TARGETS[*]} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+wrap_python() {
+	if use python; then
+		pushd bindings/python >/dev/null || die
+		distutils-r1_${1} "$@"
+		popd >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i '/NOT uppercase_CMAKE_BUILD_TYPE MATCHES/ s/DEBUG/GENTOO|DEBUG/' \
+		llvm/CMakeLists.txt || die
+	cmake_src_prepare
+	wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DCMAKE_CONFIGURATION_TYPES="Gentoo"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+	)
+
+	cmake_src_configure
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	cmake_src_compile
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	cmake_src_install
+	wrap_python ${FUNCNAME}
+}
diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-9999.ebuild
index 7ef25cfa1b43..c0221f1ff7a7 100644
--- a/dev-libs/keystone/keystone-9999.ebuild
+++ b/dev-libs/keystone/keystone-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=7
+EAPI=8
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=14
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{8,9,10} )
 
@@ -19,6 +19,7 @@ else
 	SRC_URI="https://github.com/keystone-engine/keystone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 fi
+S="${WORKDIR}"/${P/_rc/-rc}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -41,8 +42,6 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-S=${WORKDIR}/${P/_rc/-rc}
-
 wrap_python() {
 	if use python; then
 		pushd bindings/python >/dev/null || die
@@ -53,6 +52,7 @@ wrap_python() {
 
 src_prepare() {
 	default
+
 	sed -i '/NOT uppercase_CMAKE_BUILD_TYPE MATCHES/ s/DEBUG/GENTOO|DEBUG/' \
 		llvm/CMakeLists.txt || die
 	cmake_src_prepare
diff --git a/dev-libs/kuserfeedback/Manifest b/dev-libs/kuserfeedback/Manifest
index 3f42b979dcdd..b060ded83a95 100644
--- a/dev-libs/kuserfeedback/Manifest
+++ b/dev-libs/kuserfeedback/Manifest
@@ -1,7 +1,4 @@
-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
 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 1421 BLAKE2B 4c1c16ddfa81a14eb27835e4eaa3ef2d58898ba1605161a7724faa8141cba5e1798027fb44096656bd8ec0d70f8e84a4e464fb0176b1c5d7e5791906d8d81e46 SHA512 419b2717419142b99caa568f69da0c4dcb37912393d36ee33d9c720881ee2906e8c37182db5ae8b0bcc7068581f970e29e1b08baa536f47e34cfeb872b3c0fab
+EBUILD kuserfeedback-1.2.0.ebuild 1419 BLAKE2B 944fac7740c1683b73fe926a342d9ed5a12ddcf2c0c0c33e4596ce099ae05f46fe0262006f1fd1013a24f47c2e05726b5dcdac334fb380454a43d9f6696e3dc7 SHA512 b540a86cea17dd5a7e0ceef7263ef9aea1d0796b2e974672b7e6dd54c03f3886e4a56938e5365ac6614197cb3ecbd4bbf792ec15db70730bcc3a3ded66d300e5
 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
deleted file mode 100644
index 57321355b23a..000000000000
--- a/dev-libs/kuserfeedback/files/kuserfeedback-1.0.0-fix-opengl-crash.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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/kuserfeedback-1.0.0-r1.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.0.0-r1.ebuild
deleted file mode 100644
index d3d0eb2f85e9..000000000000
--- a/dev-libs/kuserfeedback/kuserfeedback-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-opengl-crash.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		# 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/kuserfeedback/kuserfeedback-1.2.0.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild
index 16eb367d08cc..9c1cc52b9a84 100644
--- a/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild
+++ b/dev-libs/kuserfeedback/kuserfeedback-1.2.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Framework to collect user feedback for applications via telemetry a
 
 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="MIT"
 SLOT="5"
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 0f13c049d517..9eabd5c2f60b 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -2,6 +2,6 @@ AUX libaio-0.3.111-optional-werror.patch 911 BLAKE2B f6ce9b16bfe7d3fe3fde520c4e6
 AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b89ff223019cf3ec759beca14ff2ef9515d4b3697ca64931c2d86969a40ad74642aa06544cc2671906e5b49d2e10352 SHA512 7386d741658af265cc4f156d4cc8518a7ec9abc15e8738cb13c2e2c3827b284cf8f8ee07c4a16dd0b7ae424cf87e9aad438389f0a832dac2e49ef945e3829374
 AUX libaio-0.3.112-respect-LDFLAGS.patch 521 BLAKE2B f45b0147202e767385f6816192c0fe8418cd7ed61b6807d9a6d16ec7448f10f4f842c32167f6a2ef82df820c291142cedcd66b610693858aa6ca956de272d2a4 SHA512 c1d8385fc66909168e2ff39d334e9ac37a02527a892ed13a594c1b0b55103a5115d79c32aff756a9ec96117a7001703a3d141319369dc7bcb118eb752860f0ba
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
-EBUILD libaio-0.3.112.ebuild 2176 BLAKE2B 7b01abde1954d1f1d5a5b64e4abd8c2f1620497e567bb425e78f8c54216df4d8627473bf2cca714543e015a35b9136982ddf39ff98909f5d1e75031f68e159e2 SHA512 596a1fae4d24cbc19784a183b67b165bf693b2a7c07798d75540c350efdc88dca34149b6bda5014eb108e3730e28ebe7b9a90440d0bb30d75a72e4fd623234a2
-EBUILD libaio-9999.ebuild 2184 BLAKE2B 6b0e607d7978885115bf87ede0e72bb89ca78ca4d9b493aa27e3a4bfab98f5dd288c979850d902756fc8baf0ea7ab203b026e3d3b5fa9b2c28d10ba85246a996 SHA512 5c511bcc4aafd5a0952fd1a6816dc94631f198345e7a821f692c9a7d9d76f2d3c2536f9bb9b697c122e9c3579c511b7f7077574a472ea60c2436046c1009597d
+EBUILD libaio-0.3.112.ebuild 2184 BLAKE2B 9af25ed8c5c41bb07f93f6139ba91ae70bac4131fa5171328b527842169bf68bf6c49a2becfc2539e1fc13a16ffc2026b8e208c6f2817d060c534ba5f8b49576 SHA512 695bd6ae41e784f76c16cf1a094f9d9282e8e9918d0612628ae587a669fbbc7bcd1d7276aeb1b421712b278333b33020e3ca1ac22e8be8e06676aff2e8970b28
+EBUILD libaio-9999.ebuild 2192 BLAKE2B 3f57d85f73da3907d7ac3bd653b72364d50d0a32044479e29f3f0425ea79ff4efd174ddef50194d36eb6757a65c5904326212b030f152154944ecbdf9696a1f0 SHA512 5925f1619bd3436165a307aac20456f7bb44f6a5c99dffce99f349f01e0de47095bb51aeaebea9b2c6d740cdd12708dc3a5c1b3226bc06fc2a38541c1011fc74
 MISC metadata.xml 415 BLAKE2B 5f25806b5b169a85b455a39a9ba1995ccfa3c41e17ce1b8a7f2269167ba477fa0b76abc4ba46d977e5d6bba365b63e342304837a19dd57c0ac8d83e5846a2b22 SHA512 ad7bc8b579f5037c678294b77511af2b9027ed696a814bbbda6e3f630853040092b0abe20967d52fef7f65815c807bd49a2e57f392cd1035d1133e6d48009204
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
index a83b08bd9822..dd90b717f5d9 100644
--- a/dev-libs/libaio/libaio-0.3.112.ebuild
+++ b/dev-libs/libaio/libaio-0.3.112.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"
@@ -53,10 +53,10 @@ multilib_src_configure() {
 }
 
 _emake() {
-	CC=$(tc-getCC) \
-	AR=$(tc-getAR) \
-	RANLIB=$(tc-getRANLIB) \
-	ABI_LIBDIR=$(get_libdir) \
+	CC="$(tc-getCC)" \
+	AR="$(tc-getAR)" \
+	RANLIB="$(tc-getRANLIB)" \
+	ABI_LIBDIR="$(get_libdir)" \
 	CFLAGS_WERROR= \
 	emake "$@"
 }
diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild
index 232c53681871..cd86a0c918f6 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-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"
@@ -53,10 +53,10 @@ multilib_src_configure() {
 }
 
 _emake() {
-	CC=$(tc-getCC) \
-	AR=$(tc-getAR) \
-	RANLIB=$(tc-getRANLIB) \
-	ABI_LIBDIR=$(get_libdir) \
+	CC="$(tc-getCC)" \
+	AR="$(tc-getAR)" \
+	RANLIB="$(tc-getRANLIB)" \
+	ABI_LIBDIR="$(get_libdir)" \
 	CFLAGS_WERROR= \
 	emake "$@"
 }
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index a9cf8680cab7..93c5c96e2029 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,5 +1,8 @@
 DIST libbsd-0.11.3.tar.xz 399712 BLAKE2B 1af04b8fcbc0bfa59fba549639d61a33ac934fe7ee42b506d1b0452e0b836b0bfdd3d8739de90465be46fe6a9d326a2d11bcf72280aa19ccba81db5da6d63d89 SHA512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5
 DIST libbsd-0.11.5.tar.xz 409972 BLAKE2B 00c89ad1be351e7851538eac2744f5aef87b5937330d514d17af8a20a04bc6eab0e2bda61d0080da1d1439306b3b191ab68b4bc4cd8558ff0adfe402bfbf5b52 SHA512 c52c19eddd53630aca14f9f6221f7b84aa9cc798b4bb91e867822b161793313aab872ac1c0350d29312a72fee6e2061f3910ff918b724ec171d8c9de5837c841
+DIST libbsd-0.11.6.tar.xz 416600 BLAKE2B 23f7a5ea765af559e0e63946014650074d4d33f9e6655afbe6f08fd38265408a9fe3cccff0d0827d08817354deee92e4c6fd5536fd6f08857813e8847989d15c SHA512 9dbbfb84340fc69f59667241701d81d176439ce168f123344805898a269f7bd0e98abf8c7fc12d9bf539d1effb19424d93b647cc9120f693327e736d339e6075
+DIST libbsd-0.11.6.tar.xz.asc 833 BLAKE2B 895dee6d441da5e5b5b202dc2b5ea3635ba93352fdcd979fc3e58939dbd327b516b107d4e3c12d18dc824b6bc9793886e2a168add313d50884b1bd38d4f5f001 SHA512 29d77e53d251c641b00924c9c42b69b66eeb160ef0534e84a4ad1afd9009f87bda82f1b91d271efe37c676295add3fab01ce55aa6cd96aa0c5f34f9837b870cd
 EBUILD libbsd-0.11.3.ebuild 1276 BLAKE2B 2f7c2b5e0e8787d2202ed3d2e66dc0f6d82d519e8877de6090633685bdced48d28cdf0948163cee674ae5dcf042e1aa67e2b87e7fca1ee922c9de7540d16c63f SHA512 f31cfbc348e390f479be6075d8bb5891fb2e37dcd04637e3bafa9a9dcc2f332325ab5f1f8b4d1c509f8474524953f09afc1da1b1d66bd3581102cf555b53f6c7
 EBUILD libbsd-0.11.5.ebuild 1053 BLAKE2B 5c0c7e80dcb7b10d5ea696dd970866439d44d0a53b2eeb570c8716b7a0458e35b2a714c19c145718f1782830a548be8b43d988e1c8bc1960b5dacad358ae9602 SHA512 91b9af7545f827a2c1af4270b3186b4de742f8f314699a1ebc1b0db0bf1be8907107940848aad726d8f55f7930c115e5fab84dd1f541b703f1bc1d0c863d12a4
+EBUILD libbsd-0.11.6.ebuild 1284 BLAKE2B 5b50d323ddf88a720e6c3e2e8c5c5c6df78d04bb263fb48fcb6cdb558fafbea86cb73cd8d9f646d6b2e479db6f8bce51c70fd03b05b2090530088128c65cb5bf SHA512 ae3f4652dc61a2af6e6bae0b415df2364404db7aabcfd4d6f70cd680843ec553c5c03590cacdd21e6d4830456b85acadd4a1470f13797e07d929b6d76fcbaa44
 MISC metadata.xml 363 BLAKE2B a1c4a829ec2dabf18360ab23b1aed4892f0650849a5287070fa15abffad4dc074d3c9c1fb698aa4da63262dcc1a4b57431654374c2f43764127daa389e7381d4 SHA512 5120ee7fb2fc2513df1a78a279d8d691969ee08d85ad2d960b5579069767eeb20087019a8a95d2f3c3f11d2ae721233a8283e47ad35d4c0fdbdef4cebc1ce930
diff --git a/dev-libs/libbsd/libbsd-0.11.6.ebuild b/dev-libs/libbsd/libbsd-0.11.6.ebuild
new file mode 100644
index 000000000000..bee79d737b6b
--- /dev/null
+++ b/dev-libs/libbsd/libbsd-0.11.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/guillemjover.asc
+inherit multilib-minimal verify-sig
+
+DESCRIPTION="Library to provide useful functions commonly found on BSD systems"
+HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
+SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://${PN}.freedesktop.org/releases/${P}.tar.xz.asc )"
+
+LICENSE="BSD BSD-2 BSD-4 ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.17
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-guillemjover )"
+
+multilib_src_configure() {
+	# The build system will install libbsd-ctor.a despite USE="-static-libs"
+	# which is correct, see:
+	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index bcfa709c9ce9..dcfffbfb71b7 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,6 @@
 DIST libevdev-1.12.0.tar.xz 443716 BLAKE2B 1df548cc9bc2472c88308eb2794df7d5636d498631b8873a1957f5cc959097235e64f46f61285a3cbe1abbfe1d968946ae181dfcd8150fecfddf212ed7f4e07e SHA512 6c1c1362d5112cdf3816d1f735c27e625f5463ebf10a83d675cd9364c3fb291ebcb91c051da442f1a36ed28ba7dd99af74546707f61274f7d5715c544a0ed04c
+DIST libevdev-1.12.1.tar.xz 446476 BLAKE2B 3b73c50b5e0bdf6dac001c7e34338ece2ba796af711d8f6f9c2928f93a8f41ee484e067c3cb02878de49d631de87229d4b1a377123e385af5997e11f7c556510 SHA512 eefce287a665e4f89eb2e0437dfefd45ecf8925c7dac35a1bdd46158541f77f2032c6146900a30a01321751d55a9b537bd1d61777cca9cfa02c39a6e31c97be4
 EBUILD libevdev-1.12.0.ebuild 1117 BLAKE2B e583ff529df3a04102e77f9bce314cdb48734981ee081c11f901a143a50ac66d6119aaffa54268600aa9b4596966bb222f6a7892f43e9eebe78df9bc2ca916be SHA512 ca8c62a433bf0ecf21aa13f600c0fbd57a22d40fcde568a23b5328d0dfd0ca37760112c97f0e0ac465c884ae4911d6b27e35b6dedf883e4fdb34ea2060855db2
+EBUILD libevdev-1.12.1.ebuild 1125 BLAKE2B ce62c1ea5c7af156ec23f634c96464493bde831a5b52e9a1bdb380d7599ed5d73e7dfbbde2c1e76db8793ff7e7d492a98de2e4e756a79a3680514f8bdaa9e3d9 SHA512 96b8725a9a580a343317270ce5b2c2a73f1927e20ce8c02cc807bee9d83df9351a2eb19c34c5f29c2b3ec3d4325f53e0063755e6894d3ce5b4c7e3994ca78e79
 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.12.1.ebuild b/dev-libs/libevdev/libevdev-1.12.1.ebuild
new file mode 100644
index 000000000000..87b1d58afa37
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.12.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 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 ~m68k ~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/libfido2/Manifest b/dev-libs/libfido2/Manifest
index d1680a39b0b0..637463ae0f5f 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,6 +1,8 @@
 AUX libfido2-1.7.0-cmakelists.patch 867 BLAKE2B ce559f70b1bc22731b16ddfd30b4a0be1e9c87e9b79dcfbf6fae3179ef618d0ed39a65c89f9d5b89f723bff87e72f2d1fdb1558aeb7946933ec35e6c2c99d247 SHA512 6c4338d82d51b66aa6d16ce6cf74f7101e1529ee6038517300e32c9f50965d029dcb8243f37643afeff9bdbc92032b80a4da24bf98d5bf2565a5c9ae95da1f41
+DIST libfido2-1.10.0.tar.gz 591372 BLAKE2B a4144ede774b90700f4cb1371b2acdba9d3ca8e6e0d68c5670986a1825635ebeb75f03c930da14a4539a9e075bcc5f7cfde7fbcc05e1fa383902ac6739225789 SHA512 ba03e25d3f42f11cec74dee48c853ae35d03600f24ca06d2b751840408a132290fe22461372ae42ae31419061a63d9908c20a2c0cf3c0c9c8dbc46c34916784f
 DIST libfido2-1.8.0.tar.gz 535947 BLAKE2B 48ca29fc1b582b4c915ce3dac2b3c24b1c71b144681f77f13059a599eb5e38b263442abecacad495e28a6fea63fc98c142a32939bb49a521b6a6a8d4ad0f1ff0 SHA512 dbea52a80068323e9945ef7a6e93ab1438bc4347390fc91694a94669900d4ce4abe95e1b6df90fe8b6b2dde6b5d28d9dc0c6b022c24ccb661f28c30c33417999
 DIST libfido2-1.9.0.tar.gz 576088 BLAKE2B 19d2933178011aebf11b44e12550518937b204a40b781ade565bd2852de6d1bbb88dda90f612e852e4561b7a9db6927df9d0a9f0b4c511208f3ab648b2cf1a9f SHA512 99edf9c52a871ed5dc3ab41ac07ca8a22670e7527c48ed69c096f001651e1e714bc3f1f55e22003cb66670fa4e851095834c2acd0e5b31887fad46bfb9f4b089
+EBUILD libfido2-1.10.0.ebuild 1000 BLAKE2B f1eea78f4ce96ea19e1cad14cf37b225492c155c6c3d05a847a70861bde468941327ee18d614660c314823e5ebdc2cbfc2891a8a699825540eaff47b58050583 SHA512 3bac7d4fd67186bd36ef7c6d2fa1ad5865ce7b39e83f462e6e2b60a94331b3a4d8ef55013213ee1001041247518e6d82598959cb23b850784bbd31f24f644e9c
 EBUILD libfido2-1.8.0.ebuild 995 BLAKE2B f072b7bb688f75979af0fab6e848c8e6c654e87112a2cd899663eb06bcce7ed9df8ca902fe534300ad8e111c1f1c49c3612cc6eb44fc34ffb5b4f51e6e648e4d SHA512 85a8f6da7d4c485a1d8495f97866aedb9c5f2b63f2f91c8eb13801bb4b233a8038b6f78af05123d890187c2d2c182e3a1807f8e6c8a7eba8c5be025134a4281a
 EBUILD libfido2-1.9.0.ebuild 1008 BLAKE2B 72b7acb5728033a9254856404e7f6b34e0c61a57a4b88e90297c9a92b9fbf1aa7e66aa9d4b3a1d011f7cd4c4b4aa42898ab4b8fe526da42852710246c799ae66 SHA512 a74fa35fb706e77e353a94c73242db6f733e62a8d98fdbab428a173e8f36cf5685133308b165aa91cd3690559e8085c90ca9326d2eadf51fbb8abab955382dc4
 MISC metadata.xml 331 BLAKE2B dbe587eb713db674febdaa58494979a44bee5a40345ef37ce67fad22e629e73948fd7e66c3109e010a7f2a51c769f5079f70ee3812098b4673eb9a5b7e70e6fe SHA512 355fd46051ca69fa79ea4953a361f8981cc75c0eb77d1e4b9315ffb3de75662660e7072211967d452dbf2ed3d3ba31baa355cafd8dae1c13e245620b0c1e7f86
diff --git a/dev-libs/libfido2/libfido2-1.10.0.ebuild b/dev-libs/libfido2/libfido2-1.10.0.ebuild
new file mode 100644
index 000000000000..c33a15058ad3
--- /dev/null
+++ b/dev-libs/libfido2/libfido2-1.10.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev linux-info
+
+DESCRIPTION="Provides library functionality for FIDO 2.0"
+HOMEPAGE="https://github.com/Yubico/libfido2"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="nfc static-libs"
+
+DEPEND="dev-libs/libcbor:=
+	dev-libs/openssl:=
+	sys-libs/zlib:=
+	virtual/libudev:="
+RDEPEND="${DEPEND}
+	acct-group/plugdev"
+
+PATCHES=(
+	"${FILESDIR}"/libfido2-1.7.0-cmakelists.patch
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~USB_HID
+		~HIDRAW
+	"
+
+	check_extra_config
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_STATIC_LIBS=$(usex static-libs ON OFF)
+		-DNFC_LINUX=$(usex nfc ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 93680bdfd90d..1dec877f1f8d 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,16 +1,15 @@
-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.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.10.1.tar.bz2 3778457 BLAKE2B 46f30459891183b6d9ec18f1c7907fee0ad156c7dd75044f3db2b4d1c19dc6f30b2dfa6f85bc82adc9243aaba913e40fb6faf77d2226ca5a33897220d032437a SHA512 e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13
+DIST libgcrypt-1.10.1.tar.bz2.sig 119 BLAKE2B 5261d7dbfd5d82b2d3fa2ebf864a9ef0c7c978dd66a71c078df7bbb3b63f5d85180e5f909f43a49712fc16c45f7aabaa6bc30ed82a39ffc9a5d483ea6a94d162 SHA512 b156ae05079776698bc95ba5a9e48e95de8f716aa1760ef4b2e7cb8518ccec660337fc7823f865bde870461800d472fd8e458d03a7095b6bb614f6dd96f796d8
 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
 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.10.1.ebuild 4977 BLAKE2B 7add0ebe773b2457ed1adaeb533ee7693452de606eda9fd678d58bf27092d17949bb466feaa44016b38572ebf26451fa679b88fcc3c79c20e79e0a73fb621d13 SHA512 8045c4cd0c9d06d904c333fda7f91ef6053c39769277d40edd0d6efd882a06ad09827d7ada770b65089ce1d2df14be85d65fa738e555a4b894d22411e251a15d
 EBUILD libgcrypt-1.8.8.ebuild 2318 BLAKE2B 335fffac9a01ebe760a019fb668ce229f22ac6bc6aea38d2fd893fdda587d76895b0bf27146a32c4817d955eab4ac5ae9aa032a3157f9dcf3ae07a98599cc60e SHA512 eea978726cb25bb0c9de94b8617cabd3e5c28b20010ccfba2f4124a4609b655d496ea376d9d72bf07c031116433f74c03d69335950ce295d922ae83801a19ada
 EBUILD libgcrypt-1.8.9.ebuild 2934 BLAKE2B b9b08095da2b6a5e42d986bac58c47ebfc2715cb15e2ac7bec4d45d35a50e164beff508aa57502e15bb5e4c15dd1578e0dd0456cb5f3820f325432b232887609 SHA512 fdfe2903216563309ca7e36d15182b31ffa7b273d70f392cfc3257839204250b3d53be5329e6c8ffabac00bf97a14109f1ead74c698336a758e7d01a2f4a485b
 EBUILD libgcrypt-1.9.4-r1.ebuild 5022 BLAKE2B da966c552e2b4dc96e7cf799246d94bc14588545bebdec3f1e6609ac3926c7b1f9cc0fac8ba1ca2b43d6499d9ae9652ec60b6ceea4b27f88cf6bf3aa535b8efc SHA512 412ca793fe764ce72614e7c3547ad40714f55d12a86d1971da0f175432d53fd5ba3b9f591a9453d4785e15f1288fd2595bb80226ee13572994517aff3639a632
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
deleted file mode 100644
index 205944dd7a1b..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-1.10.0-musl-jitterentropy-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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.1.ebuild
index 763e29359827..fd9f8ebaf6e8 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.0.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
@@ -13,7 +13,7 @@ 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="+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
@@ -38,8 +38,6 @@ BDEPEND="doc? ( virtual/texi2dvi )
 PATCHES=(
 	"${FILESDIR}"/${PN}-multilib-syspath.patch
 	"${FILESDIR}"/${PN}-powerpc-darwin.patch
-
-	"${FILESDIR}"/${P}-musl-jitterentropy-includes.patch
 )
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index 1bc9b785a1e8..ad97fbd31a7e 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -1,5 +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
+EBUILD libltdl-2.4.7.ebuild 1083 BLAKE2B c1c52d2c3ab76602df3149f24bc249c50944f4dc5a2433e45bf4b5f5be9c5177b5249520c97978fc464180ca404e109e30b4dde89506d671803b805fe4644716 SHA512 1ca2b922f15252db50634b383f49d70c7a667474262366a04a071269bd52c987ce05e2e8dfc657839f2bdbe08b2411e5224ef4c33274df453e3afe0c96fedc58
 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
index 3b9b846936fb..04dd29883a01 100644
--- a/dev-libs/libltdl/libltdl-2.4.7.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.7.ebuild
@@ -16,11 +16,10 @@ 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"
+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() {
diff --git a/dev-libs/liblzw/Manifest b/dev-libs/liblzw/Manifest
index 78c84d867451..fcc3d9da45df 100644
--- a/dev-libs/liblzw/Manifest
+++ b/dev-libs/liblzw/Manifest
@@ -2,4 +2,4 @@ DIST liblzw-0.2.tar.lzma 868300 BLAKE2B 6346fb0aa5d2a199276faf04a7ac6fd571d0dd06
 DIST liblzw-0.3.tar.xz 901084 BLAKE2B 4aa9689f82567b5ad1ac399eed8f58dfb1964f91c74cba2b291458dac89b0c4ce6a110b24b5a8f69bbcddfb0cf14fa0f80107275c16b7553375bbf38e035262a SHA512 d7fcb5c424c87a3692a8a18cd9f4cf57a7faa4f59f01cfdeff335633fb3be6c577409d996d59273f4453eb157dd9bc8fa6ec2868dbca635147d27d3fd00016f9
 EBUILD liblzw-0.2-r1.ebuild 476 BLAKE2B 104c25cb095aceb80273d733339988b018813c6e235e208e889286d860e43d33c8a58e488be593dfc2cdca54f136cae82e0556498a3938e705f627bee03dc8ab SHA512 82bd07de4a6cadfc977cfc8db0383e98d411dcd0e85d9e653c6c1dd8bc242a490062349e06ae6205ed51bdacc2452b4511015411f892c8d487e1e11641ed94b8
 EBUILD liblzw-0.3.ebuild 555 BLAKE2B c52e24798c330849f4554f5b29d6023fb7dde6eb629f331320a809ae2e3e027ac10f0de228cb13d085e20ed9395fde594b5da90bdf3804f49dd8500e9aefada0 SHA512 c86074f950ec5e3d26f7e568ddeaa4d3f88bd24a94f83b289ca1ee83f9b07868178abc08284449f32507c05495b3ef3c2ede29536656e25e38e6159f0f16e388
-MISC metadata.xml 349 BLAKE2B 1618c11d9b1f434e8a6d2bab09a20f655e616a15f10230ac8014c56098361a5d2866efc469e69f43e7e902edd35fdf1e800ae2594d9fffdd3424beaccdc620cb SHA512 cc71c87f35ba38bf40eb0bbeb22647295cc209cef57e4ddfc3d83bb0d38554cbd551c8b1f2745bc83415a44e75f32276d55ef2e9c2b5851d783eb661766ff5f3
+MISC metadata.xml 379 BLAKE2B ab1dee6b28f6bf024a8439313cb6898f54c2ce81416bd85c91f38bfcaf8232d0a3d1a31577639be0c10d8dfbb7c8769190b0f36f2516aba85527998c5e99f151 SHA512 d3fbe2fa06120fd08c817a0130ae77cf74d3602c1309a0b4430aa510e6afa9c712b9442d5b0c86baaf6207f24ed03ec953f08ddc2405160eb208a5ab71db6407
diff --git a/dev-libs/liblzw/metadata.xml b/dev-libs/liblzw/metadata.xml
index d4ac7d757337..a2512173cc43 100644
--- a/dev-libs/liblzw/metadata.xml
+++ b/dev-libs/liblzw/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<name>Mike Frysinger</name>
 		<email>vapier@gentoo.org</email>
 	</maintainer>
 	<upstream>
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index ad4959874056..4bacc3516ed5 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -5,5 +5,5 @@ DIST libofx-0.10.2.tar.gz 225043 BLAKE2B 2ca8cdd9913f2bddb60600d75acfb114d56d6c5
 DIST libofx-0.10.3.tar.gz 225132 BLAKE2B 29dff4cb79a4a535bf255c787e184d103ecdbe975bb4bb223b675bbacaff9f8a228ae0a3dffe7710c2707496ac65c4f48ce993243b8353172c53cb02067d9267 SHA512 6c024628a6a11d9542c669a438223331a033eb820b1a2c3001c60d1ab3fad45ccdec64f9b54dd206fe0058ead8e14e751eb7a3bd88e8f9e1013b0bdd5b6c5242
 EBUILD libofx-0.10.1-r1.ebuild 1239 BLAKE2B 83292626ed46b5c33d6d50fa02e8f564a906040d225c525de948f8eaba3a617aec3e50a3ad06328b7cbc42a3df539489dcf9ba519c61aaaff554657a40a5c06b SHA512 832c114686f8c26d72af61de21bd165e3a6bedb128de84cac53b5cd1e0177420fc6a0928dda3aec320e5f5925f1575ebe2a870629fa3cf08e5a45f482e013631
 EBUILD libofx-0.10.2.ebuild 1153 BLAKE2B 7b81c6001f3fd4269efca53e206493d68ec864b21629a258a6c3b943b7cb3112926c413c1fc40164cd5016f525f424248e8b20d01af20f1b64895619ea1a11d0 SHA512 cd3e5f1e565595b584f8683e6f9ddd211d21a7f650e28defc3a2b6b455942bbf89b65fdf73a9daa71881c5bc5e15eeb5c5b73cc2349f0ea6ee878acb2094eed0
-EBUILD libofx-0.10.3.ebuild 1153 BLAKE2B 7b81c6001f3fd4269efca53e206493d68ec864b21629a258a6c3b943b7cb3112926c413c1fc40164cd5016f525f424248e8b20d01af20f1b64895619ea1a11d0 SHA512 cd3e5f1e565595b584f8683e6f9ddd211d21a7f650e28defc3a2b6b455942bbf89b65fdf73a9daa71881c5bc5e15eeb5c5b73cc2349f0ea6ee878acb2094eed0
+EBUILD libofx-0.10.3.ebuild 1160 BLAKE2B cdfce6873c28f88c8cdc17b8b640962f494a0ef20e9c02518099ae9498b54eefc103ddaacda063144f7bc28ad7a963fe53503ea8717bc2a02bbbadf3c7f68700 SHA512 da36e60cd6780ab8ce1df578cef553bfec2406e180ad3873098a5cbde535e4a40691ff80daa502f307644c7942e48bd5592758d50eec02a0680e1fa5b6479b7c
 MISC metadata.xml 297 BLAKE2B 819f3298f3f9a816e9630ebce9f8d163b5974cbd76a1e6bf5ad5c499a3e926b887c0396b6f1c8d13e765b3b37cce93188d15b2ff0bef52d98b7f9bb516225bbb SHA512 58f2ece0d8cb8ffb32fc849e42a49cd086c08a0dbd4e03ab78ec51a9224f3ce60c69acaa56712567ee4e1a4d87aabd7830d2a60af1a5669af7a9eb7b4ec4f046
diff --git a/dev-libs/libofx/libofx-0.10.3.ebuild b/dev-libs/libofx/libofx-0.10.3.ebuild
index 1acb92d8616e..543e1ad45550 100644
--- a/dev-libs/libofx/libofx-0.10.3.ebuild
+++ b/dev-libs/libofx/libofx-0.10.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/10"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libplatform/Manifest b/dev-libs/libplatform/Manifest
index ad3a29509815..ab4f5abe83e2 100644
--- a/dev-libs/libplatform/Manifest
+++ b/dev-libs/libplatform/Manifest
@@ -1,5 +1,4 @@
 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-2.1.0.1-r2.ebuild 653 BLAKE2B 9f204460b6c31930f42e8373816bbb1054b42eca150fdfd21902e77f513f6806cd0d2745394ea6429f62748d9c56d3f22d1709b33238f25816361fc8aa987bc6 SHA512 d85ef9cacf3a5a2546a2cdb2623ad70837df29e5da344db228776cf1bb68358655ef09c06e27fe474ec21046937ebd90fedca7c9c6a0f84a5a2cbee7fc60d474
+EBUILD libplatform-2.1.0.1-r2.ebuild 650 BLAKE2B 68795ddfab81bb90207b60a0dd4ab4567c037501ae0a1f4571fcf086933d158239bb038172ef15eaad402f3692745a8162953e776f337f546b9b25d15753b4fd SHA512 11e086c64d0f47c63f9b09e38a6986a363d01b498ee926e91419f4c9757c340137296c47ad8a3baec2bf8eae182f96847580cf38c20100498df2cceb9df4386c
 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-r1.ebuild b/dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild
deleted file mode 100644
index e8a4bd5c4df2..000000000000
--- a/dev-libs/libplatform/libplatform-2.1.0.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-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-2.1.0.1-r2.ebuild b/dev-libs/libplatform/libplatform-2.1.0.1-r2.ebuild
index ed44eae38b02..bc9531ddfa4a 100644
--- a/dev-libs/libplatform/libplatform-2.1.0.1-r2.ebuild
+++ b/dev-libs/libplatform/libplatform-2.1.0.1-r2.ebuild
@@ -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 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index c70c4832c172..136d7e6ff542 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,9 +1,5 @@
-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
 DIST libretls-3.5.1.tar.gz 425343 BLAKE2B e303ce141a218c58655f01aacb11e61fdb96d9b3a5943b211a35f02d869fa99efe7bfbf719ad14a1983c7f418d8c1daf3013c01ffa3e0bdd58cfce84ed41ec63 SHA512 ea566f0eda3f5ecb413f070db0ff9633b0c9403919eb2724712eac1c47fd32745b6da8e974a0226c8f95b7e24e5824780b377ae63651fbd0fa34ff0e6df4792a
-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 667 BLAKE2B c79c1d558eb57d462309cbd4c4c2e7ed0fc02a605e3bef47490c53d0429812240d098059e725c475d2dcf871369688c413f1581803bc1b6c522322212650bd58 SHA512 c02825f8f3d2f7e8f0bf9102ef3fc56cb422267d4c175c81ae4281ce1ddcec55618af514a9472e428ab8cef591e79c5873d665a1df9fbd581a66b1224ca48376
+EBUILD libretls-3.5.0.ebuild 663 BLAKE2B 9f7271d760697ab4258229045278b1dc3808e08ece9888b58ab91ee88a60a635c58b3241c0e8d1a56df51c6dc3da5a20cb28cc77e5439fb58f87bf65dbcc0a02 SHA512 e1656101af64ae4c6e2772eb92f8b57539a248a7ac614e40bb1785dd6593349050335bf379adbf3dc4da7f8f9fa3f005b88d7d39a49e7ff6d93c1e2f11420775
 EBUILD libretls-3.5.1.ebuild 669 BLAKE2B 21ee067e2e922e487172c93c2abbfc8b076549125c4afe97c0ac97a6898a023d50e57273a12fd6de7f468f44f6d8ba1c4c3f1dd463fb6652aa396ee5209f3f4f SHA512 30e790b4c21a4dd580762971f82efc9d893a8c0de126d1c8966c68af4b9869dd4c09b1e12a695ccdf50ed5044988a2fbc1e17f371ec0f65830d9064f5372bcea
 MISC metadata.xml 361 BLAKE2B 9f05ddd1ac3e1a634962c9c800c3bdf60554488c61dff9b215866b24e0b2472d7c0873f0fd6bacec2abbab0e79faca728a4b22e34633c3dde64995b05b86db61 SHA512 c7b186da31da21b4ad5c5662325cb2757e3ee8d7cfd84d75a49b07aebd4dc882cb9b0e16ffce99a8ae2409a53dd750dfb5ec6eff0f9da9f4afee013f102ef688
diff --git a/dev-libs/libretls/libretls-3.4.1.ebuild b/dev-libs/libretls/libretls-3.4.1.ebuild
deleted file mode 100644
index c3548f72f880..000000000000
--- a/dev-libs/libretls/libretls-3.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2020-2021 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/libretls/libretls-3.4.2.ebuild b/dev-libs/libretls/libretls-3.4.2.ebuild
deleted file mode 100644
index 777d4586d76b..000000000000
--- a/dev-libs/libretls/libretls-3.4.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/libretls/libretls-3.5.0.ebuild b/dev-libs/libretls/libretls-3.5.0.ebuild
index 7c1804374589..3e22f6e7659a 100644
--- a/dev-libs/libretls/libretls-3.5.0.ebuild
+++ b/dev-libs/libretls/libretls-3.5.0.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest
index 888572ddef4a..87523ed8695a 100644
--- a/dev-libs/libspnav/Manifest
+++ b/dev-libs/libspnav/Manifest
@@ -1,7 +1,10 @@
 AUX libspnav-0.2.3-makefile.patch 1329 BLAKE2B 8eccfcfa539703437326b4800597dc7b6074d7bda0246c27a819114969a6906901b6063a11cdf8dd29148cbf9ecef5d5301f842355b86600b3077b34d61cd6d0 SHA512 8cdc05d5b0d4aa16de59752d0ce204dd0db1df63554c53c2e0b9ea04a7a1b32a0fded8ba4f9f5fc94456f6d4b7b87213284f88944931903986f4df81784cc64f
+AUX libspnav-1.0-no-xorg-compile.patch 1473 BLAKE2B 09848c7ec4e76d8a434b05a98728bcc3be652ddb65dfd2c290ce2dada50841b8ebe90cc127f3b63097e9edc8436086553e7a740d68e19faed836d688417dd416 SHA512 09528ae037ef05c02af1027b81896d7692b46703abfbe9708d4ad858f1deaa8d8891d7b8b7dd655117e64780a85c41a77385f4b5db2a67b5258041c4d1b35e95
 DIST libspnav-0.2.3.tar.gz 11985 BLAKE2B 134a0c3f7c9a7ef7c4f68910e0266880958e2b74e253b75237b0fa8d3e482bcd1f42e715b85f0ffca3a62103530e854090818564d9c241bfc55de039cc4883ee SHA512 b2c452d979d455fc99bfdc172c8a2408a6e8dc40acc52964fa64f4d75a8ee77dda12e5e212c0c4e07a0a24d055f16f85bb6ce6287e24e6bd0665de457e37e6a7
 DIST libspnav-0.3.tar.gz 12386 BLAKE2B 6598e0eb3cb41c9e13f0cb62715cd199d2fff0903d8f62726fa82227f2aa49f4dc41083929cbdde18974dfb08c23947158b465bb552c12ea8c9f9fd754962c2b SHA512 1bd61c1ccda37af9b3eaeda6d8f269777f7d13b1c3d3ed4d194b917199bd232d79c9513bcdae6fce6c298ad8460c095a98e3cfd98ee76e1852fc0e93e478c252
+DIST libspnav-1.0.tar.gz 31578 BLAKE2B 535cdf588b4b1de8f37f9239a48df10e755d004fbe6b5f3771b00bb2f9a8b36e7db30297a8a99ac689d890c08c728303af3d71c60c299574bf02476aa5724b11 SHA512 ae36ea51dbca7d5ba31d82ffaa46bad2bd877f5f7c077d2e711747427f6d60a000ab0c827ae6523ba6a275dbad205eea8c20520fe2575a6fa6b554ea8b5e0eaa
 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
+EBUILD libspnav-1.0.ebuild 1266 BLAKE2B cce3280bf16efec11288f11f143cea93dc0dbbaa4604a6dfe5c6984639cb59f1c624fdff2efe6d4151c82c6919ee17d82338ec995c07c3647b727efef86a01ae SHA512 a2b7670dc558eea8c88a34069c129c10de926af49d04b8a48c6961dc64fad5139648c3677bc6e4c18d36adf5cf21bf368506675a4f72bec123286d377e60588b
 MISC metadata.xml 812 BLAKE2B ced6d51e37b17056923b89e2bbe6eba4a8224690d97826db96693c01b3c97442997a61a36f020114a65191ac9a6d2cc99098f42ca65882dbec955ee44168bd77 SHA512 55fd9c851ddce1d70eb22d30af4f8d185d3fb3dd037d4739d698ba79202ec9a4e7389f29f4fc763cd24304fec26bc1e5607ed15e0c8c37a458d4c6b9da0b05f2
diff --git a/dev-libs/libspnav/files/libspnav-1.0-no-xorg-compile.patch b/dev-libs/libspnav/files/libspnav-1.0-no-xorg-compile.patch
new file mode 100644
index 000000000000..87cf1d676282
--- /dev/null
+++ b/dev-libs/libspnav/files/libspnav-1.0-no-xorg-compile.patch
@@ -0,0 +1,45 @@
+From 12cff951bb9ee24bab2f09793d3e3917b8649f36 Mon Sep 17 00:00:00 2001
+From: John Tsiombikas <nuclear@member.fsf.org>
+Date: Sat, 2 Apr 2022 01:17:41 +0300
+Subject: [PATCH] fix no-x11 build: some new functions were erroneously
+ declared inside the USE_X11 conditional block.
+
+---
+ src/spnav.c | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/src/spnav.c b/src/spnav.c
+index a444fb2..41fd559 100644
+--- a/src/spnav.c
++++ b/src/spnav.c
+@@ -50,14 +50,6 @@ OF SUCH DAMAGE.
+ static Window get_daemon_window(Display *dpy);
+ static int catch_badwin(Display *dpy, XErrorEvent *err);
+ 
+-static int read_event(int s, spnav_event *event);
+-static int proc_event(int *data, spnav_event *event);
+-
+-static void flush_resp(void);
+-static int wait_resp(void *buf, int sz, int timeout_ms);
+-static int request(int req, struct reqresp *rr, int timeout_ms);
+-static int request_str(int req, char *buf, int bufsz, int timeout_ms);
+-
+ 
+ static Display *dpy;
+ static Window app_win;
+@@ -73,6 +65,15 @@ enum {
+ #define IS_OPEN		(sock != -1)
+ #endif
+ 
++static int read_event(int s, spnav_event *event);
++static int proc_event(int *data, spnav_event *event);
++
++static void flush_resp(void);
++static int wait_resp(void *buf, int sz, int timeout_ms);
++static int request(int req, struct reqresp *rr, int timeout_ms);
++static int request_str(int req, char *buf, int bufsz, int timeout_ms);
++
++
+ struct event_node {
+ 	spnav_event event;
+ 	struct event_node *next;
diff --git a/dev-libs/libspnav/libspnav-1.0.ebuild b/dev-libs/libspnav/libspnav-1.0.ebuild
new file mode 100644
index 000000000000..c0aa5dfe1b28
--- /dev/null
+++ b/dev-libs/libspnav/libspnav-1.0.ebuild
@@ -0,0 +1,57 @@
+# 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}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-xorg-compile.patch
+)
+
+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/libvterm/Manifest b/dev-libs/libvterm/Manifest
index 2bfd5c8b6ed0..2fe9ab257a16 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -8,6 +8,6 @@ EBUILD libvterm-0.0_pre20181126.ebuild 819 BLAKE2B 407c20beaada04be4a5ccf381780f
 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.1.4.ebuild 883 BLAKE2B e96708137e44439705c4ab1ecdf581ab2087930b471d8f3cc7ef0b6196359ea6d23e2dec76e704a20c0eeaacaed9e22bd661ec2596bd6f64f4316ae038e6288e SHA512 c236cb937e9903748eca63dca6c8d72b822f20ef98b0cf5add266db8441e42f99087a207815338fae5497812fd888d14060e8e240ff6912d9394219cc7668b72
 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
index 21001f797e99..7281e976e5b0 100644
--- a/dev-libs/libvterm/libvterm-0.1.4.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
 
 BDEPEND="
 	dev-lang/perl
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index c605bd2c6e06..45cfc5964eed 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -6,5 +6,6 @@ DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e3
 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 7424 BLAKE2B 872e88ab344e86efb89f3d5cbe560f20e3a35e8b0a7fdccaf6ebff0fe5111ddf47789f236398666856489dc7272baaa221c8e347c4fbbaec218aaf72bbe2573b SHA512 90ef531d12bd73136f1fdeb8855b1ccead6ee00a3a47fbcf91dc6a03c5c2868a0314497f7433caadaf204ed2acab245d228715276bd6c107ba794397dc0e6a95
-EBUILD libxml2-2.9.13-r1.ebuild 6583 BLAKE2B 9c49b05043e933fff56084538ba5dca1f93d59d38af5a084de4fc02f5543df6f9ad1dc1afb8ae02d6e83889fd431712f69d3ed2223bcf8e645167a286c81d925 SHA512 75f535d26e8607b594baf443dc6e2fd7a7d085f74a5939c92041289efa18d02ab129c31007ef5307569f9abc05fa8b0f8c84907a811b1840703bd331fcf7e96f
+EBUILD libxml2-2.9.13-r1.ebuild 6767 BLAKE2B 481f50527b01e1dac47b0f50096e4825cb2350cef99c78381e5c325cbf476418139b4170c2ae92cf1145d7ca7842bd30024160e62f38d811cd2491c5c7672f77 SHA512 438f5f4df22ea7be1fd5577157d673249421a7aefc89e85175c77713275c58b0ec10182d0d8d203ff3deb0d75b425c30cd3ccfa5c6887ddd612981f6d81f5f31
+EBUILD libxml2-9999.ebuild 5009 BLAKE2B fd86fd7c1ec3d216c85c91b7f17479bda72fe5cc63da8bd0600cfe836ace44fce2a9925ffbe714114b10d9c98de5df1faa3d6d45949f092c2c71e2f69d73c5bc SHA512 d83466f9ce9a4dded70b290d2c5791b29eed21a26417836396243d54c18b5101438040a15dbda23416151704e736c12eabec604e9aa06b83697cedbac8fd6960
 MISC metadata.xml 458 BLAKE2B 318644d7202e85490c0b2f7a6fd36744cce5e4fa8929534149823d679a7fd01d118b9653ea5039c9e82b7cdcd423bf4541313cf550027ccfab8393f0b9b8ceca SHA512 b173246c3ec8351343bbe16f5572728ce6c6740056a0cf96e9eb4d975c181d54213d06c41ada9c38ac11727359d14d453cd1e824b29a52f7291a7ee50bfa5ed0
diff --git a/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild
index 5d7a300bba44..3378e7fad44d 100644
--- a/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild
@@ -9,7 +9,7 @@ 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
+inherit autotools flag-o-matic prefix python-r1 multilib-minimal
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
 XSTS_NAME_1="xmlschema2002-01-16"
@@ -19,19 +19,24 @@ 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"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
+	inherit git-r3
+else
+	inherit gnome.org
+	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"
+fi
 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} )"
@@ -75,11 +80,15 @@ PATCHES=(
 )
 
 src_unpack() {
-	local tarname=${P/_rc/-rc}.tar.xz
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		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
+		# ${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
+	fi
 
 	cd "${S}" || die
 
diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild
new file mode 100644
index 000000000000..3ad0604b6f1e
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-9999.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+inherit autotools flag-o-matic 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"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
+	inherit git-r3
+else
+	inherit gnome.org
+	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"
+fi
+
+SRC_URI+="
+	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"
+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 )
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		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
+	fi
+
+	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
+
+	# 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:
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--enable-ipv6 \
+			$(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) \
+			"$@"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_configure --with-python
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}"/python >/dev/null || die
+
+	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
+
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		NATIVE_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl run_in_build_dir libxml2_py_emake all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
+	fi
+
+	find "${ED}" -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 c10ca04c8bfd..ebca7625be6b 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.6.tar.gz 118521 BLAKE2B ba79d80216705b8f2f6e02a10ebab7cb3765d3718bf821bff4c6fbfe3cee7c2128230f670751948b430bd206f34924be438d4293dc154bcd69338e85cea90032 SHA512 2ea8592aa950be597254beefe1db0097ea3fb36b42e8ace04a13e34a17718bd74f232633e1555cc90283d81568fdfe2a198b68151ead5e0fa5628d344de8df9b
 DIST libxmlb-0.3.7.tar.gz 121055 BLAKE2B 5dda4695041af85a3fbb6c5ed9888ed822df1ddc6c281a89629598c82c022a8c55fdebbb4e49c553ed99d38c97843855569a3fcc5c2531b698b024e4b68638f6 SHA512 398d49e190aedd5c1f0eab2a8b6ddf5fc1cd866d575459c049e55399fc8fb54512783cc024b8f3016fbf19232502ba86781eea5b937871a3aed25b5ed28a5edd
+DIST libxmlb-0.3.8.tar.gz 121068 BLAKE2B fed6eccf0746952e3063030aa63447f2e5d29199c13166ed129c012be3e954d3fbc3109aa5397b4e9622c197222961984fb6cd3c0cec14c74f9fe80611639747 SHA512 a5302d570b5d6e5fae4be2536a11b93986cb22e7095da81e1982754cb6460464a1a9020a3e5b98566aa92d8570aa30a6fec190ae03a946e17b99f48621f476ff
 EBUILD libxmlb-0.1.15-r1.ebuild 1207 BLAKE2B 1ea024b9a69ee5da1d849c1f5ad7f13fd78621498591faa5de9ff48a6889c428018ab880472950ec5ea9fa10c70e2388e7661cee6f7a81942926330008d0b93f SHA512 332919207fd280d33be7e4087b356745b065b8af8be7be3149c40cd741173eaa1d92b3928f6704471c021f61aaf0d13424d6204f60e1733f145dbc92c6985c66
-EBUILD libxmlb-0.3.6.ebuild 1204 BLAKE2B 0fb25cf75ae6f8c8c6a0bf19609f31f9f62f6283deb5ae429e972c498e2dd351321b3069876032d71fe66d3ba5e64dfe5fbccc829cc99ec14a28adf98e69bddd SHA512 e863b1407d90806a4360b7cd50dc7dd9b01363205a035f692f00cf8e7644e829732790f7456811aca816bfa3712271cd50107e9b8b703fc57d3ff43e582c4037
 EBUILD libxmlb-0.3.7.ebuild 1204 BLAKE2B 7f650422fea3e1d88e1ecf474f09d8c38ff89ee957d6a8e05e5196f5f903e4a6af64ace26b47120cb8386b75d9374311ff120a0fe54e92734cbd335da56b9e9a SHA512 9b60a17ad5a2e31fd2ff3c8b234ac3baf80679addee8e689e9121ea14f5d13c3809afd3fb1899fd547e0290beada174251fe0429c627163c007880d7b3f9a8f7
+EBUILD libxmlb-0.3.8.ebuild 1204 BLAKE2B 7f650422fea3e1d88e1ecf474f09d8c38ff89ee957d6a8e05e5196f5f903e4a6af64ace26b47120cb8386b75d9374311ff120a0fe54e92734cbd335da56b9e9a SHA512 9b60a17ad5a2e31fd2ff3c8b234ac3baf80679addee8e689e9121ea14f5d13c3809afd3fb1899fd547e0290beada174251fe0429c627163c007880d7b3f9a8f7
 MISC metadata.xml 542 BLAKE2B 86e3ac797d222e3ac17592e2920f516387e530e02c5e64df4c64ec246d4cfb32fd80f994814cff093722ab1ae3d14169dd3f3bf17b3a022aa2d4d2f64069bc38 SHA512 52a50c11d1b4b036d22d3c2fc42b22b1b6bdcc04ec5d86b7567e3bcfe3080423867c5689657479c4b17b0826b06325b20d0d4ee8c45a6bafeb1cc2b0616d23a8
diff --git a/dev-libs/libxmlb/libxmlb-0.3.6.ebuild b/dev-libs/libxmlb/libxmlb-0.3.8.ebuild
index 84e2880a46ac..86105c7d3ce4 100644
--- a/dev-libs/libxmlb/libxmlb-0.3.6.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.3.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
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index fb6504ad723a..00b41808202e 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -4,5 +4,6 @@ DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c
 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
+EBUILD libxslt-1.1.35.ebuild 1906 BLAKE2B 3f8f08df6b84fb7158a4644c102fb8ece7dc2fd670600fb9a2c4c7aff5a3ae0ab9592c49a35465f29bd012383c9e664ff277c3ecac73030b02a223019dc463f0 SHA512 e6fb967f907fcbfb81ed1b43fcd5577468f3d62b33001b14f9c16d5f28192f14a8c1bc269385ef3c59284fe56c78719018b22b235fd5266cb7aa9884ce33a4d6
+EBUILD libxslt-9999.ebuild 2767 BLAKE2B 9b63a6f15a6665dad0784b31e8176f22ea62fbc1ba526d574ada1c820062b1c7401c2615a3e82cd4b0cb06a398065784d157035f2394da885a441331aa121da1 SHA512 6b533d3654524e791b1cd34edf6acac25a6681b9afbf6f46f5c54a3186531e086be02d9cce54a6467d748d9f857ebbcabdfe734fb7f64cc1ffd3f0628c6a329d
 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
index 3dac6a1a7af9..a00cec50a10c 100644
--- a/dev-libs/libxslt/libxslt-1.1.35.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.35.ebuild
@@ -3,15 +3,21 @@
 
 EAPI=7
 
-inherit gnome.org libtool multilib-minimal
+inherit 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"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt"
+	inherit autotools git-r3
+else
+	inherit gnome.org
+	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"
+fi
 
 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"
@@ -29,13 +35,17 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libxslt/xsltconfig.h
 )
 
+DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
+
 src_prepare() {
 	default
 
-	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
-
-	# Prefix always needs elibtoolize if not eautoreconf'd.
-	elibtoolize
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		# Prefix always needs elibtoolize if not eautoreconf'd.
+		elibtoolize
+	fi
 }
 
 multilib_src_configure() {
diff --git a/dev-libs/libxslt/libxslt-9999.ebuild b/dev-libs/libxslt/libxslt-9999.ebuild
new file mode 100644
index 000000000000..9ae87bff0559
--- /dev/null
+++ b/dev-libs/libxslt/libxslt-9999.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Note: Please bump this in sync with dev-libs/libxml2.
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit libtool python-r1 multilib-minimal
+
+DESCRIPTION="XSLT libraries and tools"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt"
+	inherit autotools git-r3
+else
+	inherit gnome.org
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="crypt debug examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND=">=virtual/pkgconfig-1"
+RDEPEND="
+	>=dev-libs/libxml2-2.9.11:2[${MULTILIB_USEDEP}]
+	crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xslt-config
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libxslt/xsltconfig.h
+)
+
+DOCS=( AUTHORS FEATURES NEWS README TODO )
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		# Prefix always needs elibtoolize if not eautoreconf'd.
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	libxslt_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--without-python \
+			$(use_with crypt crypto) \
+			$(use_with debug) \
+			$(use_with debug mem-debug) \
+			$(use_enable static-libs static) \
+			"$@"
+	}
+
+	# Build Python bindings separately
+	libxslt_configure --without-python
+
+	if multilib_is_native_abi && use python ; then
+		NATIVE_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl run_in_build_dir libxslt_configure --with-python
+	fi
+}
+
+libxslt_py_emake() {
+	pushd "${BUILD_DIR}"/python >/dev/null || die
+
+	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
+
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl run_in_build_dir libxslt_py_emake all
+	fi
+}
+
+multilib_src_test() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl run_in_build_dir libxslt_py_emake test
+	fi
+}
+
+multilib_src_install() {
+	# "default" does not work here - docs are installed by multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl run_in_build_dir libxslt_py_emake \
+			DESTDIR="${D}" \
+			install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/tutorial{,2} || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index c0b1ba11f89a..ad4e691ebe97 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,4 +1,4 @@
 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
+EBUILD mimalloc-2.0.5-r2.ebuild 686 BLAKE2B 55f12eef6f5497a8fc91eb5b923a45fa94297914b5d11c1caba285cb4c68c5e07178e53629bf7f9d281722b57a02a4016aa18d236f9c0e833d318c2d3082798e SHA512 687d66edd0c82eb79dd421a6cc02258446c45c8a8ed32a9876ee11ce8638e247ccbf661aca37109ccb127826ce5c0e280bf6b935312caa54bf382d1057aecfdc
 MISC metadata.xml 431 BLAKE2B 6b4122d0fc6609b5ee6d4fd345727301fdf1bf0943507240002d4a574aeb84622a1be6af2f095d231c9d3da303de39485234b7136a91a2d819a5434859eeea35 SHA512 9506d3cd5946abbad9a051e8cda535d361040d015e57b3b0f73a7a144e63d88e972aa427d52373ddc96b60868ee5d21e0f74b6001332343f2f57971ee27e5ab4
diff --git a/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild b/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
index 805e1fcc85d2..a165403d4ed6 100644
--- a/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
+++ b/dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0/2"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/mimetic/Manifest b/dev-libs/mimetic/Manifest
index 41187d312dea..3e30be61e852 100644
--- a/dev-libs/mimetic/Manifest
+++ b/dev-libs/mimetic/Manifest
@@ -3,4 +3,4 @@ AUX mimetic-0.9.8-uint-musl.patch 1164 BLAKE2B 98e45f7dc050f4ca01344578d3c076a85
 AUX signed-char.patch 1024 BLAKE2B 333955f24190ac0327cbc8ec786a91d62f431169aa157966ba592b1132681635bd231f893bdb7b70c849aed2d3910aa488a9813f7f00b8688d3bb46000076a10 SHA512 23f79103ff31d70d992a777118bc733f3fc52b5fc21b6827c19b0d40a099c11b74eda89feccad2690f83a4cc3f8e92d918d111cf9cef025b94481fdd75c3fb63
 DIST mimetic-0.9.8.tar.gz 556716 BLAKE2B 16dcd2a869a5ec92f8aeffca52f41aa1773ad1446302cf827d25ac27c407bcb7e59ed3f8868a00102ec19ef874da440e72f80cb42150a20dfd962af5173901f8 SHA512 4157eecb3e26af314d475c91192a357d6da35271a07a07b037d5037e9af84952ce2636874e86df0e94e8887dcfdb8f594a1ba04e6448181e436b0e2675f48f58
 EBUILD mimetic-0.9.8.ebuild 1032 BLAKE2B 2134b428597d03838486092071732affecaa050c54a342ffe8c259f7c5dd9f9231efe0cdb8bf9161f59ffcb73649426d9cc9015e94babc6a5c6c6bbcc2e25353 SHA512 3f06b9becb34de39ab7a2410034a660fbb24ef63203baf045b32ed815c8b0a8778b817a4b17d427649b2f97699f3a74bcc9d538bdf1722d1640ab5a9ff79efce
-MISC metadata.xml 384 BLAKE2B 1e0f2435d4ee6e9726cbd965c7aff8b1c3ffb7b91e91fa1a41470fdbed020a32a87bf048dc6b79f8c53ffcfb653a15829236093b7f77d8d5554b6bf048c47d4b SHA512 4c876d6eebdeaac99d38cc9f479da4a90ee1b496d9a0e93c7b9fe5174b37aa046ecd45d410bec4002be4f87d43ced5761b64092e4e2c4e5866fd8f17a9ffe987
+MISC metadata.xml 416 BLAKE2B 347e1625f27da1dcb2faf39a694b1f33750deee8705d477277267d0d264cb8831e2f39df5d8b985c4ad064efcceef18bc4d628f67f3c046010f1166e8ee416dd SHA512 f42ea33df7d0f1d4788730a3b05b7d51dc004da6fd59e298345053bf7f1054c87150669c4aece4a3f91b23d92e3e950e9c86210fd16cb6c8db8da852248062bb
diff --git a/dev-libs/mimetic/metadata.xml b/dev-libs/mimetic/metadata.xml
index 76cd805dd72e..6c135ca027bd 100644
--- a/dev-libs/mimetic/metadata.xml
+++ b/dev-libs/mimetic/metadata.xml
@@ -6,6 +6,7 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
+		<name>Michael Palimaka</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">tat/mimetic</remote-id>
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index df3974f53cee..4fae796b9348 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,11 +1,14 @@
 AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117ef801389b5b2df47c04aff51bf0759dd5bff41b09d1e9011f99b345d5769a3aab19acb943ee97f8437465518115f6902a0da1 SHA512 7667a020311ca11e8f1836bc146e4a3c94ff2a489882dbe87debcccfeaafeb50e6607574c64254a826b4b6f0bb436b310a3386fff4a58324f0e5e58debaa9d51
 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
+AUX nss-3.68-ld-fix.patch 1059 BLAKE2B ea449bf15d603e970468f1349a32804403036300c33bb77909d9752f069b2b8bc5bb3ddc3da286b5f0d4f3901c990af6ad308f7b5523103e35d72cfe18e031c2 SHA512 b3f39cb0c9d91968b3dd45fbdbd4de841e17e9b97790c574d8dc6a43e8fa59f3add77125c1117092d4600ea6a89659b0a8a26ff00cdb92165d107f47372ef862
 DIST nss-3.68.2.tar.gz 82406396 BLAKE2B 0542278f63770e9d4f3ce51516d7786680f2a869907ec91b2c4160f9fcad60703dd0e2a77bae91306349ff56908af0020e9479815e2b15392da7b14b27f8c7bc SHA512 31fe62f9e6f1695546bf8b087ae35ac2d3f39fde6be6ab3fcbc81ef66cf6290fc34b799e3809fcba4e913d0e305c476ee8ee1f22d0f957ec6978025920bdb9de
-DIST nss-3.75.tar.gz 84738291 BLAKE2B 35e8b1c3a6e2817d30e16b04288a5382332fa37d07f934de139dfb664c6a0ddd6a0e585902bd402cf45be5f9f9ae799c055a51cc4ec4a82c8dd12a454832e141 SHA512 0ad42f663b48649d7d16dc8b8956d2971a9566c0f7f655dd0609b94877f400977e5ad693f2eb44e1e277e55d1669294f07b3ba7a32573d3d72837b3944adf86d
-DIST nss-3.76.tar.gz 84623743 BLAKE2B 4e7ce8cfbfccae4d92357a86a0170427a50594387a73bd101e7400c85945de6104247900b4a0d5c0571370f718dc01b40749eba460b87ff339e097c07769412d SHA512 ffbdd8a27f60b796e1204912cde2fa62ac99747ce550258ccdd6fe96d60a46c6ac3f82758a7aba3c7ee58da4e7bf09f1bf817fb9f0fa4e62faaea08a6301b8bd
+DIST nss-3.68.3.tar.gz 82406947 BLAKE2B 92461f20294a9dce8c8a7eead9d06a4159e66afeb2d42a3313983fc5606a5f97321e038b9c25a7c7a361506910aee027ec91efd3096efdbf62096556d40896de SHA512 70fa8ab48d45249c04424979640583e8bc867432b7e3f26c1602db49a13861dd070f081ed82660bb7451f835dc859b5788ae12a67f9ddab1f6bd1a7afb1174d2
+DIST nss-3.76.1.tar.gz 84626067 BLAKE2B 5112b208f3b9528a34b1d8e3e669db067ecb79719ad16793b8cd556a02910cc29f899f2a57e959c50048c5d2b94eb3b9855208dd3c20646a719c971561f6ea4c SHA512 80d32a97501cbc05312caa5cec54fe6dd8708f01e6d15693e36a40d70433be7a35565fcc5fadfc324c998ee9093b10b2f7a89643882f06a850eda4ffd3b19c54
+DIST nss-3.77.tar.gz 84592839 BLAKE2B a63770f550b062549901afdcc5dc2a11c4648cef6875b023895da01ef53d6afc8c618291de96ac0af3a2c2cd7aa7986f93b4f10102a3c5aca1aa1447c148c393 SHA512 bd62eeb8f90ecd2d3999fd78fea6652736c02a6530f29e98d0cad0707f3b901b30409132eb6a6d53b9f5c05c6b464615a946a2a3e255553c793e44d0ed93179e
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 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
+EBUILD nss-3.68.3.ebuild 9330 BLAKE2B f3a480ad8cec62827ed7d0e5b7620dc6481e70f2ccb1dedddf36db9779c663cd1f94e54e68d87913725a8826436d961b4b5ca3367e74e49430313dbab6c53263 SHA512 fd59bd3af658dbe667df692fa6f21035509ff68c82bcfad4c567c106e836ef520683ce3116f666af032fe8dc556596e09747560defe504b2756cdc9cbdf7985e
+EBUILD nss-3.76.1.ebuild 9355 BLAKE2B 12a792836a1636697b48e86924af063fabc25d6beda356b73b35a90ae6934bc0b948b32a5ebddb17ac3ace16bb82ac02b4d15db20bd9726240ab6a23f6fb234f SHA512 3ad0df015300ad377632b44a0dc71744a02e6be72f499a563cb8e73a25d887bf0b34eb5cbda374f0c3b927f757c851cf2f1f2ec3da0d43fb2dfb1dc4a14cf20c
+EBUILD nss-3.77.ebuild 9299 BLAKE2B 046416eeb98364cf71c08cba8f1d1d49c7155f64da66ba960a0907d83ac72388cc3b3c0020324473b974f64513efd2019aa4176ec80a223ae57f7e204ef542de SHA512 7c2b1f165457e8a76d88d1750bc88169b2414df49e706df082dfd5cfc9942245420aadc95fb68fe58446e65a15f8f0eba45ca80bfadfd3bab3a28bdf990b2422
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/files/nss-3.68-ld-fix.patch b/dev-libs/nss/files/nss-3.68-ld-fix.patch
new file mode 100644
index 000000000000..ecdbdeebd4cf
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.68-ld-fix.patch
@@ -0,0 +1,29 @@
+From 3cba2869869c8480605f7ffcc41d2e4bae1b31c8 Mon Sep 17 00:00:00 2001
+From: Zi Lin <lziest@google.com>
+Date: Wed, 9 Mar 2022 19:14:16 +0000
+Subject: [PATCH] Use $(LD) instead of 'ld' for cross-platform compilation
+
+---
+ coreconf/Linux.mk | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff -Naur a/coreconf/Linux.mk b/coreconf/Linux.mk
+--- a/coreconf/Linux.mk	2022-03-03 12:18:53.000000000 +0200
++++ b/coreconf/Linux.mk	2022-03-29 08:59:10.157349449 +0300
+@@ -6,6 +6,7 @@
+ CC     ?= gcc
+ CCC    ?= g++
+ RANLIB ?= ranlib
++LD     ?= ld
+ 
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
+ 
+@@ -157,7 +158,7 @@
+ # Also, -z defs conflicts with Address Sanitizer, which emits relocations
+ # against the libsanitizer runtime built into the main executable.
+ ZDEFS_FLAG		= -Wl,-z,defs
+-DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
++DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell $(LD) -v)),,$(ZDEFS_FLAG))
+ LDFLAGS			+= $(ARCHFLAG) -z noexecstack
+ 
+ # On Maemo, we need to use the -rpath-link flag for even the standard system
diff --git a/dev-libs/nss/nss-3.68.3.ebuild b/dev-libs/nss/nss-3.68.3.ebuild
new file mode 100644
index 000000000000..1a0aceed903f
--- /dev/null
+++ b/dev-libs/nss/nss-3.68.3.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+	"${FILESDIR}/nss-3.68-ld-fix.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/nss/nss-3.76-r1.ebuild b/dev-libs/nss/nss-3.76.1.ebuild
index 225e7a316b86..f927277815f9 100644
--- a/dev-libs/nss/nss-3.76-r1.ebuild
+++ b/dev-libs/nss/nss-3.76.1.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
 	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
 	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+	"${FILESDIR}/nss-3.68-ld-fix.patch"
 )
 
 src_prepare() {
@@ -141,6 +142,7 @@ multilib_src_compile() {
 		CCC="$(tc-getCXX)"
 		AR="$(tc-getAR) rc \$@"
 		RANLIB="$(tc-getRANLIB)"
+		LD="$(tc-getLD)"
 		OPTIMIZER=
 		${mybits}
 	)
diff --git a/dev-libs/nss/nss-3.75-r1.ebuild b/dev-libs/nss/nss-3.77.ebuild
index 225e7a316b86..225e7a316b86 100644
--- a/dev-libs/nss/nss-3.75-r1.ebuild
+++ b/dev-libs/nss/nss-3.77.ebuild
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 186cee9e7e14..8dbc4ea65886 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,5 +1,5 @@
 DIST ntl-11.4.4.tar.gz 2378708 BLAKE2B 9a4c85bbe2fd2d3360988e0c350864fc0a05714e39ce3972228d93aba17f0dc079c90fbe40ab9d72116d1e31f55328bbd5cc71cd080e42ea33bc92361b4462aa SHA512 ed89d82008ca8785cb3d69de9577f42abe464dabf167ea2aaf801951843fc427d41171cbaac2f0cf68f35110d029cc28a65bd5aad69d30e7312f5ebcb0b58911
 DIST ntl-11.5.1.tar.gz 2304103 BLAKE2B 92284383451c7a810f7ee8d9a82836695d19d2a2e46b71c8c60b00acb77f4b4d3bad5497a309616a3e3188567d20203f5ad31295130ab0f3ace08417188c9fda SHA512 cf1f642b8a0f9cdc6dda888e07183817dc67ff494e56a852053aeb15b3d2a0e61fbc05824779c5d1f20b8115fba6f97266acf7e0b0b527c25df5989c86d5928f
 EBUILD ntl-11.4.4.ebuild 1704 BLAKE2B a32d148309c83276b1c56856917cb7c3a2b43c1ba4302cc6e6a634e63badf8d5aabdd48f534b72fa83718e1f797689df170ca88ea777d223a0ffeceab4f96688 SHA512 e20d5ba994de73f4762cf05a3a84ef14237849c9eae86c45f8a0ba40e8da08b2a3d855abfd8b921b95b25daeabff10bce1760ca5b263c341bcb256fff5c56d13
-EBUILD ntl-11.5.1-r1.ebuild 2070 BLAKE2B f9d048576f2e95ad247b02e0c26c2df69bbb8351c619a6aac3a0991fc58fa5f4e68a97219b3d176ba3550e59b799a522b2a96fec9e7f8e32cf438dd95422764e SHA512 9a1da9d4c5907496c142682d76c9a9c22e9970b0a3faa85aadfc8d3999f61049a70b4f6b7cb87bb27a59a2e5de65e72b0ba0c3b7250c82ccb7e133aac1713582
+EBUILD ntl-11.5.1-r1.ebuild 2074 BLAKE2B 67fc65a1f97bb89d7c3b254cc6e0d06d26a33a972217f27179a56e656837373c7bc4748aecdd27b2c0640b808d0f44180891469272824b36b6a45d1e5a501769 SHA512 5987d0c6f2061eb37cce499b1fea3b2f419089596a2627be4e6e61b57b3979834884a4016b57ed45a8c8a6e6881204101467bc822671f12b3c36084c41facc5e
 MISC metadata.xml 553 BLAKE2B cdfae3ba1eecfe54b279aec52c8a122226eb0247dfad805feb9f0854705e99247f15e42dedd6d08164a8d9c9cc9db871a481f6bcebad3062ac32ad05c3c32b7b SHA512 ca5e891461461757b75aea48a2cf631cc871daf33159c1f2c2a9a9e6acad43db97733de1c24754709e9b4eb1173a50af3ce63690443ce5ddd6794de9580b0d19
diff --git a/dev-libs/ntl/ntl-11.5.1-r1.ebuild b/dev-libs/ntl/ntl-11.5.1-r1.ebuild
index b5dd020eb133..babd1e7a505c 100644
--- a/dev-libs/ntl/ntl-11.5.1-r1.ebuild
+++ b/dev-libs/ntl/ntl-11.5.1-r1.ebuild
@@ -34,8 +34,8 @@ src_unpack() {
 src_configure() {
 	# The DoConfig script builds its own libtool, but doesn't
 	# really try to set up the build environment (bug 718892).
-	export CC=$(tc-getCC)
-	export CXX=$(tc-getCXX)
+	export CC="$(tc-getCC)"
+	export CXX="$(tc-getCXX)"
 
 	# Currently the build system can build a static library or both
 	# static and shared libraries, but not only shared libraries. The
diff --git a/dev-libs/nwjs/Manifest b/dev-libs/nwjs/Manifest
new file mode 100644
index 000000000000..4a8cf7fc0579
--- /dev/null
+++ b/dev-libs/nwjs/Manifest
@@ -0,0 +1,3 @@
+DIST nwjs-v0.62.1-linux-x64.tar.gz 128395584 BLAKE2B 144a9e61aff85a6a94bb62e4351d3aad4453e3a003fff79bbc677e9d976dd3e8a237b8ef5371f983365e4d9c56da138f7daed527cd7746fbc46bf952ff3b9887 SHA512 c6e385c3960e695b318b2d4bae902031b808490b34efdc0a4ee51cc6a5c337d597447c968bec1bfb7d6d2128604541e06ddae9073261d0aa50b70fbeb28488db
+EBUILD nwjs-0.62.1.ebuild 1908 BLAKE2B 3e2b1b51043f0613c1f7cce95a88bbe9122f5f81b537934a1541ca2f3a20fcc498b78ba32bc5fd3228ce3b6c6bde4744fc40c936b5c2c92c9b63fc31803a53bb SHA512 d2f547ba1a82b04f75cecbc371a731c8c10cff24d4af2df0efa175e6ce59ae211ccf814e005d2fe3966228ad0e63c1096452b07142e22bc50c8065d944b1c5b5
+MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135
diff --git a/dev-libs/smack/metadata.xml b/dev-libs/nwjs/metadata.xml
index 2ce0e74f9864..7c730d47817a 100644
--- a/dev-libs/smack/metadata.xml
+++ b/dev-libs/nwjs/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/nwjs/nwjs-0.62.1.ebuild b/dev-libs/nwjs/nwjs-0.62.1.ebuild
new file mode 100644
index 000000000000..d50a5c83067a
--- /dev/null
+++ b/dev-libs/nwjs/nwjs-0.62.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHROMIUM_VERSION="96"
+CHROMIUM_LANGS="
+	am
+	ar
+	bg
+	bn
+	ca
+	cs
+	da
+	de
+	el
+	en-GB
+	en-US
+	es-419
+	es
+	et
+	fa
+	fil
+	fi
+	fr
+	gu
+	he
+	hi
+	hr
+	hu
+	id
+	it
+	ja
+	kn
+	ko
+	lt
+	lv
+	ml
+	mr
+	ms
+	nb
+	nl
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sk
+	sl
+	sr
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="Framework that lets you call all Node.js modules directly from the DOM"
+HOMEPAGE="https://nwjs.io"
+SRC_URI="amd64? ( https://dl.nwjs.io/v${PV}/${MY_P}-linux-x64.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/libglvnd
+	media-libs/vulkan-loader
+	media-video/ffmpeg-chromium:${CHROMIUM_VERSION}
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+
+S="${WORKDIR}/${A%.tar.gz}"
+DIR="/opt/${PN}"
+QA_PREBUILT="${DIR#/}/*"
+
+src_prepare() {
+	default
+
+	# Unbundle some libraries.
+	rm -r lib/lib{EGL.so,ffmpeg.so,GLESv2.so,vulkan.so.1} swiftshader/ || die
+
+	cd locales || die
+	rm {ar-XB,en-XA}.pak* || die # No flags for pseudo locales.
+	chromium_remove_language_paks
+}
+
+src_install() {
+	insinto "${DIR}"
+	doins -r *
+
+	exeinto "${DIR}"
+	doexe chrome_crashpad_handler nw
+
+	insinto "${DIR}"/lib
+	doins lib/*.json
+
+	exeinto "${DIR}"/lib
+	doexe lib/*.so*
+
+	dosym ../../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
+		"${DIR}"/lib/libffmpeg.so
+
+	dosym ../.."${DIR}"/nw /usr/bin/${PN}
+}
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 1a67f5e96e41..bfd72b17abb9 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -2,6 +2,8 @@ AUX ocl-icd-2.2.12-gcc-10.patch 1551 BLAKE2B 0a2b6c66e83e67db9ba08af5311da65fc87
 AUX ocl-icd-2.3.0-new-headers.patch 4641 BLAKE2B 0013da2cfbe61cf98f98740055b54f2a3a1afacbf7d8845f0a3f53622e4a5e848d8d5d0be279e4717f29bc8e379affb3508aa2efa1c355c073ca42e883bdeead SHA512 951f1fb715031ebd6b1146b08d34fdc98154435129f8c1fb7b7b01ca33e10fdf2b8651c231fc1f47a41d3dc66c77df29786b3535099b7bbaac2e2b62fa4edc93
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
 DIST ocl-icd-2.3.0.tar.gz 100848 BLAKE2B b9e5b78df63f4865bb4cb3623fbc6bd336c86b4a9e1f23a29fab1cf11f848cb20d6d8d4a480ff44e442b02d606247a923798143058256ef59c2b16c9daf7098d SHA512 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613
+DIST ocl-icd-2.3.1.tar.gz 102616 BLAKE2B f3e41d73e8cca7b42697a81f9d353341ba40ae67bb07ccbb7f6bd4fc9c8d16cbb4a9a9826ef81a381629cf1bd2c61d6ad9d7a02dcdb2871359041cfd8e9815b7 SHA512 3fa92dbcbe8ea2acf1ee967419d1b39ca7ace96e64261e3818984bd70831d62692e953c30e3e271fe74d59c634785055320f03c4d0516e2f53f7f700d3bcc76d
 EBUILD ocl-icd-2.2.12-r4.ebuild 1212 BLAKE2B 8b39938a7bc2b83e4e3b04021f2d913d1e894ef8b89b655f93b56009ae0ed05b0e66144a5089d8b38c6f9b0fb6e6fd8bc606504f9cf10ee5c090fd941d8030ac SHA512 c2b9c70e2a62d6b6bc8974813715d1e6754e716d5eef7adb314a5f334d9c7ba748d04de3c25177231b0a74e5afc4c43e549af340633646627268af46eaa9452d
 EBUILD ocl-icd-2.3.0.ebuild 1524 BLAKE2B e738dd830515e756ddcc34bbc3aee067ac118e5d88ec07bafa37229cd7f1fc798576061e72570a63b626ff8c92d652fcdd80cb78e3afa6c1dfc9aa739d72e234 SHA512 16991b86d0d3be933f226e1dffd23c3d388b6c524426fb43a12267ee19ad681a4b6911798a305420ad65c4c1df1a8c51618b6136f1dac862f8a8c553ca8db0f1
+EBUILD ocl-icd-2.3.1.ebuild 1475 BLAKE2B dd1ff1e709bbdfe7fb3b7463864b9ca7ea83bfb153e7335a91c8ef27e1400af22f796265763eb652e0a95249b8cbb0c379b751246e05a0acd1a147c1760275d7 SHA512 3d9aaa113f9b703cc8d98dce446f306189e38ec316e6cc8e6975f1f6d710317ef772871830b3c964c6d08a08a35643f07dc2cba8795e5b086ad192d568064888
 MISC metadata.xml 397 BLAKE2B 385d442979cec4852b3ca02d98413415ea62683c4bbdf33c5ace01879f8a4a4f7bedf9a0f7ba4f88dcea4267765a0635cacb4a619e6d9294c6d399e01220a1f7 SHA512 730e4cd26169de827576ac7d61a07caa08c6d78cc1561417c5e017eee58a7137436003aafac620223ae1513a100c7817a3e00463ea50f0d9e3690949f2c54614
diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
new file mode 100644
index 000000000000..4e769ccf921e
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+inherit autotools flag-o-matic multilib-minimal ruby-single
+
+DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
+HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
+SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Does nothing now but by keeping it here we avoid having to have virtual/opencl
+# handle ebuilds both with and without this flag.
+IUSE="+khronos-headers"
+
+BDEPEND="${RUBY_DEPS}"
+DEPEND=">=dev-util/opencl-headers-2021.04.29"
+RDEPEND="${DEPEND}
+	!app-eselect/eselect-opencl
+	!dev-libs/opencl-icd-loader"
+
+src_prepare() {
+	replace-flags -Os -O2 # bug 646122
+
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# dev-util/opencl-headers ARE official Khronos Group headers, what this option
+	# does is disable the use of the bundled ones
+	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers
+}
+
+multilib_src_compile() {
+	local candidates=(${USE_RUBY})
+	local ruby=
+	for (( idx=${#candidates[@]}-1 ; idx>=0 ; idx-- )) ; do
+		if ${candidates[idx]} --version &> /dev/null; then
+			ruby=${candidates[idx]} && break
+		fi
+	done
+	[[ -z ${ruby} ]] && die "No ruby executable found"
+
+	emake RUBY=${ruby}
+}
+
+multilib_src_install() {
+	default
+
+	# Drop .la files
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index 69fff18a4cc2..cad6e8cb071c 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -1,5 +1,4 @@
 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
+EBUILD openobex-1.7.2-r3.ebuild 1081 BLAKE2B 666652dae918d03e801db196b635e68ff5079c248af4ca3efe5e79fc0ab06b526c8ad4c7439bb7da419905d6407347a898f5e33bb77916e74364de6088d6885a SHA512 be50d66be6d13f080ab70dd46b1b8591b1e80342c441ce66c7f6f12f67a49d174f805b1367b0ec62c80d0eb929bc4ce43801acecb7a7ab81e1a9c018ac4360ce
 MISC metadata.xml 391 BLAKE2B 308e54929dd0b54459df73def6f3000720755140285c80200f90d728370b148db88ed43e57f2262d8a4dde15236d00cb7dc6e926acb353e51fea433d9b3a686d SHA512 46b90dd0b36258872569b982412b810f4a4c4a77bd3f15bf5531aee9b624bd6d964fb0b3e3d21bcf2af5fd1c0b78e4d46ce144eb34d96d68a33030fe372a8722
diff --git a/dev-libs/openobex/openobex-1.7.2-r2.ebuild b/dev-libs/openobex/openobex-1.7.2-r2.ebuild
deleted file mode 100644
index 0ca2449f9f24..000000000000
--- a/dev-libs/openobex/openobex-1.7.2-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils 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-utils_src_configure
-}
diff --git a/dev-libs/openobex/openobex-1.7.2-r3.ebuild b/dev-libs/openobex/openobex-1.7.2-r3.ebuild
index ce0a1b44448b..fc2325c01365 100644
--- a/dev-libs/openobex/openobex-1.7.2-r3.ebuild
+++ b/dev-libs/openobex/openobex-1.7.2-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86"
 IUSE="bluetooth doc irda usb"
 
 BDEPEND="
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 8c57df9a2547..c0528883423e 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -3,8 +3,6 @@ AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08
 AUX protobuf-3.16.0-protoc_input_output_files.patch 10060 BLAKE2B e91d2e60ec9a901df0b0e11a8e51ff92b8765357e052231a915a2afa996c78096e18cf443708bf32e51b882c3fe2512e2ab9f7bb8ec1c6141f2c9bb7fb98af95 SHA512 03721151866f25564e203eb5af987649bf3c148ba7b9e1a2a837b336062b911d892714c4deaa5b19572a3ec47e3b309114ce67b0ec0adcff50d208b73283a7b5
 AUX protobuf-3.17.0-disable_no-warning-test.patch 965 BLAKE2B 584b43b43861280254f92ad48d8a068b6427e1af3822097f2ddd872983fae11f3bd7af1d73b9b58592987ac4aff7399fa31291e21db6656518bce10c5977a785 SHA512 a67fe3231064c1cf3f4ca94be4248fd65f455b1aaa1d1a09afae847a9b9bbae9673d1fec177e822abe0a83b2fe3342bd20dd9aff87adea0dddcc05309aaca682
 AUX protobuf-3.17.0-system_libraries.patch 6299 BLAKE2B a9252af294342e0a12137c618bc1e6fbe9aa021feaa458c2638aaf407dd6a43473587b7ac3e7278217874e5091ff7337234594715daa7567c9d3cf1bd3191973 SHA512 1d712f886e28907d5a5bef414c9fec56d1c056c316428f6e05fdfb87494e93506c17ff6dd5cff4ec716a6f20b56258393773701cdb6b04f87e44264a919a588e
-AUX protobuf-3.18.0-disable_no-warning-test.patch 1620 BLAKE2B af958e23f5229706b28e4832768e87aafe9c107b8a1f9418ee16fa50927b89d8546e36544781c94a43e29ad3466e79707b882897b18d448d603ab09d4c24d731 SHA512 484ced278252af1fa03f093ccdc8b28199c5b32056c365b5fc932cb8af6e73a32bb9ca1ab2f489e43cca8fc2334c8d323095b54c359e28ede47c7ec191c08905
-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.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12
diff --git a/dev-libs/protobuf/files/protobuf-3.18.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.18.0-disable_no-warning-test.patch
deleted file mode 100644
index 9abf5deca295..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.18.0-disable_no-warning-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 290073d7d4ddaa6d39ad12c90245e795c5482432 Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Date: Sat, 29 Jan 2022 22:43:50 +0800
-Subject: [PATCH] protobuf-3.18.0: disable no-warning test
-
-Disable no-warning-test which is compiled with -Werror option
-and whose only purpose is checking if compilation results in any warnings.
-
-Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Signed-off-by: Yixun Lan <dlan@gentoo.org>
----
- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e6b4d0f..1cfd885 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -726,7 +726,7 @@ GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
- GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
--                 no-warning-test $(GZCHECKPROGRAMS)
-+                 $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                       $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
-                       $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
-@@ -915,4 +915,4 @@ nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs)
- 
- TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
-         google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
--        protobuf-lite-arena-test no-warning-test
-+        protobuf-lite-arena-test
--- 
-2.34.1
-
diff --git a/dev-libs/protobuf/files/protobuf-3.18.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.18.0-system_libraries.patch
deleted file mode 100644
index 0e417c51bdab..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.18.0-system_libraries.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 10b2d5bb5a4d1b7529cb781e5513940ad6db4ada Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Date: Sat, 29 Jan 2022 22:46:38 +0800
-Subject: [PATCH] protobuf-3.18.0: system_libraries
-
-Use system version of GoogleTest,
-which will unbundle gtest, gmock libraries
-
-Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Signed-off-by: Yixun Lan <dlan@gentoo.org>
----
- Makefile.am     | 20 +-------------------
- configure.ac    |  7 -------
- src/Makefile.am | 33 ++++++---------------------------
- 3 files changed, 7 insertions(+), 53 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 7ce954e..c1493e0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,28 +11,10 @@ SUBDIRS = . src
- # Always include third_party directories in distributions.
- DIST_SUBDIRS = src conformance benchmarks third_party/googletest
- 
--# Build gmock before we build protobuf tests.  We don't add gmock to SUBDIRS
--# because then "make check" would also build and run all of gmock's own tests,
--# which takes a lot of time and is generally not useful to us.  Also, we don't
--# want "make install" to recurse into gmock since we don't want to overwrite
--# the installed version of gmock if there is one.
- check-local:
--	@echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
--	@cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
--	@cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
- 
--# We would like to clean gmock when "make clean" is invoked.  But we have to
--# be careful because clean-local is also invoked during "make distclean", but
--# "make distclean" already recurses into gmock because it's listed among the
--# DIST_SUBDIRS.  distclean will delete gmock/Makefile, so if we then try to
--# cd to the directory again and "make clean" it will fail.  So, check that the
--# Makefile exists before recursing.
- clean-local:
--	@if test -e third_party/googletest/Makefile; then \
--	  echo "Making clean in googletest"; \
--	  cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
--	fi; \
--	if test -e conformance/Makefile; then \
-+	@if test -e conformance/Makefile; then \
- 	  echo "Making clean in conformance"; \
- 	  cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
- 	fi; \
-diff --git a/configure.ac b/configure.ac
-index 4a6d50a..6301bd6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -236,12 +236,5 @@ if test "x$ANDROID_TEST" = xyes; then
- fi
- AC_SUBST([LIBLOG_LIBS])
- 
--# HACK:  Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
--#   since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
--#   too.
--export CFLAGS
--export CXXFLAGS
--AC_CONFIG_SUBDIRS([third_party/googletest])
--
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
- AC_OUTPUT
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1cfd885..73c2c6d 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -720,19 +720,11 @@ COMMON_TEST_SOURCES =                                          \
-   google/protobuf/testing/googletest.cc                        \
-   google/protobuf/testing/googletest.h
- 
--GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
--GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
--GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
--GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
-                  $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
--                         -I$(GOOGLEMOCK_SRC_DIR)/include
-+                      -lgtest -lgmock -lgmock_main
- # Disable optimization for tests unless the user explicitly asked for it,
- # since test_util.cc takes forever to compile with optimization (with GCC).
- # See configure.ac for more info.
-@@ -825,12 +817,8 @@ $(am_protobuf_test_OBJECTS): unittest_proto_middleman
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
-                       libprotoc.la                                   \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
--                                         -I$(GOOGLETEST_SRC_DIR)/include \
--                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
-+                      -lgtest -lgmock -lgmock_main
-+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lazy_descriptor_test_SOURCES =                        \
-   google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-@@ -851,11 +839,7 @@ COMMON_LITE_TEST_SOURCES =                                             \
- # full runtime and we want to make sure this test builds without full
- # runtime.
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
--                           $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
--                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
--                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
--                             -I$(GOOGLETEST_SRC_DIR)/include
-+                           -lgtest -lgmock -lgmock_main
- protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_test_SOURCES =                                           \
-   google/protobuf/lite_unittest.cc                                     \
-@@ -867,11 +851,7 @@ $(am_protobuf_lite_test_OBJECTS): unittest_proto_middleman
- # gtest when building the test internally our memory sanitizer doesn't detect
- # memory leaks (don't know why).
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include  \
--                                    -I$(GOOGLETEST_SRC_DIR)/include
-+                      -lgtest -lgmock -lgmock_main
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_arena_test_SOURCES =       \
-   google/protobuf/lite_arena_unittest.cc \
-@@ -881,8 +861,7 @@ $(am_protobuf_lite_arena_test_OBJECTS): unittest_proto_middleman
- 
- # Test plugin binary.
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                    $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
--test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
-+                    -lgtest
- test_plugin_SOURCES =                                          \
-   google/protobuf/compiler/mock_code_generator.cc              \
-   google/protobuf/compiler/test_plugin.cc                      \
--- 
-2.34.1
-
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 9e17f2658701..b4888526ff60 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,3 +1,5 @@
 DIST re2-2021-11-01.tar.gz 408934 BLAKE2B 31662b1e9cdfec67347cbe146763a29cc8970683d545965e649a5f54ac318c40cd6daf553b6098fae7024a944f73914641b05970f1274511fac6766abe6b9130 SHA512 9ea04638b7a8667fa9a9d9894c543417c86dde21a93bd4508ae8a43fdd21384092866a3f55e93249942f36488c165e93bee18c61bab3cf138a920654563b8122
+DIST re2-2022-04-01.tar.gz 380861 BLAKE2B ebb9ac6754382dc3a2b4c6ebab994678d364b83fc433e8c7b3b8ca8733503da41b37b796081cc24120801bdda8e69fbf111ccb9ddca51808129c65c622738e61 SHA512 fc3d7cc1ee6bd771719845566d83ffc8c4e19d838748e842a1e19c7564473c9a0a061bebb3966ffa82de6515346f9bbddc2d94ceb3de89233f58826774bd7ce7
 EBUILD re2-0.2021.11.01.ebuild 1352 BLAKE2B 4ad2554b45cee9027bb7fbf9ee731ed1e8b20648613a0a980a260e60c408edeee71208c7e91d3901fc7171bdfb59eb6933b1632c0ceb48bcf0441597706bee43 SHA512 f174c10a29fb1952841a7bd30ba28d03a13fb07423d5a7343c90b04d1b4027ab6c51a57541cb0f5fab24e75c13085362ca77256ba8e47d5f4fab1680862f62d2
+EBUILD re2-0.2022.04.01.ebuild 1356 BLAKE2B cdf5159b4c76e967b204b39a882ce62c217d653b36e1bafac6ff5611817d99b0fe567014efbc347ca1f5d8e987f91555044775ace99b2128f577424cc0bf2a74 SHA512 4db1e770dec298a128b00ab8b6dc42c219a33aef680c3c5ca2af26cd18b02a140ec591d3fb11769eeaa0ef337f88685d1f6edd3873901a51a60b8831edce0f4b
 MISC metadata.xml 486 BLAKE2B d99b0956f406a1e5fbfaf9a8516aaa86c328829bbfd6b4c3cfc2e925d2862e08dd31cebb730c957ea38a9b5aa84a3010ddd51760e2db8385f9b5d608b40b4d37 SHA512 e882f04350157da3e0ad7438f2c6a340853f6b589996041931f6686860d61c861e003692f5df616282e498c18266ded4803fd63760c2457dfbd04ca1b5d93391
diff --git a/dev-libs/re2/re2-0.2022.04.01.ebuild b/dev-libs/re2/re2-0.2022.04.01.ebuild
new file mode 100644
index 000000000000..c566acee7cdd
--- /dev/null
+++ b/dev-libs/re2/re2-0.2022.04.01.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2012-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/redis-ipc/Manifest b/dev-libs/redis-ipc/Manifest
new file mode 100644
index 000000000000..587f36477886
--- /dev/null
+++ b/dev-libs/redis-ipc/Manifest
@@ -0,0 +1,3 @@
+DIST redis-ipc-0.0.6.tar.gz 74682 BLAKE2B 76d12482519e446c55ad9e050614184e04c76d1f5d5e05b4a056a3339d8d94aedba2f5bda11e52e118ae9364937ae62f512b37d649e0e35c83aa686f679c0764 SHA512 6c54a42b29192cc79f92f2318aaaff03a56770fc2aed3d5b8c3724634c59c6fd0acfab2daf609899d3872e309e973ace6d6400bf014134fdc8e851c001637c74
+EBUILD redis-ipc-0.0.6.ebuild 977 BLAKE2B 16098cf9e2309b9dba636953633446810689ee20113d0f32bae1c36a62ff09fe6700a4b5228c1a4761ff68b708b4de6ed2c066d309a9e23fb6d25518948e5177 SHA512 881ac6f03a26dadec80bef0bf37dce257839c69a5fc3db88bff72145633168565d34d5df77cab90f658877ee59804038e01cf8dd0d3dbda061043a3c08544e56
+MISC metadata.xml 573 BLAKE2B 7f654985694ed4cddeadddbf5bb779617a54bf42d71e91b54fb3cdc7322e77b30e0088217860661e04cfa128d34cadabed0670877af3adbb7d9e7ea2b2676601 SHA512 887903795c27f1e62efa0c454d65f846cada54ad5ca2d28a9498d781c6a91092ff304f672af77dcfee91633d1326bc658a746967531292ea337a93b8fbbc67b0
diff --git a/dev-libs/redis-ipc/metadata.xml b/dev-libs/redis-ipc/metadata.xml
new file mode 100644
index 000000000000..3c1e58a0c43a
--- /dev/null
+++ b/dev-libs/redis-ipc/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nerdboy@gentoo.org</email>
+		<name>Stephen L Arnold</name>
+	</maintainer>
+	<longdescription lang="en">
+		Convenience library for using redis server and JSON as IPC
+		mechanism (command queues, settings, status, event channels).
+		Can use either local or network sockets via C or C++ interfaces.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">VCTLabs/redis-ipc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/redis-ipc/redis-ipc-0.0.6.ebuild b/dev-libs/redis-ipc/redis-ipc-0.0.6.ebuild
new file mode 100644
index 000000000000..fec9bd9c2dd3
--- /dev/null
+++ b/dev-libs/redis-ipc/redis-ipc-0.0.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A (redis) client library for using redis as system IPC msg/event bus"
+HOMEPAGE="https://github.com/VCTLabs/redis-ipc"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/VCTLabs/redis-ipc.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/VCTLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/1"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/hiredis:=
+	dev-libs/json-c
+"
+RDEPEND="${DEPEND}
+	dev-db/redis
+"
+
+src_prepare() {
+	sed -i -e "s|/lib|/$(get_libdir)|" "${S}"/redis-ipc.pc.in || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DRIPC_BUILD_TESTING=$(usex test)
+		-DRIPC_DISABLE_SOCK_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/smack/Manifest b/dev-libs/smack/Manifest
deleted file mode 100644
index 648a023284b9..000000000000
--- a/dev-libs/smack/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST smack-0.5.0.tar.bz2 38923 BLAKE2B e40ace9a4d97aaefe94d0ecdbce7f610c6cec73df87f3256078aaa5bd1ffcd45b047c4124cafd12da3dab5e1a74689726abd1ac3f1802b9a933aeb4cce7954cc SHA512 16c02538d44e3c53a783a5fd546a2813ae4da8e3d4e61fcc03a2c6c5127453ffaac1b5d5a04c499f6158d747b5cf37fdfa675dc4017d884f3eccb6dc0d76e754
-EBUILD smack-0.5.0.ebuild 433 BLAKE2B ed39b17924215065b1f8f6007f78a436b5e807c8b8bc2ae33d899bf76cd524ccaf92f3c0cf4148f600bf0459dbb4b9243af523715bfc9495c2383eed142bcc63 SHA512 08dc764aa7c35f6950b15c6c0f12f0ec102d32963d2f056d955642a35ee19e9aad874589e4b561d2d900366028aca9a07751463de369be638c133ca813f99157
-MISC metadata.xml 248 BLAKE2B 2ac829e1663815f752e218e9ee474448a3d973c075939d578699f57790581498adfe9bad180a79fcc6ea0afc339f57d25cbcc0fdd430f82d192c23c03d15e465 SHA512 55c2e2e06f91e13fd73b9545c51d4169a47f040ead41eb1368479940b026def820de67137312b64a6203f80b57a421c8895ed690386a79086fa0ba6c3557aa47
diff --git a/dev-libs/smack/smack-0.5.0.ebuild b/dev-libs/smack/smack-0.5.0.ebuild
deleted file mode 100644
index 94966983b404..000000000000
--- a/dev-libs/smack/smack-0.5.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="low-level IO storage which packs data into sorted compressed blobs"
-HOMEPAGE="http://reverbrain.com/smack/"
-SRC_URI="https://dev.gentoo.org/~patrick/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/snappy
-	dev-libs/boost"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index 0c1f48bdefca..70efe38f79b2 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -1,3 +1,5 @@
 DIST xmlrpc-c-1.51.06.tgz 933161 BLAKE2B 8023444e14e7e41f5433cebeb0fcb7a7323dd734f658155e117d3547b4d61ef81c189395662bf68074dcf1ec5c47ee550cd18773ce8bf0bd53cb0a1764cce945 SHA512 2927fc8c01d42b6f838d8b0c839f09a7dd0d1ddc5a3d7b36c9d479f1c7bf7fdf14923f640883f98ba66067eda0f5379737bf3a5bc9d4b9abe1a7eff7d7def066
-EBUILD xmlrpc-c-1.51.06-r2.ebuild 2067 BLAKE2B 27d86c5e7121e26db6bea1cf4944502f97029255e7db2f9fc2bd8f7131eb25ec4a58ad3734b9efd5998c7bbb90d7631bee625ab2a64e92e554b1c57879e28dba SHA512 7a7b0e51672b25172015a1aeebf2009d9bd7d70b29da33b27d4a9216a7390503fa69407e6c1d772bebb3c63909d0963ddaec81d7ef75a22a4acf916dabdb746a
+DIST xmlrpc-c-1.54.05.tgz 933228 BLAKE2B 50d73fe22454f04ffebf11d4b88986eaac571d107abce4e04244ad0b74469fc5233178967e3dd832a8525514912e4f835fa1ce13c439caf918a2b2d0c05021a0 SHA512 81bf8f398e9cb73b421907d8e304b9a6dc8da931f573f7296457486ade432f4a00a94b6850391690f7b229928f785522e5852db8aca68cb462c71d139e4f27b1
+EBUILD xmlrpc-c-1.51.06-r2.ebuild 2176 BLAKE2B f6b372741bbc6cddaaf967ab17433632866172f97626ea817d0ee487707b1cb9398224d3703989e96e0fe1f6e2309057aae4a92f9d3098b37acd5a748dea2e94 SHA512 b9f7aa3a4b26d1a7af841d6717c95b62d5d3f7aa77594e0e8bebe9b052107d84f15011ff453895f786da5298f14faea427c1f0847c0605205b439f3154349016
+EBUILD xmlrpc-c-1.54.05.ebuild 2182 BLAKE2B 45d6e9e9db40438a650ac2022ac151d6082e6c68c65bccabe8ebb1f8d0f8940f14a053af25ab768b778fa81f0c7211afa90750b68959f0e5fbcf71b2c595e524 SHA512 79452c94a3dd4f4fd43a6e0a88e4d3c6e08ce7db84d4e955d25f57611452122e79daa8aede48abfb8baefe714efe96108131b17040160ca6301da21724732309
 MISC metadata.xml 617 BLAKE2B b0c8cee5453b850768e8c91bcd2cbe265eb19956644798b3219c9739ec666bedb543e924d2e4fce6874bdab3ac865c4ce94ba5032775fcc2359804ede0c92053 SHA512 729a5c14973bb4bd11a138299e05db0c43dce67a58a9eb4bb60600b097c1fc479231dea287ef9e824a093c9cf15064adb9bc6e0dee2820078c2ee79d9ea9d581
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
index 29b329aaa875..54cf9c58c907 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-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
@@ -64,6 +64,8 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	default_src_compile
+	# Needed for tests, bug #836469
+	cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
 	# Tools building is broken in this release
 	#multilib_is_native_abi && use tools && emake -rC "${S}"/tools
 }
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
new file mode 100644
index 000000000000..05c4799f8bdf
--- /dev/null
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
+# 1. Only the "Super Stable" series is released as a tarball
+# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
+# Because of this, we are following the "Super Stable" release channel
+
+DESCRIPTION="A lightweigt RPC library based on XML and HTTP"
+HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0/4.54"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( abyss curl cxx )"
+
+RDEPEND="
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+	libxml2? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use curl || ewarn "Curl support disabled: No client library will be built"
+}
+
+src_prepare() {
+	sed -i \
+		-e "/CFLAGS_COMMON/s|-g -O3$||" \
+		-e "/CXXFLAGS_COMMON/s|-g$||" \
+		common.mk || die
+
+	default
+
+	# Out-of-source install phase is broken
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-libwww-client \
+		--disable-wininet-client \
+		--without-libwww-ssl \
+		$(use_enable abyss abyss-server) \
+		$(use_enable cgi cgi-server) \
+		$(use_enable curl curl-client) \
+		$(use_enable cxx cplusplus) \
+		$(use_enable libxml2 libxml2-backend) \
+		$(use_enable threads abyss-threads)
+}
+
+multilib_src_compile() {
+	default_src_compile
+	# Needed for tests, bug #836469
+	cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
+	# Tools building is broken in this release
+	#multilib_is_native_abi && use tools && emake -rC "${S}"/tools
+}
+
+#multilib_src_install_all() {
+#	# Tools building is broken in this release
+#	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
+#}
diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
index 0ba3f682e7d2..64c8f123fb3f 100644
--- a/dev-libs/zlog/Manifest
+++ b/dev-libs/zlog/Manifest
@@ -3,4 +3,4 @@ DIST zlog-v1.2.14.tar.gz 123729 BLAKE2B 6985898af81ecb3b86c941dea1402dc03c80a773
 DIST zlog-v1.2.15.tar.gz 124794 BLAKE2B a60ef362269d48672c7f0f4321b6c4f50241c7c1abcc2c3a3a888d7838018edaba103cbb985fda02db719dcb8553bad3f84bfd715f3fdb34ad64557107d24e44 SHA512 88c741b58e7857c573e4da0b3999a23c00d339e45eb4f7d3e07c03dbe8ebf4cae62720208c9759871969bb4959d2f081b6a8955e229d3872f99cde3e650702e4
 EBUILD zlog-1.2.14-r1.ebuild 676 BLAKE2B 20f6fac27b0ab76a90d5499d0c4271b4a5d36a0d26f61adfb575a9b09d17bf5a06f333d7081936ef858d5ff4a0a161f679ea6added8de83a1b44f786002c8869 SHA512 d69125bd69bf602fed0b9302ab15a7c8e496be9590e188e0028daf7357d7c56aed737a276b07f66d7c8b3c1f0b38aab20d05ba2433c1a6d746bc865ef577eb08
 EBUILD zlog-1.2.15.ebuild 676 BLAKE2B 20f6fac27b0ab76a90d5499d0c4271b4a5d36a0d26f61adfb575a9b09d17bf5a06f333d7081936ef858d5ff4a0a161f679ea6added8de83a1b44f786002c8869 SHA512 d69125bd69bf602fed0b9302ab15a7c8e496be9590e188e0028daf7357d7c56aed737a276b07f66d7c8b3c1f0b38aab20d05ba2433c1a6d746bc865ef577eb08
-MISC metadata.xml 344 BLAKE2B 0c1c5fd6c0b6d17626fc0ce972e3d1d8b51505ed8d5a2792d677fdebde77a9ed636461e84b3cd864a2b638d3389fd545bbc3d231f1d98487f5739a3fb3f92d36 SHA512 df8ee416f655a1e15484395075bfbe6107af6b0fd45d7ca2fd1675b847a409394827ba50583aa70ce474cd19bfabf84fc4d765abdb4bba47dd986fb370777902
+MISC metadata.xml 255 BLAKE2B b4a437af0e97611ad305b6e0c87449b732be402063caa90f8b213050a8182a544b90149631dcc2237bfafb4e84bf3af9ab0c3736737bd06d3294a30baacfec17 SHA512 7f35220b2103be49aa1b9780d6027040096f2546b6fd6e72bbc73e477e2b77ce8a8cd04a9bdc95b9c4d663daacc7076a83e5d7456bec009152be1c5375e93ebd
diff --git a/dev-libs/zlog/metadata.xml b/dev-libs/zlog/metadata.xml
index 06ff584f8016..986cdb9c5854 100644
--- a/dev-libs/zlog/metadata.xml
+++ b/dev-libs/zlog/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>klausman@gentoo.org</email>
-    <name>Tobias Klausmann</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">HardySimpson/zlog</remote-id>
   </upstream>
author	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-04-06 22:33:41 +0100
commit	e68d405c5d712af4387159df07e226217bdda049 (patch)
tree	009ab0f3d427f0813e62930d71802cb054c07e30 /dev-libs
parent	401101f9c8077911929d3f2b60a37098460a5d89 (diff)